config

commit db094898f9b368e83ce63dc5b197a5a55f9bb70e
parent 26efc3fa16f7b62bda85e66cd6811dfc9ad76cd2
Author: dwrz <dwrz@dwrz.net>
Date:   Wed, 22 May 2024 14:43:59 +0000

Update Emacs packages

Diffstat:
M
emacs/elpa/archives/gnu/archive-contents
 | 
143
+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
M
emacs/elpa/archives/gnu/archive-contents.signed
 | 
4
++--
M
emacs/elpa/archives/melpa/archive-contents
 | 
511
+++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
emacs/elpa/archives/nongnu/archive-contents
 | 
34
++++++++++++++++++++++++----------
M
emacs/elpa/archives/nongnu/archive-contents.signed
 | 
4
++--
D
emacs/elpa/cape-20240411.2207/cape-pkg.el
 | 
15
---------------
D
emacs/elpa/cape-20240411.2207/cape.el
 | 
1275
-------------------------------------------------------------------------------
D
emacs/elpa/cape-20240411.2207/cape.elc
 | 
0

R
emacs/elpa/cape-20240411.2207/cape-autoloads.el -> emacs/elpa/cape-20240517.2216/cape-autoloads.el
 | 
0

R
emacs/elpa/cape-20240411.2207/cape-char.el -> emacs/elpa/cape-20240517.2216/cape-char.el
 | 
0

R
emacs/elpa/cape-20240411.2207/cape-char.elc -> emacs/elpa/cape-20240517.2216/cape-char.elc
 | 
0

R
emacs/elpa/cape-20240411.2207/cape-keyword.el -> emacs/elpa/cape-20240517.2216/cape-keyword.el
 | 
0

R
emacs/elpa/cape-20240411.2207/cape-keyword.elc -> emacs/elpa/cape-20240517.2216/cape-keyword.elc
 | 
0

A
emacs/elpa/cape-20240517.2216/cape-pkg.el
 | 
15
+++++++++++++++
A
emacs/elpa/cape-20240517.2216/cape.el
 | 
1277
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/cape-20240517.2216/cape.elc
 | 
0

D
emacs/elpa/consult-20240420.929/consult-pkg.el
 | 
15
---------------
D
emacs/elpa/consult-20240420.929/consult-xref.el
 | 
122
-------------------------------------------------------------------------------
D
emacs/elpa/consult-20240420.929/consult-xref.elc
 | 
0

D
emacs/elpa/consult-20240420.929/consult.el
 | 
5237
-------------------------------------------------------------------------------
D
emacs/elpa/consult-20240420.929/consult.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-autoloads.el -> emacs/elpa/consult-20240516.2240/consult-autoloads.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-compile.el -> emacs/elpa/consult-20240516.2240/consult-compile.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-compile.elc -> emacs/elpa/consult-20240516.2240/consult-compile.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-flymake.el -> emacs/elpa/consult-20240516.2240/consult-flymake.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-flymake.elc -> emacs/elpa/consult-20240516.2240/consult-flymake.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-imenu.el -> emacs/elpa/consult-20240516.2240/consult-imenu.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-imenu.elc -> emacs/elpa/consult-20240516.2240/consult-imenu.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-info.el -> emacs/elpa/consult-20240516.2240/consult-info.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-info.elc -> emacs/elpa/consult-20240516.2240/consult-info.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-kmacro.el -> emacs/elpa/consult-20240516.2240/consult-kmacro.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-kmacro.elc -> emacs/elpa/consult-20240516.2240/consult-kmacro.elc
 | 
0

R
emacs/elpa/consult-20240420.929/consult-org.el -> emacs/elpa/consult-20240516.2240/consult-org.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-org.elc -> emacs/elpa/consult-20240516.2240/consult-org.elc
 | 
0

A
emacs/elpa/consult-20240516.2240/consult-pkg.el
 | 
15
+++++++++++++++
R
emacs/elpa/consult-20240420.929/consult-register.el -> emacs/elpa/consult-20240516.2240/consult-register.el
 | 
0

R
emacs/elpa/consult-20240420.929/consult-register.elc -> emacs/elpa/consult-20240516.2240/consult-register.elc
 | 
0

A
emacs/elpa/consult-20240516.2240/consult-xref.el
 | 
120
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/consult-20240516.2240/consult-xref.elc
 | 
0

A
emacs/elpa/consult-20240516.2240/consult.el
 | 
5262
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/consult-20240516.2240/consult.elc
 | 
0

D
emacs/elpa/consult-lsp-20230209.714/consult-lsp-pkg.el
 | 
17
-----------------
D
emacs/elpa/consult-lsp-20230209.714/consult-lsp.el
 | 
579
-------------------------------------------------------------------------------
D
emacs/elpa/consult-lsp-20230209.714/consult-lsp.elc
 | 
0

R
emacs/elpa/consult-lsp-20230209.714/consult-lsp-autoloads.el -> emacs/elpa/consult-lsp-20240507.2105/consult-lsp-autoloads.el
 | 
0

A
emacs/elpa/consult-lsp-20240507.2105/consult-lsp-pkg.el
 | 
17
+++++++++++++++++
A
emacs/elpa/consult-lsp-20240507.2105/consult-lsp.el
 | 
618
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/consult-lsp-20240507.2105/consult-lsp.elc
 | 
0

D
emacs/elpa/dash-20240405.946/dash-pkg.el
 | 
14
--------------
D
emacs/elpa/dash-20240405.946/dash.el
 | 
4136
-------------------------------------------------------------------------------
D
emacs/elpa/dash-20240405.946/dash.elc
 | 
0

D
emacs/elpa/dash-20240405.946/dash.info
 | 
4948
-------------------------------------------------------------------------------
R
emacs/elpa/dash-20240405.946/dash-autoloads.el -> emacs/elpa/dash-20240510.1327/dash-autoloads.el
 | 
0

A
emacs/elpa/dash-20240510.1327/dash-pkg.el
 | 
14
++++++++++++++
A
emacs/elpa/dash-20240510.1327/dash.el
 | 
4136
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/dash-20240510.1327/dash.elc
 | 
0

A
emacs/elpa/dash-20240510.1327/dash.info
 | 
4948
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/dash-20240405.946/dir -> emacs/elpa/dash-20240510.1327/dir
 | 
0

D
emacs/elpa/doom-modeline-20240425.609/doom-modeline-pkg.el
 | 
17
-----------------
D
emacs/elpa/doom-modeline-20240425.609/doom-modeline-segments.el
 | 
3199
-------------------------------------------------------------------------------
D
emacs/elpa/doom-modeline-20240425.609/doom-modeline-segments.elc
 | 
0

D
emacs/elpa/doom-modeline-20240425.609/doom-modeline.el
 | 
262
-------------------------------------------------------------------------------
R
emacs/elpa/doom-modeline-20240425.609/doom-modeline-autoloads.el -> emacs/elpa/doom-modeline-20240510.144/doom-modeline-autoloads.el
 | 
0

R
emacs/elpa/doom-modeline-20240425.609/doom-modeline-core.el -> emacs/elpa/doom-modeline-20240510.144/doom-modeline-core.el
 | 
0

R
emacs/elpa/doom-modeline-20240425.609/doom-modeline-core.elc -> emacs/elpa/doom-modeline-20240510.144/doom-modeline-core.elc
 | 
0

R
emacs/elpa/doom-modeline-20240425.609/doom-modeline-env.el -> emacs/elpa/doom-modeline-20240510.144/doom-modeline-env.el
 | 
0

R
emacs/elpa/doom-modeline-20240425.609/doom-modeline-env.elc -> emacs/elpa/doom-modeline-20240510.144/doom-modeline-env.elc
 | 
0

A
emacs/elpa/doom-modeline-20240510.144/doom-modeline-pkg.el
 | 
17
+++++++++++++++++
A
emacs/elpa/doom-modeline-20240510.144/doom-modeline-segments.el
 | 
3218
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/doom-modeline-20240510.144/doom-modeline-segments.elc
 | 
0

A
emacs/elpa/doom-modeline-20240510.144/doom-modeline.el
 | 
262
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/doom-modeline-20240425.609/doom-modeline.elc -> emacs/elpa/doom-modeline-20240510.144/doom-modeline.elc
 | 
0

D
emacs/elpa/git-commit-20240415.1544/git-commit-pkg.el
 | 
18
------------------
D
emacs/elpa/git-commit-20240415.1544/git-commit.el
 | 
1290
-------------------------------------------------------------------------------
D
emacs/elpa/git-commit-20240415.1544/git-commit.elc
 | 
0

R
emacs/elpa/git-commit-20240415.1544/git-commit-autoloads.el -> emacs/elpa/git-commit-20240520.1135/git-commit-autoloads.el
 | 
0

A
emacs/elpa/git-commit-20240520.1135/git-commit-pkg.el
 | 
18
++++++++++++++++++
A
emacs/elpa/git-commit-20240520.1135/git-commit.el
 | 
1312
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/git-commit-20240520.1135/git-commit.elc
 | 
0

D
emacs/elpa/lsp-mode-20240427.2141/lsp-mode-autoloads.el
 | 
964
-------------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240427.2141/lsp-mode-pkg.el
 | 
21
---------------------
D
emacs/elpa/lsp-mode-20240427.2141/lsp-mode.el
 | 
9792
-------------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240427.2141/lsp-mode.elc
 | 
0

D
emacs/elpa/lsp-mode-20240427.2141/lsp-rust.el
 | 
1770
-------------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240427.2141/lsp-rust.elc
 | 
0

D
emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.el
 | 
192
-------------------------------------------------------------------------------
D
emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-actionscript.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-actionscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-actionscript.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-actionscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ada.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ada.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ada.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ada.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-angular.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-angular.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-angular.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-angular.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ansible.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ansible.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ansible.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ansible.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-asm.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-asm.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-asm.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-asm.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-astro.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-astro.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-astro.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-astro.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-autotools.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-autotools.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-autotools.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-autotools.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-awk.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-awk.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-awk.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-awk.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-bash.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-bash.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-bash.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-bash.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-beancount.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-beancount.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-beancount.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-beancount.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-bufls.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-bufls.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-bufls.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-bufls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-camel.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-camel.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-camel.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-camel.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-clangd.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-clangd.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-clangd.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-clangd.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-clojure.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-clojure.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-clojure.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-clojure.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cmake.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-cmake.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cmake.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-cmake.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cobol.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-cobol.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cobol.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-cobol.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-completion.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-completion.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-completion.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-completion.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-credo.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-credo.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-credo.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-credo.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-crystal.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-crystal.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-crystal.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-crystal.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-csharp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-csharp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-csharp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-csharp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-css.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-css.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-css.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-css.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cucumber.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-cucumber.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cucumber.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-cucumber.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cypher.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-cypher.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-cypher.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-cypher.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-d.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-d.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-d.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-d.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dhall.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-dhall.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dhall.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-dhall.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-diagnostics.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-diagnostics.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-diagnostics.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-diagnostics.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dired.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-dired.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dired.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-dired.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dockerfile.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-dockerfile.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dockerfile.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-dockerfile.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dot.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-dot.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-dot.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-dot.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-elixir.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-elixir.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-elixir.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-elixir.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-elm.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-elm.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-elm.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-elm.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-emmet.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-emmet.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-emmet.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-emmet.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-erlang.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-erlang.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-erlang.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-erlang.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-eslint.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-eslint.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-eslint.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-eslint.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-fortran.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-fortran.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-fortran.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-fortran.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-fsharp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-fsharp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-fsharp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-fsharp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-gdscript.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-gdscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-gdscript.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-gdscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-gleam.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-gleam.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-gleam.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-gleam.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-glsl.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-glsl.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-glsl.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-glsl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-go.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-go.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-go.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-go.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-golangci-lint.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-golangci-lint.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-golangci-lint.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-golangci-lint.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-graphql.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-graphql.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-graphql.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-graphql.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-groovy.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-groovy.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-groovy.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-groovy.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-hack.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-hack.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-hack.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-hack.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-haxe.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-haxe.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-haxe.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-haxe.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-headerline.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-headerline.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-headerline.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-headerline.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-html.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-html.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-html.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-html.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-hy.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-hy.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-hy.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-hy.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-icons.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-icons.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-icons.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-icons.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ido.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ido.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ido.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ido.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-idris.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-idris.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-idris.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-idris.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-iedit.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-iedit.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-iedit.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-iedit.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-javascript.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-javascript.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-javascript.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-javascript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-jq.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-jq.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-jq.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-jq.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-json.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-json.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-json.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-json.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-jsonnet.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-jsonnet.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-jsonnet.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-jsonnet.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-kotlin.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-kotlin.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-kotlin.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-kotlin.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lens.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-lens.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lens.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-lens.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lisp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-lisp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lisp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-lisp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lua.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-lua.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-lua.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-lua.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-magik.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-magik.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-magik.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-magik.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-markdown.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-markdown.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-markdown.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-markdown.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-marksman.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-marksman.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-marksman.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-marksman.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mdx.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-mdx.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mdx.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-mdx.elc
 | 
0

A
emacs/elpa/lsp-mode-20240514.1430/lsp-meson.el
 | 
126
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-meson.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mint.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-mint.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mint.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-mint.elc
 | 
0

A
emacs/elpa/lsp-mode-20240514.1430/lsp-mode-autoloads.el
 | 
974
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-mode-pkg.el
 | 
21
+++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-mode.el
 | 
9794
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-mode.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-modeline.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-modeline.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-modeline.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-modeline.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mojo.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-mojo.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-mojo.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-mojo.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-move.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-move.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-move.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-move.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nginx.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-nginx.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nginx.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-nginx.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nim.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-nim.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nim.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-nim.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nix.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-nix.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nix.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-nix.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nushell.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-nushell.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-nushell.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-nushell.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ocaml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ocaml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ocaml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ocaml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-openscad.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-openscad.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-openscad.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-openscad.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-perl.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-perl.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-perl.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-perl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-perlnavigator.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-perlnavigator.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-perlnavigator.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-perlnavigator.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-php.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-php.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-php.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-php.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pls.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-pls.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pls.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-pls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-prolog.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-prolog.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-prolog.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-prolog.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-protocol.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-protocol.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-protocol.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-protocol.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-purescript.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-purescript.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-purescript.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-purescript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pwsh.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-pwsh.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pwsh.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-pwsh.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pyls.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-pyls.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pyls.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-pyls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pylsp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-pylsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-pylsp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-pylsp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-qml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-qml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-qml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-qml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-r.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-r.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-r.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-r.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-racket.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-racket.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-racket.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-racket.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-remark.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-remark.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-remark.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-remark.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rf.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-rf.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rf.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-rf.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rpm-spec.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-rpm-spec.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rpm-spec.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-rpm-spec.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rubocop.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-rubocop.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-rubocop.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-rubocop.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-lsp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-lsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-lsp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-lsp.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-syntax-tree.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-syntax-tree.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-syntax-tree.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-syntax-tree.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruff-lsp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruff-lsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ruff-lsp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ruff-lsp.elc
 | 
0

A
emacs/elpa/lsp-mode-20240514.1430/lsp-rust.el
 | 
1770
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-rust.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-semantic-tokens.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-semantic-tokens.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-semantic-tokens.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-semantic-tokens.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-semgrep.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-semgrep.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-semgrep.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-semgrep.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-sml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-sml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-sml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-sml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-solargraph.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-solargraph.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-solargraph.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-solargraph.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-solidity.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-solidity.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-solidity.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-solidity.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-sorbet.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-sorbet.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-sorbet.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-sorbet.elc
 | 
0

A
emacs/elpa/lsp-mode-20240514.1430/lsp-sql.el
 | 
65
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-sql.elc
 | 
0

A
emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.el
 | 
192
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-steep.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-steep.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-steep.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-steep.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-svelte.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-svelte.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-svelte.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-svelte.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-terraform.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-terraform.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-terraform.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-terraform.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-tex.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-tex.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-tex.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-tex.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-tilt.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-tilt.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-tilt.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-tilt.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-toml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-toml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-toml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-toml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-trunk.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-trunk.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-trunk.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-trunk.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ttcn3.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-ttcn3.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-ttcn3.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-ttcn3.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-typeprof.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-typeprof.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-typeprof.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-typeprof.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-v.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-v.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-v.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-v.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vala.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-vala.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vala.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-vala.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-verilog.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-verilog.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-verilog.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-verilog.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vetur.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-vetur.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vetur.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-vetur.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vhdl.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-vhdl.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vhdl.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-vhdl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vimscript.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-vimscript.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-vimscript.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-vimscript.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-volar.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-volar.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-volar.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-volar.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-wgsl.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-wgsl.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-wgsl.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-wgsl.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-xml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-xml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-xml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-xml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-yaml.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-yaml.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-yaml.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-yaml.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-yang.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-yang.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-yang.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-yang.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-zig.el -> emacs/elpa/lsp-mode-20240514.1430/lsp-zig.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp-zig.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp-zig.elc
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp.el -> emacs/elpa/lsp-mode-20240514.1430/lsp.el
 | 
0

R
emacs/elpa/lsp-mode-20240427.2141/lsp.elc -> emacs/elpa/lsp-mode-20240514.1430/lsp.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/git-rebase.el
 | 
871
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-apply.el
 | 
861
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-apply.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-autoloads.el
 | 
2253
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-base.el
 | 
1280
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-base.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-bisect.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-blame.el
 | 
988
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-diff.el
 | 
3587
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-diff.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-extras.el
 | 
919
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-extras.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-git.el
 | 
2901
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-git.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-log.el
 | 
2017
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-log.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-merge.el
 | 
319
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-merge.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-mode.el
 | 
1437
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-mode.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-pkg.el
 | 
20
--------------------
D
emacs/elpa/magit-20240426.2118/magit-process.el
 | 
1291
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-process.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-push.el
 | 
377
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-reflog.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-refs.el
 | 
789
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-refs.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-sequence.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-stash.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-status.el
 | 
822
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-status.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-submodule.el
 | 
719
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-submodule.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit-tag.el
 | 
245
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-wip.el
 | 
476
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit-worktree.elc
 | 
0

D
emacs/elpa/magit-20240426.2118/magit.el
 | 
778
-------------------------------------------------------------------------------
D
emacs/elpa/magit-20240426.2118/magit.info
 | 
11596
-------------------------------------------------------------------------------
R
emacs/elpa/magit-20240426.2118/AUTHORS.md -> emacs/elpa/magit-20240514.1843/AUTHORS.md
 | 
0

R
emacs/elpa/magit-20240426.2118/LICENSE -> emacs/elpa/magit-20240514.1843/LICENSE
 | 
0

R
emacs/elpa/magit-20240426.2118/dir -> emacs/elpa/magit-20240514.1843/dir
 | 
0

A
emacs/elpa/magit-20240514.1843/git-rebase.el
 | 
873
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/git-rebase.elc -> emacs/elpa/magit-20240514.1843/git-rebase.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-apply.el
 | 
856
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-apply.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-autoloads.el
 | 
2244
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit-autorevert.el -> emacs/elpa/magit-20240514.1843/magit-autorevert.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-autorevert.elc -> emacs/elpa/magit-20240514.1843/magit-autorevert.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-base.el
 | 
1264
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-base.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-bisect.el -> emacs/elpa/magit-20240514.1843/magit-bisect.el
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-bisect.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-blame.el
 | 
988
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit-blame.elc -> emacs/elpa/magit-20240514.1843/magit-blame.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-bookmark.el -> emacs/elpa/magit-20240514.1843/magit-bookmark.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-bookmark.elc -> emacs/elpa/magit-20240514.1843/magit-bookmark.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-branch.el -> emacs/elpa/magit-20240514.1843/magit-branch.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-branch.elc -> emacs/elpa/magit-20240514.1843/magit-branch.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-bundle.el -> emacs/elpa/magit-20240514.1843/magit-bundle.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-bundle.elc -> emacs/elpa/magit-20240514.1843/magit-bundle.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-clone.el -> emacs/elpa/magit-20240514.1843/magit-clone.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-clone.elc -> emacs/elpa/magit-20240514.1843/magit-clone.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-commit.el -> emacs/elpa/magit-20240514.1843/magit-commit.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-commit.elc -> emacs/elpa/magit-20240514.1843/magit-commit.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-core.el -> emacs/elpa/magit-20240514.1843/magit-core.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-core.elc -> emacs/elpa/magit-20240514.1843/magit-core.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-diff.el
 | 
3567
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-diff.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-ediff.el -> emacs/elpa/magit-20240514.1843/magit-ediff.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-ediff.elc -> emacs/elpa/magit-20240514.1843/magit-ediff.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-extras.el
 | 
910
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-extras.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-fetch.el -> emacs/elpa/magit-20240514.1843/magit-fetch.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-fetch.elc -> emacs/elpa/magit-20240514.1843/magit-fetch.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-files.el -> emacs/elpa/magit-20240514.1843/magit-files.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-files.elc -> emacs/elpa/magit-20240514.1843/magit-files.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-git.el
 | 
2903
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-git.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-gitignore.el -> emacs/elpa/magit-20240514.1843/magit-gitignore.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-gitignore.elc -> emacs/elpa/magit-20240514.1843/magit-gitignore.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-log.el
 | 
2009
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-log.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-margin.el -> emacs/elpa/magit-20240514.1843/magit-margin.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-margin.elc -> emacs/elpa/magit-20240514.1843/magit-margin.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-merge.el
 | 
315
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-merge.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-mode.el
 | 
1467
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-mode.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-notes.el -> emacs/elpa/magit-20240514.1843/magit-notes.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-notes.elc -> emacs/elpa/magit-20240514.1843/magit-notes.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-patch.el -> emacs/elpa/magit-20240514.1843/magit-patch.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-patch.elc -> emacs/elpa/magit-20240514.1843/magit-patch.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-pkg.el
 | 
20
++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-process.el
 | 
1295
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-process.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-pull.el -> emacs/elpa/magit-20240514.1843/magit-pull.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-pull.elc -> emacs/elpa/magit-20240514.1843/magit-pull.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-push.el
 | 
377
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit-push.elc -> emacs/elpa/magit-20240514.1843/magit-push.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-reflog.el -> emacs/elpa/magit-20240514.1843/magit-reflog.el
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-reflog.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-refs.el
 | 
789
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-refs.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-remote.el -> emacs/elpa/magit-20240514.1843/magit-remote.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-remote.elc -> emacs/elpa/magit-20240514.1843/magit-remote.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-repos.el -> emacs/elpa/magit-20240514.1843/magit-repos.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-repos.elc -> emacs/elpa/magit-20240514.1843/magit-repos.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-reset.el -> emacs/elpa/magit-20240514.1843/magit-reset.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-reset.elc -> emacs/elpa/magit-20240514.1843/magit-reset.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-sequence.el -> emacs/elpa/magit-20240514.1843/magit-sequence.el
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-sequence.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-sparse-checkout.el -> emacs/elpa/magit-20240514.1843/magit-sparse-checkout.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-sparse-checkout.elc -> emacs/elpa/magit-20240514.1843/magit-sparse-checkout.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-stash.el -> emacs/elpa/magit-20240514.1843/magit-stash.el
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-stash.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-status.el
 | 
823
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-status.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-submodule.el
 | 
720
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-20240514.1843/magit-submodule.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-subtree.el -> emacs/elpa/magit-20240514.1843/magit-subtree.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-subtree.elc -> emacs/elpa/magit-20240514.1843/magit-subtree.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-tag.el
 | 
245
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit-tag.elc -> emacs/elpa/magit-20240514.1843/magit-tag.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-transient.el -> emacs/elpa/magit-20240514.1843/magit-transient.el
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-transient.elc -> emacs/elpa/magit-20240514.1843/magit-transient.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-wip.el
 | 
476
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit-wip.elc -> emacs/elpa/magit-20240514.1843/magit-wip.elc
 | 
0

R
emacs/elpa/magit-20240426.2118/magit-worktree.el -> emacs/elpa/magit-20240514.1843/magit-worktree.el
 | 
0

A
emacs/elpa/magit-20240514.1843/magit-worktree.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit.el
 | 
778
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/magit-20240426.2118/magit.elc -> emacs/elpa/magit-20240514.1843/magit.elc
 | 
0

A
emacs/elpa/magit-20240514.1843/magit.info
 | 
11594
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
D
emacs/elpa/magit-section-20240426.1325/magit-section-pkg.el
 | 
14
--------------
D
emacs/elpa/magit-section-20240426.1325/magit-section.el
 | 
2478
-------------------------------------------------------------------------------
D
emacs/elpa/magit-section-20240426.1325/magit-section.elc
 | 
0

R
emacs/elpa/magit-section-20240426.1325/dir -> emacs/elpa/magit-section-20240508.2349/dir
 | 
0

R
emacs/elpa/magit-section-20240426.1325/magit-section-autoloads.el -> emacs/elpa/magit-section-20240508.2349/magit-section-autoloads.el
 | 
0

A
emacs/elpa/magit-section-20240508.2349/magit-section-pkg.el
 | 
14
++++++++++++++
A
emacs/elpa/magit-section-20240508.2349/magit-section.el
 | 
2475
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/magit-section-20240508.2349/magit-section.elc
 | 
0

R
emacs/elpa/magit-section-20240426.1325/magit-section.info -> emacs/elpa/magit-section-20240508.2349/magit-section.info
 | 
0

D
emacs/elpa/markdown-mode-20240318.1307/markdown-mode-pkg.el
 | 
14
--------------
D
emacs/elpa/markdown-mode-20240318.1307/markdown-mode.el
 | 
10384
-------------------------------------------------------------------------------
D
emacs/elpa/markdown-mode-20240318.1307/markdown-mode.elc
 | 
0

R
emacs/elpa/markdown-mode-20240318.1307/markdown-mode-autoloads.el -> emacs/elpa/markdown-mode-20240501.1057/markdown-mode-autoloads.el
 | 
0

A
emacs/elpa/markdown-mode-20240501.1057/markdown-mode-pkg.el
 | 
14
++++++++++++++
A
emacs/elpa/markdown-mode-20240501.1057/markdown-mode.el
 | 
10381
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/markdown-mode-20240501.1057/markdown-mode.elc
 | 
0

D
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-pkg.el
 | 
14
--------------
D
emacs/elpa/nerd-icons-20240412.1831/nerd-icons.el
 | 
1308
-------------------------------------------------------------------------------
D
emacs/elpa/nerd-icons-20240412.1831/nerd-icons.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-codicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-codicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-codicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-codicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-devicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-devicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-devicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-devicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-faicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-faicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-faicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-faicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-flicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-flicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-flicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-flicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-ipsicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-ipsicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-ipsicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-ipsicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-mdicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-mdicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-mdicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-mdicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-octicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-octicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-octicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-octicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-pomicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-pomicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-pomicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-pomicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-powerline.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-powerline.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-powerline.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-powerline.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-sucicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-sucicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-sucicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-sucicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-wicon.el -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-wicon.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-wicon.elc -> emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-wicon.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-autoloads.el -> emacs/elpa/nerd-icons-20240520.1050/nerd-icons-autoloads.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-data.el -> emacs/elpa/nerd-icons-20240520.1050/nerd-icons-data.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-data.elc -> emacs/elpa/nerd-icons-20240520.1050/nerd-icons-data.elc
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-faces.el -> emacs/elpa/nerd-icons-20240520.1050/nerd-icons-faces.el
 | 
0

R
emacs/elpa/nerd-icons-20240412.1831/nerd-icons-faces.elc -> emacs/elpa/nerd-icons-20240520.1050/nerd-icons-faces.elc
 | 
0

A
emacs/elpa/nerd-icons-20240520.1050/nerd-icons-pkg.el
 | 
14
++++++++++++++
A
emacs/elpa/nerd-icons-20240520.1050/nerd-icons.el
 | 
1315
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/nerd-icons-20240520.1050/nerd-icons.elc
 | 
0

D
emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch-pkg.el
 | 
17
-----------------
D
emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch.el
 | 
145
-------------------------------------------------------------------------------
R
emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch-autoloads.el -> emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch-autoloads.el
 | 
0

A
emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch-pkg.el
 | 
17
+++++++++++++++++
A
emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch.el
 | 
145
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch.elc -> emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch.elc
 | 
0

D
emacs/elpa/pdf-tools-20240411.1703/epdfinfo
 | 
0

D
emacs/elpa/pdf-tools-20240411.1703/pdf-tools-pkg.el
 | 
16
----------------
D
emacs/elpa/pdf-tools-20240411.1703/pdf-view.el
 | 
1826
-------------------------------------------------------------------------------
D
emacs/elpa/pdf-tools-20240411.1703/pdf-view.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/README -> emacs/elpa/pdf-tools-20240429.407/README
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/Makefile -> emacs/elpa/pdf-tools-20240429.407/build/Makefile
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/.gitignore -> emacs/elpa/pdf-tools-20240429.407/build/server/.gitignore
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/Makefile.am -> emacs/elpa/pdf-tools-20240429.407/build/server/Makefile.am
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/autobuild -> emacs/elpa/pdf-tools-20240429.407/build/server/autobuild
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/autogen.sh -> emacs/elpa/pdf-tools-20240429.407/build/server/autogen.sh
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/configure.ac -> emacs/elpa/pdf-tools-20240429.407/build/server/configure.ac
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/epdfinfo.c -> emacs/elpa/pdf-tools-20240429.407/build/server/epdfinfo.c
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/epdfinfo.h -> emacs/elpa/pdf-tools-20240429.407/build/server/epdfinfo.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/poppler-versions -> emacs/elpa/pdf-tools-20240429.407/build/server/poppler-versions
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser.c -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser.c
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser.h -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_advanced.h -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_advanced.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_local.h -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_local.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_readme.txt -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_readme.txt
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_utils.c -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_utils.c
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_utils.h -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_utils.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_version.txt -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_version.txt
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_version.h -> emacs/elpa/pdf-tools-20240429.407/build/server/synctex_version.h
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/.gitignore -> emacs/elpa/pdf-tools-20240429.407/build/server/test/.gitignore
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/.gitignore -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/.gitignore
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/lib/run-tests -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/lib/run-tests
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/lib/yes-or-enter -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/lib/yes-or-enter
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/Dockerfile.common.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/Dockerfile.common.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/arch.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/arch.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/centos.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/centos.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-10.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-10.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-11.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-11.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-9.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-9.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-26.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-26.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-27.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-27.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-28.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-28.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-29.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-29.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-34.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-34.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-35.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-35.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-36.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-36.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/freebsd.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/freebsd.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/gentoo.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/gentoo.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/macos.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/macos.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/msys2.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/msys2.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/nixos.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/nixos.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/openbsd.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/openbsd.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/opensuse.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/opensuse.Dockerfile.in.FAILING
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-18.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-18.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-20.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-20.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-22.Dockerfile.in -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-22.Dockerfile.in
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/void.Dockerfile.in.FAILING -> emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/void.Dockerfile.in.FAILING
 | 
0

A
emacs/elpa/pdf-tools-20240429.407/epdfinfo
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-annot.el -> emacs/elpa/pdf-tools-20240429.407/pdf-annot.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-annot.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-annot.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-cache.el -> emacs/elpa/pdf-tools-20240429.407/pdf-cache.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-cache.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-cache.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-dev.el -> emacs/elpa/pdf-tools-20240429.407/pdf-dev.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-dev.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-dev.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-history.el -> emacs/elpa/pdf-tools-20240429.407/pdf-history.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-history.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-history.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-info.el -> emacs/elpa/pdf-tools-20240429.407/pdf-info.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-info.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-info.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-isearch.el -> emacs/elpa/pdf-tools-20240429.407/pdf-isearch.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-isearch.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-isearch.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-links.el -> emacs/elpa/pdf-tools-20240429.407/pdf-links.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-links.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-links.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-loader.el -> emacs/elpa/pdf-tools-20240429.407/pdf-loader.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-loader.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-loader.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-macs.el -> emacs/elpa/pdf-tools-20240429.407/pdf-macs.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-macs.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-macs.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-misc.el -> emacs/elpa/pdf-tools-20240429.407/pdf-misc.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-misc.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-misc.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-occur.el -> emacs/elpa/pdf-tools-20240429.407/pdf-occur.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-occur.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-occur.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-outline.el -> emacs/elpa/pdf-tools-20240429.407/pdf-outline.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-outline.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-outline.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-sync.el -> emacs/elpa/pdf-tools-20240429.407/pdf-sync.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-sync.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-sync.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-tools-autoloads.el -> emacs/elpa/pdf-tools-20240429.407/pdf-tools-autoloads.el
 | 
0

A
emacs/elpa/pdf-tools-20240429.407/pdf-tools-pkg.el
 | 
16
++++++++++++++++
R
emacs/elpa/pdf-tools-20240411.1703/pdf-tools.el -> emacs/elpa/pdf-tools-20240429.407/pdf-tools.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-tools.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-tools.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-util.el -> emacs/elpa/pdf-tools-20240429.407/pdf-util.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-util.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-util.elc
 | 
0

A
emacs/elpa/pdf-tools-20240429.407/pdf-view.el
 | 
1826
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/pdf-tools-20240429.407/pdf-view.elc
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-virtual.el -> emacs/elpa/pdf-tools-20240429.407/pdf-virtual.el
 | 
0

R
emacs/elpa/pdf-tools-20240411.1703/pdf-virtual.elc -> emacs/elpa/pdf-tools-20240429.407/pdf-virtual.elc
 | 
0

D
emacs/elpa/transient-20240421.1737/transient-pkg.el
 | 
16
----------------
D
emacs/elpa/transient-20240421.1737/transient.el
 | 
4490
-------------------------------------------------------------------------------
D
emacs/elpa/transient-20240421.1737/transient.elc
 | 
0

R
emacs/elpa/transient-20240421.1737/dir -> emacs/elpa/transient-20240509.1849/dir
 | 
0

R
emacs/elpa/transient-20240421.1737/gpl.info -> emacs/elpa/transient-20240509.1849/gpl.info
 | 
0

R
emacs/elpa/transient-20240421.1737/transient-autoloads.el -> emacs/elpa/transient-20240509.1849/transient-autoloads.el
 | 
0

A
emacs/elpa/transient-20240509.1849/transient-pkg.el
 | 
16
++++++++++++++++
A
emacs/elpa/transient-20240509.1849/transient.el
 | 
4503
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/transient-20240509.1849/transient.elc
 | 
0

R
emacs/elpa/transient-20240421.1737/transient.info -> emacs/elpa/transient-20240509.1849/transient.info
 | 
0

D
emacs/elpa/vertico-20240424.1959/vertico-pkg.el
 | 
15
---------------
R
emacs/elpa/vertico-20240424.1959/vertico-autoloads.el -> emacs/elpa/vertico-20240511.2047/vertico-autoloads.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-buffer.el -> emacs/elpa/vertico-20240511.2047/vertico-buffer.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-buffer.elc -> emacs/elpa/vertico-20240511.2047/vertico-buffer.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-directory.el -> emacs/elpa/vertico-20240511.2047/vertico-directory.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-directory.elc -> emacs/elpa/vertico-20240511.2047/vertico-directory.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-flat.el -> emacs/elpa/vertico-20240511.2047/vertico-flat.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-flat.elc -> emacs/elpa/vertico-20240511.2047/vertico-flat.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-grid.el -> emacs/elpa/vertico-20240511.2047/vertico-grid.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-grid.elc -> emacs/elpa/vertico-20240511.2047/vertico-grid.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-indexed.el -> emacs/elpa/vertico-20240511.2047/vertico-indexed.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-indexed.elc -> emacs/elpa/vertico-20240511.2047/vertico-indexed.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-mouse.el -> emacs/elpa/vertico-20240511.2047/vertico-mouse.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-mouse.elc -> emacs/elpa/vertico-20240511.2047/vertico-mouse.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-multiform.el -> emacs/elpa/vertico-20240511.2047/vertico-multiform.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-multiform.elc -> emacs/elpa/vertico-20240511.2047/vertico-multiform.elc
 | 
0

A
emacs/elpa/vertico-20240511.2047/vertico-pkg.el
 | 
15
+++++++++++++++
R
emacs/elpa/vertico-20240424.1959/vertico-quick.el -> emacs/elpa/vertico-20240511.2047/vertico-quick.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-quick.elc -> emacs/elpa/vertico-20240511.2047/vertico-quick.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-repeat.el -> emacs/elpa/vertico-20240511.2047/vertico-repeat.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-repeat.elc -> emacs/elpa/vertico-20240511.2047/vertico-repeat.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-reverse.el -> emacs/elpa/vertico-20240511.2047/vertico-reverse.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-reverse.elc -> emacs/elpa/vertico-20240511.2047/vertico-reverse.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-suspend.el -> emacs/elpa/vertico-20240511.2047/vertico-suspend.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-suspend.elc -> emacs/elpa/vertico-20240511.2047/vertico-suspend.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-unobtrusive.el -> emacs/elpa/vertico-20240511.2047/vertico-unobtrusive.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico-unobtrusive.elc -> emacs/elpa/vertico-20240511.2047/vertico-unobtrusive.elc
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico.el -> emacs/elpa/vertico-20240511.2047/vertico.el
 | 
0

R
emacs/elpa/vertico-20240424.1959/vertico.elc -> emacs/elpa/vertico-20240511.2047/vertico.elc
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeCache.txt
 | 
355
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeCCompiler.cmake
 | 
80
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeDetermineCompilerABI_C.bin
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeSystem.cmake
 | 
15
---------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/a.out
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeConfigureLog.yaml
 | 
261
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeDirectoryInformation.cmake
 | 
16
----------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeRuleHashes.txt
 | 
11
-----------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile.cmake
 | 
131
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile2
 | 
167
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/TargetDirectories.txt
 | 
5
-----
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.json
 | 
44
--------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.txt
 | 
13
-------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/build.make
 | 
146
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/build.make
 | 
87
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/DependInfo.cmake
 | 
25
-------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/build.make
 | 
143
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake
 | 
15
---------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o.d
 | 
43
-------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/flags.make
 | 
10
----------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/link.txt
 | 
1
-
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o.d
 | 
16
----------------
D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o
 | 
0

D
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d
 | 
67
-------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/Makefile
 | 
263
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/cmake_install.cmake
 | 
54
------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm
 | 
1
-
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt
 | 
15
---------------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
 | 
15
---------------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
 | 
7
-------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
 | 
73
-------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
 | 
292
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
 | 
22
----------------------
D
emacs/elpa/vterm-20240325.1551/vterm-module.h
 | 
169
-------------------------------------------------------------------------------
D
emacs/elpa/vterm-20240325.1551/vterm-module.so
 | 
0

D
emacs/elpa/vterm-20240325.1551/vterm-pkg.el
 | 
14
--------------
D
emacs/elpa/vterm-20240325.1551/vterm.elc
 | 
0

R
emacs/elpa/vterm-20240325.1551/CMakeLists.txt -> emacs/elpa/vterm-20240520.231/CMakeLists.txt
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeCache.txt
 | 
355
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeCCompiler.cmake
 | 
80
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeDetermineCompilerABI_C.bin
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeSystem.cmake
 | 
15
+++++++++++++++
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/CMakeCCompilerId.c -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/CMakeCCompilerId.c
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/a.out
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeConfigureLog.yaml
 | 
261
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeDirectoryInformation.cmake
 | 
16
++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeRuleHashes.txt
 | 
11
+++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile.cmake
 | 
131
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile2
 | 
167
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/TargetDirectories.txt
 | 
5
+++++
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/cmake.check_cache -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/cmake.check_cache
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm-complete -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm-complete
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/DependInfo.cmake -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/DependInfo.cmake
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.json
 | 
44
++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.txt
 | 
13
+++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/build.make
 | 
146
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/cmake_clean.cmake -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/cmake_clean.cmake
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/compiler_depend.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/compiler_depend.make
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/compiler_depend.ts -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/compiler_depend.ts
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/progress.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/progress.make
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/progress.marks -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/progress.marks
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/DependInfo.cmake -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/DependInfo.cmake
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/build.make
 | 
87
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/cmake_clean.cmake -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/cmake_clean.cmake
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/compiler_depend.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/compiler_depend.make
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/compiler_depend.ts -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/compiler_depend.ts
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/progress.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/progress.make
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/DependInfo.cmake
 | 
25
+++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/build.make
 | 
143
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake
 | 
15
+++++++++++++++
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/compiler_depend.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/compiler_depend.make
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/compiler_depend.ts -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/compiler_depend.ts
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/depend.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/depend.make
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o.d
 | 
43
+++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/flags.make
 | 
10
++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/link.txt
 | 
1
+
R
emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/progress.make -> emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/progress.make
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o.d
 | 
16
++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o
 | 
0

A
emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d
 | 
67
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/Makefile
 | 
263
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/cmake_install.cmake
 | 
54
++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm
 | 
1
+
R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-build -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-build
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-done -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-done
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-download -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-download
 | 
0

A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt
 | 
15
+++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
 | 
15
+++++++++++++++
R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-install -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-install
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch
 | 
0

R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt
 | 
0

A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
 | 
7
+++++++
R
emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-cfgcmd.txt -> emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-cfgcmd.txt
 | 
0

A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
 | 
73
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
 | 
292
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
 | 
22
++++++++++++++++++++++
R
emacs/elpa/vterm-20240325.1551/elisp.c -> emacs/elpa/vterm-20240520.231/elisp.c
 | 
0

R
emacs/elpa/vterm-20240325.1551/elisp.h -> emacs/elpa/vterm-20240520.231/elisp.h
 | 
0

R
emacs/elpa/vterm-20240325.1551/emacs-module.h -> emacs/elpa/vterm-20240520.231/emacs-module.h
 | 
0

R
emacs/elpa/vterm-20240325.1551/etc/emacs-vterm-bash.sh -> emacs/elpa/vterm-20240520.231/etc/emacs-vterm-bash.sh
 | 
0

R
emacs/elpa/vterm-20240325.1551/etc/emacs-vterm-zsh.sh -> emacs/elpa/vterm-20240520.231/etc/emacs-vterm-zsh.sh
 | 
0

R
emacs/elpa/vterm-20240325.1551/etc/emacs-vterm.fish -> emacs/elpa/vterm-20240520.231/etc/emacs-vterm.fish
 | 
0

R
emacs/elpa/vterm-20240325.1551/utf8.c -> emacs/elpa/vterm-20240520.231/utf8.c
 | 
0

R
emacs/elpa/vterm-20240325.1551/utf8.h -> emacs/elpa/vterm-20240520.231/utf8.h
 | 
0

R
emacs/elpa/vterm-20240325.1551/vterm-autoloads.el -> emacs/elpa/vterm-20240520.231/vterm-autoloads.el
 | 
0

R
emacs/elpa/vterm-20240325.1551/vterm-module.c -> emacs/elpa/vterm-20240520.231/vterm-module.c
 | 
0

A
emacs/elpa/vterm-20240520.231/vterm-module.h
 | 
171
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/vterm-20240520.231/vterm-module.so
 | 
0

A
emacs/elpa/vterm-20240520.231/vterm-pkg.el
 | 
14
++++++++++++++
R
emacs/elpa/vterm-20240325.1551/vterm.el -> emacs/elpa/vterm-20240520.231/vterm.el
 | 
0

A
emacs/elpa/vterm-20240520.231/vterm.elc
 | 
0

D
emacs/elpa/which-key-20240423.1320/which-key-pkg.el
 | 
11
-----------
D
emacs/elpa/which-key-20240423.1320/which-key.el
 | 
2830
-------------------------------------------------------------------------------
D
emacs/elpa/which-key-20240423.1320/which-key.elc
 | 
0

R
emacs/elpa/which-key-20240423.1320/which-key-autoloads.el -> emacs/elpa/which-key-20240501.1251/which-key-autoloads.el
 | 
0

A
emacs/elpa/which-key-20240501.1251/which-key-pkg.el
 | 
11
+++++++++++
A
emacs/elpa/which-key-20240501.1251/which-key.el
 | 
2810
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
emacs/elpa/which-key-20240501.1251/which-key.elc
 | 
0

781 files changed, 95231 insertions(+), 94902 deletions(-)
diff --git a/emacs/elpa/archives/gnu/archive-contents b/emacs/elpa/archives/gnu/archive-contents
@@ -206,14 +206,14 @@
 	   ("John Wiegley" . "jwiegley@gmail.com"))
 	  (:commit . "00e07e060218fbd1e16faaf10116c03b12e62580"))])
  (auctex .
-	 [(14 0 4)
+	 [(14 0 5)
 	  ((emacs
 	    (27 1)))
 	  "Integrated environment for *TeX*" tar
 	  ((:url . "https://www.gnu.org/software/auctex/")
 	   (:keywords "tex" "latex" "texinfo" "context" "doctex" "preview-latex")
 	   (:maintainer nil . "auctex-devel@gnu.org")
-	   (:commit . "44d54236056fccc32a0b26d6df2ceda5716b7df1"))])
+	   (:commit . "73edb3731e4bdbe3760fb4c12f94ae1aa075458f"))])
  (aumix-mode .
 	     [(7)
 	      nil "run the aumix program in a buffer" tar
@@ -297,7 +297,7 @@
 	    ("Artur Malabarba" . "emacs@endlessparentheses.com"))
 	   (:commit . "0cf8b60f62876f3e75653a5fb30d5d5cdd74c586"))])
  (beframe .
-	  [(1 0 1)
+	  [(1 1 0)
 	   ((emacs
 	     (28 1)))
 	   "Isolate buffers per frame" tar
@@ -305,7 +305,7 @@
 	    (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
 	    (:authors
 	     ("Protesilaos Stavrou" . "info@protesilaos.com"))
-	    (:commit . "e911ab388d01aba00efc0ed7148f4e955c46f866"))])
+	    (:commit . "f5ff228db2f1afaf5ee19ab9c933ba1b3774396c"))])
  (bicep-ts-mode .
 		[(0 1 3)
 		 nil "tree-sitter support for Bicep" tar
@@ -376,7 +376,7 @@
 	  ("Amy Grinn" . "grinn.amy@gmail.com"))
 	 (:commit . "c65a353e01610633efe20d861393a5d9605bc59d"))])
  (boxy-headings .
-		[(2 1 5)
+		[(2 1 6)
 		 ((emacs
 		   (26 1))
 		  (boxy
@@ -389,7 +389,7 @@
 		  (:maintainer "Amy Grinn" . "grinn.amy@gmail.com")
 		  (:authors
 		   ("Amy Grinn" . "grinn.amy@gmail.com"))
-		  (:commit . "08e3bb8b9cb042446ac1c210340d0dbd86c3ec1b"))])
+		  (:commit . "d38a3598753d2c36c4a47b9c4b39123554d58106"))])
  (breadcrumb .
 	     [(1 0 1)
 	      ((emacs
@@ -442,7 +442,7 @@
 		   ("Clemens Radermacher" . "clemera@posteo.net"))
 		  (:commit . "c4a1c745123b86c15ba7bb4858255b5252e8440a"))])
  (bufferlo .
-	   [(0 6)
+	   [(0 8)
 	    ((emacs
 	      (27 1)))
 	    "Manage frame/tab-local buffer lists" tar
@@ -451,7 +451,7 @@
 	     (:maintainer "Florian Rommel" . "mail@florommel.de")
 	     (:authors
 	      ("Florian Rommel" . "mail@florommel.de"))
-	     (:commit . "90ba743101424b7dd98dc773aedcfc3ee08df05a"))])
+	     (:commit . "44f0ca8ef39f201ec929bd68462cb66ff6b442b4"))])
  (bug-hunter .
 	     [(1 3 1)
 	      ((seq
@@ -682,7 +682,7 @@
 	    ("Daniel Mendler" . "mail@daniel-mendler.de"))
 	   (:commit . "8d4e8a366681def88751f5e9975738ecd3180deb"))])
  (consult .
-	  [(1 5)
+	  [(1 6)
 	   ((emacs
 	     (27 1))
 	    (compat
@@ -691,7 +691,21 @@
 	   ((:url . "https://github.com/minad/consult")
 	    (:keywords "matching" "files" "completion")
 	    (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de")
-	    (:commit . "d8888bb67f881a3c4855c9ce7224de18a7dc3901"))])
+	    (:commit . "6eba1a3fa8e13681091a30b2490a03bdce5f243a"))])
+ (consult-denote .
+		 [(0 0 0)
+		  ((emacs
+		    (28 1))
+		   (denote
+		    (2 3 0))
+		   (consult
+		    (1 4)))
+		  "Use Consult in tandem with Denote" tar
+		  ((:url . "https://github.com/protesilaos/consult-denote")
+		   (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
+		   (:authors
+		    ("Protesilaos Stavrou" . "info@protesilaos.com"))
+		   (:commit . "f605131c9add9128eeaf7adb359ba11a66a394e3"))])
  (consult-hoogle .
 		 [(0 2 1)
 		  ((emacs
@@ -853,7 +867,7 @@
 		 (:url . "https://elpa.gnu.org/packages/cycle-quotes.html")
 		 (:commit . "836b19b39651419876e65cdb1a91e3eef83cc4e7"))])
  (dape .
-       [(0 10 0)
+       [(0 11 1)
 	((emacs
 	  (29 1))
 	 (jsonrpc
@@ -861,7 +875,7 @@
 	"Debug Adapter Protocol for Emacs" tar
 	((:url . "https://github.com/svaante/dape")
 	 (:maintainer "Daniel Pettersson" . "daniel@dpettersson.net")
-	 (:commit . "a5c9d468c1e49e533f1146980fa86488bbe3a54e"))])
+	 (:commit . "957d460f3560d9bea572b9ab4fa15fdd9ea2acb1"))])
  (darkroom .
 	   [(0 3)
 	    ((cl-lib
@@ -1061,16 +1075,16 @@
 		    ("Clemens Radermacher" . "clemera@posteo.net"))
 		   (:commit . "bd8556eef10e57b175406c117f18e1953422c803"))])
  (dired-preview .
-		[(0 1 1)
+		[(0 2 0)
 		 ((emacs
 		   (27 1)))
 		 "Automatically preview file at point in Dired" tar
-		 ((:url . "https://git.sr.ht/~protesilaos/dired-preview")
+		 ((:url . "https://github.com/protesilaos/dired-preview")
 		  (:keywords "files" "convenience")
 		  (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
 		  (:authors
 		   ("Protesilaos Stavrou" . "info@protesilaos.com"))
-		  (:commit . "63f6d9a2daff031554bf3321d00a8a361e98bc01"))])
+		  (:commit . "2f0a4055f575bdecd93798155f44d935a4f2cb6b"))])
  (disk-usage .
 	     [(1 3 3)
 	      ((emacs
@@ -1134,7 +1148,7 @@
 	    (:url . "https://elpa.gnu.org/packages/docbook.html")
 	    (:commit . "a59f87c0dc04bcfcf9f55a124658c2e7a585dbd2"))])
  (drepl .
-	[(0 2)
+	[(0 3)
 	 ((emacs
 	   (29 1))
 	  (comint-mime
@@ -1145,7 +1159,7 @@
 	  (:maintainer "Augusto Stoffel" . "arstoffel@gmail.com")
 	  (:authors
 	   ("Augusto Stoffel" . "arstoffel@gmail.com"))
-	  (:commit . "fc0b28b8b281899c2f00461bf9e83caf13330b54"))])
+	  (:commit . "07c4503763b5880f163b417194d580677f37a819"))])
  (dts-mode .
 	   [(1 0)
 	    ((emacs
@@ -1226,7 +1240,7 @@
 	       ("Markus Triska" . "triska@metalevel.at"))
 	      (:commit . "cfcdf9e42821d246b7fbc84877aa4ecacc184a1c"))])
  (eev .
-      [(20240309)
+      [(20240513)
        ((emacs
 	 (25 1)))
        "Support for e-scripts (eepitch blocks, elisp hyperlinks, etc)" tar
@@ -1235,7 +1249,7 @@
 	(:maintainer "Eduardo Ochs" . "eduardoochs@gmail.com")
 	(:authors
 	 ("Eduardo Ochs" . "eduardoochs@gmail.com"))
-	(:commit . "eda749bc689591a8f43a98e002d63b4ef2d4602d"))])
+	(:commit . "2bd9d441330aa782ecf645f931e62bd3f3f1ac64"))])
  (ef-themes .
 	    [(1 7 0)
 	     ((emacs
@@ -1307,16 +1321,16 @@
 		     (:url . "https://elpa.gnu.org/packages/electric-spacing.html")
 		     (:commit . "122ac5d08c3d3d91251752136abab9721d90e36c"))])
  (elisp-benchmarks .
-		   [(1 14)
+		   [(1 16)
 		    nil "elisp benchmarks collection" tar
 		    ((:keywords "languages" "lisp")
-		     (:maintainer "Andrea Corallo" . "akrl@sdf.org")
+		     (:maintainer "Andrea Corallo" . "acorallo@gnu.org")
 		     (:authors
-		      ("Andrea Corallo" . "akrl@sdf.org"))
+		      ("Andrea Corallo" . "acorallo@gnu.org"))
 		     (:url . "https://elpa.gnu.org/packages/elisp-benchmarks.html")
-		     (:commit . "70e38dbfa8f4acbdebfd0f417410d99f5031e05f"))])
+		     (:commit . "1a3d97954957a95a179806e0d49ca6d178b097af"))])
  (ellama .
-	 [(0 9 1)
+	 [(0 9 4)
 	  ((emacs
 	    (28 1))
 	   (llm
@@ -1329,7 +1343,7 @@
 	   (:maintainer "Sergey Kostyaev" . "sskostyaev@gmail.com")
 	   (:authors
 	    ("Sergey Kostyaev" . "sskostyaev@gmail.com"))
-	   (:commit . "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239"))])
+	   (:commit . "fddc1022b5e16e356d6f65ddac51bd2ccf25209c"))])
  (emacs-gc-stats .
 		 [(1 4 2)
 		  ((emacs
@@ -1898,13 +1912,13 @@
 	     (:url . "https://elpa.gnu.org/packages/greenbar.html")
 	     (:commit . "9526f29d073c533c3e54f0a7597eef1587ffb99e"))])
  (gtags-mode .
-	     [(1 5)
+	     [(1 6)
 	      ((emacs
 		(28)))
 	      "GNU Global integration with xref, project and imenu." tar
 	      ((:url . "https://github.com/Ergus/gtags-mode")
 	       (:keywords "xref" "project" "imenu" "gtags" "global")
-	       (:commit . "627b2d458af9d72cc5bc638f133764e7a209333c"))])
+	       (:commit . "a4346a0d771442af39ac77895e5e22b4c72df9b3"))])
  (guess-language .
 		 [(0 0 1)
 		  ((cl-lib
@@ -2167,7 +2181,7 @@
 		(:url . "https://elpa.gnu.org/packages/jgraph-mode.html")
 		(:commit . "4e13f89fe8837b84d40b969e6a5431816180a747"))])
  (jinx .
-       [(1 6)
+       [(1 7)
 	((emacs
 	  (27 1))
 	 (compat
@@ -2178,7 +2192,7 @@
 	 (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de")
 	 (:authors
 	  ("Daniel Mendler" . "mail@daniel-mendler.de"))
-	 (:commit . "f4abad42cd0bdcff62ac325a644cb8faad186a4b"))])
+	 (:commit . "3c36f1eb31713869ffbdbf55971671efa4f01966"))])
  (jit-spell .
 	    [(0 4)
 	     ((emacs
@@ -2387,15 +2401,17 @@
 	    ("Adam Porter" . "adam@alphapapa.net"))
 	   (:commit . "61c511541af474027c012de7063ddfdb3f8cc780"))])
  (llm .
-      [(0 12 3)
+      [(0 15 0)
        ((emacs
-	 (28 1)))
+	 (28 1))
+	(plz
+	 (0 8)))
        "Interface to pluggable llm backends" tar
        ((:url . "https://github.com/ahyatt/llm")
 	(:maintainer "Andrew Hyatt" . "ahyatt@gmail.com")
 	(:authors
 	 ("Andrew Hyatt" . "ahyatt@gmail.com"))
-	(:commit . "17c47d761e01fd49df6e1a8c453329c141d9f47d"))])
+	(:commit . "ebb7b6e4cddfd33429440bdc7387a11aac20a153"))])
  (lmc .
       [(1 4)
        nil "Little Man Computer in Elisp" tar
@@ -2713,14 +2729,14 @@
 		(:maintainer "Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")
 		(:commit . "6c38e95b8e846aceb88398c682fd283052924556"))])
  (nano-modeline .
-		[(1 0 1)
+		[(1 1 0)
 		 ((emacs
 		   (27 1)))
 		 "N Λ N O modeline" tar
 		 ((:url . "https://github.com/rougier/nano-modeline")
 		  (:keywords "convenience" "mode-line" "header-line")
 		  (:maintainer "Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")
-		  (:commit . "a18780c277838983932623870752f0adddef0345"))])
+		  (:commit . "04676d57a1e602123a593836745a744d1b2028fb"))])
  (nano-theme .
 	     [(0 3 4)
 	      ((emacs
@@ -2772,16 +2788,16 @@
 		("John Heidemann" . "johnh@isi.edu"))
 	       (:commit . "2a25d79f7e5d9ab7298ba40e11e78d1f2ded06d2"))])
  (notmuch-indicator .
-		    [(1 1 0)
+		    [(1 2 0)
 		     ((emacs
 		       (27 1)))
 		     "Display mode line indicator with notmuch-count(1) output" tar
-		     ((:url . "https://git.sr.ht/~protesilaos/notmuch-indicator")
+		     ((:url . "https://github.com/protesilaos/notmuch-indicator")
 		      (:keywords "convenience" "mail")
-		      (:maintainer "notmuch-indicator Development" . "~protesilaos/general-issues@lists.sr.ht")
+		      (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
 		      (:authors
 		       ("Protesilaos Stavrou" . "info@protesilaos.com"))
-		      (:commit . "c50cf91ff137ef07db3b0ce4410fca7a3bc94452"))])
+		      (:commit . "7aa1da708aeb9f729e8e0a99ef65341b7344815e"))])
  (ntlm .
        [(2 1 0)
 	nil "NTLM (NT LanManager) authentication support" tar
@@ -2887,7 +2903,7 @@
 	       ("Omar Antolín Camarena" . "omar@matem.unam.mx"))
 	      (:commit . "3847f311077efa17951a786d2759f2639c5f43c8"))])
  (org .
-      [(9 6 28)
+      [(9 6 30)
        ((emacs
 	 (26 1)))
        "Outline-based notes management and organizer" tar
@@ -2896,7 +2912,7 @@
 	(:maintainer "Bastien Guerry" . "bzg@gnu.org")
 	(:authors
 	 ("Carsten Dominik" . "carsten.dominik@gmail.com"))
-	(:commit . "0e743d0bfca7eb9861795791b9d3b5f05b777723"))])
+	(:commit . "071c6e986c424d2e496be7d0815d6e9cd83ae4e6"))])
  (org-contacts .
 	       [(1 1)
 		((emacs
@@ -2963,7 +2979,7 @@
 		("Peter Münster" . "pm@a16n.net"))
 	       (:commit . "c08cf5b931960bc12eb782c1fe1ec82266cb4bc8"))])
  (org-real .
-	   [(1 0 8)
+	   [(1 0 9)
 	    ((emacs
 	      (26 1))
 	     (boxy
@@ -2976,7 +2992,7 @@
 	     (:maintainer "Amy Grinn" . "grinn.amy@gmail.com")
 	     (:authors
 	      ("Amy Grinn" . "grinn.amy@gmail.com"))
-	     (:commit . "8416364b9f48329dea23ae784e5f6c44de34664d"))])
+	     (:commit . "b6df63b9c8f19c32367b03791ca47410708a10e1"))])
  (org-remark .
 	     [(1 2 2)
 	      ((emacs
@@ -2991,7 +3007,7 @@
 		("Noboru Ota" . "me@nobiot.com"))
 	       (:commit . "b49ef0a0a0bd61c912567bcdcc201d4afe110a75"))])
  (org-transclusion .
-		   [(1 3 2)
+		   [(1 4 0)
 		    ((emacs
 		      (27 1))
 		     (org
@@ -3002,7 +3018,7 @@
 		     (:maintainer "Noboru Ota" . "me@nobiot.com")
 		     (:authors
 		      ("Noboru Ota" . "me@nobiot.com"))
-		     (:commit . "7f4ad67bf1944b814a8763d304d4d27325504eb4"))])
+		     (:commit . "e6e638710e90198070c9b07ebdaa345a79f74706"))])
  (org-translate .
 		[(0 1 4)
 		 ((emacs
@@ -3286,7 +3302,7 @@
 	    ("Protesilaos Stavrou" . "info@protesilaos.com"))
 	   (:commit . "f9d09afc97d08f90a6a462b9da86900e6b555a74"))])
  (pyim .
-       [(5 3 3)
+       [(5 3 4)
 	((emacs
 	  (27 1))
 	 (async
@@ -3300,7 +3316,7 @@
 	 (:authors
 	  ("Ye Wenbin" . "wenbinye@163.com")
 	  ("Feng Shu" . "tumashu@163.com"))
-	 (:commit . "64067b20ce0e964b1342b378180f24a1d4503797"))])
+	 (:commit . "f22c20f2e6af55b3a758defabe4c842fb94cde2b"))])
  (pyim-basedict .
 		[(0 5 4)
 		 nil "The default pinyin dict of pyim" tar
@@ -3818,7 +3834,7 @@
 	     ("Artur Malabarba" . "emacs@endlessparentheses.com"))
 	    (:commit . "fffe8d0b42b143a2e7df0470d9049fa57b6ecac5"))])
  (spacious-padding .
-		   [(0 4 1)
+		   [(0 5 0)
 		    ((emacs
 		      (28 1)))
 		    "Increase the padding/spacing of frames and windows" tar
@@ -3827,7 +3843,7 @@
 		     (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
 		     (:authors
 		      ("Protesilaos Stavrou" . "info@protesilaos.com"))
-		     (:commit . "21be66a8293292234a7e4624c35f6645a044f7fa"))])
+		     (:commit . "e48f3335f50217e40081631abacc40964150f3ab"))])
  (spinner .
 	  [(1 7 4)
 	   ((emacs
@@ -3919,15 +3935,15 @@
 	   (:url . "https://elpa.gnu.org/packages/stream.html")
 	   (:commit . "5c0ffd088fbc344aedb11cc76bd7c0b28f3bc43b"))])
  (substitute .
-	     [(0 2 1)
+	     [(0 3 0)
 	      ((emacs
 		(27 1)))
 	      "Efficiently replace targets in the buffer or context" tar
-	      ((:url . "https://git.sr.ht/~protesilaos/substitute")
-	       (:maintainer "Protesilaos Stavrou General Issues" . "~protesilaos/general-issues@lists.sr.ht")
+	      ((:url . "https://github.com/protesilaos/substitute")
+	       (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com")
 	       (:authors
 		("Protesilaos Stavrou" . "info@protesilaos.com"))
-	       (:commit . "f1eb36c9e14df99e7ce8918a0add8893b79108da"))])
+	       (:commit . "740e301165c39a0e7d4b86219e08f8647cab3706"))])
  (svg .
       [(1 1)
        ((emacs
@@ -4177,7 +4193,7 @@
 	      ("Trevor Edwin Pogue" . "trevor.pogue@gmail.com"))
 	     (:commit . "33c2a6f0a11d1d88cdb2065c5a897e33507f4c86"))])
  (track-changes .
-		[(1 1)
+		[(1 2)
 		 ((emacs
 		   (24)))
 		 "API to react to buffer modifications" tar
@@ -4185,7 +4201,7 @@
 		  (:authors
 		   ("Stefan Monnier" . "monnier@iro.umontreal.ca"))
 		  (:url . "https://elpa.gnu.org/packages/track-changes.html")
-		  (:commit . "523aca13a45159711d7d9d7561e69d38acdac12a"))])
+		  (:commit . "44036b32ba398cf284320285b60be35874b6eea5"))])
  (tramp .
 	[(2 6 3)
 	 ((emacs
@@ -4342,7 +4358,7 @@
 		   (:url . "https://elpa.gnu.org/packages/uniquify-files.html")
 		   (:commit . "1d76b4f0e283afaff2be053d85f8726ffc3abd6e"))])
  (urgrep .
-	 [(0 4 1)
+	 [(0 5 0)
 	  ((emacs
 	    (27 1))
 	   (compat
@@ -4352,7 +4368,7 @@
 	  "Universal recursive grep" tar
 	  ((:url . "https://github.com/jimporter/urgrep")
 	   (:keywords "grep" "search")
-	   (:commit . "8169f5b5646b606d1273e1230aaf827cdd44a770"))])
+	   (:commit . "df0bb61b3b99c9d1dabec42cb560a84230d20a4e"))])
  (url-http-ntlm .
 		[(2 0 5)
 		 ((cl-lib
@@ -4658,6 +4674,17 @@
 		     (:authors
 		      ("Daniel Semyonov" . "daniel@dsemy.com"))
 		     (:commit . "ad92c184ccc06f46b2caf001bc8201d983eca626"))])
+ (window-tool-bar .
+		  [(0 2)
+		   ((emacs
+		     (29 1)))
+		   "Add tool bars inside windows" tar
+		   ((:keywords "mouse")
+		    (:maintainer "Jared Finder" . "jared@finder.org")
+		    (:authors
+		     ("Jared Finder" . "jared@finder.org"))
+		    (:url . "https://elpa.gnu.org/packages/window-tool-bar.html")
+		    (:commit . "be03dda5b0fc55e989bfa707c73f1cc990e24c3b"))])
  (windower .
 	   [(0 0 1)
 	    ((emacs
@@ -4714,14 +4741,14 @@
 	    (:url . "https://elpa.gnu.org/packages/wpuzzle.html")
 	    (:commit . "9373cbc013b978b31e38822bfdcc9a7fc5e0ed99"))])
  (wrap-search .
-	      [(4 14 11)
+	      [(4 16 13)
 	       nil "wrapped, non-incremental search" tar
 	       ((:url . "https://dataswamp.org/~incal/emacs-init/wrap-search.el")
 		(:keywords "matching")
 		(:maintainer "Emanuel Berg" . "incal@dataswamp.org")
 		(:authors
 		 ("Emanuel Berg" . "incal@dataswamp.org"))
-		(:commit . "72c8273811b555645ff59d6dd435e6ca3913aae8"))])
+		(:commit . "d4f73decdf1c624bb2bb3e0bf2292bae4b660fde"))])
  (xclip .
 	[(1 11)
 	 nil "Copy&paste GUI clipboard from text terminal" tar
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-04-28T09:05:03+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-05-21T09:05:03+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
@@ -19,7 +19,6 @@
  (ac-alchemist . [(20150908 656) ((auto-complete (1 5 0)) (alchemist (1 5 0)) (cl-lib (0 5))) "auto-complete source for alchemist" tar ((:commit . "b1891c3d41aed83f61d78a609ea97be5cc2758d9") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-ac-alchemist"))])
  (ac-c-headers . [(20200816 1007) ((auto-complete (1 3 1))) "auto-complete source for C headers" tar ((:commit . "67e1e86a48c9bed57bc7ce5ce2553ad203f5752e") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://zk-phi.gitub.io/"))])
  (ac-capf . [(20151101 217) ((auto-complete (1 4)) (cl-lib (0 5))) "auto-complete source with completion-at-point" tar ((:commit . "17571dba0a8f98111f2ab758e9bea285b263781b") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-ac-capf"))])
- (ac-cider . [(20161006 719) ((cider (0 8 0)) (auto-complete (1 4)) (cl-lib (0 3))) "Clojure auto-complete sources using CIDER" tar ((:commit . "d8670939bbf88079263d5ace2b8bc04cf325be36") (:authors ("Alex Yakushev" . "alex@bytopia.org") ("Steve Purcell" . "steve@sanityinc.com") ("Sam Aaron" . "samaaron@gmail.com")) (:maintainers ("Alex Yakushev" . "alex@bytopia.org")) (:maintainer "Alex Yakushev" . "alex@bytopia.org") (:keywords "languages" "clojure" "nrepl" "cider" "compliment") (:url . "https://github.com/clojure-emacs/ac-cider"))])
  (ac-clang . [(20180710 546) ((emacs (24)) (cl-lib (0 5)) (auto-complete (1 4 0)) (pos-tip (0 4 6)) (yasnippet (0 8 0))) "Auto Completion source by libclang for GNU Emacs" tar ((:commit . "3294b968eb1a8317049190940193f9da47c085ef") (:authors ("yaruopooner [https://github.com/yaruopooner]")) (:maintainers ("yaruopooner [https://github.com/yaruopooner]")) (:maintainer "yaruopooner [https://github.com/yaruopooner]") (:keywords "completion" "convenience" "intellisense") (:url . "https://github.com/yaruopooner/ac-clang"))])
  (ac-dcd . [(20210428 1556) ((auto-complete (1 3 1)) (flycheck-dmd-dub (0 7))) "Auto Completion source for dcd for GNU Emacs" tar ((:commit . "56d9817159acdebdbb3d5499c7e9379d29af0cd4") (:authors (nil . "<atila.neves@gmail.com>")) (:maintainers (nil . "<atila.neves@gmail.com>")) (:maintainer nil . "<atila.neves@gmail.com>") (:keywords "languages") (:url . "http://github.com/atilaneves/ac-dcd"))])
  (ac-emacs-eclim . [(20180911 1121) ((eclim (0 3)) (auto-complete (1 5))) "auto-complete source for eclim" tar ((:commit . "edff7e0e30c87036710d88fb0b7a4644750858e8"))])
@@ -64,7 +63,7 @@
  (acme-theme . [(20210430 302) nil "A color theme based on Acme & Sam from Plan 9" tar ((:commit . "ae8788b5851ea353fbb80ab586a3bbd5dc8e91aa") (:authors ("Ian Y.E. Pan")) (:maintainers ("Ian Y.E. Pan")) (:maintainer "Ian Y.E. Pan") (:url . "https://github.com/ianpan870102/acme-emacs-theme"))])
  (actionscript-mode . [(20180527 1701) nil "A simple mode for editing Actionscript 3 files" tar ((:commit . "65abd58e198458a8e46748c5962c41d80d60c4ea") (:authors ("Austin Haas")) (:maintainers ("Austin Haas")) (:maintainer "Austin Haas") (:keywords "language" "modes"))])
  (activity-watch-mode . [(20240313 754) ((emacs (25)) (request (0)) (json (0)) (cl-lib (0))) "Automatic time tracking extension." tar ((:commit . "19aed6ca81a3b1e549f47867c924d180d8536791") (:authors ("Gabor Torok <gabor@20y.hu>, Alan Hamlett" . "alan@wakatime.com")) (:maintainers ("Paul d'Hubert" . "paul.dhubert@ya.ru")) (:maintainer "Paul d'Hubert" . "paul.dhubert@ya.ru") (:keywords "calendar" "comm") (:url . "https://github.com/pauldub/activity-watch-mode"))])
- (ada-ts-mode . [(20240426 256) ((emacs (29 1))) "Major mode for Ada using Tree-sitter" tar ((:commit . "a0c001fd768b062089127b09c838ca51b8214360") (:authors ("Troy Brown" . "brownts@troybrown.dev")) (:maintainers ("Troy Brown" . "brownts@troybrown.dev")) (:maintainer "Troy Brown" . "brownts@troybrown.dev") (:keywords "ada" "languages" "tree-sitter") (:url . "https://github.com/brownts/ada-ts-mode"))])
+ (ada-ts-mode . [(20240506 1140) ((emacs (29 1))) "Major mode for Ada using Tree-sitter" tar ((:commit . "3f83ab4c99cf13cf4693dde29eb1e950bbbb6595") (:authors ("Troy Brown" . "brownts@troybrown.dev")) (:maintainers ("Troy Brown" . "brownts@troybrown.dev")) (:maintainer "Troy Brown" . "brownts@troybrown.dev") (:keywords "ada" "languages" "tree-sitter") (:url . "https://github.com/brownts/ada-ts-mode"))])
  (adafruit-wisdom . [(20200217 306) ((emacs (25 1)) (request (0 3 1))) "Get/display adafruit.com quotes" tar ((:commit . "c4ae0db35d0be94f0e9c50977758224d7e00234a") (:authors ("Neil Okamoto" . "neil.okamoto+melpa@gmail.com")) (:maintainers ("Neil Okamoto" . "neil.okamoto+melpa@gmail.com")) (:maintainer "Neil Okamoto" . "neil.okamoto+melpa@gmail.com") (:keywords "games") (:url . "https://github.com/gonewest818/adafruit-wisdom.el"))])
  (add-hooks . [(20171217 123) nil "Functions for setting multiple hooks" tar ((:commit . "1845137703461fc44bd77cf24014ba58f19c369d") (:authors ("Nick McCurdy" . "nick@nickmccurdy.com")) (:maintainers ("Nick McCurdy" . "nick@nickmccurdy.com")) (:maintainer "Nick McCurdy" . "nick@nickmccurdy.com") (:keywords "lisp") (:url . "https://github.com/nickmccurdy/add-hooks"))])
  (add-node-modules-path . [(20230307 655) ((s (1 12 0))) "Add node_modules to your exec-path" tar ((:commit . "841e93dfed50448da66c89a977c9182bb18796a1") (:authors ("Neri Marschik" . "marschik_neri@cyberagent.co.jp")) (:maintainers ("Neri Marschik" . "marschik_neri@cyberagent.co.jp")) (:maintainer "Neri Marschik" . "marschik_neri@cyberagent.co.jp") (:keywords "javascript" "node" "node_modules" "eslint") (:url . "https://github.com/codesuki/add-node-modules-path"))])
@@ -119,7 +118,7 @@
  (ample-theme . [(20240426 1545) nil "Calm Dark Theme for Emacs" tar ((:commit . "39ac29cf9a1229bb076964335fbd71cfb52e498b") (:authors ("Jordon Biondo" . "jordonbiondo@gmail.com")) (:maintainers ("Jordon Biondo" . "jordonbiondo@gmail.com")) (:maintainer "Jordon Biondo" . "jordonbiondo@gmail.com") (:keywords "theme" "dark") (:url . "https://github.com/jordonbiondo/ample-theme"))])
  (ample-zen-theme . [(20150119 2154) nil "AmpleZen Theme for Emacs 24" tar ((:commit . "b277bb7abd4b6624e8d59f02474b79af50a007bd") (:authors ("Michael Wall")) (:maintainers ("Michael Wall")) (:maintainer "Michael Wall") (:keywords "theme" "dark" "emacs 24") (:url . "https://github.com/mjwall/ample-zen"))])
  (amread-mode . [(20230409 1018) ((emacs (24 3)) (cl-lib (0 6 1)) (pyim (5 2 8)) (hydra (0 15 0))) "A minor mode helper user speed-reading" tar ((:commit . "b8622ae7b05f27d6f84c4e5d724bc79163ba9ce3") (:keywords "wp") (:url . "https://repo.or.cz/amread-mode.git"))])
- (amsreftex . [(20240210 1109) ((emacs (25 1))) "Add amsrefs bibliography support for reftex" tar ((:commit . "d64705a7a252be2554b717a38252d8999b0c1504") (:authors ("Fran Burstall" . "fran.burstall@gmail.com")) (:maintainers ("Fran Burstall" . "fran.burstall@gmail.com")) (:maintainer "Fran Burstall" . "fran.burstall@gmail.com") (:keywords "tex") (:url . "https://github.com/franburstall/amsreftex"))])
+ (amsreftex . [(20240512 1746) ((emacs (25 1))) "Add amsrefs bibliography support for reftex" tar ((:commit . "c508b05536a04ee153a9947f025d24930c52209a") (:authors ("Fran Burstall" . "fran.burstall@gmail.com")) (:maintainers ("Fran Burstall" . "fran.burstall@gmail.com")) (:maintainer "Fran Burstall" . "fran.burstall@gmail.com") (:keywords "tex") (:url . "https://github.com/franburstall/amsreftex"))])
  (amx . [(20230413 1210) ((emacs (24 4)) (s (0))) "Alternative M-x with extra features." tar ((:commit . "1c2428d21e9d2ee8bee944b572a39ca8c91ca13b") (:authors ("Ryan C. Thompson" . "rct@thompsonclan.org") ("Cornelius Mika" . "cornelius.mika@gmail.com")) (:maintainers ("Ryan C. Thompson" . "rct@thompsonclan.org")) (:maintainer "Ryan C. Thompson" . "rct@thompsonclan.org") (:keywords "convenience" "usability" "completion") (:url . "http://github.com/DarwinAwardWinner/amx/"))])
  (anaconda-mode . [(20231123 1806) ((emacs (25 1)) (pythonic (0 1 0)) (dash (2 6 0)) (s (1 9)) (f (0 16 2))) "Code navigation, documentation lookup and completion for Python" tar ((:commit . "92a6295622df7fae563d6b599e2dc8640e940ddf") (:authors ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainers ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainer "Artem Malyshev" . "proofit404@gmail.com") (:keywords "convenience" "anaconda") (:url . "https://github.com/proofit404/anaconda-mode"))])
  (anakondo . [(20210221 1727) ((emacs (26 3))) "Adds clj-kondo based Clojure[Script] editing facilities" tar ((:commit . "16b0ba14d94a5d7e55655efc9e1d6d069a9306f2") (:authors ("Didier A." . "didibus@users.noreply.github.com")) (:maintainers ("Didier A." . "didibus@users.noreply.github.com")) (:maintainer "Didier A." . "didibus@users.noreply.github.com") (:keywords "clojure" "clojurescript" "cljc" "clj-kondo" "completion" "languages" "tools") (:url . "https://github.com/didibus/anakondo"))])
@@ -131,12 +130,12 @@
  (angular-mode . [(20151201 2127) nil "Major mode for Angular.js" tar ((:commit . "8720cde86af0f1859ccc8580571e8d0ad1c52cff") (:authors ("Rudolf Olah" . "omouse@gmail.com")) (:maintainers ("Rudolf Olah" . "omouse@gmail.com")) (:maintainer "Rudolf Olah" . "omouse@gmail.com") (:keywords "languages" "javascript") (:url . "https://github.com/omouse/angularjs-mode"))])
  (angular-snippets . [(20140514 523) ((s (1 4 0)) (dash (1 2 0))) "Yasnippets for AngularJS" tar ((:commit . "af5ae0a4a8603b040446c28afcf6ca01a8b4bd7b") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com") (:keywords "snippets"))])
  (anki-connect . [(20191123 1858) ((emacs (24 3))) "AnkiConnect API" tar ((:commit . "1324f0c248aa2c6e73d6cf93fad6119d699f7dae") (:authors ("DarkSun" . "lujun9972@gmail.com")) (:maintainers ("DarkSun" . "lujun9972@gmail.com")) (:maintainer "DarkSun" . "lujun9972@gmail.com") (:keywords "lisp" "anki") (:url . "https://github.com/lujun9972/anki-connect.el"))])
- (anki-editor . [(20190922 1223) ((emacs (25)) (request (0 3 0)) (dash (2 12 0))) "Minor mode for making Anki cards with Org" tar ((:commit . "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408") (:authors ("Lei Tan")) (:maintainers ("Lei Tan")) (:maintainer "Lei Tan") (:url . "https://github.com/louietan/anki-editor"))])
+ (anki-editor . [(20240514 1944) ((emacs (25 1))) "Minor mode for making Anki cards with Org" tar ((:commit . "32d81be1d8305c5ccde12c7d0b29845d4f831888") (:authors ("Lei Tan")) (:maintainers ("Lei Tan")) (:maintainer "Lei Tan") (:url . "https://github.com/anki-editor/anki-editor"))])
  (anki-editor-view . [(20230807 806) ((emacs (29 1))) "Open anki-editor notes from Anki" tar ((:commit . "6ad8c6be4f44de0c33eab012e507320b732d4800") (:authors ("Valentin Herrmann" . "me@valentin-herrmann.de")) (:maintainers ("Valentin Herrmann" . "me@valentin-herrmann.de")) (:maintainer "Valentin Herrmann" . "me@valentin-herrmann.de") (:url . "https://gitlab.com/vherrmann/anki-editor-view"))])
  (anki-mode . [(20201223 719) ((emacs (24 4)) (dash (2 12 0)) (markdown-mode (2 2)) (s (1 11 0)) (request (0 3 0))) "A major mode for creating anki cards" tar ((:commit . "7cde5a68c9d0ef3811b0bd480274ea79909d2ddc") (:authors ("David Shepherd" . "davidshepherd7@gmail.com")) (:maintainers ("David Shepherd" . "davidshepherd7@gmail.com")) (:maintainer "David Shepherd" . "davidshepherd7@gmail.com") (:keywords "tools") (:url . "https://github.com/davidshepherd7/anki-mode"))])
  (anki-vocabulary . [(20200103 325) ((emacs (24 4)) (s (1 0)) (youdao-dictionary (0 4)) (anki-connect (1 0)) (s (1 10))) "Help you to create vocabulary cards in Anki" tar ((:commit . "863fe0219577f996ab126f1b7902db3c2cc59b2b") (:authors ("DarkSun" . "lujun9972@gmail.com")) (:maintainers ("DarkSun" . "lujun9972@gmail.com")) (:maintainer "DarkSun" . "lujun9972@gmail.com") (:keywords "lisp" "anki" "translator" "chinese") (:url . "https://github.com/lujun9972/anki-vocabulary.el"))])
- (annalist . [(20190929 207) ((emacs (24 4)) (cl-lib (0 5))) "Record and display information such as keybindings" tar ((:commit . "08df07e4530953a2c0b1aa553adcab37b7b614b0") (:authors ("Fox Kiester" . "noct@posteo.net")) (:maintainers ("Fox Kiester" . "noct@posteo.net")) (:maintainer "Fox Kiester" . "noct@posteo.net") (:keywords "convenience" "tools" "keybindings" "org") (:url . "https://github.com/noctuid/annalist.el"))])
- (annotate . [(20240326 1828) nil "annotate files without changing them" tar ((:commit . "3a27be3aa024d314da84c89cb86af58dbf3a2cb9") (:authors ("Bastian Bechtold")) (:maintainers ("Bastian Bechtold <bastibe.dev@mailbox.org>, cage" . "cage-dev@twistfold.it")) (:maintainer "Bastian Bechtold <bastibe.dev@mailbox.org>, cage" . "cage-dev@twistfold.it") (:url . "https://github.com/bastibe/annotate.el"))])
+ (annalist . [(20240501 1201) ((emacs (24 4)) (cl-lib (0 5))) "Record and display information such as keybindings" tar ((:commit . "e1ef5dad75fa502d761f70d9ddf1aeb1c423f41d") (:authors ("Fox Kiester" . "noct@posteo.net")) (:maintainers ("Fox Kiester" . "noct@posteo.net")) (:maintainer "Fox Kiester" . "noct@posteo.net") (:keywords "convenience" "tools" "keybindings" "org") (:url . "https://github.com/noctuid/annalist.el"))])
+ (annotate . [(20240509 1144) nil "annotate files without changing them" tar ((:commit . "bc82194ca5b10a05cab4169f6eacc5c18af61ec0") (:authors ("Bastian Bechtold")) (:maintainers ("Bastian Bechtold <bastibe.dev@mailbox.org>, cage" . "cage-dev@twistfold.it")) (:maintainer "Bastian Bechtold <bastibe.dev@mailbox.org>, cage" . "cage-dev@twistfold.it") (:url . "https://github.com/bastibe/annotate.el"))])
  (annotate-depth . [(20160520 2040) nil "Annotate buffer if indentation depth is beyond threshold." tar ((:commit . "fcb24fa36287250e40d195590c4ca4a8a696277b") (:authors ("Morten Slot Kristensen <msk AT nullpointer DOT dk>")) (:maintainers ("Morten Slot Kristensen <msk AT nullpointer DOT dk>")) (:maintainer "Morten Slot Kristensen <msk AT nullpointer DOT dk>") (:keywords "convenience") (:url . "https://github.com/netromdk/annotate-depth"))])
  (annotation . [(20200914 644) nil "Functions for annotating text with faces and help bubbles" tar ((:commit . "aa5e3a127bf17a8c80d947f3c286758a36dadc36") (:url . "https://github.com/agda/agda"))])
  (annoying-arrows-mode . [(20161024 646) ((cl-lib (0 5))) "Ring the bell if using arrows too much" tar ((:commit . "3c42e9807d7696da2da2a21b63beebf9cdb3f5dc") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainers ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com"))])
@@ -155,7 +154,7 @@
  (apache-mode . [(20210519 1931) nil "Major mode for editing Apache httpd configuration files" tar ((:commit . "f2c11aac2f5fc598123e04f4604bea248689a117") (:authors ("Karl Chen" . "quarl@nospam.quarl.org")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "languages" "faces") (:url . "https://github.com/emacs-php/apache-mode"))])
  (apdl-mode . [(20211023 1831) ((emacs (25 1))) "Major mode for the APDL programming language." tar ((:commit . "ba756eaa1d229c9bf6936fb8d2d4126ad073d488") (:authors ("H. Dieter Wilhelm" . "dieter@duenenhof-wilhelm.de")) (:maintainer "H. Dieter Wilhelm") (:keywords "languages" "convenience" "tools" "ansys" "apdl") (:url . "https://github.com/dieter-wilhelm/apdl-mode"))])
  (apel . [(20221214 1337) ((emacs (24 5))) "A Portable Emacs Library provides support for portable Emacs Lisp programs" tar ((:commit . "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb"))])
- (apheleia . [(20240413 2257) ((emacs (27))) "Reformat buffer stably" tar ((:commit . "66bf5195b4e922f23a9d573f2823daeb63e7ed5b") (:authors ("Radian LLC" . "contact+apheleia@radian.codes")) (:maintainers ("Radian LLC" . "contact+apheleia@radian.codes")) (:maintainer "Radian LLC" . "contact+apheleia@radian.codes") (:keywords "tools") (:url . "https://github.com/radian-software/apheleia"))])
+ (apheleia . [(20240517 2228) ((emacs (27))) "Reformat buffer stably" tar ((:commit . "61766b50b24fa16be519d77795dc63522e04dce8") (:authors ("Radian LLC" . "contact+apheleia@radian.codes")) (:maintainers ("Radian LLC" . "contact+apheleia@radian.codes")) (:maintainer "Radian LLC" . "contact+apheleia@radian.codes") (:keywords "tools") (:url . "https://github.com/radian-software/apheleia"))])
  (apib-mode . [(20200101 1017) ((markdown-mode (2 1))) "Major mode for API Blueprint files" tar ((:commit . "c6dd05201f6eb9295736d8668a79a7510d11159e") (:authors ("Vilibald Wanča" . "vilibald@wvi.cz")) (:maintainers ("Vilibald Wanča" . "vilibald@wvi.cz")) (:maintainer "Vilibald Wanča" . "vilibald@wvi.cz") (:keywords "tools" "api-blueprint") (:url . "http://github.com/w-vi/apib-mode"))])
  (apiwrap . [(20180602 2231) ((emacs (25))) "api-wrapping macros" tar ((:commit . "e4c9c57d6620a788ec8a715ff1bb50542edea3a6") (:authors ("Sean Allred" . "code@seanallred.com")) (:maintainers ("Sean Allred" . "code@seanallred.com")) (:maintainer "Sean Allred" . "code@seanallred.com") (:keywords "tools" "maint" "convenience") (:url . "https://github.com/vermiculus/apiwrap.el"))])
  (app-monochrome-themes . [(20240406 36) ((emacs (24 4))) "Low contrast monochrome themes" tar ((:commit . "9324ec430a5154853c1da711e1c9738d61f1135a") (:authors ("Aleksandr Petrosyan" . "appetrosan3@gmail.com")) (:maintainers ("Aleksandr Petrosyan" . "appetrosan3@gmail.com")) (:maintainer "Aleksandr Petrosyan" . "appetrosan3@gmail.com") (:url . "https://github.com/Greybeard-Entertainment/app-monochrome"))])
@@ -163,7 +162,7 @@
  (apples-mode . [(20110121 418) nil "Major mode for editing and executing AppleScript code" tar ((:commit . "83a9ab0d6ba82496e2f7df386909b1a55701fccb") (:authors ("tequilasunset" . "tequilasunset.mac@gmail.com")) (:maintainers ("tequilasunset" . "tequilasunset.mac@gmail.com")) (:maintainer "tequilasunset" . "tequilasunset.mac@gmail.com") (:keywords "applescript" "languages"))])
  (applescript-mode . [(20210802 1715) ((emacs (24 3))) "major mode for editing AppleScript source" tar ((:commit . "00c141bbff46c89a96598b605dee05dd1d89f624") (:authors ("sakito" . "sakito@users.sourceforge.jp")) (:maintainers ("sakito" . "sakito@users.sourceforge.jp")) (:maintainer "sakito" . "sakito@users.sourceforge.jp") (:keywords "languages" "tools") (:url . "https://github.com/emacsorphanage/applescript-mode"))])
  (aproject . [(20220410 541) nil "Basic project framework for Emacs" tar ((:commit . "13e176ee69851403bec6471c5cceed17b7912b6f") (:authors ("Vietor Liu" . "vietor.liu@gmail.com")) (:maintainers ("Vietor Liu" . "vietor.liu@gmail.com")) (:maintainer "Vietor Liu" . "vietor.liu@gmail.com") (:keywords "environment" "project") (:url . "https://github.com/vietor/aproject"))])
- (apropospriate-theme . [(20230925 114) nil "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." tar ((:commit . "ac2e16d23528dbc4efe1844f54366b9392d20ae6") (:authors ("Justin Talbott" . "justin@waymondo.com")) (:maintainer "Justin Talbott" . "justin@waymondo.com") (:url . "http://github.com/waymondo/apropospriate-theme"))])
+ (apropospriate-theme . [(20240517 1823) nil "A colorful, low-contrast, light & dark theme set for Emacs with a fun name." tar ((:commit . "84ee370da4c19db8051761b1b64bbdc8e1c7dc73") (:authors ("Justin Talbott" . "justin@waymondo.com")) (:maintainer "Justin Talbott" . "justin@waymondo.com") (:url . "http://github.com/waymondo/apropospriate-theme"))])
  (apt-sources-list . [(20180527 1241) ((emacs (24 4))) "Mode for editing APT source.list files" tar ((:commit . "44112833b3fa7f4d7e43708e5996782e22bb2fa3") (:authors ("Dr. Rafael Sepúlveda" . "drs@gnulinux.org.mx")) (:maintainers ("Joe Wreschnig" . "joe.wreschnig@gmail.com")) (:maintainer "Joe Wreschnig" . "joe.wreschnig@gmail.com") (:url . "https://git.korewanetadesu.com/apt-sources-list.git"))])
  (aqi . [(20230530 1204) ((emacs (25 1)) (request (0 3)) (let-alist (0 0))) "Air quality data from the World Air Quality Index" tar ((:commit . "cbff3c6ce691a3a1d2f5636384e29d43f0e1d236") (:authors ("nik gaffney" . "nik@fo.am")) (:maintainers ("nik gaffney" . "nik@fo.am")) (:maintainer "nik gaffney" . "nik@fo.am") (:keywords "air quality" "aqi" "pollution" "weather" "data") (:url . "https://github.com/zzkt/aqi"))])
  (arch-packer . [(20170730 1321) ((emacs (25 1)) (s (1 11 0)) (async (1 9 2)) (dash (2 12 0))) "Arch Linux package management frontend" tar ((:commit . "940e96f7d357c6570b675a0f942181c787f1bfd7") (:authors ("Fritz Stelzer" . "brotzeitmacher@gmail.com")) (:maintainers ("Fritz Stelzer" . "brotzeitmacher@gmail.com")) (:maintainer "Fritz Stelzer" . "brotzeitmacher@gmail.com") (:url . "https://github.com/brotzeitmacher/arch-packer"))])
@@ -189,7 +188,7 @@
  (asx . [(20191024 1100) ((emacs (26 1))) "Ask StackExchange/StackOverflow" tar ((:commit . "5ca12cc51bb02b5926adf9a7976ba9ca08a1ea21") (:authors ("Alex Ragone" . "ragonedk@gmail.com")) (:maintainers ("Alex Ragone" . "ragonedk@gmail.com")) (:maintainer "Alex Ragone" . "ragonedk@gmail.com") (:keywords "convenience") (:url . "https://github.com/ragone/asx"))])
  (async . [(20240323 1912) ((emacs (24 4))) "Asynchronous processing in Emacs" tar ((:commit . "72b70b004505db2f06318fefd6b358704b9167d7") (:authors ("John Wiegley" . "jwiegley@gmail.com")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:keywords "async") (:url . "https://github.com/jwiegley/emacs-async"))])
  (async-await . [(20220827 437) ((emacs (25 1)) (promise (1 1)) (iter2 (0 9 10))) "Async/Await" tar ((:commit . "e0d15e8057ed7520100bc50c5552278292ebcb07") (:authors ("chuntaro" . "chuntaro@sakura-games.jp")) (:maintainers ("chuntaro" . "chuntaro@sakura-games.jp")) (:maintainer "chuntaro" . "chuntaro@sakura-games.jp") (:keywords "async" "await" "convenience") (:url . "https://github.com/chuntaro/emacs-async-await"))])
- (async-backup . [(20220131 1438) ((emacs (24 4))) "Backup on each save without freezing Emacs" tar ((:commit . "6ddb39fe77d66cdef48b87cb0d0554ad7d132308") (:authors ("contrapunctus" . "xmpp:contrapunctus@jabjab.de")) (:maintainers ("contrapunctus" . "xmpp:contrapunctus@jabjab.de")) (:maintainer "contrapunctus" . "xmpp:contrapunctus@jabjab.de") (:keywords "files") (:url . "https://tildegit.org/contrapunctus/async-backup"))])
+ (async-backup . [(20230412 1534) ((emacs (24 4))) "Backup on each save without freezing Emacs" tar ((:commit . "d07a7bd4a5c3332a8a585680d67925385c595927") (:authors ("contrapunctus" . "xmpp:contrapunctus@jabjab.de")) (:maintainers ("contrapunctus" . "xmpp:contrapunctus@jabjab.de")) (:maintainer "contrapunctus" . "xmpp:contrapunctus@jabjab.de") (:keywords "files") (:url . "https://codeberg.org/contrapunctus/async-backup"))])
  (async-job-queue . [(20230427 2122) ((async (1 4)) (emacs (25 1)) (queue (0 2))) "Dispatch queue of async jobs to a fixed number of slots" tar ((:commit . "eeafcce7f960305666b2a51aec55cc6333f6af1b") (:authors ("Onnie Winebarger")) (:maintainers ("Onnie Winebarger")) (:maintainer "Onnie Winebarger") (:keywords "extensions" "lisp") (:url . "https://github.com/owinebar/emacs-async-job-queue"))])
  (async-status . [(20230821 204) ((emacs (28 1)) (svg-lib (0 2 7)) (posframe (1 4 2))) "A package for indicator support" tar ((:commit . "d2f5becc9850c26aa71fb581f9fc389eac740f52") (:authors ("Jason Kim" . "sukbeom.kim@gmail.com")) (:maintainers ("Jason Kim" . "sukbeom.kim@gmail.com")) (:maintainer "Jason Kim" . "sukbeom.kim@gmail.com") (:keywords "tools" "async") (:url . "https://github.com/seokbeomkim/async-status"))])
  (asyncloop . [(20240407 1153) ((emacs (28))) "Non-blocking series of functions" tar ((:commit . "46e38388870b238221a4d96017874309aada7660") (:authors ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainers ("Martin Edström" . "meedstrom91@gmail.com")) (:maintainer "Martin Edström" . "meedstrom91@gmail.com") (:keywords "tools") (:url . "https://github.com/meedstrom/asyncloop"))])
@@ -200,7 +199,7 @@
  (atom-one-dark-theme . [(20210128 1640) nil "Atom One Dark color theme" tar ((:commit . "b34b62e85593812b55ee552a1cb0eecfb04767bb") (:authors ("Jonathan Chu" . "me@jonathanchu.is")) (:maintainers ("Jonathan Chu" . "me@jonathanchu.is")) (:maintainer "Jonathan Chu" . "me@jonathanchu.is") (:url . "https://github.com/jonathanchu/atom-one-dark-theme"))])
  (atomic-chrome . [(20230304 112) ((emacs (24 4)) (let-alist (1 0 4)) (websocket (1 4))) "Edit Chrome text area with Emacs using Atomic Chrome" tar ((:commit . "f1b077be7e414f457191d72dcf5eedb4371f9309") (:authors ("alpha22jp" . "alpha22jp@gmail.com")) (:maintainers ("alpha22jp" . "alpha22jp@gmail.com")) (:maintainer "alpha22jp" . "alpha22jp@gmail.com") (:keywords "chrome" "edit" "textarea") (:url . "https://github.com/alpha22jp/atomic-chrome"))])
  (attrap . [(20230810 808) ((dash (2 12 0)) (emacs (25 1)) (f (0 19 0)) (s (1 11 0))) "ATtempt To Repair At Point" tar ((:commit . "bb61a4bc3d85a76e807f1ecede17031b51c8caed") (:authors ("Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com")) (:maintainers ("Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com")) (:maintainer "Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com") (:keywords "programming" "tools") (:url . "https://github.com/jyp/attrap"))])
- (auctex-cluttex . [(20220730 1100) ((emacs (24 4)) (auctex (13 1))) "ClutTeX support for AUCTeX" tar ((:commit . "f4012ac86e612eac7662c62afd946e59b3b405bd") (:authors ("Masahiro Nakamura" . "tsuucat@icloud.com")) (:maintainers ("Masahiro Nakamura" . "tsuucat@icloud.com")) (:maintainer "Masahiro Nakamura" . "tsuucat@icloud.com") (:keywords "tex") (:url . "https://github.com/tsuu32/auctex-cluttex"))])
+ (auctex-cluttex . [(20240519 1303) ((emacs (24 4)) (auctex (13 1))) "ClutTeX support for AUCTeX" tar ((:commit . "1a940892dcbe3e4874d2d60db92de1cb34a1b773") (:authors ("Masahiro Nakamura" . "tsuucat@icloud.com")) (:maintainers ("Masahiro Nakamura" . "tsuucat@icloud.com")) (:maintainer "Masahiro Nakamura" . "tsuucat@icloud.com") (:keywords "tex") (:url . "https://github.com/tsuu32/auctex-cluttex"))])
  (auctex-latexmk . [(20221025 1219) ((auctex (11 87))) "Add LatexMk support to AUCTeX" tar ((:commit . "b00a95e6b34c94987fda5a57c20cfe2f064b1c7a") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com") (:keywords "tex") (:url . "https://github.com/tom-tan/auctex-latexmk/"))])
  (auctex-lua . [(20151121 1610) ((auctex (11 86)) (lua-mode (20130419))) "Lua editing support for AUCTeX" tar ((:commit . "799cd8ac10c96991bb63d9aa60528ae5d8c786b5") (:authors ("Sean Allred" . "seallred@smcm.edu")) (:maintainers ("Sean Allred" . "seallred@smcm.edu")) (:maintainer "Sean Allred" . "seallred@smcm.edu") (:keywords "latex" "lua") (:url . "http://github.com/vermiculus/auctex-lua"))])
  (audacious . [(20210917 51) ((helm (3 6 2)) (emacs (24 4))) "Emacs interface to control audacious" tar ((:commit . "65c37f12a5c774a0ae434beee27ff7737006dd2f") (:authors ("Hitoshi Uchida" . "hitoshi.uchida@gmail.com")) (:maintainers ("Hitoshi Uchida" . "hitoshi.uchida@gmail.com")) (:maintainer "Hitoshi Uchida" . "hitoshi.uchida@gmail.com") (:url . "https://github.com/shishimaru/audacious.el"))])
@@ -246,7 +245,7 @@
  (auto-virtualenvwrapper . [(20230317 1313) ((cl-lib (1 0)) (s (1 13 0)) (virtualenvwrapper (0))) "Lightweight auto activate python virtualenvs" tar ((:commit . "8cc2616af46d7e26c1d9ecea5fffd8974e5b1acb") (:authors ("Marcwebbie" . "marcwebbie@gmail.com") ("Robert Zaremba" . "robert-zaremba@scale-it.pl")) (:maintainers ("Marcwebbie" . "marcwebbie@gmail.com")) (:maintainer "Marcwebbie" . "marcwebbie@gmail.com") (:keywords "python" "virtualenv" "tools"))])
  (auto-yasnippet . [(20230208 331) ((yasnippet (0 14 0)) (emacs (25 1))) "Quickly create disposable yasnippets" tar ((:commit . "6a9e406d0d7f9dfd6dff7647f358cb05a0b1637e") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com") ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainers ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainer "Jason Milkins" . "jasonm23@gmail.com") (:url . "https://github.com/abo-abo/auto-yasnippet"))])
  (autobookmarks . [(20220509 1712) ((dash (2 10 0)) (cl-lib (0 5))) "Save recently visited files and buffers" tar ((:commit . "8acd6f182181e23257e01c1b5cf90b872507a74d") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:keywords "files"))])
- (autobuild . [(20230906 1629) ((emacs (26 1)) (selcand (0 0 1))) "Define and execute build rules and compilation pipelines" tar ((:commit . "593a5138ded2793bdc0ff5681bf7af2e2a50ca67") (:authors ("Ernesto Alfonso")) (:maintainers (nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")")) (:maintainer nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")") (:keywords "compile" "build" "pipeline" "autobuild" "extensions" "processes" "tools") (:url . "https://github.com/erjoalgo/autobuild"))])
+ (autobuild . [(20240430 1600) ((emacs (26 1)) (selcand (0 0 3))) "Define and execute build rules and compilation pipelines" tar ((:commit . "4760f6ea843d5d15c3fcf7cbf6b69153b61739fa") (:authors ("Ernesto Alfonso")) (:maintainers (nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")")) (:maintainer nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")") (:keywords "compile" "build" "pipeline" "autobuild" "extensions" "processes" "tools") (:url . "https://github.com/erjoalgo/autobuild"))])
  (autodisass-java-bytecode . [(20230907 1729) nil "Automatically disassemble Java bytecode" tar ((:commit . "02788145f5c70e9004c4eba5acffbb584fe7de37") (:authors ("George Balatsouras <gbalats(at)gmail(dot)com>")) (:maintainer "George Balatsouras <gbalats(at)gmail(dot)com>") (:keywords "convenience" "data" "files"))])
  (autodisass-llvm-bitcode . [(20150411 125) nil "Automatically disassemble LLVM bitcode" tar ((:commit . "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0") (:authors ("George Balatsouras <gbalats(at)gmail(dot)com>")) (:maintainer "George Balatsouras <gbalats(at)gmail(dot)com>") (:keywords "convenience" "data" "files"))])
  (autoscratch . [(20230612 719) ((emacs (24 1))) "Automatically switch scratch buffer mode" tar ((:commit . "c5cf26b41f86aeb9f8bc64da2fe484ece807ac19") (:authors ("T.v.Dein" . "tlinden@cpan.org")) (:maintainers ("T.v.Dein" . "tlinden@cpan.org")) (:maintainer "T.v.Dein" . "tlinden@cpan.org") (:keywords "convenience" "buffer" "scrach") (:url . "https://github.com/tlinden/autoscratch"))])
@@ -256,12 +255,12 @@
  (avandu . [(20221106 834) nil "Gateway to Tiny Tiny RSS" tar ((:commit . "f064cd62f878d945cc2f202cda9a1a82b39d9e22") (:authors ("Tom Willemse" . "tom@ryuslash.org")) (:maintainers ("Tom Willemse" . "tom@ryuslash.org")) (:maintainer "Tom Willemse" . "tom@ryuslash.org") (:keywords "net"))])
  (avk-emacs-themes . [(20230825 922) nil "Collection of avk themes" tar ((:commit . "abe6fd059e0a7e8fcf2eb95b16c3dfac5620b1e7") (:authors ("Alex V. Koval" . "alex@koval.kharkov.ua")) (:maintainer "Alex V. Koval" . "alex@koval.kharkov.ua") (:keywords "theme") (:url . "https://github.com/avkoval/avk-emacs-themes"))])
  (avy . [(20230420 404) ((emacs (24 1)) (cl-lib (0 5))) "Jump to arbitrary positions in visible text and select text quickly." tar ((:commit . "be612110cb116a38b8603df367942e2bb3d9bdbe") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "point" "location") (:url . "https://github.com/abo-abo/avy"))])
- (avy-embark-collect . [(20231208 459) ((emacs (25 1)) (embark (0 9)) (avy (0 5))) "Use avy to jump to Embark Collect entries" tar ((:commit . "47b0c75d4bf4f72a7af839667c877c80bd493cdb") (:authors ("Omar Antolín Camarena" . "omar@matem.unam.mx")) (:maintainers ("Omar Antolín Camarena" . "omar@matem.unam.mx")) (:maintainer "Omar Antolín Camarena" . "omar@matem.unam.mx") (:keywords "convenience") (:url . "https://github.com/oantolin/embark"))])
+ (avy-embark-collect . [(20240419 452) ((emacs (25 1)) (embark (0 9)) (avy (0 5))) "Use avy to jump to Embark Collect entries" tar ((:commit . "195add1f1ccd1059472c9df7334c97c4d155425e") (:authors ("Omar Antolín Camarena" . "omar@matem.unam.mx")) (:maintainers ("Omar Antolín Camarena" . "omar@matem.unam.mx")) (:maintainer "Omar Antolín Camarena" . "omar@matem.unam.mx") (:keywords "convenience") (:url . "https://github.com/oantolin/embark"))])
  (avy-flycheck . [(20160720 1500) ((emacs (24 1)) (flycheck (0 14)) (seq (1 11)) (avy (0 4 0))) "Jump to and fix syntax errors using `flycheck' with `avy' interface" tar ((:commit . "5522f3bbbed1801d9278ed696ec0cbba38352985") (:authors ("Xu Ma" . "magicdirac@gmail.com")) (:maintainers ("Xu Ma" . "magicdirac@gmail.com")) (:maintainer "Xu Ma" . "magicdirac@gmail.com") (:keywords "tools" "convenience" "avy" "flycheck") (:url . "https://github.com/magicdirac/avy-flycheck"))])
  (avy-menu . [(20230606 1519) ((emacs (24 4)) (avy (0 4 0))) "Library providing avy-powered popup menu" tar ((:commit . "e79d892afd974105a6b24e8985fef0c9a1b10b4c") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "convenience") (:url . "https://github.com/mrkkrp/avy-menu"))])
  (avy-migemo . [(20180716 1455) ((emacs (24 4)) (avy (0 4 0)) (migemo (1 9))) "avy with migemo" tar ((:commit . "922a6dd82c0bfa316b0fbb56a9d4dd4ffa5707e7") (:authors ("momomo5717")) (:maintainers ("momomo5717")) (:maintainer "momomo5717") (:keywords "avy" "migemo") (:url . "https://github.com/momomo5717/avy-migemo"))])
  (avy-zap . [(20190801 329) ((avy (0 2 0))) "Zap to char using `avy'" tar ((:commit . "7c8d1f40e43d03e2f6c1696bfa547526528ce8cb") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com") (:keywords "extensions") (:url . "https://github.com/cute-jumper/avy-zap"))])
- (awk-ts-mode . [(20231130 12) ((emacs (29 1))) "Major mode for awk using tree-sitter" tar ((:commit . "9cd2b2ad05d85e05be9da7275077697223d79878") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:keywords "awk" "languages" "tree-sitter") (:url . "https://github.com/nverno/awk-ts-mode"))])
+ (awk-ts-mode . [(20240517 1251) ((emacs (29 1))) "Major mode for awk using tree-sitter" tar ((:commit . "343d19c5b3c99f1a665d0c6bddb7b18278306b06") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:keywords "awk" "languages" "tree-sitter") (:url . "https://github.com/nverno/awk-ts-mode"))])
  (awk-yasnippets . [(20230515 1756) ((emacs (26 3)) (yasnippet (0 8 0))) "Yasnippets for AWK" tar ((:commit . "12e8e0b49878099bda5d3e4915cc3c738c87b95c") (:authors ("Adriano Martinez")) (:maintainers ("Adriano Martinez" . "uberkael@gmail.com")) (:maintainer "Adriano Martinez" . "uberkael@gmail.com") (:keywords "extensions") (:url . "https://github.com/uberkael/awk-yasnippets"))])
  (aws-ec2 . [(20221011 538) ((emacs (24 4)) (dash (2 12 1)) (tblui (0 1 0))) "Manage AWS EC2 instances" tar ((:commit . "7b500097ac3c2addbe1644f78595dc2ea4eb87c4") (:authors ("Yuki Inoue <inouetakahiroki _at_ gmail.com>")) (:maintainers ("Yuki Inoue <inouetakahiroki _at_ gmail.com>")) (:maintainer "Yuki Inoue <inouetakahiroki _at_ gmail.com>") (:url . "https://github.com/Yuki-Inoue/aws.el"))])
  (aws-snippets . [(20191203 1553) ((yasnippet (0 8 0))) "Yasnippets for AWS" tar ((:commit . "557d19a0bc486e0fddb597b2be5087769d9bd47e") (:keywords "snippets"))])
@@ -346,8 +345,8 @@
  (bind-map . [(20240308 2050) ((emacs (24 3))) "Bind personal keymaps in multiple locations" tar ((:commit . "d7b0e42b78f708669ec368ebbd1f503094ceee22") (:authors ("Justin Burkett" . "justin@burkett.cc")) (:maintainers ("Justin Burkett" . "justin@burkett.cc")) (:maintainer "Justin Burkett" . "justin@burkett.cc") (:url . "https://github.com/justbur/emacs-bind-map"))])
  (binder . [(20230729 350) ((emacs (24 4)) (seq (2 20))) "Global minor mode to facilitate multi-file writing projects" tar ((:commit . "859d89c00e21c83565ed2b45f8d7527b45b1292c") (:authors ("Paul W. Rankin" . "pwr@bydasein.com")) (:maintainers ("Paul W. Rankin" . "pwr@bydasein.com")) (:maintainer "Paul W. Rankin" . "pwr@bydasein.com") (:keywords "files" "outlines" "wp" "text") (:url . "https://github.com/rnkn/binder"))])
  (bing-dict . [(20200216 110) nil "Minimalists' English-Chinese Bing dictionary" tar ((:commit . "1d581aaa9622b34f8fb83af5579fa252aa24cfef") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com") (:keywords "extensions") (:url . "https://github.com/cute-jumper/bing-dict.el"))])
- (binky . [(20240428 352) ((emacs (29 1))) "Jump between points like a rabbit" tar ((:commit . "d5717053910f1d66f16c22a3d8834b43a507575e") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "convenience") (:url . "https://github.com/liuyinz/binky-mode"))])
- (biome . [(20240426 1407) ((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 ((:commit . "804a0576f5c87c167c61f00d037581688ab806be") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/biome"))])
+ (binky . [(20240519 732) ((emacs (29 1)) (dash (2 19 1))) "Jump between points like a rabbit" tar ((:commit . "f2fe74321f87dfe46421a7a7aaaec30b7f831059") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "convenience") (:url . "https://github.com/liuyinz/binky-mode"))])
+ (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 ((:commit . "6c5d786219741e10332304566d4a18db3eddae2b") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/biome"))])
  (biomejs-format . [(20240401 458) ((emacs (24 1))) "Minor mode to format JS code with Biome on file save" tar ((:commit . "cbfb8aac8bfab6fd893f1ccb4eb9efa29b1b3214") (:authors ("James Long and contributors")) (:maintainers ("Kanon Kakuno" . "yadex205@yadex205.com")) (:maintainer "Kanon Kakuno" . "yadex205@yadex205.com") (:keywords "convenience" "wp" "edit" "js") (:url . "https://github.com/yadex205/emacs-biomejs-format"))])
  (birds-of-paradise-plus-theme . [(20130419 2129) nil "A brown/orange light-on-dark theme for Emacs 24 (deftheme)." tar ((:commit . "bb9f9d4ef7f7872a388ec4eee1253069adcadb6f") (:authors ("Jim Myhrberg" . "contact@jimeh.me")) (:maintainers ("Jim Myhrberg" . "contact@jimeh.me")) (:maintainer "Jim Myhrberg" . "contact@jimeh.me") (:keywords "themes") (:url . "https://github.com/jimeh/birds-of-paradise-plus-theme.el"))])
  (bison-mode . [(20210527 717) nil "Major mode for editing bison, yacc and lex files." tar ((:commit . "4f2e20394a475931409618c1635e9c9f1cf07d9c") (:authors ("Eric Beuscher" . "beuscher@eecs.tulane.edu")) (:maintainers ("Eric Beuscher" . "beuscher@eecs.tulane.edu")) (:maintainer "Eric Beuscher" . "beuscher@eecs.tulane.edu") (:keywords "bison-mode" "yacc-mode"))])
@@ -359,7 +358,7 @@
  (blacken . [(20231129 654) ((emacs (25 2))) "Reformat python buffers using the \"black\" formatter" tar ((:commit . "a43695f9cb412df93ac8d38b55ab1515e86e217e") (:authors ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainers ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainer "Artem Malyshev" . "proofit404@gmail.com") (:keywords "convenience" "blacken") (:url . "https://github.com/proofit404/blacken"))])
  (blackjack . [(20230821 41) ((emacs (26 2))) "The game of Blackjack" tar ((:commit . "7f9072630a159b59a146346b5dae24ab8fb5f290") (:authors ("Greg Donald" . "gdonald@gmail.com")) (:maintainers ("Greg Donald" . "gdonald@gmail.com")) (:maintainer "Greg Donald" . "gdonald@gmail.com") (:keywords "card" "game" "games" "blackjack" "21") (:url . "https://github.com/gdonald/blackjack-el"))])
  (blackout . [(20220509 2350) ((emacs (26))) "Better mode lighter overriding" tar ((:commit . "7707211370f03f03a2f74df15f42ac24a1e99300") (:authors ("Radian LLC" . "contact+blackout@radian.codes")) (:maintainers ("Radian LLC" . "contact+blackout@radian.codes")) (:maintainer "Radian LLC" . "contact+blackout@radian.codes") (:keywords "extensions") (:url . "https://github.com/radian-software/blackout"))])
- (blamer . [(20240320 2028) ((emacs (27 1)) (posframe (1 1 7)) (async (1 9 8))) "Show git blame info about current line" tar ((:commit . "ab7d19c2ee54424d3ffc853982fe875ad47b6e7f") (:authors ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainers ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainer "Artur Yaroshenko" . "artawower@protonmail.com") (:url . "https://github.com/artawower/blamer.el"))])
+ (blamer . [(20240512 1514) ((emacs (27 1)) (posframe (1 1 7)) (async (1 9 8))) "Show git blame info about current line" tar ((:commit . "4cc2e6daaecf84c8dd00792f86724413423293a6") (:authors ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainers ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainer "Artur Yaroshenko" . "artawower@protonmail.com") (:url . "https://github.com/artawower/blamer.el"))])
  (blgrep . [(20150401 1416) ((clmemo (20140321 715))) "Block grep" tar ((:commit . "605beda210610a5829750a987f5fcebea97af546") (:authors ("Masayuki Ataka" . "masayuki.ataka@gmail.com")) (:maintainers ("Masayuki Ataka" . "masayuki.ataka@gmail.com")) (:maintainer "Masayuki Ataka" . "masayuki.ataka@gmail.com") (:keywords "tools" "convenience"))])
  (blimp . [(20180903 2240) ((emacs (25)) (eimp (1 4 0))) "Bustling Image Manipulation Package" tar ((:commit . "b048b037129b68674b99310bcc08fb96d44fdbb4") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "multimedia" "unix") (:url . "https://github.com/walseb/blimp"))])
  (bliss-theme . [(20170808 1307) ((emacs (24 0))) "an Emacs 24 theme based on Bliss (tmTheme)" tar ((:commit . "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf") (:authors ("Jason Milkins")) (:maintainers ("Jason Milkins")) (:maintainer "Jason Milkins") (:url . "https://github.com/emacsfodder/tmtheme-to-deftheme"))])
@@ -399,7 +398,7 @@
  (bracketed-paste . [(20160407 2348) ((emacs (24 3))) "bracketed paste mode support within emacs -nw" tar ((:commit . "843ce3bbb63d560face889e13a57a2f7543957d5") (:authors ("Takeshi Banse" . "takebi@laafc.net")) (:maintainers ("Takeshi Banse" . "takebi@laafc.net")) (:maintainer "Takeshi Banse" . "takebi@laafc.net") (:keywords "terminals"))])
  (brainfuck-mode . [(20150113 842) ((langdoc (20130601 1450))) "Brainfuck mode for Emacs" tar ((:commit . "36e69552bb3b97a4f888d362c59845651bd0d492") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com") (:keywords "brainfuck" "langdoc") (:url . "https://github.com/tom-tan/brainfuck-mode/"))])
  (brazilian-holidays . [(20220828 2348) ((emacs (26))) "Brazilian holidays" tar ((:commit . "03206ea673df49c91a8f924db799620713d86240") (:authors ("Jaguaraquem A. Reinaldo" . "jaguar.adler@gmail.com")) (:maintainers ("Jaguaraquem A. Reinaldo" . "jaguar.adler@gmail.com")) (:maintainer "Jaguaraquem A. Reinaldo" . "jaguar.adler@gmail.com") (:keywords "calendar" "holidays" "brazilian") (:url . "https://github.com/jadler/brazilian-holidays"))])
- (brec-mode . [(20240425 2224) ((emacs (24 3))) "A major mode for editing Breccian text" tar ((:commit . "fd8c536bb24cc58447213f8cada94f96ccf036dc") (:authors ("Michael Allan" . "mike@reluk.ca")) (:maintainers ("Michael Allan" . "mike@reluk.ca")) (:maintainer "Michael Allan" . "mike@reluk.ca") (:keywords "outlines" "wp") (:url . "http://reluk.ca/project/Breccia/Emacs/"))])
+ (brec-mode . [(20240507 504) ((emacs (24 3))) "A major mode for editing Breccian text" tar ((:commit . "dafb49308796f75db802e2d23596dfd3fb7e37b0") (:authors ("Michael Allan" . "mike@reluk.ca")) (:maintainers ("Michael Allan" . "mike@reluk.ca")) (:maintainer "Michael Allan" . "mike@reluk.ca") (:keywords "outlines" "wp") (:url . "http://reluk.ca/project/Breccia/Emacs/"))])
  (brf . [(20230803 2022) ((fringe-helper (0 1 1)) (emacs (24 3))) "Brf-mode provides features from the legendary editor Brief" tar ((:commit . "8875f5fcd173e220bbfa6bf9f8f09d721a29cd50") (:authors ("Mike Woolley" . "mike@bulsara.com")) (:maintainers ("Mike Woolley" . "mike@bulsara.com")) (:maintainer "Mike Woolley" . "mike@bulsara.com") (:keywords "brief" "crisp" "emulations") (:url . "https://bitbucket.org/MikeWoolley/brf-mode"))])
  (brightscript-mode . [(20220906 827) ((emacs (26 3))) "Major mode for editing Brightscript files" tar ((:commit . "025d6f5a70752c62a28d4f86c053a283b3898a49") (:authors ("Daniel Mircea" . "daniel@viseztrance.com")) (:maintainers (nil . "daniel@viseztrance.com")) (:maintainer nil . "daniel@viseztrance.com") (:keywords "languages") (:url . "https://github.com/viseztrance/brightscript-mode"))])
  (bril-mode . [(20240315 1157) ((emacs (27 1))) "Major mode for Bril text format" tar ((:commit . "da61316385e31973c462a1e8a3213327b34df3ff") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:keywords "languages" "bril") (:url . "https://github.com/nverno/bril-mode"))])
@@ -467,13 +466,13 @@
  (calfw-howm . [(20170704 4) nil "calendar view for howm" tar ((:commit . "bcfc0c546c3c58e1f635a9a29efdf56c9421a3ce") (:authors ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainers ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainer "SAKURAI Masashi <m.sakurai at kiwanami.net>") (:keywords "calendar"))])
  (calfw-ical . [(20170411 220) nil "calendar view for ical format" tar ((:commit . "c538d3746449b4f0e16b16aad3073d4f7379d805") (:authors ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainers ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainer "SAKURAI Masashi <m.sakurai at kiwanami.net>") (:keywords "calendar"))])
  (calfw-org . [(20170411 220) nil "calendar view for org-agenda" tar ((:commit . "c538d3746449b4f0e16b16aad3073d4f7379d805") (:authors ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainers ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainer "SAKURAI Masashi <m.sakurai at kiwanami.net>") (:keywords "calendar" "org"))])
- (calibredb . [(20240331 409) ((emacs (25 1)) (org (9 3)) (transient (0 1 0)) (s (1 12 0)) (dash (2 17 0)) (request (0 3 3)) (esxml (0 3 7))) "Yet another calibre client" tar ((:commit . "b526095e4b1c7866958fe53518eb897a8c87a19b") (:authors ("Damon Chan" . "elecming@gmail.com")) (:maintainers ("Damon Chan" . "elecming@gmail.com")) (:maintainer "Damon Chan" . "elecming@gmail.com") (:keywords "tools") (:url . "https://github.com/chenyanming/calibredb.el"))])
+ (calibredb . [(20240507 456) ((emacs (25 1)) (org (9 3)) (transient (0 1 0)) (s (1 12 0)) (dash (2 17 0)) (request (0 3 3)) (esxml (0 3 7))) "Yet another calibre client" tar ((:commit . "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85") (:authors ("Damon Chan" . "elecming@gmail.com")) (:maintainers ("Damon Chan" . "elecming@gmail.com")) (:maintainer "Damon Chan" . "elecming@gmail.com") (:keywords "tools") (:url . "https://github.com/chenyanming/calibredb.el"))])
  (call-graph . [(20230222 525) ((emacs (25 1)) (hierarchy (0 7 0)) (tree-mode (1 0 0)) (ivy (0 10 0)) (beacon (1 3 4))) "Generate call graph for c/c++ functions" tar ((:commit . "5fd5f3aad35e3561c253870e4d7fa34353b70b7b") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "programming" "convenience") (:url . "https://github.com/beacoder/call-graph"))])
  (calmer-forest-theme . [(20230302 2149) nil "Darkish theme with green/orange tint" tar ((:commit . "09fc50730ea386d3589863f8809e02e5bdd459cf") (:authors ("Artur Hefczyc, created 2003-04-18") ("David Caldwell" . "david@porkrind.org")) (:maintainers ("Artur Hefczyc, created 2003-04-18")) (:maintainer "Artur Hefczyc, created 2003-04-18") (:url . "https://github.com/caldwell/calmer-forest-theme"))])
  (camcorder . [(20190317 2138) ((emacs (24)) (names (20150000)) (cl-lib (0 5))) "Record screencasts in gif or other formats." tar ((:commit . "b11ca61491a27681bb3131b72b51c105fd996bed") (:authors ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainers ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainer "Artur Malabarba" . "bruce.connor.am@gmail.com") (:keywords "multimedia" "screencast") (:url . "http://github.com/Bruce-Connor/camcorder.el"))])
  (caml . [(20231011 328) ((emacs (24 4))) "Caml mode for GNU Emacs" tar ((:commit . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf") (:authors ("Jacques Garrigue" . "garrigue@kurims.kyoto-u.ac.jp") ("Ian T Zimmerman" . "itz@rahul.net") ("Damien Doligez" . "damien.doligez@inria.fr")) (:maintainers ("Christophe Troestler" . "Christophe.Troestler@umons.ac.be")) (:maintainer "Christophe Troestler" . "Christophe.Troestler@umons.ac.be") (:keywords "ocaml") (:url . "https://github.com/ocaml/caml-mode"))])
  (cangjie . [(20230219 1150) ((emacs (24 4)) (s (1 12 0)) (dash (2 14 1)) (f (0 2 0))) "Retrieve cangjie code for han characters" tar ((:commit . "d6882e15f47fdde37e9f739dde604d77d25f11db") (:keywords "convenience" "writing") (:url . "https://github.com/kisaragi-hiu/cangjie.el"))])
- (cape . [(20240411 2207) ((emacs (27 1)) (compat (29 1 4 4))) "Completion At Point Extensions" tar ((:commit . "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "abbrev" "convenience" "matching" "completion" "text") (:url . "https://github.com/minad/cape"))])
+ (cape . [(20240517 2216) ((emacs (27 1)) (compat (29 1 4 4))) "Completion At Point Extensions" tar ((:commit . "a71e5c96564163837810b96bd34322b42f6e4d9c") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "abbrev" "convenience" "matching" "completion" "text") (:url . "https://github.com/minad/cape"))])
  (capnp-mode . [(20210707 2310) nil "Major mode for editing Capn' Proto Files" tar ((:commit . "f7fccad7d737f77896211bec1173117497634143") (:authors ("Brian Taylor" . "el.wubo@gmail.com")) (:maintainers ("Brian Taylor" . "el.wubo@gmail.com")) (:maintainer "Brian Taylor" . "el.wubo@gmail.com") (:url . "https://github.com/capnproto/capnproto"))])
  (capture . [(20130828 1644) nil "screencasting with \"avconv\" or \"ffmpeg\"" tar ((:commit . "9140c207b48b3520a2f06674b3e1bee2fc92b80c") (:authors ("Sergey Pashinin <sergey at pashinin dot com>")) (:maintainers ("Sergey Pashinin <sergey at pashinin dot com>")) (:maintainer "Sergey Pashinin <sergey at pashinin dot com>"))])
  (carbon-now-sh . [(20220701 332) ((emacs (24 4))) "https://carbon.now.sh integration." tar ((:commit . "e66f2e43e288f35ad9075f5fc84d59ad348efc88") (:authors ("Vitalii Elenhaupt")) (:maintainers ("Vitalii Elenhaupt")) (:maintainer "Vitalii Elenhaupt") (:keywords "convenience") (:url . "https://github.com/veelenga/carbon-now-sh.el"))])
@@ -490,6 +489,7 @@
  (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 ((:commit . "2c74cd827e88c7f8360581a841e45f0b794510e7") (:authors ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainers ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainer "Adrien Becchis" . "adriean.khisbe@live.fr") (:keywords "convenience" "tools") (:url . "http://github.com/AdrieanKhisbe/cask-package-toolset.el"))])
  (caskxy . [(20140513 1539) ((log4e (0 2 0)) (yaxception (0 1))) "Control Cask in Emacs" tar ((:commit . "279f3ab79bd77fe69cb3148a79896b9bf118a9b3") (:authors ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainers ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainer "Hiroaki Otsu" . "ootsuhiroaki@gmail.com") (:keywords "convenience") (:url . "https://github.com/aki2o/caskxy"))])
  (casual . [(20240416 2237) ((emacs (29 1))) "Transient UI for Calc" tar ((:commit . "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com") (:keywords "tools") (:url . "https://github.com/kickingvegas/casual"))])
+ (casual-dired . [(20240517 2348) ((emacs (29 1))) "Casual Dired" tar ((:commit . "d49c5c84d222ff8db2038d1f25b32c607a46c8b6") (:authors ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainers ("Charles Choi" . "kickingvegas@gmail.com")) (:maintainer "Charles Choi" . "kickingvegas@gmail.com") (:keywords "tools") (:url . "https://github.com/kickingvegas/casual-dired"))])
  (catmacs . [(20170826 1157) ((emacs (24))) "Simple CAT interface for Yaesu Transceivers." tar ((:commit . "6ea9ee195661fe95355413856476c45dcc8e24e8") (:authors ("Frank Singleton" . "b17flyboy@gmail.com")) (:maintainers ("Frank Singleton" . "b17flyboy@gmail.com")) (:maintainer "Frank Singleton" . "b17flyboy@gmail.com") (:keywords "comm" "hardware") (:url . "https://bitbucket.org/pymaximus/catmacs"))])
  (catppuccin-theme . [(20240326 900) ((emacs (25 1))) "Catppuccin for Emacs - 🍄 Soothing pastel theme for Emacs" tar ((:commit . "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994") (:authors ("nyxkrage")) (:maintainers ("Carsten Kragelund" . "carsten@kragelund.me")) (:maintainer "Carsten Kragelund" . "carsten@kragelund.me") (:url . "https://github.com/catppuccin/emacs"))])
  (cats . [(20230407 1316) ((emacs (26 1))) "Monads for Elisp" tar ((:commit . "7fc70db0eeb2c33ffba5c13c4cdc0f31c7b95537") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:url . "https://github.com/Fuco1/emacs-cats"))])
@@ -506,7 +506,7 @@
  (cedit . [(20200816 526) nil "paredit-like commands for c-like languages" tar ((:commit . "cb38316903e6cfa8b8c978defa7e1dafcd4e0c12") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://zk-phi.gitub.io/"))])
  (celery . [(20170225 924) ((emacs (24)) (dash-functional (2 11 0)) (s (1 9 0)) (deferred (0 3 2))) "a minor mode to draw stats from celery and more?" tar ((:commit . "b3378dd81e5a717432123fb13d70201da5dc841a") (:authors ("ardumont" . "eniotna.t@gmail.com")) (:maintainers ("ardumont" . "eniotna.t@gmail.com")) (:maintainer "ardumont" . "eniotna.t@gmail.com") (:keywords "celery" "convenience") (:url . "https://github.com/ardumont/emacs-celery"))])
  (celestial-mode-line . [(20230323 737) ((emacs (24))) "Show lunar phase and sunrise/-set time in modeline" tar ((:commit . "90056322d6664e2e2b593912e4d5e68f1468cafc") (:authors ("Peter" . "craven@gmx.net")) (:maintainers ("Peter" . "craven@gmx.net")) (:maintainer "Peter" . "craven@gmx.net") (:keywords "extensions") (:url . "https://github.com/ecraven/celestial-mode-line"))])
- (centaur-tabs . [(20240411 2153) ((emacs (24 4)) (powerline (2 4)) (cl-lib (0 5))) "Aesthetic, modern looking customizable tabs plugin" tar ((:commit . "24d90efc72754cd1197a0c2f14d18e7c90dd2b4f") (:authors ("Emmanuel Bustos" . "ema2159@gmail.com")) (:maintainers ("Jen-Chieh Shen" . "jcs090218@gmail.com")) (:maintainer "Jen-Chieh Shen" . "jcs090218@gmail.com") (:keywords "frames") (:url . "https://github.com/ema2159/centaur-tabs"))])
+ (centaur-tabs . [(20240518 630) ((emacs (26 1)) (powerline (2 4)) (cl-lib (0 5))) "Aesthetic, modern looking customizable tabs plugin" tar ((:commit . "c86a0abdf2b3fbdfd0c2725a5807196cc9fa6e8e") (:authors ("Emmanuel Bustos" . "ema2159@gmail.com")) (:maintainers ("Jen-Chieh Shen" . "jcs090218@gmail.com")) (:maintainer "Jen-Chieh Shen" . "jcs090218@gmail.com") (:keywords "frames") (:url . "https://github.com/ema2159/centaur-tabs"))])
  (centered-cursor-mode . [(20230914 1358) nil "cursor stays vertically centered" tar ((:commit . "67ef719e685407dbc455c7430765e4e685fd95a9") (:authors ("André Riemann" . "andre.riemann@web.de")) (:maintainers ("André Riemann" . "andre.riemann@web.de")) (:maintainer "André Riemann" . "andre.riemann@web.de") (:keywords "convenience") (:url . "https://github.com/andre-r/centered-cursor-mode.el"))])
  (centered-window . [(20220125 804) ((emacs (24 4))) "Center the text when there's only one window" tar ((:commit . "80965f6c6afe8d918481433984b493de72af5399") (:authors ("Anler Hernández Peral" . "inbox+emacs@anler.me")) (:maintainers ("Anler Hernández Peral" . "inbox+emacs@anler.me")) (:maintainer "Anler Hernández Peral" . "inbox+emacs@anler.me") (:keywords "faces" "windows") (:url . "https://github.com/anler/centered-window-mode"))])
  (centimacro . [(20201225 1132) nil "Assign multiple macros as global key bindings" tar ((:commit . "0149877584b333c4f1953f0767f0cae23881b0df") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "macros") (:url . "https://github.com/abo-abo/centimacro"))])
@@ -517,19 +517,19 @@
  (cfengine-code-style . [(20171111 1027) nil "C code style for CFEngine project." tar ((:commit . "92a25872a6d1de00c5bfc2b9455ccb0082bf6569") (:authors ("Mikhail Gusarov" . "mikhail.gusarov@cfengine.com")) (:maintainers ("Mikhail Gusarov" . "mikhail.gusarov@cfengine.com")) (:maintainer "Mikhail Gusarov" . "mikhail.gusarov@cfengine.com") (:url . "https://github.com/cfengine/core"))])
  (cff . [(20160118 2018) ((cl-lib (0 5)) (emacs (24))) "Search of the C/C++ file header by the source and vice versa" tar ((:commit . "b6ab2a28e64ef06f281ec74cfe3114e450644dfa") (:authors ("Alexey Veretennikov" . "alexey.veretennikov@gmail.com")) (:maintainers ("Alexey Veretennikov" . "alexey.veretennikov@gmail.com")) (:maintainer "Alexey Veretennikov" . "alexey.veretennikov@gmail.com") (:keywords "find-file") (:url . "https://github.com/fourier/cff"))])
  (cfml-mode . [(20190617 1130) ((emacs (25))) "Emacs mode for editing CFML files" tar ((:commit . "b06d7cee2af0ed5d55a94f0db80fc1f429a1829a") (:authors ("Andrew Myers" . "am2605@gmail.com")) (:maintainers ("Andrew Myers" . "am2605@gmail.com")) (:maintainer "Andrew Myers" . "am2605@gmail.com") (:url . "https://github.com/am2605/cfml-mode"))])
- (cfn-mode . [(20240421 805) ((emacs (26 0)) (f (0 20 0)) (s (1 12 0)) (yaml-mode (0 0 13))) "AWS cloudformation mode" tar ((:commit . "3aa78685b9158022f49da43821c0888f377fa213") (:authors ("William Orr" . "will@worrbase.com")) (:maintainers ("William Orr" . "will@worrbase.com")) (:maintainer "William Orr" . "will@worrbase.com") (:keywords "convenience" "languages" "tools") (:url . "https://gitlab.com/worr/cfn-mode"))])
+ (cfn-mode . [(20240519 805) ((emacs (27 0)) (f (0 20 0)) (s (1 12 0)) (yaml-mode (0 0 13))) "AWS cloudformation mode" tar ((:commit . "6ef789934d6b9b78cdbe5c90703f4afead736ead") (:authors ("William Orr" . "will@worrbase.com")) (:maintainers ("William Orr" . "will@worrbase.com")) (:maintainer "William Orr" . "will@worrbase.com") (:keywords "convenience" "languages" "tools") (:url . "https://gitlab.com/worr/cfn-mode"))])
  (cframe . [(20240223 2335) ((emacs (26)) (buffer-manage (0 11)) (dash (2 17 0))) "Customize a frame and fast switch size and positions" tar ((:commit . "580a20573ef413c269c032221de04abc1c97a6a8") (:authors ("Paul Landes")) (:maintainers ("Paul Landes")) (:maintainer "Paul Landes") (:keywords "frames") (:url . "https://github.com/plandes/cframe"))])
  (cfrs . [(20220129 1149) ((emacs (26 1)) (dash (2 11 0)) (s (1 10 0)) (posframe (0 6 0))) "Child-frame based read-string" tar ((:commit . "f3a21f237b2a54e6b9f8a420a9da42b4f0a63121") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/cfrs"))])
- (cg . [(20240419 1148) ((emacs (26 1))) "Major mode for editing Constraint Grammar files" tar ((:commit . "913974345a9fce9e6ac76934ed535df7e44d47d6") (:authors ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainers ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainer "Kevin Brubeck Unhammer" . "unhammer@fsfe.org") (:keywords "languages") (:url . "https://visl.sdu.dk/constraint_grammar.html"))])
+ (cg . [(20240430 2040) ((emacs (26 1))) "Major mode for editing Constraint Grammar files" tar ((:commit . "06fb61345a4f3aae4bda74f3dfe261b1ec9d902d") (:authors ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainers ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainer "Kevin Brubeck Unhammer" . "unhammer@fsfe.org") (:keywords "languages") (:url . "https://visl.sdu.dk/constraint_grammar.html"))])
  (challenger-deep-theme . [(20231218 1042) ((emacs (24))) "challenger-deep Theme" tar ((:commit . "1afd5787374c2bf3bfb46beb18e64d5677c07366") (:authors ("MaxSt")) (:maintainers ("MaxSt")) (:maintainer "MaxSt") (:url . "https://github.com/challenger-deep-theme/emacs"))])
- (champagne . [(20231229 947) ((emacs (28 1)) (posframe (1 4 2))) "Graphical countdowns" tar ((:commit . "2106273c47f898006a799f0c5e35922af4b41f54") (:authors ("Psionic K" . "73710933+psionic-k@users.noreply.github.com")) (:maintainers ("Psionic K" . "73710933+psionic-k@users.noreply.github.com")) (:maintainer "Psionic K" . "73710933+psionic-k@users.noreply.github.com") (:keywords "games") (:url . "http://github.com/positron-solutions/champagne"))])
+ (champagne . [(20240515 310) ((emacs (28 1)) (posframe (1 4 2))) "Graphical countdowns" tar ((:commit . "42ef0451e4abe800f047583c4c3b04e51b29d5ee") (:authors ("Psionic K" . "contact@positron.solutions")) (:maintainers ("Psionic K" . "contact@positron.solutions")) (:maintainer "Psionic K" . "contact@positron.solutions") (:keywords "games") (:url . "http://github.com/positron-solutions/champagne"))])
  (change-inner . [(20231203 1021) ((expand-region (0 7))) "Change contents based on semantic units" tar ((:commit . "1394f5c07a95a97e39d616a1d7054d7c9bc49ba3") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainers ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com") (:keywords "convenience" "extensions"))])
  (chaos-mode . [(20221227 223) ((emacs (24 3))) "A major mode for the Chaos programming language" tar ((:commit . "801d869c461166eb2face2554b9b7883a26374c6") (:authors ("XXIV")) (:maintainers ("XXIV")) (:maintainer "XXIV") (:keywords "files" "chaos") (:url . "https://github.com/thechampagne/chaos-mode"))])
  (chapel-mode . [(20210513 457) ((emacs (25 1)) (hydra (0 15 0))) "A major mode for the Chapel programming language" tar ((:commit . "39fd24bb7cf44808200354ac0496be4fc4fddd9a") (:keywords "chapel" "chpl" "programming" "languages") (:url . "https://github.com/damon-kwok/chapel-mode"))])
  (char-menu . [(20210321 1657) ((emacs (24 3)) (avy-menu (0 1))) "Create your own menu for fast insertion of arbitrary symbols" tar ((:commit . "d77c4d64fc8acc386a0fb9727d346c838e75f011") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "convenience" "editing") (:url . "https://github.com/mrkkrp/char-menu"))])
  (charmap . [(20200616 1418) nil "Unicode table for Emacs" tar ((:commit . "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c") (:authors ("Anan Mikami" . "lateau@gmail.com")) (:maintainers ("Anan Mikami" . "lateau@gmail.com")) (:maintainer "Anan Mikami" . "lateau@gmail.com") (:keywords "unicode" "character" "ucs") (:url . "https://github.com/lateau/charmap"))])
- (chatgpt-shell . [(20240402 2216) ((emacs (27 1)) (shell-maker (0 50 1))) "ChatGPT shell + buffer insert commands" tar ((:commit . "42cf53ba7d43e0622e8c4c57ef8f635e1248182b") (:authors ("Alvaro Ramirez https://xenodium.com")) (:maintainers ("Alvaro Ramirez https://xenodium.com")) (:maintainer "Alvaro Ramirez https://xenodium.com") (:url . "https://github.com/xenodium/chatgpt-shell"))])
- (chatu . [(20240425 1349) ((org (9 6 6)) (emacs (29 1)) (plantuml-mode (1 2 9))) "Convert and insert any images to org-mode or markdown buffer" tar ((:commit . "3175ac95de1a1dc75ff5be1bf3a2e80e0abd5229") (:authors ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainers ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainer "Kimi Ma" . "kimi.im@outlook.com") (:keywords "multimedia" "convenience") (:url . "https://github.com/kimim/chatu"))])
+ (chatgpt-shell . [(20240517 2003) ((emacs (27 1)) (shell-maker (0 50 1))) "ChatGPT shell + buffer insert commands" tar ((:commit . "910b0ad5cdb633f6be64f88596219a7eb58af226") (:authors ("Alvaro Ramirez https://xenodium.com")) (:maintainers ("Alvaro Ramirez https://xenodium.com")) (:maintainer "Alvaro Ramirez https://xenodium.com") (:url . "https://github.com/xenodium/chatgpt-shell"))])
+ (chatu . [(20240518 615) ((org (9 6 6)) (emacs (29 1)) (plantuml-mode (1 2 9))) "Convert and insert any images to org-mode or markdown buffer" tar ((:commit . "f813f0bc926346fbd8151d2ae7079119d4657abb") (:authors ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainers ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainer "Kimi Ma" . "kimi.im@outlook.com") (:keywords "multimedia" "convenience") (:url . "https://github.com/kimim/chatu"))])
  (chatwork . [(20170511 442) nil "ChatWork client for Emacs" tar ((:commit . "fea231d479f06bf40dbfcf45de143eecc9ed744c") (:authors ("Masayuki Ataka" . "masayuki.ataka@gmail.com")) (:maintainers ("Masayuki Ataka" . "masayuki.ataka@gmail.com")) (:maintainer "Masayuki Ataka" . "masayuki.ataka@gmail.com") (:keywords "web") (:url . "https://github.com/ataka/chatwork"))])
  (cheat-sh . [(20210607 1307) ((emacs (25 1))) "Interact with cheat.sh" tar ((:commit . "33bae22feae8d3375739c6bdef08d0dcdf47ee42") (:authors ("Dave Pearson" . "davep@davep.org")) (:maintainers ("Dave Pearson" . "davep@davep.org")) (:maintainer "Dave Pearson" . "davep@davep.org") (:keywords "docs" "help") (:url . "https://github.com/davep/cheat-sh.el"))])
  (cheatsheet . [(20170126 2150) ((emacs (24)) (cl-lib (0 5))) "create your own cheatsheet" tar ((:commit . "e4f8e0110167ea16a17a74517d1f10cb7ff805b8") (:authors ("Shirin Nikita" . "shirin.nikita@gmail.com")) (:maintainers ("Shirin Nikita" . "shirin.nikita@gmail.com")) (:maintainer "Shirin Nikita" . "shirin.nikita@gmail.com") (:keywords "convenience" "usability") (:url . "http://github.com/darksmile/cheatsheet/"))])
@@ -559,7 +559,7 @@
  (chronos . [(20230804 1712) ((emacs (27 1))) "Multiple simultaneous countdown / countup timers" tar ((:commit . "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1") (:authors ("David Knight" . "dxknight@opmbx.org")) (:maintainers ("David Knight" . "dxknight@opmbx.org")) (:maintainer "David Knight" . "dxknight@opmbx.org") (:keywords "calendar") (:url . "http://github.com/DarkBuffalo/chronos"))])
  (chruby . [(20180114 1652) ((cl-lib (0 5))) "Emacs integration for chruby" tar ((:commit . "42bc6d521f832eca8e2ba210f30d03ad5529788f") (:authors ("Arne Brasseur" . "arne@arnebrasseur.net")) (:maintainers ("Arne Brasseur" . "arne@arnebrasseur.net")) (:maintainer "Arne Brasseur" . "arne@arnebrasseur.net") (:keywords "languages") (:url . "https://github.com/plexus/chruby.el"))])
  (chyla-theme . [(20231220 1545) nil "chyla.org - green color theme." tar ((:commit . "4d4b9dca3547e919ed5311cc7d04821f77860fbd") (:authors ("Adam Chyła" . "adam@chyla.org")) (:maintainers ("Adam Chyła" . "adam@chyla.org")) (:maintainer "Adam Chyła" . "adam@chyla.org") (:url . "https://github.com/chyla/ChylaThemeForEmacs"))])
- (cider . [(20240424 1919) ((emacs (26)) (clojure-mode (5 18 1)) (parseedn (1 2 1)) (queue (0 2)) (spinner (1 7)) (seq (2 22)) (sesman (0 3 2)) (transient (0 4 1))) "Clojure Interactive Development Environment that Rocks" tar ((:commit . "1cd6ab7b7cb4a7e079a273600c4d28307c3aba40") (:authors ("Tim King" . "kingtim@gmail.com") ("Phil Hagelberg" . "technomancy@gmail.com") ("Bozhidar Batsov" . "bozhidar@batsov.dev") ("Artur Malabarba" . "bruce.connor.am@gmail.com") ("Hugo Duncan" . "hugo@hugoduncan.org") ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "languages" "clojure" "cider") (:url . "https://www.github.com/clojure-emacs/cider"))])
+ (cider . [(20240521 1504) ((emacs (26)) (clojure-mode (5 18 1)) (parseedn (1 2 1)) (queue (0 2)) (spinner (1 7)) (seq (2 22)) (sesman (0 3 2)) (transient (0 4 1))) "Clojure Interactive Development Environment that Rocks" tar ((:commit . "c2394fc7954170fd05a23f5e44ea74b12c25e637") (:authors ("Tim King" . "kingtim@gmail.com") ("Phil Hagelberg" . "technomancy@gmail.com") ("Bozhidar Batsov" . "bozhidar@batsov.dev") ("Artur Malabarba" . "bruce.connor.am@gmail.com") ("Hugo Duncan" . "hugo@hugoduncan.org") ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "languages" "clojure" "cider") (:url . "https://www.github.com/clojure-emacs/cider"))])
  (cider-decompile . [(20151122 537) ((cider (0 3 0)) (javap-mode (9))) "decompilation extension for cider" tar ((:commit . "5d87035f3c3c14025e8f01c0c53d0ce2c8f56651") (:authors ("Dmitry Bushenko")) (:maintainers ("Dmitry Bushenko")) (:maintainer "Dmitry Bushenko") (:keywords "languages" "clojure" "cider") (:url . "http://www.github.com/clojure-emacs/cider-decompile"))])
  (cider-eval-sexp-fu . [(20190311 2152) ((emacs (24)) (eval-sexp-fu (0 5 0))) "Briefly highlights an evaluated sexp." tar ((:commit . "7fd229f1441356866aedba611fd0cf4e89b50921") (:authors ("Sylvain Benner" . "sylvain.benner@gmail.com")) (:maintainers ("Sylvain Benner" . "sylvain.benner@gmail.com")) (:maintainer "Sylvain Benner" . "sylvain.benner@gmail.com") (:keywords "languages" "clojure" "cider"))])
  (cider-hydra . [(20190816 1121) ((cider (0 22 0)) (hydra (0 13 0))) "Hydras for CIDER." tar ((:commit . "c3b8a15d72dddfbc390ab6a454bd7e4c765a2c95") (:authors ("Tianxiang Xiong" . "tianxiang.xiong@gmail.com")) (:maintainers ("Tianxiang Xiong" . "tianxiang.xiong@gmail.com")) (:maintainer "Tianxiang Xiong" . "tianxiang.xiong@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/clojure-emacs/cider-hydra"))])
@@ -572,12 +572,12 @@
  (circe-notifications . [(20180102 2318) ((emacs (24 4)) (circe (2 3)) (alert (1 2))) "Add desktop notifications to Circe." tar ((:commit . "291149ac12877bbd062da993479d3533a26862b0") (:authors ("Ruben Maher" . "r@rkm.id.au")) (:maintainers ("Ruben Maher" . "r@rkm.id.au")) (:maintainer "Ruben Maher" . "r@rkm.id.au") (:url . "https://github.com/eqyiel/circe-notifications"))])
  (circleci-api . [(20210227 1607) ((emacs (27)) (request (0 3 2))) "Bindings for the CircleCI API" tar ((:commit . "1432b0ad0f32b03fec564c0815951d5e096c2f6a") (:authors ("Robin Schroer")) (:maintainers ("Robin Schroer")) (:maintainer "Robin Schroer") (:url . "https://github.com/sulami/circleci-api"))])
  (citar . [(20240419 2232) ((emacs (27 1)) (parsebib (4 2)) (org (9 5)) (citeproc (0 9))) "Citation-related commands for org, latex, markdown" tar ((:commit . "07d2a63c99fe35cbd468f8e6a322de05f1a29469") (:authors ("Bruce D'Arcus <https://github.com/bdarcus>")) (:maintainers ("Bruce D'Arcus <https://github.com/bdarcus>")) (:maintainer "Bruce D'Arcus <https://github.com/bdarcus>") (:url . "https://github.com/emacs-citar/citar"))])
- (citar-denote . [(20240424 2023) ((emacs (28 1)) (citar (1 4)) (denote (2 0)) (dash (2 19 1))) "Minor mode integrating Citar and Denote" tar ((:commit . "6e236e9100d1401cd7c628c5f799badded77967d") (:authors ("Peter Prevos" . "peter@prevos.net")) (:maintainers ("Peter Prevos" . "peter@prevos.net")) (:maintainer "Peter Prevos" . "peter@prevos.net") (:url . "https://github.com/pprevos/citar-denote"))])
+ (citar-denote . [(20240520 2325) ((emacs (28 1)) (citar (1 4)) (denote (2 0)) (dash (2 19 1))) "Minor mode integrating Citar and Denote" tar ((:commit . "1c62db7107b1ff9de5f87a03d9ac1973c4bbb0ec") (:authors ("Peter Prevos" . "peter@prevos.net")) (:maintainers ("Peter Prevos" . "peter@prevos.net")) (:maintainer "Peter Prevos" . "peter@prevos.net") (:url . "https://github.com/pprevos/citar-denote"))])
  (citar-embark . [(20231122 1548) ((emacs (27 1)) (embark (0 17)) (citar (0 9 7))) "Citar/Embark integration" tar ((:commit . "572b7b6e569e9423dd948539fa48d3f53ceffe57") (:authors ("Bruce D'Arcus" . "bdarcus@gmail.com")) (:maintainers ("Bruce D'Arcus" . "bdarcus@gmail.com")) (:maintainer "Bruce D'Arcus" . "bdarcus@gmail.com") (:keywords "bib" "extensions") (:url . "https://github.com/emacs-citar/citar"))])
  (citar-org-roam . [(20240212 2159) ((emacs (27 1)) (org-roam (2 2)) (citar (1 2 0))) "Citar/org-roam integration" tar ((:commit . "999268c7a077aad6a8f4dfc88d0eeabdf4267fea") (:authors ("Bruce D'Arcus" . "bdarcus@gmail.com")) (:maintainers ("Bruce D'Arcus" . "bdarcus@gmail.com")) (:maintainer "Bruce D'Arcus" . "bdarcus@gmail.com") (:url . "https://github.com/emacs-citar/citar-org-roam"))])
- (citeproc . [(20240307 1412) ((emacs (26)) (dash (2 13 0)) (s (1 12 0)) (f (0 18 0)) (queue (0 2)) (string-inflection (1 0)) (org (9)) (parsebib (2 4)) (compat (28 1))) "A CSL 1.0.2 Citation Processor" tar ((:commit . "cb2d3e72116e626133703aa9875d680442249abe") (:authors ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainers ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainer "András Simonyi" . "andras.simonyi@gmail.com") (:keywords "bib") (:url . "https://github.com/andras-simonyi/citeproc-el"))])
+ (citeproc . [(20240513 1309) ((emacs (26)) (dash (2 13 0)) (s (1 12 0)) (f (0 18 0)) (queue (0 2)) (string-inflection (1 0)) (org (9)) (parsebib (2 4)) (compat (28 1))) "A CSL 1.0.2 Citation Processor" tar ((:commit . "fed285385c1a8c0248890cd591f64a0e2598334d") (:authors ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainers ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainer "András Simonyi" . "andras.simonyi@gmail.com") (:keywords "bib") (:url . "https://github.com/andras-simonyi/citeproc-el"))])
  (citeproc-org . [(20200915 2009) ((emacs (25 1)) (dash (2 12 0)) (org (9)) (f (0 18 0)) (citeproc (0 1)) (org-ref (1 1 1))) "Render org-mode references in CSL styles" tar ((:commit . "22a759c4f0ec80075014dcc594baa4d1b470d995") (:authors ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainers ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainer "András Simonyi" . "andras.simonyi@gmail.com") (:keywords "org-ref" "org-mode" "cite" "bib") (:url . "https://github.com/andras-simonyi/citeproc-org"))])
- (citre . [(20240425 1635) ((emacs (26 1))) "Superior code reading & auto-completion tool with pluggable backends." tar ((:commit . "a78cf13d5c3c1c0275b332da5888cd0973de70fe") (:authors ("Hao Wang" . "amaikinono@gmail.com")) (:maintainers ("Hao Wang" . "amaikinono@gmail.com")) (:maintainer "Hao Wang" . "amaikinono@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/universal-ctags/citre"))])
+ (citre . [(20240508 1154) ((emacs (26 1))) "Superior code reading & auto-completion tool with pluggable backends." tar ((:commit . "fe670ff2410fe4cd59cdce8ef1b947deefa71879") (:authors ("Hao Wang" . "amaikinono@gmail.com")) (:maintainers ("Hao Wang" . "amaikinono@gmail.com")) (:maintainer "Hao Wang" . "amaikinono@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/universal-ctags/citre"))])
  (cl-format . [(20230818 1726) nil "CL format routine." tar ((:commit . "42b662d27eefa458c1a39bea1836d6ada740b863") (:authors ("Andreas Politz" . "politza@fh-trier.de")) (:maintainer "akater" . "nuclearspace@gmail.com") (:keywords "extensions") (:url . "https://gitlab.com/akater/elisp-cl-format"))])
  (cl-libify . [(20181130 230) ((emacs (25))) "Update elisp code to use cl-lib instead of cl" tar ((:commit . "e205b96f944a4f312fd523804cbbaf00027a3c8b") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "lisp") (:url . "https://github.com/purcell/cl-libify"))])
  (clang-capf . [(20221030 1830) ((emacs (24 4))) "Completion-at-point backend for c/c++ using clang" tar ((:commit . "5e4dfba90ce86bbc7ee61805edfca04fff93c291") (:authors ("Philip K. <philipk [at] posteo [dot] net>")) (:maintainers ("Philip K. <philipk [at] posteo [dot] net>")) (:maintainer "Philip K. <philipk [at] posteo [dot] net>") (:keywords "c" "abbrev" "convenience") (:url . "https://git.sr.ht/~pkal/clang-capf"))])
@@ -614,7 +614,7 @@
  (clojars . [(20180825 1951) ((request-deferred (0 2 0))) "clojars.org search interface" tar ((:commit . "c78e4d5ddacda064c253e2b38d1c35188aa1ad71") (:authors ("Joshua Miller" . "josh@joshmiller.io")) (:maintainers ("Joshua Miller" . "josh@joshmiller.io")) (:maintainer "Joshua Miller" . "josh@joshmiller.io") (:keywords "docs" "help" "tools") (:url . "https://github.com/joshuamiller/clojars.el"))])
  (clojure-essential-ref . [(20221215 1427) ((emacs (24)) (cider (0 24 0))) "Cider-doc to \"Clojure, The Essential Reference\"" tar ((:commit . "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96") (:url . "https://github.com/p3r7/clojure-essential-ref"))])
  (clojure-essential-ref-nov . [(20221215 1427) ((emacs (24)) (dash (2 16 0)) (nov (0 3 1)) (clojure-essential-ref (0 1 0))) "Cider-doc to \"Clojure, The Essential Reference\" (EPUB)" tar ((:commit . "6741bf65cf9b9bc896ab1cc3c384573e8ffe5f96") (:url . "https://github.com/p3r7/clojure-essential-ref"))])
- (clojure-mode . [(20240304 559) ((emacs (25 1))) "Major mode for Clojure code" tar ((:commit . "3792e08b76aa7fdae18938e1966ea140b9817a9a") (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "languages" "clojure" "clojurescript" "lisp") (:url . "https://github.com/clojure-emacs/clojure-mode"))])
+ (clojure-mode . [(20240516 525) ((emacs (25 1))) "Major mode for Clojure code" tar ((:commit . "faee3efbb1e940af0e5777514923c8dea567f87d") (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "languages" "clojure" "clojurescript" "lisp") (:url . "https://github.com/clojure-emacs/clojure-mode"))])
  (clojure-mode-extra-font-locking . [(20231124 732) ((clojure-mode (3 0))) "Extra font-locking for Clojure mode" tar ((:commit . "25d713a67d8e0209ee74bfc0153fdf677697b43f") (:authors ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "languages" "lisp") (:url . "https://github.com/clojure-emacs/clojure-mode"))])
  (clojure-quick-repls . [(20150814 736) ((cider (0 8 1)) (dash (2 9 0))) "Quickly create Clojure and ClojureScript repls for a project." tar ((:commit . "8fe4e44939e8a01a4cdf60c0001d9a6abf8a73c3") (:keywords "languages" "clojure" "cider" "clojurescript") (:url . "https://github.com/symfrog/clojure-quick-repls"))])
  (clojure-snippets . [(20220914 950) ((yasnippet (0 10 0))) "Yasnippets for clojure" tar ((:commit . "66d23f0ffedf2cc2be0387c3504b5f89d7300cfa") (:authors ("Max Penet" . "m@qbits.cc")) (:maintainer "Max Penet" . "m@qbits.cc") (:keywords "snippets"))])
@@ -632,7 +632,7 @@
  (cmake-project . [(20171121 1115) nil "Integrates CMake build process with Emacs" tar ((:commit . "d3f408f226eff3f77f7e00dd519f4efc78fd292d") (:authors ("Alexander Lamaison" . "alexander.lamaison@gmail")) (:maintainers ("Alexander Lamaison" . "alexander.lamaison@gmail")) (:maintainer "Alexander Lamaison" . "alexander.lamaison@gmail") (:keywords "c" "cmake" "languages" "tools") (:url . "http://github.com/alamaison/emacs-cmake-project"))])
  (cmd-to-echo . [(20161203 2133) ((emacs (24 4)) (s (1 11 0)) (shell-split-string (20151224 208))) "Show the output of long-running commands in the echo area" tar ((:commit . "e0e874fc0e1ad6d291e39ed76023445297ad438a") (:authors ("Tijs Mallaerts" . "tijs.mallaerts@gmail.com")) (:maintainers ("Tijs Mallaerts" . "tijs.mallaerts@gmail.com")) (:maintainer "Tijs Mallaerts" . "tijs.mallaerts@gmail.com"))])
  (cmm-mode . [(20150225 746) nil "Major mode for C-- source code" tar ((:commit . "c3ad514dff3eb30434f6b20d953276d4c00de1ee"))])
- (cnfonts . [(20240426 601) ((emacs (24))) "A simple Chinese fonts config tool" tar ((:commit . "d81b1d5932fbbed509f4b011eb14d2e0e1e73971") (:authors ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "chinese" "font") (:url . "https://github.com/tumashu/cnfonts"))])
+ (cnfonts . [(20240430 536) ((emacs (24))) "A simple Chinese fonts config tool" tar ((:commit . "1f57d4f64f50e4dbc7ab4d963278b746f904c454") (:authors ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "chinese" "font") (:url . "https://github.com/tumashu/cnfonts"))])
  (cobalt . [(20180304 1155) ((emacs (24))) "Easily use the Cobalt.rs static site generator" tar ((:commit . "634ace275697e188746ca22a30ff94380ec756be") (:authors ("Juan Karlo Licudine" . "accidentalrebel@gmail.com")) (:maintainers ("Juan Karlo Licudine" . "accidentalrebel@gmail.com")) (:maintainer "Juan Karlo Licudine" . "accidentalrebel@gmail.com") (:keywords "convenience") (:url . "https://github.com/cobalt-org/cobalt.el"))])
  (cobra-mode . [(20140116 2116) nil "Major mode for .NET-based Cobra language" tar ((:commit . "acd6e53f6286af5176471d01f25257e5ddb6dd01") (:authors ("Taylor \"Nekroze\" Lawson")) (:maintainers ("Taylor \"Nekroze\" Lawson")) (:maintainer "Taylor \"Nekroze\" Lawson") (:keywords "languages") (:url . "http://github.com/Nekroze/cobra-mode"))])
  (codcut . [(20190915 1009) nil "Share pieces of code to Codcut" tar ((:commit . "bf07c3db3900e36b0b87423f3b715d6378f86393") (:authors ("Diego Pasquali" . "hello@dgopsq.space")) (:maintainers ("Diego Pasquali" . "hello@dgopsq.space")) (:maintainer "Diego Pasquali" . "hello@dgopsq.space") (:keywords "comm" "tools" "codcut" "share") (:url . "https://github.com/codcut/codcut-emacs"))])
@@ -651,14 +651,14 @@
  (coffee-mode . [(20200315 1133) ((emacs (24 3))) "Major mode for CoffeeScript code" tar ((:commit . "35a41c7d8233eac0b267d9593e67fb8b6235e134") (:authors ("Chris Wanstrath" . "chris@ozmm.org")) (:maintainers ("Chris Wanstrath" . "chris@ozmm.org")) (:maintainer "Chris Wanstrath" . "chris@ozmm.org") (:keywords "coffeescript" "major" "mode") (:url . "http://github.com/defunkt/coffee-mode"))])
  (coin-ticker . [(20170611 727) ((request (0 3 0)) (emacs (25))) "Show a cryptocurrency price ticker" tar ((:commit . "45108e239e1d129c0cc1ff37f2870cf73087780b") (:authors ("Evan Klitzke" . "evan@eklitzke.org")) (:maintainers ("Evan Klitzke" . "evan@eklitzke.org")) (:maintainer "Evan Klitzke" . "evan@eklitzke.org") (:keywords "news") (:url . "https://github.com/eklitzke/coin-ticker-mode"))])
  (colonoscopy-theme . [(20170808 1309) ((emacs (24 0))) "an Emacs 24 theme based on Colonoscopy (tmTheme)" tar ((:commit . "64bbb322b13dae91ce9f1e3581f836f94f800ead") (:authors ("Jason Milkins")) (:maintainers ("Jason Milkins")) (:maintainer "Jason Milkins") (:url . "https://github.com/emacsfodder/tmtheme-to-deftheme"))])
- (color-identifiers-mode . [(20240218 1801) ((dash (2 5 0)) (emacs (24))) "Color identifiers based on their names" tar ((:commit . "6cb50ae7e61189f55387e5350c20651e081d613c") (:authors ("Ankur Dave" . "ankurdave@gmail.com")) (:maintainers ("Ankur Dave" . "ankurdave@gmail.com")) (:maintainer "Ankur Dave" . "ankurdave@gmail.com") (:keywords "faces" "languages") (:url . "https://github.com/ankurdave/color-identifiers-mode"))])
+ (color-identifiers-mode . [(20240505 2245) ((dash (2 5 0)) (emacs (24))) "Color identifiers based on their names" tar ((:commit . "8e189b03ad602cc457308934fbb91b2dc8f286df") (:authors ("Ankur Dave" . "ankurdave@gmail.com")) (:maintainers ("Ankur Dave" . "ankurdave@gmail.com")) (:maintainer "Ankur Dave" . "ankurdave@gmail.com") (:keywords "faces" "languages") (:url . "https://github.com/ankurdave/color-identifiers-mode"))])
  (color-moccur . [(20141223 35) nil "multi-buffer occur (grep) mode" tar ((:commit . "4f1c59ffd1ccc2ab1a171cd6b721e8cb9e002fb7") (:keywords "convenience") (:url . "http://www.bookshelf.jp/elc/color-moccur.el"))])
  (color-theme . [(20190220 1115) nil "An OBSOLETE color-theme implementation" tar ((:commit . "3a2f6b615f5e2401e30d93a3e0adc210bbb4b7aa") (:authors ("Jonadab the Unsightly One" . "jonadab@bright.net")) (:maintainers ("Xavier Maillard" . "zedek@gnu.org")) (:maintainer "Xavier Maillard" . "zedek@gnu.org") (:keywords "faces") (:url . "http://www.emacswiki.org/cgi-bin/wiki.pl?ColorTheme"))])
  (color-theme-approximate . [(20140228 436) nil "Makes Emacs theme works on terminal transparently" tar ((:commit . "f54301ca39bc5d2ffb000f233f8114184a3e7d71") (:authors ("Tung Dao" . "me@tungdao.com")) (:maintainers ("Tung Dao" . "me@tungdao.com")) (:maintainer "Tung Dao" . "me@tungdao.com"))])
  (color-theme-buffer-local . [(20170126 601) ((color-theme (0))) "Install color-themes by buffer." tar ((:commit . "faf7415c99e132094f1f09c6b6974ec118a18d87") (:authors ("Victor Borja" . "vic.borja@gmail.com")) (:maintainers ("Victor Borja" . "vic.borja@gmail.com")) (:maintainer "Victor Borja" . "vic.borja@gmail.com") (:keywords "faces") (:url . "http://github.com/vic/color-theme-buffer-local"))])
  (color-theme-modern . [(20231116 2258) ((emacs (24))) "Reimplement colortheme with Emacs 24 theme framework." tar ((:commit . "5f790421b6eff5d2915819fa23cfcdb19827fa91") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/emacs-jp/replace-colorthemes"))])
  (color-theme-sanityinc-solarized . [(20220917 1350) ((emacs (24 1)) (cl-lib (0 6))) "A version of Ethan Schoonover's Solarized themes" tar ((:commit . "b8f4a65bd53b97b56b93fff2fb14f71b2831aa6f") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "faces" "themes") (:url . "https://github.com/purcell/color-theme-sanityinc-solarized"))])
- (color-theme-sanityinc-tomorrow . [(20240406 1456) ((emacs (24 1))) "A version of Chris Kempson's \"tomorrow\" themes" tar ((:commit . "42b24a3fa3fbdcb36cd2936a38abe142cda65294") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "faces" "themes") (:url . "https://github.com/purcell/color-theme-sanityinc-tomorrow"))])
+ (color-theme-sanityinc-tomorrow . [(20240429 949) ((emacs (24 1))) "A version of Chris Kempson's \"tomorrow\" themes" tar ((:commit . "5f3b2039eda57e9e4501f8decab5808d9edf98eb") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "faces" "themes") (:url . "https://github.com/purcell/color-theme-sanityinc-tomorrow"))])
  (color-theme-x . [(20201204 2245) ((cl-lib (0 5))) "convert color themes to X11 resource settings" tar ((:commit . "ec853dd931d625e07116fbc91d8829bd15f90889") (:authors ("Matthew Kennedy" . "mkennedy@killr.ath.cx")) (:maintainers ("Andrew Johnson" . "andrew@andrewjamesjohnson.com")) (:maintainer "Andrew Johnson" . "andrew@andrewjamesjohnson.com") (:keywords "convenience" "faces" "frames") (:url . "https://github.com/ajsquared/color-theme-x"))])
  (colorless-themes . [(20210102 1035) ((emacs (24 1))) "A macro to generate mostly colorless themes" tar ((:commit . "95fff8b4e313bdd2073454fd5be9420d95dab267") (:authors ("Thomas Letan" . "contact@thomasletan.fr")) (:maintainers ("Thomas Letan" . "contact@thomasletan.fr")) (:maintainer "Thomas Letan" . "contact@thomasletan.fr") (:keywords "faces themes" "faces") (:url . "https://git.sr.ht/~lthms/colorless-themes.el"))])
  (colormaps . [(20171008 2224) ((emacs (25))) "Hex colormaps" tar ((:commit . "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c") (:authors ("Abhinav Tushar" . "lepisma@fastmail.com")) (:maintainers ("Abhinav Tushar" . "lepisma@fastmail.com")) (:maintainer "Abhinav Tushar" . "lepisma@fastmail.com") (:keywords "tools") (:url . "https://github.com/lepisma/colormaps.el"))])
@@ -678,7 +678,7 @@
  (commenter . [(20160219 1627) ((emacs (24 4)) (let-alist (1 0 4))) "multiline-comment support package" tar ((:commit . "6d1885419434ba779270c6fda0e30d390bb074bd") (:authors ("Yuta Yamada <cokesboy\"at\"gmail.com>")) (:maintainers ("Yuta Yamada <cokesboy\"at\"gmail.com>")) (:maintainer "Yuta Yamada <cokesboy\"at\"gmail.com>") (:keywords "comment") (:url . "https://github.com/yuutayamada/commenter"))])
  (commify . [(20230616 1042) ((s (1 9 0))) "Toggle grouping commas in numbers" tar ((:commit . "35e2438eb7feeb28273c4920376fcf296cc83283") (:authors ("Daniel E. Doherty" . "ded-commify@ddoherty.net")) (:maintainers ("Daniel E. Doherty" . "ded-commify@ddoherty.net")) (:maintainer "Daniel E. Doherty" . "ded-commify@ddoherty.net") (:keywords "convenience" "editing" "numbers" "grouping" "commas") (:url . "https://github.com/ddoherty03/commify"))])
  (common-lisp-snippets . [(20180226 1523) ((yasnippet (0 8 0))) "Yasnippets for Common Lisp" tar ((:commit . "1ddf808311ba4d9e8444a1cb50bd5ee75e4111f6") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "snippets") (:url . "https://github.com/mrkkrp/common-lisp-snippets"))])
- (company . [(20240311 1943) ((emacs (25 1))) "Modular text completion framework" tar ((:commit . "b0a522ac5bf8ba3d2f4f22e3aa846a4f82978a16") (:authors ("Nikolaj Schumacher")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "abbrev" "convenience" "matching") (:url . "http://company-mode.github.io/"))])
+ (company . [(20240428 2258) ((emacs (25 1))) "Modular text completion framework" tar ((:commit . "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc") (:authors ("Nikolaj Schumacher")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "abbrev" "convenience" "matching") (:url . "http://company-mode.github.io/"))])
  (company-anaconda . [(20230821 2126) ((emacs (25 1)) (company (0 8 0)) (anaconda-mode (0 1 1)) (cl-lib (0 5 0)) (dash (2 6 0)) (s (1 9))) "Anaconda backend for company-mode" tar ((:commit . "14867265e474f7a919120bbac74870c3256cbacf") (:authors ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainers ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainer "Artem Malyshev" . "proofit404@gmail.com") (:keywords "convenience" "company" "anaconda") (:url . "https://github.com/proofit404/anaconda-mode"))])
  (company-ansible . [(20240221 2255) ((emacs (24 4)) (company (0 8 12))) "A company back-end for ansible" tar ((:commit . "338922601cf9e8ada863fe6f2dd9d5145d9983b0") (:authors ("Krzysztof Magosa" . "krzysztof@magosa.pl")) (:maintainers ("Krzysztof Magosa" . "krzysztof@magosa.pl")) (:maintainer "Krzysztof Magosa" . "krzysztof@magosa.pl") (:keywords "ansible") (:url . "https://github.com/krzysztof-magosa/company-ansible"))])
  (company-arduino . [(20160306 1739) ((emacs (24 1)) (company (0 8 0)) (irony (0 1 0)) (cl-lib (0 5)) (company-irony (0 1 0)) (company-c-headers (20140930)) (arduino-mode (1 0))) "company-mode for Arduino" tar ((:commit . "5958b917cc5cc729dc64d74d947da5ee91c48980") (:authors ("Yuta Yamada" . "sleepboy.zzz@gmail.com")) (:maintainers ("Yuta Yamada" . "sleepboy.zzz@gmail.com")) (:maintainer "Yuta Yamada" . "sleepboy.zzz@gmail.com") (:keywords "convenience" "development" "company") (:url . "https://github.com/yuutayamada/company-arduino"))])
@@ -689,7 +689,7 @@
  (company-c-headers . [(20190825 1631) ((emacs (24 1)) (company (0 8))) "Company mode backend for C/C++ header files" tar ((:commit . "5e676ab0c2f287c868b1e3931afd4c78895910cd") (:authors ("Alastair Rankine" . "alastair@girtby.net")) (:maintainers ("Alastair Rankine" . "alastair@girtby.net")) (:maintainer "Alastair Rankine" . "alastair@girtby.net") (:keywords "development" "company"))])
  (company-cabal . [(20170917 1317) ((cl-lib (0 5)) (company (0 8 0)) (emacs (24))) "company-mode cabal backend" tar ((:commit . "62112a7259e24bd6c08885629a185afe512b7d3d") (:authors ("Iku Iwasa" . "iku.iwasa@gmail.com")) (:maintainers ("Iku Iwasa" . "iku.iwasa@gmail.com")) (:maintainer "Iku Iwasa" . "iku.iwasa@gmail.com") (:url . "https://github.com/iquiw/company-cabal"))])
  (company-coq . [(20221130 536) ((cl-lib (0 5)) (dash (2 12 1)) (yasnippet (0 11 0)) (company (0 8 12)) (company-math (1 1))) "A collection of extensions for Proof General's Coq mode" tar ((:commit . "5affe7a96a25df9101f9e44bac8a828d8292c2fa") (:authors ("Clément Pit-Claudel" . "clement.pitclaudel@live.com")) (:maintainer "Clément Pit-Claudel" . "clement.pitclaudel@live.com") (:keywords "convenience" "languages") (:url . "https://github.com/cpitclaudel/company-coq"))])
- (company-ctags . [(20211211 338) ((emacs (25 1)) (company (0 9 0))) "Fastest company-mode completion backend for ctags" tar ((:commit . "313508ba5d4f1e4b5d5d554faaa74076201c3248") (:authors ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com") (:keywords "convenience") (:url . "https://github.com/redguardtoo/company-ctags"))])
+ (company-ctags . [(20240511 856) ((emacs (27 1)) (company (0 9 0))) "Fastest company-mode completion backend for ctags" tar ((:commit . "2e079a634afa5687bdb004e3883ac0671a222401") (:authors ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com") (:keywords "convenience") (:url . "https://github.com/redguardtoo/company-ctags"))])
  (company-dcd . [(20240218 1726) ((company (0 9)) (flycheck-dmd-dub (0 7)) (yasnippet (0 8)) (popwin (0 7)) (cl-lib (0 5)) (ivy (20160804 326))) "Company backend for Dlang using DCD." tar ((:commit . "29dc3dc7fd0f7effe8f6a3dfbe7028a2019de48e") (:authors ("tsukimizake <shomasd_at_gmail.com>")) (:maintainers ("tsukimizake <shomasd_at_gmail.com>")) (:maintainer "tsukimizake <shomasd_at_gmail.com>") (:keywords "languages") (:url . "http://github.com/tsukimizake/company-dcd"))])
  (company-dict . [(20190302 5) ((emacs (24 4)) (company (0 8 12)) (parent-mode (2 3))) "A backend that emulates ac-source-dictionary" tar ((:commit . "cd7b8394f6014c57897f65d335d6b2bd65dab1f4") (:authors ("Henrik Lissner <http://github/hlissner>")) (:maintainers ("Henrik Lissner" . "henrik@lissner.net")) (:maintainer "Henrik Lissner" . "henrik@lissner.net") (:keywords "company" "dictionary" "ac-source-dictionary") (:url . "https://github.com/hlissner/emacs-company-dict"))])
  (company-distel . [(20180827 1344) ((distel-completion-lib (1 0 0))) "Erlang/distel completion backend for company-mode" tar ((:commit . "acc4c0a5521904203d797fe96b08e5fae4233c7e") (:authors ("Sebastian Weddmark Olsson")) (:maintainers ("Sebastian Weddmark Olsson")) (:maintainer "Sebastian Weddmark Olsson") (:keywords "erlang" "distel" "company") (:url . "github.com/sebastiw/distel-completion"))])
@@ -700,7 +700,7 @@
  (company-erlang . [(20170123 538) ((emacs (24 4)) (ivy-erlang-complete (0 1)) (company (0 9 2))) "company backend based on ivy-erlang-complete" tar ((:commit . "bc0524a16f17b66c7397690e4ca0e004f09ea6c5") (:authors ("Sergey Kostyaev" . "feo.me@ya.ru")) (:maintainers ("Sergey Kostyaev" . "feo.me@ya.ru")) (:maintainer "Sergey Kostyaev" . "feo.me@ya.ru") (:keywords "tools"))])
  (company-flow . [(20180225 2159) ((company (0 8 0)) (dash (2 13 0))) "Flow backend for company-mode" tar ((:commit . "76ef585c70d2a3206c2eadf24ba61e59124c3a16") (:authors ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainers ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainer "Aaron Jensen" . "aaronjensen@gmail.com") (:url . "https://github.com/aaronjensen/company-flow"))])
  (company-flx . [(20180103 518) ((emacs (24)) (company (0 8 12)) (flx (0 5))) "flx based fuzzy matching for company" tar ((:commit . "05efcafb488f587bb6e60923078d97227462eb68") (:authors ("PythonNut" . "pythonnut@pythonnut.com")) (:maintainers ("PythonNut" . "pythonnut@pythonnut.com")) (:maintainer "PythonNut" . "pythonnut@pythonnut.com") (:keywords "convenience" "company" "fuzzy" "flx") (:url . "https://github.com/PythonNut/company-flx"))])
- (company-fuzzy . [(20240101 943) ((emacs (26 1)) (company (0 8 12)) (s (1 12 0)) (ht (2 0))) "Fuzzy matching for `company-mode'" tar ((:commit . "059e3e0893a2b3c0ad4bf27b6963e7547b97b5d4") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "matching" "auto-complete" "complete" "fuzzy") (:url . "https://github.com/jcs-elpa/company-fuzzy"))])
+ (company-fuzzy . [(20240519 904) ((emacs (26 1)) (company (0 8 12)) (s (1 12 0)) (ht (2 0))) "Fuzzy matching for `company-mode'" tar ((:commit . "ae4dbb00d91fae8f13e236093d99c7e4d0d8fa73") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "matching" "auto-complete" "complete" "fuzzy") (:url . "https://github.com/jcs-elpa/company-fuzzy"))])
  (company-ghci . [(20190707 311) ((company (0 8 11)) (haskell-mode (13))) "company backend which uses the current ghci process." tar ((:commit . "a1d25652583ab4666c5a78cac18cd8039776b50d") (:authors ("Hector Orellana" . "hofm92@gmail.com")) (:maintainers ("Hector Orellana" . "hofm92@gmail.com")) (:maintainer "Hector Orellana" . "hofm92@gmail.com"))])
  (company-glsl . [(20210109 1403) ((company (0 9 4)) (glsl-mode (2 4)) (emacs (24 4))) "Support glsl in company-mode" tar ((:commit . "3a40501ba831a30a7fd3e8529b20d1305d0454aa") (:authors ("Guido Schmidt" . "git@guidoschmidt.cc")) (:maintainers ("Guido Schmidt" . "git@guidoschmidt.cc")) (:maintainer "Guido Schmidt" . "git@guidoschmidt.cc") (:url . "https://github.com/guidoschmidt/company-glsl"))])
  (company-go . [(20170825 1643) ((company (0 8 0)) (go-mode (1 0 0))) "company-mode backend for Go (using gocode)" tar ((:commit . "31948b463f2fc18f8801e5a8fe511fef300eb3dd") (:authors ("nsf" . "no.smile.face@gmail.com")) (:maintainers ("nsf" . "no.smile.face@gmail.com")) (:maintainer "nsf" . "no.smile.face@gmail.com") (:keywords "languages"))])
@@ -751,10 +751,10 @@
  (company-ycmd . [(20180520 1053) ((ycmd (1 3)) (company (0 9 3)) (deferred (0 5 1)) (s (1 11 0)) (dash (2 13 0)) (let-alist (1 0 5)) (f (0 19 0))) "company-mode backend for ycmd" tar ((:commit . "966594701c1eef1f6d4dad0c71c6d43a029977d7") (:url . "https://github.com/abingham/emacs-ycmd"))])
  (compdef . [(20200304 611) ((emacs (24 4))) "A local completion definer" tar ((:commit . "30fb5846ed851efee641ce8c5d8879ad36cd7ac6") (:authors ("Uros Perisic")) (:maintainers ("Uros Perisic")) (:maintainer "Uros Perisic") (:keywords "convenience") (:url . "https://gitlab.com/jjzmajic/compdef"))])
  (competitive-programming-snippets . [(20201115 1702) ((emacs (26)) (yasnippet (0 8 0))) "Competitive Programming snippets for yasnippet" tar ((:commit . "3b43c1aeaa6676d1d3d0c47e78790db9bee150b6") (:authors ("Seong Yong-ju" . "sei40kr@gmail.com")) (:maintainers ("Seong Yong-ju" . "sei40kr@gmail.com")) (:maintainer "Seong Yong-ju" . "sei40kr@gmail.com") (:keywords "tools") (:url . "https://github.com/sei40kr/competitive-programming-snippets"))])
- (compile-multi . [(20240421 1100) ((emacs (28 1))) "A multi target interface to compile" tar ((:commit . "fab41595a704260a295544aecbecb16896824e88") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:keywords "tools" "compile" "build") (:url . "https://github.com/mohkale/compile-multi"))])
- (compile-multi-all-the-icons . [(20240421 1100) ((emacs (28 0)) (all-the-icons-completion (0 0 1))) "Affixate `compile-multi' with icons" tar ((:commit . "fab41595a704260a295544aecbecb16896824e88") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:keywords "tools" "compile" "build") (:url . "https://github.com/mohkale/compile-multi"))])
+ (compile-multi . [(20240507 1829) ((emacs (28 1))) "A multi target interface to compile" tar ((:commit . "1fbd38806c70ebe8ebfec49cc7606284396a31e6") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:keywords "tools" "compile" "build") (:url . "https://github.com/mohkale/compile-multi"))])
+ (compile-multi-all-the-icons . [(20240506 1319) ((emacs (28 0)) (all-the-icons-completion (0 0 1))) "Affixate `compile-multi' with icons" tar ((:commit . "4f9cc1d3c448ecc496540a65578191733c09b0fd") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:keywords "tools" "compile" "build") (:url . "https://github.com/mohkale/compile-multi"))])
  (compile-multi-embark . [(20230904 1806) ((emacs (28 1)) (compile-multi (0 4)) (embark (0 22 1))) "Integration for `compile-multi' and `embark'" tar ((:commit . "30edb0e86287101269debf20f43cead92310029a") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/compile-multi"))])
- (compiler-explorer . [(20240425 2138) ((emacs (26 1)) (request (0 3 0)) (eldoc (1 15 0)) (map (3 3 1)) (seq (2 24))) "Compiler explorer client (godbolt.org)" tar ((:commit . "fcf17db156877e35be589dbc82dd6d5736038961") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com") (:keywords "c" "tools") (:url . "https://github.com/mkcms/compiler-explorer.el"))])
+ (compiler-explorer . [(20240517 1816) ((emacs (26 1)) (plz (0 8)) (eldoc (1 15 0)) (map (3 3 1)) (seq (2 24))) "Compiler explorer client (godbolt.org)" tar ((:commit . "ca01cbfa5941750f3cf2232f00e28032ef7f9bce") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com") (:keywords "c" "tools") (:url . "https://github.com/mkcms/compiler-explorer.el"))])
  (composable . [(20220608 1148) ((emacs (25 1))) "composable editing" tar ((:commit . "205a69c64ea95ef67070423c31ed70ec44ec980c") (:authors ("Simon Friis Vindum" . "simon@vindum.io")) (:maintainers ("Simon Friis Vindum" . "simon@vindum.io")) (:maintainer "Simon Friis Vindum" . "simon@vindum.io") (:keywords "lisp"))])
  (composer . [(20221120 202) ((emacs (25 1)) (seq (1 9)) (php-runtime (0 1 0))) "Interface to PHP Composer" tar ((:commit . "2299cd731205906350d615021f99a66d7a8905c2") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "tools" "php" "dependency" "manager") (:url . "https://github.com/zonuexe/composer.el"))])
  (comware-router-mode . [(20240103 907) ((dash (2 16 0)) (emacs (24 3))) "Major mode for editing Comware configuration files" tar ((:commit . "e1671efe5e0ade2dcbea0c17697d460cd8f0ba67") (:authors ("Davide Restivo" . "davide.restivo@yahoo.it")) (:maintainers ("Davide Restivo" . "davide.restivo@yahoo.it")) (:maintainer "Davide Restivo" . "davide.restivo@yahoo.it") (:keywords "convenience" "faces") (:url . "https://github.com/daviderestivo/comware-router-mode"))])
@@ -766,14 +766,15 @@
  (conkeror-minor-mode . [(20150114 1604) nil "Mode for editing conkeror javascript files." tar ((:commit . "476e81c27b056e21c192391fe674a2bf875466b0") (:authors ("Artur Malabarba" . "bruce.connor.am@gmail.com>")) (:maintainers ("Artur Malabarba" . "bruce.connor.am@gmail.com>")) (:maintainer "Artur Malabarba" . "bruce.connor.am@gmail.com>") (:keywords "programming" "tools") (:url . "http://github.com/Bruce-Connor/conkeror-minor-mode"))])
  (conllu-mode . [(20200501 2328) ((emacs (25)) (cl-lib (0 5)) (flycheck (30)) (hydra (0 13 0)) (s (1 0))) "editing mode for CoNLL-U files" tar ((:commit . "0db3063572b0de08874822e20570bb153747e6ed") (:authors ("bruno cuconato" . "bcclaro+emacs@gmail.com")) (:maintainers ("bruno cuconato" . "bcclaro+emacs@gmail.com")) (:maintainer "bruno cuconato" . "bcclaro+emacs@gmail.com") (:keywords "extensions") (:url . "https://github.com/odanoburu/conllu-mode"))])
  (connection . [(20191111 446) nil "TCP-based client connection" tar ((:commit . "c9cad101100975e88873636bfd426b7a19304ebd") (:authors ("Torsten Hilbrich" . "torsten.hilbrich@gmx.net")) (:maintainers ("Torsten Hilbrich" . "torsten.hilbrich@gmx.net")) (:maintainer "Torsten Hilbrich" . "torsten.hilbrich@gmx.net") (:keywords "network"))])
+ (conner . [(20240512 1717) ((emacs (29 1))) "Define and run project specific commands" tar ((:commit . "d8dabaab32e39b01500841b7465076c6ad73c3b9") (:keywords "tools") (:url . "https://github.com/tralph3/conner"))])
  (constant-theme . [(20180921 1012) ((emacs (24 1))) "A calm, dark, almost monochrome color theme." tar ((:commit . "0feb9f99d708633d62fa548c953ebbe68fd70de0") (:authors ("Jannis Pohlmann" . "contact@jannispohlmann.de")) (:maintainers ("Jannis Pohlmann" . "contact@jannispohlmann.de")) (:maintainer "Jannis Pohlmann" . "contact@jannispohlmann.de") (:keywords "themes") (:url . "https://github.com/jannis/emacs-constant-theme"))])
- (consult . [(20240420 929) ((emacs (27 1)) (compat (29 1 4 4))) "Consulting completing-read" tar ((:commit . "8989c7a5c5035f9e3429f85f1006d0c6cb5d5e8d") (:authors ("Daniel Mendler and Consult contributors")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "matching" "files" "completion") (:url . "https://github.com/minad/consult"))])
+ (consult . [(20240516 2240) ((emacs (27 1)) (compat (29 1 4 4))) "Consulting completing-read" tar ((:commit . "80407622f323669c735737272ecbc3b602434b77") (:authors ("Daniel Mendler and Consult contributors")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "matching" "files" "completion") (:url . "https://github.com/minad/consult"))])
  (consult-ag . [(20230227 406) ((emacs (27 1)) (consult (0 32))) "The silver searcher integration using Consult" tar ((:commit . "9eb4df265aedf2628a714610c2ade6d2f21de053") (:authors ("Kanon Kakuno" . "yadex205@outlook.jp")) (:maintainers ("Kanon Kakuno" . "yadex205@outlook.jp")) (:maintainer "Kanon Kakuno" . "yadex205@outlook.jp") (:url . "https://github.com/yadex205/consult-ag"))])
  (consult-codesearch . [(20230315 1424) ((emacs (27 1)) (consult (0 20))) "Consult interface for codesearch" tar ((:commit . "51df545bb57b468058245950322ae15f6c3a0ce2") (:authors ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainers ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainer "Youngjoo Lee" . "youngker@gmail.com") (:keywords "tools") (:url . "https://github.com/youngker/consult-codesearch"))])
  (consult-company . [(20230606 1824) ((emacs (27 1)) (company (0 9)) (consult (0 9))) "Consult frontend for company" tar ((:commit . "6e309fa9115c9ecd29aa27bff4e3b733979e5dbc") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:url . "https://github.com/mohkale/consult-company"))])
  (consult-compile-multi . [(20230904 1806) ((emacs (28 1)) (compile-multi (0 4)) (consult (0 34))) "Consulting read support for `compile-multi'" tar ((:commit . "30edb0e86287101269debf20f43cead92310029a") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:keywords "tools" "compile" "build") (:url . "https://github.com/mohkale/compile-multi"))])
  (consult-dash . [(20230529 1419) ((emacs (27 2)) (dash-docs (1 4 0)) (consult (0 16))) "Consult front-end for dash-docs" tar ((:commit . "af9f26393583e4b5eb5f29fa4d7e72bf1a46d5f9") (:authors ("Ravi R Kiran" . "lists.ravi@gmail.com")) (:maintainers ("Ravi R Kiran" . "lists.ravi@gmail.com")) (:maintainer "Ravi R Kiran" . "lists.ravi@gmail.com") (:keywords "consult" "dash" "docs") (:url . "https://codeberg.org/ravi/consult-dash"))])
- (consult-dir . [(20230725 2338) ((emacs (27 1)) (consult (0 9))) "Insert paths into the minibuffer prompt" tar ((:commit . "3268ec3f7194c086ecfbd2863e029f42d91b77c1") (:authors ("Karthik Chikmagalur")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com") (:keywords "convenience") (:url . "https://github.com/karthink/consult-dir"))])
+ (consult-dir . [(20240506 236) ((emacs (27 1)) (consult (1 0))) "Insert paths into the minibuffer prompt" tar ((:commit . "15891383f34d43acc5bb82bda92239b1f54cf178") (:authors ("Karthik Chikmagalur")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com") (:keywords "convenience") (:url . "https://github.com/karthink/consult-dir"))])
  (consult-eglot . [(20240324 1137) ((emacs (27 1)) (eglot (1 7)) (consult (0 31)) (project (0 3 0))) "A consulting-read interface for eglot" tar ((:commit . "4fa151f83f15de22eb2a241ddce95bed80b8ba79") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem")) (:maintainer "Mohsin Kaleem") (:keywords "tools" "completion" "lsp") (:url . "https://github.com/mohkale/consult-eglot"))])
  (consult-eglot-embark . [(20240324 1211) ((emacs (27 1)) (consult-eglot (0 3)) (embark-consult (1 0))) "Embark integration for `consult-eglot'" tar ((:commit . "64262e72452f8fe6dd49d31bcdd4bd577b7d682d") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem")) (:maintainer "Mohsin Kaleem") (:keywords "tools" "completion" "lsp") (:url . "https://github.com/mohkale/consult-eglot"))])
  (consult-flycheck . [(20240310 1442) ((emacs (27 1)) (consult (1 4)) (flycheck (34))) "Provides the command `consult-flycheck'" tar ((:commit . "754f5497d827f7d58009256a21af614cc44378a3") (:authors ("Daniel Mendler and Consult contributors")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "languages" "tools" "completion") (:url . "https://github.com/minad/consult-flycheck"))])
@@ -782,8 +783,8 @@
  (consult-git-log-grep . [(20230204 1753) ((emacs (27 1)) (consult (0 16))) "Consult integration for git log grep" tar ((:commit . "30dfcad5745a6b9882d94fec75d38c345a1eff89") (:authors ("Ghosty")) (:maintainers ("Ghosty")) (:maintainer "Ghosty") (:keywords "git" "convenience") (:url . "https://github.com/Ghosty141/consult-git-log-grep"))])
  (consult-hatena-bookmark . [(20221125 109) ((emacs (27 1)) (consult (0 9)) (async-await (1 1))) "Consult commands for the Hatena Bookmark" tar ((:commit . "b85484b11705ebd896878d3ac7fdb12bc8c9637a") (:authors ("Yukinori Kitadai")) (:maintainers ("Yukinori Kitadai")) (:maintainer "Yukinori Kitadai") (:url . "https://github.com/Nyoho/consult-hatena-bookmark"))])
  (consult-ls-git . [(20230924 810) ((emacs (27 1)) (consult (0 16))) "Consult integration for git" tar ((:commit . "3ccd9d80da73a05ef2a74616ffdc469860f74c21") (:authors ("Robin Joy")) (:maintainers ("Robin Joy")) (:maintainer "Robin Joy") (:keywords "convenience") (:url . "https://github.com/rcj/consult-ls-git"))])
- (consult-lsp . [(20230209 714) ((emacs (27 1)) (lsp-mode (5 0)) (consult (0 16)) (f (0 20 0))) "LSP-mode Consult integration" tar ((:commit . "f8db3252c0daa41225ba4ed1c0d178b281cd3e90") (:authors ("Gerry Agbobada")) (:maintainers ("Gerry Agbobada")) (:maintainer "Gerry Agbobada") (:keywords "tools" "completion" "lsp") (:url . "https://github.com/gagbo/consult-lsp"))])
- (consult-notes . [(20240306 1529) ((emacs (27 1)) (consult (0 17)) (s (1 12 0)) (dash (2 19))) "Manage notes with consult" tar ((:commit . "652d0281b81becac643efe96386facf23e1dee01") (:authors ("Colin McLear" . "mclear@fastmail.com")) (:maintainers ("Colin McLear")) (:maintainer "Colin McLear") (:keywords "convenience") (:url . "https://github.com/mclear-tools/consult-notes"))])
+ (consult-lsp . [(20240507 2105) ((emacs (27 1)) (lsp-mode (5 0)) (consult (0 16)) (f (0 20 0))) "LSP-mode Consult integration" tar ((:commit . "68583913168bf66fd4d542b2517a2dcab19c447c") (:authors ("Gerry Agbobada")) (:maintainers ("Gerry Agbobada")) (:maintainer "Gerry Agbobada") (:keywords "tools" "completion" "lsp") (:url . "https://github.com/gagbo/consult-lsp"))])
+ (consult-notes . [(20240516 1423) ((emacs (27 1)) (consult (0 17)) (s (1 12 0)) (dash (2 19))) "Manage notes with consult" tar ((:commit . "c97420c8e91aaae214be7de897eb7eb9b7843520") (:authors ("Colin McLear" . "mclear@fastmail.com")) (:maintainers ("Colin McLear")) (:maintainer "Colin McLear") (:keywords "convenience") (:url . "https://github.com/mclear-tools/consult-notes"))])
  (consult-notmuch . [(20240127 406) ((emacs (26 1)) (consult (0 9)) (notmuch (0 31))) "Notmuch search using consult" tar ((:commit . "d8022e2ddc67ed4e89cc6f5bbe664fdb04e1e815") (:authors ("Jose A Ortega Ruiz" . "jao@gnu.org")) (:maintainers ("Jose A Ortega Ruiz")) (:maintainer "Jose A Ortega Ruiz") (:keywords "mail") (:url . "https://codeberg.org/jao/consult-notmuch"))])
  (consult-org-roam . [(20240217 1442) ((emacs (27 1)) (org-roam (2 2 0)) (consult (0 16))) "Consult integration for org-roam" tar ((:commit . "a6dec09dcd06a3014409044399c4f8860ca45ef1") (:authors ("jgru <https://github.com/jgru>")) (:maintainers ("jgru <https://github.com/jgru>")) (:maintainer "jgru <https://github.com/jgru>") (:url . "https://github.com/jgru/consult-org-roam"))])
  (consult-project-extra . [(20231221 1857) ((emacs (27 1)) (consult (0 17)) (project (0 8 1))) "Consult integration for project.el" tar ((:commit . "982e8008d69ea6733a2a7548e245d645c0fefb3f") (:authors ("Enrique Kessler Martínez")) (:maintainers ("Enrique Kessler Martínez")) (:maintainer "Enrique Kessler Martínez") (:keywords "convenience" "project" "management") (:url . "https://github.com/Qkessler/consult-project-extra"))])
@@ -793,6 +794,7 @@
  (consult-tex . [(20240417 1149) ((emacs (28 2)) (consult (0 35))) "Consult powered completion for tex" tar ((:commit . "675755e106f9e64e2c1fd3cf05a43275c09497da") (:authors ("Titus Pinta")) (:maintainers ("Titus Pinta" . "titus.pinta@gmail.com")) (:maintainer "Titus Pinta" . "titus.pinta@gmail.com") (:keywords "consult" "tex" "latex") (:url . "https://gitlab.com/titus.pinta/consult-TeX"))])
  (consult-todo . [(20231022 2059) ((emacs (27 1)) (consult (0 35)) (hl-todo (3 1 2))) "Search hl-todo keywords in consult" tar ((:commit . "84f3c9876a285f733d75053076a97cc30f7d8eb9") (:authors ("liuyinz" . "liuyinz@gmail.com")) (:maintainers ("liuyinz" . "liuyinz@gmail.com")) (:maintainer "liuyinz" . "liuyinz@gmail.com") (:url . "https://github.com/liuyinz/consult-todo"))])
  (consult-yasnippet . [(20240314 1838) ((emacs (27 1)) (yasnippet (0 14)) (consult (0 16))) "A consulting-read interface for yasnippet" tar ((:commit . "834d39acfe8a7d2c304afbe4d649b9372118c756") (:authors ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainers ("mohsin kaleem" . "mohkale@kisara.moe")) (:maintainer "mohsin kaleem" . "mohkale@kisara.moe") (:url . "https://github.com/mohkale/consult-yasnippet"))])
+ (context-transient . [(20240507 1534) ((emacs (29 1))) "Context specific transients" tar ((:commit . "efd8343f46f9fb2a1ee391c0292fb35d4f91b107") (:authors ("Mykhaylo Bilyanskyy" . "mb@m1k.pw")) (:maintainers ("Mykhaylo Bilyanskyy" . "mb@m1k.pw")) (:maintainer "Mykhaylo Bilyanskyy" . "mb@m1k.pw") (:url . "https://github.com/licht1stein/context-transient.el"))])
  (contextual . [(20180726 800) ((emacs (24)) (dash (2 12 1)) (cl-lib (0 5))) "Contextual profile management system" tar ((:commit . "7ad2bb36426fd182d4d5ee7fd9be1cc0db8c7a84") (:authors ("Alexander Kahl" . "ak@sodosopa.io")) (:maintainers ("Alexander Kahl" . "ak@sodosopa.io")) (:maintainer "Alexander Kahl" . "ak@sodosopa.io") (:keywords "convenience" "tools") (:url . "https://github.com/lshift-de/contextual"))])
  (contextual-menubar . [(20180205 709) nil "display the menubar only on a graphical display" tar ((:commit . "f76f55232ac07df76ef9a334a0c527dfab97c40b") (:authors ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainers ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainer "Aaron Jensen" . "aaronjensen@gmail.com") (:url . "https://github.com/aaronjensen/contextual-menubar"))])
  (contrast-color . [(20160903 1807) ((emacs (24 3)) (cl-lib (0 5))) "Pick best contrast color for you" tar ((:commit . "6ff1b807e09ef6a775e4ab1032bb2ea3fc442d9e") (:authors ("Yuta Yamada <cokesboy[at]gmail.com>")) (:maintainers ("Yuta Yamada <cokesboy[at]gmail.com>")) (:maintainer "Yuta Yamada <cokesboy[at]gmail.com>") (:keywords "color" "convenience") (:url . "https://github.com/yuutayamada/contrast-color-el"))])
@@ -810,7 +812,7 @@
  (corral . [(20160502 948) nil "Quickly surround text with delimiters" tar ((:commit . "e7ab6aa118e46b93d4933d1364bc273f57cd6911") (:authors ("Kevin Liu" . "mail@nivekuil.com")) (:maintainers ("Kevin Liu" . "mail@nivekuil.com")) (:maintainer "Kevin Liu" . "mail@nivekuil.com") (:url . "http://github.com/nivekuil/corral"))])
  (cort . [(20211020 18) ((emacs (24 1)) (ansi (0 4)) (cl-lib (0 6))) "Simplify extended unit test framework" tar ((:commit . "3f64a7b03a4c5b768ec21fd5987acd0d62d16c7b") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "test" "lisp") (:url . "https://github.com/conao3/cort.el"))])
  (cosmo . [(20170922 744) ((emacs (24 4))) "Cosmological Calculator" tar ((:commit . "dd83b09a49a2843606b28279b674b2207040b36b") (:authors ("Francesco Montanari" . "fmnt@fmnt.info")) (:maintainers ("Francesco Montanari" . "fmnt@fmnt.info")) (:maintainer "Francesco Montanari" . "fmnt@fmnt.info") (:keywords "tools") (:url . "https://gitlab.com/montanari/cosmo-el"))])
- (counsel . [(20240413 1905) ((emacs (24 5)) (ivy (0 14 2)) (swiper (0 14 2))) "Various completion functions using Ivy" tar ((:commit . "28ac6c7e32ec0b90803fd35f8d1f04ed0fe2e6a5") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "convenience" "matching" "tools") (:url . "https://github.com/abo-abo/swiper"))])
+ (counsel . [(20240520 1323) ((emacs (24 5)) (ivy (0 14 2)) (swiper (0 14 2))) "Various completion functions using Ivy" tar ((:commit . "8133016ab1b37da233e6daaab471e40abf0f7ba9") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "convenience" "matching" "tools") (:url . "https://github.com/abo-abo/swiper"))])
  (counsel-ag-popup . [(20210121 805) ((emacs (26 1)) (counsel (0 13 0)) (transient (0 3 0))) "Interactive search with counsel-ag" tar ((:commit . "41d85fe36edd72da68f5009ad9cf9013cd19960d") (:authors ("Eder Elorriaga" . "gexplorer8@gmail.com")) (:maintainers ("Eder Elorriaga" . "gexplorer8@gmail.com")) (:maintainer "Eder Elorriaga" . "gexplorer8@gmail.com") (:keywords "convenience" "matching" "tools") (:url . "https://github.com/gexplorer/counsel-ag-popup"))])
  (counsel-at-point . [(20240422 116) ((emacs (29 1)) (counsel (0 13 0))) "Context sensitive project search" tar ((:commit . "5aa7a483c5188d71c04c3302cfd900e7be91ffd6") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:keywords "convenience") (:url . "https://codeberg.org/ideasman42/emacs-counsel-at-point"))])
  (counsel-bbdb . [(20220909 727) ((emacs (24 3)) (bbdb (3 2 2 2))) "Quick search&input email from BBDB based on Emacs API `completing-read'" tar ((:commit . "ccae56b0551abb305cad087d85f1b6a97adb7c0f") (:authors ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com") (:keywords "mail" "abbrev" "convenience" "matching") (:url . "https://github.com/redguard/counsel-bbdb"))])
@@ -917,7 +919,7 @@
  (daml-mode . [(20231106 916) ((emacs (27 1)) (haskell-mode (16 1))) "Major mode for daml" tar ((:commit . "3ba1166edd4c22402996625b1f8a05a2d5b1cbc6") (:authors ("Bártfai Tamás")) (:maintainers ("Bártfai Tamás")) (:maintainer "Bártfai Tamás") (:url . "https://github.com/bartfaitamas/daml-mode"))])
  (danneskjold-theme . [(20231110 722) nil "Beautiful high-contrast Emacs theme." tar ((:commit . "b3335e44f468c019c95a8210ce1ed9fe23c65735") (:authors ("Dmitry Akatov" . "akatovda@yandex.com")) (:maintainer "Dmitry Akatov" . "akatovda@yandex.com") (:url . "https://github.com/rails-to-cosmos/danneskjold-theme"))])
  (dante . [(20230808 658) ((dash (2 12 0)) (emacs (27 1)) (f (0 19 0)) (flycheck (0 30)) (company (0 9)) (flymake (1 0)) (s (1 11 0)) (lcr (1 5))) "Development mode for Haskell" tar ((:commit . "ca47f8cc1392c7045db7da8b4fafe86b7c044e90") (:authors ("Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com")) (:maintainers ("Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com")) (:maintainer "Jean-Philippe Bernardy" . "jeanphilippe.bernardy@gmail.com") (:keywords "haskell" "tools") (:url . "https://github.com/jyp/dante"))])
- (dap-mode . [(20240424 1359) ((emacs (27 1)) (dash (2 18 0)) (lsp-mode (6 0)) (bui (1 1 0)) (f (0 20 0)) (s (1 12 0)) (lsp-treemacs (0 1)) (posframe (0 7 0)) (ht (2 3)) (lsp-docker (1 0 0))) "Debug Adapter Protocol mode" tar ((:commit . "22af181d627577968f03213ba59d02458d3e734a") (:authors ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainers ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainer "Ivan Yonchovski" . "yyoncho@gmail.com") (:keywords "languages" "debug") (:url . "https://github.com/emacs-lsp/dap-mode"))])
+ (dap-mode . [(20240514 1617) ((emacs (27 1)) (dash (2 18 0)) (lsp-mode (6 0)) (bui (1 1 0)) (f (0 20 0)) (s (1 12 0)) (lsp-treemacs (0 1)) (posframe (0 7 0)) (ht (2 3)) (lsp-docker (1 0 0))) "Debug Adapter Protocol mode" tar ((:commit . "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583") (:authors ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainers ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainer "Ivan Yonchovski" . "yyoncho@gmail.com") (:keywords "languages" "debug") (:url . "https://github.com/emacs-lsp/dap-mode"))])
  (darcsum . [(20190316 2215) nil "a pcl-cvs like interface for managing darcs patches" tar ((:commit . "6a8b690539d133c5e3d17cb23fe4365fbb6fb493") (:authors ("John Wiegley" . "johnw@gnu.org")) (:maintainers ("John Wiegley" . "johnw@gnu.org")) (:maintainer "John Wiegley" . "johnw@gnu.org") (:keywords "completion" "convenience" "tools" "vc"))])
  (darcula-theme . [(20171227 1845) nil "Inspired by IntelliJ's Darcula theme" tar ((:commit . "d9b82b58ded9014985be6658f4ab17e26ed9e93e") (:authors ("Sam Halliday" . "Sam.Halliday@gmail.com")) (:maintainers ("Sam Halliday" . "Sam.Halliday@gmail.com")) (:maintainer "Sam Halliday" . "Sam.Halliday@gmail.com") (:keywords "faces") (:url . "https://gitlab.com/fommil/emacs-darcula-theme"))])
  (dark-krystal-theme . [(20170808 1300) ((emacs (24 0))) "an Emacs 24 theme based on Dark Krystal (tmTheme)" tar ((:commit . "79084b99665dc9ffb0ec62cc092349a5ecebebbc") (:authors ("Jason Milkins")) (:maintainers ("Jason Milkins")) (:maintainer "Jason Milkins") (:url . "https://github.com/emacsfodder/tmtheme-to-deftheme"))])
@@ -929,7 +931,7 @@
  (darktooth-theme . [(20231011 427) ((emacs (27 1)) (autothemer (0 2))) "From the darkness... it watches" tar ((:commit . "2358dd334b5dcb6dc9828422bd7bd1e4da556819") (:url . "http://github.com/emacsfodder/emacs-theme-darktooth"))])
  (dart-mode . [(20231002 1138) ((emacs (27 1))) "Major mode for editing Dart files" tar ((:commit . "61e01142352f6813aca6512bedadb5007de3a0b9") (:authors ("Brady Trainor")) (:maintainers ("Jen-Chieh Shen" . "jcs090218@gmail.com")) (:maintainer "Jen-Chieh Shen" . "jcs090218@gmail.com") (:keywords "languages") (:url . "https://github.com/emacsorphanage/dart-mode"))])
  (dart-server . [(20210501 1445) ((emacs (24 5)) (cl-lib (0 5)) (dash (2 10 0)) (flycheck (0 23)) (s (1 10))) "Minor mode for editing Dart files" tar ((:commit . "75562baf9a89b7e314bc2f795f6ecdc5d1f2cc8c") (:authors ("Natalie Weizenbaum") ("Brady Trainor" . "mail@bradyt.com")) (:maintainers ("Brady Trainor" . "mail@bradyt.com")) (:maintainer "Brady Trainor" . "mail@bradyt.com") (:keywords "languages") (:url . "https://github.com/bradyt/dart-server"))])
- (dash . [(20240405 946) ((emacs (24))) "A modern list library for Emacs" tar ((:commit . "885332bbc4582b08d4f24526250876f3a7569067") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainers ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com") (:keywords "extensions" "lisp") (:url . "https://github.com/magnars/dash.el"))])
+ (dash . [(20240510 1327) ((emacs (24))) "A modern list library for Emacs" tar ((:commit . "1de9dcb83eacfb162b6d9a118a4770b1281bcd84") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainers ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com") (:keywords "extensions" "lisp") (:url . "https://github.com/magnars/dash.el"))])
  (dash-alfred . [(20191024 450) ((emacs (25 1))) "Search Dash documentation via Dash-Alfred-Workflow" tar ((:commit . "fcd21bd6c7eb5cd31377be970406ff3d2454bd5c") (:authors ("Xu Chunyang")) (:maintainers ("Xu Chunyang")) (:maintainer "Xu Chunyang") (:keywords "docs") (:url . "https://github.com/xuchunyang/dash-alfred.el"))])
  (dash-at-point . [(20211023 104) nil "Search the word at point with Dash" tar ((:commit . "fba1a6f42ea51d05110e12c62bdced664059eb55") (:authors ("Shinji Tanaka" . "shinji.tanaka@gmail.com")) (:maintainers ("Shinji Tanaka" . "shinji.tanaka@gmail.com")) (:maintainer "Shinji Tanaka" . "shinji.tanaka@gmail.com") (:url . "https://github.com/stanaka/dash-at-point"))])
  (dash-docs . [(20210830 926) ((emacs (24 4)) (cl-lib (0 5)) (async (1 9 3))) "Offline documentation browser using Dash docsets." tar ((:commit . "29848b6b347ac520f7646c200ed2ec36cea3feda") (:authors ("Raimon Grau" . "raimonster@gmail.com") ("Toni Reina " . "areina0@gmail.com") ("Bryan Gilbert" . "bryan@bryan.sh")) (:maintainers ("Raimon Grau" . "raimonster@gmail.com")) (:maintainer "Raimon Grau" . "raimonster@gmail.com") (:keywords "docs") (:url . "http://github.com/areina/helm-dash"))])
@@ -952,7 +954,7 @@
  (ddskk . [(20230701 2340) ((ccc (1 43)) (cdb (20141201 754))) "Simple Kana to Kanji conversion program." tar ((:commit . "8c47f46e38a29a0f3eabcd524268d20573102467") (:authors ("Masahiko Sato" . "masahiko@kuis.kyoto-u.ac.jp")) (:maintainer "SKK Development Team") (:keywords "japanese" "mule" "input method") (:url . "https://github.com/skk-dev/ddskk"))])
  (ddskk-posframe . [(20200812 917) ((emacs (26 1)) (posframe (0 4 3)) (ddskk (16 2 50))) "Show Henkan tooltip for ddskk via posframe" tar ((:commit . "299493dd951e5a0b43b8213321e3dc0bac10f762") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "tooltip" "convenience" "posframe") (:url . "https://github.com/conao3/ddskk-posframe.el"))])
  (deadgrep . [(20240408 1537) ((emacs (25 1)) (dash (2 12 0)) (s (1 11 0)) (spinner (1 7 3))) "fast, friendly searching with ripgrep" tar ((:commit . "eafc642c551e6d5df7eb1fee9aa7596e59811178") (:authors ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainers ("Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainer "Wilfred Hughes" . "me@wilfred.me.uk") (:keywords "tools") (:url . "https://github.com/Wilfred/deadgrep"))])
- (debian-el . [(20240404 541) nil "startup file for the debian-el package" tar ((:commit . "7bbbf575f0ce11cb4b6acd89e56000ae388b1413") (:authors ("Debian Emacsen Team" . "debian-emacsen@lists.debian.org")) (:maintainers ("Debian Emacsen Team" . "debian-emacsen@lists.debian.org")) (:maintainer "Debian Emacsen Team" . "debian-emacsen@lists.debian.org") (:keywords "debian" "apt" "elisp"))])
+ (debian-el . [(20240519 1104) nil "startup file for the debian-el package" tar ((:commit . "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9") (:authors ("Debian Emacsen Team" . "debian-emacsen@lists.debian.org")) (:maintainers ("Debian Emacsen Team" . "debian-emacsen@lists.debian.org")) (:maintainer "Debian Emacsen Team" . "debian-emacsen@lists.debian.org") (:keywords "debian" "apt" "elisp"))])
  (debpaste . [(20161214 2023) ((xml-rpc (1 6 7))) "Interface for getting/posting/deleting pastes from paste.debian.net" tar ((:commit . "6f2a400665062468ebd03a2ce1de2a73d9084958") (:authors ("Alex Kost" . "alezost@gmail.com")) (:maintainers ("Alex Kost" . "alezost@gmail.com")) (:maintainer "Alex Kost" . "alezost@gmail.com") (:keywords "paste") (:url . "http://github.com/alezost/debpaste.el"))])
  (debug-print . [(20140126 19) ((emacs (24))) "A nice printf debugging environment by the way Gauche do" tar ((:commit . "d817fd9ea2d3f8d2c1ace4d8af155684f3a99dc5") (:authors ("Ken Okada" . "keno.ss57@gmail.com")) (:maintainers ("Ken Okada" . "keno.ss57@gmail.com")) (:maintainer "Ken Okada" . "keno.ss57@gmail.com") (:keywords "extensions" "lisp" "tools" "maint") (:url . "https://github.com/kenoss/debug-print"))])
  (decide . [(20230424 1647) nil "rolling dice and other random things" tar ((:commit . "9c0e4c4493f9af9a981627d0630ac6cb2d8c98f0") (:authors ("Pelle Nilsson" . "perni@lysator.liu.se")) (:maintainers ("Pelle Nilsson" . "perni@lysator.liu.se")) (:maintainer "Pelle Nilsson" . "perni@lysator.liu.se"))])
@@ -977,7 +979,7 @@
  (demo-it . [(20211221 2152) nil "Create demonstrations" tar ((:commit . "8ade739bb2605275f1f56128a0a9a8c6b55bab6a") (:authors ("Howard Abrams" . "howard.abrams@gmail.com")) (:maintainers ("Howard Abrams" . "howard.abrams@gmail.com")) (:maintainer "Howard Abrams" . "howard.abrams@gmail.com") (:keywords "demonstration" "presentation" "test"))])
  (deno-fmt . [(20230117 1117) ((emacs (24))) "Minor mode for using deno fmt on save" tar ((:commit . "6378966f448a3b9b5ae98af58cd13a031bd26702") (:authors ("Russell Clarey <http://github/rclarey>")) (:maintainers ("Russell Clarey <http://github/rclarey>")) (:maintainer "Russell Clarey <http://github/rclarey>") (:url . "https://github.com/russell/deno-emacs"))])
  (deno-ts-mode . [(20230912 202) ((emacs (29 1))) "Major mode for Deno" tar ((:commit . "526b6c00483cd86a028805e31ebd8a4a7000c3da") (:authors ("Graham Marlow" . "info@mgmarlow.com")) (:maintainers ("Graham Marlow" . "info@mgmarlow.com")) (:maintainer "Graham Marlow" . "info@mgmarlow.com") (:keywords "languages") (:url . "https://git.sr.ht/~mgmarlow/deno-ts-mode"))])
- (denote-explore . [(20240426 450) ((emacs (29 1)) (denote (2 3 5)) (dash (2 19 1))) "Explore Denote files" tar ((:commit . "9e1a5162dbec751fe62ce4b99bcb0e5024f39f94") (:authors ("Peter Prevos" . "peter@prevos.net")) (:maintainers ("Peter Prevos" . "peter@prevos.net")) (:maintainer "Peter Prevos" . "peter@prevos.net") (:url . "https://github.com/pprevos/denote-explore/"))])
+ (denote-explore . [(20240512 113) ((emacs (29 1)) (denote (2 3 5)) (dash (2 19 1))) "Explore Denote files" tar ((:commit . "7073ef97758fbcf953557efa15da9226283ff6b0") (:authors ("Peter Prevos" . "peter@prevos.net")) (:maintainers ("Peter Prevos" . "peter@prevos.net")) (:maintainer "Peter Prevos" . "peter@prevos.net") (:url . "https://github.com/pprevos/denote-explore/"))])
  (derl . [(20231004 821) ((emacs (29 1))) "Erlang distribution protocol implementation" tar ((:commit . "6f31592bb3083de366cdb13a7db0ed69fc72de47") (:authors ("Axel Forsman" . "axel@axelf.se")) (:maintainers ("Axel Forsman" . "axel@axelf.se")) (:maintainer "Axel Forsman" . "axel@axelf.se") (:keywords "comm" "extensions" "languages" "processes") (:url . "https://github.com/axelf4/derl.el"))])
  (describe-hash . [(20200718 1556) nil "Help function for examining a hash map" tar ((:commit . "20dbbbea630055b2401f13a55fbb21216960dc46") (:url . "https://github.com/Junker/describe-hash"))])
  (describe-number . [(20151101 55) ((yabin (1 1))) "Describe arbitrarily large number at point." tar ((:commit . "40618345a37831804b29589849a785ef5aa5ac24") (:authors ("Morten Slot Kristensen <msk AT nullpointer DOT dk>")) (:maintainers ("Morten Slot Kristensen <msk AT nullpointer DOT dk>")) (:maintainer "Morten Slot Kristensen <msk AT nullpointer DOT dk>") (:keywords "describe" "value" "help") (:url . "https://github.com/netromdk/describe-number"))])
@@ -988,7 +990,7 @@
  (detached . [(20221129 1430) ((emacs (27 1))) "A package to launch, and manage, detached processes" tar ((:commit . "6b64d4d8064cee781e071e825857b442ea96c3d9") (:authors ("Niklas Eklund" . "niklas.eklund@posteo.net")) (:maintainers ("detached.el Development" . "~niklaseklund/detached.el@lists.sr.ht")) (:maintainer "detached.el Development" . "~niklaseklund/detached.el@lists.sr.ht") (:keywords "convenience" "processes") (:url . "https://sr.ht/~niklaseklund/detached.el/"))])
  (detour . [(20181122 2138) ((emacs (24 4))) "Take a quick detour and return" tar ((:commit . "f41f17cf1cf4f3db41563ff011786b6567596fb4") (:authors ("Stefan Kamphausen <www.skamphausen.de>")) (:maintainers ("Stefan Kamphausen <www.skamphausen.de>")) (:maintainer "Stefan Kamphausen <www.skamphausen.de>") (:keywords "convenience" "abbrev") (:url . "https://github.com/ska2342/detour/"))])
  (devdocs . [(20240428 711) ((emacs (27 1))) "Emacs viewer for DevDocs" tar ((:commit . "c14d1306648d3ae09ee3a3b3f45592334943cfeb") (:authors ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainers ("Augusto Stoffel" . "arstoffel@gmail.com")) (:maintainer "Augusto Stoffel" . "arstoffel@gmail.com") (:keywords "help") (:url . "https://github.com/astoff/devdocs.el"))])
- (devdocs-browser . [(20240414 1251) ((emacs (27 1))) "Browse devdocs.io documents using EWW" tar ((:commit . "d4ebae6b12ba13393270278a75b053d53af3ac54") (:authors ("blahgeek" . "i@blahgeek.com")) (:maintainers ("blahgeek" . "i@blahgeek.com")) (:maintainer "blahgeek" . "i@blahgeek.com") (:keywords "docs" "help" "tools") (:url . "https://github.com/blahgeek/emacs-devdocs-browser"))])
+ (devdocs-browser . [(20240511 306) ((emacs (27 1))) "Browse devdocs.io documents using EWW" tar ((:commit . "0655b89651458777354a3b89c1d486e0fda1928d") (:authors ("blahgeek" . "i@blahgeek.com")) (:maintainers ("blahgeek" . "i@blahgeek.com")) (:maintainer "blahgeek" . "i@blahgeek.com") (:keywords "docs" "help" "tools") (:url . "https://github.com/blahgeek/emacs-devdocs-browser"))])
  (devil . [(20240107 2149) ((emacs (24 4))) "Minor mode for translating key sequences" tar ((:commit . "dd29681fe07f37c4acbff32a5767bddcbf3b5b80") (:authors ("Susam Pal" . "susam@susam.net")) (:maintainers ("Susam Pal" . "susam@susam.net")) (:maintainer "Susam Pal" . "susam@susam.net") (:keywords "convenience" "abbrev") (:url . "https://github.com/susam/devil"))])
  (dfmt . [(20170728 1023) nil "Emacs Interface to D indenting/formatting tool dfmt." tar ((:commit . "21b9094e907b7ac53f5ecb4ff4539613a9d12434") (:authors ("Per Nordlöw")) (:maintainers ("Kirill Babikhin <qsimpleq>")) (:maintainer "Kirill Babikhin <qsimpleq>") (:keywords "tools" "convenience" "languages" "dlang") (:url . "https://github.com/qsimpleq/elisp-dfmt"))])
  (dhall-mode . [(20230228 1005) ((emacs (24 4)) (reformatter (0 3))) "Major mode for the dhall configuration language" tar ((:commit . "87ab69fe765d87b3bb1604a306a8c44d6887681d") (:authors ("Sibi Prabakaran" . "sibi@psibi.in")) (:maintainers ("Sibi Prabakaran" . "sibi@psibi.in")) (:maintainer "Sibi Prabakaran" . "sibi@psibi.in") (:keywords "languages") (:url . "https://github.com/psibi/dhall-mode"))])
@@ -1000,14 +1002,14 @@
  (didyoumean . [(20240229 1807) ((emacs (24 4))) "Did you mean to open another file?" tar ((:commit . "fc12bd33c7b4f6dc74e49735c269ff75c72227a1") (:keywords "convenience") (:url . "https://gitlab.com/kisaragi-hiu/didyoumean.el"))])
  (diff-ansi . [(20240421 810) ((emacs (29 1))) "Display diff's using alternative diffing tools" tar ((:commit . "9e5b61a82e04ffd0e81f88fcf159575618886d72") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-diff-ansi"))])
  (diff-at-point . [(20240421 858) ((emacs (29 1))) "Diff navigation" tar ((:commit . "bdd507b940e57a110e0e7d31834987924abc05b2") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-diff-at-point"))])
- (diff-hl . [(20240401 2357) ((cl-lib (0 2)) (emacs (25 1))) "Highlight uncommitted changes using VC" tar ((:commit . "09a0f8fcc7e6ce3f49dca64cdfab898d6762f2a4") (:authors ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "vc" "diff") (:url . "https://github.com/dgutov/diff-hl"))])
+ (diff-hl . [(20240505 2110) ((cl-lib (0 2)) (emacs (25 1))) "Highlight uncommitted changes using VC" tar ((:commit . "11f3113e790526d5ee00f61f8e7cd0d01e323b2e") (:authors ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "vc" "diff") (:url . "https://github.com/dgutov/diff-hl"))])
  (diffed . [(20230208 1546) ((emacs (27 1))) "Diffed is for recursive diff like Dired is for ls" tar ((:commit . "f7dc37f13a4f1660212c41a6e9faba61eb8cc078") (:authors ("Bernhard Rotter" . "bernhard@b-rotter.de")) (:maintainers ("Bernhard Rotter" . "bernhard@b-rotter.de")) (:maintainer "Bernhard Rotter" . "bernhard@b-rotter.de") (:keywords "tools") (:url . "https://github.com/ber-ro/diffed"))])
  (difflib . [(20210224 2242) ((emacs (24 4)) (cl-generic (0 3)) (ht (2 2)) (s (1 12 0))) "Helpers for computing deltas between sequences." tar ((:commit . "646fc4388274fe765bbf4661e17a24e4d081250c") (:authors ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainers ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainer "Diego A. Mundo" . "dieggsy@pm.me") (:keywords "matching" "tools" "string") (:url . "http://github.com/dieggsy/difflib.el"))])
  (diffpdf . [(20210626 1447) ((emacs (25 1)) (transient (0 3 0))) "Transient diffpdf" tar ((:commit . "a5b203b549e373cb9b0ef3f00c0010bd34dd644a") (:authors ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainers ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainer "Shuguang Sun" . "shuguang79@qq.com") (:keywords "tools") (:url . "https://github.com/ShuguangSun/diffpdf.el"))])
  (diffscuss-mode . [(20141014 2357) nil "Major mode for diffscuss files." tar ((:commit . "bbc6dbed4b97d1eb9ae5dae021ed1e066129bd98") (:authors ("Edmund Jorgensen" . "edmund@hut8labs.com")) (:maintainers ("Edmund Jorgensen" . "edmund@hut8labs.com")) (:maintainer "Edmund Jorgensen" . "edmund@hut8labs.com") (:keywords "tools"))])
- (difftastic . [(20240423 1553) ((emacs (28 1)) (compat (29 1 4 2)) (magit (20220326))) "Wrapper for difftastic" tar ((:commit . "56ec9ba861b132a96220837d711f6e79c26c268d") (:authors ("Przemyslaw Kryger" . "pkryger@gmail.com")) (:maintainers ("Przemyslaw Kryger" . "pkryger@gmail.com")) (:maintainer "Przemyslaw Kryger" . "pkryger@gmail.com") (:keywords "tools" "diff") (:url . "https://github.com/pkryger/difftastic.el"))])
+ (difftastic . [(20240429 2057) ((emacs (28 1)) (compat (29 1 4 2)) (magit (20220326))) "Wrapper for difftastic" tar ((:commit . "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa") (:authors ("Przemyslaw Kryger" . "pkryger@gmail.com")) (:maintainers ("Przemyslaw Kryger" . "pkryger@gmail.com")) (:maintainer "Przemyslaw Kryger" . "pkryger@gmail.com") (:keywords "tools" "diff") (:url . "https://github.com/pkryger/difftastic.el"))])
  (diffview . [(20230224 1916) nil "View diffs in side-by-side format" tar ((:commit . "8f07c0ff4a1acef990589df0d3e32288f19c9d71") (:authors ("Mitchel Humpherys" . "mitch.special@gmail.com")) (:maintainers ("Mitchel Humpherys" . "mitch.special@gmail.com")) (:maintainer "Mitchel Humpherys" . "mitch.special@gmail.com") (:keywords "convenience" "diff") (:url . "https://github.com/mgalgs/diffview-mode"))])
- (digistar-mode . [(20240220 1600) nil "major mode for Digistar scripts" tar ((:commit . "178cb58a3a52d22168f641a5436addf0904d5c45") (:authors ("John Foerch" . "jjfoerch@gmail.com")) (:maintainers ("John Foerch" . "jjfoerch@gmail.com")) (:maintainer "John Foerch" . "jjfoerch@gmail.com") (:keywords "languages"))])
+ (digistar-mode . [(20240515 1529) nil "major mode for Digistar scripts" tar ((:commit . "546adaccb1f90d6947c2c80c2fab4933f40bc274") (:authors ("John Foerch" . "jjfoerch@gmail.com")) (:maintainers ("John Foerch" . "jjfoerch@gmail.com")) (:maintainer "John Foerch" . "jjfoerch@gmail.com") (:keywords "languages"))])
  (digit-groups . [(20200506 37) ((dash (2 11 0))) "Highlight place-value positions in numbers" tar ((:commit . "7b81930cad19b8b7913b7eedbcb498964bfdcbdb") (:authors ("Michael D. Adams <http://michaeldadams.org>")) (:maintainers ("Michael D. Adams <http://michaeldadams.org>")) (:maintainer "Michael D. Adams <http://michaeldadams.org>") (:url . "https://github.com/adamsmd/digit-groups/"))])
  (digitalocean . [(20190607 726) ((request (2 5)) (emacs (24 4))) "Create and manipulate digitalocean droplets" tar ((:commit . "6c32d3593286e2a62d9afab0057c829407b0d1e8") (:authors ("Oliver Marks" . "oly@digitaloctave.com")) (:maintainers ("Oliver Marks" . "oly@digitaloctave.com")) (:maintainer "Oliver Marks" . "oly@digitaloctave.com") (:keywords "processes" "tools") (:url . "https://github.com/olymk2/emacs-digitalocean"))])
  (digitalocean-helm . [(20180610 746) ((emacs (24 3)) (helm (2 5)) (digitalocean (0 1))) "Create and manipulate digitalocean droplets" tar ((:commit . "b125c9882eded7d73ec109d152b26625f333440b") (:authors ("Oliver Marks" . "oly@digitaloctave.com")) (:maintainers ("Oliver Marks" . "oly@digitaloctave.com")) (:maintainer "Oliver Marks" . "oly@digitaloctave.com") (:keywords "processes" "tools") (:url . "https://gitlab.com/olymk2/digitalocean-api"))])
@@ -1123,7 +1125,7 @@
  (dokuwiki-mode . [(20170223 1301) nil "Major mode for DokuWiki document" tar ((:commit . "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1") (:authors ("Tsunenobu Kai" . "kai2nenobu@gmail.com")) (:maintainers ("Tsunenobu Kai" . "kai2nenobu@gmail.com")) (:maintainer "Tsunenobu Kai" . "kai2nenobu@gmail.com") (:keywords "hypermedia" "text" "dokuwiki") (:url . "https://github.com/kai2nenobu/emacs-dokuwiki-mode"))])
  (dollaro . [(20151123 1302) ((s (1 6 0))) "simple text templates" tar ((:commit . "500127f0172ac7a1eec627e026b59136580a74ac") (:authors ("Alessandro Piras" . "laynor@gmail.com")) (:maintainers ("Alessandro Piras" . "laynor@gmail.com")) (:maintainer "Alessandro Piras" . "laynor@gmail.com") (:keywords "tools" "convenience"))])
  (doom . [(20180301 2308) ((cl-lib (0 5))) "DOM implementation and manipulation library" tar ((:commit . "e59040aefc92dd9b3134eb623624307fb9e4327b") (:authors ("Alex Schroeder" . "alex@gnu.org") ("Henrik.Motakef" . "elisp@henrik-motakef.de") ("Katherine Whitlock" . "toroidal-code@gmail.com") ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Alex Schroeder")) (:maintainer "Alex Schroeder") (:keywords "xml" "dom") (:url . "http://www.github.com/kensanata/doom.el/"))])
- (doom-modeline . [(20240425 609) ((emacs (25 1)) (compat (29 1 4 2)) (nerd-icons (0 1 0)) (shrink-path (0 3 1))) "A minimal and modern mode-line" tar ((:commit . "150b5bf8da8050e5db1193f827c33b16a5d8dd3f") (:authors ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Vincent Zhang" . "seagle0128@gmail.com") (:keywords "faces" "mode-line") (:url . "https://github.com/seagle0128/doom-modeline"))])
+ (doom-modeline . [(20240510 144) ((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 ((:commit . "65d0bd83eb7c393092e032c24b882f3ba19b4899") (:authors ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Vincent Zhang" . "seagle0128@gmail.com") (:keywords "faces" "mode-line") (:url . "https://github.com/seagle0128/doom-modeline"))])
  (doom-modeline-now-playing . [(20210831 1442) ((emacs (24 4)) (doom-modeline (3 0 0)) (async (1 9 3))) "Segment for Doom Modeline to show playerctl information" tar ((:commit . "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c") (:authors ("Ellis Kenyő" . "me@elken.dev")) (:maintainers ("Ellis Kenyő" . "me@elken.dev")) (:maintainer "Ellis Kenyő" . "me@elken.dev") (:url . "https://github.com/elken/doom-modeline-now-playing"))])
  (doom-themes . [(20240404 2042) ((emacs (25 1)) (cl-lib (0 5))) "an opinionated pack of modern color-themes" tar ((:commit . "3b2422b208d28e8734b300cd3cc6a7f4af5eba55") (:authors ("Henrik Lissner" . "contact@henrik.io")) (:maintainers ("Henrik Lissner" . "contact@henrik.io")) (:maintainer "Henrik Lissner" . "contact@henrik.io") (:keywords "themes" "faces") (:url . "https://github.com/doomemacs/themes"))])
  (dot-env . [(20230820 2014) ((emacs (24 4)) (s (1 13 0))) "Dotenv functionality" tar ((:commit . "83ce690e8ef9175fc621c85d5fbef4f7ace7b7a8") (:authors ("Amo DelBello")) (:maintainers ("Amo DelBello")) (:maintainer "Amo DelBello") (:keywords "convenience" "dotenv" "environment" "configuration") (:url . "https://github.com/amodelbello/dot-env.el"))])
@@ -1157,7 +1159,7 @@
  (dts-mode . [(20211202 18) nil "Major mode for Devicetree source code" tar ((:commit . "32517e7eeeccc785b7c669fd5e93c5df45597ef1") (:authors ("Ben Gamari" . "ben@smart-cactus.org")) (:maintainers ("Ben Gamari" . "ben@smart-cactus.org")) (:maintainer "Ben Gamari" . "ben@smart-cactus.org") (:keywords "languages"))])
  (ducpel . [(20140702 1154) ((cl-lib (0 5))) "Logic game with sokoban elements" tar ((:commit . "2f2ce2df269d99261c808a5c4ebc00d6d2cddabc") (:authors ("Alex Kost" . "alezost@gmail.com")) (:maintainers ("Alex Kost" . "alezost@gmail.com")) (:maintainer "Alex Kost" . "alezost@gmail.com") (:keywords "games") (:url . "https://github.com/alezost/ducpel"))])
  (dumb-diff . [(20171211 2122) ((emacs (24 3))) "fast arbitrary diffs" tar ((:commit . "1a2331d283049b71a07c1b06b1e0627a950d55f4") (:authors ("jack angers")) (:maintainers ("jack angers")) (:maintainer "jack angers") (:keywords "programming" "diff"))])
- (dumb-jump . [(20240114 354) ((emacs (24 3)) (s (1 11 0)) (dash (2 9 0)) (popup (0 5 3))) "Jump to definition for 50+ languages without configuration" tar ((:commit . "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5") (:authors ("jack angers and contributors")) (:maintainers ("jack angers and contributors")) (:maintainer "jack angers and contributors") (:keywords "programming") (:url . "https://github.com/jacktasia/dumb-jump"))])
+ (dumb-jump . [(20240514 702) ((emacs (24 3)) (s (1 11 0)) (dash (2 9 0)) (popup (0 5 3))) "Jump to definition for 50+ languages without configuration" tar ((:commit . "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39") (:authors ("jack angers and contributors")) (:maintainers ("jack angers and contributors")) (:maintainer "jack angers and contributors") (:keywords "programming") (:url . "https://github.com/jacktasia/dumb-jump"))])
  (dummyparens . [(20141009 1024) nil "parenthesis auto-pairing and wrapping" tar ((:commit . "9798ef1d0eaa24e4fe66f8aa6022a8c62714cc89") (:authors ("Sergei Nosov <sergei.nosov [at] gmail.com>")) (:maintainers ("Sergei Nosov <sergei.nosov [at] gmail.com>")) (:maintainer "Sergei Nosov <sergei.nosov [at] gmail.com>") (:keywords "dummyparens" "auto-pair" "wrapping") (:url . "https://github.com/snosov1/dummyparens"))])
  (dune . [(20240427 1346) nil "Integration with the dune build system" tar ((:commit . "5554158af27ead066fbb3c009e780c930958613c") (:url . "https://github.com/ocaml/dune"))])
  (dune-format . [(20210505 108) ((reformatter (0 6)) (emacs (24 1))) "Reformat OCaml's dune files automatically" tar ((:commit . "eda7a16ae378e7c482c11228c43ef32b893a1520") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "languages") (:url . "https://github.com/purcell/emacs-dune-format"))])
@@ -1166,7 +1168,7 @@
  (dut-mode . [(20170729 2111) ((emacs (24))) "Major mode for the Dut programming language" tar ((:commit . "9235c7acaa6690942e9de8b7acd1e4be0c859dc1") (:authors ("The dut-mode Authors")) (:maintainers ("The dut-mode Authors")) (:maintainer "The dut-mode Authors") (:keywords "languages" "gut") (:url . "https://github.com/dut-lang/dut-mode"))])
  (dw . [(20210331 2311) ((emacs (25 1))) "Diceware passphrase generation commands" tar ((:commit . "61c5718ba64ace4c9e29de18aa2690ecc3f0f258") (:authors ("D. Williams" . "d.williams@posteo.net")) (:maintainers ("D. Williams" . "d.williams@posteo.net")) (:maintainer "D. Williams" . "d.williams@posteo.net") (:keywords "convenience" "games") (:url . "https://github.com/integral-dw/dw-passphrase-generator"))])
  (dwim-coder-mode . [(20230830 1215) ((emacs (29))) "DWIM keybindings for C, Python, Rust, and more" tar ((:commit . "94a752fca078144dd309343880abafbc4eacca5f") (:authors ("Mohammed Sadiq" . "sadiq@sadiqpk.org")) (:maintainers ("Mohammed Sadiq" . "sadiq@sadiqpk.org")) (:maintainer "Mohammed Sadiq" . "sadiq@sadiqpk.org") (:keywords "convenience" "hacks") (:url . "https://sadiqpk.org/projects/dwim-coder-mode.html"))])
- (dwim-shell-command . [(20240414 1607) ((emacs (28 1))) "Shell commands with DWIM behaviour" tar ((:commit . "3dc879fa4c473d1f7c0929ebb0cebcbe729553cc") (:authors ("Alvaro Ramirez")) (:maintainers ("Alvaro Ramirez")) (:maintainer "Alvaro Ramirez") (:url . "https://github.com/xenodium/dwim-shell-command"))])
+ (dwim-shell-command . [(20240520 1732) ((emacs (28 1))) "Shell commands with DWIM behaviour" tar ((:commit . "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b") (:authors ("Alvaro Ramirez")) (:maintainers ("Alvaro Ramirez")) (:maintainer "Alvaro Ramirez") (:url . "https://github.com/xenodium/dwim-shell-command"))])
  (dyalog-mode . [(20230214 1027) ((cl-lib (0 2)) (emacs (24 3))) "Major mode for editing Dyalog APL source code" tar ((:commit . "13c0d391aa878a1609259a89fe3e6db8d21935e8") (:authors ("Joakim Hårsman" . "joakim.harsman@gmail.com")) (:maintainers ("Joakim Hårsman" . "joakim.harsman@gmail.com")) (:maintainer "Joakim Hårsman" . "joakim.harsman@gmail.com") (:keywords "languages") (:url . "https://github.com/harsman/dyalog-mode.git"))])
  (dylan . [(20220115 1804) ((emacs (25 1))) "Dylan editing modes" tar ((:commit . "9d2891e3e06405b75072d296f385fa795aeb9835") (:url . "https://opendylan.org/"))])
  (dynamic-fonts . [(20140731 1226) ((font-utils (0 7 0)) (persistent-soft (0 8 8)) (pcache (0 2 3))) "Set faces based on available fonts" tar ((:commit . "004ee6014dc7dbff8f14d26015c91d9229f6eac0") (:authors ("Roland Walker" . "walker@pobox.com")) (:maintainers ("Roland Walker" . "walker@pobox.com")) (:maintainer "Roland Walker" . "walker@pobox.com") (:keywords "faces" "frames") (:url . "http://github.com/rolandwalker/dynamic-fonts"))])
@@ -1196,14 +1198,14 @@
  (easy-kill . [(20220511 557) ((emacs (25)) (cl-lib (0 5))) "kill & mark things easily" tar ((:commit . "de7d66c3c864a4722a973ee9bc228a14be49ba0c") (:authors ("Leo Liu" . "sdl.web@gmail.com")) (:maintainers ("Leo Liu" . "sdl.web@gmail.com")) (:maintainer "Leo Liu" . "sdl.web@gmail.com") (:keywords "killing" "convenience") (:url . "https://github.com/leoliu/easy-kill"))])
  (easy-kill-extras . [(20240122 1649) ((easy-kill (0 9 4))) "Extra functions for easy-kill." tar ((:commit . "6ec0a1ff47aee681f7aa7af4250ede75815385f2") (:authors ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainers ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainer "Akinori MUSHA" . "knu@iDaemons.org") (:keywords "killing" "convenience") (:url . "https://github.com/knu/easy-kill-extras.el"))])
  (easy-repeat . [(20150516 848) ((emacs (24 4))) "Repeat easily" tar ((:commit . "060f0e6801c82c40c06961dc0528a00e18947a8c") (:authors ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainers ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainer "Chunyang Xu" . "xuchunyang56@gmail.com") (:keywords "repeat" "convenience") (:url . "https://github.com/xuchunyang/easy-repeat.el"))])
- (ebdb-mua-sidecar . [(20240115 1727) ((emacs (28 1)) (universal-sidecar (1 5 1)) (ebdb (0 8 20))) "EBDB Integration for Universal Sidecar" tar ((:commit . "9050eaea7946e613a4b9ecd9dd1462614699edb1") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "mail" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (ebdb-mua-sidecar . [(20240428 1852) ((emacs (28 1)) (universal-sidecar (1 5 1)) (ebdb (0 8 20))) "EBDB Integration for Universal Sidecar" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "mail" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
  (ebf . [(20210225 1211) ((dash (2 18 0)) (cl-lib (0 5))) "brainfuck language transpiler to Emacs Lisp" tar ((:commit . "6cbeb4d62416f4cfd5be8906667342af8ecc44a6") (:authors ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainers ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainer "Alexey Kutepov" . "reximkut@gmail.com") (:url . "http://github.com/rexim/ebf"))])
- (ebib . [(20240426 642) ((parsebib (4 0)) (emacs (27 1)) (compat (29 1 4 3))) "a BibTeX database manager" tar ((:commit . "4055e30872e642f746633bab96c3383836d61e68") (:authors ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainers ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainer "Joost Kremers" . "joostkremers@fastmail.fm") (:keywords "text" "bibtex") (:url . "http://joostkremers.github.io/ebib/"))])
- (ebib-sidecar . [(20240320 1935) ((emacs (28 1)) (citeproc (0 9 4)) (universal-sidecar (1 5 1)) (universal-sidecar-citeproc (1 0 0)) (ebib (2 39))) "Sidecar to show formatted reference of current Ebib Entry" tar ((:commit . "e38aa3fbf570ab1eef3bf0441e5be59586672377") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (ebib . [(20240430 1436) ((parsebib (4 0)) (emacs (27 1)) (compat (29 1 4 3))) "a BibTeX database manager" tar ((:commit . "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba") (:authors ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainers ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainer "Joost Kremers" . "joostkremers@fastmail.fm") (:keywords "text" "bibtex") (:url . "http://joostkremers.github.io/ebib/"))])
+ (ebib-sidecar . [(20240428 1852) ((emacs (28 1)) (citeproc (0 9 4)) (universal-sidecar (1 5 1)) (universal-sidecar-citeproc (1 0 0)) (ebib (2 39))) "Sidecar to show formatted reference of current Ebib Entry" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
  (ebnf-mode . [(20231022 1759) ((emacs (25 1))) "Major mode for EBNF files" tar ((:commit . "61486b1c9d4746249640410e58087e318f801ed8") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:url . "https://github.com/nverno/ebnf-mode"))])
  (ebuku . [(20231113 748) ((emacs (25 1))) "Interface to the buku Web bookmark manager" tar ((:commit . "c854d128cba8576fe9693c19109b5deafb573e99") (:authors ("Alexis <flexibeast@gmail.com>, Erik Sjöstrand <sjostrand.erik@gmail.com>, Junji Zhi [https://github.com/junjizhi], Hilton Chain" . "hako@ultrarare.space")) (:maintainers ("Alexis" . "flexibeast@gmail.com")) (:maintainer "Alexis" . "flexibeast@gmail.com") (:keywords "bookmarks" "buku" "data" "web" "www") (:url . "https://github.com/flexibeast/ebuku"))])
  (ecb . [(20170728 1921) nil "a code browser for Emacs" tar ((:commit . "1330a44cf3c171781083b0b926ab7622f64e6e81") (:authors ("Jesper Nordenberg" . "mayhem@home.se") ("Klaus Berndl" . "klaus.berndl@sdm.de") ("Kevin A. Burton" . "burton@openprivacy.org")) (:maintainers ("Klaus Berndl" . "klaus.berndl@sdm.de")) (:maintainer "Klaus Berndl" . "klaus.berndl@sdm.de") (:keywords "browser" "code" "programming" "tools"))])
- (echo-bar . [(20240307 741) nil "Turn the echo area into a custom status bar" tar ((:commit . "71ef563df7f1b85cfe64854b6e40bb353a281cc5") (:authors ("Adam Tillou" . "qaiviq@gmail.com")) (:maintainers ("Adam Tillou" . "qaiviq@gmail.com")) (:maintainer "Adam Tillou" . "qaiviq@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/qaiviq/echo-bar.el"))])
+ (echo-bar . [(20240521 326) nil "Turn the echo area into a custom status bar" tar ((:commit . "0e221754cb40406609ae5c79ac294683850638e1") (:authors ("Adam Tillou" . "qaiviq@gmail.com")) (:maintainers ("Adam Tillou" . "qaiviq@gmail.com")) (:maintainer "Adam Tillou" . "qaiviq@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/qaiviq/echo-bar.el"))])
  (eclim . [(20181108 1134) ((dash (2 11 0)) (json (1 2)) (popup (0 5 2)) (s (1 9 0)) (cl-lib (0 5)) (yasnippet (0 10 0))) "An interface to the Eclipse IDE." tar ((:commit . "23f5b294f833ce58516d7b9ae08a7792d70022a1"))])
  (eclipse-theme . [(20191113 1518) nil "Theme based on Eclipse circa 2010" tar ((:commit . "dcf97865512ed450f9d5137c1a05e12edb5b7f80") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "themes") (:url . "https://github.com/abo-abo/eclipse-theme"))])
  (ecukes . [(20240315 2350) ((emacs (25)) (commander (0 6 1)) (espuds (0 2 2)) (ansi (0 3 0)) (dash (2 2 0)) (s (1 8 0)) (f (0 11 0))) "Cucumber for Emacs" tar ((:commit . "11225972934b3cfe09ada87dd785f8dd0082b6e3"))])
@@ -1223,7 +1225,7 @@
  (edit-list . [(20100930 1443) nil "edit a single list" tar ((:commit . "f460d3f9e208a4e606fe6ded307f1b011916ca71") (:authors ("Michael Olson" . "mwolson@gnu.org")) (:maintainers ("Michael Olson" . "mwolson@gnu.org")) (:maintainer "Michael Olson" . "mwolson@gnu.org") (:url . "http://mwolson.org/static/dist/elisp/edit-list.el"))])
  (edit-server . [(20220908 1014) nil "server that responds to edit requests from Chrome" tar ((:commit . "3ce09c6eb2919d56ef052b1584bba6abb12f7e99") (:authors ("Alex Bennée" . "alex@bennee.com")) (:maintainers ("Alex Bennée" . "alex@bennee.com")) (:maintainer "Alex Bennée" . "alex@bennee.com") (:url . "https://github.com/stsquad/emacs_chrome"))])
  (edit-server-htmlize . [(20130329 2248) ((edit-server (1 9))) "(de)HTMLization hooks for edit-server.el" tar ((:commit . "e7f8dadfabe869c77ca241cd6fbd4c52bd908392") (:authors ("Roland McGrath" . "roland@hack.frob.com")) (:maintainers ("Roland McGrath" . "roland@hack.frob.com")) (:maintainer "Roland McGrath" . "roland@hack.frob.com") (:url . "https://github.com/frobtech/edit-server-htmlize"))])
- (editorconfig . [(20240318 2049) ((emacs (26 1)) (nadvice (0 3))) "EditorConfig Emacs Plugin" tar ((:commit . "6b85f0475f01ff97f3233acb68e2646d2ca32a91") (:authors ("EditorConfig Team" . "editorconfig@googlegroups.com")) (:maintainers ("EditorConfig Team" . "editorconfig@googlegroups.com")) (:maintainer "EditorConfig Team" . "editorconfig@googlegroups.com") (:keywords "convenience" "editorconfig") (:url . "https://github.com/editorconfig/editorconfig-emacs#readme"))])
+ (editorconfig . [(20240512 1958) ((emacs (26 1)) (nadvice (0 3))) "EditorConfig Emacs Plugin" tar ((:commit . "6ac848e380322bb52d6f70a032e12f70d60daab1") (:authors ("EditorConfig Team" . "editorconfig@googlegroups.com")) (:maintainers ("EditorConfig Team" . "editorconfig@googlegroups.com")) (:maintainer "EditorConfig Team" . "editorconfig@googlegroups.com") (:keywords "convenience" "editorconfig") (:url . "https://github.com/editorconfig/editorconfig-emacs#readme"))])
  (editorconfig-charset-extras . [(20180223 457) ((editorconfig (0 6 0))) "Extra EditorConfig Charset Support" tar ((:commit . "ddf60923c6f4841cb593b2ea04c9c710a01d262f") (:authors ("10sr" . "8.slashes@gmail.com")) (:maintainers ("10sr" . "8.slashes@gmail.com")) (:maintainer "10sr" . "8.slashes@gmail.com") (:keywords "tools") (:url . "https://github.com/10sr/editorconfig-charset-extras-el"))])
  (editorconfig-custom-majormode . [(20180816 244) ((editorconfig (0 6 0))) "Decide major-mode and mmm-mode from EditorConfig" tar ((:commit . "13ad1c83f847bedd4b3a19f9df7fd925853b19de") (:authors ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainers ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainer "10sr <8slashes+el [at] gmail [dot] com>") (:keywords "editorconfig" "util") (:url . "https://github.com/10sr/editorconfig-custom-majormode-el"))])
  (editorconfig-domain-specific . [(20180505 924) ((cl-lib (0 5)) (editorconfig (0 6 0))) "Apply brace style and other \"domain-specific\" EditorConfig properties" tar ((:commit . "e9824160fb2e466afa755240ee3ab7cc5657fb04") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "editorconfig" "util") (:url . "https://github.com/lassik/editorconfig-emacs-domain-specific"))])
@@ -1240,8 +1242,8 @@
  (egg . [(20181126 500) nil "Emacs Got Git - Emacs interface to Git" tar ((:commit . "00e768a78ac3d25f457eed667d02cac568480bf9") (:authors ("Bogolisk" . "bogolisk@gmail.com")) (:maintainers ("Bogolisk" . "bogolisk@gmail.com")) (:maintainer "Bogolisk" . "bogolisk@gmail.com") (:keywords "git" "version control" "release management"))])
  (egg-timer . [(20200217 1650) ((emacs (25 1))) "Commonly used intervals for setting timers while working" tar ((:commit . "53a9e9d20453ea4b0198ca413b8b5069a0b30b38") (:authors ("William Carroll" . "wpcarro@gmail.com")) (:maintainers ("William Carroll" . "wpcarro@gmail.com")) (:maintainer "William Carroll" . "wpcarro@gmail.com") (:url . "https://github.com/wpcarro/egg-timer.el"))])
  (egison-mode . [(20211218 1115) nil "Egison editing mode" tar ((:commit . "dbb395b41a4e4eb69f3f045cbfbe95a1575ac45b") (:authors ("Satoshi Egi" . "egisatoshi@gmail.com")) (:maintainers ("Satoshi Egi" . "egisatoshi@gmail.com")) (:maintainer "Satoshi Egi" . "egisatoshi@gmail.com") (:url . "https://github.com/egisatoshi/egison3/blob/master/elisp/egison-mode.el"))])
- (eglot-fsharp . [(20230324 1942) ((emacs (27 1)) (eglot (1 4)) (fsharp-mode (1 10)) (jsonrpc (1 0 14))) "fsharp-mode eglot integration" tar ((:commit . "0ce19f272949f9ed335ab7a9fd9454c01f07eb8f") (:authors ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainers ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainer "Jürgen Hötzel" . "juergen@hoetzel.info") (:keywords "languages") (:url . "https://github.com/fsharp/emacs-fsharp-mode"))])
- (eglot-java . [(20240322 239) ((emacs (26 1)) (eglot (1 0)) (jsonrpc (1 0 0))) "Java extension for the eglot LSP client" tar ((:commit . "d09a4204ece16a5be4ddea71476ef87e565733bd") (:authors ("Yves Zoundi" . "yves_zoundi@hotmail.com")) (:maintainers ("Yves Zoundi" . "yves_zoundi@hotmail.com")) (:maintainer "Yves Zoundi" . "yves_zoundi@hotmail.com") (:keywords "convenience" "languages") (:url . "https://github.com/yveszoundi/eglot-java"))])
+ (eglot-fsharp . [(20240514 1923) ((emacs (27 1)) (eglot (1 4)) (fsharp-mode (1 10)) (jsonrpc (1 0 14))) "fsharp-mode eglot integration" tar ((:commit . "677d78c4d6cb574086408082dedbcaef04a85359") (:authors ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainers ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainer "Jürgen Hötzel" . "juergen@hoetzel.info") (:keywords "languages") (:url . "https://github.com/fsharp/emacs-fsharp-mode"))])
+ (eglot-java . [(20240501 922) ((emacs (26 1)) (eglot (1 0)) (jsonrpc (1 0 0))) "Java extension for the eglot LSP client" tar ((:commit . "492282d653c91b07ec10b30eb8a05cbfdc4017c7") (:authors ("Yves Zoundi" . "yves_zoundi@hotmail.com")) (:maintainers ("Yves Zoundi" . "yves_zoundi@hotmail.com")) (:maintainer "Yves Zoundi" . "yves_zoundi@hotmail.com") (:keywords "convenience" "languages") (:url . "https://github.com/yveszoundi/eglot-java"))])
  (eglot-jl . [(20240318 1159) ((emacs (25 1)) (eglot (1 4)) (project (0 8 1)) (cl-generic (1 0))) "Julia support for eglot" tar ((:commit . "1d9cab682380f37ca1e9e9933cda13164600706d") (:authors ("Adam Beckmeyer" . "adam_git@thebeckmeyers.xyz")) (:maintainers ("Adam Beckmeyer" . "adam_git@thebeckmeyers.xyz")) (:maintainer "Adam Beckmeyer" . "adam_git@thebeckmeyers.xyz") (:keywords "convenience" "languages") (:url . "https://github.com/non-Jedi/eglot-jl"))])
  (eglot-luau . [(20240401 2209) ((emacs (29 1))) "Luau language server integration for eglot" tar ((:commit . "3926860036402cce4a55faec534b88c0bf6006fd") (:authors ("Kenneth Loeffler" . "kenloef@gmail.com")) (:maintainers ("Kenneth Loeffler" . "kenloef@gmail.com")) (:maintainer "Kenneth Loeffler" . "kenloef@gmail.com") (:keywords "roblox" "luau" "tools") (:url . "https://github.com/kennethloeffler/eglot-luau"))])
  (eglot-signature-eldoc-talkative . [(20240424 801) ((emacs (29 1)) (eglot (1 16)) (eldoc (1 14 0)) (jsonrpc (1 0 23))) "Make Eglot make ElDoc echo docs" tar ((:commit . "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d") (:authors ("João Távora" . "joaotavora@gmail.com") ("Mekeor Melire" . "mekeor@posteo.de")) (:maintainers ("Mekeor Melire" . "mekeor@posteo.de")) (:maintainer "Mekeor Melire" . "mekeor@posteo.de") (:keywords "convenience" "documentation" "eglot" "eldoc" "languages" "lsp") (:url . "https://codeberg.org/mekeor/emacs-eglot-signature-eldoc-talkative"))])
@@ -1253,7 +1255,7 @@
  (eink-theme . [(20190219 858) nil "E Ink color theme" tar ((:commit . "326b07523dcb076d6209cdbc7fdbb73df296dbdb") (:authors ("Marian Schubert" . "marian.schubert@gmail.com")) (:maintainers ("Marian Schubert" . "marian.schubert@gmail.com")) (:maintainer "Marian Schubert" . "marian.schubert@gmail.com") (:url . "http://github.com/maio/eink-emacs"))])
  (ejc-sql . [(20240106 1848) ((emacs (26 3)) (clomacs (0 0 5)) (dash (2 16 0)) (spinner (1 7 3))) "Emacs SQL client uses Clojure JDBC." tar ((:commit . "b80b773238719fa7160e598219f300dfbc4db06d") (:authors ("Kostafey" . "kostafey@gmail.com")) (:maintainers ("Kostafey" . "kostafey@gmail.com")) (:maintainer "Kostafey" . "kostafey@gmail.com") (:keywords "sql" "jdbc") (:url . "https://github.com/kostafey/ejc-sql"))])
  (ejson-mode . [(20190720 2138) ((emacs (25))) "Major mode for editing ejson files." tar ((:commit . "9630dfac9549779711dbe89e621f516bb4b3a354") (:authors ("Dante Catalfamo")) (:maintainers ("Dante Catalfamo")) (:maintainer "Dante Catalfamo") (:keywords "convenience" "languages" "tools") (:url . "https://github.com/dantecatalfamo/ejson-mode"))])
- (ekg . [(20240320 242) ((triples (0 3 5)) (emacs (28 1)) (llm (0 4 0))) "A system for recording and linking information" tar ((:commit . "8f050a65837d6d3ec4ea3ba7539541518d061539") (:authors ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainers ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainer "Andrew Hyatt" . "ahyatt@gmail.com") (:keywords "outlines" "hypermedia") (:url . "https://github.com/ahyatt/ekg"))])
+ (ekg . [(20240506 419) ((triples (0 3 5)) (emacs (28 1)) (llm (0 4 0))) "A system for recording and linking information" tar ((:commit . "c23f6672fa1075d11e942dffc1c37701731b94f0") (:authors ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainers ("Andrew Hyatt" . "ahyatt@gmail.com")) (:maintainer "Andrew Hyatt" . "ahyatt@gmail.com") (:keywords "outlines" "hypermedia") (:url . "https://github.com/ahyatt/ekg"))])
  (el-autoyas . [(20120918 1317) nil "Automatically create Emacs-Lisp Yasnippets" tar ((:commit . "bde0251ecb504f585dfa27c205c8e312655310cc") (:authors ("Matthew L. Fidler")) (:maintainers ("Matthew L. Fidler")) (:maintainer "Matthew L. Fidler") (:keywords "emacs" "lisp" "mode" "yasnippet") (:url . "https://github.com/mlf176f2/el-autoyas.el"))])
  (el-fetch . [(20230624 2) ((emacs (25 1))) "Show system information in Neofetch-like style (eg CPU, RAM)" tar ((:commit . "7907fd7829ca55b21a62d23c17066fdfde9cd07c") (:authors ("Maciej Barć" . "xgqt@riseup.net")) (:maintainers ("Maciej Barć" . "xgqt@riseup.net")) (:maintainer "Maciej Barć" . "xgqt@riseup.net") (:keywords "games") (:url . "https://gitlab.com/xgqt/emacs-el-fetch"))])
  (el-fly-indent-mode . [(20180422 243) ((emacs (25))) "Indent Emacs Lisp on the fly" tar ((:commit . "1dd4b907ff4d9581c18b4e38e8719e83ba0dace1") (:authors ("Jiahao Li" . "jiahaowork@gmail.com")) (:maintainers ("Jiahao Li" . "jiahaowork@gmail.com")) (:maintainer "Jiahao Li" . "jiahaowork@gmail.com") (:keywords "lisp" "languages") (:url . "https://github.com/jiahaowork/el-fly-indent-mode.el"))])
@@ -1277,7 +1279,7 @@
  (elcontext . [(20210109 1238) ((ht (2 3)) (hydra (0 14 0)) (emacs (24 3)) (f (0 20 0)) (osx-location (0 4)) (uuidgen (0 3))) "Create context specific actions" tar ((:commit . "2efd3dd8c5176c4f071bb048be6cb069b05d6e9e") (:authors ("Thomas Sojka")) (:maintainers ("Thomas Sojka")) (:maintainer "Thomas Sojka") (:keywords "calendar" "convenience") (:url . "https://github.com/rollacaster/elcontext"))])
  (elcord . [(20240305 2138) ((emacs (25 1))) "Allows you to integrate Rich Presence from Discord" tar ((:commit . "e2775f40ec55dfdceea83d535dff77d60534b6bc") (:authors ("heatingdevice") ("Wilfredo Velázquez-Rodríguez" . "zulu.inuoe@gmail.com")) (:maintainers ("heatingdevice")) (:maintainer "heatingdevice") (:keywords "games") (:url . "https://github.com/Mstrodl/elcord"))])
  (elcouch . [(20230903 750) ((emacs (25 1)) (json-mode (1 0 0)) (libelcouch (0 11 0)) (navigel (0 3 0))) "View and manipulate CouchDB databases" tar ((:commit . "a426e9bee9501284f4e1e84766621ca6b130c79a") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:keywords "data" "tools") (:url . "https://gitlab.petton.fr/DamienCassou/elcouch"))])
- (eldev . [(20240428 1335) ((emacs (24 4))) "Elisp development tool" tar ((:commit . "f843dbc0bbda1a066c581c925635452038d324ab") (:authors ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainers ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainer "Paul Pogonyshev" . "pogonyshev@gmail.com") (:keywords "maint" "tools") (:url . "https://github.com/emacs-eldev/eldev"))])
+ (eldev . [(20240511 2039) ((emacs (24 4))) "Elisp development tool" tar ((:commit . "5153b5a747aaadb51ac14f3963e3ffbf59273e74") (:authors ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainers ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainer "Paul Pogonyshev" . "pogonyshev@gmail.com") (:keywords "maint" "tools") (:url . "https://github.com/emacs-eldev/eldev"))])
  (eldoc-box . [(20240426 408) ((emacs (27 1))) "Display documentation in childframe" tar ((:commit . "4392128d4caaa21f7810ba0955514c395e9f3cae") (:authors ("Yuan Fu" . "casouri@gmail.com")) (:maintainers ("Yuan Fu" . "casouri@gmail.com")) (:maintainer "Yuan Fu" . "casouri@gmail.com") (:url . "https://github.com/casouri/eldoc-box"))])
  (eldoc-cmake . [(20190419 2244) ((emacs (25 1))) "Eldoc support for CMake" tar ((:commit . "4453c03b5c95ff32842f13db2fc317fb0fe2f79e") (:authors ("Kirill Ignatiev")) (:maintainers ("Kirill Ignatiev")) (:maintainer "Kirill Ignatiev") (:url . "https://github.com/ikirill/eldoc-cmake"))])
  (eldoc-eask . [(20240101 819) ((emacs (26 1)) (eask (0 1 0))) "Eldoc support for Eask-file" tar ((:commit . "ade0f239814f3b8bc77229e903d2c4b806ded90a") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience") (:url . "https://github.com/emacs-eask/eldoc-eask"))])
@@ -1288,7 +1290,7 @@
  (electric-case . [(20150417 1112) nil "insert camelCase, snake_case words without \"Shift\"ing" tar ((:commit . "984b6a4c6c4cdcefeecb59e941f5f184cc1dedff") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://hins11.yu-yake.com/"))])
  (electric-cursor . [(20221221 438) ((emacs (25 1))) "Change cursor automatically depending on mode" tar ((:commit . "bc09aa8c5d3cc32e3e6452cbf8018fc1ea772b73") (:authors ("Case Duckworth" . "acdw@acdw.net")) (:maintainers ("Case Duckworth" . "acdw@acdw.net")) (:maintainer "Case Duckworth" . "acdw@acdw.net") (:keywords "terminals" "frames") (:url . "https://github.com/duckwork/electric-cursor"))])
  (electric-operator . [(20231014 1107) ((dash (2 10 0)) (emacs (24 4))) "Automatically add spaces around operators" tar ((:commit . "18e555a5cdfd7264c179f810d7fd4c71a80b715a") (:authors ("David Shepherd" . "davidshepherd7@gmail.com")) (:maintainers ("David Shepherd" . "davidshepherd7@gmail.com")) (:maintainer "David Shepherd" . "davidshepherd7@gmail.com") (:keywords "electric") (:url . "https://github.com/davidshepherd7/electric-operator"))])
- (electric-ospl . [(20240319 1842) ((emacs (26 1))) "Electric OSPL Mode" tar ((:commit . "e5283062fdf66aa2d664059b307839bf94413055") (:authors ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org") (:keywords "convenience" "text") (:url . "https://git.sr.ht/~swflint/electric-ospl-mode"))])
+ (electric-ospl . [(20240428 1829) ((emacs (26 1))) "Electric OSPL Mode" tar ((:commit . "deab4493530ab4bb2112c18d8ca6ccc652e24a63") (:authors ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org") (:keywords "convenience" "text") (:url . "https://git.sr.ht/~swflint/electric-ospl-mode"))])
  (electric-spacing . [(20220220 1540) nil "Insert operators with surrounding spaces smartly" tar ((:commit . "c37b2502512dd49a8311d7c34e9bfd1af3d4dbcd") (:authors ("William Xu" . "william.xwl@gmail.com")) (:maintainers ("William Xu" . "william.xwl@gmail.com")) (:maintainer "William Xu" . "william.xwl@gmail.com"))])
  (elegant-agenda-mode . [(20210115 353) ((emacs (26 1))) "An elegant theme for your org-agenda" tar ((:commit . "5cbc688584ba103ea3be7d7b30e5d94e52f59eb6") (:authors ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainers ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainer "Justin Barclay" . "justinbarclay@gmail.com") (:keywords "faces") (:url . "https://github.com/justinbarclay/elegant-agenda-mode"))])
  (elein . [(20120120 1116) nil "running leiningen commands from emacs" tar ((:commit . "d4c0c0491dbb7c90e953d7a16172107c37103605") (:authors ("R.W. van 't Veer")) (:maintainers ("R.W. van 't Veer")) (:maintainer "R.W. van 't Veer") (:keywords "tools" "processes") (:url . "https://github.com/remvee/elein"))])
@@ -1303,7 +1305,7 @@
  (elfeed-protocol . [(20231007 1535) ((emacs (24 4)) (elfeed (2 1 1)) (cl-lib (0 5))) "Provide fever/newsblur/owncloud/ttrss protocols for elfeed" tar ((:commit . "bcefb85a1d4075f36e73a94bda569e71f28a52c2") (:authors ("Xu Fasheng <fasheng[AT]fasheng.info>")) (:maintainers ("Xu Fasheng <fasheng[AT]fasheng.info>")) (:maintainer "Xu Fasheng <fasheng[AT]fasheng.info>") (:keywords "news") (:url . "https://github.com/fasheng/elfeed-protocol"))])
  (elfeed-score . [(20230728 1433) ((emacs (26 1)) (elfeed (3 3 0))) "Gnus-style scoring for Elfeed" tar ((:commit . "cc1a05a95bff953eb28151056ce3ce14ba3e901d") (:authors ("Michael Herstine" . "sp1ff@pobox.com")) (:maintainer "Michael Herstine" . "sp1ff@pobox.com") (:keywords "news") (:url . "https://github.com/sp1ff/elfeed-score"))])
  (elfeed-summary . [(20231231 1456) ((emacs (27 1)) (magit-section (3 3 0)) (elfeed (3 4 1))) "Feed summary interface for elfeed" tar ((:commit . "7e308adaa351f8c7f6ba839cbcfd4e3cd145401c") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/elfeed-summary.el"))])
- (elfeed-tube . [(20240123 1825) ((emacs (27 1)) (elfeed (3 4 1)) (aio (1 0))) "YouTube integration for Elfeed" tar ((:commit . "92c66d6adcebe0588ccf811616decf7ef8a8ac65") (:authors ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com") (:keywords "news" "hypermedia" "convenience") (:url . "https://github.com/karthink/elfeed-tube"))])
+ (elfeed-tube . [(20240511 418) ((emacs (27 1)) (elfeed (3 4 1)) (aio (1 0))) "YouTube integration for Elfeed" tar ((:commit . "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c") (:authors ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com") (:keywords "news" "hypermedia" "convenience") (:url . "https://github.com/karthink/elfeed-tube"))])
  (elfeed-tube-mpv . [(20230607 717) ((emacs (27 1)) (elfeed-tube (0 10)) (mpv (0 2 0))) "Control mpv from Elfeed" tar ((:commit . "6d5a24cfd0655068afd364cded5521a4550a8adb") (:authors ("Karthik Chikmagalur" . "karthikchikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthikchikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthikchikmagalur@gmail.com") (:keywords "news" "hypermedia") (:url . "https://github.com/karthink/elfeed-tube"))])
  (elfeed-web . [(20210226 258) ((simple-httpd (1 5 1)) (elfeed (3 2 0)) (emacs (24 3))) "web interface to Elfeed" tar ((:commit . "0ccd59aaace34546017a1a0d7c393749747d5bc6") (:authors ("Christopher Wellons" . "wellons@nullprogram.com")) (:maintainer "Christopher Wellons" . "wellons@nullprogram.com") (:url . "https://github.com/skeeto/elfeed"))])
  (elfeed-webkit . [(20230604 2111) ((emacs (26 1)) (elfeed (3 4 1))) "Render elfeed entries in embedded webkit widgets" tar ((:commit . "db7ee83f9c0e67f01960b1e0489717cf7a8fd2c2") (:authors ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainers ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainer "Fritz Grabo" . "hello@fritzgrabo.com") (:keywords "comm") (:url . "https://github.com/fritzgrabo/elfeed-webkit"))])
@@ -1325,7 +1327,7 @@
  (elixir-mode . [(20230626 1738) ((emacs (25))) "Major mode for editing Elixir files" tar ((:commit . "00d6580a040a750e019218f9392cf9a4c2dac23a") (:keywords "languages" "elixir") (:url . "https://github.com/elixir-editors/emacs-elixir"))])
  (elixir-ts-mode . [(20240116 645) ((emacs (29 1)) (heex-ts-mode (1 3))) "Major mode for Elixir with tree-sitter support" tar ((:commit . "6db05baed9a34d01edf0bfdd804d951dedc6dccb") (:authors ("Wilhelm H Kirschbaum")) (:maintainers ("Wilhelm H Kirschbaum")) (:maintainer "Wilhelm H Kirschbaum") (:keywords "elixir" "languages" "tree-sitter") (:url . "https://github.com/wkirschbaum/elixir-ts-mode"))])
  (elixir-yasnippets . [(20150417 1239) ((yasnippet (0 8 0))) "Yasnippets for Elixir" tar ((:commit . "980ca7626c14ef0573bec0035ec7942796062783") (:authors ("Yinghai Zhao" . "zyinghai@gmail.com")) (:maintainer "Yinghai Zhao" . "zyinghai@gmail.com") (:keywords "snippets"))])
- (ellama . [(20240415 730) ((emacs (28 1)) (llm (0 6 0)) (spinner (1 7 4))) "Tool for interacting with LLMs" tar ((:commit . "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239") (:authors ("Sergey Kostyaev" . "sskostyaev@gmail.com")) (:maintainers ("Sergey Kostyaev" . "sskostyaev@gmail.com")) (:maintainer "Sergey Kostyaev" . "sskostyaev@gmail.com") (:keywords "help" "local" "tools") (:url . "http://github.com/s-kostyaev/ellama"))])
+ (ellama . [(20240517 1457) ((emacs (28 1)) (llm (0 6 0)) (spinner (1 7 4))) "Tool for interacting with LLMs" tar ((:commit . "fddc1022b5e16e356d6f65ddac51bd2ccf25209c") (:authors ("Sergey Kostyaev" . "sskostyaev@gmail.com")) (:maintainers ("Sergey Kostyaev" . "sskostyaev@gmail.com")) (:maintainer "Sergey Kostyaev" . "sskostyaev@gmail.com") (:keywords "help" "local" "tools") (:url . "http://github.com/s-kostyaev/ellama"))])
  (ellocate . [(20200112 1931) ((emacs (25 1)) (s (1 12 0)) (f (0 20 0))) "The locate command reimplemented in Emacs Lisp" tar ((:commit . "81405082f68f0577c9f176d3d4f034a7142aba59") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "matching") (:url . "https://github.com/walseb/ellocate"))])
  (elm-mode . [(20230315 1122) ((f (0 17)) (s (1 7 0)) (emacs (25 1)) (seq (2 23)) (reformatter (0 3))) "Major mode for Elm" tar ((:commit . "699841865e1bd5b7f2077baa7121510b6bcad3c7") (:authors ("Joseph Collard")) (:maintainers ("Joseph Collard")) (:maintainer "Joseph Collard") (:url . "https://github.com/jcollard/elm-mode"))])
  (elm-test-runner . [(20230905 331) ((emacs (24 4))) "Enhanced support for running elm-test" tar ((:commit . "b664e50a4c849f5f2e2f434fc01718da10515612") (:authors ("Juan Edi")) (:maintainers ("Juan Edi")) (:maintainer "Juan Edi") (:url . "https://github.com/juanedi/elm-test-runner"))])
@@ -1357,8 +1359,8 @@
  (elune-theme . [(20231009 1709) nil "Elune theme" tar ((:commit . "4d0217a7601e34fa84fc174ccf7945cd598d4135") (:authors ("Çağan Korkmaz" . "xcatalystt@gmail.com")) (:maintainers ("Çağan Korkmaz" . "xcatalystt@gmail.com")) (:maintainer "Çağan Korkmaz" . "xcatalystt@gmail.com") (:url . "https://github.com/xcatalyst/elune-theme"))])
  (elvish-mode . [(20180809 1612) ((emacs (24 3))) "Defines a major mode for Elvish" tar ((:commit . "c3a7e31564256b9755b1ab9fb40d32ad78cd1ad2") (:authors ("Adam Schwalm" . "adamschwalm@gmail.com")) (:maintainers ("Adam Schwalm" . "adamschwalm@gmail.com")) (:maintainer "Adam Schwalm" . "adamschwalm@gmail.com") (:url . "https://github.com/ALSchwalm/elvish-mode"))])
  (elwm . [(20150817 1007) ((dash (1 1 0))) "Minimalistic window manager for emacs" tar ((:commit . "c33b183f006ad476c3a44dab316f580f8b369930") (:authors ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matus Goljer" . "matus.goljer@gmail.com") (:keywords "docs") (:url . "https://github.com/Fuco1/elwm"))])
- (elx . [(20240415 1535) ((emacs (25 1)) (compat (29 1 4 1)) (llama (0 2 0))) "Extract information from Emacs Lisp libraries" tar ((:commit . "4b3b0af5b8d1e530a1a8fc44af650886b23918b1") (:authors ("Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev") (:keywords "docs" "libraries" "packages") (:url . "https://github.com/emacscollective/elx"))])
- (emacs-everywhere . [(20240416 749) ((emacs (26 3))) "System-wide popup windows for quick edits" tar ((:commit . "8868b9e371d3d09add67022e46b3e4db0a0c22a0") (:authors ("TEC <https://github.com/tecosaur>")) (:maintainers ("TEC" . "contact@tecosaur.net")) (:maintainer "TEC" . "contact@tecosaur.net") (:keywords "convenience" "frames") (:url . "https://github.com/tecosaur/emacs-everywhere"))])
+ (elx . [(20240506 1556) ((emacs (25 1)) (compat (29 1 4 1)) (llama (0 2 0))) "Extract information from Emacs Lisp libraries" tar ((:commit . "9db9f8dcc595717d82943fef66f554a4b40aff0b") (:authors ("Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.elx@jonas.bernoulli.dev") (:keywords "docs" "libraries" "packages") (:url . "https://github.com/emacscollective/elx"))])
+ (emacs-everywhere . [(20240509 1715) ((emacs (26 3))) "System-wide popup windows for quick edits" tar ((:commit . "0b731ca6da351ba40953d090acf69e81757d437b") (:authors ("TEC <https://github.com/tecosaur>")) (:maintainers ("TEC" . "contact@tecosaur.net")) (:maintainer "TEC" . "contact@tecosaur.net") (:keywords "convenience" "frames") (:url . "https://github.com/tecosaur/emacs-everywhere"))])
  (emacsc . [(20240104 634) nil "helper for emacsc(1)" tar ((:commit . "9bec453a4170dbcb409b884e3e8d30f388de7b8d") (:authors ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainers ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainer "Akinori MUSHA" . "knu@iDaemons.org") (:keywords "tools") (:url . "https://github.com/knu/emacsc"))])
  (emacsist-view . [(20160426 1223) nil "Mode for viewing emacsist.com" tar ((:commit . "f67761259ed779a9bc95c9a4e0474522990c5c6b") (:authors ("DarkSun" . "lujun9972@gmail.com")) (:maintainers ("DarkSun" . "lujun9972@gmail.com")) (:maintainer "DarkSun" . "lujun9972@gmail.com") (:keywords "convenience" "usability") (:url . "https://github.com/lujun9972/emacsist-view"))])
  (emacsql . [(20240415 1535) ((emacs (25 1))) "High-level SQL database front-end" tar ((:commit . "5108c16c5e1d5bfdd41fcc0807241e28886ab763") (:authors ("Christopher Wellons" . "wellons@nullprogram.com")) (:maintainers ("Jonas Bernoulli" . "emacs.emacsql@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.emacsql@jonas.bernoulli.dev") (:url . "https://github.com/magit/emacsql"))])
@@ -1381,7 +1383,7 @@
  (embrace . [(20231027 419) ((cl-lib (0 5)) (expand-region (0 10 0))) "Add/Change/Delete pairs based on `expand-region'" tar ((:commit . "c7e748603151d7d91c237fd2d9cdf56e9f3b1ea8") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com") (:keywords "extensions"))])
  (emidje . [(20190209 1726) ((emacs (25)) (cider (0 17 0)) (seq (2 16)) (magit-popup (2 4 0))) "Test runner and report viewer for Midje" tar ((:commit . "7e92f053964d925c97dc8cca8d4d70a3030021db") (:authors ("Alan Ghelardi" . "alan.ghelardi@nubank.com.br")) (:maintainers ("Alan Ghelardi" . "alan.ghelardi@nubank.com.br")) (:maintainer "Alan Ghelardi" . "alan.ghelardi@nubank.com.br") (:keywords "tools") (:url . "https://github.com/nubank/emidje"))])
  (emmet-mode . [(20221111 329) nil "Unofficial Emmet's support for emacs" tar ((:commit . "63b6932603184956b5ea8919036d2b307b48d7fd") (:authors ("Shin Aoyama" . "smihica@gmail.com")) (:maintainers ("Shin Aoyama" . "smihica@gmail.com")) (:maintainer "Shin Aoyama" . "smihica@gmail.com") (:keywords "convenience") (:url . "https://github.com/smihica/emmet-mode"))])
- (emms . [(20240414 1933) ((cl-lib (0 5)) (nadvice (0 3)) (seq (0))) "The Emacs Multimedia System" tar ((:commit . "01110352afecd160165041bee55a63e959f66835") (:authors ("Jorgen Schäfer" . "forcer@forcix.cx")) (:maintainers ("Yoni Rabkin" . "yrk@gnu.org")) (:maintainer "Yoni Rabkin" . "yrk@gnu.org") (:keywords "emms" "mp3" "ogg" "flac" "music" "mpeg" "video" "multimedia") (:url . "https://www.gnu.org/software/emms/"))])
+ (emms . [(20240512 1735) ((cl-lib (0 5)) (nadvice (0 3)) (seq (0))) "The Emacs Multimedia System" tar ((:commit . "c86ede13e80ad573f52e46de54fd24a97e2faa88") (:authors ("Jorgen Schäfer" . "forcer@forcix.cx")) (:maintainers ("Yoni Rabkin" . "yrk@gnu.org")) (:maintainer "Yoni Rabkin" . "yrk@gnu.org") (:keywords "emms" "mp3" "ogg" "flac" "music" "mpeg" "video" "multimedia") (:url . "https://www.gnu.org/software/emms/"))])
  (emms-info-mediainfo . [(20131223 1300) ((emms (0))) "Info-method for EMMS using medianfo" tar ((:commit . "bce16eae9eacd38719fea62a9755225a888da59d") (:authors ("Fabián Ezequiel Gallina" . "fgallina@gnu.org")) (:maintainers ("Fabián Ezequiel Gallina" . "fgallina@gnu.org")) (:maintainer "Fabián Ezequiel Gallina" . "fgallina@gnu.org") (:keywords "multimedia" "processes"))])
  (emms-mark-ext . [(20130529 327) ((emms (3 0))) "Extra functions for emms-mark-mode and emms-tag-edit-mode" tar ((:commit . "ec68129e3e9e469e5bf160c6a1b7030e322f3541") (:authors ("Joe Bloggs" . "vapniks@yahoo.com")) (:maintainers ("Joe Bloggs" . "vapniks@yahoo.com")) (:maintainer "Joe Bloggs" . "vapniks@yahoo.com") (:keywords "convenience" "multimedia") (:url . "https://github.com/vapniks/emms-mark-ext"))])
  (emms-mode-line-cycle . [(20160221 1120) ((emacs (24)) (emms (4 0))) "Display the emms mode line as a ticker" tar ((:commit . "2c2f395e484a1d345050ddd61ff5fab71a92a6bc") (:authors ("momomo5717")) (:maintainers ("momomo5717")) (:maintainer "momomo5717") (:keywords "emms" "mode-line") (:url . "https://github.com/momomo5717/emms-mode-line-cycle"))])
@@ -1398,7 +1400,7 @@
  (emojify . [(20210108 1111) ((seq (1 11)) (ht (2 0)) (emacs (24 3))) "Display emojis in Emacs" tar ((:commit . "cfa00865388809363df3f884b4dd554a5d44f835") (:authors ("Iqbal Ansari" . "iqbalansari02@yahoo.com")) (:maintainers ("Iqbal Ansari" . "iqbalansari02@yahoo.com")) (:maintainer "Iqbal Ansari" . "iqbalansari02@yahoo.com") (:keywords "multimedia" "convenience") (:url . "https://github.com/iqbalansari/emacs-emojify"))])
  (emojify-logos . [(20180814 917) ((emojify (0 4))) "Add logos to emojify" tar ((:commit . "a3e78bcbdf863092d4c9b026ac08bf7d1c7c0e8b") (:authors ("mxgoldstein" . "m_goldstein@gmx.net")) (:maintainers ("mxgoldstein" . "m_goldstein@gmx.net")) (:maintainer "mxgoldstein" . "m_goldstein@gmx.net") (:url . "https://github.com/mxgoldstein/emojify-logos"))])
  (empos . [(20151011 1916) nil "Locate bibtex citations from within emacs" tar ((:commit . "7b99ad30e56937adb7e6349777e5a2045597d564") (:authors ("Dimitris Alikaniotis <da352 [at] cam.ac.uk>")) (:maintainers ("Dimitris Alikaniotis <da352 [at] cam.ac.uk>")) (:maintainer "Dimitris Alikaniotis <da352 [at] cam.ac.uk>") (:keywords "citations" "reference" "bibtex" "reftex") (:url . "http://github.com/dimalik/empos/"))])
- (empv . [(20240423 2355) ((emacs (28 1)) (s (1 13 0)) (compat (29 1 4 4))) "A multimedia player/manager, YouTube interface" tar ((:commit . "d9ab5d355c2e92c2c4e709d6945e6fab25069ccb") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com") (:url . "https://github.com/isamert/empv.el"))])
+ (empv . [(20240517 1701) ((emacs (28 1)) (s (1 13 0)) (compat (29 1 4 4))) "A multimedia player/manager, YouTube interface" tar ((:commit . "c7313288e350de7331779c0b37a8298980f6ff57") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com") (:url . "https://github.com/isamert/empv.el"))])
  (emr . [(20220108 548) ((s (1 3 1)) (dash (1 2 0)) (cl-lib (0 2)) (popup (0 5 0)) (emacs (24 1)) (list-utils (0 3 0)) (paredit (24 0 0)) (projectile (0 9 1)) (clang-format (0 0 1)) (iedit (0 97))) "Emacs refactoring system." tar ((:commit . "cac1b52932926f56d7f6d2923732d20bbd20670d") (:authors ("Chris Barrett" . "chris.d.barrett@me.com")) (:maintainers ("Chris Barrett" . "chris.d.barrett@me.com")) (:maintainer "Chris Barrett" . "chris.d.barrett@me.com") (:keywords "tools" "convenience" "refactoring") (:url . "https://github.com/Wilfred/emacs-refactor"))])
  (enclose . [(20121008 1614) nil "Enclose cursor within punctuation pairs." tar ((:commit . "2fff3d4fcc1089f87647042d7164ba04282766ae") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com") (:keywords "speed" "convenience") (:url . "http://github.com/rejeep/enclose"))])
  (encourage-mode . [(20151128 905) ((emacs (24 4))) "Encourages you in your work. :D" tar ((:commit . "ca411e6bfd3d0edffe95852127bd995730b942e3") (:authors ("Patrick Mosby" . "patrick@schreiblogade.de")) (:maintainers ("Patrick Mosby" . "patrick@schreiblogade.de")) (:maintainer "Patrick Mosby" . "patrick@schreiblogade.de") (:keywords "fun") (:url . "https://github.com/halbtuerke/encourage-mode.el"))])
@@ -1410,7 +1412,7 @@
  (eno . [(20191013 1239) ((dash (2 12 1)) (edit-at-point (1 0))) "Goto/copy/cut any word/symbol/line in view, similar to ace-jump/easymotion" tar ((:commit . "c5c6193687c0bede1ddf507c430cf8b0a6d272d9") (:authors (nil . "<e.enoson@gmail.com>")) (:maintainers (nil . "<e.enoson@gmail.com>")) (:maintainer nil . "<e.enoson@gmail.com>") (:url . "http://github.com/enoson/eno.el"))])
  (enotify . [(20130407 1348) nil "A networked notification system for emacs" tar ((:commit . "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80") (:authors ("Alessandro Piras" . "laynor@gmail.com")) (:maintainer "Alessandro Piras" . "laynor@gmail.com") (:keywords "tools"))])
  (environ . [(20230518 1310) ((emacs (24 1)) (dash (2 17 0)) (f (0 20 0)) (s (1 12 0))) "API for environment variables and env files" tar ((:commit . "9530e2f1ead5bd37aca4d298514800f73b3cc0a7") (:authors ("Chris Clark" . "cfclrk@gmail.com")) (:maintainers ("Chris Clark" . "cfclrk@gmail.com")) (:maintainer "Chris Clark" . "cfclrk@gmail.com") (:keywords "tools") (:url . "https://github.com/cfclrk/environ"))])
- (envrc . [(20240415 1016) ((emacs (26 1)) (inheritenv (0 1))) "Support for `direnv' that operates buffer-locally" tar ((:commit . "8571bf94b6a63ffd9a84100106602f88ba186854") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "processes" "tools") (:url . "https://github.com/purcell/envrc"))])
+ (envrc . [(20240517 1633) ((emacs (26 1)) (inheritenv (0 1))) "Support for `direnv' that operates buffer-locally" tar ((:commit . "4405f6e7b2e300aa91211bd505364d8f01667c97") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "processes" "tools") (:url . "https://github.com/purcell/envrc"))])
  (eopengrok . [(20230114 1413) ((s (1 9 0)) (dash (2 10 0)) (magit (2 1 0)) (cl-lib (0 5))) "opengrok interface for emacs" tar ((:commit . "83b1695774f8bdc322e528ade9dffe9b2e93f32a") (:authors ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainers ("Youngjoo Lee" . "youngker@gmail.com")) (:maintainer "Youngjoo Lee" . "youngker@gmail.com") (:keywords "tools"))])
  (epc . [(20140610 534) ((concurrent (0 3 1)) (ctable (0 1 2))) "A RPC stack for the Emacs Lisp" tar ((:commit . "94cd36a3bec752263ac9b1b3a9dd2def329d2af7") (:authors ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainers ("SAKURAI Masashi <m.sakurai at kiwanami.net>")) (:maintainer "SAKURAI Masashi <m.sakurai at kiwanami.net>") (:keywords "lisp" "rpc") (:url . "https://github.com/kiwanami/emacs-epc"))])
  (epic . [(20170210 23) ((htmlize (1 47))) "Evernote Picker for Cocoa Emacs" tar ((:commit . "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e") (:authors ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainers ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainer "Yoshinari Nomura" . "nom@quickhack.net") (:keywords "evernote" "applescript") (:url . "https://github.com/yoshinari-nomura/epic"))])
@@ -1447,7 +1449,7 @@
  (ergoemacs-status . [(20160318 538) ((powerline (2 3)) (mode-icons (0 1 0))) "Adaptive Status Bar / Mode Line" tar ((:commit . "d952cc2361adf6eb4d6af60950ad4ab699c81320") (:authors ("Matthew Fidler")) (:maintainers ("Matthew Fidler")) (:maintainer "Matthew Fidler"))])
  (eri . [(20240220 2129) nil "Enhanced relative indentation (eri)" tar ((:commit . "d4ac6d038e25bb8d4912da7a4c5df91a856e1c9c") (:url . "https://github.com/agda/agda"))])
  (erk . [(20231227 1449) ((emacs (28 1)) (auto-compile (1 2 0)) (dash (2 18 0)) (license-templates (0 1 3))) "Elisp (GitHub) Repository Kit" tar ((:commit . "0d9906415a649caff2df7b4b1b3f8f6cc337032a") (:authors ("Positron Solutions" . "contact@positron.solutions")) (:maintainers ("Positron Solutions" . "contact@positron.solutions")) (:maintainer "Positron Solutions" . "contact@positron.solutions") (:keywords "convenience" "programming") (:url . "http://github.com/positron-solutions/elisp-repo-kit"))])
- (erlang . [(20240418 631) ((emacs (24 1))) "Erlang major mode" tar ((:commit . "5df3992d695da4d7e8777cf7605279ce9d131f1c") (:authors ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "erlang" "languages" "processes"))])
+ (erlang . [(20240517 1225) ((emacs (24 1))) "Erlang major mode" tar ((:commit . "601a012837ea0a5c8095bf24223132824177124d") (:authors ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "erlang" "languages" "processes"))])
  (erlstack-mode . [(20230608 909) ((emacs (25 1)) (dash (2 12 0))) "Minor mode for analysing Erlang stacktraces" tar ((:commit . "51e3cd10a2fe77eb8eb60643aba6f8178374b069") (:authors ("k32")) (:maintainers ("k32")) (:maintainer "k32") (:keywords "tools" "erlang") (:url . "https://github.com/k32/erlstack-mode"))])
  (eros . [(20230309 615) ((emacs (24 4))) "Evaluation Result OverlayS for Emacs Lisp" tar ((:commit . "a9a92bdc6be0521a6a06eb464be55ed61946639c") (:authors ("Tianxiang Xiong" . "tianxiang.xiong@gmail.com")) (:maintainers ("Tianxiang Xiong" . "tianxiang.xiong@gmail.com")) (:maintainer "Tianxiang Xiong" . "tianxiang.xiong@gmail.com") (:keywords "convenience" "lisp") (:url . "https://github.com/xiongtx/eros"))])
  (ert-async . [(20200105 1031) ((emacs (24 1))) "Async support for ERT" tar ((:commit . "948cf2faa10e085bda3739034ca5ea1912893433") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com") (:keywords "lisp" "test") (:url . "http://github.com/rejeep/ert-async.el"))])
@@ -1463,7 +1465,7 @@
  (esh-autosuggest . [(20210906 1446) ((emacs (24 4)) (company (0 9 4))) "History autosuggestions for eshell" tar ((:commit . "bf676b137d35553debe32ff134dbec25f3978ae7") (:authors ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainers ("Diego A. Mundo" . "dieggsy@pm.me")) (:maintainer "Diego A. Mundo" . "dieggsy@pm.me") (:keywords "completion" "company" "matching" "convenience" "abbrev") (:url . "http://github.com/dieggsy/esh-autosuggest"))])
  (esh-buf-stack . [(20140107 1018) nil "Add a buffer stack feature to Eshell" tar ((:commit . "ea5da9ce8566ffe2e013f0e588701cb0825258b6") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com") (:keywords "eshell" "extensions"))])
  (esh-help . [(20190905 22) ((dash (1 4 0))) "Add some help functions and support for Eshell" tar ((:commit . "417673ed18a983930a66a6692dbfb288a995cb80") (:authors ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainers ("Tomoya Tanjo" . "ttanjo@gmail.com")) (:maintainer "Tomoya Tanjo" . "ttanjo@gmail.com") (:keywords "eshell" "extensions") (:url . "https://github.com/tom-tan/esh-help/"))])
- (eshell-atuin . [(20240409 932) ((emacs (27 1)) (compat (29 1 4 1))) "Integrate eshell with atuin, a shell history tool" tar ((:commit . "1b71d4c18039bc3b46095adb557f6987caab4a43") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/eshell-atuin"))])
+ (eshell-atuin . [(20240519 2200) ((emacs (27 1)) (compat (29 1 4 1))) "Integrate eshell with atuin, a shell history tool" tar ((:commit . "b8bff27bbd7d4e7c28770d6f88d8ebcb1b965a9e") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/eshell-atuin"))])
  (eshell-autojump . [(20201117 235) nil "autojump command for Eshell" tar ((:commit . "c1056bfc6b46646ae1e606247689fef9aee621af") (:authors ("Alex Schroeder")) (:maintainers ("Yen-Chin, Lee" . "coldnew.tw@gmail.com")) (:maintainer "Yen-Chin, Lee" . "coldnew.tw@gmail.com") (:url . "http://github.com/coldnew/eshell-autojump"))])
  (eshell-bookmark . [(20170922 1514) ((emacs (24 3))) "Integrate bookmarks with eshell." tar ((:commit . "deda4b848b2fb979dbe73ead2cb866610e3596ed") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:keywords "convenience" "files") (:url . "https://github.com/Fuco1/eshell-bookmark"))])
  (eshell-did-you-mean . [(20211104 237) ((emacs (24 1)) (cl-lib (0 5))) "command not found (\"did you mean…\" feature) in Eshell" tar ((:commit . "80cd8c4b186a2fb29621cf634bcf2bcd914f1e3d") (:authors ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainers ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainer "Chunyang Xu" . "xuchunyang56@gmail.com") (:keywords "eshell") (:url . "https://github.com/xuchunyang/eshell-did-you-mean"))])
@@ -1473,7 +1475,7 @@
  (eshell-info-banner . [(20220728 1006) ((emacs (25 1)) (s (1))) "System information as your Eshell banner" tar ((:commit . "987e69a66276ca057798896c606e5c5d5fb9ee5c") (:authors ("Lucien Cartier-Tilet" . "lucien@phundrak.com")) (:maintainers ("Lucien Cartier-Tilet" . "lucien@phundrak.com")) (:maintainer "Lucien Cartier-Tilet" . "lucien@phundrak.com") (:url . "https://github.com/Phundrak/eshell-info-banner.el"))])
  (eshell-outline . [(20201121 620) ((emacs (25 1))) "Enhanced outline-mode for Eshell" tar ((:commit . "6f917afa5b3d36764d76d7864589094647d8c3b4") (:authors ("Jamie Beardslee" . "jdb@jamzattack.xyz")) (:maintainers ("Jamie Beardslee" . "jdb@jamzattack.xyz")) (:maintainer "Jamie Beardslee" . "jdb@jamzattack.xyz") (:keywords "unix" "eshell" "outline" "convenience") (:url . "https://git.jamzattack.xyz/eshell-outline"))])
  (eshell-prompt-extras . [(20231019 1405) ((emacs (25))) "Display extra information for your eshell prompt." tar ((:commit . "14eabe593e110ed6937ac3b95f7979263d716a26") (:authors ("zwild" . "judezhao@outlook.com")) (:maintainers ("Xu Chunyang" . "xuchunyang56@gmail.com")) (:maintainer "Xu Chunyang" . "xuchunyang56@gmail.com") (:keywords "eshell" "prompt") (:url . "https://github.com/zwild/eshell-prompt-extras"))])
- (eshell-syntax-highlighting . [(20240416 102) ((emacs (25 1))) "Highlight eshell commands" tar ((:commit . "070b33c20a907d973f41c0be1dcfd1335b8aa1e0") (:authors ("Alex Kreisher" . "akreisher18@gmail.com")) (:maintainers ("Alex Kreisher" . "akreisher18@gmail.com")) (:maintainer "Alex Kreisher" . "akreisher18@gmail.com") (:keywords "convenience") (:url . "https://github.com/akreisher/eshell-syntax-highlighting"))])
+ (eshell-syntax-highlighting . [(20240509 241) ((emacs (25 1))) "Highlight eshell commands" tar ((:commit . "1198fd658d317747eb606a50c7767fef579af324") (:authors ("Alex Kreisher" . "akreisher18@gmail.com")) (:maintainers ("Alex Kreisher" . "akreisher18@gmail.com")) (:maintainer "Alex Kreisher" . "akreisher18@gmail.com") (:keywords "convenience") (:url . "https://github.com/akreisher/eshell-syntax-highlighting"))])
  (eshell-toggle . [(20240417 1536) ((emacs (25 1)) (dash (2 11 0))) "Show/hide eshell under active window." tar ((:commit . "222e05870c0b3f4a4d96f9bdb7065c53eb43a917") (:authors ("Dmitry Cherkassov" . "dcherkassov@gmail.com")) (:maintainers ("Dmitry Cherkassov" . "dcherkassov@gmail.com")) (:maintainer "Dmitry Cherkassov" . "dcherkassov@gmail.com") (:keywords "processes") (:url . "https://github.com/4da/eshell-toggle"))])
  (eshell-up . [(20240226 1747) ((emacs (24))) "Quickly go to a specific parent directory in eshell" tar ((:commit . "1999afaa509204b780db44e99ac9648fe7d92d32") (:authors ("Peter W. V. Tran-Jørgensen" . "peter.w.v.jorgensen@gmail.com")) (:maintainers ("Peter W. V. Tran-Jørgensen" . "peter.w.v.jorgensen@gmail.com")) (:maintainer "Peter W. V. Tran-Jørgensen" . "peter.w.v.jorgensen@gmail.com") (:keywords "eshell") (:url . "https://github.com/peterwvj/eshell-up"))])
  (eshell-vterm . [(20240305 1149) ((emacs (27 1)) (vterm (0 0 1))) "Vterm for visual commands in eshell" tar ((:commit . "20f4b246fa605a1533cdfbe3cb7faf31a24e3d2e") (:authors ("Illia Ostapyshyn" . "ilya.ostapyshyn@gmail.com")) (:maintainers ("Illia Ostapyshyn" . "ilya.ostapyshyn@gmail.com")) (:maintainer "Illia Ostapyshyn" . "ilya.ostapyshyn@gmail.com") (:keywords "eshell" "vterm" "terminals" "shell" "visual" "tools" "processes") (:url . "https://github.com/iostapyshyn/eshell-vterm"))])
@@ -1490,7 +1492,7 @@
  (espy . [(20200317 2333) ((emacs (24))) "Emacs Simple Password Yielder" tar ((:commit . "2c01be937a5e5bde62921684a0b27300705fb4e0") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "convenience") (:url . "https://github.com/walseb/espy"))])
  (esqlite . [(20151206 1206) ((pcsv (1 3 3))) "Manipulate sqlite file from Emacs" tar ((:commit . "fae9826cbc255b0f0686a801288f1441bda5f631") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com") (:keywords "data") (:url . "https://github.com/mhayashi1120/Emacs-esqlite"))])
  (esqlite-helm . [(20151116 850) ((esqlite (0 2 0)) (helm (20131207 845))) "Define helm source for sqlite database" tar ((:commit . "84d5b16198f30949c544affba751ee0d58a000d9") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com") (:keywords "data") (:url . "https://github.com/mhayashi1120/Emacs-esqlite"))])
- (ess . [(20240410 1836) ((emacs (25 1))) "Emacs Speaks Statistics" tar ((:commit . "8030e29de88c1f234184278e9839d7a78d3ddc6c") (:authors ("David Smith" . "dsmith@stats.adelaide.edu.au") ("A.J. Rossini" . "blindglobe@gmail.com") ("Richard M. Heiberger" . "rmh@temple.edu") ("Kurt Hornik" . "Kurt.Hornik@R-project.org") ("Martin Maechler" . "maechler@stat.math.ethz.ch") ("Rodney A. Sparapani" . "rsparapa@mcw.edu") ("Stephen Eglen" . "stephen@gnu.org") ("Sebastian P. Luque" . "spluque@gmail.com") ("Henning Redestig" . "henning.red@googlemail.com") ("Vitalie Spinu" . "spinuvit@gmail.com") ("Lionel Henry" . "lionel.hry@gmail.com") ("J. Alexander Branham" . "alex.branham@gmail.com")) (:maintainers ("ESS Core Team" . "ESS-core@r-project.org")) (:maintainer "ESS Core Team" . "ESS-core@r-project.org") (:url . "https://ess.r-project.org/"))])
+ (ess . [(20240516 811) ((emacs (25 1))) "Emacs Speaks Statistics" tar ((:commit . "f307097eac4d182986ed200924f92f14210a7c46") (:authors ("David Smith" . "dsmith@stats.adelaide.edu.au") ("A.J. Rossini" . "blindglobe@gmail.com") ("Richard M. Heiberger" . "rmh@temple.edu") ("Kurt Hornik" . "Kurt.Hornik@R-project.org") ("Martin Maechler" . "maechler@stat.math.ethz.ch") ("Rodney A. Sparapani" . "rsparapa@mcw.edu") ("Stephen Eglen" . "stephen@gnu.org") ("Sebastian P. Luque" . "spluque@gmail.com") ("Henning Redestig" . "henning.red@googlemail.com") ("Vitalie Spinu" . "spinuvit@gmail.com") ("Lionel Henry" . "lionel.hry@gmail.com") ("J. Alexander Branham" . "alex.branham@gmail.com")) (:maintainers ("ESS Core Team" . "ESS-core@r-project.org")) (:maintainer "ESS Core Team" . "ESS-core@r-project.org") (:url . "https://ess.r-project.org/"))])
  (ess-R-data-view . [(20130509 1158) ((ctable (20130313 1743)) (popup (20130324 1305)) (ess (20130225 1754))) "Data viewer for GNU R" tar ((:commit . "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9") (:authors ("myuhe <yuhei.maeda_at_gmail.com>")) (:maintainers ("myuhe")) (:maintainer "myuhe") (:keywords "convenience") (:url . "https://github.com/myuhe/ess-R-data-view.el"))])
  (ess-r-insert-obj . [(20220610 1406) ((emacs (26 1)) (ess (18 10 1))) "Insert objects in ESS-R" tar ((:commit . "2ded9c23d0af2a7f6c0e02f9ea4af0e5b3cb7fb4") (:authors ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainers ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainer "Shuguang Sun" . "shuguang79@qq.com") (:keywords "tools") (:url . "https://github.com/ShuguangSun/ess-r-insert-obj"))])
  (ess-smart-equals . [(20210411 1333) ((emacs (25 1)) (ess (18 10))) "flexible, context-sensitive assignment key for R/S" tar ((:commit . "fea9eea4b59c3e9559b379508e3500076ca99ef1") (:authors ("Christopher R. Genovese" . "genovese@cmu.edu")) (:maintainers ("Christopher R. Genovese" . "genovese@cmu.edu")) (:maintainer "Christopher R. Genovese" . "genovese@cmu.edu") (:keywords "r" "s" "ess" "convenience") (:url . "https://github.com/genovese/ess-smart-equals"))])
@@ -1514,8 +1516,8 @@
  (evalator . [(20160213 128) ((helm-core (1 9 1))) "Package for interactive transformation of data with helm" tar ((:commit . "f30da4da48c0b3f3cfa1fc1c7cfdb53ffe79df36") (:authors ("Sean Irby")) (:maintainers ("Sean Irby" . "sean.t.irby@gmail.com")) (:maintainer "Sean Irby" . "sean.t.irby@gmail.com") (:keywords "languages" "elisp" "helm") (:url . "http://www.github.com/seanirby/evalator"))])
  (evalator-clojure . [(20160208 2148) ((cider (0 10 0)) (evalator (1 0 0))) "Clojure evaluation context for evalator via CIDER." tar ((:commit . "caa4e0a137bdfada86593128a654e16aa617ad50") (:authors ("Sean Irby")) (:maintainers ("Sean Irby" . "sean.t.irby@gmail.com")) (:maintainer "Sean Irby" . "sean.t.irby@gmail.com") (:keywords "languages" "clojure" "cider" "helm") (:url . "http://www.github.com/seanirby/evalator-clojure"))])
  (eve-mode . [(20170822 2231) ((emacs (25)) (polymode (1 0)) (markdown-mode (2 0))) "Major mode for editing Eve documents." tar ((:commit . "a4661114d9c18725691b76321d72167ca5a9070a") (:authors ("Joshua Cole" . "joshuafcole@gmail.com")) (:maintainers ("Joshua Cole" . "joshuafcole@gmail.com")) (:maintainer "Joshua Cole" . "joshuafcole@gmail.com") (:keywords "languages" "wp" "tools") (:url . "https://github.com/witheve/emacs-eve-mode"))])
- (everlasting-scratch . [(20230105 507) ((emacs (25 1))) "The *scratch* that lasts forever" tar ((:commit . "1b7dac779501dcd988552aa6455a5be89e8b0562") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "tool") (:url . "https://github.com/beacoder/everlasting-scratch"))])
- (evil . [(20240421 1915) ((emacs (24 1)) (goto-chg (1 6)) (cl-lib (0 5))) "Extensible Vi layer for Emacs." tar ((:commit . "fe44a565e6806dba4c298a76eb8800063016ec2d") (:maintainer "Tom Dalziel" . "tom.dalziel@gmail.com") (:keywords "emulations") (:url . "https://github.com/emacs-evil/evil"))])
+ (everlasting-scratch . [(20240430 1713) ((emacs (25 1))) "The *scratch* that lasts forever" tar ((:commit . "1837142ae14fdfd4d634434ceff966b348826259") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "tool") (:url . "https://github.com/beacoder/everlasting-scratch"))])
+ (evil . [(20240521 954) ((emacs (24 1)) (goto-chg (1 6)) (cl-lib (0 5))) "Extensible Vi layer for Emacs." tar ((:commit . "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed") (:maintainer "Tom Dalziel" . "tom.dalziel@gmail.com") (:keywords "emulations") (:url . "https://github.com/emacs-evil/evil"))])
  (evil-anzu . [(20220911 1939) ((evil (1 0 0)) (anzu (0 46))) "anzu for evil-mode" tar ((:commit . "d1e98ee6976437164627542909a25c6946497899") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com") ("Fredrik Bergroth" . "fbergroth@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-evil-anzu"))])
  (evil-args . [(20240210 504) ((evil (1 0 8))) "Motions and text objects for delimited arguments in Evil." tar ((:commit . "a8151556f63c9d45d0c44c8a7ef9e5a542f3cdc7") (:authors ("Connor Smith" . "wconnorsmith@gmail.com")) (:maintainers ("Connor Smith" . "wconnorsmith@gmail.com")) (:maintainer "Connor Smith" . "wconnorsmith@gmail.com") (:keywords "evil" "vim-emulation") (:url . "http://github.com/wcsmith/evil-args"))])
  (evil-avy . [(20150908 748) ((emacs (24 1)) (cl-lib (0 5)) (avy (0 3 0)) (evil (1 2 3))) "set-based completion" tar ((:commit . "2dd955cc3ecaa7ddeb67b295298abdc6d16dd3a5") (:authors ("Yufan Lou" . "loganlyf@gmail.com")) (:maintainers ("Yufan Lou" . "loganlyf@gmail.com")) (:maintainer "Yufan Lou" . "loganlyf@gmail.com") (:keywords "point" "location" "evil" "vim") (:url . "https://github.com/louy2/evil-avy"))])
@@ -1545,6 +1547,7 @@
  (evil-ledger . [(20180802 1612) ((emacs (24 4)) (evil (1 2 12)) (ledger-mode (0))) "Make `ledger-mode' more `evil'." tar ((:commit . "7a9f9f5d39c42fffdba8004f8982642351f2b233") (:authors ("Aaron Jacobs" . "atheriel@gmail.com")) (:maintainers ("Aaron Jacobs" . "atheriel@gmail.com")) (:maintainer "Aaron Jacobs" . "atheriel@gmail.com") (:keywords "convenience" "evil" "languages" "ledger" "vim-emulation") (:url . "https://github.com/atheriel/evil-ledger"))])
  (evil-lion . [(20220317 1030) ((emacs (24 3)) (evil (1 0 0))) "Evil align operator, port of vim-lion" tar ((:commit . "4da660e124731ed65e7aaa6c067c30e876619429") (:authors ("edkolev" . "evgenysw@gmail.com")) (:maintainers ("edkolev" . "evgenysw@gmail.com")) (:maintainer "edkolev" . "evgenysw@gmail.com") (:keywords "emulations" "evil" "vim") (:url . "http://github.com/edkolev/evil-lion"))])
  (evil-lisp-state . [(20160404 248) ((evil (1 0 9)) (bind-map (0)) (smartparens (1 6 1))) "An evil state to edit Lisp code" tar ((:commit . "3c65fecd9917a41eaf6460f22187e2323821f3ce") (:authors ("Sylvain Benner" . "sylvain.benner@gmail.com")) (:maintainers ("Sylvain Benner" . "sylvain.benner@gmail.com")) (:maintainer "Sylvain Benner" . "sylvain.benner@gmail.com") (:keywords "convenience" "editing" "evil" "smartparens" "lisp" "mnemonic") (:url . "https://github.com/syl20bnr/evil-lisp-state"))])
+ (evil-lispops . [(20240428 1356) ((emacs (26 1)) (evil (1 2 10))) "Operations for editing lisp evilly" tar ((:commit . "372b52df1a45fcea6c9461e7909cfdbb1db822a9") (:authors ("precompute" . "git@precompute.net")) (:maintainers ("precompute" . "git@precompute.net")) (:maintainer "precompute" . "git@precompute.net") (:url . "https://github.com/precompute/evil-lispops"))])
  (evil-lispy . [(20190502 739) ((lispy (0 26 0)) (evil (1 2 12)) (hydra (0 13 5))) "precision Lisp editing with Evil and Lispy" tar ((:commit . "ed317f7fccbdbeea8aa04a91b1b1f48a0e2ddc4e") (:authors ("Brandon Carrell <brandoncarrell@gmail.com>, Mika Vilpas" . "mika.vilpas@gmail.com")) (:maintainers ("Brandon Carrell <brandoncarrell@gmail.com>, Mika Vilpas" . "mika.vilpas@gmail.com")) (:maintainer "Brandon Carrell <brandoncarrell@gmail.com>, Mika Vilpas" . "mika.vilpas@gmail.com") (:keywords "lisp") (:url . "https://github.com/sp3ctum/evil-lispy"))])
  (evil-mark-replace . [(20240303 1416) ((evil (1 14 0))) "replace the thing in marked area" tar ((:commit . "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4") (:authors ("Chen Bin <chenbin DOT sh AT gmail DOT com>")) (:maintainers ("Chen Bin <chenbin DOT sh AT gmail DOT com>")) (:maintainer "Chen Bin <chenbin DOT sh AT gmail DOT com>") (:keywords "convenience") (:url . "http://github.com/redguardtoo/evil-mark-replace"))])
  (evil-matchit . [(20240418 731) ((emacs (25 1))) "Vim matchit ported to Evil" tar ((:commit . "c75b2c6c3123824ff7ae35deef22a3a5d9b619b2") (:authors ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com") (:keywords "matchit" "vim" "evil") (:url . "http://github.com/redguardtoo/evil-matchit"))])
@@ -1617,7 +1620,7 @@
  (extend-dnd . [(20151122 1850) nil "R drag and Drop" tar ((:commit . "80c966c93b82c9bb5c6225a432557c39144fc602") (:authors ("Matthew L. Fidler")) (:maintainers ("Matthew L. Fidler")) (:maintainer "Matthew L. Fidler") (:keywords "extend" "drag and drop") (:url . "https://github.com/mlf176f2/extend-dnd"))])
  (external-dict . [(20231129 1043) ((emacs (25 1))) "Query external dictionary like goldendict, Bob.app etc" tar ((:commit . "17807ac7e671b44da495e7e3fac5b8cb72a25feb") (:keywords "wp" "processes") (:url . "https://repo.or.cz/external-dict.el.git"))])
  (extmap . [(20230907 1959) ((emacs (24 4))) "Externally-stored constant mapping for Elisp" tar ((:commit . "3b0f898057082a1c01584ff2bbaf5fd4d22c1400") (:authors ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainers ("Paul Pogonyshev" . "pogonyshev@gmail.com")) (:maintainer "Paul Pogonyshev" . "pogonyshev@gmail.com") (:keywords "lisp") (:url . "https://github.com/doublep/extmap"))])
- (exunit . [(20240401 1344) ((s (1 11 0)) (emacs (24 3)) (f (0 20 0)) (transient (0 3 6))) "ExUnit test runner" tar ((:commit . "3b63d8835398ccadbcec080c8c1e00cd638b62b0") (:authors ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainers ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainer "Anantha kumaran" . "ananthakumaran@gmail.com") (:keywords "processes" "elixir" "exunit") (:url . "http://github.com/ananthakumaran/exunit.el"))])
+ (exunit . [(20240502 431) ((s (1 11 0)) (emacs (24 3)) (f (0 20 0)) (transient (0 3 6)) (project (0 9 8))) "ExUnit test runner" tar ((:commit . "b6134ce920a4bbc561f65fac1d1bf37206d97505") (:authors ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainers ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainer "Anantha kumaran" . "ananthakumaran@gmail.com") (:keywords "processes" "elixir" "exunit") (:url . "http://github.com/ananthakumaran/exunit.el"))])
  (exwm-edit . [(20240418 2142) ((emacs (27 1))) "Edit mode for EXWM" tar ((:commit . "046b8c11f71bfd6c798df770c6b7708af2c187a2") (:authors ("Ag Ibragimov")) (:maintainers ("Ag Ibragimov")) (:maintainer "Ag Ibragimov") (:keywords "convenience") (:url . "https://github.com/agzam/exwm-edit"))])
  (exwm-firefox-core . [(20190812 2110) ((emacs (24 4)) (exwm (0 16))) "Firefox hotkeys to functions" tar ((:commit . "e2fe2a895e8f973307ef52f8c9976b26e701cbd0") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "extensions") (:url . "https://github.com/walseb/exwm-firefox-core"))])
  (exwm-firefox-evil . [(20231026 309) ((emacs (24 4)) (exwm (0 16)) (evil (1 0 0)) (exwm-firefox-core (1 0))) "evil-mode implementation of exwm-firefox-core" tar ((:commit . "ec9e14eca25aea9b7c7169be23843898f46696e7") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "extensions") (:url . "https://github.com/walseb/exwm-firefox-evil"))])
@@ -1637,7 +1640,7 @@
  (face-explorer . [(20190517 1857) nil "Library and tools for faces and text properties" tar ((:commit . "ad1300e13e5643e4c246cabfd91f833d39113052") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "faces") (:url . "https://github.com/Lindydancer/face-explorer"))])
  (faceup . [(20170925 1946) nil "Markup language for faces and font-lock regression testing" tar ((:commit . "6c92dad56a133e14e7b27831e1bcf9b3a71ff154") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "faces" "languages") (:url . "https://github.com/Lindydancer/faceup"))])
  (factlog . [(20130210 140) ((deferred (0 3 1))) "File activity logger" tar ((:commit . "38f78132ae311faffba98ed5dd18d661af68678e") (:authors ("Takafumi Arakaki <aka.tkf at gmail.com>")) (:maintainers ("Takafumi Arakaki <aka.tkf at gmail.com>")) (:maintainer "Takafumi Arakaki <aka.tkf at gmail.com>") (:url . "https://github.com/tkf/factlog"))])
- (faff-theme . [(20240416 2057) nil "Light Emacs color theme on cornsilk3 background" tar ((:commit . "9b8ff139442b29a16a437c367f201f263bbb884c") (:authors ("James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>")) (:maintainers ("James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>")) (:maintainer "James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>") (:keywords "color" "theme") (:url . "https://github.com/WJCFerguson/emacs-faff-theme"))])
+ (faff-theme . [(20240520 1303) nil "Light Emacs color theme on cornsilk3 background" tar ((:commit . "452546431e3bef05fbf8914f6d41b8b7a3557bf3") (:authors ("James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>")) (:maintainers ("James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>")) (:maintainer "James Ferguson <(concat \"wjcferguson\" at-sign \"gmail.com\")>") (:keywords "color" "theme") (:url . "https://github.com/WJCFerguson/emacs-faff-theme"))])
  (fakir . [(20140729 1652) ((noflet (0 0 8)) (dash (1 3 2)) (kv (0 0 19))) "fakeing bits of Emacs" tar ((:commit . "1fca406ad7de80fece6319ff75d4230b648534b0") (:authors ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainers ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainer "Nic Ferrier" . "nferrier@ferrier.me.uk") (:keywords "lisp" "tools") (:url . "http://github.com/nicferrier/emacs-fakir"))])
  (fancy-battery . [(20150101 1204) ((emacs (24 1))) "Fancy battery display" tar ((:commit . "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68") (:authors ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainers ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainer "Sebastian Wiesner" . "swiesner@lunaryorn.com") (:keywords "convenience" "tools" "hardware") (:url . "https://github.com/lunaryorn/fancy-battery.el"))])
  (fancy-compilation . [(20240422 111) ((emacs (26 1))) "Enhanced compilation output" tar ((:commit . "347db70ec7252245ab745c1087e8806c684e2a04") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-fancy-compilation"))])
@@ -1662,7 +1665,7 @@
  (feebleline . [(20190822 1401) nil "Replace modeline with a slimmer proxy" tar ((:commit . "b2f2db25cac77817bf0c49ea2cea6383556faea0") (:authors ("Benjamin Lindqvist" . "benjamin.lindqvist@gmail.com")) (:maintainers ("Benjamin Lindqvist" . "benjamin.lindqvist@gmail.com")) (:maintainer "Benjamin Lindqvist" . "benjamin.lindqvist@gmail.com") (:url . "https://github.com/tautologyclub/feebleline"))])
  (feed-discovery . [(20200714 1118) ((emacs (25 1)) (dash (2 16 0))) "Discover feed url by RSS/Atom autodiscovery" tar ((:commit . "3812439c845c184eaf164d3ac8935de135259855") (:authors ("Hiroki YAMAKAWA" . "s06139@gmail.com")) (:maintainers ("Hiroki YAMAKAWA" . "s06139@gmail.com")) (:maintainer "Hiroki YAMAKAWA" . "s06139@gmail.com") (:url . "https://github.com/HKey/feed-discovery"))])
  (feline . [(20230301 1350) ((emacs (28 1))) "A modeline with very little" tar ((:commit . "8c46b1be9e45a38281aa9ddae79fda3c8e4cb5c5") (:authors ("chee" . "emacs@chee.party")) (:maintainers ("chee" . "emacs@chee.party")) (:maintainer "chee" . "emacs@chee.party") (:url . "https://opensource.chee.party/chee/feline-mode"))])
- (fennel-mode . [(20240425 129) ((emacs (26 1))) "A major-mode for editing Fennel code" tar ((:commit . "dd7a320b1582b726d011f4fca24d36614b5ffba8") (:authors ("Phil Hagelberg")) (:maintainers ("Phil Hagelberg")) (:maintainer "Phil Hagelberg") (:keywords "languages" "tools") (:url . "https://git.sr.ht/~technomancy/fennel-mode"))])
+ (fennel-mode . [(20240502 1555) ((emacs (26 1))) "A major-mode for editing Fennel code" tar ((:commit . "b07a726f4d8b6e7f69fdf7f2105abfa5707680dc") (:authors ("Phil Hagelberg")) (:maintainers ("Phil Hagelberg")) (:maintainer "Phil Hagelberg") (:keywords "languages" "tools") (:url . "https://git.sr.ht/~technomancy/fennel-mode"))])
  (fetch . [(20131201 730) nil "Fetch and unpack resources" tar ((:commit . "3f2793afcbbc32f320e572453166f9354ecc6d06") (:authors ("Christian 'crshd' Brassat" . "christian.brassat@gmail.com")) (:maintainers ("Christian 'crshd' Brassat" . "christian.brassat@gmail.com")) (:maintainer "Christian 'crshd' Brassat" . "christian.brassat@gmail.com") (:url . "https://github.com/crshd/fetch.el"))])
  (ffmpeg-player . [(20240101 926) ((emacs (24 4)) (s (1 12 0)) (f (0 20 0))) "Play video using ffmpeg" tar ((:commit . "c3808dc1c39499a81e1b9463526fda924fd1f062") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "multimedia" "video" "ffmpeg" "buffering" "images") (:url . "https://github.com/jcs-elpa/ffmpeg-player"))])
  (ffmpeg-utils . [(20230305 709) ((emacs (25 1)) (alert (1 2)) (transient (0 1 0))) "FFmpeg command utilities wrappers" tar ((:commit . "064d61527bc6b6a1d0fb0065f8a7bae3bbd4cefc") (:keywords "multimedia") (:url . "https://repo.or.cz/ffmpeg-utils.git"))])
@@ -1684,7 +1687,7 @@
  (find-file-in-project . [(20230506 544) ((emacs (25 1))) "Find file/directory and review Diff/Patch/Commit efficiently" tar ((:commit . "889466d047ee93ab33fa8eaa4e1ef279d884f1da") (:authors ("Phil Hagelberg, Doug Alcorn, and Will Farrington")) (:maintainers ("Chen Bin" . "chenbin.sh@gmail.com")) (:maintainer "Chen Bin" . "chenbin.sh@gmail.com") (:keywords "project" "convenience") (:url . "https://github.com/redguardtoo/find-file-in-project"))])
  (find-file-in-repository . [(20210301 2202) nil "Quickly find files in a git, mercurial or other repository" tar ((:commit . "10f5bd919ce35691addc5ce0d281597a46813a79") (:authors ("Samuel Hoffstaetter" . "samuel@hoffstaetter.com")) (:maintainers ("Samuel Hoffstaetter" . "samuel@hoffstaetter.com")) (:maintainer "Samuel Hoffstaetter" . "samuel@hoffstaetter.com") (:keywords "files" "convenience" "repository" "project" "source control") (:url . "https://github.com/hoffstaetter/find-file-in-repository"))])
  (find-file-rg . [(20220314 1540) ((emacs (25 1))) "Find file in project using ripgrep" tar ((:commit . "404b1cc97c2f700d3dc1c66b640f96ed5a268dc3") (:authors ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainers ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainer "Andrii Kolomoiets" . "andreyk.mad@gmail.com") (:keywords "tools") (:url . "https://github.com/muffinmad/emacs-find-file-rg"))])
- (find-temp-file . [(20221119 1350) nil "Open quickly a temporary file" tar ((:commit . "601e39b052c66df4cd928cf7e308dd6a54769a99") (:authors ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainers ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainer "Sylvain Rousseau <thisirs at gmail dot com>") (:keywords "convenience") (:url . "https://github.com/thisirs/find-temp-file.git"))])
+ (find-temp-file . [(20240512 1635) nil "Open quickly a temporary file" tar ((:commit . "76414b6ba8660905675ec8969f5db0adb270bb80") (:authors ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainers ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainer "Sylvain Rousseau <thisirs at gmail dot com>") (:keywords "convenience") (:url . "https://github.com/thisirs/find-temp-file.git"))])
  (find-things-fast . [(20150519 2226) nil "Find things fast, leveraging the power of git" tar ((:commit . "281dcb5a2e2db1013246dcac5111808352a8ea95") (:authors ("Elvio Toccalino and Elliot Glaysher and Phil Hagelberg and Doug Alcorn")) (:maintainers ("Elvio Toccalino and Elliot Glaysher and Phil Hagelberg and Doug Alcorn")) (:maintainer "Elvio Toccalino and Elliot Glaysher and Phil Hagelberg and Doug Alcorn") (:keywords "project" "convenience"))])
  (findr . [(20130127 2032) nil "Breadth-first file-finding facility for (X)Emacs" tar ((:commit . "1ddbc0464bb05dcda392b62666ad17239a2152d3") (:authors ("David Bakhash" . "cadet@bu.edu")) (:maintainers ("David Bakhash" . "cadet@bu.edu")) (:maintainer "David Bakhash" . "cadet@bu.edu") (:keywords "files"))])
  (fingers . [(20160817 829) nil "Modal editing with universal text manipulation helpers." tar ((:commit . "7de351448a6f5ea7aa7a25db6c90d5138f87eb16") (:authors ("Felix Geller" . "fgeller@gmail.com")) (:maintainers ("Felix Geller" . "fgeller@gmail.com")) (:maintainer "Felix Geller" . "fgeller@gmail.com") (:keywords "fingers" "modal" "editing" "workman") (:url . "http://github.com/fgeller/fingers.el"))])
@@ -1696,7 +1699,7 @@
  (firestarter . [(20210508 1626) ((emacs (24 1))) "Execute (shell) commands on save" tar ((:commit . "76070c9074aa363350abe6ad06143e90b3e12ab1") (:authors ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de") (:keywords "convenience") (:url . "https://depp.brause.cc/firestarter"))])
  (firrtl-mode . [(20231127 1237) ((emacs (24 3))) "mode for working with FIRRTL files" tar ((:commit . "0c7d971899f93367b78e13d70d64cfb89d80b45c") (:authors ("Schuyler Eldridge" . "schuyler.eldridge@ibm.com")) (:maintainers ("Schuyler Eldridge" . "schuyler.eldridge@ibm.com")) (:maintainer "Schuyler Eldridge" . "schuyler.eldridge@ibm.com") (:keywords "languages" "firrtl") (:url . "https://github.com/ibm/firrtl-mode"))])
  (firstly-search . [(20240408 556) ((emacs (29 1))) "Search with any key: Dired, Package, Buffer menu modes" tar ((:commit . "2045d990509074a8151c8a27db50e477d254aa31") (:authors ("github.com/Anoncheg1,codeberg.org/Anoncheg")) (:maintainers ("github.com/Anoncheg1,codeberg.org/Anoncheg")) (:maintainer "github.com/Anoncheg1,codeberg.org/Anoncheg") (:keywords "matching" "isearch" "navigation" "dired" "packagemenu") (:url . "https://codeberg.org/Anoncheg/firstly-search"))])
- (fish-completion . [(20240405 2052) ((emacs (25 1))) "Fish completion for pcomplete (shell and Eshell)" tar ((:commit . "807628cc4b0f7a07b6e512f7c7825a78ee5c73fc") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainer "Pierre Neidhardt" . "mail@ambrevar.xyz") (:url . "https://gitlab.com/Ambrevar/emacs-fish-completion"))])
+ (fish-completion . [(20240518 1403) ((emacs (25 1))) "Fish completion for pcomplete (shell and Eshell)" tar ((:commit . "1256f137a2039805d4e87f8e6c11a162ed019587") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainer "Pierre Neidhardt" . "mail@ambrevar.xyz") (:url . "https://gitlab.com/Ambrevar/emacs-fish-completion"))])
  (fish-mode . [(20240129 1213) ((emacs (24))) "Major mode for fish shell scripts" tar ((:commit . "2526b1803b58cf145bc70ff6ce2adb3f6c246f89") (:authors ("Tony Wang" . "wwwjfy@gmail.com")) (:maintainers ("Tony Wang" . "wwwjfy@gmail.com")) (:maintainer "Tony Wang" . "wwwjfy@gmail.com") (:keywords "fish" "shell"))])
  (fit-text-scale . [(20211230 2002) ((emacs (25 1))) "Fit text by scaling" tar ((:commit . "c53c8ce606380088643463848a9ee3502b0c64f4") (:authors ("Marco Wahl" . "marcowahlsoft@gmail.com")) (:maintainers ("Marco Wahl" . "marcowahlsoft@gmail.com")) (:maintainer "Marco Wahl" . "marcowahlsoft@gmail.com") (:keywords "convenience") (:url . "https://gitlab.com/marcowahl/fit-text-scale"))])
  (fix-input . [(20230606 1523) ((emacs (24 4))) "Make input methods play nicely with alternative layouts" tar ((:commit . "439c1ce8c0a66ecdee4a4b25a1b96197d926b1c3") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "convenience" "input") (:url . "https://github.com/mrkkrp/fix-input"))])
@@ -1742,7 +1745,7 @@
  (flycheck-bashate . [(20200625 642) ((flycheck (0 24)) (emacs (24 4))) "Integrate bashate with flycheck" tar ((:commit . "69e53e84f712bafffd785d84d9304598c2df5615") (:authors ("Alex Murray" . "murray.alex@gmail.com")) (:maintainers ("Alex Murray" . "murray.alex@gmail.com")) (:maintainer "Alex Murray" . "murray.alex@gmail.com") (:url . "https://github.com/alexmurray/flycheck-bashate"))])
  (flycheck-buf-lint . [(20230724 1501) ((emacs (26 1)) (flycheck (0 22)) (s (1 12 0))) "Flycheck checker for protobuf with buf.build" tar ((:commit . "51c439dcb9fa40966256d8cce835f7b7aabf44d0") (:authors ("Aaron Ji" . "shuxiao9058@gmail.com")) (:maintainers ("Aaron Ji" . "shuxiao9058@gmail.com")) (:maintainer "Aaron Ji" . "shuxiao9058@gmail.com") (:keywords "convenience" "tools" "buf" "protobuf") (:url . "https://github.com/shuxiao9058/flycheck-buf-lint"))])
  (flycheck-cask . [(20240205 1721) ((emacs (24 3)) (flycheck (0 14)) (dash (2 4 0))) "Cask support in Flycheck" tar ((:commit . "0eeec5197e9d31bfcfc39380b262d65259a87d91") (:authors ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainers ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainer "Sebastian Wiesner" . "swiesner@lunaryorn.com") (:keywords "tools" "convenience") (:url . "https://github.com/flycheck/flycheck-cask"))])
- (flycheck-cfn . [(20231030 1003) ((emacs (26 1)) (flycheck (31))) "Flycheck backend for AWS cloudformation" tar ((:commit . "0eb3dd630391e4d8a26e09c9032cfb9f4bd71e08") (:authors ("William Orr" . "will@worrbase.com")) (:maintainers ("William Orr" . "will@worrbase.com")) (:maintainer "William Orr" . "will@worrbase.com") (:keywords "convenience") (:url . "https://gitlab.com/worr/cfn-mode"))])
+ (flycheck-cfn . [(20240512 2341) ((emacs (27 0)) (flycheck (31))) "Flycheck backend for AWS cloudformation" tar ((:commit . "b26a95a219aa700256b22fd026cace57bce1701b") (:authors ("William Orr" . "will@worrbase.com")) (:maintainers ("William Orr" . "will@worrbase.com")) (:maintainer "William Orr" . "will@worrbase.com") (:keywords "convenience") (:url . "https://gitlab.com/worr/cfn-mode"))])
  (flycheck-checkbashisms . [(20230313 1418) ((emacs (24)) (flycheck (0 25))) "checkbashisms checker for flycheck" tar ((:commit . "ca8f11679c77d6702f34e773bdde185ceb47a05d") (:authors ("Cuong Le" . "cuong.manhle.vn@gmail.com")) (:maintainers ("Cuong Le" . "cuong.manhle.vn@gmail.com")) (:maintainer "Cuong Le" . "cuong.manhle.vn@gmail.com") (:keywords "convenience" "tools" "sh" "unix") (:url . "https://github.com/cuonglm/flycheck-checkbashisms"))])
  (flycheck-checkpatch . [(20170217 1025) ((emacs (25)) (flycheck (30))) "Flycheck support for checkpatch.pl tool" tar ((:commit . "6461fc7b0d493eb9863814055f8bce5fa35739de") (:authors ("Alexander Yarygin" . "yarygin.alexander@gmail.com")) (:maintainers ("Alexander Yarygin" . "yarygin.alexander@gmail.com")) (:maintainer "Alexander Yarygin" . "yarygin.alexander@gmail.com") (:url . "https://github.com/zpp0/flycheck-checkpatch"))])
  (flycheck-clang-analyzer . [(20211214 648) ((flycheck (0 24)) (emacs (24 4))) "Integrate Clang Analyzer with flycheck" tar ((:commit . "646d9f3a80046ab231a07526778695d5decad92d") (:authors ("Alex Murray" . "murray.alex@gmail.com")) (:maintainers ("Alex Murray" . "murray.alex@gmail.com")) (:maintainer "Alex Murray" . "murray.alex@gmail.com") (:url . "https://github.com/alexmurray/flycheck-clang-analyzer"))])
@@ -1938,16 +1941,16 @@
  (foreign-regexp . [(20200325 50) nil "search and replace by foreign regexp." tar ((:commit . "e2dd47f2160cadc194eb156e7c76c3c869e6706e") (:authors ("K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>")) (:maintainers ("K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>")) (:maintainer "K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>") (:keywords "convenience" "emulations" "matching" "tools" "unix" "wp"))])
  (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 ((:commit . "22b3bb13134b617870ed1e888af739f4818be929") (:authors ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainers ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainer "ZHOU Feng" . "zf.pascal@gmail.com") (:keywords "foreman") (:url . "http://github.com/zweifisch/foreman-mode"))])
  (forest-blue-theme . [(20160627 842) ((emacs (24))) "Emacs theme with a dark background." tar ((:commit . "58096ce1a25615d2bae806c3775bae3e2775019d") (:authors ("olkinn")) (:maintainers ("olkinn")) (:maintainer "olkinn"))])
- (forge . [(20240423 2033) ((emacs (26 1)) (compat (29 1 4 5)) (closql (20240405)) (dash (2 19 1)) (emacsql (20240124)) (ghub (20240311)) (let-alist (1 0 6)) (magit (20240404)) (markdown-mode (2 6)) (seq (2 24)) (transient (20240421)) (yaml (0 5 5))) "Access Git forges from Magit." tar ((:commit . "b54c8610a48c092aec8adde289cb9ba52ff7e23c") (:authors ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/forge"))])
+ (forge . [(20240519 1510) ((emacs (26 3)) (compat (29 1 4 5)) (closql (20240405)) (dash (2 19 1)) (emacsql (20240124)) (ghub (20240507)) (let-alist (1 0 6)) (magit (20240428)) (markdown-mode (2 6)) (seq (2 24)) (transient (20240421)) (yaml (0 5 5))) "Access Git forges from Magit." tar ((:commit . "d3b14f2cb6740d18827ed713715908b517e4a899") (:authors ("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/forge"))])
  (form-feed . [(20210508 1627) ((emacs (24 1))) "Display ^L glyphs as horizontal lines" tar ((:commit . "ac1f0ef30a11979f5dfe12d8c05a666739e486ff") (:authors ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainers ("Vasilij Schneidermann" . "mail@vasilij.de")) (:maintainer "Vasilij Schneidermann" . "mail@vasilij.de") (:keywords "faces") (:url . "https://depp.brause.cc/form-feed"))])
  (form-feed-st . [(20231002 2211) ((emacs (25 1))) "Display ^L glyphs as full-width horizontal lines" tar ((:commit . "f91c8daf35b7588e0aa24c8716c8cfd8ff0067c8") (:authors ("Leonardo Schripsema")) (:maintainers ("Leonardo Schripsema")) (:maintainer "Leonardo Schripsema") (:keywords "faces") (:url . "https://github.com/leodag/form-feed-st"))])
- (format-all . [(20240205 2153) ((emacs (24 4)) (inheritenv (0 1)) (language-id (0 20))) "Auto-format C, C++, JS, Python, Ruby and 50 other languages" tar ((:commit . "1f4a69811b4b6a00c74fa2566ef731b17b9a2ed1") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/lassik/emacs-format-all-the-code"))])
+ (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 ((:commit . "c5ddfc5f3317eaa2a7541a818a0fce961e5e61dd") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/lassik/emacs-format-all-the-code"))])
  (format-sql . [(20150422 1333) nil "Use format-sql to make your SQL readable in directly Emacs." tar ((:commit . "97f475c245cd6c81a72a265678e2087cee66ac7b") (:authors ("Friedrich Paetzke" . "paetzke@fastmail.fm")) (:maintainers ("Friedrich Paetzke" . "paetzke@fastmail.fm")) (:maintainer "Friedrich Paetzke" . "paetzke@fastmail.fm") (:url . "https://github.com/paetzke/format-sql.el"))])
  (format-table . [(20181223 1616) ((emacs (25)) (dash (2 14 1))) "Parse and reformat tabular data." tar ((:commit . "dfcae3a867e574577fc09a43b045889ff155b58f") (:authors ("Jason Duncan" . "jasond496@msn.com")) (:maintainers ("Jason Duncan" . "jasond496@msn.com")) (:maintainer "Jason Duncan" . "jasond496@msn.com") (:keywords "data") (:url . "https://github.com/functionreturnfunction/format-table"))])
  (forth-mode . [(20231206 1127) ((cl-lib (0 2))) "Programming language mode for Forth" tar ((:commit . "59c5ea89ca7593bd49cdde6caefa0893a8780105") (:authors ("Lars Brinkhoff" . "lars@nocrew.org")) (:maintainers ("Lars Brinkhoff" . "lars@nocrew.org")) (:maintainer "Lars Brinkhoff" . "lars@nocrew.org") (:keywords "languages" "forth") (:url . "http://github.com/larsbrinkhoff/forth-mode"))])
  (fortpy . [(20150715 2032) ((epc (0 1 0)) (auto-complete (1 4)) (python-environment (0 0 2)) (pos-tip (0 4 5))) "a Fortran auto-completion for Emacs" tar ((:commit . "c614517e9396ef7a78be3b8786fbf303879cf43b") (:authors ("Conrad Rosenbrock <rosenbrockc at gmail.com>")) (:maintainers ("Conrad Rosenbrock <rosenbrockc at gmail.com>")) (:maintainer "Conrad Rosenbrock <rosenbrockc at gmail.com>"))])
  (fortune-cookie . [(20181223 842) nil "Print a fortune in your scratch buffer." tar ((:commit . "6c1c08f5be83822c0b762872ab25e3dbee96f333") (:authors ("Andrew Schwartzmeyer" . "andrew@schwartzmeyer.com")) (:maintainers ("Andrew Schwartzmeyer" . "andrew@schwartzmeyer.com")) (:maintainer "Andrew Schwartzmeyer" . "andrew@schwartzmeyer.com") (:keywords "fortune" "cowsay" "scratch" "startup") (:url . "https://github.com/andschwa/fortune-cookie"))])
- (fountain-mode . [(20240329 229) ((emacs (24 4)) (seq (2 20))) "Major mode for screenwriting in Fountain markup" tar ((:commit . "b25315fed996cf1d41cc2d612dacc62b3e95f928") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "wp" "text") (:url . "https://www.fountain-mode.org"))])
+ (fountain-mode . [(20240520 307) ((emacs (24 4)) (seq (2 20))) "Major mode for screenwriting in Fountain markup" tar ((:commit . "7e10f27dd5d9a5d18e08a5454321e961167dfbf7") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "wp" "text") (:url . "https://www.fountain-mode.org"))])
  (fpga . [(20240329 1759) ((emacs (29 1))) "FPGA & ASIC Utils" tar ((:commit . "34e521962ba3842321d456bd587aa93e4b627969") (:authors ("Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com")) (:maintainers ("Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com")) (:maintainer "Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com") (:keywords "tools") (:url . "https://github.com/gmlarumbe/fpga"))])
  (fraktur-mode . [(20160815 227) ((cl-lib (0 5))) "Easily insert Unicode mathematical Fraktur characters" tar ((:commit . "514baf5546aed12a0d9fa0fe66e87cdcc7843b08") (:authors ("Grant Rettke" . "gcr@wisdomandwonder.com")) (:maintainers (nil . "<gcr@wisdomandwonder.com>")) (:maintainer nil . "<gcr@wisdomandwonder.com>") (:keywords "unicode" "fraktur" "math" "mathematical") (:url . "https://github.com/grettke/fraktur-mode"))])
  (frame-local . [(20180330 940) ((emacs (25 1))) "Variables local to a frame" tar ((:commit . "51c0889602626e2dcc6f1c1a812b058bc96df03c") (:authors ("Sebastien Chapuis" . "sebastien@chapu.is")) (:maintainers ("Sebastien Chapuis" . "sebastien@chapu.is")) (:maintainer "Sebastien Chapuis" . "sebastien@chapu.is") (:keywords "frames" "tools" "local" "lisp") (:url . "https://github.com/sebastiencs/frame-local"))])
@@ -1995,17 +1998,17 @@
  (gams-ac . [(20180423 926) ((emacs (24)) (auto-complete (1 0)) (gams-mode (4 0))) "auto-complete source file for GAMS mode" tar ((:commit . "66d04ff36033f54205c19bc1d893e926d4dbf02e") (:authors ("Shiro Takeda")) (:maintainers ("Shiro Takeda")) (:maintainer "Shiro Takeda") (:keywords "languages" "tools" "gams-mode" "auto-complete") (:url . "https://github.com/ShiroTakeda/gams-ac"))])
  (gams-mode . [(20231202 1410) ((emacs (24 3))) "Major mode for General Algebraic Modeling System (GAMS)" tar ((:commit . "03c24b19c270feca0d3fc9494698cf6d4c7f8152") (:authors ("Shiro Takeda")) (:maintainers ("Shiro Takeda")) (:maintainer "Shiro Takeda") (:keywords "languages" "tools" "gams") (:url . "http://shirotakeda.org/en/gams/gams-mode/"))])
  (gandalf-theme . [(20130809 947) nil "Gandalf color theme" tar ((:commit . "4e472fc851431458537d458d09c1f5895e338536") (:authors ("Peter Vasil" . "mail@petervasil.net")) (:maintainers ("Peter Vasil" . "mail@petervasil.net")) (:maintainer "Peter Vasil" . "mail@petervasil.net") (:keywords "color" "theme"))])
- (gap-mode . [(20240126 359) nil "Major mode for editing files in the GAP programming language." tar ((:commit . "b816fcf70840887461764ebdbb34c8b37dd42ba2") (:authors ("Michael Smith" . "smith@pell.anu.edu.au") ("Gary Zablackis") ("Goetz Pfeiffer") ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainers ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainer "Ivan Andrus" . "darthandrus@gmail.com") (:keywords "gap") (:url . "https://gitlab.com/gvol/gap-mode"))])
+ (gap-mode . [(20240430 210) nil "Major mode for editing files in the GAP programming language." tar ((:commit . "09b4082b6e28141537696bb832c8ecc975ec57d8") (:authors ("Michael Smith" . "smith@pell.anu.edu.au") ("Gary Zablackis") ("Goetz Pfeiffer") ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainers ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainer "Ivan Andrus" . "darthandrus@gmail.com") (:keywords "gap") (:url . "https://gitlab.com/gvol/gap-mode"))])
  (gather . [(20141230 1338) nil "Gather string in buffer." tar ((:commit . "8909c886d72a682710bb79ccfcfe4df54a399b7e") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com") (:keywords "matching" "convenience" "tools") (:url . "https://github.com/mhayashi1120/Emacs-gather/raw/master/gather.el"))])
  (gcmh . [(20201116 2251) ((emacs (24))) "the Garbage Collector Magic Hack" tar ((:commit . "0089f9c3a6d4e9a310d0791cf6fa8f35642ecfd9") (:authors ("Andrea Corallo" . "akrl@sdf.org")) (:maintainers (nil . "akrl@sdf.org")) (:maintainer nil . "akrl@sdf.org") (:keywords "internal") (:url . "https://gitlab.com/koral/gcmh"))])
  (gcode-mode . [(20230823 2141) ((emacs (24 4))) "Simple G-Code major mode" tar ((:commit . "4b54553a698d81e52dde14037df94774c7f30b95") (:authors ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainers ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainer "Yuri D'Elia" . "wavexx@thregr.org") (:keywords "gcode" "languages" "highlight" "syntax") (:url . "https://gitlab.com/wavexx/gcode-mode.el"))])
- (gdscript-mode . [(20240424 2157) ((emacs (26 3))) "Major mode for Godot's GDScript language" tar ((:commit . "2737f1c68cbeba38d34e5728c9fc2cd69e9a8f88") (:authors ("Nathan Lovato <nathan@gdquest.com>, Fabián E. Gallina" . "fgallina@gnu.org")) (:maintainers (nil . "nathan@gdquest.com")) (:maintainer nil . "nathan@gdquest.com") (:keywords "languages") (:url . "https://github.com/godotengine/emacs-gdscript-mode/"))])
+ (gdscript-mode . [(20240509 1523) ((emacs (26 3))) "Major mode for Godot's GDScript language" tar ((:commit . "32086df83335ce0e5120b21b80cf7996edb2232e") (:authors ("Nathan Lovato <nathan@gdquest.com>, Fabián E. Gallina" . "fgallina@gnu.org")) (:maintainers (nil . "nathan@gdquest.com")) (:maintainer nil . "nathan@gdquest.com") (:keywords "languages") (:url . "https://github.com/godotengine/emacs-gdscript-mode/"))])
  (geben . [(20220827 105) ((emacs (24 3)) (cl-lib (0 5))) "DBGp protocol frontend, a script debugger" tar ((:commit . "8df1ed2c8ff13b0ca4ef241c95c46f60a5a4fe3c") (:authors ("Matthew Carter" . "m@ahungry.com")) (:maintainers ("Matthew Carter" . "m@ahungry.com")) (:maintainer "Matthew Carter" . "m@ahungry.com") (:keywords "c" "comm" "tools") (:url . "https://github.com/ahungry/geben"))])
  (geben-helm-projectile . [(20170524 334) ((emacs (24)) (geben (0 26)) (helm-projectile (0 13 0))) "Integrate helm-projectile with geben" tar ((:commit . "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b") (:authors ("Matthew Carter" . "m@ahungry.com")) (:maintainers ("Matthew Carter" . "m@ahungry.com")) (:maintainer "Matthew Carter" . "m@ahungry.com") (:keywords "ahungry" "emacs" "geben" "helm" "projectile" "debug") (:url . "https://github.com/ahungry/geben-helm-projectile"))])
  (geeknote . [(20220213 612) ((emacs (24))) "Use Evernote in Emacs through geeknote" tar ((:commit . "ce2738aebeeda35f9d31027e9b7bad0813b975c3") (:authors ("Evan Dale Aromin")) (:maintainers ("Evan Dale Aromin")) (:maintainer "Evan Dale Aromin") (:keywords "evernote" "geeknote" "note" "emacs-evernote" "evernote-mode") (:url . "http://github.com/avendael/emacs-geeknote"))])
  (geiser . [(20240208 26) ((emacs (27 1)) (project (0 8 1))) "GNU Emacs and Scheme talk to each other" tar ((:commit . "4e64934bd2ae7c6f0e4acb9f2ed017844c187223") (:authors ("Jose Antonio Ortega Ruiz" . "jao@gnu.org")) (:maintainers ("Jose Antonio Ortega Ruiz" . "jao@gnu.org")) (:maintainer "Jose Antonio Ortega Ruiz" . "jao@gnu.org") (:keywords "languages" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/"))])
  (geiser-chez . [(20230707 1334) ((emacs (26 1)) (geiser (0 19))) "Chez and Geiser talk to each other" tar ((:commit . "605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d") (:authors ("Peter" . "craven@gmx.net")) (:maintainers ("Jose A Ortega Ruiz" . "jao@gnu.org")) (:maintainer "Jose A Ortega Ruiz" . "jao@gnu.org") (:keywords "languages" "chez" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/chez"))])
- (geiser-chibi . [(20211204 1938) ((emacs (24 4)) (geiser (0 18))) "Chibi Scheme's implementation of the geiser protocols" tar ((:commit . "5a6a5a580ea45cd4974df21629a8d50cbe3d6e99") (:authors ("Peter" . "craven@gmx.net")) (:maintainers ("Jose A Ortega Ruiz" . "jao@gnu.org")) (:maintainer "Jose A Ortega Ruiz" . "jao@gnu.org") (:keywords "languages" "chibi" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/chibi"))])
+ (geiser-chibi . [(20240519 2215) ((emacs (24 4)) (geiser (0 18))) "Chibi Scheme's implementation of the geiser protocols" tar ((:commit . "da68e9bcf4382f07121ae3c103f5b6847b3f3047") (:authors ("Peter" . "craven@gmx.net")) (:maintainers ("Jose A Ortega Ruiz" . "jao@gnu.org")) (:maintainer "Jose A Ortega Ruiz" . "jao@gnu.org") (:keywords "languages" "chibi" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/chibi"))])
  (geiser-chicken . [(20220717 1130) ((emacs (24 4)) (geiser (0 19))) "Chicken's implementation of the geiser protocols" tar ((:commit . "a480598b5908c95bc8d3178a48f13e9072a9235b") (:authors ("Daniel Leslie")) (:maintainers ("Daniel Leslie")) (:maintainer "Daniel Leslie") (:keywords "languages" "chicken" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/chicken"))])
  (geiser-gambit . [(20220208 1356) ((emacs (26 1)) (geiser (0 18))) "Gambit's implementation of the geiser protocols" tar ((:commit . "381d74ca5059b44fe3d8b5daf42214019c6d1a88") (:authors ("Daniel Leslie")) (:maintainers ("Jose A Ortega Ruiz" . "jao@gnu.org")) (:maintainer "Jose A Ortega Ruiz" . "jao@gnu.org") (:keywords "languages" "gambit" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/gambit"))])
  (geiser-gauche . [(20220503 1700) ((emacs (26 1)) (geiser (0 11 2))) "Gauche scheme support for Geiser" tar ((:commit . "8ff743f6416f00751e24aef8b9791501a40f5421") (:authors ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainers ("András Simonyi" . "andras.simonyi@gmail.com")) (:maintainer "András Simonyi" . "andras.simonyi@gmail.com") (:keywords "languages" "gauche" "scheme" "geiser") (:url . "https://gitlab.com/emacs-geiser/gauche"))])
@@ -2036,11 +2039,12 @@
  (gherkin-mode . [(20171224 1353) nil "An emacs major mode for editing gherkin files." tar ((:commit . "0313492e7da152f0aa73ddf96c0287ded8f51253") (:authors ("Craig Andera")) (:maintainers ("Craig Andera")) (:maintainer "Craig Andera") (:keywords "languages"))])
  (ghost-blog . [(20171023 742) ((markdown-mode (1 0))) "A package to manage Ghost blog" tar ((:commit . "71b358643cc9a2db1bf752281ff94aba9b59e4cc") (:authors ("Javier Aguirre" . "hello@javaguirre.net")) (:maintainers ("Javier Aguirre" . "hello@javaguirre.net")) (:maintainer "Javier Aguirre" . "hello@javaguirre.net") (:keywords "ghost" "blog") (:url . "https://github.com/javaguirre/ghost-blog"))])
  (ghq . [(20230510 332) ((emacs (26 1)) (dash (2 18 0)) (s (1 7 0))) "Ghq interface for emacs" tar ((:commit . "eb197c14e53ac57a136ea8d34eec7528487c3301") (:authors ("Roman Coedo" . "romancoedo@gmail.com")) (:maintainers ("Joseph LaFreniere" . "joseph@lafreniere.xyz")) (:maintainer "Joseph LaFreniere" . "joseph@lafreniere.xyz") (:keywords "convenience") (:url . "https://github.com/lafrenierejm/emacs-ghq"))])
- (ghub . [(20240415 1555) ((emacs (25 1)) (compat (29 1 4 4)) (let-alist (1 0 6)) (treepy (0 1 2))) "Client libraries for Git forge APIs." tar ((:commit . "e0a65456098c5e0f2cf2724d071e9033f7b0bf3a") (:authors ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev") (:keywords "tools") (:url . "https://github.com/magit/ghub"))])
+ (ghub . [(20240507 1647) ((emacs (26 3)) (compat (29 1 4 5)) (let-alist (1 0 6)) (treepy (0 1 2))) "Client libraries for Git forge APIs." tar ((:commit . "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9") (:authors ("Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ghub@jonas.bernoulli.dev") (:keywords "tools") (:url . "https://github.com/magit/ghub"))])
  (ghub+ . [(20191229 1748) ((emacs (25)) (ghub (2 0)) (apiwrap (0 5))) "a thick GitHub API client built on ghub" tar ((:commit . "b1adef2402d7599911d4dd447a987a0cea04e6fe") (:authors ("Sean Allred" . "code@seanallred.com")) (:maintainers ("Sean Allred" . "code@seanallred.com")) (:maintainer "Sean Allred" . "code@seanallred.com") (:keywords "extensions" "multimedia" "tools") (:url . "https://github.com/vermiculus/ghub-plus"))])
  (gif-screencast . [(20230728 1144) ((emacs (25 1))) "One-frame-per-action GIF recording" tar ((:commit . "6798656d3d3107d16e30cc26bc3928b00e50c1ca") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainer "Pierre Neidhardt" . "mail@ambrevar.xyz") (:keywords "multimedia" "screencast") (:url . "https://gitlab.com/ambrevar/emacs-gif-screencast"))])
  (gift-mode . [(20210528 1459) nil "major mode for editing GIFT format quizzes" tar ((:commit . "c93354e8fe1173b22f398f17b127875807f15b87") (:authors ("Christophe Rhodes" . "christophe@rhodes.io")) (:maintainers ("Christophe Rhodes" . "christophe@rhodes.io")) (:maintainer "Christophe Rhodes" . "christophe@rhodes.io") (:url . "https://github.com/csrhodes/gift-mode"))])
  (gildas-mode . [(20181022 649) ((polymode (0 1 5)) (emacs (25))) "Major mode for Gildas" tar ((:commit . "d0c9e997e2aa0bcd9b8b7db082d69100448cb1b2") (:authors ("Sébastien Maret" . "sebastien.maret@icloud.com")) (:maintainers ("Sébastien Maret" . "sebastien.maret@icloud.com")) (:maintainer "Sébastien Maret" . "sebastien.maret@icloud.com") (:keywords "languages" "gildas") (:url . "https://github.com/smaret/gildas-mode"))])
+ (girly-notebook-theme . [(20240513 1344) ((emacs (26 1))) "A light theme with vivid colours and cursive text" tar ((:commit . "e27603d5afb2b60714b8acef61f3477d11c34e00") (:authors ("elilla&" . "elilla@transmom.love")) (:maintainers ("elilla&" . "elilla@transmom.love")) (:maintainer "elilla&" . "elilla@transmom.love") (:url . "https://github.com/melissaboiko/girly-notebook-theme"))])
  (gist . [(20171128 406) ((emacs (24 1)) (gh (0 10 0))) "Emacs integration for gist.github.com" tar ((:commit . "b2712a61d04af98a05cc2556d85479803b6626be") (:authors ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainers ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainer "Yann Hodique" . "yann.hodique@gmail.com") (:keywords "tools") (:url . "https://github.com/defunkt/gist.el"))])
  (git . [(20140128 1041) ((s (1 7 0)) (dash (2 2 0)) (f (0 10 0))) "An Elisp API for programmatically using Git" tar ((:commit . "8b7f1477ef367b5b7de452589dd9a8ab30150d0a") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com") (:keywords "git") (:url . "http://github.com/rejeep/git.el"))])
  (git-annex . [(20220807 1542) nil "Mode for easy editing of git-annex'd files" tar ((:commit . "92f2d97c89980d2cea85850353836c68903514a1") (:authors ("John Wiegley" . "jwiegley@gmail.com")) (:maintainers ("John Wiegley" . "jwiegley@gmail.com")) (:maintainer "John Wiegley" . "jwiegley@gmail.com") (:keywords "files" "data" "git" "annex") (:url . "https://github.com/jwiegley/git-annex-el"))])
@@ -2050,9 +2054,9 @@
  (git-backup . [(20191209 2144) ((emacs (24 3)) (s (1 8 0))) "Backup each file change using git" tar ((:commit . "e28d7af2d1c58fa5b8068223eb83a73f044e6a6c") (:authors ("Anthony HAMON" . "hamon.anth@gmail.com")) (:maintainers ("Anthony HAMON" . "hamon.anth@gmail.com")) (:maintainer "Anthony HAMON" . "hamon.anth@gmail.com") (:keywords "backup" "files" "tools" "git") (:url . "http://github.com/antham/git-backup"))])
  (git-backup-ivy . [(20231030 2155) ((ivy (0 12 0)) (git-backup (0 0 1)) (emacs (25 1))) "An ivy interface to git-backup" tar ((:commit . "8c825ac2fef586e2792e980003e5ae0deb908bbc") (:authors ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainers ("Sebastian Wålinder" . "s.walinder@gmail.com")) (:maintainer "Sebastian Wålinder" . "s.walinder@gmail.com") (:keywords "backup" "convenience" "files" "tools" "vc") (:url . "https://github.com/walseb/git-backup-ivy"))])
  (git-blamed . [(20161028 1926) nil "Minor mode for incremental blame for Git" tar ((:commit . "cef196abf398e2dd11f775d1e6cd8690567408aa") (:keywords "git" "version control" "release management"))])
- (git-cliff . [(20240407 940) ((emacs (29 1)) (transient (0 5 0))) "Generate and update changelog using git-cliff" tar ((:commit . "b217b0576798767cc0a96343ba43adca3c04f760") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "tools") (:url . "https://github.com/liuyinz/git-cliff.el"))])
+ (git-cliff . [(20240517 1042) ((emacs (29 1)) (transient (0 6 0)) (dash (2 19 1))) "Generate and update changelog using git-cliff" tar ((:commit . "90db86c1a600fc319e7c8172839bfe18c3e4221b") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "tools") (:url . "https://github.com/liuyinz/git-cliff.el"))])
  (git-command . [(20191028 333) ((term-run (0 1 4)) (with-editor (2 3 1))) "A Git Command-Line interface" tar ((:commit . "a773d40da39dfb1c6ecf2b0758aa370ddea8f06d") (:authors ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainers ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainer "10sr <8slashes+el [at] gmail [dot] com>") (:keywords "utility" "git") (:url . "https://github.com/10sr/git-command-el"))])
- (git-commit . [(20240415 1544) ((emacs (25 1)) (compat (29 1 4 4)) (transient (20231204)) (with-editor (20230917))) "Edit Git commit messages." tar ((:commit . "68075aff58e7ae5c852b9eabb69df454267deeaf") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Sebastian Wiesner" . "lunaryorn@gmail.com") ("Florian Ragwitz" . "rafl@debian.org") ("Marius Vollmer" . "marius.vollmer@gmail.com")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/magit"))])
+ (git-commit . [(20240520 1135) ((emacs (26 1)) (compat (29 1 4 5)) (transient (20240421)) (with-editor (20240415))) "Edit Git commit messages." tar ((:commit . "22fd8f8594202a0679ccc2f7d02bca44d48b8039") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") ("Sebastian Wiesner" . "lunaryorn@gmail.com") ("Florian Ragwitz" . "rafl@debian.org") ("Marius Vollmer" . "marius.vollmer@gmail.com")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/magit"))])
  (git-commit-insert-issue . [(20230512 1416) ((emacs (25)) (projectile (0)) (s (0)) (ghub (0)) (bitbucket (0))) "Get issues list when typing \"Fixes #\"" tar ((:commit . "df7ce0549d1db7bab27d401a351ea0d187c4a673") (:authors ("Vindarel")) (:maintainers ("Vindarel")) (:maintainer "Vindarel") (:keywords "tools" "vc" "github" "gitlab" "bitbucket" "commit" "issues") (:url . "https://gitlab.com/emacs-stuff/git-commit-insert-issue/"))])
  (git-dwim . [(20170126 1214) nil "Context-aware git commands such as branch handling" tar ((:commit . "485c732130686c2f28a026e385366006435394b9") (:authors ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainers ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainer "rubikitch" . "rubikitch@ruby-lang.org") (:keywords "git" "tools" "convenience") (:url . "http://www.emacswiki.org/cgi-bin/wiki/download/git-dwim.el"))])
  (git-grep . [(20200920 1751) ((projectile (0 10 0))) "Search tools using git grep" tar ((:commit . "12ff6045e9b6aa42f98abd4ddc44d670268a0849") (:authors ("Sam Kleinman")) (:maintainers ("tychoish" . "garen@tychoish.com")) (:maintainer "tychoish" . "garen@tychoish.com") (:keywords "matching" "files" "grep" "search" "using" "git-grep") (:url . "https://github.com/tychoish/git-grep.el"))])
@@ -2110,7 +2114,7 @@
  (gnome-calendar . [(20161110 1256) nil "Integration with the GNOME Shell calendar" tar ((:commit . "668591bec95c23934c5e1ef100cec4824e7cb25d") (:authors ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainers ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainer "Nicolas Petton" . "nicolas@petton.fr") (:keywords "gnome" "calendar"))])
  (gnome-screencast . [(20210125 2001) ((emacs (25))) "Use Gnome screen recording functionality using elisp" tar ((:commit . "1f4ef60fe9d452320dc02f89e289bac04ef2ad1c") (:authors ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainers ("Jürgen Hötzel" . "juergen@hoetzel.info")) (:maintainer "Jürgen Hötzel" . "juergen@hoetzel.info") (:keywords "tools" "multimedia") (:url . "https://github.com/juergenhoetzel/emacs-gnome-screencast"))])
  (gnomenm . [(20150316 1918) ((s (1 9 0)) (dash (2 3 0)) (kv (0 0 19))) "Emacs interface to Gnome nmcli command" tar ((:commit . "9065cda44ffc9e06239b8189a0154d31314c3b4d") (:authors ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainers ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainer "Nic Ferrier" . "nferrier@ferrier.me.uk") (:keywords "processes" "hardware") (:url . "http://github.com/nicferrier/emacs-nm"))])
- (gnosis . [(20240417 1322) ((emacs (27 2)) (emacsql (20240124)) (compat (29 1 4 2))) "Spaced Repetition System For Note Taking & Self Testing" tar ((:commit . "ad7b3563cb0b63afdb3ee14ada8e282c3a65b72e") (:authors ("Thanos Apollo" . "public@thanosapollo.org")) (:maintainers ("Thanos Apollo" . "public@thanosapollo.org")) (:maintainer "Thanos Apollo" . "public@thanosapollo.org") (:keywords "extensions") (:url . "https://thanosapollo.org/projects/gnosis"))])
+ (gnosis . [(20240517 334) ((emacs (27 2)) (emacsql (20240124)) (compat (29 1 4 2))) "Spaced Repetition System" tar ((:commit . "b9c6c04e33ad2f541ab116dda9e460f21034a8eb") (:authors ("Thanos Apollo" . "public@thanosapollo.org")) (:maintainers ("Thanos Apollo" . "public@thanosapollo.org")) (:maintainer "Thanos Apollo" . "public@thanosapollo.org") (:keywords "extensions") (:url . "https://thanosapollo.org/projects/gnosis"))])
  (gntp . [(20141025 250) nil "Growl Notification Protocol for Emacs" tar ((:commit . "767571135e2c0985944017dc59b0be79af222ef5") (:authors ("Engelke Eschner" . "tekai@gmx.li")) (:maintainers ("Engelke Eschner" . "tekai@gmx.li")) (:maintainer "Engelke Eschner" . "tekai@gmx.li"))])
  (gnu-apl-mode . [(20220404 341) ((emacs (27))) "Integrate GNU APL with Emacs" tar ((:commit . "c8695b0d55b5167263a843252ffd21a589018427") (:authors ("Elias Mårtenson" . "lokedhs@gmail.com")) (:maintainer "Elias Mårtenson" . "lokedhs@gmail.com") (:keywords "languages") (:url . "http://www.gnu.org/software/apl/"))])
  (gnu-indent . [(20221127 2112) ((emacs (25 1))) "Indent your code with GNU Indent" tar ((:commit . "f31dbe60478b6270bb57b6b05998df8eec56f801") (:authors ("Akib Azmain Turja" . "akib@disroot.org")) (:maintainers ("Akib Azmain Turja" . "akib@disroot.org")) (:maintainer "Akib Azmain Turja" . "akib@disroot.org") (:keywords "tools" "c") (:url . "https://codeberg.org/akib/emacs-gnu-indent"))])
@@ -2150,7 +2154,7 @@
  (go-snippets . [(20180113 611) ((yasnippet (0 8 0))) "Yasnippets for go" tar ((:commit . "d437df148879566ffe7f2e503a3cf2602aa9fb28") (:keywords "snippets"))])
  (go-stacktracer . [(20150430 2142) nil "parse Go stack traces" tar ((:commit . "a2ac6d801b389f80ca4e2fcc1ab44513a9e55976") (:authors ("Samer Masterson" . "samer@samertm.com")) (:maintainers ("Samer Masterson" . "samer@samertm.com")) (:maintainer "Samer Masterson" . "samer@samertm.com") (:keywords "tools") (:url . "https://github.com/samertm/go-stacktracer.el"))])
  (go-tag . [(20230111 651) ((emacs (24 0)) (go-mode (1 5 0))) "Edit Golang struct field tag" tar ((:commit . "33f2059551d5298ca228d90f525b99d1a8d70364") (:authors ("Brantou" . "brantou89@gmail.com")) (:maintainers ("Brantou" . "brantou89@gmail.com")) (:maintainer "Brantou" . "brantou89@gmail.com") (:keywords "tools") (:url . "https://github.com/brantou/emacs-go-tag"))])
- (go-translate . [(20240313 356) ((emacs (27 1))) "Translation framework supports multiple engines such as Google/Bing/DeepL" tar ((:commit . "377375c87f64e7d069c8fc310ccfefd8771226f3") (:authors ("lorniu" . "lorniu@gmail.com")) (:maintainers ("lorniu" . "lorniu@gmail.com")) (:maintainer "lorniu" . "lorniu@gmail.com") (:keywords "convenience") (:url . "https://github.com/lorniu/go-translate"))])
+ (go-translate . [(20240521 331) ((emacs (28 1))) "Translation framework, configurable and scalable" tar ((:commit . "5ff3fa939f52a3670b39dfccd9d63a185656238d") (:authors ("lorniu" . "lorniu@gmail.com")) (:maintainers ("lorniu" . "lorniu@gmail.com")) (:maintainer "lorniu" . "lorniu@gmail.com") (:keywords "convenience") (:url . "https://github.com/lorniu/go-translate"))])
  (gobgen . [(20161020 1523) ((emacs (24 4))) "Generate GObject descendants using a detailed form" tar ((:commit . "ed2c2b0d217deae293096f3cf14aa492791ddd4f") (:authors ("Gergely Polonkai" . "gergely@polonkai.eu")) (:maintainers ("Gergely Polonkai" . "gergely@polonkai.eu")) (:maintainer "Gergely Polonkai" . "gergely@polonkai.eu") (:keywords "gobject" "glib" "gtk" "helper" "utilities"))])
  (god-mode . [(20221230 708) ((emacs (25 1))) "Minor mode for God-like command entering" tar ((:commit . "607aff10a7b27a8aa0c1a15c2c39337ab17cfda7") (:authors ("Chris Done" . "chrisdone@gmail.com")) (:maintainers ("Chris Done" . "chrisdone@gmail.com")) (:maintainer "Chris Done" . "chrisdone@gmail.com") (:url . "https://github.com/emacsorphanage/god-mode"))])
  (godoctor . [(20180710 2152) nil "Frontend for godoctor" tar ((:commit . "4b45ff3d0572f0e84056e4c3ba91fcc178199859") (:authors ("Sangho Na" . "microamp@protonmail.com")) (:maintainers ("Sangho Na" . "microamp@protonmail.com")) (:maintainer "Sangho Na" . "microamp@protonmail.com") (:keywords "go" "golang" "refactoring") (:url . "https://github.com/microamp/godoctor.el"))])
@@ -2187,7 +2191,8 @@
  (gpt . [(20231112 2012) ((emacs (24 4))) "Run instruction-following language models" tar ((:commit . "c1091d25db420320de4b121baba99d7ac2e23932") (:authors ("Andreas Stuhlmueller" . "andreas@ought.org")) (:maintainers ("Andreas Stuhlmueller" . "andreas@ought.org")) (:maintainer "Andreas Stuhlmueller" . "andreas@ought.org") (:keywords "gpt3" "language" "copilot" "convenience" "tools") (:url . "https://github.com/stuhlmueller/gpt.el"))])
  (gpt-commit . [(20230716 331) ((emacs (27 1)) (magit (2 90)) (request (0 3 2))) "Commit messages with GPT in Emacs" tar ((:commit . "8a8883be2051eed499c5bc3035a75ff56d64d5ff") (:authors ("Youngwook Kim" . "youngwook.kim@gmail.com")) (:maintainers ("Youngwook Kim" . "youngwook.kim@gmail.com")) (:maintainer "Youngwook Kim" . "youngwook.kim@gmail.com") (:url . "https://github.com/ywkim/gpt-commit"))])
  (gptai . [(20230530 1853) ((emacs (24 1))) "Integrate with the OpenAI API" tar ((:commit . "e7b8b91b425986868e8bc0edcac384ba47d4d4b7") (:authors ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainers ("Anton Hibl" . "antonhibl11@gmail.com")) (:maintainer "Anton Hibl" . "antonhibl11@gmail.com") (:keywords "comm" "convenience") (:url . "https://github.com/antonhibl/gptai"))])
- (gptel . [(20240428 314) ((emacs (27 1)) (transient (0 4 0)) (compat (29 1 4 1))) "Interact with ChatGPT or other LLMs" tar ((:commit . "306fe3bd8c2933b48a871976161a7030c7e5b9f8") (:authors ("Karthik Chikmagalur")) (:maintainers ("Karthik Chikmagalur")) (:maintainer "Karthik Chikmagalur") (:keywords "convenience") (:url . "https://github.com/karthink/gptel"))])
+ (gptel . [(20240520 1943) ((emacs (27 1)) (transient (0 4 0)) (compat (29 1 4 1))) "Interact with ChatGPT or other LLMs" tar ((:commit . "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b") (:authors ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainers ("Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com")) (:maintainer "Karthik Chikmagalur" . "karthik.chikmagalur@gmail.com") (:keywords "convenience") (:url . "https://github.com/karthink/gptel"))])
+ (gpx . [(20240513 1737) ((emacs (27 1))) "Major mode for GPX files" tar ((:commit . "b79baf93040fb5c89e803848e8aff31331ea03b8") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com") (:keywords "data" "tools") (:url . "https://github.com/mkcms/gpx-mode"))])
  (grab-mac-link . [(20210511 1303) ((emacs (24))) "Grab link from Mac Apps and insert it into Emacs" tar ((:commit . "5fdb03bf57bc4a530374b896e0f8b5139dc794e3") (:authors ("Xu Chunyang")) (:maintainers ("Xu Chunyang")) (:maintainer "Xu Chunyang") (:keywords "mac" "hyperlink") (:url . "https://github.com/xuchunyang/grab-mac-link.el"))])
  (grab-x-link . [(20191113 848) ((emacs (24)) (cl-lib (0 5))) "Grab links from X11 apps and insert into Emacs" tar ((:commit . "d898db46e4864118359fdedfe915e180de3fe290") (:authors ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainers ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainer "Xu Chunyang" . "mail@xuchunyang.me") (:keywords "hyperlink") (:url . "https://github.com/xuchunyang/grab-x-link"))])
  (gradle-mode . [(20150313 1905) ((s (1 8 0))) "Gradle integration with Emacs' compile" tar ((:commit . "579de06674551919cddac9cfe42129f4fb0155c9") (:authors ("Daniel Mijares" . "daniel.j.mijares@gmail.com")) (:maintainers ("Daniel Mijares" . "daniel.j.mijares@gmail.com")) (:maintainer "Daniel Mijares" . "daniel.j.mijares@gmail.com") (:keywords "gradle") (:url . "http://github.com/jacobono/emacs-gradle-mode"))])
@@ -2220,7 +2225,7 @@
  (gruber-darker-theme . [(20231026 2031) nil "Gruber Darker color theme for Emacs 24." tar ((:commit . "2e9f99c41fe8ef0557e9ea0f3b94ef50c68b5557") (:authors ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainers ("Alexey Kutepov" . "reximkut@gmail.com")) (:maintainer "Alexey Kutepov" . "reximkut@gmail.com") (:url . "http://github.com/rexim/gruber-darker-theme"))])
  (grugru . [(20231202 250) ((emacs (24 4))) "Rotate text at point" tar ((:commit . "3f1bc431f4dc919a7b04e519f1c8add9fb2949f3") (:authors ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainers ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainer "ROCKTAKEY" . "rocktakey@gmail.com") (:keywords "convenience" "abbrev" "tools") (:url . "https://github.com/ROCKTAKEY/grugru"))])
  (grunt . [(20160316 1528) ((dash (2 9 0)) (ansi-color (3 4 2)) (emacs (24 3))) "Some glue to stick Emacs and Gruntfiles together" tar ((:commit . "4c269e2738658643ec2ed9ef61a2a3d71b08d304") (:authors ("Daniel Gempesaw" . "dgempesaw@sharecare.com")) (:maintainers ("Daniel Gempesaw" . "dgempesaw@sharecare.com")) (:maintainer "Daniel Gempesaw" . "dgempesaw@sharecare.com") (:keywords "convenience" "grunt") (:url . "https://github.com/gempesaw/grunt.el"))])
- (gruvbox-theme . [(20230921 120) ((autothemer (0 2))) "A retro-groove colour theme for Emacs" tar ((:commit . "9ee1159acd15ee014d5643cdaa4e00e06efa6d63") (:authors ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainers ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainer "Jason Milkins" . "jasonm23@gmail.com") (:url . "https://github.com/greduan/emacs-theme-gruvbox"))])
+ (gruvbox-theme . [(20240515 553) ((autothemer (0 2))) "A retro-groove colour theme for Emacs" tar ((:commit . "3388a96d8e59c120bc243c1f90c614237f6ac3b5") (:authors ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainers ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainer "Jason Milkins" . "jasonm23@gmail.com") (:url . "https://github.com/greduan/emacs-theme-gruvbox"))])
  (gs-mode . [(20151202 1006) nil "Major mode for editing GrADS script files" tar ((:commit . "1a13051db21b999c7682a015b33a03096ff9d891") (:authors ("Joe Wielgosz" . "joew@cola.iges.org")) (:maintainers ("Joe Wielgosz" . "joew@cola.iges.org")) (:maintainer "Joe Wielgosz" . "joew@cola.iges.org") (:keywords "grads" "script" "major-mode"))])
  (gscholar-bibtex . [(20190130 555) nil "Retrieve BibTeX from Google Scholar and other online sources(ACM, IEEE, DBLP)" tar ((:commit . "3b651e3de116860eb1f1aef9b547a561784871fe") (:authors ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainers ("Junpeng Qiu" . "qjpchmail@gmail.com")) (:maintainer "Junpeng Qiu" . "qjpchmail@gmail.com") (:keywords "extensions"))])
  (gsettings . [(20210407 2045) ((emacs (24 3)) (dash (2 16 0)) (gvariant (1 0 0)) (s (1 12 0))) "GSettings (Gnome) helpers" tar ((:commit . "9f9fb1fe946bbba46307c26355f355225ea7262a") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "languages") (:url . "https://github.com/wbolster/emacs-gsettings"))])
@@ -2244,7 +2249,7 @@
  (hack-mode . [(20230227 1950) ((emacs (25 1)) (s (1 11 0))) "Major mode for the Hack programming language" tar ((:commit . "278e4cc4032bff92060496cf1179643cfc6f9c0f") (:authors ("John Allen <jallen@fb.com>, Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainers ("John Allen <jallen@fb.com>, Wilfred Hughes" . "me@wilfred.me.uk")) (:maintainer "John Allen <jallen@fb.com>, Wilfred Hughes" . "me@wilfred.me.uk") (:url . "https://github.com/hhvm/hack-mode"))])
  (hacker-typer . [(20170206 1520) ((emacs (24))) "Pretend to write code like a pro" tar ((:commit . "d5a23714a4ccc5071580622f278597d5973f40bd") (:authors ("Diego A. Mundo" . "diegoamundo@gmail.com")) (:maintainers ("Diego A. Mundo" . "diegoamundo@gmail.com")) (:maintainer "Diego A. Mundo" . "diegoamundo@gmail.com") (:keywords "hacker" "typer" "multimedia" "games") (:url . "http://github.com/therockmandolinist/emacs-hacker-typer"))])
  (hackernews . [(20240405 807) nil "Hacker News Client for Emacs" tar ((:commit . "7c1e9de10fd6b299d45b383302d223d7e3285da9") (:authors ("Lincoln de Sousa" . "lincoln@clarete.li")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "comm" "hypermedia" "news") (:url . "https://github.com/clarete/hackernews.el"))])
- (haki-theme . [(20240412 1016) ((emacs (27 1))) "An elegant, high-contrast dark theme in modern sense" tar ((:commit . "a564a4feab9e1bd7f022128934ed55c83d120b69") (:authors ("Dilip")) (:maintainers ("Dilip")) (:maintainer "Dilip") (:keywords "faces" "theme" "accessibility") (:url . "https://github.com/idlip/haki"))])
+ (haki-theme . [(20240501 1610) ((emacs (27 1))) "An elegant, high-contrast dark theme in modern sense" tar ((:commit . "e076785ca936b723751b8957c5d5eab8dde12346") (:authors ("Dilip")) (:maintainers ("Dilip")) (:maintainer "Dilip") (:keywords "faces" "theme" "accessibility") (:url . "https://github.com/idlip/haki"))])
  (hal-mode . [(20160704 1746) nil "Major mode for editing HAL files" tar ((:commit . "cd2f66f219ee520198d4586fb6b169cef7ad3f21") (:authors ("Alexander Rössler")) (:maintainers ("Alexander Rössler")) (:maintainer "Alexander Rössler") (:keywords "language") (:url . "https://github.com/strahlex/hal-mode/"))])
  (halloweenie-theme . [(20231011 1252) ((emacs (27 1)) (autothemer (0 2))) "Dark and spooky Halloween color theme" tar ((:commit . "db39ff0516e071aa890585c39fe411ea355e8b06") (:authors ("Colin Okay" . "colin@cicadas.surf")) (:maintainers ("Colin Okay" . "colin@cicadas.surf")) (:maintainer "Colin Okay" . "colin@cicadas.surf") (:keywords "faces" "theme" "halloween" "pumpkin") (:url . "https://cicadas.surf/cgit/halloweenie-theme.git"))])
  (ham-mode . [(20150811 1306) ((html-to-markdown (1 2)) (markdown-mode (2 0))) "Html As Markdown. Transparently edit an html file using markdown" tar ((:commit . "3a141986a21c2aa6eefb428983352abb8b7907d2") (:authors ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainers ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainer "Artur Malabarba" . "bruce.connor.am@gmail.com") (:keywords "convenience" "emulation" "wp") (:url . "http://github.com/Bruce-Connor/ham-mode"))])
@@ -2280,7 +2285,7 @@
  (headlong . [(20150417 1526) nil "reckless completion" tar ((:commit . "f6830f87f236eee88263cb6976125f72422abe72") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "completion") (:url . "https://github.com/abo-abo/headlong"))])
  (heaven-and-hell . [(20190713 1830) ((emacs (24 4))) "easy toggle light/dark themes" tar ((:commit . "e1febfd60d060c110a1e43c5f093cd8537251308") (:authors ("Valentin Ignatev" . "valentignatev@gmail.com")) (:maintainers ("Valentin Ignatev" . "valentignatev@gmail.com")) (:maintainer "Valentin Ignatev" . "valentignatev@gmail.com") (:keywords "faces") (:url . "https://github.com/valignatev/heaven-and-hell"))])
  (heex-ts-mode . [(20240113 1104) ((emacs (29 1))) "Major mode for Heex with tree-sitter support" tar ((:commit . "90142df2929956536dc1eaae3bb5ca04dc4232ab") (:authors ("Wilhelm H Kirschbaum")) (:maintainers ("Wilhelm H Kirschbaum")) (:maintainer "Wilhelm H Kirschbaum") (:keywords "heex" "languages" "tree-sitter") (:url . "https://github.com/wkirschbaum/elixir-ts-mode"))])
- (helm . [(20240425 825) ((helm-core (3 9 8)) (wfnames (1 1)) (popup (0 5 3))) "Helm is an Emacs incremental and narrowing framework" tar ((:commit . "753563ee010e865f3f0fd9d491c2052eb1347fd8") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://emacs-helm.github.io/helm/"))])
+ (helm . [(20240521 1457) ((helm-core (3 9 8)) (wfnames (1 1)) (popup (0 5 3))) "Helm is an Emacs incremental and narrowing framework" tar ((:commit . "c65a9039b6574183aa3f3e0b647c85470c002339") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://emacs-helm.github.io/helm/"))])
  (helm-R . [(20120820 14) ((helm (20120517)) (ess (20120509))) "helm-sources and some utilities for GNU R." tar ((:commit . "b0eb9d5f6a483a9dbe6eb6cf1f2024d4f5938bc2") (:authors ("myuhe <yuhei.maeda_at_gmail.com>")) (:maintainers ("myuhe")) (:maintainer "myuhe") (:keywords "convenience") (:url . "https://github.com/myuhe/helm-R.el"))])
  (helm-ack . [(20141030 1226) ((helm (1 0)) (cl-lib (0 5))) "Ack command with helm interface" tar ((:commit . "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-helm-ack"))])
  (helm-ad . [(20151209 1015) ((dash (2 8 0)) (helm (1 6 2))) "helm source for Active Directory" tar ((:commit . "8ac044705d8620ee354a9cfa8cc1b865e83c0d55") (:authors ("Takahiro Noda" . "takahiro.noda+github@gmail.com")) (:maintainers ("Takahiro Noda" . "takahiro.noda+github@gmail.com")) (:maintainer "Takahiro Noda" . "takahiro.noda+github@gmail.com") (:keywords "comm"))])
@@ -2314,7 +2319,7 @@
  (helm-comint . [(20231102 2029) ((emacs (25 1)) (helm (3 9 4))) "Comint prompt navigation for helm" tar ((:commit . "9215b2aa8f42f62cbda66a1503832abb7f491549") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Benedict Wang" . "foss@bhw.name")) (:maintainer "Benedict Wang" . "foss@bhw.name") (:keywords "processes" "matching") (:url . "https://github.com/benedicthw/helm-comint.git"))])
  (helm-commandlinefu . [(20150611 545) ((emacs (24 1)) (helm (1 7 0)) (json (1 3)) (let-alist (1 0 3))) "Search and browse commandlinefu.com from helm" tar ((:commit . "9ee7e018c5db23ae9c8d1c8fa969876f15b7280d") (:authors ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainers ("Chunyang Xu" . "xuchunyang56@gmail.com")) (:maintainer "Chunyang Xu" . "xuchunyang56@gmail.com") (:keywords "commandlinefu.com") (:url . "https://github.com/xuchunyang/helm-commandlinefu"))])
  (helm-company . [(20231113 701) ((helm (1 5 9)) (company (0 10 0))) "Helm interface for company-mode" tar ((:commit . "4622b82353220ee6cc33468f710fa5b6b253b7f1") (:authors ("Yasuyuki Oka" . "yasuyk@gmail.com")) (:maintainers ("Daniel Ralston" . "Sodel-the-Vociferous@users.noreply.github.com")) (:maintainer "Daniel Ralston" . "Sodel-the-Vociferous@users.noreply.github.com") (:url . "https://github.com/Sodel-the-Vociferous/helm-company"))])
- (helm-core . [(20240411 1719) ((emacs (25 1)) (async (1 9 7))) "Development files for Helm" tar ((:commit . "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://emacs-helm.github.io/helm/"))])
+ (helm-core . [(20240518 1434) ((emacs (25 1)) (async (1 9 7))) "Development files for Helm" tar ((:commit . "ba2eb552353635222f14984b8a2f4456b4ac62e2") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://emacs-helm.github.io/helm/"))])
  (helm-cscope . [(20190615 41) ((xcscope (1 0)) (helm (1 6 7)) (cl-lib (0 5)) (emacs (24 1))) "Helm interface for xcscope.el." tar ((:commit . "af1d9e7f4460a88d7400b5a74d5da68084089ac1") (:authors ("alpha22jp" . "alpha22jp@gmail.com")) (:maintainers ("alpha22jp" . "alpha22jp@gmail.com")) (:maintainer "alpha22jp" . "alpha22jp@gmail.com") (:keywords "cscope" "helm") (:url . "https://github.com/alpha22jp/helm-cscope.el"))])
  (helm-css-scss . [(20230522 1113) ((emacs (24 3)) (helm (1 0))) "CSS/SCSS/LESS Selectors with helm interface" tar ((:commit . "2169d83d8fdc661241df208cb3235112735d936e") (:authors ("Shingo Fukuyama - http://fukuyama.co")) (:maintainers ("Shingo Fukuyama - http://fukuyama.co")) (:maintainer "Shingo Fukuyama - http://fukuyama.co") (:keywords "convenience" "scss" "css" "less" "selector" "helm") (:url . "https://github.com/ShingoFukuyama/helm-css-scss"))])
  (helm-ctest . [(20220721 400) ((s (1 9 0)) (dash (2 11 0)) (helm-core (3 6 0))) "Run ctest from within emacs" tar ((:commit . "48edc9fa862219da34feb423c06c33d8f6d43722") (:authors ("Dan LaManna" . "me@danlamanna.com")) (:maintainers ("Dan LaManna" . "me@danlamanna.com")) (:maintainer "Dan LaManna" . "me@danlamanna.com") (:keywords "helm" "ctest"))])
@@ -2477,6 +2482,7 @@
  (hiccup-cli . [(20210211 2127) ((emacs (26 1))) "Convert HTML to Hiccup syntax" tar ((:commit . "cfbb957a1f86bc1d28e778bfdffdeaaa2ae79286") (:authors ("Kevin W. van Rooijen")) (:maintainers ("Kevin W. van Rooijen")) (:maintainer "Kevin W. van Rooijen") (:keywords "tools") (:url . "https://github.com/kwrooijen/hiccup-cli"))])
  (hide-lines . [(20210513 1636) nil "Commands for hiding lines based on a regexp" tar ((:commit . "f0828c15e50db5eddb905de783e7683b04d1eca3") (:authors ("Mark Hulme-Jones <ture at plig cucumber dot net>")) (:maintainers ("Joe Bloggs" . "vapniks@yahoo.com")) (:maintainer "Joe Bloggs" . "vapniks@yahoo.com") (:keywords "convenience") (:url . "https://github.com/vapniks/hide-lines"))])
  (hide-mode-line . [(20211112 1400) ((emacs (24 4))) "minor mode that hides/masks your modeline" tar ((:commit . "bc5d293576c5e08c29e694078b96a5ed85631942") (:authors ("Henrik Lissner <http://github/hlissner>")) (:maintainers ("Henrik Lissner" . "git@henrik.io")) (:maintainer "Henrik Lissner" . "git@henrik.io") (:keywords "frames" "mode-line") (:url . "https://github.com/hlissner/emacs-hide-mode-line"))])
+ (hide-secrets . [(20240512 1933) ((emacs (29 1))) "A package for hiding secrets in buffers" tar ((:commit . "e774f3fdacd875707fde25e32f8760e54a440689") (:authors ("Sebastian Meisel" . "sebastian.meisel@gmail.com")) (:maintainers ("Sebastian Meisel" . "sebastian.meisel@gmail.com")) (:maintainer "Sebastian Meisel" . "sebastian.meisel@gmail.com") (:keywords "tools") (:url . "https://gitlab.com/ostseepinguin1/hide-secrets-el"))])
  (hidepw . [(20200326 112) nil "Minor mode to hide passwords" tar ((:commit . "73f099da79d73fe4087472df3469d8b9b20a59f2") (:authors ("Chris Forno" . "jekor@jekor.com")) (:maintainers ("Chris Forno" . "jekor@jekor.com")) (:maintainer "Chris Forno" . "jekor@jekor.com") (:keywords "hide" "hidden" "password" "faces") (:url . "https://github.com/jekor/hidepw"))])
  (hideshow-org . [(20120223 2250) nil "Provides org-mode like hide and show for hideshow.el" tar ((:commit . "16419e52e6cdd2f46f755144c0ab11ce00d1a626") (:authors ("Shane Celis <shane (at) gnufoo (dot) org>")) (:maintainers ("Shane Celis <shane (at) gnufoo (dot) org>")) (:maintainer "Shane Celis <shane (at) gnufoo (dot) org>") (:keywords "c" "c++" "java" "lisp" "tools" "editing" "comments" "blocks" "hiding" "outlines" "org-mode"))])
  (hierarchy . [(20190425 842) ((emacs (25 1))) "Library to create and display hierarchy structures" tar ((:commit . "a5bc6bf2e1bbd48cc17c508043134f24abb41944") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:url . "https://github.com/DamienCassou/hierarchy"))])
@@ -2499,7 +2505,7 @@
  (highlight-symbol . [(20160102 2009) nil "automatic and manual symbol highlighting" tar ((:commit . "7a789c779648c55b16e43278e51be5898c121b3a") (:authors ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainers ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainer "Nikolaj Schumacher <bugs * nschum de>") (:keywords "faces" "matching") (:url . "http://nschum.de/src/emacs/highlight-symbol/"))])
  (highlight-thing . [(20230217 728) nil "Minimalistic minor mode to highlight current thing under point." tar ((:commit . "ad788d7a7ee9eb287a8cca3adb21510b89270dca") (:authors ("Felix Geller" . "fgeller@gmail.com")) (:maintainers ("Felix Geller" . "fgeller@gmail.com")) (:maintainer "Felix Geller" . "fgeller@gmail.com") (:keywords "highlight" "thing" "symbol") (:url . "https://github.com/fgeller/highlight-thing.el"))])
  (highlight-unique-symbol . [(20130612 542) ((deferred (0 3 2))) "highlight symbols which not appear in the repository" tar ((:commit . "d760015b4a5ce31d6da5a30890b599a8e1312be5") (:authors ("hitode909" . "hitode909@gmail.com")) (:maintainers ("hitode909" . "hitode909@gmail.com")) (:maintainer "hitode909" . "hitode909@gmail.com") (:url . "https://github.com/hitode909/emacs-highlight-unique-symbol"))])
- (highlight2clipboard . [(20151020 1840) ((htmlize (1 47))) "Copy text to clipboard with highlighting." tar ((:commit . "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "tools"))])
+ (highlight2clipboard . [(20240516 1942) ((htmlize (1 47))) "Copy text to clipboard with highlighting." tar ((:commit . "6564fafd09a9c676b4d393f2260a0c73daac7257") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "tools"))])
  (hima-theme . [(20240116 404) ((emacs (25 1))) "A minimal theme with pretty colors" tar ((:commit . "e928d62558ffaa9b2cca6d891069858d33535d59") (:keywords "faces") (:url . "https://github.com/meain/hima-theme"))])
  (himalaya . [(20240101 2203) ((emacs (27 1))) "Interface for the email client Himalaya CLI" tar ((:commit . "108e275f25ea35f2adeedbeb4af28c4a99c07fa7") (:authors ("Dante Catalfamo") ("soywod" . "clement.douin@posteo.net")) (:maintainers ("soywod" . "clement.douin@posteo.net")) (:maintainer "soywod" . "clement.douin@posteo.net") (:keywords "mail" "comm") (:url . "https://github.com/dantecatalfamo/himalaya-emacs"))])
  (hindent . [(20231112 1536) ((cl-lib (0 5))) "Indent haskell code using the \"hindent\" program" tar ((:commit . "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50") (:authors ("Chris Done" . "chrisdone@gmail.com")) (:maintainers ("Chris Done" . "chrisdone@gmail.com")) (:maintainer "Chris Done" . "chrisdone@gmail.com") (:url . "https://github.com/chrisdone/hindent"))])
@@ -2564,8 +2570,8 @@
  (hydandata-light-theme . [(20190809 1925) nil "A light color theme that is easy on your eyes" tar ((:commit . "812ffa4bee3163098ef66ee4506feed45018be4e") (:authors ("David Chkhikvadze" . "david@chkhd.net")) (:maintainers ("David Chkhikvadze" . "david@chkhd.net")) (:maintainer "David Chkhikvadze" . "david@chkhd.net") (:keywords "color-theme" "theme") (:url . "https://github.com/chkhd/hydandata-light-theme"))])
  (hyde . [(20160508 308) nil "Major mode to help create and manage Jekyll blogs" tar ((:commit . "a8cd6ed00ecd8d7de0ded2f4867015b412b15b76"))])
  (hydra . [(20220910 1206) ((cl-lib (0 5)) (lv (0))) "Make bindings that stick around." tar ((:commit . "317e1de33086637579a7aeb60f77ed0405bf359b") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "bindings") (:url . "https://github.com/abo-abo/hydra"))])
- (hyperbole . [(20240420 1609) ((emacs (27 1))) "GNU Hyperbole: The Everyday Hypertextual Information Manager" tar ((:commit . "31c60562fc3b2c23719b2c617be8a65bc5d128ff") (:authors ("Robert Weiner" . "rsw@gnu.org")) (:maintainers ("Mats Lidell" . "matsl@gnu.org")) (:maintainer "Mats Lidell" . "matsl@gnu.org") (:keywords "comm" "convenience" "files" "frames" "hypermedia" "languages" "mail" "matching" "mouse" "multimedia" "outlines" "tools" "wp") (:url . "http://www.gnu.org/software/hyperbole"))])
- (hyperdrive . [(20240424 1953) ((emacs (28 1)) (map (3 0)) (compat (29 1 4 4)) (plz (0 7 2)) (persist (0 6)) (taxy-magit-section (0 13)) (transient (0 6 0))) "P2P filesystem" tar ((:commit . "3d509c7a5998511c2951eedcd236e5939c8c0fc5") (:authors ("Joseph Turner" . "joseph@ushin.org")) (:maintainers ("Joseph Turner" . "~ushin/ushin@lists.sr.ht")) (:maintainer "Joseph Turner" . "~ushin/ushin@lists.sr.ht") (:url . "https://git.sr.ht/~ushin/hyperdrive.el"))])
+ (hyperbole . [(20240519 1800) ((emacs (27 1))) "GNU Hyperbole: The Everyday Hypertextual Information Manager" tar ((:commit . "61937530ea3713b37ed34b8ad62331a507ccf8c6") (:authors ("Robert Weiner" . "rsw@gnu.org")) (:maintainers ("Mats Lidell" . "matsl@gnu.org")) (:maintainer "Mats Lidell" . "matsl@gnu.org") (:keywords "comm" "convenience" "files" "frames" "hypermedia" "languages" "mail" "matching" "mouse" "multimedia" "outlines" "tools" "wp") (:url . "http://www.gnu.org/software/hyperbole"))])
+ (hyperdrive . [(20240519 640) ((emacs (28 1)) (map (3 0)) (compat (29 1 4 4)) (plz (0 7 2)) (persist (0 6)) (taxy-magit-section (0 13)) (transient (0 6 0))) "P2P filesystem" tar ((:commit . "261277b30ff560ec40158ee45e380b0200d22fbf") (:authors ("Joseph Turner" . "joseph@ushin.org")) (:maintainers ("Joseph Turner" . "~ushin/ushin@lists.sr.ht")) (:maintainer "Joseph Turner" . "~ushin/ushin@lists.sr.ht") (:url . "https://git.sr.ht/~ushin/hyperdrive.el"))])
  (hyperkitty . [(20220226 1951) ((request (0 3 2)) (emacs (25 1))) "Emacs interface for Hyperkitty archives" tar ((:commit . "2c1d22ff017d096c359aa151e6a29f7214a58118") (:authors ("Abhilash Raj" . "maxking@asynchronous.in")) (:maintainers ("Abhilash Raj" . "maxking@asynchronous.in")) (:maintainer "Abhilash Raj" . "maxking@asynchronous.in") (:keywords "mail" "hyperkitty" "mailman") (:url . "https://github.com/maxking/hyperkitty.el"))])
  (hyperlist-mode . [(20230119 28) ((emacs (24))) "A major-mode for viewing Hyperlists" tar ((:commit . "480dbf33ca72e7b5fade952aaf0d5a5eb43acb1d") (:authors ("Wojciech Siewierski")) (:maintainers ("Wojciech Siewierski")) (:maintainer "Wojciech Siewierski") (:keywords "outlines") (:url . "https://github.com/vifon/hyperlist-mode"))])
  (hyperspace . [(20230518 442) ((emacs (25)) (s (1 12 0))) "Get there from here" tar ((:commit . "f574d07fd8715e806ba4f0487b73c699963baed3") (:authors ("Ian Eure" . "ian@retrospec.tv")) (:maintainers ("Ian Eure" . "ian@retrospec.tv")) (:maintainer "Ian Eure" . "ian@retrospec.tv") (:keywords "tools" "convenience") (:url . "https://github.com/ieure/hyperspace-el"))])
@@ -2643,7 +2649,7 @@
  (import-popwin . [(20170218 1407) ((emacs (24 3)) (popwin (0 6))) "popwin buffer near by import statements with popwin" tar ((:commit . "bb05a9e226f8c63fe7b18a3e92010357049ab5ba") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-import-popwin"))])
  (importmagic . [(20180520 303) ((f (0 11 0)) (epc (0 1 0)) (emacs (24 3))) "Fix Python imports using importmagic." tar ((:commit . "e32ee9f6a5eef937b76eba82fdae8bae85d18088") (:authors ("Nicolás Salas V." . "nikosalas@gmail.com")) (:maintainers ("Nicolás Salas V." . "nikosalas@gmail.com")) (:maintainer "Nicolás Salas V." . "nikosalas@gmail.com") (:keywords "languages" "convenience") (:url . "https://github.com/anachronic/importmagic.el"))])
  (impostman . [(20230111 2012) ((emacs (27 1))) "Import Postman collections" tar ((:commit . "936575500f733c2428ba878f9400f3eef8c9645e") (:authors ("Sébastien Helleu" . "flashcode@flashtux.org")) (:maintainers ("Sébastien Helleu" . "flashcode@flashtux.org")) (:maintainer "Sébastien Helleu" . "flashcode@flashtux.org") (:keywords "tools") (:url . "https://github.com/flashcode/impostman"))])
- (indent-control . [(20240303 2359) ((emacs (26 1))) "Management for indentation level" tar ((:commit . "4ede831b8680946f8e4a6cafd4f522c464160c00") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "control" "indent" "tab" "generic" "level") (:url . "https://github.com/jcs-elpa/indent-control"))])
+ (indent-control . [(20240512 503) ((emacs (26 1))) "Management for indentation level" tar ((:commit . "bf4863c9f7d1d5cadf47b78bebbafc5431361597") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "control" "indent" "tab" "generic" "level") (:url . "https://github.com/jcs-elpa/indent-control"))])
  (indent-guide . [(20210115 400) nil "show vertical lines to guide indentation" tar ((:commit . "d388c3387781a370ca13233ff445d03f3c5cf12f") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://hins11.yu-yake.com/"))])
  (indent-info . [(20210111 745) ((emacs (24 3))) "Show indentation information in status bar" tar ((:commit . "05a787afeb9946714d8b0c724868195a678db49e") (:authors ("Terje Larsen" . "terlar@gmail.com")) (:maintainers ("Terje Larsen" . "terlar@gmail.com")) (:maintainer "Terje Larsen" . "terlar@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/terlar/indent-info.el"))])
  (indent-lint . [(20230822 46) ((emacs (25 1)) (async-await (1 0)) (async (1 9 4)) (promise (1 1))) "Async indentation checker" tar ((:commit . "aee76faf54a55e0bcb5dc07a667d7f5999299c9b") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "tools") (:url . "https://github.com/conao3/indent-lint.el"))])
@@ -2656,7 +2662,7 @@
  (inf-crystal . [(20180119 211) ((emacs (24 3)) (crystal-mode (0 1 0))) "Run a Inferior-Crystal process in a buffer" tar ((:commit . "dd5c85e621976ea09b602182a15396e3b510ec63") (:authors ("Brantou" . "brantou89@gmail.com")) (:maintainers ("Brantou" . "brantou89@gmail.com")) (:maintainer "Brantou" . "brantou89@gmail.com") (:keywords "languages" "crystal") (:url . "https://github.com/brantou/inf-crystal.el"))])
  (inf-elixir . [(20230611 1945) ((emacs (25 1))) "Run an interactive Elixir shell" tar ((:commit . "77ac6af83eb4b816c62f58a0298b1bae0c3d69fd") (:authors ("Jonathan Arnett" . "jonathan.arnett@protonmail.com")) (:maintainers ("Jonathan Arnett" . "jonathan.arnett@protonmail.com")) (:maintainer "Jonathan Arnett" . "jonathan.arnett@protonmail.com") (:keywords "languages" "processes" "tools") (:url . "https://github.com/J3RN/inf-elixir"))])
  (inf-mongo . [(20180408 1338) nil "Run a MongoDB shell process in a buffer" tar ((:commit . "2e498d1c88bd1904eeec18ed06b1a0cf8bdc2a92") (:authors ("Tobias Svensson")) (:maintainers ("Tobias Svensson")) (:maintainer "Tobias Svensson") (:keywords "databases" "mongodb") (:url . "http://github.com/endofunky/inf-mongo"))])
- (inf-ruby . [(20240310 1803) ((emacs (26 1))) "Run a Ruby process in a buffer" tar ((:commit . "b88ff8bd5fe2e468de611b0211842634beaeb5da") (:authors ("Yukihiro Matsumoto") ("Nobuyoshi Nakada") ("Cornelius Mika" . "cornelius.mika@gmail.com") ("Dmitry Gutov" . "dgutov@yandex.ru") ("Kyle Hargraves" . "pd@krh.me")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "languages" "ruby") (:url . "http://github.com/nonsequitur/inf-ruby"))])
+ (inf-ruby . [(20240509 143) ((emacs (26 1))) "Run a Ruby process in a buffer" tar ((:commit . "1dcaa0aad2eec23582263f934005140ddf70f52c") (:authors ("Yukihiro Matsumoto") ("Nobuyoshi Nakada") ("Cornelius Mika" . "cornelius.mika@gmail.com") ("Dmitry Gutov" . "dgutov@yandex.ru") ("Kyle Hargraves" . "pd@krh.me")) (:maintainers ("Dmitry Gutov" . "dmitry@gutov.dev")) (:maintainer "Dmitry Gutov" . "dmitry@gutov.dev") (:keywords "languages" "ruby") (:url . "http://github.com/nonsequitur/inf-ruby"))])
  (inferior-islisp . [(20220924 1040) ((emacs (26 3)) (islisp-mode (0 2))) "Run inferior ISLisp processes" tar ((:commit . "423b84fe4cc6944e36971225b3e19c888e7e4690") (:authors ("Fermin Munoz")) (:maintainers ("Fermin Munoz" . "fmfs@posteo.net")) (:maintainer "Fermin Munoz" . "fmfs@posteo.net") (:keywords "islisp" "lisp" "programming") (:url . "https://gitlab.com/sasanidas/islisp-mode"))])
  (inflections . [(20210110 2237) ((cl-lib (0 5)) (emacs (24))) "convert english words between singular and plural" tar ((:commit . "55caa66a7cc6e0b1a76143fd40eff38416928941") (:authors ("Dmitry Galinsky, Howard Yeh")) (:maintainers ("Dmitry Galinsky, Howard Yeh")) (:maintainer "Dmitry Galinsky, Howard Yeh") (:keywords "languages" "tools" "wp") (:url . "https://github.com/eschulte/jump.el"))])
  (info-beamer . [(20210427 1033) ((emacs (24 4))) "Utilities for working with info-beamer" tar ((:commit . "6b4cc29f1aec72d8e23b2c25a99cdd84e6cdc92b") (:authors ("Daniel Kraus" . "daniel@kraus.my")) (:maintainers ("Daniel Kraus" . "daniel@kraus.my")) (:maintainer "Daniel Kraus" . "daniel@kraus.my") (:keywords "tools" "processes" "comm") (:url . "https://github.com/dakra/info-beamer.el"))])
@@ -2669,7 +2675,7 @@
  (inheritenv . [(20230804 651) ((emacs (24 4))) "Make temp buffers inherit buffer-local environment variables" tar ((:commit . "00106bb208d06e5f1ec25d0c2f41c000cbb25076") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "unix") (:url . "https://github.com/purcell/inheritenv"))])
  (ini . [(20220827 2009) ((emacs (24 4))) "Converting between INI files and association lists" tar ((:commit . "d50fe629497d51c6390a56bbded1ad77ce12e5af") (:url . "https://github.com/EsaLaine/ini.el"))])
  (ini-mode . [(20230211 1512) ((emacs (24 1))) "Major mode for Windows-style ini files." tar ((:commit . "5472abc94e564edc6b469c48d2324519a044a77c") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "languages" "faces") (:url . "https://github.com/Lindydancer/ini-mode"))])
- (init-dir . [(20240326 2204) ((emacs (27 1)) (benchmark-init (1 2))) "Init directory instead of just a single file" tar ((:commit . "5f351041b0f81bfbf81437ce1d39bbd37de9319d") (:authors ("Jared Finder" . "jared@finder.org")) (:maintainers ("Jared Finder" . "jared@finder.org")) (:maintainer "Jared Finder" . "jared@finder.org") (:keywords "extensions" "internal") (:url . "http://github.com/chaosemer/init-dir"))])
+ (init-dir . [(20240521 349) ((emacs (27 1)) (benchmark-init (1 2))) "Init directory instead of just a single file" tar ((:commit . "fd3da1d7a4caf337eebf53de5cd6f5cadad00537") (:authors ("Jared Finder" . "jared@finder.org")) (:maintainers ("Jared Finder" . "jared@finder.org")) (:maintainer "Jared Finder" . "jared@finder.org") (:keywords "extensions" "internal") (:url . "http://github.com/chaosemer/init-dir"))])
  (init-loader . [(20240401 103) ((cl-lib (0 5))) "Loader for configuration files" tar ((:commit . "4ed535f887eb7ac72aedf282b7e4f5a2f7cb7582") (:authors ("IMAKADO" . "ken.imakado@gmail.com")) (:maintainers ("IMAKADO" . "ken.imakado@gmail.com")) (:maintainer "IMAKADO" . "ken.imakado@gmail.com") (:url . "https://github.com/emacs-jp/init-loader/"))])
  (init-open-recentf . [(20220220 2004) ((emacs (24 4))) "Invoke a command immediately after startup" tar ((:commit . "51463effe54ca9390ec339b9678968f35a40dbfd") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "files" "recentf" "after-init-hook") (:url . "https://github.com/zonuexe/init-open-recentf.el"))])
  (initsplit . [(20160919 1818) nil "code to split customizations into different files" tar ((:commit . "c941d436eb2b10b01c76a582c5a2b23fb30751aa") (:authors ("John Wiegley <johnw@gnu.org>, Dave Abrahams" . "dave@boostpro.com")) (:maintainers ("John Wiegley <johnw@gnu.org>, Dave Abrahams" . "dave@boostpro.com")) (:maintainer "John Wiegley <johnw@gnu.org>, Dave Abrahams" . "dave@boostpro.com") (:keywords "lisp") (:url . "http://www.gci-net.com/users/j/johnw/emacs.html"))])
@@ -2726,7 +2732,7 @@
  (iterator . [(20210109 1859) ((emacs (24)) (cl-lib (0 5))) "A library to create and use elisp iterators objects." tar ((:commit . "b514d4d1d0167e5973afbc93a34070d1aa967d82") (:authors ("Thierry Volpiatto <thierry dot volpiatto at gmail dot com>")) (:maintainers ("Thierry Volpiatto <thierry dot volpiatto at gmail dot com>")) (:maintainer "Thierry Volpiatto <thierry dot volpiatto at gmail dot com>") (:url . "https://github.com/thierryvolpiatto/iterator"))])
  (ivariants . [(20170823 224) ((emacs (24 3)) (ivs-edit (1 0))) "Ideographic variants editor and browser" tar ((:commit . "ca0b74d32b5d2d77a45cc6ad6edc00be0ee85284") (:authors ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainers ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainer "KAWABATA, Taichi <kawabata.taichi_at_gmail.com>") (:keywords "i18n" "languages") (:url . "http://github.com/kawabata/ivariants"))])
  (ivs-edit . [(20170818 1441) ((emacs (24 3)) (dash (2 6 0)) (cl-lib (1 0))) "IVS (Ideographic Variation Sequence) editing tool" tar ((:commit . "5db39c234aa7393b591168a4fd0a9a4cbbca347d") (:authors ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainers ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainer "KAWABATA, Taichi <kawabata.taichi_at_gmail.com>") (:keywords "text") (:url . "http://github.com/kawabata/ivs-edit"))])
- (ivy . [(20240405 2019) ((emacs (24 5))) "Incremental Vertical completYon" tar ((:commit . "a38bc60eb78e38304d1183d98d4fc76671263ee1") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "matching") (:url . "https://github.com/abo-abo/swiper"))])
+ (ivy . [(20240519 1636) ((emacs (24 5))) "Incremental Vertical completYon" tar ((:commit . "6a98b006f140b588490c24c5f794aac4250bf300") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "matching") (:url . "https://github.com/abo-abo/swiper"))])
  (ivy-avy . [(20240214 2118) ((emacs (24 5)) (ivy (0 14 2)) (avy (0 5 0))) "Avy integration for Ivy" tar ((:commit . "749ac1235a7948011cb0caddd4c31037e3314614") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "convenience") (:url . "https://github.com/abo-abo/swiper"))])
  (ivy-bibtex . [(20210927 1205) ((bibtex-completion (1 0 0)) (ivy (0 13 0)) (cl-lib (0 5))) "A bibliography manager based on Ivy" tar ((:commit . "bb47f355b0da8518aa3fb516019120c14c8747c9") (:authors ("Justin Burkett" . "justin@burkett.cc")) (:maintainers ("Titus von der Malsburg" . "malsburg@posteo.de")) (:maintainer "Titus von der Malsburg" . "malsburg@posteo.de") (:url . "https://github.com/tmalsburg/helm-bibtex"))])
  (ivy-clipmenu . [(20220202 2122) ((emacs (26 1)) (f (0 20 0)) (s (1 12 0)) (dash (2 16 0)) (ivy (0 13 0))) "Ivy client for clipmenu" tar ((:commit . "7c200cd4732821187084fad23547ee3f58365062") (:authors ("William Carroll" . "wpcarro@gmail.com")) (:maintainers ("William Carroll" . "wpcarro@gmail.com")) (:maintainer "William Carroll" . "wpcarro@gmail.com") (:url . "https://github.com/wpcarro/ivy-clipmenu.el"))])
@@ -2761,7 +2767,7 @@
  (ivy-youtube . [(20230503 1509) ((request (0 2 0)) (ivy (0 8 0)) (cl-lib (0 5))) "Query YouTube and play videos in your browser" tar ((:commit . "e7a7cc860e967500857e5fd85d8e397c6d752ee1") (:authors ("Brunno dos Santos")) (:maintainers ("Brunno dos Santos")) (:maintainer "Brunno dos Santos") (:keywords "youtube" "multimedia" "mpv" "vlc") (:url . "https://github.com/squiter/ivy-youtube"))])
  (ix . [(20131027 1657) ((grapnel (0 5 3))) "Emacs client for http://ix.io pastebin" tar ((:commit . "498dac674f4f1910d39087b1457c5da5465a0614") (:authors ("Abhishek L" . "abhishekl.2006@gmail.com")) (:maintainers ("Abhishek L" . "abhishekl.2006@gmail.com")) (:maintainer "Abhishek L" . "abhishekl.2006@gmail.com") (:url . "http://www.github.com/theanalyst/ix.el"))])
  (j-mode . [(20171224 1856) nil "Major mode for editing J programs" tar ((:commit . "e8725ac8af95498faabb2ca3ab3bd809a8f148e6") (:keywords "j" "languages") (:url . "http://github.com/zellio/j-mode"))])
- (jabber . [(20240306 524) ((emacs (27 1)) (fsm (0 2)) (srv (0 2))) "A Jabber client for Emacs." tar ((:commit . "633cb73633143ec093c291af94b008f456037e8b") (:authors ("Magnus Henoch" . "mange@freemail.hu")) (:maintainer "wgreenhouse" . "wgreenhouse@tilde.club") (:keywords "comm") (:url . "https://codeberg.org/emacs-jabber/emacs-jabber"))])
+ (jabber . [(20240521 633) ((emacs (27 1)) (fsm (0 2)) (srv (0 2))) "A Jabber client for Emacs." tar ((:commit . "9e7bebfe76d2ed529d66942b602ac4348e0cc61f") (:authors ("Magnus Henoch" . "mange@freemail.hu")) (:maintainer "wgreenhouse" . "wgreenhouse@tilde.club") (:keywords "comm") (:url . "https://codeberg.org/emacs-jabber/emacs-jabber"))])
  (jack . [(20221122 632) ((emacs (28 1))) "HTML generator library" tar ((:commit . "3b4ea97fcc107d0ffd201ea695129af52f390113") (:authors ("Tony Aldon" . "tony.aldon.adm@gmail.com")) (:maintainers ("Tony Aldon" . "tony.aldon.adm@gmail.com")) (:maintainer "Tony Aldon" . "tony.aldon.adm@gmail.com") (:keywords "lisp" "html") (:url . "https://github.com/tonyaldon/jack"))])
  (jack-connect . [(20220201 1417) nil "Manage jack connections within Emacs" tar ((:commit . "1acaebfe8f37f0194e95c3e812c9515a6f688eee") (:authors ("Stefano Barbi" . "stefanobarbi@gmail.com")) (:maintainers ("Stefano Barbi" . "stefanobarbi@gmail.com")) (:maintainer "Stefano Barbi" . "stefanobarbi@gmail.com"))])
  (jack-ts-mode . [(20231110 1615) ((emacs (29 1))) "Major mode for jack buffers using tree-sitter" tar ((:commit . "f57f211d96608a90142619a925caeb8808e7c632") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:keywords "tree-sitter" "languages" "jack" "nand2tetris") (:url . "https://github.com/nverno/jack-ts-mode"))])
@@ -2799,7 +2805,7 @@
  (jetbrains-darcula-theme . [(20230223 1901) nil "A complete port of the default JetBrains Darcula theme" tar ((:commit . "46f153385e50998826ca13e18056c6a972768cfd") (:authors ("Ian Y.E. Pan")) (:maintainers ("Ian Y.E. Pan")) (:maintainer "Ian Y.E. Pan") (:url . "https://github.com/ianpan870102/jetbrains-darcula-emacs-theme"))])
  (jg-quicknav . [(20170809 130) ((s (1 9 0)) (cl-lib (0 5))) "Quickly navigate the file system to find a file." tar ((:commit . "c8d53e774d63e68a944092c08a026b57da741038") (:authors ("Jeff Gran" . "jeff@jeffgran.com")) (:maintainers ("Jeff Gran" . "jeff@jeffgran.com")) (:maintainer "Jeff Gran" . "jeff@jeffgran.com") (:keywords "navigation") (:url . "https://github.com/jeffgran/jg-quicknav"))])
  (jinja2-mode . [(20220117 807) nil "A major mode for jinja2" tar ((:commit . "03e5430a7efe1d163a16beaf3c82c5fd2c2caee1") (:authors ("Florian Mounier aka paradoxxxzero")) (:maintainers ("Florian Mounier aka paradoxxxzero")) (:maintainer "Florian Mounier aka paradoxxxzero"))])
- (jinx . [(20240415 423) ((emacs (27 1)) (compat (29 1 4 4))) "Enchanted Spell Checker" tar ((:commit . "77cac7f240f45d6c4836e844bd68151c7f863298") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "convenience" "text") (:url . "https://github.com/minad/jinx"))])
+ (jinx . [(20240515 1016) ((emacs (27 1)) (compat (29 1 4 4))) "Enchanted Spell Checker" tar ((:commit . "3c36f1eb31713869ffbdbf55971671efa4f01966") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "convenience" "text") (:url . "https://github.com/minad/jinx"))])
  (jira-markup-mode . [(20150601 2109) nil "Emacs Major mode for JIRA-markup-formatted text files" tar ((:commit . "53bf083fdbece483f1351f32085b424b38c4c1f2") (:authors ("Matthias Nuessler" . "m.nuessler@web.de>")) (:maintainers ("Matthias Nuessler" . "m.nuessler@web.de>")) (:maintainer "Matthias Nuessler" . "m.nuessler@web.de>") (:keywords "jira" "markup") (:url . "https://github.com/mnuessler/jira-markup-mode"))])
  (jiralib2 . [(20200520 2031) ((emacs (25)) (request (0 3)) (dash (2 14 1))) "JIRA REST API bindings to Elisp" tar ((:commit . "c21c4e759eff549dbda11099f2f680b78d7f5a01") (:authors ("Henrik Nyman" . "h@nyymanni.com")) (:maintainers ("Henrik Nyman" . "h@nyymanni.com")) (:maintainer "Henrik Nyman" . "h@nyymanni.com") (:keywords "comm" "jira" "rest" "api") (:url . "https://github.com/nyyManni/jiralib2"))])
  (jirascope . [(20240122 2130) ((emacs (25 1))) "A Jira client" tar ((:commit . "61acd8d6adbd6b25ebcc5436b4dce6d5c6d2981c") (:authors ("Stanisław Zagórowski" . "duckonaut@gmail.com")) (:maintainers ("Stanisław Zagórowski" . "duckonaut@gmail.com")) (:maintainer "Stanisław Zagórowski" . "duckonaut@gmail.com") (:keywords "tools") (:url . "https://github.com/Duckonaut/jirascope"))])
@@ -2807,7 +2813,7 @@
  (jit-lock-stealth-progress . [(20240422 105) ((emacs (28 1))) "JIT lock stealth mode-line progress" tar ((:commit . "8f517230266faf1decb8e948110baef7539c9df3") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-jit-lock-stealth-progress"))])
  (jknav . [(20121006 2025) nil "Automatically enable j/k keys for line-based navigation" tar ((:commit . "861245715c728503dad6573278fdd75c271dbf8b") (:authors ("Aaron Culich" . "aculich@gmail.com")) (:maintainers ("Aaron Culich" . "aculich@gmail.com")) (:maintainer "Aaron Culich" . "aculich@gmail.com") (:keywords "keyboard" "navigation"))])
  (jmespath . [(20240115 1310) ((emacs (24 3))) "Query JSON using jmespath" tar ((:commit . "d3a4a4abdd6804d3aef5e0d0c538abd27667b4c3") (:authors ("Shubham Kumar" . "unresolved.shubham@gmail.com")) (:maintainers ("Shubham Kumar" . "unresolved.shubham@gmail.com")) (:maintainer "Shubham Kumar" . "unresolved.shubham@gmail.com") (:keywords "json" "data" "languages" "tools") (:url . "https://github.com/unresolvedcold/jmespath"))])
- (jmt-mode . [(20240425 1650) ((emacs (27 1))) "JMT Mode" tar ((:commit . "7c88ff37c2a957a5d07be7a1c878b3325b55f719") (:authors ("Michael Allan" . "mike@reluk.ca")) (:maintainers ("Michael Allan" . "mike@reluk.ca")) (:maintainer "Michael Allan" . "mike@reluk.ca") (:keywords "languages" "c") (:url . "http://reluk.ca/project/Java/Emacs/"))])
+ (jmt-mode . [(20240508 951) ((emacs (27 1))) "JMT Mode" tar ((:commit . "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3") (:authors ("Michael Allan" . "mike@reluk.ca")) (:maintainers ("Michael Allan" . "mike@reluk.ca")) (:maintainer "Michael Allan" . "mike@reluk.ca") (:keywords "languages" "c") (:url . "http://reluk.ca/project/Java/Emacs/"))])
  (jonprl-mode . [(20160819 59) ((emacs (24 3)) (cl-lib (0 5)) (yasnippet (0 8 0))) "A major mode for editing JonPRL files" tar ((:commit . "6059bb64891fae45827174e044d6a87ac07172d8") (:authors ("David Raymond Christiansen" . "david@davidchristiansen.dk")) (:maintainers ("David Raymond Christiansen" . "david@davidchristiansen.dk")) (:maintainer "David Raymond Christiansen" . "david@davidchristiansen.dk") (:keywords "languages"))])
  (journalctl-mode . [(20240219 2115) ((emacs (27 1))) "Sample major mode for  viewing output journalctl" tar ((:commit . "631d10a5c8f466c94c38c3cd7410a27026f5f822") (:authors ("Sebastian Meisel" . "sebastian.meisel@gmail.com")) (:maintainers ("Sebastian Meisel" . "sebastian.meisel@gmail.com")) (:maintainer "Sebastian Meisel" . "sebastian.meisel@gmail.com") (:keywords "unix") (:url . "https://github.com/SebastianMeisel/journalctl-mode"))])
  (jpop . [(20170410 1250) ((emacs (24)) (dash (2 11 0)) (cl-lib (0 5))) "Lightweight project caching and navigation framework" tar ((:commit . "7628b03260be96576b34459d45959ee77d8b2110") (:authors ("Dom Charlesworth" . "dgc336@gmail.com")) (:maintainers ("Dom Charlesworth" . "dgc336@gmail.com")) (:maintainer "Dom Charlesworth" . "dgc336@gmail.com") (:keywords "project" "convenience") (:url . "https://github.com/domtronn/jpop.el"))])
@@ -2846,14 +2852,14 @@
  (jss . [(20130508 1423) ((emacs (24 1)) (websocket (0)) (js2-mode (0))) "An emacs interface to webkit and mozilla debuggers" tar ((:commit . "41749257aecf13c7bd6ed489b5ab3304d06e40bc") (:authors ("Marco Baringer" . "mb@bese.it")) (:maintainers ("Marco Baringer" . "mb@bese.it")) (:maintainer "Marco Baringer" . "mb@bese.it") (:keywords "languages"))])
  (jst . [(20150604 1138) ((s (1 9)) (f (0 17)) (dash (2 10)) (pcache (0 3)) (emacs (24 4))) "JS test mode" tar ((:commit . "865ff97449a4cbbcb40d38b4908cf4d7b22a5108") (:authors ("Cheung Hoi Yu" . "yeannylam@gmail.com")) (:maintainers ("Cheung Hoi Yu" . "yeannylam@gmail.com")) (:maintainer "Cheung Hoi Yu" . "yeannylam@gmail.com") (:keywords "js" "javascript" "jasmine" "coffee" "coffeescript") (:url . "https://github.com/cheunghy/jst-mode"))])
  (jtags . [(20160211 2029) nil "enhanced tags functionality for Java development" tar ((:commit . "f7d29e1635ef7ee4ee2cdb8f1f6ab83e1015c84a") (:authors ("Alexander Baltatzis" . "alexander@baltatzis.com") ("Johan Dykstrom" . "jody4711-sf@yahoo.se")) (:maintainers ("Johan Dykstrom" . "jody4711-sf@yahoo.se")) (:maintainer "Johan Dykstrom" . "jody4711-sf@yahoo.se") (:keywords "languages" "tools") (:url . "http://jtags.sourceforge.net"))])
- (jtsx . [(20240418 2018) ((emacs (29 1))) "Extends JSX/TSX built-in support" tar ((:commit . "32dec6d5d5725a7fe2d50537e46c224349008896") (:authors ("Loïc Lemaître" . "loic.lemaitre@gmail.com")) (:maintainers ("Loïc Lemaître" . "loic.lemaitre@gmail.com")) (:maintainer "Loïc Lemaître" . "loic.lemaitre@gmail.com") (:keywords "languages") (:url . "https://github.com/llemaitre19/jtsx"))])
+ (jtsx . [(20240519 1546) ((emacs (29 1))) "Extends JSX/TSX built-in support" tar ((:commit . "7bbf02f046e375c23fe5a90eb0a9557e843eba41") (:authors ("Loïc Lemaître" . "loic.lemaitre@gmail.com")) (:maintainers ("Loïc Lemaître" . "loic.lemaitre@gmail.com")) (:maintainer "Loïc Lemaître" . "loic.lemaitre@gmail.com") (:keywords "languages") (:url . "https://github.com/llemaitre19/jtsx"))])
  (julia-formatter . [(20231130 1512) ((emacs (27 1)) (session-async (0 0 5))) "Use JuliaFormatter.jl for julia code" tar ((:commit . "4b40481cc9c0dcb3c9704436e00d613067d44bf5") (:authors ("Felipe Lema" . "felipe.lema@mortemale.org")) (:maintainers ("Felipe Lema" . "felipe.lema@mortemale.org")) (:maintainer "Felipe Lema" . "felipe.lema@mortemale.org") (:keywords "convenience" "tools") (:url . "https://codeberg.org/FelipeLema/julia-formatter.el"))])
- (julia-mode . [(20240409 1316) ((emacs (26 1))) "Major mode for editing Julia source code" tar ((:commit . "60f23fea669add4a1624573eb6383f4180f5a6c9") (:keywords "languages") (:url . "https://github.com/JuliaEditorSupport/julia-emacs"))])
+ (julia-mode . [(20240506 1205) ((emacs (26 1))) "Major mode for editing Julia source code" tar ((:commit . "d360ad5285b8a0be1818fd6c2b4307c34e468c6e") (:keywords "languages") (:url . "https://github.com/JuliaEditorSupport/julia-emacs"))])
  (julia-repl . [(20240408 850) ((emacs (25 1)) (s (1 12))) "A minor mode for a Julia REPL" tar ((:commit . "801d0fc3d8f6f08f66a11515e6517739a0b312a1") (:authors ("Tamas Papp" . "tkpapp@gmail.com")) (:maintainers ("Tamas Papp" . "tkpapp@gmail.com")) (:maintainer "Tamas Papp" . "tkpapp@gmail.com") (:keywords "languages") (:url . "https://github.com/tpapp/julia-repl"))])
  (julia-shell . [(20161125 1910) ((julia-mode (0 3))) "Major mode for an inferior Julia shell" tar ((:commit . "583a0b2ca20461ab4356929fd0f2212c22341b69") (:authors ("Dennis Ogbe" . "dogbe@purdue.edu")) (:maintainers ("Dennis Ogbe" . "dogbe@purdue.edu")) (:maintainer "Dennis Ogbe" . "dogbe@purdue.edu"))])
- (julia-snail . [(20240428 522) ((emacs (26 2)) (dash (2 16 0)) (julia-mode (0 3)) (s (1 12 0)) (spinner (1 7 3)) (popup (0 5 9))) "Julia Snail" tar ((:commit . "a63ee2a61efd6af2d6a597bfa40cc98630406a8e") (:url . "https://github.com/gcv/julia-snail"))])
+ (julia-snail . [(20240521 22) ((emacs (26 2)) (dash (2 16 0)) (julia-mode (0 3)) (s (1 12 0)) (spinner (1 7 3)) (popup (0 5 9))) "Julia Snail" tar ((:commit . "f7784c50078332aeeb8e388bf5b8f13042b7406b") (:url . "https://github.com/gcv/julia-snail"))])
  (julia-ts-mode . [(20230921 1433) ((emacs (29 1)) (julia-mode (0 4))) "Major mode for Julia source code using tree-sitter" tar ((:commit . "44260b265359c7ed4052398e099ad019ce899109") (:authors ("Ronan Arraes Jardim Chagas")) (:maintainers ("Ronan Arraes Jardim Chagas")) (:maintainer "Ronan Arraes Jardim Chagas") (:keywords "julia" "languages" "tree-sitter") (:url . "https://github.com/ronisbr/julia-ts-mode"))])
- (julia-vterm . [(20230815 2318) ((emacs (25 1)) (vterm (0 0 1))) "A mode for Julia REPL using vterm" tar ((:commit . "6d67b618a6f2714d283095b088b12859fb663df9") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "languages" "julia") (:url . "https://github.com/shg/julia-vterm.el"))])
+ (julia-vterm . [(20240514 724) ((emacs (25 1)) (vterm (0 0 1))) "A mode for Julia REPL using vterm" tar ((:commit . "2298cd42d354f069adbb7bb06b3b15222e5f54a2") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "languages" "julia") (:url . "https://github.com/shg/julia-vterm.el"))])
  (jumblr . [(20170727 2043) ((s (1 8 0)) (dash (2 2 0))) "an anagram game for emacs" tar ((:commit . "34533dfb9db8538c005f4eaffafeff7ed193729f") (:keywords "anagram" "word game" "games") (:url . "https://github.com/mkmcc/jumblr"))])
  (jump . [(20210110 2237) ((findr (0 7)) (inflections (2 4)) (cl-lib (0 5))) "build functions which contextually jump between files" tar ((:commit . "55caa66a7cc6e0b1a76143fd40eff38416928941") (:authors ("Eric Schulte")) (:maintainers ("Eric Schulte")) (:maintainer "Eric Schulte") (:keywords "project" "convenience" "navigation") (:url . "http://github.com/eschulte/jump.el"))])
  (jump-char . [(20180601 1348) nil "navigation by char" tar ((:commit . "1e31a3c687f2b3c71bbfab881c6d75915534bb9e") (:authors ("Le Wang")) (:maintainers ("Le Wang")) (:maintainer "Le Wang") (:url . "https://github.com/lewang/jump-char"))])
@@ -2875,11 +2881,11 @@
  (kaleidoscope . [(20170808 817) ((s (1 11 0))) "Controlling Kaleidoscope-powered devices." tar ((:commit . "b89a243f6024099192f1bc38d8a54e3e7a654090") (:authors ("Gergely Nagy")) (:maintainers ("Gergely Nagy")) (:maintainer "Gergely Nagy") (:url . "https://github.com/algernon/kaleidoscope.el"))])
  (kaleidoscope-evil-state-flash . [(20170728 1020) ((evil (1 2 12)) (kaleidoscope (0 1 0)) (s (1 11 0))) "Flash keyboard LEDs when changing Evil state" tar ((:commit . "5b88327350c3d6375ef1d43fb31342eaabd88fdc") (:authors ("Gergely Nagy")) (:maintainers ("Gergely Nagy")) (:maintainer "Gergely Nagy") (:url . "https://github.com/algernon/kaleidoscope.el"))])
  (kana . [(20210531 1427) ((emacs (24 4)) (dash (2 17 0))) "Learn Japanese hiragana and katakana" tar ((:commit . "d3d550aad67ef8625b3860598bf3622f5b2a7d32") (:authors ("Damon Chan" . "elecming@gmail.com")) (:maintainers ("Damon Chan" . "elecming@gmail.com")) (:maintainer "Damon Chan" . "elecming@gmail.com") (:keywords "tools") (:url . "https://github.com/chenyanming/kana"))])
- (kanagawa-theme . [(20240424 308) ((emacs (24 3))) "An elegant theme inspired by The Great Wave off Kanagawa by Katsushika Hokusa" tar ((:commit . "dca0ee1e2978eb82b37c777d894dc447faa70619") (:authors ("Raime Filianore" . "meritamen@sdf.org")) (:maintainers ("Raime Filianore" . "meritamen@sdf.org")) (:maintainer "Raime Filianore" . "meritamen@sdf.org") (:keywords "themes" "faces") (:url . "https://github.com/meritamen/emacs-kanagawa-theme"))])
+ (kanagawa-theme . [(20240501 38) ((emacs (24 3))) "An elegant theme inspired by The Great Wave off Kanagawa by Katsushika Hokusa" tar ((:commit . "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d") (:authors ("Raime Filianore" . "meritamen@sdf.org")) (:maintainers ("Raime Filianore" . "meritamen@sdf.org")) (:maintainer "Raime Filianore" . "meritamen@sdf.org") (:keywords "themes" "faces") (:url . "https://github.com/meritamen/emacs-kanagawa-theme"))])
  (kanban . [(20230210 1505) nil "Parse org-todo headlines to use org-tables as Kanban tables" tar ((:commit . "d70fa7acab2bfcbb7d3da43c1343073f7eff4998") (:authors ("Arne Babenhauserheide" . "arne_bab@web.de")) (:maintainers ("Arne Babenhauserheide" . "arne_bab@web.de")) (:maintainer "Arne Babenhauserheide" . "arne_bab@web.de") (:keywords "outlines" "convenience"))])
  (kanji-mode . [(20230928 1113) nil "View stroke order for kanji characters at cursor" tar ((:commit . "731b3a5447bcb899ba1d86b645a344e0915d04f3") (:authors ("Wojciech Gac" . "wojciech.s.gac@gmail.com")) (:maintainers ("Wojciech Gac" . "wojciech.s.gac@gmail.com")) (:maintainer "Wojciech Gac" . "wojciech.s.gac@gmail.com") (:url . "http://github.com/wsgac/kanji-mode "))])
  (kaocha-runner . [(20240410 1348) ((emacs (26)) (s (1 4 0)) (cider (0 21 0)) (parseedn (0 1 0))) "A package for running Kaocha tests via CIDER." tar ((:commit . "ab5b4f32c733e238bdf08e10cab9a0606675faa4") (:authors ("Magnar Sveen" . "magnars@gmail.com")) (:maintainers ("Magnar Sveen" . "magnars@gmail.com")) (:maintainer "Magnar Sveen" . "magnars@gmail.com") (:url . "https://github.com/magnars/kaocha-runner.el"))])
- (kaolin-themes . [(20240217 2054) ((emacs (25 1)) (autothemer (0 2 2)) (cl-lib (0 6))) "A set of eye pleasing themes" tar ((:commit . "b03749c914b1319caccce4cf96630e3fba5335f5") (:authors ("Ogden Webb" . "ogdenwebb@gmail.com")) (:maintainers ("Ogden Webb" . "ogdenwebb@gmail.com")) (:maintainer "Ogden Webb" . "ogdenwebb@gmail.com") (:keywords "dark" "light" "teal" "blue" "violet" "purple" "brown" "theme" "faces") (:url . "https://github.com/ogdenwebb/emacs-kaolin-themes"))])
+ (kaolin-themes . [(20240507 1430) ((emacs (25 1)) (autothemer (0 2 2)) (cl-lib (0 6))) "A set of eye pleasing themes" tar ((:commit . "ba7a003d7aa5d4681a8464f4dec6ab4e9fb271d2") (:authors ("Ogden Webb" . "ogdenwebb@gmail.com")) (:maintainers ("Ogden Webb" . "ogdenwebb@gmail.com")) (:maintainer "Ogden Webb" . "ogdenwebb@gmail.com") (:keywords "dark" "light" "teal" "blue" "violet" "purple" "brown" "theme" "faces") (:url . "https://github.com/ogdenwebb/emacs-kaolin-themes"))])
  (kaomoji . [(20220721 441) ((emacs (24 3)) (helm-core (3 6 0))) "Input kaomoji superb easily" tar ((:commit . "fba0018a13eba70c2bffc6153dcfee99937fa3d6") (:authors ("Ono Hiroko" . "azazabc123@gmail.com")) (:maintainers ("Ono Hiroko" . "azazabc123@gmail.com")) (:maintainer "Ono Hiroko" . "azazabc123@gmail.com") (:keywords "tools" "fun") (:url . "https://github.com/kuanyui/kaomoji.el"))])
  (kapacitor . [(20190414 1908) ((emacs (25 1)) (magit (2 13 0)) (magit-popup (2 12 4))) "Main file for kapacitor-mode" tar ((:commit . "e3300d8b4017a2f66b0d929cb85bcc7ee2612072") (:authors ("Manoj Kumar Manikchand" . "manojm.321@gmail.com")) (:maintainers ("Manoj Kumar Manikchand" . "manojm.321@gmail.com")) (:maintainer "Manoj Kumar Manikchand" . "manojm.321@gmail.com") (:keywords "kapacitor" "emacs" "magit" "tools") (:url . "http://github.com/Manoj321/kapacitor-el"))])
  (karma . [(20160220 1245) ((pkg-info (0 4)) (emacs (24))) "Karma Test Runner Emacs Integration" tar ((:commit . "31d3e7708246183d7ed0686be92bf23140af348c") (:authors ("Samuel Tonini")) (:maintainers ("Samuel Tonini")) (:maintainer "Samuel Tonini") (:keywords "language" "javascript" "js" "karma" "testing") (:url . "http://github.com/tonini/karma.el"))])
@@ -2889,7 +2895,7 @@
  (keepass-mode . [(20211030 958) ((emacs (27))) "Mode for KeePass DB." tar ((:commit . "f432bb60f9f3bd027025140d723906dcabeefaef") (:authors ("Ignasi Fosch" . "natx@y10k.ws")) (:maintainer "Ignasi Fosch" . "natx@y10k.ws") (:keywords "data" "files" "tools") (:url . "https://github.com/ifosch/keepass-mode"))])
  (keg . [(20230709 1321) ((emacs (24 1))) "Modern Elisp package development system" tar ((:commit . "c0d24fdad4248e0291685b47a02df54e9f980aba") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "convenience") (:url . "https://github.com/conao3/keg.el"))])
  (keg-mode . [(20220307 829) ((emacs (24 4))) "Major mode for editing Keg files" tar ((:commit . "d2ef9cfaee1256849291cfade3d730667f55aaf2") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "convenience") (:url . "https://github.com/conao3/keg.el"))])
- (kele . [(20240415 2325) ((emacs (28 1)) (async (1 9 7)) (dash (2 19 1)) (f (0 20 0)) (ht (2 3)) (memoize (0)) (plz (0 7 3)) (s (1 13 0)) (yaml (0 5 1))) "Spritzy Kubernetes cluster management" tar ((:commit . "8f3c4515ae55376f49d2be338d876686a34d121d") (:authors ("Jonathan Jin" . "me@jonathanj.in")) (:maintainers ("Jonathan Jin" . "me@jonathanj.in")) (:maintainer "Jonathan Jin" . "me@jonathanj.in") (:keywords "kubernetes" "tools") (:url . "https://github.com/jinnovation/kele.el"))])
+ (kele . [(20240428 2141) ((emacs (28 1)) (async (1 9 7)) (dash (2 19 1)) (f (0 20 0)) (ht (2 3)) (memoize (0)) (plz (0 7 3)) (s (1 13 0)) (yaml (0 5 1))) "Spritzy Kubernetes cluster management" tar ((:commit . "ee667b6581113be21e7d24935cf8a431eb382432") (:authors ("Jonathan Jin" . "me@jonathanj.in")) (:maintainers ("Jonathan Jin" . "me@jonathanj.in")) (:maintainer "Jonathan Jin" . "me@jonathanj.in") (:keywords "kubernetes" "tools") (:url . "https://github.com/jinnovation/kele.el"))])
  (kerl . [(20150424 2005) nil "Emacs integration for kerl" tar ((:commit . "1732ee26213f021bf040919c45ad276aafcaae14") (:authors ("Correl Roush" . "correl@gmail.com")) (:maintainers ("Correl Roush" . "correl@gmail.com")) (:maintainer "Correl Roush" . "correl@gmail.com") (:keywords "tools") (:url . "http://github.com/correl/kerl.el/"))])
  (key-assist . [(20231208 446) ((emacs (24 3))) "Minibuffer keybinding cheatsheet and launcher" tar ((:commit . "87d2378db3d997b6b5a7b2c04281c18378e70bbb") (:authors ("Boruch Baum" . "boruch_baum@gmx.com")) (:maintainers ("Boruch Baum" . "boruch_baum@gmx.com")) (:maintainer "Boruch Baum" . "boruch_baum@gmx.com") (:keywords "abbrev" "convenience" "docs" "help") (:url . "https://github.com/Boruch-Baum/emacs-key-assist"))])
  (key-chord . [(20240109 1430) ((emacs (24))) "map pairs of simultaneously pressed keys to commands" tar ((:commit . "dbf91fefdad58b1c2f07c92e658ce81490837c60") (:authors ("David Andersson <l.david.andersson(at)sverige.nu>")) (:maintainers ("David Andersson <l.david.andersson(at)sverige.nu>")) (:maintainer "David Andersson <l.david.andersson(at)sverige.nu>") (:keywords "keyboard" "chord" "input"))])
@@ -2913,7 +2919,7 @@
  (kfg . [(20140909 538) ((f (0 17 1))) "an emacs configuration system" tar ((:commit . "ffc35b77f227d4c64a1271ec30d31333ffeb0013") (:authors ("Austin Bingham" . "austin.bingham@gmail.com")) (:maintainers ("Austin Bingham" . "austin.bingham@gmail.com")) (:maintainer "Austin Bingham" . "austin.bingham@gmail.com") (:url . "https://github.com/abingham/kfg"))])
  (khalel . [(20240314 1347) ((emacs (27 1))) "Import, edit and create calendar events through khal" tar ((:commit . "9dea9e45ebb2364f9fe873ca773b9324b34b720f") (:authors ("Hanno Perrey <http://gitlab.com/hperrey>")) (:maintainers ("Hanno Perrey" . "hanno@hoowl.se")) (:maintainer "Hanno Perrey" . "hanno@hoowl.se") (:keywords "event" "calendar" "ics" "khal") (:url . "https://gitlab.com/hperrey/khalel"))])
  (khardel . [(20231126 1502) ((emacs (27 1)) (yaml-mode (0 0 13))) "Integrate with khard" tar ((:commit . "205e374b36252183a146a7a8f857bcf95a77edc3") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:url . "https://github.com/DamienCassou/khardel"))])
- (khoj . [(20240427 1312) ((emacs (27 1)) (transient (0 3 0)) (dash (2 19 1))) "AI copilot for your Second Brain" tar ((:commit . "12258f02d7c526bc1c91afddbce165f78c3e8a7a") (:authors ("Debanjum Singh Solanky" . "debanjum@khoj.dev") ("Saba Imran" . "saba@khoj.dev")) (:maintainers ("Debanjum Singh Solanky" . "debanjum@khoj.dev")) (:maintainer "Debanjum Singh Solanky" . "debanjum@khoj.dev") (:keywords "search" "chat" "org-mode" "outlines" "markdown" "pdf" "image") (:url . "https://github.com/khoj-ai/khoj/tree/master/src/interface/emacs"))])
+ (khoj . [(20240501 1100) ((emacs (27 1)) (transient (0 3 0)) (dash (2 19 1))) "AI copilot for your Second Brain" tar ((:commit . "bc8b92a77dc40c93a5fdf6639f367d814339bbad") (:authors ("Debanjum Singh Solanky" . "debanjum@khoj.dev") ("Saba Imran" . "saba@khoj.dev")) (:maintainers ("Debanjum Singh Solanky" . "debanjum@khoj.dev")) (:maintainer "Debanjum Singh Solanky" . "debanjum@khoj.dev") (:keywords "search" "chat" "org-mode" "outlines" "markdown" "pdf" "image") (:url . "https://github.com/khoj-ai/khoj/tree/master/src/interface/emacs"))])
  (kibit-helper . [(20150508 1533) ((s (0 8)) (emacs (24))) "Conveniently use the Kibit Leiningen plugin from Emacs" tar ((:commit . "ec5f154db3bb0c838e86f527353f08644cede926") (:authors ("Jonas Enlund") ("James Elliott" . "james@brunchboy.com")) (:maintainers ("Jonas Enlund")) (:maintainer "Jonas Enlund") (:keywords "languages" "clojure" "kibit") (:url . "http://www.github.com/brunchboy/kibit-helper"))])
  (kill-file-path . [(20230306 1041) ((emacs (26))) "Copy file name into kill ring" tar ((:commit . "5dcbce69cbae17665216a32dd20f27de54c62972") (:authors ("Adam Chyła" . "adam@chyla.org")) (:maintainers ("Adam Chyła" . "adam@chyla.org")) (:maintainer "Adam Chyła" . "adam@chyla.org") (:keywords "files") (:url . "https://github.com/chyla/kill-file-path/kill-file-path.el"))])
  (kill-or-bury-alive . [(20230606 1503) ((emacs (24 4))) "Precise control over buffer killing" tar ((:commit . "16c393db6ad0c7e184af0a24d26b637e23543b1f") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "convenience") (:url . "https://github.com/mrkkrp/kill-or-bury-alive"))])
@@ -2936,7 +2942,7 @@
  (korean-holidays . [(20190102 1558) nil "Korean holidays for calendar." tar ((:commit . "3f90ed86f46f8e5533f23baa40e2513ac497ca2b") (:authors ("SeungKi Kim" . "tttuuu888@gmail.com")) (:maintainers ("SeungKi Kim" . "tttuuu888@gmail.com")) (:maintainer "SeungKi Kim" . "tttuuu888@gmail.com") (:keywords "calendar") (:url . "https://github.com/tttuuu888/korean-holidays"))])
  (kosmos-theme . [(20170502 1850) ((emacs (24))) "Black and lightgray theme with not so much syntax highlighting." tar ((:commit . "616456d2376a75dc31190ad65137d179fbad4336") (:authors ("Maxim Kim" . "habamax@gmail.com")) (:maintainers ("Maxim Kim" . "habamax@gmail.com")) (:maintainer "Maxim Kim" . "habamax@gmail.com") (:url . "https://github.com/habamax/kosmos-theme"))])
  (kotlin-mode . [(20230123 1859) ((emacs (24 3))) "Major mode for kotlin" tar ((:commit . "fddd747e5b4736e8b27a147960f369b86179ddff") (:authors ("Shodai Yokoyama" . "quantumcars@gmail.com")) (:maintainers ("Shodai Yokoyama" . "quantumcars@gmail.com")) (:maintainer "Shodai Yokoyama" . "quantumcars@gmail.com") (:keywords "languages") (:url . "https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode"))])
- (kotlin-ts-mode . [(20240417 838) ((emacs (29 1))) "A mode for editing Kotlin files based on tree-sitter" tar ((:commit . "a8747af6465b384941ce8f199bdfecb3d0c09812") (:authors ("Alex Figl-Brick" . "alex@alexbrick.me")) (:maintainers ("Alex Figl-Brick" . "alex@alexbrick.me")) (:maintainer "Alex Figl-Brick" . "alex@alexbrick.me") (:url . "https://gitlab.com/bricka/emacs-kotlin-ts-mode"))])
+ (kotlin-ts-mode . [(20240513 1429) ((emacs (29 1))) "A mode for editing Kotlin files based on tree-sitter" tar ((:commit . "786b7eacb6c10b7a4e0c0537264264f299632679") (:authors ("Alex Figl-Brick" . "alex@alexbrick.me")) (:maintainers ("Alex Figl-Brick" . "alex@alexbrick.me")) (:maintainer "Alex Figl-Brick" . "alex@alexbrick.me") (:url . "https://gitlab.com/bricka/emacs-kotlin-ts-mode"))])
  (kpm-list . [(20170924 1352) nil "An emacs buffer list that tries to intelligently group together buffers." tar ((:commit . "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5") (:authors ("Kevin Mahoney")) (:maintainers ("Kevin Mahoney")) (:maintainer "Kevin Mahoney") (:url . "https://github.com/KMahoney/kpm-list/"))])
  (kroman . [(20150827 2340) nil "Korean hangul romanization" tar ((:commit . "431144a3cd629a2812a668a29ad85182368dc9b0") (:authors ("Zhang Kai Yu" . "yeannylam@gmail.com")) (:maintainers ("Zhang Kai Yu" . "yeannylam@gmail.com")) (:maintainer "Zhang Kai Yu" . "yeannylam@gmail.com") (:keywords "korean" "roman"))])
  (ksp-cfg-mode . [(20190414 2348) ((emacs (24)) (cl-lib (0 5))) "major mode for editing KSP CFG files" tar ((:commit . "faec8bd8456c67276d065eb68c88a30efcef59ef") (:authors ("Emily Backes" . "lucca@accela.net")) (:maintainers ("Emily Backes" . "lucca@accela.net")) (:maintainer "Emily Backes" . "lucca@accela.net") (:keywords "data") (:url . "http://github.com/lashtear/ksp-cfg-mode"))])
@@ -2954,7 +2960,7 @@
  (kv . [(20140108 1534) nil "key/value data structure functions" tar ((:commit . "721148475bce38a70e0b678ba8aa923652e8900e") (:authors ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainers ("Nic Ferrier" . "nferrier@ferrier.me.uk")) (:maintainer "Nic Ferrier" . "nferrier@ferrier.me.uk") (:keywords "lisp"))])
  (kwin . [(20220120 2125) nil "communicatewith the KWin window manager" tar ((:commit . "20fac6508e5535a26df783ba05f04d1800b7382c") (:authors ("Simon Hafner")) (:maintainers ("Simon Hafner")) (:maintainer "Simon Hafner") (:url . "http://github.com/reactormonk/kwin-minor-mode"))])
  (laas . [(20230331 1806) ((emacs (26 3)) (auctex (11 88)) (aas (1 1))) "A bundle of as-you-type LaTeX snippets" tar ((:commit . "a00f0aba237b85b3e5fd60cf84de5759d1bf5d48") (:maintainers ("Yoav Marco" . "yoavm448@gmail.com")) (:maintainer "Yoav Marco" . "yoavm448@gmail.com") (:keywords "tools" "tex") (:url . "https://github.com/tecosaur/LaTeX-auto-activating-snippets"))])
- (lab . [(20240404 736) ((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 ((:commit . "ca6a02c567adb562305d0887140d631e2d6f01f6") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com") (:url . "https://github.com/isamert/lab.el"))])
+ (lab . [(20240517 1837) ((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 ((:commit . "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com") (:url . "https://github.com/isamert/lab.el"))])
  (lab-themes . [(20200815 2104) ((emacs (24))) "A custom theme carefully constructed in the LAB space" tar ((:commit . "9d7deb9635959d3a50ccb1082eb1207275f4b3e8") (:authors ("MetroWind" . "chris.corsair@gmail.com")) (:maintainers ("MetroWind" . "chris.corsair@gmail.com")) (:maintainer "MetroWind" . "chris.corsair@gmail.com") (:keywords "lisp") (:url . "https://github.com/MetroWind/lab-theme"))])
  (labburn-theme . [(20221208 1611) nil "A lab color space zenburn theme." tar ((:commit . "bd0de2fdcf285d981f32e3e5ebc56fe3c9b589a5") (:authors ("Johannes Goslar")) (:maintainers ("Johannes Goslar")) (:maintainer "Johannes Goslar") (:keywords "theme" "zenburn") (:url . "https://github.com/ksjogo/labburn-theme"))])
  (lacquer . [(20230824 725) ((emacs (25 2))) "Switch theme/font by selecting from a cache" tar ((:commit . "c8a0fb81f18001b3d510f545ba253ed4f9a50f5b") (:authors ("zakudriver" . "zy.hua1122@gmail.com")) (:maintainers ("zakudriver" . "zy.hua1122@gmail.com")) (:maintainer "zakudriver" . "zy.hua1122@gmail.com") (:keywords "tools") (:url . "https://github.com/zakudriver/lacquer"))])
@@ -2967,7 +2973,7 @@
  (langtool-ignore-fonts . [(20210526 2340) ((emacs (25 1)) (langtool (2 2 1))) "Force langtool to ignore certain fonts" tar ((:commit . "a5d04c3840c293f1b11db3c28e7210d0d20f53af") (:authors ("Christopher Lloyd" . "cjl8zf@virginia.edu")) (:maintainers ("Christopher Lloyd" . "cjl8zf@virginia.edu")) (:maintainer "Christopher Lloyd" . "cjl8zf@virginia.edu") (:url . "https://github.com/cjl8zf/langtool-ignore-fonts"))])
  (langtool-popup . [(20230222 401) ((emacs (25 1)) (popup (0 5 9))) "Popup message extension for langtool.el" tar ((:commit . "d86101eafe9a994eb0425e08e7c1795e9cb0cd42") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com") (:keywords "docs") (:url . "https://github.com/mhayashi1120/Emacs-langtool"))])
  (language-detection . [(20161123 1813) ((emacs (24)) (cl-lib (0 5))) "Automatic language detection from code snippets" tar ((:commit . "38f5d294870678efc6ccf94ce6e8175a58f93025") (:authors ("Andreas Jansson" . "andreas@jansson.me.uk")) (:maintainers ("Andreas Jansson" . "andreas@jansson.me.uk")) (:maintainer "Andreas Jansson" . "andreas@jansson.me.uk") (:url . "https://github.com/andreasjansson/language-detection.el"))])
- (language-id . [(20240325 1223) ((emacs (24 3))) "Library to work with programming language identifiers" tar ((:commit . "c05a566ab5c938b31873b24d698c3d9ff0948ea9") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/lassik/emacs-language-id"))])
+ (language-id . [(20240510 1342) ((emacs (24 3))) "Library to work with programming language identifiers" tar ((:commit . "435114f208b97e97aa1576ef1966a33d90cad01b") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/lassik/emacs-language-id"))])
  (languagetool . [(20230325 507) ((emacs (27 1))) "LanguageTool integration for grammar and spell check" tar ((:commit . "b136d531129eb488dc4134784e34c4afedcb0c2f") (:authors ("Joar Buitrago" . "jebuitragoc@unal.edu.co")) (:maintainers ("Joar Buitrago" . "jebuitragoc@unal.edu.co")) (:maintainer "Joar Buitrago" . "jebuitragoc@unal.edu.co") (:keywords "grammar" "text" "docs" "tools" "convenience" "checker") (:url . "https://github.com/PillFall/Emacs-LanguageTool.el"))])
  (lark-mode . [(20231221 340) ((emacs (24 3))) "Major mode for editing Lark parser code" tar ((:commit . "0a0724b0f64d433d81f90ba8f86e618f8c33522a") (:authors ("Ta Quang Trung")) (:maintainers ("Ta Quang Trung")) (:maintainer "Ta Quang Trung") (:keywords "languages") (:url . "https://github.com/taquangtrung/lark-mode"))])
  (lastfm . [(20211018 838) ((emacs (26 1)) (request (0 3 0)) (anaphora (1 0 4)) (memoize (1 1)) (elquery (0 1 0)) (s (1 12 0))) "Last.fm API for Emacs Lisp" tar ((:commit . "b4b19f0aadc5087febeeb3f59944a89c4cdcf325") (:authors ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainers ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainer "Mihai Olteanu" . "mihai_olteanu@fastmail.fm") (:keywords "multimedia" "api") (:url . "https://github.com/mihaiolteanu/lastfm.el/"))])
@@ -3024,7 +3030,7 @@
  (lgr . [(20230407 1317) ((emacs (26 1))) "A fully featured logging framework" tar ((:commit . "4ab6c22bcbc533acace3c854876f40fa9d2f7819") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:keywords "tools") (:url . "https://github.com/Fuco1/emacs-lgr"))])
  (libbcel . [(20230826 1233) ((emacs (26 1)) (request (0 3 1))) "Library to connect to basecamp 3 API" tar ((:commit . "35679c86b6d73817fef17df4119a7a45dfc9f33d") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:url . "https://gitlab.petton.fr/bcel/libbcel"))])
  (libelcouch . [(20230903 800) ((emacs (26 1)) (request (0 3 0))) "Communication with CouchDB" tar ((:commit . "5202084caee9fd236a18afc6f83293f05168a4c3") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:keywords "tools") (:url . "https://github.com/DamienCassou/libelcouch/"))])
- (liberime . [(20230113 556) ((emacs (25 1))) "Rime elisp binding" tar ((:commit . "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753") (:authors ("A.I.")) (:maintainers ("A.I.")) (:maintainer "A.I.") (:keywords "convenience" "chinese" "input-method" "rime") (:url . "https://github.com/merrickluo/liberime"))])
+ (liberime . [(20240515 255) ((emacs (25 1))) "Rime elisp binding" tar ((:commit . "c5839f541763f661a4d46784f3f14adad28ee2b0") (:authors ("A.I.")) (:maintainers ("A.I.")) (:maintainer "A.I.") (:keywords "convenience" "chinese" "input-method" "rime") (:url . "https://github.com/merrickluo/liberime"))])
  (liblouis . [(20220426 657) ((emacs (26 1))) "Mode for editing liblouis braille translation tables" tar ((:commit . "a341a0c434cdbe7f46956c8db13203c3fc941a34") (:authors ("Christian Egli" . "christian.egli@sbs.ch")) (:maintainers ("Christian Egli" . "christian.egli@sbs.ch")) (:maintainer "Christian Egli" . "christian.egli@sbs.ch") (:keywords "languages") (:url . "https://github.com/liblouis/liblouis-mode"))])
  (libmpdee . [(20220825 957) nil "Client end library for mpd, a music playing daemon" tar ((:commit . "9a84e074385cd085622f94e720a968a0e05ceae5") (:authors ("Ramkumar R. Aiyengar" . "andyetitmoves@gmail.com")) (:maintainers ("Ramkumar R. Aiyengar" . "andyetitmoves@gmail.com")) (:maintainer "Ramkumar R. Aiyengar" . "andyetitmoves@gmail.com") (:keywords "music" "mpd"))])
  (libmpdel . [(20230816 839) ((emacs (25 1))) "Communication with an MPD server" tar ((:commit . "ca5397f1d66462e11c9ff4a49d308d92aef31b29") (:authors ("Damien Cassou" . "damien@cassou.me")) (:maintainers ("Damien Cassou" . "damien@cassou.me")) (:maintainer "Damien Cassou" . "damien@cassou.me") (:keywords "multimedia") (:url . "https://github.com/mpdel/libmpdel"))])
@@ -3068,7 +3074,7 @@
  (litanize . [(20230419 917) ((emacs (24 1)) (enlive (0 0 1)) (s (1 12 0))) "Generate \"Latour Litanies\"" tar ((:commit . "a45902fa29c16ef9606229cb01a5441ea754f11b") (:authors ("nik gaffney" . "nik@fo.am")) (:maintainers ("nik gaffney" . "nik@fo.am")) (:maintainer "nik gaffney" . "nik@fo.am") (:keywords "tools" "latour litany" "alien phenomenology" "ontography" "metaphorism" "carpentry") (:url . "https://github.com/zzkt/litanizer"))])
  (litecoin-ticker . [(20160612 11) ((json (1 2))) "litecoin price in modeline" tar ((:commit . "3d8047c736e4ee0b8638953f8cc63eaefad34106") (:authors ("Zhe Lei")) (:maintainers ("Zhe Lei")) (:maintainer "Zhe Lei"))])
  (literal-string . [(20191023 733) ((emacs (25)) (edit-indirect (0 1 5))) "edit string literals in a dedicated buffer" tar ((:commit . "afffa86e626798ee9f9188ea3be2d5ee6ad17c39") (:authors ("Joost Diepenmaat" . "joost@zeekat.nl")) (:maintainers ("Joost Diepenmaat" . "joost@zeekat.nl")) (:maintainer "Joost Diepenmaat" . "joost@zeekat.nl") (:keywords "lisp" "tools" "docs") (:url . "https://github.com/joodie/literal-string-mode/"))])
- (literate-calc-mode . [(20240402 808) ((emacs (27)) (dash (2 19 1)) (s (1 12 0))) "Inline results from calc" tar ((:commit . "ceddadc4f130626d3430fc8c5cfff71628221a60") (:authors ("Robin Schroer")) (:maintainers ("Robin Schroer")) (:maintainer "Robin Schroer") (:keywords "calc" "languages" "tools") (:url . "https://github.com/sulami/literate-calc-mode.el"))])
+ (literate-calc-mode . [(20240513 1200) ((emacs (27)) (dash (2 19 1)) (s (1 12 0))) "Inline results from calc" tar ((:commit . "5e8ce01ff3d85ff81f366724330026d68449bc19") (:authors ("Robin Schroer")) (:maintainers ("Robin Schroer")) (:maintainer "Robin Schroer") (:keywords "calc" "languages" "tools") (:url . "https://github.com/sulami/literate-calc-mode.el"))])
  (literate-coffee-mode . [(20170211 1515) ((coffee-mode (0 5 0))) "major-mode for Literate CoffeeScript" tar ((:commit . "ef34c3a5b813ef078d44c29887761950ab6821c7") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-literate-coffee-mode"))])
  (literate-elisp . [(20220626 932) ((emacs (26 1))) "Load Emacs Lisp code blocks from Org files" tar ((:commit . "bbc4befbf13f63b92cb1d780501482ae5bd8285b") (:authors ("Jingtao Xu" . "jingtaozf@gmail.com")) (:maintainers ("Jingtao Xu" . "jingtaozf@gmail.com")) (:maintainer "Jingtao Xu" . "jingtaozf@gmail.com") (:keywords "lisp" "docs" "extensions" "tools") (:url . "https://github.com/jingtaozf/literate-elisp"))])
  (litex-mode . [(20221107 147) ((emacs (24 4)) (units-mode (0 1 1))) "Minor mode for converting lisp to LaTeX" tar ((:commit . "45004b3a865771799b739d17ebb7849190fffa63") (:authors ("Gaurav Atreya" . "allmanpride@gmail.com")) (:maintainers ("Gaurav Atreya" . "allmanpride@gmail.com")) (:maintainer "Gaurav Atreya" . "allmanpride@gmail.com") (:keywords "calculator" "lisp" "latex") (:url . "https://github.com/Atreyagaurav/litex-mode"))])
@@ -3080,8 +3086,8 @@
  (livescript-mode . [(20221015 1316) ((emacs (24 3))) "Major mode for editing LiveScript files" tar ((:commit . "e71a82a400e9d451c966c397bb8fa7887d35637b") (:authors ("Hisamatsu Yasuyuki" . "yas@null.net")) (:maintainers ("Hisamatsu Yasuyuki" . "yas@null.net")) (:maintainer "Hisamatsu Yasuyuki" . "yas@null.net") (:keywords "languages" "livescript") (:url . "https://github.com/yhisamatsu/livescript-mode"))])
  (livid-mode . [(20131116 1344) ((skewer-mode (1 5 3)) (s (1 8 0))) "Live browser eval of JavaScript every time a buffer changes" tar ((:commit . "dfe5212fa64738bc4138bfebf349fbc8bc237c26") (:authors ("Murphy McMahon")) (:maintainers ("Murphy McMahon")) (:maintainer "Murphy McMahon") (:url . "https://github.com/pandeiro/livid-mode"))])
  (ll-debug . [(20211002 1031) ((emacs (24 3))) "Low level debug tools" tar ((:commit . "a2cfeab46e5100c348b35987fae34f9ea76d7c0b") (:authors ("Claus Brunzema" . "mail@cbrunzema.de")) (:maintainers ("Claus Brunzema" . "mail@cbrunzema.de")) (:maintainer "Claus Brunzema" . "mail@cbrunzema.de") (:keywords "abbrev" "convenience" "tools" "c" "lisp") (:url . "https://github.com/replrep/ll-debug"))])
- (llama . [(20240415 1539) nil "Compact syntax for short lambda" tar ((:commit . "40d671b35e51afbc0d690f33c965d322375c4b27") (:keywords "extensions") (:url . "https://git.sr.ht/~tarsius/llama"))])
- (llama-cpp . [(20231228 2043) ((emacs (27 1)) (dash (2 19 1))) "A client for llama-cpp server" tar ((:commit . "e876c05eca8ffadc39d3c5013c2581f1e9f8f94f") (:authors ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainers ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainer "Evgeny Kurnevsky" . "kurnevsky@gmail.com") (:keywords "tools") (:url . "https://github.com/kurnevsky/llama.el"))])
+ (llama . [(20240520 1947) nil "Compact syntax for short lambda" tar ((:commit . "cea812d16129749deb524771e615a4a831604a83") (:keywords "extensions") (:url . "https://git.sr.ht/~tarsius/llama"))])
+ (llama-cpp . [(20240511 1039) ((emacs (27 1)) (dash (2 19 1))) "A client for llama-cpp server" tar ((:commit . "5cea3698aa63921b21888f126cae4f3ebc1baa39") (:authors ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainers ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainer "Evgeny Kurnevsky" . "kurnevsky@gmail.com") (:keywords "tools") (:url . "https://github.com/kurnevsky/llama.el"))])
  (llvm-ts-mode . [(20231120 1251) ((emacs (29 1))) "LLVM major mode using tree-sitter" tar ((:commit . "9974601dcddbeffc4ad47598d63d3c1a83bb6fb9") (:authors ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainers ("Noah Peart" . "noah.v.peart@gmail.com")) (:maintainer "Noah Peart" . "noah.v.peart@gmail.com") (:keywords "languages" "tree-sitter" "llvm") (:url . "https://github.com/nverno/llvm-ts-mode"))])
  (lms . [(20210820 2200) ((emacs (25 1))) "Squeezebox / Logitech Media Server frontend" tar ((:commit . "29593b4c18a570dfb2e60b196f24d407a1277daa") (:authors ("Iñigo Serna" . "inigoserna@gmx.com")) (:maintainers ("Iñigo Serna" . "inigoserna@gmx.com")) (:maintainer "Iñigo Serna" . "inigoserna@gmx.com") (:keywords "multimedia") (:url . "https://hg.serna.eu/emacs/lms"))])
  (load-bash-alias . [(20240103 916) ((emacs (24 1)) (seq (2 16))) "Convert bash aliases into eshell ones" tar ((:commit . "7e7b6773f99e6aafe819596388a3a7fd09dd91a9") (:authors ("Davide Restivo" . "davide.restivo@yahoo.it")) (:maintainers ("Davide Restivo" . "davide.restivo@yahoo.it")) (:maintainer "Davide Restivo" . "davide.restivo@yahoo.it") (:keywords "emacs" "bash" "eshell" "alias") (:url . "https://github.com/daviderestivo/load-bash-alias"))])
@@ -3114,21 +3120,21 @@
  (lox-mode . [(20200619 1700) ((emacs (24 3))) "Major mode for the Lox programming language" tar ((:commit . "083a2299e188a516d1e46ef2dd1cbb89db1aec49") (:authors ("Timmy Jose" . "zoltan.jose@gmail.com")) (:maintainers ("Timmy Jose" . "zoltan.jose@gmail.com")) (:maintainer "Timmy Jose" . "zoltan.jose@gmail.com") (:keywords "languages" "lox") (:url . "https://github.com/timmyjose-projects/lox-mode"))])
  (lpy . [(20231026 1525) ((emacs (25 1)) (lispy (0 27 0))) "A lispy interface to Python" tar ((:commit . "2c086ec162d4456b99a6095c3c335382a8304734") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "python" "lisp") (:url . "https://github.com/abo-abo/lpy"))])
  (lsp-cfn . [(20240112 921) ((emacs (27 0)) (lsp-mode (8 0 0)) (yaml-mode (0 0 15))) "LSP integration for cfn-lsp-extra" tar ((:commit . "2297533003118ebd9db0116b4d3486a987e98ca9") (:authors ("Laurence Warne")) (:maintainers ("Laurence Warne")) (:maintainer "Laurence Warne") (:url . "https://github.com/LaurenceWarne/lsp-cfn.el"))])
- (lsp-dart . [(20240401 1646) ((emacs (27 1)) (lsp-treemacs (0 3)) (lsp-mode (7 0 1)) (dap-mode (0 6)) (f (0 20 0)) (dash (2 14 1)) (dart-mode (1 0 5)) (jsonrpc (1 0 15)) (ht (2 2))) "Dart support lsp-mode" tar ((:commit . "ee476aa9bb891873943bb4f9dc4b729921c2de37") (:keywords "languages" "extensions") (:url . "https://emacs-lsp.github.io/lsp-dart"))])
+ (lsp-dart . [(20240520 1834) ((emacs (27 1)) (lsp-treemacs (0 3)) (lsp-mode (7 0 1)) (dap-mode (0 6)) (f (0 20 0)) (dash (2 14 1)) (dart-mode (1 0 5)) (jsonrpc (1 0 15)) (ht (2 2))) "Dart support lsp-mode" tar ((:commit . "1f52e81c9371055ff9188117ace81f009d1c79f2") (:keywords "languages" "extensions") (:url . "https://emacs-lsp.github.io/lsp-dart"))])
  (lsp-docker . [(20240419 1428) ((emacs (27 1)) (dash (2 14 1)) (lsp-mode (6 2 1)) (f (0 20 0)) (s (1 13 0)) (yaml (0 2 0)) (ht (2 0))) "LSP Docker integration" tar ((:commit . "16a0cfbe06813a1191b19e412445f9d34cd7493f") (:authors ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainers ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainer "Ivan Yonchovski" . "yyoncho@gmail.com") (:keywords "languages" "langserver") (:url . "https://github.com/emacs-lsp/lsp-docker"))])
  (lsp-focus . [(20200906 1917) ((emacs (26 1)) (focus (0 1 1)) (lsp-mode (6 1))) "focus.el support for lsp-mode" tar ((:commit . "d01f0af156e4e78dcb9fa8e080a652cf8f221d30") (:authors ("Vibhav Pant")) (:maintainers ("Vibhav Pant")) (:maintainer "Vibhav Pant") (:keywords "languages" "lsp-mode") (:url . "https://github.com/emacs-lsp/lsp-focus"))])
  (lsp-grammarly . [(20240229 115) ((emacs (27 1)) (lsp-mode (6 1)) (grammarly (0 3 0)) (request (0 3 0)) (s (1 12 0)) (ht (2 3))) "LSP Clients for Grammarly" tar ((:commit . "39deb23b282785eaffc6ae17838c92c613a49315") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "lsp" "grammarly" "checker") (:url . "https://github.com/emacs-grammarly/lsp-grammarly"))])
  (lsp-haskell . [(20231011 1723) ((emacs (27 1)) (lsp-mode (3 0)) (haskell-mode (16 1))) "Haskell support for lsp-mode" tar ((:commit . "89d16370434e9a247e95b8b701f524f5abfc884b") (:keywords "haskell") (:url . "https://github.com/emacs-lsp/lsp-haskell"))])
  (lsp-intellij . [(20180831 2051) ((emacs (25 1)) (lsp-mode (4 1))) "intellij lsp client" tar ((:commit . "cf30f0ac63bd0140e758840b8ab070e8313697b2") (:authors ("Ruin0x11" . "ipickering2@gmail.com")) (:maintainers ("Ruin0x11" . "ipickering2@gmail.com")) (:maintainer "Ruin0x11" . "ipickering2@gmail.com") (:keywords "languages" "processes" "tools") (:url . "https://github.com/Ruin0x11/lsp-intellij"))])
  (lsp-ivy . [(20220831 1823) ((emacs (25 1)) (dash (2 14 1)) (lsp-mode (6 2 1)) (ivy (0 13 0))) "LSP ivy integration" tar ((:commit . "9ecf4dd9b1207109802bd1882aa621eb1c385106") (:keywords "languages" "debug") (:url . "https://github.com/emacs-lsp/lsp-ivy"))])
- (lsp-java . [(20230922 1154) ((emacs (27 1)) (lsp-mode (6 0)) (markdown-mode (2 3)) (dash (2 18 0)) (f (0 20 0)) (ht (2 0)) (request (0 3 0)) (treemacs (2 5)) (dap-mode (0 5))) "Java support for lsp-mode" tar ((:commit . "449673da7221a30f1b1756cedcc48b9a2b52a51e") (:keywords "languague" "tools") (:url . "https://github.com/emacs-lsp/lsp-java"))])
+ (lsp-java . [(20240501 1928) ((emacs (27 1)) (lsp-mode (6 0)) (markdown-mode (2 3)) (dash (2 18 0)) (f (0 20 0)) (ht (2 0)) (request (0 3 0)) (treemacs (2 5)) (dap-mode (0 5))) "Java support for lsp-mode" tar ((:commit . "37c95ef7e992001250d893277acfccf4af0099b4") (:keywords "languague" "tools") (:url . "https://github.com/emacs-lsp/lsp-java"))])
  (lsp-javacomp . [(20190124 1755) ((emacs (25 1)) (lsp-mode (3 0)) (s (1 2 0))) "Provide Java IDE features powered by JavaComp." tar ((:commit . "82aa4ad6ca03a74565c35e855b318b1887bcd89b") (:keywords "java" "tools" "lsp") (:url . "https://github.com/tigersoldier/lsp-javacomp"))])
  (lsp-jedi . [(20230824 1908) ((emacs (25 1)) (lsp-mode (6 0))) "Lsp client plugin for Python Jedi Language Server" tar ((:commit . "3c828df8dd422dbb94856cc99db6f9acb52b871d") (:authors ("Fred Campos" . "fred.tecnologia@gmail.com")) (:maintainers ("Fred Campos")) (:maintainer "Fred Campos") (:keywords "language-server" "tools" "python" "jedi" "ide") (:url . "http://github.com/fredcamps/lsp-jedi"))])
  (lsp-julia . [(20230915 654) ((emacs (25 1)) (lsp-mode (6 3)) (julia-mode (0 3))) "Julia support for lsp-mode" tar ((:commit . "c869b2f6c05a97e5495ed3cc6710a33b4faf41a2") (:authors ("Martin Wolke" . "vibhavp@gmail.com") ("Adam Beckmeyer" . "adam_git@thebeckmeyers.xyz") ("Guido Kraemer" . "gdkrmr@users.noreply.github.com")) (:maintainers ("Guido Kraemer" . "gdkrmr@users.noreply.github.com")) (:maintainer "Guido Kraemer" . "gdkrmr@users.noreply.github.com") (:keywords "languages" "tools") (:url . "https://github.com/gdkrmr/lsp-julia"))])
  (lsp-latex . [(20240324 1218) ((emacs (27 1)) (lsp-mode (6 0)) (consult (0 35))) "LSP-mode client for LaTeX, on texlab" tar ((:commit . "30e5ee2a387bee7b320564d402b3e587cdae536c") (:authors ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainers ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainer "ROCKTAKEY" . "rocktakey@gmail.com") (:keywords "languages" "tex") (:url . "https://github.com/ROCKTAKEY/lsp-latex"))])
  (lsp-ltex . [(20240425 2049) ((emacs (27 1)) (lsp-mode (6 1))) "LSP Clients for LTEX" tar ((:commit . "c473ed37aa0f2769bb0b4c344cc28f95975dbc17") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "lsp" "languagetool" "checker") (:url . "https://github.com/emacs-languagetool/lsp-ltex"))])
- (lsp-metals . [(20240413 851) ((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 ((:commit . "01060e9df33bb077ba6bb56ccfebc140aef8f8f3") (:authors ("Ross A. Baker" . "ross@rossabaker.com") ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainers ("Ross A. Baker" . "ross@rossabaker.com")) (:maintainer "Ross A. Baker" . "ross@rossabaker.com") (:keywords "languages" "extensions") (:url . "https://github.com/emacs-lsp/lsp-metals"))])
- (lsp-mode . [(20240427 2141) ((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 ((:commit . "32bf5aa458f2bafb318a34bed64cb3f681aa0b51") (:authors ("Vibhav Pant, Fangrui Song, Ivan Yonchovski")) (:maintainers ("Vibhav Pant, Fangrui Song, Ivan Yonchovski")) (:maintainer "Vibhav Pant, Fangrui Song, Ivan Yonchovski") (:keywords "languages") (:url . "https://github.com/emacs-lsp/lsp-mode"))])
+ (lsp-metals . [(20240508 627) ((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 ((:commit . "fa4072cbe7a7061cdb218b9a3619979f7facba0e") (:authors ("Ross A. Baker" . "ross@rossabaker.com") ("Evgeny Kurnevsky" . "kurnevsky@gmail.com")) (:maintainers ("Ross A. Baker" . "ross@rossabaker.com")) (:maintainer "Ross A. Baker" . "ross@rossabaker.com") (:keywords "languages" "extensions") (:url . "https://github.com/emacs-lsp/lsp-metals"))])
+ (lsp-mode . [(20240514 1430) ((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 ((:commit . "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a") (:authors ("Vibhav Pant, Fangrui Song, Ivan Yonchovski")) (:maintainers ("Vibhav Pant, Fangrui Song, Ivan Yonchovski")) (:maintainer "Vibhav Pant, Fangrui Song, Ivan Yonchovski") (:keywords "languages") (:url . "https://github.com/emacs-lsp/lsp-mode"))])
  (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 ((:commit . "a0dba8f86a2ace7e800a9dc8f814767625a509af") (:authors ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainers ("Ivan Yonchovski" . "yyoncho@gmail.com")) (:maintainer "Ivan Yonchovski" . "yyoncho@gmail.com") (:keywords "data" "languages") (:url . "https://github.com/emacs-lsp/lsp-mssql"))])
  (lsp-origami . [(20230815 704) ((emacs (27 1)) (origami (1 0)) (lsp-mode (6 1))) "origami.el support for lsp-mode" tar ((:commit . "86aa06517910141c3d5054eea5f7723461fce6a6") (:authors ("Vibhav Pant")) (:maintainers ("Vibhav Pant")) (:maintainer "Vibhav Pant") (:keywords "languages" "lsp-mode") (:url . "https://github.com/emacs-lsp/lsp-origami"))])
  (lsp-p4 . [(20190127 1049) ((lsp-mode (3 0))) "P4 support for lsp-mode" tar ((:commit . "084e33a5782f9153502d9b03e63d9cbbe81cdaeb") (:authors ("Dmitri Makarov")) (:maintainers ("Dmitri Makarov")) (:maintainer "Dmitri Makarov") (:keywords "lsp" "p4") (:url . "https://github.com/dmakarov/p4ls"))])
@@ -3143,7 +3149,7 @@
  (lsp-sourcekit . [(20230815 717) ((emacs (27 1)) (lsp-mode (5))) "sourcekit-lsp client for lsp-mode" tar ((:commit . "1cd5e7d2699598a97bdbcd289d9a88b249db474c") (:authors ("Daniel Martín")) (:maintainers ("Daniel Martín")) (:maintainer "Daniel Martín") (:keywords "languages" "lsp" "swift" "objective-c" "c++") (:url . "https://github.com/emacs-lsp/lsp-sourcekit"))])
  (lsp-tailwindcss . [(20240420 1411) ((lsp-mode (7 1)) (f (0 20 0)) (emacs (26 1))) "A lsp-mode client for tailwindcss" tar ((:commit . "3e3cc80a448e9dd24663eaa41742cda686dac5ab") (:authors ("A.I." . "merrick@luois.me")) (:maintainers ("A.I." . "merrick@luois.me")) (:maintainer "A.I." . "merrick@luois.me") (:keywords "language" "tools") (:url . "https://github.com/merrickluo/lsp-tailwindcss"))])
  (lsp-treemacs . [(20240406 2141) ((emacs (27 1)) (dash (2 18 0)) (f (0 20 0)) (ht (2 0)) (treemacs (2 5)) (lsp-mode (6 0))) "LSP treemacs" tar ((:commit . "e223fbb6c09ebcd1366d631c191fab485f0678b8") (:authors ("Ivan Yonchovski")) (:maintainers ("Ivan Yonchovski")) (:maintainer "Ivan Yonchovski") (:keywords "languages") (:url . "https://github.com/emacs-lsp/lsp-treemacs"))])
- (lsp-ui . [(20240424 412) ((emacs (27 1)) (dash (2 18 0)) (lsp-mode (6 0)) (markdown-mode (2 3))) "UI modules for lsp-mode" tar ((:commit . "a59fb5d02eaa97908a06cfc07156de73458c8ae8") (:authors ("Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me")) (:maintainers ("Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me")) (:maintainer "Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me") (:keywords "languages" "tools") (:url . "https://github.com/emacs-lsp/lsp-ui"))])
+ (lsp-ui . [(20240514 1943) ((emacs (27 1)) (dash (2 18 0)) (lsp-mode (6 0)) (markdown-mode (2 3))) "UI modules for lsp-mode" tar ((:commit . "00f1fecdfb41c30428734cf27e492f26f46627fb") (:authors ("Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me")) (:maintainers ("Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me")) (:maintainer "Sebastien Chapuis <sebastien@chapu.is>, Fangrui Song" . "i@maskray.me") (:keywords "languages" "tools") (:url . "https://github.com/emacs-lsp/lsp-ui"))])
  (lua-mode . [(20231023 947) ((emacs (24 3))) "a major-mode for editing Lua scripts" tar ((:commit . "d074e4134b1beae9ed4c9b512af741ca0d852ba3") (:authors ("2011-2013 immerrr" . "immerrr+lua@gmail.com") ("2010-2011 Reuben Thomas" . "rrt@sc3d.org") ("2006 Juergen Hoetzel" . "juergen@hoetzel.info") ("2004 various (support for Lua 5 and byte compilation)") ("2001 Christian Vogler" . "cvogler@gradient.cis.upenn.edu") ("1997 Bret Mogilefsky" . "mogul-lua@gelatinous.com") ("tcl-mode by Gregor Schmid" . "schmid@fb3-s7.math.tu-berlin.de") ("with tons of assistance from") ("Paul Du Bois" . "pld-lua@gelatinous.com") ("Aaron Smith" . "aaron-lua@gelatinous.com")) (:maintainers ("2011-2013 immerrr" . "immerrr+lua@gmail.com")) (:maintainer "2011-2013 immerrr" . "immerrr+lua@gmail.com") (:keywords "languages" "processes" "tools") (:url . "https://immerrr.github.io/lua-mode"))])
  (luarocks . [(20170430 2305) ((emacs (24)) (cl-lib (0 5))) "luarocks tools" tar ((:commit . "cee27ba0716edf338077387969883226dd2b7484") (:authors ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainers ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainer "Mario Rodas" . "marsam@users.noreply.github.com") (:keywords "convenience") (:url . "https://github.com/emacs-pe/luarocks.el"))])
  (lurk-mode . [(20230120 2226) ((emacs (25 1))) "A major mode for editing lurk files" tar ((:commit . "59a3f956944a5ddd43cfd57deeff6b647fc46554") (:maintainers ("Jeff Weiss" . "jweiss@protocol.ai")) (:maintainer "Jeff Weiss" . "jweiss@protocol.ai") (:keywords "languages" "lurk" "lisp") (:url . "http://github.com/lurk-lang/lurk-emacs"))])
@@ -3161,21 +3167,22 @@
  (maces-game . [(20170903 1551) ((dash (2 12 0)) (cl-lib (0 5)) (emacs (24))) "another anagram game." tar ((:commit . "6a067422d305ac51612842930ed6686dc615ffec") (:authors ("Pawel Bokota" . "pawelb.lnx@gmail.com")) (:maintainers ("Pawel Bokota" . "pawelb.lnx@gmail.com")) (:maintainer "Pawel Bokota" . "pawelb.lnx@gmail.com") (:keywords "games" "word games" "anagram") (:url . "https://github.com/pawelbx/anagram-game"))])
  (macports . [(20240321 2352) ((emacs (26 1)) (transient (0 1 0))) "A porcelain for MacPorts" tar ((:commit . "a5ef9d69ff04f5dc62c5a48c5119d96ab3e4d62a") (:authors ("Aaron Madlon-Kay")) (:maintainers ("Aaron Madlon-Kay")) (:maintainer "Aaron Madlon-Kay") (:keywords "convenience") (:url . "https://github.com/amake/macports.el"))])
  (macro-math . [(20130328 1604) nil "in-buffer mathematical operations" tar ((:commit . "216e59371e9ee39c34117ba79b9acd78bb415750") (:authors ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainers ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainer "Nikolaj Schumacher <bugs * nschum de>") (:keywords "convenience") (:url . "http://nschum.de/src/emacs/macro-math/"))])
- (macrostep . [(20240328 2134) ((cl-lib (0 5))) "Interactive macro expander" tar ((:commit . "e28d0a028f702d2dbf9a33ab691c3459268ed35e") (:authors ("Jon Oddie" . "j.j.oddie@gmail.com")) (:maintainers ("Jon Oddie" . "j.j.oddie@gmail.com")) (:maintainer "Jon Oddie" . "j.j.oddie@gmail.com") (:keywords "lisp" "languages" "macro" "debugging") (:url . "https://github.com/emacsorphanage/macrostep"))])
+ (macrostep . [(20240513 2203) ((cl-lib (0 5)) (compat (29))) "Interactive macro expander" tar ((:commit . "4939d88779761e8b5461b4cf73f86600172987db") (:authors ("Jon Oddie" . "j.j.oddie@gmail.com")) (:maintainers ("Jeremy Bryant" . "jb@jeremybryant.net")) (:maintainer "Jeremy Bryant" . "jb@jeremybryant.net") (:keywords "lisp" "languages" "macro" "debugging") (:url . "https://github.com/emacsorphanage/macrostep"))])
  (macrostep-geiser . [(20210717 801) ((emacs (24 4)) (macrostep (0 9)) (geiser (0 12))) "Macrostep for `geiser'" tar ((:commit . "f6a2d5bb96ade4f23df557649af87ebd0cc45125") (:authors ("Nikita Bloshchanevich")) (:maintainers ("Nikita Bloshchanevich")) (:maintainer "Nikita Bloshchanevich") (:keywords "languages" "scheme") (:url . "https://github.com/nbfalcon/macrostep-geiser"))])
  (madhat2r-theme . [(20170203 30) ((emacs (24))) "dark color theme that is easy on the eyes" tar ((:commit . "6b387f09de055cfcc15d74981cd4f32f8f9a7323") (:authors ("Micah Duke")) (:maintainers ("Micah Duke")) (:maintainer "Micah Duke") (:keywords "color" "theme") (:url . "https://github.com/madhat2r/madhat2r-theme"))])
  (mag-menu . [(20150505 1850) ((splitter (0 1 0))) "Intuitive keyboard-centric menu system" tar ((:commit . "9b9277021cd09fb1dba64b1d2a00705d20914bd6") (:authors ("Steven Thomas")) (:maintainers ("Steven Thomas")) (:maintainer "Steven Thomas") (:keywords "convenience") (:url . "https://github.com/chumpage/mag-menu"))])
  (magic-filetype . [(20240130 1805) ((emacs (24 3)) (s (1 9 0))) "Enhance filetype major mode" tar ((:commit . "3979ddbd8066d7390e31bde2b35f997c5f5f4516") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "emulations" "vim" "ft" "file" "magic-mode") (:url . "https://github.com/emacs-php/magic-filetype.el"))])
  (magic-latex-buffer . [(20210306 422) ((cl-lib (0 5)) (emacs (25 1))) "Magically enhance LaTeX-mode font-locking for semi-WYSIWYG editing" tar ((:commit . "903ec91872760e47c0e5715795f8465173615098") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://zk-phi.github.io/"))])
- (magik-mode . [(20240409 1410) ((emacs (24 4)) (compat (28 1))) "Emacs major mode for Smallworld Magik files" tar ((:commit . "7540f14d3d62856313b5cbebefcfd813784ee77b") (:keywords "languages") (:url . "https://github.com/roadrunner1776/magik"))])
- (magit . [(20240426 2118) ((emacs (25 1)) (compat (29 1 4 4)) (dash (20240103)) (git-commit (20240123)) (magit-section (20240114)) (seq (2 24)) (transient (20240201)) (with-editor (20240101))) "A Git porcelain inside Emacs." tar ((:commit . "49ba535f526266b69fcaf7442acfa59ad8473caf") (:authors ("Marius Vollmer" . "marius.vollmer@gmail.com") ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/magit"))])
+ (magik-mode . [(20240521 1419) ((emacs (24 4)) (compat (28 1))) "Emacs major mode for Smallworld Magik files" tar ((:commit . "51ec2d21e4d68fc549d2022f86a882e090541ec3") (:keywords "languages") (:url . "https://github.com/roadrunner1776/magik"))])
+ (magit . [(20240514 1843) ((emacs (26 1)) (compat (29 1 4 5)) (dash (20240405)) (git-commit (20240429)) (magit-section (20240429)) (seq (2 24)) (transient (20240421)) (with-editor (20240415))) "A Git porcelain inside Emacs." tar ((:commit . "9cde118744151caca08b080e15f0c903f17d0f20") (:authors ("Marius Vollmer" . "marius.vollmer@gmail.com") ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/magit"))])
  (magit-annex . [(20231210 2140) ((cl-lib (0 3)) (magit (3 0 0))) "Control git-annex from Magit" tar ((:commit . "056f0d4462cdccbd7bb7589994da7fef9de766da") (:authors ("Kyle Meyer" . "kyle@kyleam.com") ("Rémi Vanicat" . "vanicat@debian.org")) (:maintainers ("Kyle Meyer" . "kyle@kyleam.com")) (:maintainer "Kyle Meyer" . "kyle@kyleam.com") (:keywords "vc" "tools") (:url . "https://github.com/magit/magit-annex"))])
  (magit-commit-mark . [(20240421 931) ((emacs (29 1)) (magit (3 3 0))) "Support marking commits as read" tar ((:commit . "d09d0df6f8a697446e9fac77428b32997b94c59e") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-magit-commit-mark"))])
  (magit-delta . [(20220125 50) ((emacs (25 1)) (magit (20200426)) (xterm-color (2 0))) "Use Delta when displaying diffs in Magit" tar ((:commit . "5fc7dbddcfacfe46d3fd876172ad02a9ab6ac616") (:authors ("Dan Davison" . "dandavison7@gmail.com")) (:maintainers ("Dan Davison" . "dandavison7@gmail.com")) (:maintainer "Dan Davison" . "dandavison7@gmail.com") (:url . "https://github.com/dandavison/magit-delta"))])
  (magit-diff-flycheck . [(20190524 551) ((magit (2)) (flycheck (31)) (seq (2)) (emacs (25 1))) "Report errors in diffs" tar ((:commit . "ad58efa312d708f25661dfcc2a7f83a833cca328") (:authors ("Alex Ragone" . "ragonedk@gmail.com")) (:maintainers ("Alex Ragone" . "ragonedk@gmail.com")) (:maintainer "Alex Ragone" . "ragonedk@gmail.com") (:keywords "convenience" "matching") (:url . "https://github.com/ragone/magit-diff-flycheck"))])
+ (magit-file-icons . [(20240520 216) ((emacs (24 3)) (magit (3 3 0)) (nerd-icons (0 1 0)) (el-patch (3 1))) "Icons for file entries in Magit buffers" tar ((:commit . "d85fad81e74a9b6ce9fd7ab341f265d5a181d2a8") (:authors ("Gregor Grigorjan" . "gregor@grigorjan.net")) (:maintainers ("Gregor Grigorjan" . "gregor@grigorjan.net")) (:maintainer "Gregor Grigorjan" . "gregor@grigorjan.net") (:url . "https://github.com/gekoke/magit-file-icons"))])
  (magit-filenotify . [(20151116 2340) ((magit (1 3 0)) (emacs (24 4))) "Refresh status buffer when git tree changes" tar ((:commit . "c0865b3c41af20b6cd89de23d3b0beb54c8401a4") (:authors ("Rüdiger Sonderfeld" . "ruediger@c-plusplus.de")) (:maintainers ("Rüdiger Sonderfeld" . "ruediger@c-plusplus.de")) (:maintainer "Rüdiger Sonderfeld" . "ruediger@c-plusplus.de") (:keywords "tools"))])
  (magit-find-file . [(20150702 830) ((magit (2 1 0)) (dash (2 8 0))) "completing-read over all files in Git" tar ((:commit . "035da838b1a19e7a5ee135b4ca8475f4e235b61e") (:authors ("Bradley Wright" . "brad@intranation.com")) (:maintainers ("Bradley Wright" . "brad@intranation.com")) (:maintainer "Bradley Wright" . "brad@intranation.com") (:keywords "git") (:url . "https://github.com/bradleywright/magit-find-file.el"))])
- (magit-gerrit . [(20231002 1538) ((emacs (25 1)) (magit (2 90 1)) (transient (0 3 0))) "Magit plugin for Gerrit Code Review" tar ((:commit . "9b6c476a4a5e715d68081dda45312f7e2bedd484") (:authors ("Brian Fransioli" . "assem@terranpro.org")) (:maintainers ("Brian Fransioli" . "assem@terranpro.org")) (:maintainer "Brian Fransioli" . "assem@terranpro.org") (:url . "https://github.com/emacsorphanage/magit-gerrit"))])
+ (magit-gerrit . [(20240514 1139) ((emacs (25 1)) (magit (2 90 1)) (transient (0 3 0))) "Magit plugin for Gerrit Code Review" tar ((:commit . "46fe81c76fd2d3e5e97207cd1d951f22ecb16573") (:authors ("Brian Fransioli" . "assem@terranpro.org")) (:maintainers ("Brian Fransioli" . "assem@terranpro.org")) (:maintainer "Brian Fransioli" . "assem@terranpro.org") (:url . "https://github.com/emacsorphanage/magit-gerrit"))])
  (magit-gh-pulls . [(20191230 1944) ((emacs (24 4)) (gh (0 9 1)) (magit (2 12 0)) (pcache (0 2 3)) (s (1 6 1))) "GitHub pull requests extension for Magit" tar ((:commit . "57f3a5158bbc7bfd169ee136fde351cce999e0ca") (:authors ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainers ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainer "Yann Hodique" . "yann.hodique@gmail.com") (:keywords "git" "tools") (:url . "https://github.com/sigma/magit-gh-pulls"))])
  (magit-gitflow . [(20170929 824) ((magit (2 1 0)) (magit-popup (2 2 0))) "gitflow extension for magit" tar ((:commit . "cc41b561ec6eea947fe9a176349fb4f771ed865b") (:authors ("Jan Tatarik" . "Jan.Tatarik@gmail.com")) (:maintainers ("Jan Tatarik" . "Jan.Tatarik@gmail.com")) (:maintainer "Jan Tatarik" . "Jan.Tatarik@gmail.com") (:keywords "vc" "tools") (:url . "https://github.com/jtatarik/magit-gitflow"))])
  (magit-gptcommit . [(20240406 807) ((emacs (29 1)) (dash (2 13 0)) (magit (2 90 1)) (gptel (0 6 0))) "Git commit with help of gpt" tar ((:commit . "3584b1036574c704e5bae04274b8849590a097b0") (:authors ("Tiou Lims" . "dourokinga@gmail.com")) (:maintainers ("Tiou Lims" . "dourokinga@gmail.com")) (:maintainer "Tiou Lims" . "dourokinga@gmail.com") (:url . "https://github.com/douo/magit-gptcommit"))])
@@ -3187,12 +3194,12 @@
  (magit-popup . [(20200719 1015) ((emacs (24 4)) (dash (2 13 0))) "Define prefix-infix-suffix command combos" tar ((:commit . "d8585fa39f88956963d877b921322530257ba9f5") (:authors ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainers ("Jonas Bernoulli" . "jonas@bernoul.li")) (:maintainer "Jonas Bernoulli" . "jonas@bernoul.li") (:keywords "bindings") (:url . "https://github.com/magit/magit-popup"))])
  (magit-rbr . [(20181009 2016) ((magit (2 13 0)) (emacs (24 3))) "Support for git rbr in Magit" tar ((:commit . "029203b3e48537205052a058e964f058cd802c3c") (:authors ("Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com")) (:maintainers ("Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com")) (:maintainer "Anatoly Fayngelerin" . "fanatoly+magitrbr@gmail.com") (:keywords "git" "magit" "rbr" "tools") (:url . "https://github.com/fanatoly/magit-rbr"))])
  (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 ((:commit . "aceedff88921f1dfef8a6b2fb18fe316fb7223a8") (:authors ("Jules Tamagnan" . "jtamagnan@gmail.com")) (:maintainers ("Jules Tamagnan" . "jtamagnan@gmail.com")) (:maintainer "Jules Tamagnan" . "jtamagnan@gmail.com") (:keywords "magit" "vc") (:url . "http://github.com/jtamagnan/magit-reviewboard"))])
- (magit-section . [(20240426 1325) ((emacs (25 1)) (compat (29 1 4 4)) (dash (20221013))) "Sections for read-only buffers." tar ((:commit . "fef45b274ecb4dc0448bd34dac26f7eaff621e59") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "tools") (:url . "https://github.com/magit/magit"))])
+ (magit-section . [(20240508 2349) ((emacs (26 1)) (compat (29 1 4 5)) (dash (20240405))) "Sections for read-only buffers." tar ((:commit . "855d924969eb6231d62ab446f727c9f7ad5c4913") (:authors ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev") (:keywords "tools") (:url . "https://github.com/magit/magit"))])
  (magit-stats . [(20230223 1819) ((emacs (25 1))) "Generates GIT Repo Statistics Report" tar ((:commit . "41b18e5fc664dba93981a7931f476632c5b54a7d") (:authors ("Rahul M. Juliato")) (:maintainers ("Rahul M. Juliato")) (:maintainer "Rahul M. Juliato") (:keywords "vc" "convenience") (:url . "https://github.com/LionyxML/magit-stats"))])
  (magit-stgit . [(20231226 1514) ((emacs (24 4)) (magit (2 12 0)) (magit-popup (2 12 0))) "StGit extension for Magit" tar ((:commit . "59d1eb355caf4adbbdf1e351f5861de61b0b5efa") (:authors ("Lluís Vilanova" . "vilanova@ac.upc.edu")) (:maintainers ("Peter Grayson" . "pete@jpgrayson.net")) (:maintainer "Peter Grayson" . "pete@jpgrayson.net") (:keywords "git" "tools" "vc") (:url . "https://github.com/stacked-git/magit-stgit"))])
  (magit-svn . [(20220314 1451) ((emacs (25 1)) (magit (2 90 1)) (transient (0 3 2))) "Git-Svn extension for Magit" tar ((:commit . "b8277081db90977247ae3900ea6afeb0ca644d36") (:authors ("Phil Jackson" . "phil@shellarchive.co.uk")) (:maintainers ("Phil Jackson" . "phil@shellarchive.co.uk")) (:maintainer "Phil Jackson" . "phil@shellarchive.co.uk") (:keywords "vc" "tools"))])
  (magit-tbdiff . [(20220527 2213) ((emacs (25 1)) (magit (3 0 0))) "Magit extension for range diffs" tar ((:commit . "55e6443710def357f3f78eea27d5bbe023d868f5") (:authors ("Kyle Meyer" . "kyle@kyleam.com")) (:maintainers ("Kyle Meyer" . "kyle@kyleam.com")) (:maintainer "Kyle Meyer" . "kyle@kyleam.com") (:keywords "vc" "tools") (:url . "https://github.com/magit/magit-tbdiff"))])
- (magit-todos . [(20240421 1131) ((emacs (26 1)) (async (1 9 2)) (dash (2 13 0)) (f (0 17 2)) (hl-todo (1 9 0)) (magit (2 13 0)) (pcre2el (1 8)) (s (1 12 0)) (transient (0 2 0))) "Show source file TODOs in Magit" tar ((:commit . "f73921e484dbae056e84080c743dffd241cb6bf3") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net") (:keywords "magit" "vc") (:url . "http://github.com/alphapapa/magit-todos"))])
+ (magit-todos . [(20240519 247) ((emacs (26 1)) (async (1 9 2)) (dash (2 13 0)) (f (0 17 2)) (hl-todo (1 9 0)) (magit (2 13 0)) (pcre2el (1 8)) (s (1 12 0)) (transient (0 2 0))) "Show source file TODOs in Magit" tar ((:commit . "501c8db90ab59f8b619618b9d10db2a32a113727") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net") (:keywords "magit" "vc") (:url . "http://github.com/alphapapa/magit-todos"))])
  (magit-topgit . [(20161105 1623) ((emacs (24 4)) (magit (2 1 0))) "TopGit extension for Magit" tar ((:commit . "11489ea798bc88d0ea5244bbf725285eedfefbef") (:authors ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainers ("Robin Green" . "greenrd@greenrd.org")) (:maintainer "Robin Green" . "greenrd@greenrd.org") (:keywords "vc" "tools"))])
  (magit-vcsh . [(20230402 1219) ((magit (2 90 1)) (vcsh (0 4)) (emacs (24 4))) "Magit vcsh integration" tar ((:commit . "fd6c86c066b14bbf78644d38eca9711d6d9544a1") (:authors ("Štěpán Němec" . "stepnem@smrk.net")) (:maintainers ("Štěpán Němec" . "stepnem@smrk.net")) (:maintainer "Štěpán Němec" . "stepnem@smrk.net") (:keywords "vc" "files" "magit") (:url . "http://git.smrk.net/magit-vcsh.el"))])
  (magithub . [(20220315 117) ((emacs (25)) (magit (2 12)) (s (1 12 0)) (ghub+ (0 3)) (git-commit (2 12)) (markdown-mode (2 3))) "Magit interfaces for GitHub" tar ((:commit . "dd62c7057155c0a334e6d9087779a2923d2300b8") (:authors ("Sean Allred" . "code@seanallred.com")) (:maintainers ("Sean Allred" . "code@seanallred.com")) (:maintainer "Sean Allred" . "code@seanallred.com") (:keywords "git" "tools" "vc") (:url . "https://github.com/vermiculus/magithub"))])
@@ -3226,7 +3233,7 @@
  (mark-tools . [(20130614 1025) nil "Some simple tools to access the mark-ring in Emacs" tar ((:commit . "a11b61effa90bd0abc876d12573674d36fc17f0c") (:authors ("Alex Bennée" . "alex@bennee.com")) (:maintainers ("Alex Bennée" . "alex@bennee.com")) (:maintainer "Alex Bennée" . "alex@bennee.com") (:url . "https://github.com/stsquad/emacs-mark-tools"))])
  (mark-yank . [(20231105 2027) ((emacs (24 4))) "Set region to the last yank" tar ((:commit . "7207aabe9edd0872ec6d506a58b942b43926c122") (:authors ("Michael Kleehammer" . "michael@kleehammer.com")) (:maintainers ("Michael Kleehammer" . "michael@kleehammer.com")) (:maintainer "Michael Kleehammer" . "michael@kleehammer.com") (:url . "https://github.com/mkleehammer/mark-yank"))])
  (markdown-changelog . [(20230805 1720) ((emacs (26)) (dash (2 13 0))) "Maintain changelog entries" tar ((:commit . "403d2cd1cff932ae135692d57062824892e01d13") (:authors ("Paul Landes")) (:maintainers ("Paul Landes")) (:maintainer "Paul Landes") (:keywords "markdown" "changelog" "files") (:url . "https://github.com/plandes/markdown-changelog"))])
- (markdown-mode . [(20240318 1307) ((emacs (27 1))) "Major mode for Markdown-formatted text" tar ((:commit . "fd6c5508f979ab526e024a591eaec963712cb211") (:authors ("Jason R. Blevins" . "jblevins@xbeta.org")) (:maintainers ("Jason R. Blevins" . "jblevins@xbeta.org")) (:maintainer "Jason R. Blevins" . "jblevins@xbeta.org") (:keywords "markdown" "github flavored markdown" "itex") (:url . "https://jblevins.org/projects/markdown-mode/"))])
+ (markdown-mode . [(20240501 1057) ((emacs (27 1))) "Major mode for Markdown-formatted text" tar ((:commit . "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89") (:authors ("Jason R. Blevins" . "jblevins@xbeta.org")) (:maintainers ("Jason R. Blevins" . "jblevins@xbeta.org")) (:maintainer "Jason R. Blevins" . "jblevins@xbeta.org") (:keywords "markdown" "github flavored markdown" "itex") (:url . "https://jblevins.org/projects/markdown-mode/"))])
  (markdown-preview-eww . [(20160111 1502) ((emacs (24 4))) "Realtime preview by eww" tar ((:commit . "5853f836425c877c8a956501f0adda137ef1d3b7") (:authors ("niku" . "niku@niku.name")) (:maintainers ("niku" . "niku@niku.name")) (:maintainer "niku" . "niku@niku.name") (:url . "https://github.com/niku/markdown-preview-eww"))])
  (markdown-preview-mode . [(20230707 803) ((emacs (24 4)) (websocket (1 6)) (markdown-mode (2 0)) (cl-lib (0 5)) (web-server (0 1 1))) "markdown realtime preview minor mode." tar ((:commit . "68242b3907dc065aa35412bfd928b43d8052d321") (:authors ("Igor Shymko" . "igor.shimko@gmail.com")) (:maintainers ("Igor Shymko" . "igor.shimko@gmail.com")) (:maintainer "Igor Shymko" . "igor.shimko@gmail.com") (:keywords "markdown" "gfm" "convenience") (:url . "https://github.com/ancane/markdown-preview-mode"))])
  (markdown-soma . [(20240215 228) ((emacs (25)) (s (1 11 0)) (dash (2 19 1)) (f (0 20 0))) "Live preview for Markdown" tar ((:commit . "ba30e609108d32fe6e1998490548b4631e3e48c3") (:authors ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainers ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainer "Jason Milkins" . "jasonm23@gmail.com") (:keywords "wp" "docs" "text" "markdown") (:url . "https://github.com/jasonm23/markdown-soma"))])
@@ -3241,13 +3248,13 @@
  (marshal . [(20201223 1853) ((emacs (25 1)) (ht (2 0))) "eieio extension for automatic (un)marshalling" tar ((:commit . "490496d974d03906f784707ecc2e0ac36ed84b96") (:authors ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainers ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainer "Yann Hodique" . "yann.hodique@gmail.com") (:keywords "extensions") (:url . "https://github.com/sigma/marshal.el"))])
  (maruo-macro-mode . [(20160616 1349) ((emacs (24 3))) "Major mode for editing Hidemaru/Maruo macro script" tar ((:commit . "8fc9a38ad051eafa8eb94038711acc52c5d1d8d5") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "programming" "editor" "macro"))])
  (masm-mode . [(20200308 1450) ((emacs (25 1))) "MASM x86 and x64 assembly major mode" tar ((:commit . "ab63524d195332ec9f703783704231606e69c292") (:authors ("YiGeeker" . "zyfchinese@yeah.net")) (:maintainers ("YiGeeker" . "zyfchinese@yeah.net")) (:maintainer "YiGeeker" . "zyfchinese@yeah.net") (:keywords "languages") (:url . "https://github.com/YiGeeker/masm-mode"))])
- (mastodon . [(20240327 1353) ((emacs (27 1)) (request (0 3 0)) (persist (0 4))) "Client for fediverse services using the Mastodon API" tar ((:commit . "d54aa9aa3e4276b9519ff9123e9dc0c123d9dd3b") (:authors ("Johnson Denen" . "johnson.denen@gmail.com") ("Marty Hiatt" . "martianhiatus@riseup.net")) (:maintainers ("Marty Hiatt" . "martianhiatus@riseup.net")) (:maintainer "Marty Hiatt" . "martianhiatus@riseup.net") (:url . "https://codeberg.org/martianh/mastodon.el"))])
+ (mastodon . [(20240521 1721) ((emacs (27 1)) (request (0 3 0)) (persist (0 4))) "Client for fediverse services using the Mastodon API" tar ((:commit . "49def07b3d9b6f0718ef9402a3808ca01557245e") (:authors ("Johnson Denen" . "johnson.denen@gmail.com") ("Marty Hiatt" . "martianhiatus@riseup.net")) (:maintainers ("Marty Hiatt" . "martianhiatus@riseup.net")) (:maintainer "Marty Hiatt" . "martianhiatus@riseup.net") (:url . "https://codeberg.org/martianh/mastodon.el"))])
  (material-theme . [(20210904 1226) ((emacs (24 1))) "A Theme based on the colors of the Google Material Design" tar ((:commit . "6823009bc92f82aa3a90e27e1009f7da8e87b648") (:authors ("Christoph Paulik" . "cpaulik@gmail.com")) (:maintainers ("Christoph Paulik" . "cpaulik@gmail.com")) (:maintainer "Christoph Paulik" . "cpaulik@gmail.com") (:keywords "themes") (:url . "http://github.com/cpaulik/emacs-material-theme"))])
- (math-preview . [(20230425 1820) ((emacs (26 1)) (json (1 4)) (dash (2 18 0)) (s (1 12 0))) "Preview TeX math equations inline" tar ((:commit . "620de35fc8cf940eba5a567767eac2288708d8cb") (:authors ("Matsievskiy S.V.")) (:maintainers ("Matsievskiy S.V.")) (:maintainer "Matsievskiy S.V.") (:keywords "convenience") (:url . "https://gitlab.com/matsievskiysv/math-preview"))])
+ (math-preview . [(20240519 740) ((emacs (26 1)) (json (1 4)) (dash (2 18 0)) (s (1 12 0))) "Preview TeX math equations inline" tar ((:commit . "7c12235c7f8bb1af0e712a8bfa77f1f2635d964a") (:authors ("Matsievskiy S.V.")) (:maintainers ("Matsievskiy S.V.")) (:maintainer "Matsievskiy S.V.") (:keywords "convenience") (:url . "https://gitlab.com/matsievskiysv/math-preview"))])
  (math-symbol-lists . [(20220828 2047) nil "Lists of Unicode math symbols and latex commands" tar ((:commit . "ac3eb053d3b576fcdd192b0ac6ad5090ea3a7079") (:authors ("Vitalie Spinu" . "spinuvit@gmail.com")) (:maintainers ("Vitalie Spinu" . "spinuvit@gmail.com")) (:maintainer "Vitalie Spinu" . "spinuvit@gmail.com") (:keywords "unicode" "symbols" "mathematics") (:url . "https://github.com/vspinu/math-symbol-lists"))])
  (math-symbols . [(20201005 2313) nil "Math Symbol Input methods and conversion tools" tar ((:commit . "091b81cb40ceaff97614999ffe85b572ace182f0") (:authors ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainers ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainer "KAWABATA, Taichi <kawabata.taichi_at_gmail.com>") (:keywords "i18n" "languages" "tex") (:url . "https://github.com/kawabata/math-symbols"))])
  (math-tex-convert . [(20221210 1937) ((emacs (26 1)) (math-symbol-lists (1 3)) (auctex (12 1))) "Convert LaTeX macros to unicode and back" tar ((:commit . "8b174d05e8e5269322a1ee90f94cf1ed018d4976") (:authors ("Enrico Flor" . "enrico@eflor.net")) (:maintainers ("Enrico Flor" . "enrico@eflor.net")) (:maintainer "Enrico Flor" . "enrico@eflor.net") (:url . "https://github.com/enricoflor/math-tex-convert"))])
- (matlab-mode . [(20240418 1949) nil "Major mode for MATLAB(R) dot-m files" tar ((:commit . "005954382db3df9c41585701467cedffe48b2ff4"))])
+ (matlab-mode . [(20240521 1748) nil "Major mode for MATLAB(R) dot-m files" tar ((:commit . "a78b368387c85437f8de187acf0a2b1cbeeacc3f"))])
  (maude-mode . [(20230504 937) ((emacs (25))) "Emacs mode for the programming language Maude" tar ((:commit . "2e1f68a890493d964f933d6e40b0ede047f70ede") (:authors ("Ellef Gjelstad <ellefg+maude*ifi.uio.no>")) (:maintainers ("Rudi Schlatte" . "rudi@constantly.at")) (:maintainer "Rudi Schlatte" . "rudi@constantly.at") (:keywords "languages" "maude") (:url . "https://github.com/rudi/abs-mode"))])
  (maven-test-mode . [(20141220 557) ((s (1 9)) (emacs (24))) "Utilities for navigating test files and running maven test tasks." tar ((:commit . "a19151861df2ad8ae4880a2e7c86ddf848cb569a") (:authors ("Renan Ranelli")) (:maintainers ("Renan Ranelli")) (:maintainer "Renan Ranelli") (:keywords "java" "maven" "test") (:url . "http://github.com/rranelli/maven-test-mode"))])
  (maxframe . [(20170120 1705) nil "maximize the emacs frame based on display size" tar ((:commit . "13bda6dd9f1d96aa4b9dd9957a26cefd399a7772") (:authors ("Ryan McGeary")) (:maintainers ("Ryan McGeary")) (:maintainer "Ryan McGeary") (:keywords "display" "frame" "window" "maximize"))])
@@ -3269,7 +3276,7 @@
  (melancholy-theme . [(20240417 136) ((emacs (27 1))) "A dark theme that's pretty sad  -*- lexical-binding: t; -" tar ((:commit . "7ba2bb3f062e798236bfb589381691c5bd9a22be") (:authors ("@baaash" . "bleat@baaa.sh")) (:maintainers ("@baaash" . "bleat@baaa.sh")) (:maintainer "@baaash" . "bleat@baaa.sh") (:keywords "faces" "frames") (:url . "https://gitlab.com/baaash/melancholy-theme"))])
  (mellow-theme . [(20170808 1317) ((emacs (24 0))) "an Emacs 24 theme based on Mellow (tmTheme)" tar ((:commit . "2bdf18f05f5212b6f269d9a94afe2cf201766891") (:authors ("Jason Milkins")) (:maintainers ("Jason Milkins")) (:maintainer "Jason Milkins") (:url . "https://github.com/emacsfodder/tmtheme-to-deftheme"))])
  (melpa-upstream-visit . [(20130720 1033) ((s (1 6 0))) "A set of kludges to visit a melpa-hosted package's homepage" tar ((:commit . "7310c74fdead3c0f86ad6eff76cf989e63f70f66") (:authors ("Alessandro Piras" . "laynor@gmail.com")) (:maintainers ("Alessandro Piras" . "laynor@gmail.com")) (:maintainer "Alessandro Piras" . "laynor@gmail.com") (:keywords "convenience"))])
- (memento-mori . [(20240407 1417) ((emacs (24 4))) "Reminder of our mortality" tar ((:commit . "7cc2e89511c1c131789737b4c9daeee0147916f0") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainer "Ivan Andrus" . "darthandrus@gmail.com") (:keywords "help") (:url . "https://github.com/gvol/emacs-memento-mori"))])
+ (memento-mori . [(20240429 327) ((emacs (24 4))) "Reminder of our mortality" tar ((:commit . "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Ivan Andrus" . "darthandrus@gmail.com")) (:maintainer "Ivan Andrus" . "darthandrus@gmail.com") (:keywords "help") (:url . "https://github.com/gvol/emacs-memento-mori"))])
  (memoize . [(20200103 2036) nil "Memoization functions" tar ((:commit . "51b075935ca7070f62fae1d69fe0ff7d8fa56fdd") (:authors ("Christopher Wellons" . "mosquitopsu@gmail.com")) (:maintainers ("Christopher Wellons" . "mosquitopsu@gmail.com")) (:maintainer "Christopher Wellons" . "mosquitopsu@gmail.com") (:url . "https://github.com/skeeto/emacs-memoize"))])
  (memolist . [(20150804 1721) ((markdown-mode (22 0)) (ag (0 45))) "memolist.el is Emacs port of memolist.vim." tar ((:commit . "60c296e202a71e9dcf1c3936d47b5c4b95c5839f") (:authors ("mikanfactory <k952i4j14x17_at_gmail.com>")) (:maintainers ("mikanfactory")) (:maintainer "mikanfactory") (:keywords "markdown" "memo") (:url . "http://github.com/mikanfactory/emacs-memolist"))])
  (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 ((:commit . "f51dd4f3f87c54b7cc92189924b9d873a53f5a75") (:authors ("Stefan Kangas" . "stefankangas@gmail.com")) (:maintainers ("Stefan Kangas" . "stefankangas@gmail.com")) (:maintainer "Stefan Kangas" . "stefankangas@gmail.com") (:keywords "comm" "processes" "bittorrent") (:url . "https://github.com/skangas/mentor"))])
@@ -3296,7 +3303,7 @@
  (metaweblog . [(20230501 234) ((emacs (27 1))) "An XML-RPC MetaWeblog and WordPress API client" tar ((:commit . "814f8a7098508286195e3053bf24f6af928c7f0b") (:authors ("Puneeth Chaganti" . "punchagan+org2blog@gmail.com")) (:maintainers ("Grant Rettke" . "grant@wisdomandwonder.com")) (:maintainer "Grant Rettke" . "grant@wisdomandwonder.com") (:keywords "comm") (:url . "https://github.com/org2blog/org2blog"))])
  (metrics-tracker . [(20231006 1213) ((emacs (24 4)) (seq (2 3))) "Generate reports of personal metrics from diary entries" tar ((:commit . "3f32267635e7b73334cc661a01f3b4d31580eaf5") (:authors ("Ian Martins" . "ianxm@jhu.edu")) (:maintainers ("Ian Martins" . "ianxm@jhu.edu")) (:maintainer "Ian Martins" . "ianxm@jhu.edu") (:keywords "calendar") (:url . "https://github.com/ianxm/emacs-tracker"))])
  (metronome . [(20230515 1850) ((emacs (25 1))) "The missing metronome for GNU Emacs" tar ((:commit . "4811b54d800d1bb69fd501ffeab3adf86978362d") (:authors ("Jonathan Gregory <jgrg at autistici dot org>")) (:maintainers ("Jonathan Gregory <jgrg at autistici dot org>")) (:maintainer "Jonathan Gregory <jgrg at autistici dot org>") (:url . "https://git.sr.ht/~jagrg/metronome"))])
- (mew . [(20240427 946) nil "Messaging in the Emacs World" tar ((:commit . "82c531e328ca1073e4d4115ca844ba9f0859c4a1") (:authors ("Mew developing team")) (:maintainers ("Mew developing team")) (:maintainer "Mew developing team"))])
+ (mew . [(20240515 152) nil "Messaging in the Emacs World" tar ((:commit . "6eedf619d726aa11f23962e406331b7aba8ac82c") (:authors ("Mew developing team")) (:maintainers ("Mew developing team")) (:maintainer "Mew developing team"))])
  (mexican-holidays . [(20210604 1421) nil "Mexico holidays for Emacs calendar." tar ((:commit . "8e28907ea69f2c0ed9aad9f3b99664ca147379d0") (:authors ("Saúl Gutiérrez" . "me@sggc.me")) (:maintainers ("Saúl Gutiérrez" . "me@sggc.me")) (:maintainer "Saúl Gutiérrez" . "me@sggc.me") (:keywords "calendar") (:url . "https://github.com/sggutier/mexican-holidays"))])
  (meyvn . [(20231213 230) ((emacs (25 1)) (cider (0 23)) (projectile (2 1)) (s (1 12)) (dash (2 17)) (parseedn (1 1 0)) (parseclj (1 1 0)) (geiser (0 12))) "Meyvn client" tar ((:commit . "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a") (:authors ("Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com")) (:maintainers ("Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com")) (:maintainer "Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com") (:url . "https://github.com/danielsz/meyvn-el"))])
  (mgmtconfig-mode . [(20240330 2205) ((emacs (24 3))) "mgmt configuration management language" tar ((:commit . "1b00af6926d8699d9d04062f28fddd43c6340bac") (:authors ("Peter Oliver" . "mgmtconfig@mavit.org.uk")) (:maintainers ("Mgmt contributors <https://github.com/purpleidea/mgmt>")) (:maintainer "Mgmt contributors <https://github.com/purpleidea/mgmt>") (:keywords "languages") (:url . "https://github.com/purpleidea/mgmt/misc/emacs"))])
@@ -3309,9 +3316,10 @@
  (milkode . [(20140927 529) nil "Command line search and direct jump with Milkode" tar ((:commit . "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513") (:authors ("ongaeshi")) (:maintainers ("ongaeshi")) (:maintainer "ongaeshi") (:keywords "milkode" "search" "grep" "jump" "keyword"))])
  (mimetypes . [(20201115 1605) ((emacs (25 1))) "Guess a file's mimetype by extension" tar ((:commit . "1663054ce266ed25e47ec707c19f619d33225903") (:authors ("Craig Niles <niles.c at gmail.com>")) (:maintainers ("Craig Niles <niles.c at gmail.com>")) (:maintainer "Craig Niles <niles.c at gmail.com>") (:url . "https://github.com/cniles/emacs-mimetypes"))])
  (mindre-theme . [(20220827 1031) ((emacs (26 1))) "Minimal, light theme" tar ((:commit . "fc9ab1ba03494f2fb8cb8dc4e2ba5120ae35eb31") (:authors ("Erik Bäckman" . "contact@ebackman.net")) (:maintainers ("Erik Bäckman" . "contact@ebackman.net")) (:maintainer "Erik Bäckman" . "contact@ebackman.net") (:keywords "faces") (:url . "https://github.com/erikbackman/mindre-theme"))])
+ (mindstream . [(20240519 1715) ((emacs (25 1)) (magit (3 3 0))) "Start writing, stay focused, don't worry" tar ((:commit . "ae8b10b077d71de5e8ad966e03527e8d55b3e18d") (:authors ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainers ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainer "Siddhartha Kasivajhula" . "sid@countvajhula.com") (:keywords "convenience" "files" "languages" "outlines" "tools" "vc" "wp") (:url . "https://github.com/countvajhula/mindstream"))])
  (minesweeper . [(20200416 2342) nil "play minesweeper in Emacs" tar ((:commit . "d4248e3c9b3e9e7277cb9e6d081330611898f334") (:authors ("Zachary Kanfer" . "zkanfer@gmail.com")) (:maintainers ("Zachary Kanfer" . "zkanfer@gmail.com")) (:maintainer "Zachary Kanfer" . "zkanfer@gmail.com") (:keywords "game" "fun" "minesweeper" "inane" "diversion") (:url . "https://hg.sr.ht/~zck/minesweeper"))])
  (mingus . [(20230518 1726) ((libmpdee (2 2))) "MPD Interface" tar ((:commit . "3fa9b95552eb062eb245321abb7f442c458618dc") (:authors ("Niels Giesen <pft on #emacs>")) (:maintainers ("Niels Giesen <pft on #emacs>")) (:maintainer "Niels Giesen <pft on #emacs>") (:keywords "multimedia" "elisp" "music" "mpd") (:url . "https://github.com/pft/mingus"))])
- (mini-echo . [(20240418 1047) ((emacs (29 1)) (hide-mode-line (1 0 3))) "Echo buffer status in minibuffer window" tar ((:commit . "adeb402f5e508424960b6165d596b25fd6a6d756") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "frames") (:url . "https://github.com/liuyinz/mini-echo.el"))])
+ (mini-echo . [(20240518 849) ((emacs (29 1)) (dash (2 19 1)) (hide-mode-line (1 0 3))) "Echo buffer status in minibuffer window" tar ((:commit . "4e2918225bea7fa7d232260bd0b2de48df68c6f8") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "frames") (:url . "https://github.com/liuyinz/mini-echo.el"))])
  (mini-frame . [(20220627 2041) ((emacs (26 1))) "Show minibuffer in child frame on read-from-minibuffer" tar ((:commit . "60838f3cab438dcbda8eaa15ab3e5d1af88910e9") (:authors ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainers ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainer "Andrii Kolomoiets" . "andreyk.mad@gmail.com") (:keywords "frames") (:url . "https://github.com/muffinmad/emacs-mini-frame"))])
  (mini-header-line . [(20170621 1221) ((emacs (24 4))) "a minimal header-line" tar ((:commit . "73b6724e0a26c4528d93768191c8aa59e6bce2e5") (:authors ("Johannes Goslar")) (:maintainers ("Johannes Goslar")) (:maintainer "Johannes Goslar") (:keywords "header-line" "mode-line") (:url . "https://github.com/ksjogo/mini-header-line"))])
  (mini-modeline . [(20230306 1521) ((emacs (25 1)) (dash (2 12 0))) "Display modeline in minibuffer" tar ((:commit . "86e753b6c38a06b0fc80d7560aa6a25245fd4d38") (:authors ("Kien Nguyen" . "kien.n.quang@gmail.com")) (:maintainers ("Kien Nguyen" . "kien.n.quang@gmail.com")) (:maintainer "Kien Nguyen" . "kien.n.quang@gmail.com") (:keywords "convenience" "tools") (:url . "https://github.com/kiennq/emacs-mini-modeline"))])
@@ -3330,7 +3338,8 @@
  (mint-mode . [(20221031 411) ((emacs (25 1))) "Major mode for the Mint programming language" tar ((:commit . "7bb0f9946f5833eada199e880fdc4efa6df09e0b") (:authors ("Diwank Tomer" . "singh@diwank.name")) (:maintainers ("jgart" . "jgart@dismail.de")) (:maintainer "jgart" . "jgart@dismail.de") (:keywords "mint" "languages" "processes" "convenience" "tools" "files") (:url . "https://github.com/creatorrr/emacs-mint-mode"))])
  (mip-mode . [(20151127 617) nil "virtual projects for emacs." tar ((:commit . "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c") (:authors ("Eeli Reilin" . "gaudecker@fea.st")) (:maintainers ("Eeli Reilin" . "gaudecker@fea.st")) (:maintainer "Eeli Reilin" . "gaudecker@fea.st") (:keywords "workspaces" "workspace" "project" "projects" "mip-mode"))])
  (mips-mode . [(20220608 1204) ((emacs (25 1))) "Major-mode for MIPS assembly" tar ((:commit . "98795cdc81979821ac35d9f94ce354cd99780c67") (:authors ("Henrik Lissner <http://github/hlissner>")) (:maintainers ("Henrik Lissner" . "contact@henrik.io")) (:maintainer "Henrik Lissner" . "contact@henrik.io") (:keywords "languages" "mips" "assembly") (:url . "https://github.com/hlissner/emacs-mips-mode"))])
- (mistty . [(20231122 2029) ((emacs (29 1))) "Shell/Comint alternative based on term.el" tar ((:commit . "d51d6d995db42377d225169ec8ad200cbbfca401") (:authors ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainers ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainer "Stephane Zermatten" . "szermatt@gmx.net") (:keywords "convenience" "unix") (:url . "http://github.com/szermatt/mistty"))])
+ (mise . [(20240514 452) ((emacs (29 1)) (inheritenv (0 2)) (dash (2 19 1))) "Support for `mise' cli" tar ((:commit . "cb19405eba3cfd679a5e3ac75c8c4c1146b16015") (:authors ("liuyinz" . "liuyinz95@gmail.com")) (:maintainers ("liuyinz" . "liuyinz95@gmail.com")) (:maintainer "liuyinz" . "liuyinz95@gmail.com") (:keywords "tools" "processes") (:url . "https://github.com/liuyinz/mise.el"))])
+ (mistty . [(20240429 1645) ((emacs (29 1))) "Shell/Comint alternative based on term.el" tar ((:commit . "bf68d5b52d9dfae68c83340cabea2681057e82ea") (:authors ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainers ("Stephane Zermatten" . "szermatt@gmx.net")) (:maintainer "Stephane Zermatten" . "szermatt@gmx.net") (:keywords "convenience" "unix") (:url . "http://github.com/szermatt/mistty"))])
  (mix . [(20240122 720) ((emacs (25 1))) "Mix Major Mode. Build Elixir using Mix" tar ((:commit . "16cc69cbf919769c191b1c49c1cab324fd0682a9") (:authors ("Ayrat Badykov" . "ayratin555@gmail.com")) (:maintainers ("Ayrat Badykov" . "ayratin555@gmail.com")) (:maintainer "Ayrat Badykov" . "ayratin555@gmail.com") (:keywords "tools") (:url . "https://github.com/ayrat555/mix.el"))])
  (mixed-pitch . [(20210304 1900) ((emacs (24 3))) "Use a variable pitch, keeping fixed pitch where it's sensible" tar ((:commit . "519e05f74825abf04b7d2e0e38ec040d013a125a") (:authors ("J. Alexander Branham" . "branham@utexas.edu")) (:maintainers ("J. Alexander Branham" . "branham@utexas.edu")) (:maintainer "J. Alexander Branham" . "branham@utexas.edu") (:url . "https://gitlab.com/jabranham/mixed-pitch"))])
  (mkdown . [(20140517 1418) ((markdown-mode (2 0))) "Pretty Markdown previews based on mkdown.com" tar ((:commit . "8e23de82719af6c5b53b52b3308a02b3a1fb872e") (:authors ("Andrew Tulloch")) (:maintainers ("Andrew Tulloch")) (:maintainer "Andrew Tulloch") (:keywords "markdown") (:url . "https://github.com/ajtulloch/mkdown.el"))])
@@ -3344,7 +3353,7 @@
  (mocha . [(20200729 1130) ((js2-mode (20150909)) (f (0 18))) "Run Mocha or Jasmine tests" tar ((:commit . "6a72fa20e7be6e55c09b1bc9887ee09c5df28e45") (:authors ("Al Scott")) (:maintainers ("Al Scott")) (:maintainer "Al Scott") (:keywords "javascript" "mocha" "jasmine") (:url . "http://github.com/scottaj/mocha.el"))])
  (mocha-snippets . [(20190417 1931) ((yasnippet (0 8 0))) "Yasnippets for the Mocha JS Testing Framework" tar ((:commit . "361a3809f755577406e109b9e44d473dfa7c08e0") (:authors ("Charles Lowell" . "cowboyd@frontside.io")) (:maintainers ("Charles Lowell" . "cowboyd@frontside.io")) (:maintainer "Charles Lowell" . "cowboyd@frontside.io") (:keywords "test" "javascript"))])
  (mocker . [(20220727 1452) ((emacs (25 1))) "mocking framework for emacs" tar ((:commit . "4bd8d56eb4c3a1fcbbcdbf616f1b43e076b13eee") (:authors ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainers ("Yann Hodique" . "yann.hodique@gmail.com")) (:maintainer "Yann Hodique" . "yann.hodique@gmail.com") (:keywords "lisp" "testing"))])
- (modaled . [(20240330 1956) ((emacs (25 1))) "Build your own minor modes for modal editing" tar ((:commit . "01ef8befac15f77f1b9129bade37e78b6bf7d612") (:authors ("DCsunset")) (:maintainers ("DCsunset")) (:maintainer "DCsunset") (:keywords "convenience" "modal-editing") (:url . "https://github.com/DCsunset/modaled"))])
+ (modaled . [(20240511 1540) ((emacs (25 1))) "Build your own minor modes for modal editing" tar ((:commit . "c7259e3e91fc8de4f17b2de9c83a12e855ae7932") (:authors ("DCsunset")) (:maintainers ("DCsunset")) (:maintainer "DCsunset") (:keywords "convenience" "modal-editing") (:url . "https://github.com/DCsunset/modaled"))])
  (modalka . [(20230606 1357) ((emacs (24 4))) "Modal editing your way" tar ((:commit . "6deb661e84cb34746a62ce84842f52c22138beda") (:authors ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainers ("Mark Karpov" . "markkarpov92@gmail.com")) (:maintainer "Mark Karpov" . "markkarpov92@gmail.com") (:keywords "convenience") (:url . "https://github.com/mrkkrp/modalka"))])
  (mode-icons . [(20230911 20) ((emacs (24)) (cl-lib (0 5))) "Show icons for modes" tar ((:commit . "931250e8f9f1106e7ace6247989867c5e17fc9cc") (:authors ("Tom Willemse" . "tom@ryuslash.org")) (:maintainers ("Tom Willemse" . "tom@ryuslash.org")) (:maintainer "Tom Willemse" . "tom@ryuslash.org") (:keywords "multimedia") (:url . "http://ryuslash.org/projects/mode-icons.html"))])
  (mode-line-bell . [(20181029 516) nil "Flash the mode line instead of ringing the bell" tar ((:commit . "4985ba42f5a19f46ddbf9b3622453a9694995ce5") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "convenience"))])
@@ -3356,8 +3365,8 @@
  (modern-sh . [(20211101 1001) ((emacs (25 1)) (hydra (0 15 0)) (eval-in-repl (0 9 7))) "Minor mode for editing shell script" tar ((:commit . "8ebebe77304aa8170f7af809e7564c79d3bd45da") (:keywords "languages" "programming") (:url . "https://github.com/damon-kwok/modern-sh"))])
  (modtime-skip-mode . [(20140128 2201) nil "Minor mode for disabling modtime and supersession checks on files." tar ((:commit . "c0e49523aa26b2263a8693691ac775988015f592") (:authors ("Jordon Biondo" . "biondoj@mail.gvsu.edu")) (:maintainers ("Jordon Biondo" . "biondoj@mail.gvsu.edu")) (:maintainer "Jordon Biondo" . "biondoj@mail.gvsu.edu") (:url . "http://www.github.com/jordonbiondo/modtime-skip-mode"))])
  (modular-config . [(20210726 1614) ((emacs (25 1))) "Organize your config into small and loadable modules" tar ((:commit . "043907d96efff70dfaea1e721de90bd35970e8bd") (:authors ("Sidharth Arya" . "sidhartharya10@gmail.com")) (:maintainers ("Sidharth Arya" . "sidhartharya10@gmail.com")) (:maintainer "Sidharth Arya" . "sidhartharya10@gmail.com") (:keywords "startup" "lisp" "tools") (:url . "https://github.com/SidharthArya/modular-config.el"))])
- (modus-themes . [(20240427 843) ((emacs (27 1))) "Elegant, highly legible and customizable themes" tar ((:commit . "56bd9c8f32b4179e4207f553f8656934c0076a85") (:authors ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainers ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com") (:keywords "faces" "theme" "accessibility") (:url . "https://github.com/protesilaos/modus-themes"))])
- (moe-theme . [(20240417 1111) nil "A colorful eye-candy theme. Moe, moe, kyun!" tar ((:commit . "0fb1274cb29863597e627757230feedf7d90482c") (:authors ("kuanyui" . "azazabc123@gmail.com")) (:maintainers ("kuanyui" . "azazabc123@gmail.com")) (:maintainer "kuanyui" . "azazabc123@gmail.com") (:keywords "themes") (:url . "https://github.com/kuanyui/moe-theme.el"))])
+ (modus-themes . [(20240505 331) ((emacs (27 1))) "Elegant, highly legible and customizable themes" tar ((:commit . "d2762db19ed48bd0cbba61c41940be479760a35e") (:authors ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainers ("Protesilaos Stavrou" . "info@protesilaos.com")) (:maintainer "Protesilaos Stavrou" . "info@protesilaos.com") (:keywords "faces" "theme" "accessibility") (:url . "https://github.com/protesilaos/modus-themes"))])
+ (moe-theme . [(20240430 1601) nil "A colorful eye-candy theme. Moe, moe, kyun!" tar ((:commit . "6df0d99a1a2006b218282f15d84609b88478ca7a") (:authors ("kuanyui" . "azazabc123@gmail.com")) (:maintainers ("kuanyui" . "azazabc123@gmail.com")) (:maintainer "kuanyui" . "azazabc123@gmail.com") (:keywords "themes") (:url . "https://github.com/kuanyui/moe-theme.el"))])
  (molar-mass . [(20220922 1752) ((emacs (24 3))) "Calculates molar mass of a molecule" tar ((:commit . "c3b686c4b621b45fa4b17857b4934eb4487d74f5") (:authors ("Sergi Ruiz Trepat")) (:maintainers ("Sergi Ruiz Trepat")) (:maintainer "Sergi Ruiz Trepat") (:keywords "convenience" "chemistry") (:url . "https://github.com/sergiruiztrepat/molar-mass.el"))])
  (molecule . [(20180527 743) ((emacs (25 1))) "Simple wrapper for molecule" tar ((:commit . "2ef72b81d9aa24ea782b71a061a3abdad6cae162") (:authors (": drymer <drymer [ AT ] autistici.org>")) (:maintainers (": drymer <drymer [ AT ] autistici.org>")) (:maintainer ": drymer <drymer [ AT ] autistici.org>") (:keywords ":" "languages" "terminals") (:url . "https://git.daemons.it/drymer/molecule.el"))])
  (molokai-theme . [(20220106 1520) nil "molokai theme with Emacs theme engine" tar ((:commit . "cc53e997e7eff93b58ad16a376a292c1dd66044b") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/alloy-d/color-theme-molokai"))])
@@ -3374,7 +3383,7 @@
  (monroe . [(20220915 1647) nil "Yet another client for nREPL" tar ((:commit . "8f809e4aa0a35ec2d1c880aacf59e6bc317a566f") (:authors ("Sanel Zukan" . "sanelz@gmail.com")) (:maintainers ("Sanel Zukan" . "sanelz@gmail.com")) (:maintainer "Sanel Zukan" . "sanelz@gmail.com") (:keywords "languages" "clojure" "nrepl" "lisp") (:url . "http://www.github.com/sanel/monroe"))])
  (mood-line . [(20231210 1309) ((emacs (26 1))) "A minimal mode line inspired by doom-modeline" tar ((:commit . "d1c024fdf9543fbc0101cd2c6e8b248378f591cd") (:authors ("Jessie Hildebrandt <jessieh.net>")) (:maintainers ("Jessie Hildebrandt <jessieh.net>")) (:maintainer "Jessie Hildebrandt <jessieh.net>") (:keywords "mode-line" "faces") (:url . "https://gitlab.com/jessieh/mood-line"))])
  (mood-one-theme . [(20221222 1214) ((emacs (27 1))) "A dark color scheme inspired by the Doom One theme" tar ((:commit . "dfbc81900737d3382a340feeed24d2bcd9bdedb0") (:authors ("Jessie Hildebrandt <jessieh.net>")) (:maintainers ("Jessie Hildebrandt <jessieh.net>")) (:maintainer "Jessie Hildebrandt <jessieh.net>") (:keywords "mode-line" "faces") (:url . "https://gitlab.com/jessieh/mood-one-theme"))])
- (moody . [(20240415 1545) ((emacs (25 3)) (compat (29 1 4 1))) "Tabs and ribbons for the mode line" tar ((:commit . "28abaf874b87b6d6c09ef1ab63856de4ed743974") (:authors ("Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev") (:keywords "faces") (:url . "https://github.com/tarsius/moody"))])
+ (moody . [(20240520 1715) ((emacs (25 3)) (compat (29 1 4 1))) "Tabs and ribbons for the mode line" tar ((:commit . "1faf8c16073bb62ade53906eef549ed8ac79ae70") (:authors ("Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.moody@jonas.bernoulli.dev") (:keywords "faces") (:url . "https://github.com/tarsius/moody"))])
  (moom . [(20230722 2037) ((emacs (25 1))) "Commands to control frame position and size" tar ((:commit . "54750aa2e3e9476375a32ef94714e22ece6e4039") (:authors ("Takaaki ISHIKAWA <takaxp at ieee dot org>")) (:maintainers ("Takaaki ISHIKAWA <takaxp at ieee dot org>")) (:maintainer "Takaaki ISHIKAWA <takaxp at ieee dot org>") (:keywords "frames" "faces" "convenience") (:url . "https://github.com/takaxp/Moom"))])
  (moonscript . [(20170831 2226) ((cl-lib (0 5)) (emacs (24))) "Major mode for editing MoonScript code" tar ((:commit . "56f90471e2ced2b0a177aed4d8c2f854797e9cc7") (:authors ("@GriffinSchneider, @k2052, @EmacsFodder")) (:maintainers ("@GriffinSchneider, @k2052, @EmacsFodder")) (:maintainer "@GriffinSchneider, @k2052, @EmacsFodder"))])
  (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 ((:commit . "ec37a12825888047a90d9ee8131aa4bea348edf7") (:authors ("Jong-Hyouk Yun" . "ageldama@gmail.com")) (:maintainers ("Jong-Hyouk Yun" . "ageldama@gmail.com")) (:maintainer "Jong-Hyouk Yun" . "ageldama@gmail.com") (:keywords "convenience" "files" "processes" "tools" "unix") (:url . "https://github.com/ageldama/moonshot"))])
@@ -3415,12 +3424,12 @@
  (mu4e-conversation . [(20190609 812) ((emacs (25 1))) "Show a complete thread in a single buffer" tar ((:commit . "98110bb9c300fc9866dee8e0023355f9f79c9b96") (:authors ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainers ("Pierre Neidhardt" . "mail@ambrevar.xyz")) (:maintainer "Pierre Neidhardt" . "mail@ambrevar.xyz") (:keywords "mail" "convenience" "mu4e") (:url . "https://gitlab.com/Ambrevar/mu4e-conversation"))])
  (mu4e-jump-to-list . [(20221202 1023) ((emacs (24 4)) (cl-lib (0 5))) "mu4e jump-to-list extension" tar ((:commit . "cf19684d2333cb0cda7f6b62c7607144baa49310") (:authors ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainers ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainer "Yuri D'Elia" . "wavexx@thregr.org") (:keywords "mu4e" "mail" "convenience") (:url . "https://gitlab.com/wavexx/mu4e-jump-to-list.el"))])
  (mu4e-marker-icons . [(20230423 1039) ((emacs (26 1)) (nerd-icons (0 0 1))) "Display icons for mu4e markers" tar ((:commit . "09fe0ca72b5c000d45a875c7cfa58016f740c1ae") (:keywords "mail") (:url . "https://repo.or.cz/mu4e-marker-icons.git"))])
- (mu4e-overview . [(20240330 1441) ((emacs (26))) "Show overview of maildir" tar ((:commit . "758ea4b3945fa377ae33e45f8213280d38e0551d") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com") (:keywords "mail" "tools") (:url . "https://github.com/mkcms/mu4e-overview"))])
+ (mu4e-overview . [(20240521 1445) ((emacs (26))) "Show overview of maildir" tar ((:commit . "51327c894721680633292a43a4e610542b4eceb3") (:authors ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainers ("Michał Krzywkowski" . "k.michal@zoho.com")) (:maintainer "Michał Krzywkowski" . "k.michal@zoho.com") (:keywords "mail" "tools") (:url . "https://github.com/mkcms/mu4e-overview"))])
  (mu4e-query-fragments . [(20240415 1421) ((emacs (24 4))) "mu4e query fragments extension" tar ((:commit . "14b38e4a7b7aae47f3c1bdccb6680f8c38c645bf") (:authors ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainers ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainer "Yuri D'Elia" . "wavexx@thregr.org") (:keywords "mu4e" "mail" "convenience") (:url . "https://gitlab.com/wavexx/mu4e-query-fragments.el"))])
  (mu4e-views . [(20240401 1150) ((emacs (26 1)) (xwidgets-reuse (0 3)) (ht (2 2)) (esxml (20210323 1102))) "View emails in mu4e using xwidget-webkit" tar ((:commit . "e0f60e314d034e02fbc3696c3cb9e3598eed9070") (:authors ("Boris Glavic" . "lordpretzel@gmail.com")) (:maintainers ("Boris Glavic" . "lordpretzel@gmail.com")) (:maintainer "Boris Glavic" . "lordpretzel@gmail.com") (:keywords "mail") (:url . "https://github.com/lordpretzel/mu4e-views"))])
  (mu4easy . [(20230629 1721) ((emacs (25 1)) (mu4e-column-faces (1 2 1)) (mu4e-alert (1 0)) (helm-mu (1 0 0)) (org-msg (4 0))) "Packages + configs for using mu4e with multiple accounts" tar ((:commit . "bb9f5df374723932c848f8864c86d7b0ceacc82c") (:authors ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainers ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainer "Daniel Fleischer" . "danflscr@gmail.com") (:keywords "mail") (:url . "https://github.com/danielfleischer/mu4easy"))])
  (muban . [(20180415 1219) ((emacs (25))) "Lightweight template expansion tool" tar ((:commit . "c134c46e60be1fb3e9a08dba3d07346855e0fcc2") (:authors ("Jiahao Li" . "jiahaowork@gmail.com")) (:maintainers ("Jiahao Li" . "jiahaowork@gmail.com")) (:maintainer "Jiahao Li" . "jiahaowork@gmail.com") (:keywords "abbrev" "tools") (:url . "https://github.com/jiahaowork/muban.el"))])
- (mugur . [(20231024 755) ((emacs (26 1)) (s (1 12 0)) (anaphora (1 0 4)) (dash (2 18 1)) (cl-lib (1 0))) "Configurator for QMK compatible keyboards" tar ((:commit . "9d55e6eac893abfc0a2622d6ac2a791ce5b23fbb") (:authors ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainers ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainer "Mihai Olteanu" . "mihai_olteanu@fastmail.fm") (:keywords "multimedia") (:url . "https://github.com/mihaiolteanu/mugur"))])
+ (mugur . [(20240517 504) ((emacs (26 1)) (s (1 12 0)) (anaphora (1 0 4)) (dash (2 18 1)) (cl-lib (1 0))) "Configurator for QMK compatible keyboards" tar ((:commit . "7fe7f6a9dd80389fcd9754e9191192e697a88882") (:authors ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainers ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainer "Mihai Olteanu" . "mihai_olteanu@fastmail.fm") (:keywords "multimedia") (:url . "https://github.com/mihaiolteanu/mugur"))])
  (multi . [(20131013 1544) ((emacs (24))) "Clojure-style multi-methods for emacs lisp" tar ((:commit . "884203b11fdac8374ec644cca975469aab263404") (:authors ("Christina Whyte" . "kurisu.whyte@gmail.com")) (:maintainers ("Christina Whyte" . "kurisu.whyte@gmail.com")) (:maintainer "Christina Whyte" . "kurisu.whyte@gmail.com") (:keywords "multimethod" "generic" "predicate" "dispatch") (:url . "http://github.com/kurisuwhyte/emacs-multi"))])
  (multi-compile . [(20211113 2119) ((emacs (24 4)) (dash (2 12 1))) "Multi target interface to compile." tar ((:commit . "360e44b200d07da379c906856d37613d0f06a9ae") (:authors ("Kvashnin Vladimir" . "reangd@gmail.com")) (:maintainers ("Kvashnin Vladimir" . "reangd@gmail.com")) (:maintainer "Kvashnin Vladimir" . "reangd@gmail.com") (:keywords "tools" "compile" "build") (:url . "https://github.com/ReanGD/emacs-multi-compile"))])
  (multi-line . [(20230721 1814) ((emacs (24 3)) (s (1 9 0)) (cl-lib (0 5)) (dash (2 12 0)) (shut-up (0 3 2))) "multi-line statements" tar ((:commit . "06ea7294c4e4ace0c3253b7952a6d937a169eb55") (:authors ("Ivan Malison" . "IvanMalison@gmail.com")) (:maintainers ("Ivan Malison" . "IvanMalison@gmail.com")) (:maintainer "Ivan Malison" . "IvanMalison@gmail.com") (:keywords "multi" "line" "length" "whitespace" "programming" "tools" "convenience" "files") (:url . "https://github.com/IvanMalison/multi-line"))])
@@ -3489,7 +3498,7 @@
  (nemerle . [(20161029 2023) nil "major mode for editing nemerle programs" tar ((:commit . "8818c5af5598e16ea59189e1e3245f0a3d7c78f0") (:authors ("Jacek Sliwerski (rzyjontko)" . "rzyj@o2.pl")) (:maintainers ("Jacek Sliwerski (rzyjontko)" . "rzyj@o2.pl")) (:maintainer "Jacek Sliwerski (rzyjontko)" . "rzyj@o2.pl") (:keywords "nemerle" "mode" "languages"))])
  (neon-mode . [(20180406 1156) nil "Simple major mode for editing neon files" tar ((:commit . "99d15e46beaf1e7d71e39a00cce810df1f33229d") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:keywords "conf"))])
  (neotree . [(20230815 219) ((cl-lib (0 5))) "A tree plugin like NerdTree for Vim" tar ((:commit . "2b0cb8285352202c62b1e46a8aa265a5e4f9d966") (:authors ("jaypei" . "jaypei97159@gmail.com")) (:maintainers ("jaypei" . "jaypei97159@gmail.com")) (:maintainer "jaypei" . "jaypei97159@gmail.com") (:url . "https://github.com/jaypei/emacs-neotree"))])
- (nerd-icons . [(20240412 1831) ((emacs (24 3))) "Emacs Nerd Font Icons Library" tar ((:commit . "fb395120e9de33b276d16caaccaefd98d4340b92") (:authors ("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com") (:keywords "lisp") (:url . "https://github.com/rainstormstudio/nerd-icons.el"))])
+ (nerd-icons . [(20240520 1050) ((emacs (24 3))) "Emacs Nerd Font Icons Library" tar ((:commit . "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e") (:authors ("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")) (:maintainers ("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")) (:maintainer "Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com") (:keywords "lisp") (:url . "https://github.com/rainstormstudio/nerd-icons.el"))])
  (nerd-icons-completion . [(20230430 1611) ((emacs (25 1)) (nerd-icons (0 0 1))) "Add icons to completion candidates" tar ((:commit . "5cfee6ff1b9647c783bae944402d60440ce04cbb") (:authors ("Hongyu Ding" . "rainstormstudio@yahoo.com")) (:maintainers ("Hongyu Ding" . "rainstormstudio@yahoo.com")) (:maintainer "Hongyu Ding" . "rainstormstudio@yahoo.com") (:keywords "lisp") (:url . "https://github.com/rainstormstudio/nerd-icons-completion"))])
  (nerd-icons-corfu . [(20231019 1618) ((emacs (27 1)) (nerd-icons (0 1 0))) "Icons for Corfu via nerd-icons" tar ((:commit . "7077bb76fefc15aed967476406a19dc5c2500b3c") (:authors ("Luigi Sartor Piucco" . "luigipiucco@gmail.com")) (:maintainers ("Luigi Sartor Piucco" . "luigipiucco@gmail.com")) (:maintainer "Luigi Sartor Piucco" . "luigipiucco@gmail.com") (:keywords "convenience" "files" "icons") (:url . "https://github.com/LuigiPiucco/nerd-icons-corfu"))])
  (nerd-icons-dired . [(20231214 2155) ((emacs (24 4)) (nerd-icons (0 0 1))) "Shows icons for each file in dired mode" tar ((:commit . "c1c73488630cc1d19ce1677359f614122ae4c1b9") (:authors ("Hongyu Ding" . "rainstormstudio@yahoo.com")) (:maintainers ("Hongyu Ding" . "rainstormstudio@yahoo.com")) (:maintainer "Hongyu Ding" . "rainstormstudio@yahoo.com") (:keywords "lisp") (:url . "https://github.com/rainstormstudio/nerd-icons-dired"))])
@@ -3511,7 +3520,7 @@
  (ng2-mode . [(20201203 1925) ((typescript-mode (0 1))) "Major modes for editing Angular 2" tar ((:commit . "d341f177c6e4fb9d99b8639943ab5fc9184e2715") (:authors ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainers ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainer "Adam Niederer" . "adam.niederer@gmail.com") (:keywords "typescript" "angular" "angular2" "template") (:url . "http://github.com/AdamNiederer/ng2-mode"))])
  (nginx-mode . [(20240412 402) nil "major mode for editing nginx config files" tar ((:commit . "c4ac5de975d65c84893a130a470af32a48b0b66c") (:authors ("Andrew J Cosgriff" . "andrew@cosgriff.name")) (:maintainers ("Andrew J Cosgriff" . "andrew@cosgriff.name")) (:maintainer "Andrew J Cosgriff" . "andrew@cosgriff.name") (:keywords "languages" "nginx"))])
  (niceify-info . [(20160416 1244) nil "improve usability of Info pages" tar ((:commit . "66b45916f1994e16ee023d29fa7cf8fec48078f1"))])
- (nickel-mode . [(20230707 1228) ((emacs (24 3))) "A major mode for editing Nickel source code" tar ((:commit . "8b7828892341bbca789723d487546905ca443dc3") (:authors ("The Nickel Team" . "nickel-lang@tweag.io")) (:maintainers ("The Nickel Team" . "nickel-lang@tweag.io")) (:maintainer "The Nickel Team" . "nickel-lang@tweag.io") (:keywords "languages" "configuration-language" "configuration" "nickel" "infrastructure") (:url . "https://github.com/nickel-lang/nickel-mode"))])
+ (nickel-mode . [(20240514 1236) ((emacs (24 3))) "A major mode for editing Nickel source code" tar ((:commit . "71441281e66500e978e10eb44d58e33a28f55b4e") (:authors ("The Nickel Team" . "nickel-lang@tweag.io")) (:maintainers ("The Nickel Team" . "nickel-lang@tweag.io")) (:maintainer "The Nickel Team" . "nickel-lang@tweag.io") (:keywords "languages" "configuration-language" "configuration" "nickel" "infrastructure") (:url . "https://github.com/nickel-lang/nickel-mode"))])
  (niconama . [(20170910 1501) ((emacs (24)) (request (20170131 1747)) (cl-lib (0 5))) "Tools for Niconico Live Broadcast" tar ((:commit . "96e7553e50e6bf7b58aac50f52c9b0b8edb41c56") (:keywords "comm") (:url . "https://github.com/NOBUTOKA/niconama.el"))])
  (night-owl-theme . [(20200622 1943) ((emacs (24))) "A color theme for the night owls out there" tar ((:commit . "50315d6a4e170dccc83bf2d59a8a761f5ea32bb6") (:authors ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainers ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainer "Aaron Jensen" . "aaronjensen@gmail.com") (:url . "http://github.com/aaronjensen/night-owl-theme"))])
  (nikki . [(20210228 428) ((emacs (24 3))) "A simple diary mode" tar ((:commit . "b2ea20d04a061df88d72bd8dd0412a6e7876458d") (:authors ("Taiki Harada" . "thdev994@gmail.com")) (:maintainers ("Taiki Harada" . "thdev994@gmail.com")) (:maintainer "Taiki Harada" . "thdev994@gmail.com") (:keywords "convenience") (:url . "https://github.com/th994/nikki"))])
@@ -3525,7 +3534,7 @@
  (nix-mode . [(20230421 2036) ((emacs (25 1)) (magit-section (0)) (transient (0 3))) "Major mode for editing .nix files" tar ((:commit . "719feb7868fb567ecfe5578f6119892c771ac5e5") (:maintainers ("Matthew Bauer" . "mjbauer95@gmail.com")) (:maintainer "Matthew Bauer" . "mjbauer95@gmail.com") (:keywords "nix" "languages" "tools" "unix") (:url . "https://github.com/NixOS/nix-mode"))])
  (nix-modeline . [(20210405 742) ((emacs (25 1))) "Info about in-progress Nix evaluations on your modeline" tar ((:commit . "9a6116a11bdacf649f2c50ae1f2f4b12c03bed70") (:authors ("Jordan Mulcahey" . "snhjordy@gmail.com")) (:maintainers ("Jordan Mulcahey" . "snhjordy@gmail.com")) (:maintainer "Jordan Mulcahey" . "snhjordy@gmail.com") (:keywords "processes" "unix" "tools") (:url . "https://github.com/ocelot-project/nix-modeline"))])
  (nix-sandbox . [(20210325 1622) ((dash (2 12 1)) (s (1 10 0))) "Utility functions to work with nix-shell sandboxes" tar ((:commit . "d3ec98405f1f9dac833abf9e146249b1b943870d") (:authors ("Sven Keidel" . "svenkeidel@gmail.com")) (:maintainers ("Sven Keidel" . "svenkeidel@gmail.com")) (:maintainer "Sven Keidel" . "svenkeidel@gmail.com") (:url . "https://github.com/travisbhartwell/nix-emacs"))])
- (nix-ts-mode . [(20231107 1639) ((emacs (29 1))) "Major mode for Nix expressions, powered by tree-sitter" tar ((:commit . "2dddc6e9ca33be211675afca3896fd661fc38a0c") (:maintainers ("Remi Gelinas" . "mail@remigelin.as")) (:maintainer "Remi Gelinas" . "mail@remigelin.as") (:keywords "nix" "languages") (:url . "https://github.com/remi-gelinas/nix-ts-mode"))])
+ (nix-ts-mode . [(20240514 1605) ((emacs (29 1))) "Major mode for Nix expressions, powered by tree-sitter" tar ((:commit . "49d890e86a4597911366208930af6457ce1d46e7") (:maintainers ("Remi Gelinas" . "mail@remigelin.as")) (:maintainer "Remi Gelinas" . "mail@remigelin.as") (:keywords "nix" "languages") (:url . "https://github.com/nix-community/nix-ts-mode"))])
  (nix-update . [(20220816 2212) ((emacs (25))) "Update \"fetch\" blocks in .nix expressions" tar ((:commit . "aab70a38165575a9cb41726f1cc67df60fbf2832") (:authors ("John Wiegley" . "johnw@newartisans.com")) (:maintainers ("John Wiegley" . "johnw@newartisans.com")) (:maintainer "John Wiegley" . "johnw@newartisans.com") (:keywords "nix") (:url . "https://github.com/jwiegley/nix-update-el"))])
  (nixos-options . [(20160209 1841) ((emacs (24))) "Interface for browsing and completing NixOS options." tar ((:commit . "045825c2e1cf0a4fb0a472e72c1dae8f55202cef") (:authors ("Diego Berrocal" . "cestdiego@gmail.com") ("Travis B. Hartwell" . "nafai@travishartwell.net")) (:maintainers ("Diego Berrocal" . "cestdiego@gmail.com")) (:maintainer "Diego Berrocal" . "cestdiego@gmail.com") (:keywords "unix") (:url . "http://www.github.com/travisbhartwell/nix-emacs/"))])
  (nixpkgs-fmt . [(20200327 2302) ((emacs (24)) (reformatter (0 3))) "Reformat Nix using nixpkgs-fmt" tar ((:commit . "83e03d6f20bdf79c1c448c15734367b1a7cc6b02") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "languages") (:url . "https://github.com/purcell/emacs-nixpkgs-fmt"))])
@@ -3592,6 +3601,7 @@
  (oauth . [(20230706 2026) ((emacs (25 1))) "OAuth 1.0 client library" tar ((:commit . "737f4058b3239261cf7c95043034b95f1ce3b282") (:authors ("Peter Sanford" . "peter@petersdanceparty.com") ("Neil Roberts" . "bpeeluk@yahoo.co.uk")) (:maintainers ("Folkert van der Beek" . "folkertvanderbeek@gmail.com")) (:maintainer "Folkert van der Beek" . "folkertvanderbeek@gmail.com") (:keywords "comm") (:url . "https://github.com/fvdbeek/emacs-oauth"))])
  (oauth2-auto . [(20240326 2225) ((emacs (26 1)) (aio (1 0)) (alert (1 2)) (dash (2 19))) "Automatically refreshing OAuth 2.0 tokens" tar ((:commit . "ff9a45e27621aad5b1a2e12a09b01f3e4eaecf96") (:authors ("Adrià Garriga-Alonso" . "adria.garriga@gmail.com")) (:maintainers ("Adrià Garriga-Alonso" . "adria.garriga@gmail.com")) (:maintainer "Adrià Garriga-Alonso" . "adria.garriga@gmail.com") (:keywords "comm" "oauth2") (:url . "https://github.com/rhaps0dy/emacs-oauth2-auto"))])
  (oauth2-request . [(20210215 657) ((emacs (26 1)) (oauth2 (0 14)) (request (0 3))) "OAuth2 request package interface" tar ((:commit . "86ff048635e002b00e23d6bed2ec6f36c17bca8e") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "convenience") (:url . "https://github.com/conao3/oauth2-request.el"))])
+ (ob-acl2 . [(20240505 1844) ((emacs (28)) (org (9))) "Babel Functions for ACL2" tar ((:commit . "db6b274de3cd16e17b5b525c94bf3ad9cc279970") (:authors ("TANIGUCHI Masaya" . "masaya.taniguchi@a.riken.jp")) (:maintainers ("TANIGUCHI Masaya" . "masaya.taniguchi@a.riken.jp")) (:maintainer "TANIGUCHI Masaya" . "masaya.taniguchi@a.riken.jp") (:keywords "tools" "org" "literate programming" "theorem proving" "acl2" "proof assistant system") (:url . "https://github.com/tani/ob-acl2"))])
  (ob-ada-spark . [(20221114 2007) ((emacs (26 1)) (f (0 20 0))) "Babel functions for Ada & SPARK" tar ((:commit . "92978410ca14aa4e84c229a0920ad40be91c35e1") (:authors ("Francesc Rocher")) (:maintainers ("Francesc Rocher")) (:maintainer "Francesc Rocher") (:keywords "languages" "tools" "outlines") (:url . "https://github.com/rocher/ob-ada-spark"))])
  (ob-applescript . [(20190709 1607) nil "Org-babel functions for AppleScript" tar ((:commit . "2b07b77b75bd02f2102f62e6d52ffdd0f921439a") (:authors ("Stig Brautaset")) (:maintainers ("Stig Brautaset")) (:maintainer "Stig Brautaset") (:keywords "literate programming" "reproducible research" "mac") (:url . "http://github.com/stig/ob-applescript.el"))])
  (ob-async . [(20210428 2052) ((async (1 9)) (org (9 0 1)) (emacs (24 4)) (dash (2 14 1))) "Asynchronous org-babel src block execution" tar ((:commit . "9aac486073f5c356ada20e716571be33a350a982") (:authors ("Andrew Stahlman" . "andrewstahlman@gmail.com")) (:maintainers ("Andrew Stahlman" . "andrewstahlman@gmail.com")) (:maintainer "Andrew Stahlman" . "andrewstahlman@gmail.com") (:keywords "tools") (:url . "https://github.com/astahlman/ob-async"))])
@@ -3630,7 +3640,7 @@
  (ob-http . [(20180707 1448) ((s (1 9 0)) (cl-lib (0 5))) "http request in org-mode babel" tar ((:commit . "b1428ea2a63bcb510e7382a1bf5fe82b19c104a7") (:authors ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainers ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainer "ZHOU Feng" . "zf.pascal@gmail.com") (:url . "http://github.com/zweifisch/ob-http"))])
  (ob-hy . [(20180702 540) ((emacs (24 4))) "org-babel functions for Hy-lang evaluation" tar ((:commit . "a42ecaf440adc03e279afe43ee5ef6093ddd542a") (:authors ("Brantou" . "brantou89@gmail.com")) (:maintainers ("Brantou" . "brantou89@gmail.com")) (:maintainer "Brantou" . "brantou89@gmail.com") (:keywords "hy" "literate programming" "reproducible research") (:url . "https://github.com/brantou/ob-hy"))])
  (ob-ipython . [(20180224 953) ((s (1 9 0)) (dash (2 10 0)) (dash-functional (1 2 0)) (f (0 17 2)) (emacs (24))) "org-babel functions for IPython evaluation" tar ((:commit . "7147455230841744fb5b95dcbe03320313a77124") (:authors ("Greg Sexton" . "gregsexton@gmail.com")) (:maintainers ("Greg Sexton" . "gregsexton@gmail.com")) (:maintainer "Greg Sexton" . "gregsexton@gmail.com") (:keywords "literate programming" "reproducible research") (:url . "http://www.gregsexton.org"))])
- (ob-julia-vterm . [(20230815 2332) ((emacs (26 1)) (julia-vterm (0 16)) (queue (0 2))) "Babel functions for Julia that work with julia-vterm" tar ((:commit . "22f8825185231654397ae31e2a586ec39f98ab6f") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "julia" "org" "outlines" "literate programming" "reproducible research") (:url . "https://github.com/shg/ob-julia-vterm.el"))])
+ (ob-julia-vterm . [(20240514 328) ((emacs (26 1)) (julia-vterm (0 25)) (queue (0 2))) "Babel functions for Julia that work with julia-vterm" tar ((:commit . "e1aae4f54cd06f33c63a16d88df4856947f46201") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "julia" "org" "outlines" "literate programming" "reproducible research") (:url . "https://github.com/shg/ob-julia-vterm.el"))])
  (ob-kotlin . [(20180823 1321) ((org (8))) "org-babel functions for kotlin evaluation" tar ((:commit . "b817ffb7fd03a25897eb2aba24af2035bbe3cfa8") (:authors ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainers ("ZHOU Feng" . "zf.pascal@gmail.com")) (:maintainer "ZHOU Feng" . "zf.pascal@gmail.com") (:keywords "org" "babel" "kotlin") (:url . "http://github.com/zweifisch/ob-kotlin"))])
  (ob-latex-as-png . [(20200629 1013) ((emacs (26 1)) (org (9 1))) "Org-babel functions for latex-as-png evaluation" tar ((:commit . "b0c68bdb54741fbee1068654e4eba1962241f271") (:authors ("Musa Al-hassy" . "alhassy@gmail.com")) (:maintainers ("Musa Al-hassy" . "alhassy@gmail.com")) (:maintainer "Musa Al-hassy" . "alhassy@gmail.com") (:keywords "literate programming" "reproducible research" "org" "convenience") (:url . "https://github.com/alhassy/ob-latex-as-png"))])
  (ob-lesim . [(20230619 357) ((emacs (28 1)) (org (9 3)) (lesim-mode (0 3 3))) "Org-babel functions for lesim-mode" tar ((:commit . "37e15f610783ff12926b5d221cefb4a49b4d54d6") (:authors ("Stefano Ghirlanda" . "drghirlanda@gmail.com")) (:maintainers ("Stefano Ghirlanda" . "drghirlanda@gmail.com")) (:maintainer "Stefano Ghirlanda" . "drghirlanda@gmail.com") (:keywords "languages" "tools") (:url . "https://github.com/drghirlanda/ob-lesim"))])
@@ -3683,15 +3693,15 @@
  (octicons . [(20151101 340) ((cl-lib (0 5))) "octicons utility" tar ((:commit . "229286a6166dba8ddabc8c4d338798c6cd3cf67d") (:authors ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainers ("Syohei YOSHIDA" . "syohex@gmail.com")) (:maintainer "Syohei YOSHIDA" . "syohex@gmail.com") (:url . "https://github.com/syohex/emacs-octicons"))])
  (octo-mode . [(20161008 1229) ((emacs (24))) "Major mode for Octo assembly language" tar ((:commit . "4b2ed4a61674f73a6ccd390b5ae123474bd0c977") (:authors ("John Olsson" . "john@cryon.se")) (:maintainers ("John Olsson" . "john@cryon.se")) (:maintainer "John Olsson" . "john@cryon.se") (:keywords "languages") (:url . "https://github.com/cryon/octo-mode"))])
  (octopress . [(20190123 107) nil "A lightweight wrapper for Jekyll and Octopress." tar ((:commit . "f2c92d5420f14fc9167c7de1873836510e652de2") (:authors ("Aaron Bieber" . "aaron@aaronbieber.com")) (:maintainers ("Aaron Bieber" . "aaron@aaronbieber.com")) (:maintainer "Aaron Bieber" . "aaron@aaronbieber.com") (:keywords "octopress" "blog") (:url . "https://github.com/aaronbieber/octopress.el"))])
- (oer-reveal . [(20240414 1312) ((emacs (24 4)) (org-re-reveal (3 22 0))) "OER with reveal.js, plugins, and org-re-reveal" tar ((:commit . "4a8000a196e663be9fec61d0e6fed27814945086") (:authors ("Jens Lechtenbörger")) (:maintainers ("Jens Lechtenbörger")) (:maintainer "Jens Lechtenbörger") (:keywords "hypermedia" "tools" "slideshow" "presentation" "oer") (:url . "https://gitlab.com/oer/oer-reveal"))])
+ (oer-reveal . [(20240513 956) ((emacs (24 4)) (org-re-reveal (3 22 0))) "OER with reveal.js, plugins, and org-re-reveal" tar ((:commit . "08c44d4fd212a7433ad2f863299b5c1bdd87e23f") (:authors ("Jens Lechtenbörger")) (:maintainers ("Jens Lechtenbörger")) (:maintainer "Jens Lechtenbörger") (:keywords "hypermedia" "tools" "slideshow" "presentation" "oer") (:url . "https://gitlab.com/oer/oer-reveal"))])
  (offlineimap . [(20150916 1158) nil "Run OfflineIMAP from Emacs" tar ((:commit . "cc3e067e6237a1eb7b21c575a41683b1febb47f1") (:authors ("Julien Danjou" . "julien@danjou.info")) (:maintainers ("Julien Danjou" . "julien@danjou.info")) (:maintainer "Julien Danjou" . "julien@danjou.info") (:url . "http://julien.danjou.info/offlineimap-el.html"))])
  (oj . [(20230212 148) ((emacs (26 1)) (quickrun (2 2))) "Competitive programming tools client for AtCoder, Codeforces" tar ((:commit . "6d586cb108c642bc166c64df113e03193f4d1495") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "convenience") (:url . "https://github.com/conao3/oj.el"))])
- (ol-notmuch . [(20240415 1546) ((emacs (25 1)) (compat (29 1 4 1)) (notmuch (0 37)) (org (9 6 5))) "Links to notmuch messages" tar ((:commit . "05f3fc9ea77d32892726c94cd7a876733890da91") (:authors ("Matthieu Lemerre" . "racin@free.fr")) (:maintainers ("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev") (:keywords "hypermedia" "mail") (:url . "https://git.sr.ht/~tarsius/ol-notmuch"))])
+ (ol-notmuch . [(20240503 1711) ((emacs (25 1)) (compat (29 1 4 1)) (notmuch (0 37)) (org (9 6 5))) "Links to notmuch messages" tar ((:commit . "f176ad73496ee086688ec5eeafcfff9372a833bc") (:authors ("Matthieu Lemerre" . "racin@free.fr")) (:maintainers ("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev") (:keywords "hypermedia" "mail") (:url . "https://git.sr.ht/~tarsius/ol-notmuch"))])
  (ol-tmsu . [(20230207 1457) ((emacs (28 1)) (tmsu (0 9))) "Org-mode links to TMSU queries" tar ((:commit . "9672d193a51f2848696445528de757aa21b2b686") (:authors ("Wojciech Siewierski")) (:maintainers ("Wojciech Siewierski")) (:maintainer "Wojciech Siewierski") (:keywords "files" "outlines" "hypermedia") (:url . "https://github.com/vifon/tmsu.el"))])
  (olc . [(20200818 1221) ((emacs (25 1))) "Open location code library" tar ((:commit . "d2dc62dbc3cf6460cc12bd96857a988bc80ac37e") (:authors ("David Byers" . "david.byers@liu.se")) (:maintainers ("David Byers" . "david.byers@liu.se")) (:maintainer "David Byers" . "david.byers@liu.se") (:keywords "extensions" "lisp") (:url . "https://gitlab.liu.se/davby02/olc"))])
  (old-norse-input . [(20170816 1842) ((emacs (24))) "An input method for Old Norse" tar ((:commit . "c2e21ee72c3768e9152aff6baf12a19cde1d0c53") (:authors ("David Christiansen" . "david@davidchristiansen.dk")) (:maintainers ("David Christiansen" . "david@davidchristiansen.dk")) (:maintainer "David Christiansen" . "david@davidchristiansen.dk") (:keywords "languages") (:url . "https://github.com/david-christiansen/emacs-old-norse-input"))])
  (oldlace-theme . [(20150705 1300) ((emacs (24))) "Emacs 24 theme with an 'oldlace' background." tar ((:commit . "9ecbef999b63021c967846a3c80b3fbfc81f1290") (:authors ("martin haesler")) (:maintainers ("martin haesler")) (:maintainer "martin haesler"))])
- (olivetti . [(20231104 538) ((emacs (24 4))) "Minor mode for a nice writing environment" tar ((:commit . "1f8b3d5cb155f7497083001037a09a972befab21") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "wp" "text") (:url . "https://github.com/rnkn/olivetti"))])
+ (olivetti . [(20240519 914) ((emacs (24 4))) "Minor mode for a nice writing environment" tar ((:commit . "5a7bd951d6135ff7ee3b45086308c14abce0936f") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "wp" "text") (:url . "https://github.com/rnkn/olivetti"))])
  (om-mode . [(20140915 2110) nil "Insert Om component template with life cycle." tar ((:commit . "5a6b380f8d1293a865d8a37aa4816d7412c512ce") (:authors ("Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com")) (:maintainers ("Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com")) (:maintainer "Daniel Szmulewicz" . "daniel.szmulewicz@gmail.com") (:keywords "clojurescript"))])
  (omni-kill . [(20171016 2140) nil "Kill all the things" tar ((:commit . "904549c8fd6ac3cf22b5d7111ca8944e179cffea") (:authors ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainers ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainer "Adrien Becchis" . "adriean.khisbe@live.fr") (:keywords "convenience" "editing" "tools"))])
  (omni-log . [(20200304 2229) ((emacs (24)) (ht (2 0)) (s (1 6 1)) (dash (2 13 0))) "Logging utilities" tar ((:commit . "0a240660ccdd0b6588b4e3c322743b5ab1161338") (:authors ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainers ("Adrien Becchis" . "adriean.khisbe@live.fr")) (:maintainer "Adrien Becchis" . "adriean.khisbe@live.fr") (:keywords "convenience" "languages" "tools") (:url . "https://github.com/AdrieanKhisbe/omni-log.el"))])
@@ -3717,7 +3727,7 @@
  (openfoam . [(20210516 1015) ((emacs (25 1))) "OpenFOAM files and directories" tar ((:commit . "e2c899009a9df412bf9f360492b1072eb6f1513f") (:authors ("Ralph Schleicher" . "rs@ralph-schleicher.de")) (:maintainers ("Ralph Schleicher" . "rs@ralph-schleicher.de")) (:maintainer "Ralph Schleicher" . "rs@ralph-schleicher.de") (:keywords "languages") (:url . "https://github.com/ralph-schleicher/emacs-openfoam"))])
  (opensource . [(20160926 1616) ((s (1 11 0)) (dash (2 12 1)) (pkg-info (0 6 0)) (request (0 2 0))) "Client for Opensource API" tar ((:commit . "42742d5f1b9590acff7f05ee0094e3a80f4f7171") (:authors ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainers ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainer "Nicolas Lamirault" . "nicolas.lamirault@gmail.com") (:keywords "opensource") (:url . "https://github.com/OpenSourceOrg/el-opensourceorg"))])
  (openstack-cgit-browse-file . [(20130819 927) nil "Browse the current file in OpenStack cgit" tar ((:commit . "244219288b9aef41155044697bb114b7af83ab8f") (:authors ("Chmouel Boudjnah" . "chmouel@chmouel.com")) (:maintainers ("Chmouel Boudjnah" . "chmouel@chmouel.com")) (:maintainer "Chmouel Boudjnah" . "chmouel@chmouel.com") (:keywords "convenience" "vc" "git" "cgit" "gerrit" "openstack") (:url . "https://github.com/chmouel/openstack-cgit-browse-file"))])
- (opensub . [(20240405 750) ((emacs (25 1))) "Search and download from open-subtitles" tar ((:commit . "2e3d55fd1ebc909caa81b06f3323d123ec557d03") (:authors ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainers ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainer "Daniel Fleischer" . "danflscr@gmail.com") (:keywords "multimedia") (:url . "https://github.com/danielfleischer/opensub"))])
+ (opensub . [(20240501 1946) ((emacs (25 1))) "Search and download from open-subtitles" tar ((:commit . "22cc8ef1e119c3cc5f605ca5be4cf680745c503a") (:authors ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainers ("Daniel Fleischer" . "danflscr@gmail.com")) (:maintainer "Daniel Fleischer" . "danflscr@gmail.com") (:keywords "multimedia") (:url . "https://github.com/danielfleischer/opensub"))])
  (openwith . [(20120531 2136) nil "Open files with external programs" tar ((:commit . "dd1f0e2a527535086c2b0ae12031dbf3ab7c5fd7") (:authors ("Markus Triska" . "markus.triska@gmx.at")) (:maintainers ("Markus Triska" . "markus.triska@gmx.at")) (:maintainer "Markus Triska" . "markus.triska@gmx.at") (:keywords "files" "processes") (:url . "https://bitbucket.org/jpkotta/openwith"))])
  (operate-on-number . [(20231114 1921) nil "Operate on number at point with arithmetic functions" tar ((:commit . "0ddebae1885c1b54eae1d79e66204d6d83c5065b") (:authors ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainers ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainer "Akinori MUSHA" . "knu@iDaemons.org") (:keywords "editing") (:url . "https://github.com/knu/operate-on-number.el"))])
  (orangey-bits-theme . [(20220822 324) ((autothemer (0 2)) (emacs (27 1))) "A Theme with smashing orangey bits" tar ((:commit . "533856d399cb4098300bcaf4a2d20920395746f8") (:url . "http://github.com/emacsfodder/emacs-theme-orangey-bits"))])
@@ -3728,7 +3738,7 @@
  (org-agenda-files-track . [(20231209 1529) ((emacs (27 1))) "Fine-track `org-agenda-files' to speed-up `org-agenda'" tar ((:commit . "c0f5f7746ec023a32ba106ec24812eca5cbe15df") (:authors ("Nicolas Graves" . "ngraves@ngraves.fr")) (:maintainers ("Nicolas Graves" . "ngraves@ngraves.fr")) (:maintainer "Nicolas Graves" . "ngraves@ngraves.fr") (:keywords "data" "files" "tools") (:url . "https://git.sr.ht/~ngraves/org-agenda-files-track"))])
  (org-agenda-files-track-ql . [(20231218 627) ((emacs (27 1)) (org-ql (0 7 3))) "Fine-track `org-agenda-files' to speed-up `org-ql-views'" tar ((:commit . "832cffe62c35f32850afb800e9a3b8a20a05ad7b") (:authors ("Nicolas Graves" . "ngraves@ngraves.fr")) (:maintainers ("Nicolas Graves" . "ngraves@ngraves.fr")) (:maintainer "Nicolas Graves" . "ngraves@ngraves.fr") (:keywords "data" "files" "tools") (:url . "https://git.sr.ht/~ngraves/org-agenda-files-track"))])
  (org-agenda-property . [(20140626 2116) ((emacs (24 2))) "Display org properties in the agenda buffer." tar ((:commit . "01afb36072eb27846eb09310dfca7991dbae831e") (:authors ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainers ("Artur Malabarba" . "bruce.connor.am@gmail.com")) (:maintainer "Artur Malabarba" . "bruce.connor.am@gmail.com") (:keywords "calendar") (:url . "http://github.com/Bruce-Connor/org-agenda-property"))])
- (org-ai . [(20240103 235) ((emacs (27 1)) (websocket (1 15))) "Use ChatGPT and other LLMs in org-mode and beyond" tar ((:commit . "329bebaf90f013a54449806e6e65f2fab04cee1f") (:authors ("Robert Krahn" . "robert@kra.hn")) (:maintainers ("Robert Krahn" . "robert@kra.hn")) (:maintainer "Robert Krahn" . "robert@kra.hn") (:url . "https://github.com/rksm/org-ai"))])
+ (org-ai . [(20240517 1114) ((emacs (27 1)) (websocket (1 15))) "Use ChatGPT and other LLMs in org-mode and beyond" tar ((:commit . "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4") (:authors ("Robert Krahn" . "robert@kra.hn")) (:maintainers ("Robert Krahn" . "robert@kra.hn")) (:maintainer "Robert Krahn" . "robert@kra.hn") (:url . "https://github.com/rksm/org-ai"))])
  (org-alert . [(20240122 1728) ((org (9 0)) (alert (1 2))) "Notify org deadlines via notify-send" tar ((:commit . "b4bfd4cead89215cc9a46162234f7a4836da4dad") (:authors ("Stephen Pegoraro" . "spegoraro@tutive.com")) (:maintainers ("Stephen Pegoraro" . "spegoraro@tutive.com")) (:maintainer "Stephen Pegoraro" . "spegoraro@tutive.com") (:keywords "org" "org-mode" "notify" "notifications" "calendar") (:url . "https://github.com/spegoraro/org-alert"))])
  (org-analyzer . [(20191001 1717) nil "org-analyzer is a tool that extracts time tracking data from org files." tar ((:commit . "19da62aa4dcf1090be8f574f6f2d4c7e116163a8") (:authors ("Robert Krahn" . "robert@kra.hn")) (:maintainer "Robert Krahn" . "robert@kra.hn") (:keywords "calendar") (:url . "https://github.com/rksm/clj-org-analyzer"))])
  (org-anki . [(20240427 1628) ((emacs (27 1)) (request (0 3 2)) (dash (2 17)) (promise (1 1))) "Synchronize org-mode entries to Anki" tar ((:commit . "75c2cd6ababf3e2808107af32efc754bfd06a88b") (:authors ("Markus Läll" . "markus.l2ll@gmail.com")) (:maintainers ("Markus Läll" . "markus.l2ll@gmail.com")) (:maintainer "Markus Läll" . "markus.l2ll@gmail.com") (:keywords "outlines" "flashcards" "memory") (:url . "https://github.com/eyeinsky/org-anki"))])
@@ -3743,6 +3753,7 @@
  (org-beautify-theme . [(20170908 2218) nil "A sub-theme to make org-mode more beautiful." tar ((:commit . "df6a1114fda313e1689363e196c8284fbe2a2738") (:authors ("Jonathan Arkell" . "jonnay@jonnay.net")) (:maintainers ("Jonathan Arkell" . "jonnay@jonnay.net")) (:maintainer "Jonathan Arkell" . "jonnay@jonnay.net") (:keywords "org" "theme"))])
  (org-board . [(20230408 1041) nil "bookmarking and web archival system for Org mode." tar ((:commit . "500fe02bc114e5b535a2eb2ab73954d79428168f") (:authors ("Charles A. Roelli " . "charles@aurox.ch")) (:maintainers ("Charles A. Roelli " . "charles@aurox.ch")) (:maintainer "Charles A. Roelli " . "charles@aurox.ch") (:keywords "org" "bookmarks" "archives") (:url . "https://github.com/scallywag/org-board"))])
  (org-bookmark-heading . [(20231216 1234) ((emacs (24 4))) "Emacs bookmark support for Org mode" tar ((:commit . "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net") (:keywords "hypermedia" "outlines") (:url . "http://github.com/alphapapa/org-bookmark-heading"))])
+ (org-bookmarks . [(20240520 16) ((emacs (26 1))) "Manage bookmarks in Org mode" tar ((:commit . "774b2cad8b77920e5ea2089d7dd11c8ccab4a471") (:keywords "outline" "matching" "hypermedia" "org") (:url . "https://repo.or.cz/org-bookmarks.git"))])
  (org-bookmarks-extractor . [(20220829 146) ((emacs (25 1))) "Extract bookmarks from Org mode" tar ((:commit . "26d810d4d58de1f64f0bbd649e13816f96663d73") (:authors ("Xuqing Jia" . "jxq@jxq.me")) (:maintainers ("Xuqing Jia" . "jxq@jxq.me")) (:maintainer "Xuqing Jia" . "jxq@jxq.me") (:keywords "convenience" "org") (:url . "https://github.com/jxq0/org-bookmarks-extractor"))])
  (org-books . [(20210408 1913) ((enlive (0 0 1)) (s (1 11 0)) (helm (2 9 2)) (helm-org (1 0)) (dash (2 14 1)) (org (9 3)) (emacs (25))) "Reading list management with Org mode and helm" tar ((:commit . "9f4ec4a981bfc5eebff993c3ad49a4bed26aebd1") (:authors ("Abhinav Tushar" . "abhinav@lepisma.xyz")) (:maintainers ("Abhinav Tushar" . "abhinav@lepisma.xyz")) (:maintainer "Abhinav Tushar" . "abhinav@lepisma.xyz") (:keywords "outlines") (:url . "https://github.com/lepisma/org-books"))])
  (org-brain . [(20230217 1908) ((emacs (25 1)) (org (9 2))) "Org-mode concept mapping" tar ((:commit . "2bad7732aae1a3051e2a14de2e30f970bbe43c25") (:authors ("Erik Sjöstrand" . "sjostrand.erik@gmail.com")) (:maintainers ("Erik Sjöstrand" . "sjostrand.erik@gmail.com")) (:maintainer "Erik Sjöstrand" . "sjostrand.erik@gmail.com") (:keywords "outlines" "hypermedia") (:url . "http://github.com/Kungsgeten/org-brain"))])
@@ -3764,7 +3775,7 @@
  (org-clock-split . [(20200331 526) ((emacs (24))) "Split clock entries" tar ((:commit . "39e1d2912a7a7223e2356a5fc4dff03507ae084d") (:authors ("Justin Taft <https://github.com/justintaft>")) (:maintainers ("Justin Taft <https://github.com/justintaft>")) (:maintainer "Justin Taft <https://github.com/justintaft>") (:keywords "calendar") (:url . "https://github.com/justintaft/emacs-org-clock-split"))])
  (org-clock-today . [(20220918 514) ((emacs (25))) "Show total clocked time of the current day in the mode line" tar ((:commit . "b73cca120eb64538ab0666892a8b97b6d65b4d6b") (:authors ("Tijs Mallaerts" . "tijs.mallaerts@gmail.com")) (:maintainers ("Tijs Mallaerts" . "tijs.mallaerts@gmail.com")) (:maintainer "Tijs Mallaerts" . "tijs.mallaerts@gmail.com") (:url . "https://github.com/mallt/org-clock-today-mode"))])
  (org-commentary . [(20160802 637) ((dash (2 0)) (emacs (24 4)) (org (8 0))) "generate or update conventional library headers using Org mode files" tar ((:commit . "821ccb994811359c42f4e3d459e0e88849d42b75") (:authors ("Sergei Maximov" . "s.b.maximov@gmail.com")) (:maintainers ("Sergei Maximov" . "s.b.maximov@gmail.com")) (:maintainer "Sergei Maximov" . "s.b.maximov@gmail.com") (:keywords "convenience" "docs" "tools") (:url . "https://github.com/smaximov/org-commentary"))])
- (org-contacts . [(20240410 1128) ((emacs (27 1)) (org (9 3 4))) "Contacts management system for Org mode" tar ((:commit . "0ff9a6dae6c1b67f0da0c63bc75b8c1063eac85d") (:authors ("Julien Danjou" . "julien@danjou.info")) (:maintainers ("stardiviner" . "numbchild@gmail.com")) (:maintainer "stardiviner" . "numbchild@gmail.com") (:keywords "contacts" "org-mode" "outlines" "hypermedia" "calendar") (:url . "https://repo.or.cz/org-contacts.git"))])
+ (org-contacts . [(20240521 1144) ((emacs (27 1)) (org (9 7))) "Contacts management system for Org mode" tar ((:commit . "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9") (:authors ("Julien Danjou" . "julien@danjou.info")) (:maintainers ("stardiviner" . "numbchild@gmail.com")) (:maintainer "stardiviner" . "numbchild@gmail.com") (:keywords "contacts" "org-mode" "outlines" "hypermedia" "calendar") (:url . "https://repo.or.cz/org-contacts.git"))])
  (org-context . [(20220606 1339) nil "Contextual capture and agenda commands for Org-mode" tar ((:commit . "47bd45149cb74dab2ebecccfb918f6f8502a4f2c") (:authors ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainers ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainer "Sylvain Rousseau <thisirs at gmail dot com>") (:keywords "org" "capture" "agenda" "convenience") (:url . "https://github.com/thisirs/org-context"))])
  (org-cua-dwim . [(20120203 534) nil "Org-mode and Cua mode compatibility layer" tar ((:commit . "a55d6c7009fc0b22f1110c07de629acc955c85e4") (:authors ("Matthew L. Fidler")) (:maintainers ("Matthew L. Fidler")) (:maintainer "Matthew L. Fidler") (:keywords "org-mode" "cua-mode"))])
  (org-custom-cookies . [(20240414 44) ((emacs (25 1)) (org (9 4))) "Custom cookies for org-mode" tar ((:commit . "5650c73d20e53310dab62f6a65754a55aea9b40b") (:authors ("Gulshan Singh" . "gsingh2011@gmail.com")) (:maintainers ("Gulshan Singh" . "gsingh2011@gmail.com")) (:maintainer "Gulshan Singh" . "gsingh2011@gmail.com") (:url . "https://github.com/gsingh93/org-custom-cookies"))])
@@ -3804,13 +3815,13 @@
  (org-inline-anim . [(20230610 1504) ((emacs (25 3)) (org (9 4))) "Inline playback of animated GIF/PNG for Org" tar ((:commit . "488fed644748b578dffe7e3847970ec25dcfd24d") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "org" "outlines" "hypermedia" "multimedia") (:url . "https://github.com/shg/org-inline-anim.el"))])
  (org-inline-pdf . [(20230826 1220) ((emacs (25 1)) (org (9 4))) "Inline PDF previewing for Org" tar ((:commit . "2460c429e0977587863f41176aafe1ca858c13e8") (:authors ("Shigeaki Nishina")) (:maintainers ("Shigeaki Nishina")) (:maintainer "Shigeaki Nishina") (:keywords "org" "outlines" "hypermedia") (:url . "https://github.com/shg/org-inline-pdf.el"))])
  (org-iv . [(20171001 1022) ((impatient-mode (1 0 0)) (org (8 0)) (cl-lib (0 5))) "a tool used to view html (in browser) generated by org-file once the org-file changes" tar ((:commit . "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd") (:authors ("kuangdash" . "kuangdash@163.com")) (:maintainer "kuangdash" . "kuangdash@163.com") (:url . "https://github.com/kuangdash/org-iv"))])
- (org-ivy-search . [(20231213 857) ((emacs (25 1)) (ivy (0 10 0)) (org (0 10 0)) (beacon (1 3 4))) "Full text search for org files powered by ivy" tar ((:commit . "aeff31203c4c407d3f921124b6798ffd04772a11") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "tool" "org") (:url . "https://github.com/beacoder/org-ivy-search"))])
+ (org-ivy-search . [(20240430 1713) ((emacs (25 1)) (ivy (0 10 0)) (org (0 10 0)) (beacon (1 3 4))) "Full text search for org files powered by ivy" tar ((:commit . "2ec41a54f3849e783cfb16eddcfd310097ed6d5e") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "tool" "org") (:url . "https://github.com/beacoder/org-ivy-search"))])
  (org-jami-bot . [(20240203 1016) ((emacs (28 1)) (jami-bot (0 0 4))) "Capture GNU Jami messages as notes and todos in Org mode" tar ((:commit . "020b03f299dad438f65d7bcbf93553b273fd7c33") (:authors ("Hanno Perrey" . "hanno@hoowl.se")) (:maintainers ("Hanno Perrey" . "hanno@hoowl.se")) (:maintainer "Hanno Perrey" . "hanno@hoowl.se") (:keywords "comm" "outlines" "org-capture" "jami") (:url . "https://gitlab.com/hperrey/org-jami-bot"))])
  (org-jira . [(20230915 57) ((emacs (24 5)) (cl-lib (0 5)) (request (0 2 0)) (dash (2 14 1))) "Syncing between Jira and Org-mode." tar ((:commit . "295b01ede42952c848bd8d76bc8c456a87876cbc") (:maintainers ("Matthew Carter" . "m@ahungry.com")) (:maintainer "Matthew Carter" . "m@ahungry.com") (:keywords "ahungry" "jira" "org" "bug" "tracker") (:url . "https://github.com/ahungry/org-jira"))])
  (org-journal . [(20240218 1645) ((emacs (26 1)) (org (9 1))) "a simple org-mode based journaling mode" tar ((:commit . "859dc19168dc6b10eba3843f24980a7db79f6869") (:authors ("Bastian Bechtold") ("Christian Schwarzgruber")) (:maintainers ("Bastian Bechtold")) (:maintainer "Bastian Bechtold") (:url . "http://github.com/bastibe/org-journal"))])
  (org-journal-list . [(20190221 2052) ((emacs (25))) "Org mode Journal List" tar ((:commit . "2b26d00181bb49bff64b31ad020490acd1b6ae02") (:authors ("Huy Tran" . "huytd189@gmail.com")) (:maintainers ("Huy Tran" . "huytd189@gmail.com")) (:maintainer "Huy Tran" . "huytd189@gmail.com") (:url . "https://github.com/huytd/org-journal-list"))])
  (org-journal-tags . [(20240101 4) ((emacs (27 1)) (org-journal (2 1 2)) (magit-section (3 3 0)) (transient (0 3 7))) "Tagging and querying system for org-journal" tar ((:commit . "a68e40a8473ff18bef58a171245a9cdef6eee622") (:authors ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainers ("Korytov Pavel" . "thexcloud@gmail.com")) (:maintainer "Korytov Pavel" . "thexcloud@gmail.com") (:url . "https://github.com/SqrtMinusOne/org-journal-tags"))])
- (org-kanban . [(20220723 1216) ((s (0)) (dash (2 17 0)) (emacs (24 4)) (org (9 1))) "kanban dynamic block for org-mode." tar ((:commit . "e78deb03880ae89d6bceae6563ef1383526233a1") (:authors ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainers ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainer "Christian Köstlin" . "christian.koestlin@gmail.com") (:keywords "org-mode" "org" "kanban" "tools") (:url . "http://github.com/gizmomogwai/org-kanban"))])
+ (org-kanban . [(20240430 944) ((s (0)) (dash (2 17 0))) "kanban dynamic block for org-mode." tar ((:commit . "e316be6a4f64c4869b911d2cbdc4673a0e398a5f") (:authors ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainers ("Christian Köstlin" . "christian.koestlin@gmail.com")) (:maintainer "Christian Köstlin" . "christian.koestlin@gmail.com") (:keywords "org-mode" "org" "kanban" "tools") (:url . "http://github.com/gizmomogwai/org-kanban"))])
  (org-kindle . [(20220210 1408) ((emacs (25)) (cl-lib (0 5)) (seq (2 20))) "Send org link file to ebook reader." tar ((:commit . "fadcfd62e254d0c45e87d63128a82a08ae21869a") (:keywords "org" "link" "ebook" "kindle" "epub" "azw3" "mobi") (:url . "https://repo.or.cz/org-kindle.git"))])
  (org-latex-impatient . [(20221111 623) ((emacs (26)) (s (1 8 0)) (posframe (0 8 0)) (org (9 3)) (dash (2 17 0))) "Preview org-latex Fragments Instantly via MathJax" tar ((:commit . "031025a8be9bf7255aa047388d027642cd2d6183") (:authors ("Sheng Yang" . "styang@fastmail.com")) (:maintainers ("Sheng Yang" . "styang@fastmail.com")) (:maintainer "Sheng Yang" . "styang@fastmail.com") (:keywords "tex" "tools") (:url . "https://github.com/yangsheng6810/org-latex-instant-preview"))])
  (org-linenote . [(20240325 320) ((emacs (29 1)) (projectile (2 8 0)) (vertico (1 7))) "A package inspired by VSCode Linenote" tar ((:commit . "4c081f4bbe13c48df7cb17f2f006465b8b95196b") (:authors ("Jason Kim" . "sukbeom.kim@gmail.com")) (:maintainers ("Jason Kim" . "sukbeom.kim@gmail.com")) (:maintainer "Jason Kim" . "sukbeom.kim@gmail.com") (:keywords "tools" "note" "org") (:url . "https://github.com/seokbeomKim/org-linenote"))])
@@ -3824,7 +3835,7 @@
  (org-mind-map . [(20180826 2340) ((emacs (24)) (dash (1 8 0)) (org (8 2 10))) "Creates a directed graph from org-mode files" tar ((:commit . "41df4b2e30455494f1848b4e06cc9208aa9e902b") (:authors ("Ted Wiles" . "theodore.wiles@gmail.com")) (:maintainers ("Ted Wiles" . "theodore.wiles@gmail.com")) (:maintainer "Ted Wiles" . "theodore.wiles@gmail.com") (:keywords "orgmode" "extensions" "graphviz" "dot") (:url . "https://github.com/theodorewiles/org-mind-map"))])
  (org-ml . [(20230410 30) ((emacs (27 1)) (org (9 3)) (dash (2 17)) (s (1 12))) "Functional Org Mode API" tar ((:commit . "f57336a9126a168ad32ccce017c072474555395a") (:authors ("Nathan Dwarshuis" . "ndwar@yavin4.ch")) (:maintainers ("Nathan Dwarshuis" . "ndwar@yavin4.ch")) (:maintainer "Nathan Dwarshuis" . "ndwar@yavin4.ch") (:keywords "org-mode" "outlines") (:url . "https://github.com/ndwarshuis/org-ml"))])
  (org-mobile-sync . [(20180606 524) ((emacs (24 3 50)) (org (8 0))) "automatically sync org-mobile on changes" tar ((:commit . "06764b943a528827df1e2acc6bc7806cc2c1351f") (:authors ("steckerhalter")) (:maintainers ("steckerhalter")) (:maintainer "steckerhalter") (:keywords "org-mode" "org" "mobile" "sync" "todo") (:url . "https://framagit.org/steckerhalter/org-mobile-sync"))])
- (org-modern . [(20240428 1150) ((emacs (27 1)) (compat (29 1 4 4))) "Modern looks for Org" tar ((:commit . "5621060178ad081e3633d326b4f2452006988dcc") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "outlines" "hypermedia" "text") (:url . "https://github.com/minad/org-modern"))])
+ (org-modern . [(20240515 1932) ((emacs (27 1)) (compat (29 1 4 4))) "Modern looks for Org" tar ((:commit . "ea829ce4b3ac035808d411b1a088e0947d75f554") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "outlines" "hypermedia" "text") (:url . "https://github.com/minad/org-modern"))])
  (org-movies . [(20210920 101) ((emacs (26 1)) (org (9 0)) (request (0 3 0))) "Manage watchlist with Org mode" tar ((:commit . "e96fecaffa2924de64a507aa31d2934e667ee1ea") (:authors ("Anh T Nguyen")) (:maintainers ("Anh T Nguyen")) (:maintainer "Anh T Nguyen") (:keywords "hypermedia" "outlines" "org") (:url . "https://github.com/teeann/org-movies"))])
  (org-mpv-notes . [(20231210 628) ((emacs (28 1))) "Take notes in org mode while watching videos in mpv" tar ((:commit . "01d6d52a1f964e7bb61f0f65ac4fb2ccfa986f34") (:authors ("Bibek Panthi" . "bpanthi977@gmail.com")) (:maintainers ("Bibek Panthi" . "bpanthi977@gmail.com")) (:maintainer "Bibek Panthi" . "bpanthi977@gmail.com") (:url . "https://github.com/bpanthi977/org-mpv-notes"))])
  (org-mru-clock . [(20230704 850) ((emacs (26 1))) "Clock in/out of tasks with completion and persistent history" tar ((:commit . "66fe744df9100efc4ec68089f7d0ce56a0d38b8b") (:authors ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainers ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainer "Kevin Brubeck Unhammer" . "unhammer@fsfe.org") (:keywords "convenience" "calendar") (:url . "https://github.com/unhammer/org-mru-clock"))])
@@ -3834,7 +3845,7 @@
  (org-newtab . [(20240227 155) ((emacs (27 1)) (websocket (1 14)) (async (1 9 7))) "Supercharge your browser's new tab page" tar ((:commit . "eca494a43e242558bd8db24d321ad62a8ec86c02") (:authors ("Zweihänder" . "zweidev@zweihander.me")) (:maintainers ("Zweihänder" . "zweidev@zweihander.me")) (:maintainer "Zweihänder" . "zweidev@zweihander.me") (:keywords "outlines") (:url . "https://github.com/Zweihander-Main/org-newtab"))])
  (org-nix-shell . [(20240205 1642) ((emacs (27 1)) (org (9 4))) "Org local nix-shell" tar ((:commit . "d9843aa0f62a39b9938a89388e25129ecb39a4cc") (:maintainers ("Anton Hakansson" . "anton@hakanssn.com")) (:maintainer "Anton Hakansson" . "anton@hakanssn.com") (:keywords "processes" "outlines") (:url . "https://github.com/AntonHakansson/"))])
  (org-notebook . [(20170322 452) ((emacs (24)) (org (8)) (cl-lib (0 5))) "Ease the use of org-mode as a notebook" tar ((:commit . "d90c4aeca2442161e6dd89de175561af85aace03") (:authors ("Paul Elder" . "paul.elder@amanokami.net")) (:maintainers ("Paul Elder" . "paul.elder@amanokami.net")) (:maintainer "Paul Elder" . "paul.elder@amanokami.net") (:keywords "convenience" "tools"))])
- (org-noter . [(20240207 2329) ((emacs (24 4)) (cl-lib (0 6)) (org (9 4))) "A synchronized, Org-mode, document annotator" tar ((:commit . "9e4f57957b8f54db20a4e13bf8d6b32e004ab3e8") (:authors ("Gonçalo Santos (github.com/weirdNox)" . "in@bsentia") ("   Maintainer Dmitry M" . "dmitrym@gmail.com")) (:maintainers ("Peter Mao" . "peter.mao@gmail.com")) (:maintainer "Peter Mao" . "peter.mao@gmail.com") (:keywords "lisp" "pdf" "interleave" "annotate" "external" "sync" "notes" "documents" "org-mode") (:url . "https://github.com/org-noter/org-noter"))])
+ (org-noter . [(20240509 1756) ((emacs (24 4)) (cl-lib (0 6)) (org (9 4))) "A synchronized, Org-mode, document annotator" tar ((:commit . "68646b685a0d8c02419234922a9e2d885d6419df") (:authors ("Gonçalo Santos (github.com/weirdNox)" . "in@bsentia") ("   Maintainer Dmitry M" . "dmitrym@gmail.com")) (:maintainers ("Peter Mao" . "peter.mao@gmail.com")) (:maintainer "Peter Mao" . "peter.mao@gmail.com") (:keywords "lisp" "pdf" "interleave" "annotate" "external" "sync" "notes" "documents" "org-mode") (:url . "https://github.com/org-noter/org-noter"))])
  (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 ((:commit . "4e420233a153a9c4ab3d1a7e1d7d3211c836f0ac") (:authors ("Alexander Fu Xi" . "fuxialexander@gmail.com")) (:maintainers ("Alexander Fu Xi" . "fuxialexnader@gmail.com")) (:maintainer "Alexander Fu Xi" . "fuxialexnader@gmail.com") (:keywords "convenience") (:url . "https://github.com/fuxialexander/org-pdftools"))])
  (org-notifications . [(20210918 1827) ((emacs (25 1)) (org (9 0)) (sound-wav (0 2)) (alert (1 2)) (seq (2 21))) "Creates notifications for org-mode entries" tar ((:commit . "b8032f8adfbeb328962a5657c6dd173e64cc76e5") (:authors ("doppelc")) (:maintainers ("doppelc")) (:maintainer "doppelc") (:keywords "outlines") (:url . "https://github.com/doppelc/org-notifications"))])
  (org-octopress . [(20170821 415) ((org (9 0)) (orglue (0 1)) (ctable (0 1 1))) "Compose octopress articles using org-mode." tar ((:commit . "38598ef98d04076a8eb78d549907ddfde8d3a652") (:authors ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainers ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainer "Yoshinari Nomura" . "nom@quickhack.net") (:keywords "org" "jekyll" "octopress" "blog"))])
@@ -3860,13 +3871,13 @@
  (org-rainbow-tags . [(20230921 2038) ((emacs (28 1))) "Colorize org tags automatically" tar ((:commit . "fd0b68921302fdc3f0d086db7a09b5196251160f") (:authors ("Furkan Karataş" . "furkan.karatas02@gmail.com")) (:maintainers ("Furkan Karataş" . "furkan.karatas02@gmail.com")) (:maintainer "Furkan Karataş" . "furkan.karatas02@gmail.com") (:keywords "faces" "outlines") (:url . "https://github.com/KaratasFurkan/org-rainbow-tags"))])
  (org-random-todo . [(20190214 2057) ((emacs (24 3)) (alert (1 3))) "show a random TODO (with alert) every so often" tar ((:commit . "4f7677af740e8f3f7cfaf630ae2e594a125af760") (:authors ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainers ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainer "Kevin Brubeck Unhammer" . "unhammer@fsfe.org") (:keywords "org" "todo" "notification" "calendar") (:url . "https://github.com/unhammer/org-random-todo"))])
  (org-randomnote . [(20200110 1407) ((f (0 19 0)) (dash (2 12 0)) (org (0))) "Find a random note in your Org-Mode files" tar ((:commit . "ea8cf4385970637efffff8f79e14576ba6d7ad13") (:authors ("Michael Fogleman" . "michaelwfogleman@gmail.com")) (:maintainers ("Michael Fogleman" . "michaelwfogleman@gmail.com")) (:maintainer "Michael Fogleman" . "michaelwfogleman@gmail.com") (:url . "http://github.com/mwfogleman/org-randomnote"))])
- (org-re-reveal . [(20240421 716) ((emacs (24 4)) (org (8 3)) (htmlize (1 34))) "Org export to reveal.js presentations" tar ((:commit . "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0") (:keywords "tools" "outlines" "hypermedia" "slideshow" "presentation" "oer") (:url . "https://gitlab.com/oer/org-re-reveal"))])
+ (org-re-reveal . [(20240430 1155) ((emacs (24 4)) (org (8 3)) (htmlize (1 34))) "Org export to reveal.js presentations" tar ((:commit . "ceb5420fd5200c3b4165ffc71360d5388dba7d29") (:keywords "tools" "outlines" "hypermedia" "slideshow" "presentation" "oer") (:url . "https://gitlab.com/oer/org-re-reveal"))])
  (org-re-reveal-citeproc . [(20211028 1328) ((emacs (25 1)) (org (9 5)) (citeproc (0 9)) (org-re-reveal (3 0 0))) "Citations and bibliography for org-re-reveal" tar ((:commit . "faa9ea387917b20bd1499ad90199ff3d417c00c2") (:authors ("Jens Lechtenbörger")) (:maintainers ("Jens Lechtenbörger")) (:maintainer "Jens Lechtenbörger") (:keywords "hypermedia" "tools" "slideshow" "presentation" "bibliography") (:url . "https://gitlab.com/oer/org-re-reveal-citeproc"))])
  (org-re-reveal-ref . [(20211029 551) ((emacs (25 1)) (org-ref (1 1 1)) (org-re-reveal (0 9 3))) "Citations and bibliography for org-re-reveal" tar ((:commit . "ea9661864d5fbef87b12b78f516c13a40c683f24") (:authors ("Jens Lechtenbörger")) (:maintainers ("Jens Lechtenbörger")) (:maintainer "Jens Lechtenbörger") (:keywords "hypermedia" "tools" "slideshow" "presentation" "bibliography") (:url . "https://gitlab.com/oer/org-re-reveal-ref"))])
  (org-recent-headings . [(20211011 1519) ((emacs (26 1)) (org (9 0 5)) (dash (2 18 0)) (frecency (0 1)) (s (1 12 0))) "Jump to recently used Org headings" tar ((:commit . "97418d581ea030f0718794e50b005e9bae44582e") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net") (:keywords "hypermedia" "outlines" "org") (:url . "http://github.com/alphapapa/org-recent-headings"))])
  (org-recur . [(20230124 1532) ((emacs (24 1)) (org (9 0)) (dash (2 7 0))) "Recurring org-mode tasks" tar ((:commit . "628099883a63d219f76cd9631cc914fe6ec8a3e3") (:authors ("Marcin Swieczkowski" . "marcin.swieczkowski@gmail.com")) (:maintainers ("Marcin Swieczkowski" . "marcin.swieczkowski@gmail.com")) (:maintainer "Marcin Swieczkowski" . "marcin.swieczkowski@gmail.com") (:url . "https://github.com/mrcnski/org-recur"))])
  (org-redmine . [(20160711 1114) nil "Redmine tools using Emacs OrgMode" tar ((:commit . "a526c3ac802634486bf10de9c2283ccb1a30ec8d") (:authors ("Wataru MIYAGUNI" . "gonngo@gmail.com")) (:maintainers ("Wataru MIYAGUNI" . "gonngo@gmail.com")) (:maintainer "Wataru MIYAGUNI" . "gonngo@gmail.com") (:keywords "redmine" "org") (:url . "https://github.com/gongo/org-redmine"))])
- (org-ref . [(20240426 1644) ((org (9 4)) (dash (0)) (s (0)) (f (0)) (htmlize (0)) (hydra (0)) (avy (0)) (parsebib (0)) (bibtex-completion (0)) (citeproc (0)) (ox-pandoc (0)) (request (0))) "citations, cross-references and bibliographies in org-mode" tar ((:commit . "feaf7ea25cefaa347e6d593bf3a56064b92f16d6") (:authors ("John Kitchin" . "jkitchin@andrew.cmu.edu")) (:maintainers ("John Kitchin" . "jkitchin@andrew.cmu.edu")) (:maintainer "John Kitchin" . "jkitchin@andrew.cmu.edu") (:keywords "org-mode" "cite" "ref" "label") (:url . "https://github.com/jkitchin/org-ref"))])
+ (org-ref . [(20240509 1211) ((org (9 4)) (dash (0)) (s (0)) (f (0)) (htmlize (0)) (hydra (0)) (avy (0)) (parsebib (0)) (bibtex-completion (0)) (citeproc (0)) (ox-pandoc (0)) (request (0))) "citations, cross-references and bibliographies in org-mode" tar ((:commit . "e435bc60228b985806ea7ea0856ceef1e5262c83") (:authors ("John Kitchin" . "jkitchin@andrew.cmu.edu")) (:maintainers ("John Kitchin" . "jkitchin@andrew.cmu.edu")) (:maintainer "John Kitchin" . "jkitchin@andrew.cmu.edu") (:keywords "org-mode" "cite" "ref" "label") (:url . "https://github.com/jkitchin/org-ref"))])
  (org-ref-prettify . [(20220507 649) ((emacs (24 3)) (org-ref (3 0)) (bibtex-completion (1 0 0))) "Prettify org-ref citation links" tar ((:commit . "0ec3b6e398ee117c8b8a787a0422b95d9e95f7bb") (:authors ("Alex Kost" . "alezost@gmail.com") ("Vitus Schäfftlein" . "vitusschaefftlein@live.de")) (:maintainers ("Alex Kost" . "alezost@gmail.com")) (:maintainer "Alex Kost" . "alezost@gmail.com") (:keywords "convenience") (:url . "https://github.com/alezost/org-ref-prettify.el"))])
  (org-repo-todo . [(20171228 119) nil "Simple repository todo management with org-mode" tar ((:commit . "f73ebd91399c5760ad52c6ad9033de1066042003") (:authors ("justin talbott" . "justin@waymondo.com")) (:maintainers ("justin talbott" . "justin@waymondo.com")) (:maintainer "justin talbott" . "justin@waymondo.com") (:keywords "convenience") (:url . "https://github.com/waymondo/org-repo-todo"))])
  (org-reverse-datetree . [(20221203 259) ((emacs (28 1)) (dash (2 19)) (org (9 5))) "Create reverse date trees in org-mode" tar ((:commit . "fca95cd22ed29653f3217034c71ec0ab0a7c7734") (:authors ("Akira Komamura" . "akira.komamura@gmail.com")) (:maintainers ("Akira Komamura" . "akira.komamura@gmail.com")) (:maintainer "Akira Komamura" . "akira.komamura@gmail.com") (:keywords "outlines") (:url . "https://github.com/akirak/org-reverse-datetree"))])
@@ -3874,11 +3885,11 @@
  (org-rich-yank . [(20240302 659) ((emacs (25 1))) "Paste with org-mode markup and link to source" tar ((:commit . "50925a1183a51a6b3a9cf9ce23c425735e622e42") (:authors ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainers ("Kevin Brubeck Unhammer" . "unhammer@fsfe.org")) (:maintainer "Kevin Brubeck Unhammer" . "unhammer@fsfe.org") (:keywords "convenience" "hypermedia" "org") (:url . "https://github.com/unhammer/org-rich-yank"))])
  (org-roam . [(20240114 1941) ((emacs (26 1)) (dash (2 13)) (org (9 4)) (emacsql (20230228)) (magit-section (3 0 0))) "A database abstraction layer for Org-mode" tar ((:commit . "2e94f55cc58f6dce2772a6f33521eb5afcf67265") (:authors ("Jethro Kuan" . "jethrokuan95@gmail.com")) (:maintainers ("Jethro Kuan" . "jethrokuan95@gmail.com")) (:maintainer "Jethro Kuan" . "jethrokuan95@gmail.com") (:keywords "org-mode" "roam" "convenience") (:url . "https://github.com/org-roam/org-roam"))])
  (org-roam-bibtex . [(20240229 1913) ((emacs (27 1)) (org-roam (2 2 0)) (bibtex-completion (1 0 0))) "Org Roam meets BibTeX" tar ((:commit . "d9b8a57cfca832e3e7c7f414bf93060acbf63573") (:authors ("Mykhailo Shevchuk" . "mail@mshevchuk.com") ("Leo Vivier" . "leo.vivier+dev@gmail.com")) (:maintainers ("Mykhailo Shevchuk" . "mail@mshevchuk.com")) (:maintainer "Mykhailo Shevchuk" . "mail@mshevchuk.com") (:keywords "bib" "hypermedia" "outlines" "wp") (:url . "https://github.com/org-roam/org-roam-bibtex"))])
- (org-roam-ql . [(20240226 1311) ((emacs (28)) (org-roam (2 2 0)) (s (1 12 0)) (magit-section (3 3 0)) (transient (0 4)) (org-super-agenda (1 2))) "Interface to query and view results from org-roam" tar ((:commit . "2bd7c59ce1216b5d76e2a067be2f25807cd4d831") (:authors ("Shariff AM Faleel")) (:maintainers ("Shariff AM Faleel")) (:maintainer "Shariff AM Faleel") (:url . "https://github.com/ahmed-shariff/org-roam-ql"))])
- (org-roam-ql-ql . [(20230902 613) ((emacs (28)) (org-roam-ql (0 1)) (org-ql (0 7)) (org-roam (2 2 0)) (s (1 12 0)) (transient (0 4))) "Intgrating org-roam and org-ql" tar ((:commit . "31b7de04430e2e989564cc58d82c2b92f2383ee4") (:authors ("Shariff AM Faleel")) (:maintainers ("Shariff AM Faleel")) (:maintainer "Shariff AM Faleel") (:url . "https://github.com/ahmed-shariff/org-roam-ql"))])
+ (org-roam-ql . [(20240503 1845) ((emacs (28)) (org-roam (2 2 0)) (s (1 12 0)) (magit-section (3 3 0)) (transient (0 4)) (org-super-agenda (1 2))) "Interface to query and view results from org-roam" tar ((:commit . "f628fef081394f159f196f4350132aecb3edb8cc") (:authors ("Shariff AM Faleel")) (:maintainers ("Shariff AM Faleel")) (:maintainer "Shariff AM Faleel") (:url . "https://github.com/ahmed-shariff/org-roam-ql"))])
+ (org-roam-ql-ql . [(20240503 1845) ((emacs (28)) (org-roam-ql (0 1)) (org-ql (0 7)) (org-roam (2 2 0)) (s (1 12 0)) (transient (0 4))) "Intgrating org-roam and org-ql" tar ((:commit . "f628fef081394f159f196f4350132aecb3edb8cc") (:authors ("Shariff AM Faleel")) (:maintainers ("Shariff AM Faleel")) (:maintainer "Shariff AM Faleel") (:url . "https://github.com/ahmed-shariff/org-roam-ql"))])
  (org-roam-timestamps . [(20221104 1544) ((emacs (26 1)) (org-roam (2 0 0))) "Keep track of modification times for org-roam" tar ((:commit . "c4ff1e2f5b0905b5caa917249aab56ddc1de1ab3") (:authors ("Thomas F. K. Jorna <https://github.com/thomas>")) (:maintainers ("Thomas F. K. Jorna" . "jorna@jtrialerror.com")) (:maintainer "Thomas F. K. Jorna" . "jorna@jtrialerror.com") (:keywords "calendar" "outlines" "files") (:url . "https://github.com/ThomasFKJorna/org-roam-timestamps/"))])
  (org-roam-ui . [(20221105 1040) ((emacs (27 1)) (org-roam (2 0 0)) (simple-httpd (20191103 1446)) (websocket (1 13))) "User Interface for Org-roam" tar ((:commit . "5ac74960231db0bf7783c2ba7a19a60f582e91ab") (:authors ("Kirill Rogovoy, Thomas Jorna")) (:maintainers ("Kirill Rogovoy, Thomas Jorna")) (:maintainer "Kirill Rogovoy, Thomas Jorna") (:keywords "files" "outlines") (:url . "https://github.com/org-roam/org-roam-ui"))])
- (org-ros . [(20220320 1705) ((emacs (24 1))) "Rahul's Org-Mode Screenshot" tar ((:commit . "70e0f33ee027ca1dce68351ad14a9e47a452fc17") (:authors ("Rahul Martim Juliato" . "rahul.juliato@gmail.com")) (:maintainers ("Rahul Martim Juliato" . "rahul.juliato@gmail.com")) (:maintainer "Rahul Martim Juliato" . "rahul.juliato@gmail.com") (:url . "https://github.com/LionyxML/ros"))])
+ (org-ros . [(20240512 452) ((emacs (24 1))) "Rahul's Org-Mode Screenshot" tar ((:commit . "50e16f5031d281458bd574f07aad16c0d1d18663") (:authors ("Rahul Martim Juliato" . "rahul.juliato@gmail.com")) (:maintainers ("Rahul Martim Juliato" . "rahul.juliato@gmail.com")) (:maintainer "Rahul Martim Juliato" . "rahul.juliato@gmail.com") (:url . "https://github.com/LionyxML/ros"))])
  (org-rtm . [(20160214 1236) ((rtm (0 1))) "Simple import/export from rememberthemilk to org-mode" tar ((:commit . "adc42ad1fbe92ab447ccc9553780f4456f2508d2") (:authors ("Philipp Middendorf" . "pmidden@secure.mailbox.org")) (:maintainers ("Philipp Middendorf" . "pmidden@secure.mailbox.org")) (:maintainer "Philipp Middendorf" . "pmidden@secure.mailbox.org") (:keywords "outlines" "data") (:url . "https://github.com/pmiddend/org-rtm"))])
  (org-runbook . [(20230503 319) ((emacs (27 1)) (seq (2 3)) (f (0 20 0)) (s (1 12 0)) (dash (2 17 0)) (mustache (0 24)) (ht (0 9)) (ivy (0 8 0))) "Org mode for runbooks" tar ((:commit . "7ada3903a56266d60541d59ae92410e8ab6fe836") (:authors ("Tyler Dodge")) (:maintainers ("Tyler Dodge")) (:maintainer "Tyler Dodge") (:keywords "convenience" "processes" "terminals" "files") (:url . "https://github.com/tyler-dodge/org-runbook"))])
  (org-scrum . [(20200131 1129) ((emacs (24 5)) (org (8 2)) (seq (2 3)) (cl-lib (1 0))) "org mode extensions for scrum planning and reporting" tar ((:commit . "a383348ea80c2459bfb96fa0652b98f0059bd311") (:authors ("Ian Martins" . "ianxm@jhu.edu")) (:maintainers ("Ian Martins" . "ianxm@jhu.edu")) (:maintainer "Ian Martins" . "ianxm@jhu.edu") (:url . "https://github.com/ianxm/emacs-scrum"))])
@@ -3925,6 +3936,7 @@
  (org-visibility . [(20220929 1415) ((emacs (27 1))) "Persistent org tree visibility" tar ((:commit . "afa4b6f8ff274df87eb11f1afd0321084a45a2ab") (:authors ("Kyle W T Sherman" . "kylewsherman@gmail.com")) (:maintainers ("Kyle W T Sherman" . "kylewsherman@gmail.com")) (:maintainer "Kyle W T Sherman" . "kylewsherman@gmail.com") (:keywords "outlines" "convenience") (:url . "https://github.com/nullman/emacs-org-visibility"))])
  (org-wc . [(20200731 2244) nil "Count words in org mode trees." tar ((:commit . "dbbf794e4ec6c4080d945f43338185e34a4a582d") (:authors ("Simon Guest")) (:maintainers ("Simon Guest")) (:maintainer "Simon Guest"))])
  (org-web-tools . [(20231220 1515) ((emacs (27 1)) (org (9 0)) (compat (29 1 4 2)) (dash (2 12)) (esxml (0 3 4)) (s (1 10 0)) (plz (0 7 1)) (request (0 3 0))) "Display and capture web content with Org-mode" tar ((:commit . "7a6498f442fc7f29504745649948635c7165d847") (:authors ("Adam Porter" . "adam@alphapapa.net")) (:maintainers ("Adam Porter" . "adam@alphapapa.net")) (:maintainer "Adam Porter" . "adam@alphapapa.net") (:keywords "hypermedia" "outlines" "org" "web") (:url . "http://github.com/alphapapa/org-web-tools"))])
+ (org-web-track . [(20240424 756) ((emacs (29 1)) (request (0 3 0)) (enlive (0 0 1))) "Web data tracking framework in org mode" tar ((:commit . "92e97112aa63cbe14f7727b157eb3c11239bf86c") (:authors ("p-snow" . "public@p-snow.org")) (:maintainers ("p-snow" . "public@p-snow.org")) (:maintainer "p-snow" . "public@p-snow.org") (:keywords "org" "agenda" "web" "hypermedia") (:url . "https://github.com/p-snow/org-web-track"))])
  (org-wild-notifier . [(20240325 744) ((alert (1 2)) (async (1 9 3)) (dash (2 18 0)) (emacs (26 1))) "Customizable org-agenda notifications" tar ((:commit . "4c1679c12ebe0e4a97494d0673a5484f9e4d0ba6") (:authors ("Artem Khramov" . "akhramov+emacs@pm.me")) (:maintainers ("Artem Khramov" . "akhramov+emacs@pm.me")) (:maintainer "Artem Khramov" . "akhramov+emacs@pm.me") (:keywords "notification" "alert" "org" "org-agenda" "agenda") (:url . "https://github.com/akhramov/org-wild-notifier.el"))])
  (org-working-set . [(20230803 1640) ((org (9 3)) (dash (2 12)) (s (1 12)) (emacs (26 3))) "Manage and visit a small and changing set of org-nodes that you work on" tar ((:commit . "c83a63f34829dca137941bc06e29c34bf056a43b") (:authors ("Marc Ihm" . "marc@ihm.name")) (:maintainers ("Marc Ihm" . "marc@ihm.name")) (:maintainer "Marc Ihm" . "marc@ihm.name") (:url . "https://github.com/marcIhm/org-working-set"))])
  (org-wunderlist . [(20191017 1917) ((request-deferred (0 2 0)) (alert (1 1)) (emacs (24)) (cl-lib (0 5)) (org (8 2 4)) (s (1 9 0))) "Org sync with Wunderlist" tar ((:commit . "1a084bb49be4b5a1066db9cd9b7da2f8efab293f") (:authors ("myuhe <yuhei.maeda_at_gmail.com>")) (:maintainers ("myuhe")) (:maintainer "myuhe") (:keywords "convenience") (:url . "https://github.com/myuhe/org-wunderlist.el"))])
@@ -3945,7 +3957,7 @@
  (orglue . [(20200411 311) ((org (9 3)) (epic (0 2))) "more functionality to org-mode." tar ((:commit . "9d5a8e24be9acb8c55bb4d6aa8b98e30e2677401") (:authors ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainers ("Yoshinari Nomura" . "nom@quickhack.net")) (:maintainer "Yoshinari Nomura" . "nom@quickhack.net") (:keywords "org"))])
  (orgmdb . [(20231003 2144) ((emacs (27 1)) (dash (2 11 0)) (s (1 12 0)) (org (8 0 0))) "An OMDb API client with some convenience functions" tar ((:commit . "4338a0a34d500a214df8293590960011f761fe24") (:authors ("Isa Mert Gurbuz" . "isamert@protonmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamert@protonmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamert@protonmail.com") (:url . "https://github.com/isamert/orgmdb"))])
  (orgnav . [(20170608 1713) ((helm (2 7 0)) (s (1 11 0)) (dash (1 11 0)) (emacs (24))) "Org tree navigation using helm" tar ((:commit . "9e2cac9c1a67af5f0080e60022e821bf7b70312d") (:authors ("Facet Framer" . "facet@facetframer.com")) (:maintainers ("Facet Framer" . "facet@facetframer.com")) (:maintainer "Facet Framer" . "facet@facetframer.com") (:keywords "convenience" "outlines") (:url . "http://github.com/facetframer/orgnav"))])
- (orgnote . [(20231211 2104) ((emacs (27 1))) "Sync org-roam notes with OrgNote app" tar ((:commit . "0919f9fd05b83870b8a7073eb94f77199e681241") (:authors ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainers ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainer "Artur Yaroshenko" . "artawower@protonmail.com") (:url . "https://github.com/Artawower/orgnote.el"))])
+ (orgnote . [(20240516 1842) ((emacs (27 1))) "Sync org-roam notes with OrgNote app" tar ((:commit . "0b6ab72bede2fa757758016ae69db2cc8332fa2d") (:authors ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainers ("Artur Yaroshenko" . "artawower@protonmail.com")) (:maintainer "Artur Yaroshenko" . "artawower@protonmail.com") (:url . "https://github.com/Artawower/orgnote.el"))])
  (orgstrap . [(20230408 2232) ((emacs (24 4))) "Bootstrap an Org file using file local variables" tar ((:commit . "f35bccde556b0f82515e79ee69f4379469276356") (:authors ("Tom Gillespie")) (:maintainers ("Tom Gillespie")) (:maintainer "Tom Gillespie") (:keywords "lisp" "org" "org-mode" "bootstrap") (:url . "https://github.com/tgbugs/orgstrap"))])
  (orgtbl-aggregate . [(20240228 720) ((emacs (26 1))) "Create an aggregated Org table from another one" tar ((:commit . "cc129b543c472c704c8dc074500a8192ac3d9f88") (:keywords "data" "extensions") (:url . "https://github.com/tbanel/orgaggregate/blob/master/README.org"))])
  (orgtbl-ascii-plot . [(20230122 816) nil "ascii-art bar plots in org-mode tables" tar ((:commit . "4160128045b271bc1aef3d14dbf0c5b53ae58bd2") (:authors ("Thierry Banel  tbanelwebmin at free dot fr") ("Michael Brand")) (:maintainers ("Thierry Banel  tbanelwebmin at free dot fr")) (:maintainer "Thierry Banel  tbanelwebmin at free dot fr") (:keywords "org" "table" "ascii" "plot"))])
@@ -4038,7 +4050,7 @@
  (package+ . [(20230805 2115) ((emacs (24 3))) "Extensions for the package library." tar ((:commit . "57a53a1da75d76a9dcd17008d1c1d77475b9671a") (:authors ("Ryan Davis" . "ryand-ruby@zenspider.com")) (:maintainers ("Ryan Davis" . "ryand-ruby@zenspider.com")) (:maintainer "Ryan Davis" . "ryand-ruby@zenspider.com") (:keywords "extensions" "tools") (:url . "https://github.com/zenspider/package"))])
  (package-build . [(20240415 1547) ((emacs (26 1)) (compat (27 1))) "Tools for assembling a package archive" tar ((:commit . "d9ce37b82529827ce720ad3ccf4af887d19fcfb0") (:authors ("Donald Ephraim Curtis" . "dcurtis@milkbox.net") ("Steve Purcell" . "steve@sanityinc.com") ("Jonas Bernoulli" . "emacs.package-build@jonas.bernoulli.dev") ("Phil Hagelberg" . "technomancy@gmail.com")) (:maintainers ("Donald Ephraim Curtis" . "dcurtis@milkbox.net")) (:maintainer "Donald Ephraim Curtis" . "dcurtis@milkbox.net") (:keywords "maint" "tools") (:url . "https://github.com/melpa/package-build"))])
  (package-filter . [(20161122 719) nil "package archive whitelist and blacklist" tar ((:commit . "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b") (:authors ("Donald Ephraim Curtis" . "dcurtis@milkbox.net")) (:maintainers ("Donald Ephraim Curtis" . "dcurtis@milkbox.net")) (:maintainer "Donald Ephraim Curtis" . "dcurtis@milkbox.net") (:url . "https://github.com/milkypostman/package-filter"))])
- (package-lint . [(20240330 1458) ((emacs (24 4)) (let-alist (1 0 6))) "A linting library for elisp package authors" tar ((:commit . "17e4ab20dd3e36fa540007b4f4047170c23bdb10") (:authors ("Steve Purcell" . "steve@sanityinc.com") ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "lisp") (:url . "https://github.com/purcell/package-lint"))])
+ (package-lint . [(20240507 1722) ((emacs (24 4)) (let-alist (1 0 6))) "A linting library for elisp package authors" tar ((:commit . "cb8b0ddaa14cafe9e4ab9a81b2ad47319fd54f27") (:authors ("Steve Purcell" . "steve@sanityinc.com") ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "lisp") (:url . "https://github.com/purcell/package-lint"))])
  (package-lint-flymake . [(20240330 1458) ((emacs (26 1)) (package-lint (0 5))) "A package-lint Flymake backend" tar ((:commit . "17e4ab20dd3e36fa540007b4f4047170c23bdb10") (:url . "https://github.com/purcell/package-lint"))])
  (package-loading-notifier . [(20230809 446) ((emacs (25))) "Notify a package is being loaded" tar ((:commit . "f64f994cb1a55f9d59444deaec884bff0ed2b26e") (:authors ("SeungKi Kim" . "tttuuu888@gmail.com")) (:maintainers ("SeungKi Kim" . "tttuuu888@gmail.com")) (:maintainer "SeungKi Kim" . "tttuuu888@gmail.com") (:keywords "convenience" "faces" "config" "startup") (:url . "https://github.com/tttuuu888/package-loading-notifier"))])
  (package-utils . [(20220630 2345) ((restart-emacs (0 1 1))) "Extensions for package.el" tar ((:commit . "0168172062467b1bff913ea955b2ef709b43ecfa") (:authors ("Philippe Vaucher" . "philippe.vaucher@gmail.com")) (:maintainers ("Philippe Vaucher" . "philippe.vaucher@gmail.com")) (:maintainer "Philippe Vaucher" . "philippe.vaucher@gmail.com") (:keywords "package" "convenience") (:url . "https://github.com/Silex/package-utils"))])
@@ -4068,7 +4080,7 @@
  (paren-completer . [(20160501 1052) ((emacs (24 3))) "Automatically, language agnostically, fill in delimiters." tar ((:commit . "74183a8e13fa1266271bdcbcb4bfb29a4f915f0a") (:authors ("Matthew Bregg")) (:maintainers ("Matthew Bregg")) (:maintainer "Matthew Bregg") (:keywords "convenience") (:url . "https://github.com/MatthewBregg/paren-completer"))])
  (paren-face . [(20240415 1547) ((emacs (25 1)) (compat (29 1 4 1))) "A face for parentheses in lisp modes" tar ((:commit . "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7") (:authors ("Jonas Bernoulli" . "emacs.paren-face@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.paren-face@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.paren-face@jonas.bernoulli.dev") (:keywords "faces" "lisp") (:url . "https://github.com/tarsius/paren-face"))])
  (parent-mode . [(20240210 1906) nil "get major mode's parent modes" tar ((:commit . "9fe5363b2a190619641c79b3a40d874d8c8f9f40") (:authors ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainers ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainer "Fanael Linithien" . "fanael4@gmail.com") (:url . "https://github.com/Fanael/parent-mode"))])
- (parinfer-rust-mode . [(20240419 415) ((emacs (26 1))) "An interface for the parinfer-rust library" tar ((:commit . "823188f3d8d1f00693c3d1d754e58ad95ad0a8dd") (:authors ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainers ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainer "Justin Barclay" . "justinbarclay@gmail.com") (:keywords "lisp" "tools") (:url . "https://github.com/justinbarclay/parinfer-rust-mode"))])
+ (parinfer-rust-mode . [(20240506 816) ((emacs (26 1)) (track-changes (1 1))) "An interface for the parinfer-rust library" tar ((:commit . "d3bfb2745cc0858e2741dc2a2f00a86f456656ec") (:authors ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainers ("Justin Barclay" . "justinbarclay@gmail.com")) (:maintainer "Justin Barclay" . "justinbarclay@gmail.com") (:keywords "lisp" "tools") (:url . "https://github.com/justinbarclay/parinfer-rust-mode"))])
  (parrot . [(20220101 518) ((emacs (24 1))) "Party Parrot rotates gracefully in mode-line." tar ((:commit . "1d381f24d74242018e306d1a0c891bed9a465ac3") (:authors ("Daniel Ting" . "deep.paren.12@gmail.com")) (:maintainers ("Daniel Ting" . "deep.paren.12@gmail.com")) (:maintainer "Daniel Ting" . "deep.paren.12@gmail.com") (:keywords "party" "parrot" "rotate" "sirocco" "kakapo" "games") (:url . "https://github.com/dp12/parrot.git"))])
  (parse-csv . [(20160512 1723) nil "Parse strings with CSV fields into s-expressions" tar ((:commit . "96bef1ffbc89ea12d13311c9fa239c5c3e864890") (:authors ("Edward Marco Baringer (Common Lisp)") ("Matt Curtis" . "matt.r.curtis@gmail.com")) (:maintainers ("Matt Curtis" . "matt.r.curtis@gmail.com")) (:maintainer "Matt Curtis" . "matt.r.curtis@gmail.com") (:keywords "csv") (:url . "https://github.com/mrc/el-csv"))])
  (parse-it . [(20240101 946) ((emacs (25 1)) (s (1 12 0))) "Basic Parser in Emacs Lisp" tar ((:commit . "cdc4386ef8e94ccdeff3700021d4a944034ae559") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "parse" "parser" "lex" "lexer" "ast") (:url . "https://github.com/jcs-elpa/parse-it"))])
@@ -4108,8 +4120,8 @@
  (pd-remote . [(20230314 428) ((emacs (24 3)) (faust-mode (0 6)) (lua-mode (20210802))) "Pd remote control helper" tar ((:commit . "dcd68097d2b7468303517d91cb76682bfb47db63") (:authors ("Albert Graef" . "aggraef@gmail.com")) (:maintainers ("Albert Graef" . "aggraef@gmail.com")) (:maintainer "Albert Graef" . "aggraef@gmail.com") (:keywords "multimedia" "pure-data") (:url . "https://github.com/agraef/pd-remote"))])
  (pdb-capf . [(20200419 1237) ((emacs (25 1))) "Completion-at-point function for python debugger" tar ((:commit . "2f4099aa1330f87df4e9cd526de057ee9b71de6c") (:authors ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainers ("Andrii Kolomoiets" . "andreyk.mad@gmail.com")) (:maintainer "Andrii Kolomoiets" . "andreyk.mad@gmail.com") (:keywords "languages" "abbrev" "convenience") (:url . "https://github.com/muffinmad/emacs-pdb-capf"))])
  (pdb-mode . [(20150128 1751) nil "Major mode for editing Protein Data Bank files" tar ((:commit . "855fb18ebb73b5df30c8d7677c2bcd0f361b138a") (:authors (nil . "charles.bond@uwa.edu.au")) (:maintainers (nil . "aix.bing@gmail.com")) (:maintainer nil . "aix.bing@gmail.com") (:keywords "data" "pdb") (:url . "http://bondxray.org/software/pdb-mode/"))])
- (pdf-tools . [(20240411 1703) ((emacs (26 3)) (tablist (1 0)) (let-alist (1 0 4))) "Support library for PDF documents" tar ((:commit . "94e9f20a78f64a83daf641891923681a52d03919") (:authors ("Andreas Politz" . "mail@andreas-politz.de")) (:maintainers ("Vedang Manerikar" . "vedang.manerikar@gmail.com")) (:maintainer "Vedang Manerikar" . "vedang.manerikar@gmail.com") (:keywords "files" "multimedia") (:url . "http://github.com/vedang/pdf-tools/"))])
- (pdf-view-pagemark . [(20230901 2245) ((pdf-tools (0 90)) (posframe (1 4 2)) (emacs (26 0))) "Add indicator in pdfview mode to show the page remaining" tar ((:commit . "5a044bead5855c5fd46a691fee01dc931c959cab") (:authors ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainers ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainer "Kimi Ma" . "kimi.im@outlook.com") (:keywords "multimedia" "convenience") (:url . "https://github.com/kimim/pdf-view-pagemark"))])
+ (pdf-tools . [(20240429 407) ((emacs (26 3)) (tablist (1 0)) (let-alist (1 0 4))) "Support library for PDF documents" tar ((:commit . "30b50544e55b8dbf683c2d932d5c33ac73323a16") (:authors ("Andreas Politz" . "mail@andreas-politz.de")) (:maintainers ("Vedang Manerikar" . "vedang.manerikar@gmail.com")) (:maintainer "Vedang Manerikar" . "vedang.manerikar@gmail.com") (:keywords "files" "multimedia") (:url . "http://github.com/vedang/pdf-tools/"))])
+ (pdf-view-pagemark . [(20240518 626) ((pdf-tools (0 90)) (posframe (1 4 2)) (emacs (26 0))) "Add indicator in pdfview mode to show the page remaining" tar ((:commit . "a746cf8b86d030ebfc61bb2ff10c0e16b5d195c6") (:authors ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainers ("Kimi Ma" . "kimi.im@outlook.com")) (:maintainer "Kimi Ma" . "kimi.im@outlook.com") (:keywords "multimedia" "convenience") (:url . "https://github.com/kimim/pdf-view-pagemark"))])
  (pdf-view-restore . [(20190904 1708) ((pdf-tools (0 90)) (emacs (26 0))) "Support for opening last known pdf position in pdfview mode" tar ((:commit . "5a1947c01a3edecc9e0fe7629041a2f53e0610c9") (:authors ("Kevin Kim" . "kevinkim1991@gmail.com")) (:maintainers ("Kevin Kim" . "kevinkim1991@gmail.com")) (:maintainer "Kevin Kim" . "kevinkim1991@gmail.com") (:keywords "files" "convenience") (:url . "https://github.com/007kevin/pdf-view-restore"))])
  (pdfgrep . [(20210203 1730) ((emacs (24 4))) "run `pdfgrep' and display the results." tar ((:commit . "a4ca0a1e6521de93f28bb6736a5344b4974d144c") (:authors ("Jérémy Compostella" . "jeremy.compostella@gmail.com")) (:maintainers ("Jérémy Compostella" . "jeremy.compostella@gmail.com")) (:maintainer "Jérémy Compostella" . "jeremy.compostella@gmail.com") (:keywords "extensions" "mail" "pdf" "grep") (:url . "https://github.com/jeremy-compostella/pdfgrep"))])
  (peacock-theme . [(20170808 1320) ((emacs (24 0))) "an Emacs 24 theme based on Peacock (tmTheme)" tar ((:commit . "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8") (:authors ("Jason Milkins")) (:maintainers ("Jason Milkins")) (:maintainer "Jason Milkins") (:url . "https://github.com/emacsfodder/tmtheme-to-deftheme"))])
@@ -4120,7 +4132,7 @@
  (pelican-mode . [(20190124 2336) ((emacs (25))) "Minor mode for editing Pelican sites" tar ((:commit . "a69934885c7a3b303049e2418333b3915b8f8fb8") (:authors ("Joe Wreschnig" . "joe.wreschnig@gmail.com")) (:maintainers ("Joe Wreschnig" . "joe.wreschnig@gmail.com")) (:maintainer "Joe Wreschnig" . "joe.wreschnig@gmail.com") (:keywords "convenience" "editing") (:url . "https://git.korewanetadesu.com/pelican-mode.git"))])
  (pepita . [(20240102 401) ((emacs (25)) (csv (2 1))) "Run Splunk search commands, export results to CSV/HTML/JSON" tar ((:commit . "02ac00ad23b9a3e19797fc76ac569c2d46da54b9") (:authors ("Sebastian Monia" . "smonia@outlook.com")) (:maintainers ("Sebastian Monia" . "smonia@outlook.com")) (:maintainer "Sebastian Monia" . "smonia@outlook.com") (:keywords "tools" "convenience" "matching") (:url . "https://github.com/sebasmonia/pepita.git"))])
  (per-buffer-theme . [(20221002 2219) ((emacs (25 1))) "Change theme and font according to buffer name or major mode." tar ((:commit . "2cbb15c05edff4ce23ce61858cf16e8953cd58b3") (:authors ("Iñigo Serna" . "inigoserna@gmx.com")) (:maintainers ("Iñigo Serna" . "inigoserna@gmx.com")) (:maintainer "Iñigo Serna" . "inigoserna@gmx.com") (:keywords "themes") (:url . "https://hg.serna.eu/emacs/per-buffer-theme"))])
- (perfect-margin . [(20240111 1158) ((emacs (25 1))) "Auto center windows, works with line numbers" tar ((:commit . "bd15823219c93261536966b4dc65c1ae45a404cf") (:authors ("Randall Wang" . "randall.wjz@gmail.com")) (:maintainers ("Randall Wang" . "randall.wjz@gmail.com")) (:maintainer "Randall Wang" . "randall.wjz@gmail.com") (:keywords "convenience" "frames") (:url . "https://github.com/mpwang/perfect-margin"))])
+ (perfect-margin . [(20240512 1120) ((emacs (25 1))) "Auto center windows, works with line numbers" tar ((:commit . "d2973b0dc44b086353a2920a66fec0fcc1b3b60a") (:authors ("Randall Wang" . "randall.wjz@gmail.com")) (:maintainers ("Randall Wang" . "randall.wjz@gmail.com")) (:maintainer "Randall Wang" . "randall.wjz@gmail.com") (:keywords "convenience" "frames") (:url . "https://github.com/mpwang/perfect-margin"))])
  (perject . [(20230605 841) ((emacs (27 1)) (dash (2 10)) (transient (0 3 7))) "Session-persistent project management" tar ((:commit . "6357ab199c717191e7695a3e3c2545918b97a942") (:authors ("overideal")) (:maintainers ("overideal")) (:maintainer "overideal") (:url . "https://github.com/overideal/perject"))])
  (perlbrew . [(20230823 1652) nil "A perlbrew wrapper for Emacs" tar ((:commit . "527b7f6a6a5edd2b779ae98029e60994391c0903") (:authors ("Kentaro Kuribayashi" . "kentarok@gmail.com")) (:maintainers ("Kentaro Kuribayashi" . "kentarok@gmail.com")) (:maintainer "Kentaro Kuribayashi" . "kentarok@gmail.com") (:keywords "emacs" "perl"))])
  (persist-state . [(20230728 714) ((emacs (28 2))) "Regularly persist bookmarks, history, recent files and more" tar ((:commit . "0b0dd8dca90414db3395860c2bf32a4c736acfb4") (:authors ("Bram Schoenmakers" . "me@bramschoenmakers.nl")) (:maintainers ("Bram Schoenmakers" . "me@bramschoenmakers.nl")) (:maintainer "Bram Schoenmakers" . "me@bramschoenmakers.nl") (:keywords "convenience") (:url . "https://codeberg.org/bram85/emacs-persist-state.git"))])
@@ -4139,7 +4151,7 @@
  (pest-mode . [(20221231 15) ((emacs (26 3))) "Major mode for editing Pest files" tar ((:commit . "8023a92ce59c34dcd1587cbd85ed144f206ddb89") (:authors ("ksqsf" . "i@ksqsf.moe")) (:maintainers ("ksqsf" . "i@ksqsf.moe")) (:maintainer "ksqsf" . "i@ksqsf.moe") (:keywords "languages") (:url . "https://github.com/ksqsf/pest-mode"))])
  (pet . [(20230906 46) ((emacs (26 1)) (f (0 6 0)) (map (3 3 1)) (seq (2 24))) "Executable and virtualenv tracker for python-mode" tar ((:commit . "acd54c5b0171a82f88988b4fe2e6db112df5bf9a") (:authors ("Jimmy Yuen Ho Wong" . "wyuenho@gmail.com")) (:maintainers ("Jimmy Yuen Ho Wong" . "wyuenho@gmail.com")) (:maintainer "Jimmy Yuen Ho Wong" . "wyuenho@gmail.com") (:keywords "tools") (:url . "https://github.com/wyuenho/emacs-pet/"))])
  (pfuture . [(20220913 1401) ((emacs (25 2))) "a simple wrapper around asynchronous processes" tar ((:commit . "19b53aebbc0f2da31de6326c495038901bffb73c") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/pfuture"))])
- (pg . [(20240414 1912) ((emacs (28 1))) "Emacs Lisp socket-level interface to the PostgreSQL RDBMS" tar ((:commit . "4b71a337fedf16678e546fa8d1df0ea496762f40") (:authors ("Eric Marsden" . "eric.marsden@risk-engineering.org")) (:maintainers ("Eric Marsden" . "eric.marsden@risk-engineering.org")) (:maintainer "Eric Marsden" . "eric.marsden@risk-engineering.org") (:keywords "data" "comm" "database" "postgresql") (:url . "https://github.com/emarsden/pg-el"))])
+ (pg . [(20240520 1322) ((emacs (28 1)) (peg (1 0))) "Emacs Lisp socket-level interface to the PostgreSQL RDBMS" tar ((:commit . "0f20a0051ab898ea53903284c47a4703555380ca") (:authors ("Eric Marsden" . "eric.marsden@risk-engineering.org")) (:maintainers ("Eric Marsden" . "eric.marsden@risk-engineering.org")) (:maintainer "Eric Marsden" . "eric.marsden@risk-engineering.org") (:keywords "data" "comm" "database" "postgresql") (:url . "https://github.com/emarsden/pg-el"))])
  (pgdevenv . [(20150105 2236) nil "Manage your PostgreSQL development envs" tar ((:commit . "7f1d5bc734750aca98cf67a9491cdbd5615fd132") (:authors ("Dimitri Fontaine" . "dim@tapoueh.org")) (:maintainers ("Dimitri Fontaine" . "dim@tapoueh.org")) (:maintainer "Dimitri Fontaine" . "dim@tapoueh.org") (:keywords "emacs" "postgresql" "development" "environment" "shell" "debug" "gdb"))])
  (ph . [(20161029 1522) ((emacs (24 3))) "A global minor mode for managing multiple projects." tar ((:commit . "a66e38637d1898b2ec31ee611033ac3f295fd97f") (:authors ("Alexander Gromnitsky" . "alexander.gromnitsky@gmail.com")) (:maintainer "Alexander Gromnitsky" . "alexander.gromnitsky@gmail.com"))])
  (phabricator . [(20160510 1425) ((emacs (24 4)) (dash (1 0)) (projectile (0 13 0)) (s (1 10 0)) (f (0 17 2))) "Phabricator/Arcanist helpers for Emacs." tar ((:commit . "d09d6f059aea92d3b11c68664a5e80c901182ab8") (:authors ("Andrew Tulloch")) (:maintainers ("Andrew Tulloch")) (:maintainer "Andrew Tulloch") (:keywords "phabricator" "arcanist" "diffusion") (:url . "https://github.com/ajtulloch/phabricator.el"))])
@@ -4193,6 +4205,7 @@
  (pkg-info . [(20150517 1143) ((epl (0 8))) "Information about packages" tar ((:commit . "4dbe328c9eced79e0004e3fdcd7bfb997a928be5") (:authors ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainers ("Sebastian Wiesner" . "swiesner@lunaryorn.com")) (:maintainer "Sebastian Wiesner" . "swiesner@lunaryorn.com") (:keywords "convenience") (:url . "https://github.com/lunaryorn/pkg-info.el"))])
  (pkg-overview . [(20210802 1509) ((emacs (24 3))) "Make org documentation from elisp source file" tar ((:commit . "9b2e416758a6c107bb8cc670ec4d2627f82d5590") (:authors ("Boruch Baum" . "boruch_baum@gmx.com")) (:maintainers ("Boruch Baum" . "boruch_baum@gmx.com")) (:maintainer "Boruch Baum" . "boruch_baum@gmx.com") (:keywords "docs" "help" "lisp" "maint" "outlines" "tools") (:url . "https://github.com/Boruch-Baum/emacs-pkg-overview"))])
  (pkgbuild-mode . [(20220802 1951) ((emacs (26 1))) "Interface to the ArchLinux package manager" tar ((:commit . "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067") (:authors ("Juergen Hoetzel" . "juergen@hoetzel.info")) (:maintainers ("Juergen Hoetzel" . "juergen@hoetzel.info")) (:maintainer "Juergen Hoetzel" . "juergen@hoetzel.info") (:keywords "languages") (:url . "https://github.com/juergenhoetzel/pkgbuild-mode"))])
+ (pkl-mode . [(20240422 1529) ((emacs (24 3))) "Major mode for editing Pkl files" tar ((:commit . "c57fe374a9c57eee6432d0b449e410ab8dc40a89") (:authors ("sin-ack" . "sin-ack@protonmail.com")) (:maintainers ("sin-ack" . "sin-ack@protonmail.com")) (:maintainer "sin-ack" . "sin-ack@protonmail.com") (:keywords "languages" "pkl") (:url . "https://github.com/sin-ack/pkl-mode"))])
  (plain-org-wiki . [(20201217 1027) ((emacs (24 3)) (ivy (0 12 0))) "Simple jump-to-org-files in a directory package" tar ((:commit . "faeeb54ca808bbf0f4380a938e75805b7a78dbf7") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "convenience") (:url . "https://github.com/abo-abo/plain-org-wiki"))])
  (plain-theme . [(20171124 410) ((emacs (24))) "Plain theme without syntax highlighting" tar ((:commit . "2609a811335d58cfb73a65d6307c156fe09037d3"))])
  (plan9-theme . [(20180804 1441) nil "A color theme for Emacs based on Plan9" tar ((:commit . "4c1050b8ed42e0f99ef64c77ec370a786bd0003c") (:authors ("John Louis Del Rosario" . "john2x@gmail.com")) (:maintainers ("John Louis Del Rosario" . "john2x@gmail.com")) (:maintainer "John Louis Del Rosario" . "john2x@gmail.com") (:url . "https://github.com/john2x/plan9-theme.el"))])
@@ -4228,7 +4241,7 @@
  (poke-line . [(20201023 247) ((emacs (24 3))) "Minor mode to show position in a buffer using a Pokemon" tar ((:commit . "8d484dbaa1215d902fbd1e3c9163b39a43ec532a") (:authors ("Ryan Miller" . "ryan@devopsmachine.com")) (:maintainers ("Ryan Miller" . "ryan@devopsmachine.com")) (:maintainer "Ryan Miller" . "ryan@devopsmachine.com") (:keywords "pokemon" "fun" "mode-line" "mouse") (:url . "https://github.com/RyanMillerC/poke-line/"))])
  (pollen-mode . [(20220904 447) ((emacs (24 3)) (cl-lib (0 5))) "major mode for editing pollen files" tar ((:commit . "19174fab69ce4d2ae903ef2c3da44054e8b84268") (:authors ("Junsong Li <ljs.darkfish AT GMAIL>")) (:maintainers ("Junsong Li")) (:maintainer "Junsong Li") (:keywords "languages" "pollen" "pollenpub") (:url . "https://github.com/lijunsong/pollen-mode"))])
  (poly-R . [(20230416 1454) ((emacs (25)) (polymode (0 2 2)) (poly-markdown (0 2 2)) (poly-noweb (0 2 2))) "Various polymodes for R language" tar ((:commit . "8024e852cfca642dea2045a41b2033baa2f1f9a5") (:authors ("Vitalie Spinu")) (:maintainers ("Vitalie Spinu")) (:maintainer "Vitalie Spinu") (:keywords "languages" "multi-modes") (:url . "https://github.com/polymode/poly-R"))])
- (poly-ansible . [(20240418 1123) ((ansible (0 2)) (ansible-doc (0 4)) (emacs (24 1)) (jinja2-mode (0 2)) (polymode (0 2))) "Polymode for Ansible: Jinja2 in YAML" tar ((:commit . "5c4423671c051db26a48de72773abdf2395bb6aa") (:authors ("Peter Oliver" . "poly-ansible@mavit.org.uk")) (:maintainers ("Peter Oliver" . "poly-ansible@mavit.org.uk")) (:maintainer "Peter Oliver" . "poly-ansible@mavit.org.uk") (:keywords "languages") (:url . "https://gitlab.com/mavit/poly-ansible/"))])
+ (poly-ansible . [(20240520 1500) ((ansible (0 2)) (ansible-doc (0 4)) (emacs (24 1)) (jinja2-mode (0 2)) (polymode (0 2)) (yaml-mode (0 0 13))) "Polymode for Ansible: Jinja2 in YAML" tar ((:commit . "187ad18b7c03eb2b286b4d49eb36572bb7847d57") (:authors ("Peter Oliver" . "poly-ansible@mavit.org.uk")) (:maintainers ("Peter Oliver" . "poly-ansible@mavit.org.uk")) (:maintainer "Peter Oliver" . "poly-ansible@mavit.org.uk") (:keywords "languages") (:url . "https://gitlab.com/mavit/poly-ansible/"))])
  (poly-erb . [(20200316 1314) ((emacs (25)) (polymode (0 2 2))) "Polymode for erb" tar ((:commit . "56c744b8d87d8cbe0aba2696d4e8525afc4aa0e8") (:authors ("Siavash Sajjadi and Vitalie Spinu")) (:maintainers ("Vitalie Spinu")) (:maintainer "Vitalie Spinu") (:keywords "emacs") (:url . "https://github.com/polymode/poly-erb"))])
  (poly-markdown . [(20230202 1210) ((emacs (25)) (polymode (0 2 2)) (markdown-mode (2 3))) "Polymode for markdown-mode" tar ((:commit . "98695eb7ca4ca11dcec71a1cab64903bbf79b4d3") (:authors ("Vitalie Spinu")) (:maintainers ("Vitalie Spinu")) (:maintainer "Vitalie Spinu") (:keywords "emacs") (:url . "https://github.com/polymode/poly-markdown"))])
  (poly-noweb . [(20200316 1315) ((emacs (25)) (polymode (0 2 2))) "Polymode for noweb" tar ((:commit . "3b0cd36ca9a707e8a09337a3468fa85d81fc461c") (:authors ("Vitalie Spinu")) (:maintainers ("Vitalie Spinu")) (:maintainer "Vitalie Spinu") (:keywords "languages" "multi-modes") (:url . "https://github.com/polymode/poly-noweb"))])
@@ -4258,7 +4271,7 @@
  (portage-navi . [(20141208 1355) ((concurrent (0 3 1)) (ctable (0 1 2))) "portage viewer" tar ((:commit . "8016c3e99fe6cef101d479a3d69185796b22ca2f") (:authors ("<m.sakurai at kiwanami.net>")) (:maintainers ("<m.sakurai at kiwanami.net>")) (:maintainer "<m.sakurai at kiwanami.net>") (:keywords "tools" "gentoo") (:url . "https://github.com/kiwanami/emacs-portage-navi"))])
  (porthole . [(20200404 1454) ((emacs (26)) (web-server (0 1 2)) (f (0 19 0)) (json-rpc-server (0 1 2))) "RPC Servers in Emacs" tar ((:commit . "9e68b419acf9245208f8094e10041b7f04511473") (:authors ("GitHub user \"Jcaw\"")) (:maintainers ("GitHub user \"Jcaw\"")) (:maintainer "GitHub user \"Jcaw\"") (:keywords "comm" "rpc" "http" "json") (:url . "https://github.com/jcaw/porthole"))])
  (pos-tip . [(20240209 837) nil "Show tooltip at point" tar ((:commit . "4889e08cf9077c8589ea6fea4e2ce558614dfcde") (:authors ("S. Irie")) (:maintainers ("S. Irie")) (:maintainer "S. Irie") (:keywords "tooltip"))])
- (posframe . [(20240426 604) ((emacs (26 1))) "Pop a posframe (just a frame) at point" tar ((:commit . "468ac1ab50d7e0feae2c06f12596bbc169f2abe4") (:authors ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "tooltip") (:url . "https://github.com/tumashu/posframe"))])
+ (posframe . [(20240507 148) ((emacs (26 1))) "Pop a posframe (just a frame) at point" tar ((:commit . "f4e9e509ba96ceb3c2b2b054957291607fb52651") (:authors ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "tooltip") (:url . "https://github.com/tumashu/posframe"))])
  (posix-manual . [(20231215 1604) ((emacs (24))) "POSIX manual page lookup" tar ((:commit . "428b10d011082a57db0ce310fad6cd092267e139") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/lassik/emacs-posix-manual"))])
  (postcss-sorting . [(20180211 956) ((emacs (24))) "postcss-sorting interface" tar ((:commit . "deb0c935d2904c11a965758a9aee5a0e905f21fc") (:authors ("Peiwen Lu" . "hi@peiwen.lu")) (:maintainers ("Peiwen Lu" . "hi@peiwen.lu")) (:maintainer "Peiwen Lu" . "hi@peiwen.lu") (:url . "https://github.com/P233/postcss-sorting.el"))])
  (pov-mode . [(20161115 743) nil "Major mode for editing POV-Ray scene files." tar ((:commit . "9fc1db3aab7c27155674dd1a87ec62606035d074") (:authors ("Peter Boettcher" . "pwb@andrew.cmu.edu")) (:maintainer "Marco Pessotto" . "melmothx@gmail.com") (:keywords "pov" "povray"))])
@@ -4304,6 +4317,7 @@
  (prognth . [(20130920 1759) nil "Extend prog1 to arbitrary index" tar ((:commit . "2f1ca4d34b1fd581163e1df122c85418137e8e62") (:authors ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matus Goljer" . "matus.goljer@gmail.com") (:keywords "lisp"))])
  (programmer-dvorak . [(20150427 137) nil "Input method for Programmer Dvorak." tar ((:commit . "c35d5e3b8b53c1e9341957b5d5db40387ba0c8ee") (:authors ("Chenyun Yang" . "yangchenyun@gmail.com")) (:maintainers ("Chenyun Yang" . "yangchenyun@gmail.com")) (:maintainer "Chenyun Yang" . "yangchenyun@gmail.com") (:keywords "dvorak" "programmer-dvorak" "input-method") (:url . "https://github.com/yangchenyun/programmer-dvorak"))])
  (project-abbrev . [(20240101 932) ((emacs (25 1))) "Customize abbreviation expansion in the project" tar ((:commit . "71bceb21c9d9df3ee00c9fbd420fd0c2733941a1") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "abbrev" "abbreviation" "customizable" "shortcut") (:url . "https://github.com/jcs-elpa/project-abbrev"))])
+ (project-butler . [(20240520 943) ((emacs (28 1))) "Lay out a project's buffers" tar ((:commit . "1cf28f5e5e584bac2411662405c96f13d43179f9") (:authors ("Stefan Thesing" . "software@webdings.de")) (:maintainers ("Stefan Thesing" . "software@webdings.de")) (:maintainer "Stefan Thesing" . "software@webdings.de") (:keywords "convenience" "projects") (:url . "https://codeberg.org/jabbo/project-butler"))])
  (project-explorer . [(20150504 14) ((cl-lib (0 3)) (es-lib (0 3)) (es-windows (0 1)) (emacs (24))) "A project explorer sidebar" tar ((:commit . "589a09008706f5f4ef91393dc4306eede0d15ca9") (:authors ("sabof")) (:maintainers ("sabof")) (:maintainer "sabof") (:url . "https://github.com/sabof/project-explorer"))])
  (project-mode-line-tag . [(20231215 807) ((emacs (25 1))) "Display a buffer's project in its mode line" tar ((:commit . "c63f254e006ddf6ad12c7dc15eed0484d57a8cb5") (:authors ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainers ("Fritz Grabo" . "hello@fritzgrabo.com")) (:maintainer "Fritz Grabo" . "hello@fritzgrabo.com") (:keywords "convenience") (:url . "https://github.com/fritzgrabo/project-mode-line-tag"))])
  (project-persist . [(20180906 1302) nil "A minor mode to allow loading and saving of project settings." tar ((:commit . "26d9435bef44da2a1b0892eba822f9f487b98eec") (:authors ("Robert Dallas Gray")) (:maintainer "Robert Dallas Gray") (:keywords "project" "persistence") (:url . "https://github.com/rdallasgray/project-persist"))])
@@ -4322,9 +4336,9 @@
  (projectile-speedbar . [(20190807 2010) ((projectile (0 11 0)) (sr-speedbar (0))) "projectile integration for speedbar" tar ((:commit . "93320e467ee78772065e599a5dba94889a77db22") (:authors ("Anshul Verma" . "anshul.verma86@gmail.com")) (:maintainers ("Anshul Verma" . "anshul.verma86@gmail.com")) (:maintainer "Anshul Verma" . "anshul.verma86@gmail.com") (:keywords "project" "convenience" "speedbar" "projectile") (:url . "https://github.com/anshulverma/projectile-speedbar"))])
  (projectile-trailblazer . [(20170928 1624) ((emacs (24 4)) (projectile (0 12 0)) (inflections (1 1)) (inf-ruby (2 2 6)) (f (0 13 0)) (rake (0 3 2))) "Minor mode for Rails projects using trailblazer" tar ((:commit . "79299498d74876f2ac3fe8075716b39a5bdd04cd") (:authors ("Michael Dahl" . "michael.dahl84@gmail.com")) (:maintainers ("Michael Dahl" . "michael.dahl84@gmail.com")) (:maintainer "Michael Dahl" . "michael.dahl84@gmail.com") (:keywords "rails" "projectile" "trailblazer" "languages") (:url . "https://github.com/micdahl/projectile-trailblazer"))])
  (projectile-variable . [(20230916 441) ((emacs (24)) (cl-lib (0 5))) "Store project local variables." tar ((:commit . "fa6bf595529156ee3b6d08f90ebea3b4ab7c5ef8") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "project" "convenience") (:url . "https://github.com/emacs-php/projectile-variable"))])
- (projection . [(20240421 1410) ((emacs (29 1)) (project (0 9 8)) (compat (29 1 4 1)) (f (0 20)) (s (1 13))) "Project type support for `project'" tar ((:commit . "d0aa74fbe08d7e28b95a0d2006399565f51655ef") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
+ (projection . [(20240517 2023) ((emacs (29 1)) (project (0 9 8)) (compat (29 1 4 1)) (f (0 20)) (s (1 13))) "Project type support for `project'" tar ((:commit . "c6df3b19204113642ee14a87598d65c03688f0fa") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
  (projection-dape . [(20240325 1931) ((emacs (29 1)) (projection (0 1)) (dape (0 8))) "Projection integration for `dape'" tar ((:commit . "68abb9dfab5e85daa31961be10362ca02effeeeb") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
- (projection-multi . [(20240316 2222) ((emacs (29 1)) (projection (0 1)) (compile-multi (0 5))) "Projection integration for `compile-multi'" tar ((:commit . "dc489480a6e4be82e570266202144730b3ddde5f") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
+ (projection-multi . [(20240517 2021) ((emacs (29 1)) (projection (0 1)) (compile-multi (0 5))) "Projection integration for `compile-multi'" tar ((:commit . "68f2387219f2627506f5e345e9be04bd11aa0e65") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
  (projection-multi-embark . [(20231008 937) ((emacs (29 1)) (projection (0 1)) (compile-multi-embark (0 5))) "Integration for `projection-multi' and `embark'" tar ((:commit . "928602ddd3003913cfefe343b5f057bfa360c0fe") (:authors ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainers ("Mohsin Kaleem" . "mohkale@kisara.moe")) (:maintainer "Mohsin Kaleem" . "mohkale@kisara.moe") (:keywords "project" "convenience") (:url . "https://github.com/mohkale/projection"))])
  (projector . [(20211112 1514) ((alert (1 1)) (cl-lib (0 5))) "Lightweight library for managing project-aware shell and command buffers" tar ((:commit . "1d0f2d307591ea50888d31dcae7e463e2ada1316") (:authors ("Justin Talbott" . "justin@waymondo.com")) (:maintainers ("Justin Talbott" . "justin@waymondo.com")) (:maintainer "Justin Talbott" . "justin@waymondo.com") (:url . "https://github.com/waymondo/projector.el"))])
  (projekt . [(20150324 848) ((emacs (24))) "some kind of staging for CVS" tar ((:commit . "a65e554e5d8b0def08c5d06f3fe34fec40bebd83") (:authors ("Engelke Eschner" . "tekai@gmx.li")) (:maintainers ("Engelke Eschner" . "tekai@gmx.li")) (:maintainer "Engelke Eschner" . "tekai@gmx.li"))])
@@ -4334,7 +4348,7 @@
  (prompt-text . [(20190408 310) nil "Configure your minibuffer prompt" tar ((:commit . "b842bf13c53d0a2bd2bc7a00d37cc713d69fa9e9") (:authors ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainers ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainer "10sr <8slashes+el [at] gmail [dot] com>") (:keywords "utility" "minibuffer") (:url . "https://github.com/10sr/prompt-text-el"))])
  (prompts . [(20160916 1041) ((dash (2 13 0))) "utilities for working with text prompts." tar ((:commit . "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26") (:authors ("Ben Moon" . "guiltydolphin@gmail.com")) (:maintainers ("Ben Moon" . "guiltydolphin@gmail.com")) (:maintainer "Ben Moon" . "guiltydolphin@gmail.com") (:keywords "input" "minibuffer") (:url . "https://github.com/guiltydolphin/prompts.el"))])
  (pronto . [(20200218 1633) ((emacs (24))) "Compilation mode for pronto stylechecks" tar ((:commit . "c0cd13d8219879610b7fe284b182a9db4d3d40b3") (:authors ("Julian Rubisch" . "julian@julianrubisch.at")) (:maintainers ("Julian Rubisch" . "julian@julianrubisch.at")) (:maintainer "Julian Rubisch" . "julian@julianrubisch.at") (:keywords "processes" "tools") (:url . "https://github.com/julianrubisch/pronto.el"))])
- (proof-general . [(20240425 939) ((emacs (25 2))) "A generic Emacs interface for proof assistants" tar ((:commit . "6cace58d0d632c4eafa18959319a484fb5c07238") (:maintainers (nil . "proof-general-maintainers@groupes.renater.fr")) (:maintainer nil . "proof-general-maintainers@groupes.renater.fr") (:url . "https://proofgeneral.github.io/"))])
+ (proof-general . [(20240513 720) ((emacs (25 2))) "A generic Emacs interface for proof assistants" tar ((:commit . "55e133360c1b66b834f9ae2c4478d2c81b2d33ef") (:maintainers (nil . "proof-general-maintainers@groupes.renater.fr")) (:maintainer nil . "proof-general-maintainers@groupes.renater.fr") (:url . "https://proofgeneral.github.io/"))])
  (prop-menu . [(20150728 1118) ((emacs (24 3)) (cl-lib (0 5))) "Create and display a context menu based on text and overlay properties" tar ((:commit . "50b102c1c0935fd3e0c465feed7f27d66b21cdf3") (:authors ("David Christiansen" . "david@davidchristiansen.dk")) (:maintainers ("David Christiansen" . "david@davidchristiansen.dk")) (:maintainer "David Christiansen" . "david@davidchristiansen.dk") (:keywords "convenience") (:url . "https://github.com/david-christiansen/prop-menu-el"))])
  (propfont-mixed . [(20150113 2211) ((emacs (24)) (cl-lib (0 5))) "Use proportional fonts with space-based indentation." tar ((:commit . "0b461ef4754a469610dba71874a34b6da42176bf") (:authors ("Kirill Ignatiev <github.com/ikirill>")) (:maintainers ("Kirill Ignatiev <github.com/ikirill>")) (:maintainer "Kirill Ignatiev <github.com/ikirill>") (:keywords "faces") (:url . "https://github.com/ikirill/propfont-mixed"))])
  (proportional . [(20221205 1417) ((emacs (25 1))) "use a proportional font everywhere" tar ((:commit . "6b675694292a5dbebb52b6196e8ccee6e3a73042") (:authors ("Johannes Goslar")) (:maintainers ("Johannes Goslar")) (:maintainer "Johannes Goslar") (:keywords "faces") (:url . "https://github.com/ksjogo/proportional"))])
@@ -4346,7 +4360,7 @@
  (psalm . [(20230914 1925) ((emacs (27 1)) (php-mode (1 22 3))) "Interface to Psalm" tar ((:commit . "9449c09b8d570705aa74b5aef7651893b482cc66") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "tools" "php") (:url . "https://github.com/emacs-php/psalm.el"))])
  (psc-ide . [(20240113 1224) ((emacs (25)) (dash (2 18 0)) (company (0 8 7)) (s (1 10 0)) (flycheck (0 24)) (let-alist (1 0 4)) (seq (1 11)) (inheritenv (0 2))) "Minor mode for PureScript's IDE server." tar ((:commit . "4e614df553fb315d32ee9dac085109ee7786a3cf") (:authors ("Erik Post" . "erik@shinsetsu.nl") ("Dmitry Bushenko" . "d.bushenko@gmail.com") ("Christoph Hegemann" . "christoph.hegemann1337@gmail.com") ("Brian Sermons")) (:maintainers ("Erik Post" . "erik@shinsetsu.nl")) (:maintainer "Erik Post" . "erik@shinsetsu.nl") (:keywords "languages") (:url . "https://github.com/purescript-emacs/psc-ide-emacs"))])
  (psci . [(20231219 52) ((emacs (25 1)) (purescript-mode (13 10)) (dash (2 9 0)) (inheritenv (0 2))) "Major mode for purescript repl psci" tar ((:commit . "ef31045295f29485fc697892fba53390fe193595") (:authors ("Antoine R. Dumont <eniotna.t AT gmail.com>")) (:maintainers ("Antoine R. Dumont <eniotna.t AT gmail.com>")) (:maintainer "Antoine R. Dumont <eniotna.t AT gmail.com>") (:keywords "languages" "purescript" "psci" "repl") (:url . "https://github.com/purescript-emacs/emacs-psci"))])
- (psession . [(20231117 1648) ((emacs (24)) (cl-lib (0 5)) (async (1 9 3))) "Persistent save of elisp objects." tar ((:commit . "5fdca68ca4bf4fafaf3aa438401ec611bc430782") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://github.com/thierryvolpiatto/psession"))])
+ (psession . [(20240515 1449) ((emacs (24)) (cl-lib (0 5)) (async (1 9 3))) "Persistent save of elisp objects." tar ((:commit . "5a5b11df882339b4474ab0cc6dd847aaab6a84b6") (:authors ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainers ("Thierry Volpiatto" . "thievol@posteo.net")) (:maintainer "Thierry Volpiatto" . "thievol@posteo.net") (:url . "https://github.com/thierryvolpiatto/psession"))])
  (psysh . [(20230815 730) ((emacs (24 3)) (s (1 9 0)) (php-runtime (0 2))) "PsySH, PHP interactive shell (REPL)" tar ((:commit . "8bf82fa68ca90fc72528ea406f0e57718bcb1cbf") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "processes" "php") (:url . "https://github.com/emacs-php/psysh.el"))])
  (pt . [(20161226 1959) nil "A front-end for pt, The Platinum Searcher." tar ((:commit . "6d99b2aaded3ece3db19a20f4b8f1d4abe382622") (:authors ("Bailey Ling")) (:maintainers ("Bailey Ling")) (:maintainer "Bailey Ling") (:keywords "pt" "ack" "ag" "grep" "search") (:url . "https://github.com/bling/pt.el"))])
  (ptemplate . [(20210324 1446) ((emacs (25 1)) (yasnippet (0 13 0))) "Project templates" tar ((:commit . "b81cc7be8865745c3a60177a244d2a69729ab21b") (:authors ("Nikita Bloshchanevich" . "nikblos@outlook.com")) (:maintainers ("Nikita Bloshchanevich" . "nikblos@outlook.com")) (:maintainer "Nikita Bloshchanevich" . "nikblos@outlook.com") (:url . "https://github.com/nbfalcon/ptemplate"))])
@@ -4384,7 +4398,7 @@
  (pyenv-mode . [(20230821 1645) ((emacs (25 1)) (pythonic (0 1 0))) "Integrate pyenv with python-mode" tar ((:commit . "6820aa6673e6a51ace88611a58b423b5b1effb19") (:authors ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainers ("Artem Malyshev" . "proofit404@gmail.com")) (:maintainer "Artem Malyshev" . "proofit404@gmail.com") (:url . "https://github.com/proofit404/pyenv-mode"))])
  (pygen . [(20161121 506) ((elpy (1 12 0)) (python-mode (6 2 2)) (dash (2 13 0))) "Python code generation using Elpy and Python-mode." tar ((:commit . "3a5d1d1a0640865b15be05cd1eeb33bb4793b622") (:authors ("Jack Crawley <http://www.github.com/jackcrawley>")) (:maintainers ("Jack Crawley <http://www.github.com/jackcrawley>")) (:maintainer "Jack Crawley <http://www.github.com/jackcrawley>") (:keywords "python" "code generation") (:url . "https://github.com/JackCrawley/pygen/"))])
  (pygn-mode . [(20230606 42) ((emacs (26 1)) (tree-sitter (0 15 2)) (tree-sitter-langs (0 10 7)) (uci-mode (0 5 4)) (nav-flash (1 0 0)) (ivy (0 10 0))) "Major-mode for chess PGN files, powered by Python" tar ((:commit . "9957f3e70b48b6cde77e26253feddad2cd4ca0f0") (:authors ("Dodge Coates and Roland Walker")) (:maintainers ("Dodge Coates and Roland Walker")) (:maintainer "Dodge Coates and Roland Walker") (:keywords "data" "games" "chess") (:url . "https://github.com/dwcoates/pygn-mode"))])
- (pyim . [(20230908 39) ((emacs (27 1)) (async (1 6)) (xr (1 13))) "A Chinese input method support quanpin, shuangpin, wubi, cangjie and rime." tar ((:commit . "64067b20ce0e964b1342b378180f24a1d4503797") (:authors ("Ye Wenbin" . "wenbinye@163.com") ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "chinese" "pinyin" "input-method") (:url . "https://github.com/tumashu/pyim"))])
+ (pyim . [(20240508 256) ((emacs (27 1)) (async (1 6)) (xr (1 13))) "A Chinese input method support quanpin, shuangpin, wubi, cangjie and rime." tar ((:commit . "f22c20f2e6af55b3a758defabe4c842fb94cde2b") (:authors ("Ye Wenbin" . "wenbinye@163.com") ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "chinese" "pinyin" "input-method") (:url . "https://github.com/tumashu/pyim"))])
  (pyim-basedict . [(20220614 1108) nil "The default pinyin dict of pyim" tar ((:commit . "d61af27686f7a39e6c138b7261a686e7ea7a0ef7") (:authors ("Feng Shu" . "tumashu@163.com")) (:maintainers ("Feng Shu" . "tumashu@163.com")) (:maintainer "Feng Shu" . "tumashu@163.com") (:keywords "convenience" "chinese" "pinyin" "input-method" "complete") (:url . "https://github.com/tumashu/pyim-basedict"))])
  (pyim-cangjiedict . [(20210617 934) ((pyim (3 7))) "Some cangjie dicts for pyim" tar ((:commit . "d17e3d32a6480939b350a91a915ebe8e6efad819") (:authors ("Yuanchen Xie" . "yuanchen.gm@gmail.com")) (:maintainers ("Yuanchen Xie" . "yuanchen.gm@gmail.com")) (:maintainer "Yuanchen Xie" . "yuanchen.gm@gmail.com") (:keywords "convenience" "chinese" "pinyin" "input-method" "complete") (:url . "https://github.com/p1uxtar/pyim-cangjiedict"))])
  (pyim-smzmdict . [(20210505 1445) ((pyim (3 7))) "Sanma(triple) Zhengma dict for pyim" tar ((:commit . "fcddbde17a04d174c7353548056524687f7be8d2") (:authors ("Yue Shi (Zhizhi)")) (:maintainers ("Yuanchen Xie")) (:maintainer "Yuanchen Xie") (:keywords "convenience" "i18n" "pyim" "chinese" "zhengma") (:url . "https://github.com/p1uxtar/pyim-smzmdict"))])
@@ -4397,16 +4411,16 @@
  (pyramid . [(20230114 1049) ((emacs (25 2)) (pythonic (0 1 1)) (tablist (0 70))) "Minor mode for working with pyramid projects" tar ((:commit . "c8a8b36725d85664e74f59600fe5d18d06ea907d") (:authors ("Daniel Kraus" . "daniel@kraus.my")) (:maintainers ("Daniel Kraus" . "daniel@kraus.my")) (:maintainer "Daniel Kraus" . "daniel@kraus.my") (:keywords "python" "pyramid" "pylons" "convenience" "tools" "processes") (:url . "https://github.com/dakra/pyramid.el"))])
  (pytest . [(20230810 1218) ((s (1 9 0))) "Easy Python test running in Emacs" tar ((:commit . "8692f965bf4ddf3d755cf1fbf77a7a768e22460e") (:keywords "pytest" "python" "testing") (:url . "https://github.com/ionrock/pytest-el"))])
  (pytest-pdb-break . [(20200804 848) ((emacs (25))) "A pytest PDB launcher" tar ((:commit . "05d227493b7b96f3556cba22f215cb85f9282020") (:authors ("Jane Soko" . "poppyschmo@protonmail.com")) (:maintainers ("Jane Soko" . "poppyschmo@protonmail.com")) (:maintainer "Jane Soko" . "poppyschmo@protonmail.com") (:keywords "languages" "tools") (:url . "https://github.com/poppyschmo/pytest-pdb-break"))])
- (python-black . [(20230313 1037) ((emacs (25)) (dash (2 16 0)) (reformatter (0 3))) "Reformat Python using python-black" tar ((:commit . "0714b0007c0b620f88ed9cc91035caea43f3d75f") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "languages") (:url . "https://github.com/wbolster/emacs-python-black"))])
+ (python-black . [(20240520 729) ((emacs (25)) (dash (2 16 0)) (reformatter (0 3))) "Reformat Python using python-black" tar ((:commit . "4da1519345b3d5c513d82ef0d39536dd9c626d42") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "languages") (:url . "https://github.com/wbolster/emacs-python-black"))])
  (python-cell . [(20240126 841) ((emacs (25 1))) "Support for MATLAB-like cells in python mode" tar ((:commit . "ea469071adc72f371698934c3709ee370ac6be6f") (:authors ("Thomas Hisch" . "t.hisch@gmail.com")) (:maintainers ("Thomas Hisch" . "t.hisch@gmail.com")) (:maintainer "Thomas Hisch" . "t.hisch@gmail.com") (:keywords "extensions" "python" "matlab" "cell") (:url . "https://github.com/thisch/python-cell.el"))])
- (python-coverage . [(20211224 1420) ((emacs (25 1)) (dash (2 18 0)) (s (1 12 0)) (xml+ (1))) "Show Python coverage via overlays or Flycheck" tar ((:commit . "a341615af03dbe3ce0ac9b63cf43dc01c1ae5ebe") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "languages" "processes" "tools") (:url . "https://github.com/wbolster/emacs-python-coverage"))])
+ (python-coverage . [(20240509 856) ((emacs (25 1)) (dash (2 18 0)) (s (1 12 0)) (xml+ (1))) "Show Python coverage via overlays or Flycheck" tar ((:commit . "7f130066460ab8a58c2667d9f76a3e2c168e0759") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "languages" "processes" "tools") (:url . "https://github.com/wbolster/emacs-python-coverage"))])
  (python-django . [(20150822 404) nil "A Jazzy package for managing Django projects" tar ((:commit . "fc54ad74f0309670359b939f64d0f1fff68aeac4") (:authors ("Fabián E. Gallina" . "fabian@anue.biz")) (:maintainers ("FSF")) (:maintainer "FSF") (:keywords "languages") (:url . "https://github.com/fgallina/python-django.el"))])
  (python-docstring . [(20231203 2036) nil "Smart Python docstring formatting" tar ((:commit . "48e6489ec2db8b4959a9f591910941c2a5f132a3"))])
  (python-environment . [(20150310 853) ((deferred (0 3 1))) "virtualenv API for Emacs Lisp" tar ((:commit . "401006584e32864a10c69d29f14414828909362e") (:authors ("Takafumi Arakaki <aka.tkf at gmail.com>")) (:maintainers ("Takafumi Arakaki <aka.tkf at gmail.com>")) (:maintainer "Takafumi Arakaki <aka.tkf at gmail.com>") (:keywords "applications" "tools"))])
  (python-insert-docstring . [(20211127 1232) ((emacs (25 1))) "Python Google docstring inserter" tar ((:commit . "cd6419b74c99c06d5c48c1b289572acce1fd193b") (:authors ("Marco Vocialta" . "macurovc@tutanota.com")) (:maintainers ("Marco Vocialta" . "macurovc@tutanota.com")) (:maintainer "Marco Vocialta" . "macurovc@tutanota.com") (:url . "https://github.com/macurovc/insert-docstring"))])
  (python-isort . [(20210603 2153) ((emacs (26)) (reformatter (0 6))) "Reformat python-mode buffer with isort" tar ((:commit . "339814df22b87eebca02137e581f65d6283fce97") (:authors ("Jimmy Yuen Ho Wong" . "wyuenho@gmail.com")) (:maintainers ("Jimmy Yuen Ho Wong" . "wyuenho@gmail.com")) (:maintainer "Jimmy Yuen Ho Wong" . "wyuenho@gmail.com") (:keywords "languages") (:url . "https://github.com/wyuenho/emacs-python-isort"))])
  (python-mls . [(20230920 1915) ((emacs (27 1)) (compat (29 1))) "Multi-line shell for (i)Python" tar ((:commit . "821b93ff7c94a13090598c22fd92bd19b5ad951b") (:authors ("J.D. Smith")) (:maintainers ("J.D. Smith")) (:maintainer "J.D. Smith") (:keywords "languages" "processes") (:url . "https://github.com/jdtsmith/python-mls"))])
- (python-mode . [(20231218 645) nil "Python major mode" tar ((:commit . "9678f77d0d0ab3d672374c4457b5a02ce49cd206") (:authors ("2015-2023 https://gitlab.com/groups/python-mode-devs") ("2003-2014 https://launchpad.net/python-mode") ("1995-2002 Barry A. Warsaw") ("1992-1994 Tim Peters")) (:maintainer nil . "python-mode@python.org") (:keywords "python" "languages" "oop") (:url . "https://gitlab.com/groups/python-mode-devs"))])
+ (python-mode . [(20240520 1744) nil "Python major mode" tar ((:commit . "5279a81ecaa9fc535915c58336c96baf3f2aa8b1") (:authors ("2015-2023 https://gitlab.com/groups/python-mode-devs") ("2003-2014 https://launchpad.net/python-mode") ("1995-2002 Barry A. Warsaw") ("1992-1994 Tim Peters")) (:maintainer nil . "python-mode@python.org") (:keywords "python" "languages" "oop") (:url . "https://gitlab.com/groups/python-mode-devs"))])
  (python-pytest . [(20240416 1128) ((emacs (24 4)) (dash (2 18 0)) (transient (0 3 7)) (projectile (0 14 0)) (s (1 12 0))) "helpers to run pytest" tar ((:commit . "9f850e22df93812a5b109968c549f9b3dd828ed1") (:authors ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainers ("wouter bolsterlee" . "wouter@bolsterl.ee")) (:maintainer "wouter bolsterlee" . "wouter@bolsterl.ee") (:keywords "pytest" "test" "python" "languages" "processes" "tools") (:url . "https://github.com/wbolster/emacs-python-pytest"))])
  (python-switch-quotes . [(20161228 809) ((emacs (24 3))) "cycle between ' and \" quotes in python strings" tar ((:commit . "93f1e9b40e061a6cea480139e8b1362b6404abd0") (:authors ("Vladimir Lagunov" . "lagunov.vladimir@gmail.com")) (:maintainers ("Vladimir Lagunov" . "lagunov.vladimir@gmail.com")) (:maintainer "Vladimir Lagunov" . "lagunov.vladimir@gmail.com") (:keywords "python" "tools" "convenience") (:url . "https://github.com/werehuman/python-switch-quotes"))])
  (python-test . [(20181018 29) ((emacs (25 1))) "Python testing integration" tar ((:commit . "f899975b133539e19ba822e4b0bfd1a28572967e") (:authors ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainers ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainer "Mario Rodas" . "marsam@users.noreply.github.com") (:keywords "convenience" "tools" "processes") (:url . "https://github.com/emacs-pe/python-test.el"))])
@@ -4438,7 +4452,7 @@
  (quiz . [(20190525 1206) ((cl-lib (0 5)) (emacs (25))) "Multiple choice quiz game" tar ((:commit . "570bf53926d89282cdb9653bd5aa8fe968f92bbd") (:authors ("Dave Pearson" . "davep@davep.org")) (:maintainers ("Dave Pearson" . "davep@davep.org")) (:maintainer "Dave Pearson" . "davep@davep.org") (:keywords "games" "trivia" "quiz") (:url . "https://github.com/davep/quiz.el"))])
  (r-autoyas . [(20140101 1510) ((ess (0)) (yasnippet (0 8 0))) "Provides automatically created yasnippets for R function argument lists." tar ((:commit . "d321a7da0ef2e94668d53e0807277da7b70ea678") (:authors ("Sven Hartenstein & Matthew Fidler")) (:maintainers ("Matthew Fidler")) (:maintainer "Matthew Fidler") (:keywords "r" "yasnippet") (:url . "https://github.com/mlf176f2/r-autoyas.el"))])
  (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 ((:commit . "1e63e98626737ea9b662d4a9b1ffd6842b1c648c") (:authors ("Phil Dawes")) (:maintainers ("Phil Dawes")) (:maintainer "Phil Dawes") (:keywords "abbrev" "convenience" "matching" "rust" "tools") (:url . "https://github.com/racer-rust/emacs-racer"))])
- (racket-mode . [(20240418 1446) ((emacs (25 1))) "Racket editing, REPL, and more" tar ((:commit . "d5f4007fd2c2604673125035f4852dce1b639b33") (:authors ("Greg Hendershott" . "racket-mode-author@greghendershott.com")) (:maintainers ("Greg Hendershott")) (:maintainer "Greg Hendershott") (:url . "https://www.racket-mode.com/"))])
+ (racket-mode . [(20240514 1524) ((emacs (25 1))) "Racket editing, REPL, and more" tar ((:commit . "d2cff2b7f210846108875c7eccb1b5ab98bceb74") (:authors ("Greg Hendershott" . "racket-mode-author@greghendershott.com")) (:maintainers ("Greg Hendershott")) (:maintainer "Greg Hendershott") (:url . "https://www.racket-mode.com/"))])
  (rails-i18n . [(20220126 1643) ((emacs (27 2)) (yaml (0 1 0)) (dash (2 19 1))) "Seach and insert i18n on ruby code" tar ((:commit . "8e87e4e48e31902b8259ded28a208c2e7efea6e9") (: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") (:keywords "tools" "languages") (:url . "https://github.com/otavioschwanck/rails-i18n.el"))])
  (rails-log-mode . [(20140408 425) nil "Major mode for viewing Rails log files" tar ((:commit . "ff440003ad7d47cb0ac3300f2a632f4cfd36a446") (:authors ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainers ("Anantha kumaran" . "ananthakumaran@gmail.com")) (:maintainer "Anantha kumaran" . "ananthakumaran@gmail.com") (:keywords "rails" "log"))])
  (rails-routes . [(20220126 1631) ((emacs (27 2)) (inflections (1 1))) "Search for and insert rails routes" tar ((:commit . "eab995a9297ca5bd9bd4f4c2737f2fecfc36def0") (:authors ("Otávio Schwanck" . "otavioschwanck@gmail.com")) (:maintainers ("Otávio Schwanck" . "otavioschwanck@gmail.com")) (:maintainer "Otávio Schwanck" . "otavioschwanck@gmail.com") (:keywords "tools" "languages") (:url . "https://github.com/otavioschwanck/rails-routes"))])
@@ -4449,10 +4463,10 @@
  (rainbow-fart . [(20230619 515) ((emacs (25 1)) (flycheck (32 -4))) "Checks the keywords of code to play suitable sounds" tar ((:commit . "5e174a2b09f8326e4bd61d4d392ed32a6b45e3ab") (:keywords "tools") (:url . "https://repo.or.cz/emacs-rainbow-fart.git"))])
  (rainbow-identifiers . [(20141102 1526) ((emacs (24))) "Highlight identifiers according to their names" tar ((:commit . "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e") (:authors ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainers ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainer "Fanael Linithien" . "fanael4@gmail.com") (:url . "https://github.com/Fanael/rainbow-identifiers"))])
  (rake . [(20220211 827) ((f (0 13 0)) (dash (1 5 0)) (cl-lib (0 5))) "Run rake commands" tar ((:commit . "452ea0caca33376487103c64177c295ed2960cca") (:authors ("Adam Sokolnicki" . "adam.sokolnicki@gmail.com")) (:maintainers ("Adam Sokolnicki" . "adam.sokolnicki@gmail.com")) (:maintainer "Adam Sokolnicki" . "adam.sokolnicki@gmail.com") (:keywords "rake" "ruby") (:url . "https://github.com/asok/rake.el"))])
- (raku-mode . [(20210927 1227) ((emacs (24 4))) "Major mode for editing Raku code" tar ((:commit . "4ee9045eeb90f7831d7c0ee2e4adfcd957f712be") (:authors ("Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com")) (:maintainers ("Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com")) (:maintainer "Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com") (:keywords "languages") (:url . "https://github.com/hinrik/perl6-mode"))])
+ (raku-mode . [(20240429 1007) ((emacs (24 4))) "Major mode for editing Raku code" tar ((:commit . "14f9b9bba08c0bbb7f3895380d0b1a9feb7a168d") (:authors ("Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com")) (:maintainers ("Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com")) (:maintainer "Hinrik Örn Sigurðsson" . "hinrik.sig@gmail.com") (:keywords "languages") (:url . "https://github.com/hinrik/perl6-mode"))])
  (rally-mode . [(20161114 354) ((popwin (1 0 0))) "a mode to interact with the Rally Software web site." tar ((:commit . "0f5e09a6abe2de7613f174b4f54863df93343134") (:authors ("Sean LeBlanc" . "seanleblanc@gmail.com")) (:maintainers ("Sean LeBlanc" . "seanleblanc@gmail.com")) (:maintainer "Sean LeBlanc" . "seanleblanc@gmail.com") (:keywords "rally" "ca" "agile") (:url . "https://pragcraft.wordpress.com/"))])
  (rand-theme . [(20151219 2335) ((cl-lib (0 5))) "Random Emacs theme at start-up!" tar ((:commit . "65a00e5c5150f857aa96803b68f50bc8da0215b7") (:authors ("Daniel Gopar")) (:maintainers ("Daniel Gopar")) (:maintainer "Daniel Gopar") (:url . "https://github.com/gopar/rand-theme"))])
- (random-splash-image . [(20151003 130) nil "Randomly sets splash image to *GNU Emacs* buffer on startup." tar ((:commit . "907e2db5ceff781ac7f4dbdd65fe71736c36aa22") (:authors ("kakakaya <kakakaya AT gmail.com>")) (:maintainers ("kakakaya <kakakaya AT gmail.com>")) (:maintainer "kakakaya <kakakaya AT gmail.com>") (:keywords "games") (:url . "https://github.com/kakakaya/random-splash-image"))])
+ (random-splash-image . [(20240501 1550) nil "Randomly sets splash image to *GNU Emacs* buffer on startup." tar ((:commit . "05a5cdb8315577536de5e425f6ef6cbb994c6282") (:authors ("kakakaya <kakakaya AT gmail.com>")) (:maintainers ("kakakaya <kakakaya AT gmail.com>")) (:maintainer "kakakaya <kakakaya AT gmail.com>") (:keywords "games") (:url . "https://github.com/kakakaya/random-splash-image"))])
  (ranger . [(20210125 330) ((emacs (24 4))) "Make dired more like ranger" tar ((:commit . "2498519cb21dcd5791d240607a72a204d1761668") (:authors ("Rich Alesi <https://github.com/ralesi>")) (:maintainers ("Rich Alesi <https://github.com/ralesi>")) (:maintainer "Rich Alesi <https://github.com/ralesi>") (:keywords "files" "convenience" "dired") (:url . "https://github.com/ralesi/ranger"))])
  (rase . [(20120928 2045) nil "Run At Sun Event daemon" tar ((:commit . "59b5f7e8102570b65040e8d55781c7ea28de7338") (:authors ("Andrey Kotlarski" . "m00naticus@gmail.com")) (:maintainers ("Andrey Kotlarski" . "m00naticus@gmail.com")) (:maintainer "Andrey Kotlarski" . "m00naticus@gmail.com") (:keywords "solar" "sunrise" "sunset" "midday" "midnight") (:url . "https://github.com/m00natic/rase/"))])
  (rats . [(20170818 1013) ((s (1 10 0)) (go-mode (1 3 1)) (cl-lib (0 5))) "Rapid testing suite for Go" tar ((:commit . "a6d55aebcc54f669c6c6ffedf84364c4097903cc") (:authors ("Antoine Kalmbach" . "ane@iki.fi")) (:maintainers ("Antoine Kalmbach" . "ane@iki.fi")) (:maintainer "Antoine Kalmbach" . "ane@iki.fi") (:keywords "go"))])
@@ -4549,8 +4563,8 @@
  (restclient-helm . [(20170314 1554) ((restclient (0)) (helm (1 9 4))) "helm interface for restclient.el" tar ((:commit . "af7420085dd67ed08d199a2402e8ff3e996c3029") (:authors ("Pavel Kurnosov" . "pashky@gmail.com")) (:maintainers ("Pavel Kurnosov" . "pashky@gmail.com")) (:maintainer "Pavel Kurnosov" . "pashky@gmail.com") (:keywords "http" "helm"))])
  (restclient-jq . [(20220426 1734) ((restclient (20200502 831)) (jq-mode (0 4 1)) (emacs (24 4))) "Support for setting restclient vars from jq expressions" tar ((:commit . "ae79e7dd283890072da69b8f48aeec1afd0d9442") (:authors ("Cameron Dorrat" . "cdorrat@gmail.com")) (:maintainers ("Cameron Dorrat" . "cdorrat@gmail.com")) (:maintainer "Cameron Dorrat" . "cdorrat@gmail.com") (:keywords "tools" "comm" "http" "jq") (:url . "https://github.com/pashky/restclient.el"))])
  (restclient-test . [(20240207 1415) ((emacs (26 1)) (restclient (0))) "Run tests with restclient.el" tar ((:commit . "5a364b93779eb3b4566dd6d843d7637983fcc949") (:authors ("Simen Heggestøyl" . "simenheg@runbox.com")) (:maintainers ("Simen Heggestøyl" . "simenheg@runbox.com")) (:maintainer "Simen Heggestøyl" . "simenheg@runbox.com") (:url . "https://github.com/simenheg/restclient-test.el"))])
- (retraction-viewer . [(20240419 1316) ((emacs (26 1)) (plz (0 7))) "View retraction information for current citation" tar ((:commit . "280fbb60c44a184e0060640966ad9ddc80602e21") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "tex" "data") (:url . "https://git.sr.ht/~swflint/retraction-viewer"))])
- (retraction-viewer-section . [(20240419 837) ((emacs (25 1)) (retraction-viewer (1 0 2)) (universal-sidecar (1 5 1))) "Show retraction information in the universal-sidecar" tar ((:commit . "87efb813a0dd3b320299d771779e68efe4344cf0") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "tex") (:url . "https://git.sr.ht/~swflint/retraction-viewer"))])
+ (retraction-viewer . [(20240509 1440) ((emacs (26 1)) (plz (0 7))) "View retraction information for current citation" tar ((:commit . "e8ab96e5a95a93849b912e2684b9776c685ac4bd") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "tex" "data") (:url . "https://git.sr.ht/~swflint/retraction-viewer"))])
+ (retraction-viewer-section . [(20240509 1440) ((emacs (25 1)) (retraction-viewer (1 0 2)) (universal-sidecar (1 5 1))) "Show retraction information in the universal-sidecar" tar ((:commit . "e8ab96e5a95a93849b912e2684b9776c685ac4bd") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "tex") (:url . "https://git.sr.ht/~swflint/retraction-viewer"))])
  (retrie . [(20200519 551) ((emacs (24 5))) "Refactoring Haskell code with retrie" tar ((:commit . "976d6f01a3e214917f16b82e750d825cb9bfcc59") (:authors ("Junyoung Clare Jang" . "jjc9310@gmail.com")) (:maintainers ("Junyoung Clare Jang" . "jjc9310@gmail.com")) (:maintainer "Junyoung Clare Jang" . "jjc9310@gmail.com") (:keywords "files" "languages" "tools") (:url . "https://github.com/Ailrun/emacs-retrie"))])
  (revbufs . [(20200907 2223) nil "Reverts all out-of-date buffers safely" tar ((:commit . "df3c02d3063951582c693ae12547993cec8256e2") (:authors ("Neil Van Dyke" . "neil@neilvandyke.org")) (:maintainers ("Sam Kleinman" . "sam@tychoish.com")) (:maintainer "Sam Kleinman" . "sam@tychoish.com") (:keywords "convenience" "buffers") (:url . "http://www.neilvandyke.org/revbufs/"))])
  (reveal-in-folder . [(20240226 37) ((emacs (24 3)) (f (0 20 0)) (s (1 12 0))) "Reveal current file/directory in folder" tar ((:commit . "ef1b86f745ff2e1d13dc57f6f9fe7e0c53fe26bd") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "folder" "finder" "reveal" "file" "explorer") (:url . "https://github.com/jcs-elpa/reveal-in-folder"))])
@@ -4569,6 +4583,7 @@
  (rhtml-mode . [(20130422 1311) nil "major mode for editing RHTML files" tar ((:commit . "a6d71b38a3db867ccf82999c99805db1a3a33c33"))])
  (rib-mode . [(20170726 1448) ((emacs (24))) "RenderMan® Interface Bytestream (RIB) Major Mode" tar ((:commit . "97470158784c3c212e22e2c20b8471ee65ba59af") (:authors ("Remik Ziemlinski and Daniel Blezek" . "daniel.blezek@gmail.com")) (:maintainers ("Remik Ziemlinski and Daniel Blezek" . "daniel.blezek@gmail.com")) (:maintainer "Remik Ziemlinski and Daniel Blezek" . "daniel.blezek@gmail.com") (:url . "https://github.com/blezek/rib-mode"))])
  (rich-minority . [(20190419 1136) ((cl-lib (0 5))) "Clean-up and Beautify the list of minor-modes." tar ((:commit . "a03e693f6f9232cf75363aaaf1cb041f21675c19") (:authors ("Artur Malabarba" . "emacs@endlessparentheses.com")) (:maintainers ("Artur Malabarba" . "emacs@endlessparentheses.com")) (:maintainer "Artur Malabarba" . "emacs@endlessparentheses.com") (:keywords "mode-line" "faces") (:url . "https://github.com/Malabarba/rich-minority"))])
+ (ride-mode . [(20240511 1623) ((emacs (25 1))) "A major-mode for editing RIDE language" tar ((:commit . "b693e5c33090530d2ea9d792fa148ea983f8607f") (:authors ("DEADBLACKCLOVER" . "deadblackclover@protonmail.com")) (:maintainers ("DEADBLACKCLOVER" . "deadblackclover@protonmail.com")) (:maintainer "DEADBLACKCLOVER" . "deadblackclover@protonmail.com") (:keywords "languages") (:url . "https://github.com/deadblackclover/ride-mode"))])
  (right-click-context . [(20210519 1713) ((emacs (24 3)) (popup (0 5)) (ordinal (0 0 1))) "Right Click Context menu" tar ((:commit . "c3c9d36ffbc9fb2bc7c2c4b75291dbcdb1c5f531") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "mouse" "menu" "rightclick") (:url . "https://github.com/zonuexe/right-click-context"))])
  (rigid-tabs . [(20230905 940) ((emacs (24 3))) "Fix TAB alignment in diff buffers" tar ((:commit . "9553118e76fcbc1d8f0bcb960de13c7e3f07b9df") (:authors ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainers ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainer "Yuri D'Elia" . "wavexx@thregr.org") (:keywords "diff" "whitespace" "version control" "magit") (:url . "https://gitlab.com/wavexx/rigid-tabs.el"))])
  (rii . [(20210317 1330) ((emacs (24 3))) "Reversible input interface for multiple input" tar ((:commit . "9df603a5c63ae38ec776e27dc93d3618e2b0fabe") (:authors ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainers ("ROCKTAKEY" . "rocktakey@gmail.com")) (:maintainer "ROCKTAKEY" . "rocktakey@gmail.com") (:keywords "extensions" "tools") (:url . "https://github.com/ROCKTAKEY/rii"))])
@@ -4581,8 +4596,8 @@
  (riscv-mode . [(20220916 206) ((emacs (24 4))) "Major-mode for RISC V assembly" tar ((:commit . "8e335b9c93de93ed8dd063d702b0f5ad48eef6d7") (:authors ("Adam Niederer <https://github.com/AdamNiederer>")) (:maintainers ("Adam Niederer")) (:maintainer "Adam Niederer") (:keywords "riscv" "assembly") (:url . "https://github.com/AdamNiederer/riscv-mode"))])
  (rivet-mode . [(20201013 1905) ((emacs (24)) (web-mode (16))) "A minor mode for editing Apache Rivet files" tar ((:commit . "6cf58cf04fee933113857af07414b3f27c24b505") (:authors ("Jade Michael Thornton")) (:maintainers ("Jade Michael Thornton")) (:maintainer "Jade Michael Thornton") (:url . "https://gitlab.com/thornjad/rivet-mode"))])
  (rjsx-mode . [(20200224 2149) ((emacs (24 4)) (js2-mode (20170504))) "Real support for JSX" tar ((:commit . "0061587a06cdc2579a8d0e90863498d96bf982d8") (:authors ("Felipe Ochoa" . "felipe@fov.space")) (:maintainers ("Felipe Ochoa" . "felipe@fov.space")) (:maintainer "Felipe Ochoa" . "felipe@fov.space") (:keywords "languages") (:url . "https://github.com/felipeochoa/rjsx-mode/"))])
- (rmsbolt . [(20240301 1749) ((emacs (25 1))) "A compiler output viewer" tar ((:commit . "1aeeadf7114316b9949e3c212a883ca95c3ddab0") (:authors ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainers ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainer "Jay Kamat" . "jaygkamat@gmail.com") (:keywords "compilation" "tools") (:url . "http://gitlab.com/jgkamat/rmsbolt"))])
- (robe . [(20240327 308) ((inf-ruby (2 5 1)) (emacs (25 1))) "Code navigation, documentation lookup and completion for Ruby" tar ((:commit . "e8c86ee553589ff03418102426420b5049d4a044") (:authors ("Dmitry Gutov")) (:maintainers ("Dmitry Gutov")) (:maintainer "Dmitry Gutov") (:keywords "ruby" "convenience" "rails") (:url . "https://github.com/dgutov/robe"))])
+ (rmsbolt . [(20240507 47) ((emacs (25 1))) "A compiler output viewer" tar ((:commit . "32604147643dbfebe499ea8a4b139cc68acd2746") (:authors ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainers ("Jay Kamat" . "jaygkamat@gmail.com")) (:maintainer "Jay Kamat" . "jaygkamat@gmail.com") (:keywords "compilation" "tools") (:url . "http://gitlab.com/jgkamat/rmsbolt"))])
+ (robe . [(20240509 155) ((inf-ruby (2 5 1)) (emacs (25 1))) "Code navigation, documentation lookup and completion for Ruby" tar ((:commit . "6bc8a07fc483407971de0966d367a11006b3ab80") (:authors ("Dmitry Gutov")) (:maintainers ("Dmitry Gutov")) (:maintainer "Dmitry Gutov") (:keywords "ruby" "convenience" "rails") (:url . "https://github.com/dgutov/robe"))])
  (robot-log . [(20220719 1301) ((emacs (28 1))) "Major mode for viewing RobotFramework debug log files" tar ((:commit . "26da47597aa97be9649cb60f4da6d94d47d0c0ac") (:keywords "convenience" "files") (:url . "https://git.sr.ht/~apteryx/emacs-robot-log"))])
  (robot-mode . [(20231118 826) ((emacs (26 1))) "Major-mode for Robot Framework files" tar ((:commit . "cb12e5adcba3379a67483e268229c152e0a8405f") (:authors ("Kalle Kankare" . "kalle.kankare@iki.fi")) (:maintainers ("Kalle Kankare" . "kalle.kankare@iki.fi")) (:maintainer "Kalle Kankare" . "kalle.kankare@iki.fi") (:keywords "languages" "files") (:url . "https://github.com/kopoli/robot-mode"))])
  (robots-txt-mode . [(20190812 1858) nil "Major mode for editing robots.txt" tar ((:commit . "8bf67285a25a6756607354d184e36583f2847e7d") (:authors ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainers ("USAMI Kenta" . "tadsan@zonu.me")) (:maintainer "USAMI Kenta" . "tadsan@zonu.me") (:keywords "languages" "comm" "web") (:url . "https://github.com/emacs-php/robots-txt-mode"))])
@@ -4627,7 +4642,7 @@
  (russian-holidays . [(20170109 2140) nil "Russian holidays for the calendar" tar ((:commit . "b285a30f29d85c48e3ea4eb93972d34a090c167b") (:authors ("Alexander I.Grafov" . "siberian@laika.name")) (:maintainers ("Alexander I.Grafov" . "siberian@laika.name")) (:maintainer "Alexander I.Grafov" . "siberian@laika.name") (:url . "https://github.com/grafov/russian-holidays"))])
  (russian-techwriter . [(20221229 822) nil "Input methods for Russian technical writers" tar ((:commit . "1d86134d04ecf2305969c7546ead7ad425cd7243") (:authors ("Maxim Dunaevskii" . "dunmaksim@yandex.ru")) (:maintainers ("Maxim Dunaevskii")) (:maintainer "Maxim Dunaevskii") (:keywords "multilingual" "input method" "cyrillic" "i18n") (:url . "https://github.com/dunmaksim/emacs-russian-techwriter-input-method"))])
  (rust-auto-use . [(20200608 1359) nil "Utility to automatically insert Rust use statements" tar ((:commit . "d5205f7b9b9eae0f7d0893f87d3391464719f9c0") (:authors ("Rotem Yaari" . "rotemy@MBP.local")) (:maintainers ("Rotem Yaari" . "rotemy@MBP.local")) (:maintainer "Rotem Yaari" . "rotemy@MBP.local") (:keywords "languages"))])
- (rust-mode . [(20240415 936) ((emacs (25 1))) "A major-mode for editing Rust source code" tar ((:commit . "e54bbae8c4c2af580b5721ad5ac151f2ad19293e") (:authors ("Mozilla" . "rust-mode@noreply.github.com")) (:maintainers ("Mozilla" . "rust-mode@noreply.github.com")) (:maintainer "Mozilla" . "rust-mode@noreply.github.com") (:keywords "languages") (:url . "https://github.com/rust-lang/rust-mode"))])
+ (rust-mode . [(20240520 749) ((emacs (25 1))) "A major-mode for editing Rust source code" tar ((:commit . "d00d83d3a207a5b7c2994392b2781f627e3159ce") (:authors ("Mozilla" . "rust-mode@noreply.github.com")) (:maintainers ("Mozilla" . "rust-mode@noreply.github.com")) (:maintainer "Mozilla" . "rust-mode@noreply.github.com") (:keywords "languages") (:url . "https://github.com/rust-lang/rust-mode"))])
  (rust-playground . [(20200116 1043) ((emacs (24 3))) "Local Rust playground for short code snippets." tar ((:commit . "5a117781dcb66065bea7830dd73618008fc34949") (:authors ("Alexander I.Grafov" . "grafov@gmail.com")) (:maintainers ("Alexander I.Grafov" . "grafov@gmail.com")) (:maintainer "Alexander I.Grafov" . "grafov@gmail.com") (:keywords "tools" "rust") (:url . "https://github.com/grafov/rust-playground"))])
  (rustic . [(20230130 912) ((emacs (26 1)) (rust-mode (1 0 3)) (dash (2 13 0)) (f (0 18 2)) (let-alist (1 0 4)) (markdown-mode (2 3)) (project (0 3 0)) (s (1 10 0)) (seq (2 3)) (spinner (1 7 3)) (xterm-color (1 6))) "Rust development environment" tar ((:commit . "a5fc66c8167a827a57c4426e4b8dbe717b3be43c") (:authors ("Mozilla")) (:maintainers ("Mozilla")) (:maintainer "Mozilla") (:keywords "languages"))])
  (rutils . [(20220619 1421) ((emacs (26 1)) (ess (18 10 1)) (transient (0 3 0))) "R utilities with transient" tar ((:commit . "dd500ab8062ce40cb339ec8620bdfc63fdd28364") (:authors ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainers ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainer "Shuguang Sun" . "shuguang79@qq.com") (:keywords "convenience") (:url . "https://github.com/ShuguangSun/rutils.el"))])
@@ -4638,7 +4653,7 @@
  (s12cpuv2-mode . [(20171013 2051) ((emacs (24 3))) "Major-mode for S12CPUV2 assembly" tar ((:commit . "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c") (:authors ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainers ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainer "Adam Niederer" . "adam.niederer@gmail.com") (:keywords "s12cpuv2" "assembly" "languages") (:url . "https://github.com/AdamNiederer/s12cpuv2-mode"))])
  (s3ed . [(20200929 1317) ((emacs (25 1)) (dash (2 17 0)) (s (1 12 0))) "Tramp-like access to s3" tar ((:commit . "2234444ead6c4c6fc3fea548958b36d2c29a9938") (:authors ("Matt Usifer" . "mattusifer@gmail.com")) (:maintainers ("Matt Usifer" . "mattusifer@gmail.com")) (:maintainer "Matt Usifer" . "mattusifer@gmail.com") (:keywords "s3" "tools") (:url . "https://github.com/mattusifer/s3ed"))])
  (sackspace . [(20130719 956) nil "A better backspace" tar ((:commit . "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708") (:authors ("Michael Markert" . "markert.michael@googlemail.com")) (:maintainers ("Michael Markert" . "markert.michael@googlemail.com")) (:maintainer "Michael Markert" . "markert.michael@googlemail.com") (:keywords "delete" "convenience") (:url . "http://github.com/cofi/sackspace.el"))])
- (sage-shell-mode . [(20231013 1408) ((cl-lib (0 6 1)) (emacs (24 4)) (let-alist (1 0 5)) (deferred (0 5 1))) "A front-end for Sage Math" tar ((:commit . "2f069323cb722c608405a3621d8185f4b7130fc3") (:authors ("Sho Takemori" . "stakemorii@gmail.com")) (:maintainers ("Sho Takemori" . "stakemorii@gmail.com")) (:maintainer "Sho Takemori" . "stakemorii@gmail.com") (:keywords "sage" "math") (:url . "https://github.com/sagemath/sage-shell-mode"))])
+ (sage-shell-mode . [(20240504 726) ((cl-lib (0 6 1)) (emacs (24 4)) (let-alist (1 0 5)) (deferred (0 5 1))) "A front-end for Sage Math" tar ((:commit . "4291700e981a2105d55fa56382ba25046d3d268d") (:authors ("Sho Takemori" . "stakemorii@gmail.com")) (:maintainers ("Sho Takemori" . "stakemorii@gmail.com")) (:maintainer "Sho Takemori" . "stakemorii@gmail.com") (:keywords "sage" "math") (:url . "https://github.com/sagemath/sage-shell-mode"))])
  (sailfish-scratchbox . [(20171202 1332) nil "Sailfish OS scratchbox inside the emacs." tar ((:commit . "bb5ed0f0b0cd72f2eb1af065b7587ec81866b089") (:authors ("V. V. Polevoy" . "fx@thefx.co")) (:maintainers ("V. V. Polevoy" . "fx@thefx.co")) (:maintainer "V. V. Polevoy" . "fx@thefx.co") (:keywords "sb2" "mb2" "building" "scratchbox" "sailfish") (:url . "https://github.com/vityafx/sailfish-scratchbox.el"))])
  (sakura-theme . [(20220822 254) nil "Filled with cherry blossoms" tar ((:commit . "d78648632a94dd5354d2fed0f94fcb7aece29132") (:url . "http://github.com/emacsfodder/emacs-theme-sakura"))])
  (salesforce-utils . [(20160814 154) ((cl-lib (0 5))) "simple utilities for Salesforce" tar ((:commit . "73328baf0fb94ac0d0de645a8f6d42e5ae27f773") (:authors ("Sean McAfee")) (:maintainers ("Sean McAfee")) (:maintainer "Sean McAfee") (:url . "https://github.com/grimnebulin/emacs-salesforce"))])
@@ -4655,9 +4670,10 @@
  (say-what-im-doing . [(20160706 1931) nil "dictate what you're doing with text to speech" tar ((:commit . "5b2ce6783b02805bcac1107a149bfba3852cd9d5") (:authors ("Benaiah Mischenko")) (:maintainers ("Benaiah Mischenko")) (:maintainer "Benaiah Mischenko") (:keywords "text to speech" "dumb" "funny") (:url . "http://github.com/benaiah/say-what-im-doing"))])
  (sayid . [(20220101 1357) ((cider (0 21 0))) "sayid nREPL middleware client" tar ((:commit . "879aff586336a0ec4d46c0ed4720fb1de22082bd") (:authors ("Bill Piel" . "bill@billpiel.com")) (:maintainers ("Bozhidar Batsov" . "bozhidar@batsov.dev")) (:maintainer "Bozhidar Batsov" . "bozhidar@batsov.dev") (:keywords "clojure" "cider" "debugger") (:url . "https://github.com/clojure-emacs/sayid"))])
  (sbt-mode . [(20240404 1105) ((emacs (24 4))) "Interactive support for sbt projects" tar ((:commit . "cc68728a6ef0600aad369157b3a2d0ce56afba9b") (:keywords "languages") (:url . "https://github.com/hvesalai/emacs-sbt-mode"))])
- (scad-mode . [(20240428 1152) ((emacs (27 1)) (compat (29 1 4 4))) "A major mode for editing OpenSCAD code" tar ((:commit . "37689c4bd06c40fcadc96065de5945d9c9a5d236") (:authors ("Len Trigg, Łukasz Stelmach, zk_phi, Daniel Mendler")) (:maintainers ("Len Trigg <lenbok@gmail.com>, Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Len Trigg <lenbok@gmail.com>, Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "languages") (:url . "https://github.com/openscad/emacs-scad-mode"))])
+ (scad-mode . [(20240429 1628) ((emacs (27 1)) (compat (29 1 4 4))) "A major mode for editing OpenSCAD code" tar ((:commit . "8b830727c343bf762d9469b413f0c2a4c1996fe2") (:authors ("Len Trigg, Łukasz Stelmach, zk_phi, Daniel Mendler")) (:maintainers ("Len Trigg <lenbok@gmail.com>, Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Len Trigg <lenbok@gmail.com>, Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "languages") (:url . "https://github.com/openscad/emacs-scad-mode"))])
  (scad-preview . [(20211212 1128) ((scad-mode (91 0)) (emacs (24 4))) "Preview SCAD models in real-time within Emacs" tar ((:commit . "c5449b26c63f3e0a695905a7e4e84f8d844f761b") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "https://zk-phi.github.io/"))])
  (scala-mode . [(20240113 1743) nil "Major mode for editing Scala" tar ((:commit . "4c6d636b86e3bb1d95de819dc48dda92abdfbcf4") (:keywords "languages") (:url . "https://github.com/hvesalai/emacs-scala-mode"))])
+ (scala-repl . [(20240427 1456) ((emacs (29 1))) "Scala REPL Mode" tar ((:commit . "679bdf663e0b32a5a285d6f98daa2e3d5de60289") (:authors ("Daian YUE" . "sheepduke@gmail.com")) (:maintainers ("Daian YUE" . "sheepduke@gmail.com")) (:maintainer "Daian YUE" . "sheepduke@gmail.com") (:keywords "languages" "tools") (:url . "https://github.com/sheepduke/scala-repl.el"))])
  (scala-ts-mode . [(20240420 1150) ((emacs (29 1))) "Scala Tree-Sitter Mode" tar ((:commit . "d9424fa74acf930664c43d4c9f9625d8bfdd4d21") (:authors ("Karan Ahlawat" . "ahlawatkaran12@gmail.com")) (:maintainers ("Karan Ahlawat" . "ahlawatkaran12@gmail.com")) (:maintainer "Karan Ahlawat" . "ahlawatkaran12@gmail.com") (:keywords "scala" "languages" "tree-sitter") (:url . "https://github.com/KaranAhlawat/scala-ts-mode"))])
  (scf-mode . [(20151122 248) nil "shorten file-names in compilation type buffers" tar ((:commit . "dbfcdcd89034f208d65e181af58e0d73ad09f8b2") (:authors ("Le Wang")) (:maintainers ("Le Wang")) (:maintainer "Le Wang") (:keywords "compilation") (:url . "https://github.com/lewang/scf-mode"))])
  (scheme-complete . [(20201112 442) nil "Smart auto completion for Scheme in Emacs" tar ((:commit . "b9a1448c4696f117d9ea4e59b6162dc31112e71a") (:authors ("Alex Shinn")) (:maintainers ("Alex Shinn")) (:maintainer "Alex Shinn"))])
@@ -4673,7 +4689,7 @@
  (scratch-ext . [(20220617 132) ((emacs (24 1))) "Extensions for *scratch*" tar ((:commit . "8bbe1649503bb2e3676643e6e49fde155c1d6c70") (:authors ("Kouhei Yanagita" . "yanagi@shakenbu.org")) (:maintainers ("Kouhei Yanagita" . "yanagi@shakenbu.org")) (:maintainer "Kouhei Yanagita" . "yanagi@shakenbu.org") (:url . "https://github.com/kyanagi/scratch-ext-el"))])
  (scratch-log . [(20141115 743) nil "Utility for *scratch* buffer." tar ((:commit . "1168f7f16d36ca0f4ddf2bb98881f8db62cc5dc0") (:authors ("kmori" . "morihenotegami@gmail.com")) (:maintainers ("kmori" . "morihenotegami@gmail.com")) (:maintainer "kmori" . "morihenotegami@gmail.com"))])
  (scratch-message . [(20220209 2207) nil "Changing message in your scratch buffer" tar ((:commit . "0d4198f6effd8f118bf03ee4979f566041ef6a9b") (:authors ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainers ("Sylvain Rousseau <thisirs at gmail dot com>")) (:maintainer "Sylvain Rousseau <thisirs at gmail dot com>") (:keywords "util" "scratch") (:url . "https://github.com/thisirs/scratch-message.git"))])
- (scratch-palette . [(20210306 427) ((popwin (0 7 0 -3))) "make scratch buffer for each files" tar ((:commit . "e4642ed8a2b744ba48a8e11ca83861f8e4b9c5b3") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://zk-phi.gitub.io/"))])
+ (scratch-palette . [(20240516 1817) nil "make scratch buffer for each files" tar ((:commit . "6b344af6b33b6b0bfd08e213dd0d43b714f7a5e9") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://zk-phi.gitub.io/"))])
  (scratch-pop . [(20200910 226) nil "Generate, popup (& optionally backup) scratch buffer(s)." tar ((:commit . "545badcd840dd50b39dd7dfa37459c6f71d02ea6") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://hins11.yu-yake.com/"))])
  (scratches . [(20151006 416) ((dash (2 11 0)) (f (0 17 0))) "Multiple scratches in any language" tar ((:commit . "9441afe6396ca38f08029123fab5d87429cbf315") (:authors ("Zhang Kai Yu" . "yeannylam@gmail.com")) (:maintainers ("Zhang Kai Yu" . "yeannylam@gmail.com")) (:maintainer "Zhang Kai Yu" . "yeannylam@gmail.com") (:keywords "scratch"))])
  (scribble-mode . [(20190912 200) ((emacs (24))) "Major mode for editing Scribble documents" tar ((:commit . "5c3ea3cc9bbad585476eee41ea76dc056c2012bb") (:authors ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainers ("Mario Rodas" . "marsam@users.noreply.github.com")) (:maintainer "Mario Rodas" . "marsam@users.noreply.github.com") (:keywords "convenience") (:url . "https://github.com/emacs-pe/scribble-mode"))])
@@ -4694,7 +4710,7 @@
  (seeing-is-believing . [(20170214 1320) nil "minor mode for running the seeing-is-believing ruby gem" tar ((:commit . "fbbe246c0fda87bb26227bb826eebadb418a220f") (:authors ("John Cinnamond")) (:maintainers ("John Cinnamond")) (:maintainer "John Cinnamond"))])
  (seethru . [(20150218 1829) ((shadchen (1 4))) "Easily change Emacs' transparency" tar ((:commit . "d87e231f99313bea75b1e69e48c0f32968c82060") (:authors ("Benaiah Mischenko" . "benaiah@mischenko.com")) (:maintainers ("Benaiah Mischenko" . "benaiah@mischenko.com")) (:maintainer "Benaiah Mischenko" . "benaiah@mischenko.com") (:keywords "lisp" "tools" "alpha" "transparency") (:url . "http://github.com/benaiah/seethru"))])
  (sekka . [(20170803 1247) ((cl-lib (0 3)) (concurrent (0 3 1)) (popup (0 5 2))) "A client for Sekka IME server" tar ((:commit . "d1fd5d47aacba723631d5d374169a45ff2051c41") (:authors ("Kiyoka Nishiyama" . "kiyoka@sumibi.org")) (:maintainers ("Kiyoka Nishiyama" . "kiyoka@sumibi.org")) (:maintainer "Kiyoka Nishiyama" . "kiyoka@sumibi.org") (:keywords "ime" "skk" "japanese") (:url . "https://github.com/kiyoka/sekka"))])
- (selcand . [(20230628 733) ((emacs (25 1))) "Select a candidate from a tree of hint characters" tar ((:commit . "b6fc231a784df570df0f817d34f926f141a65126") (:authors ("Ernesto Alfonso")) (:maintainers (nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")")) (:maintainer nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")") (:keywords "lisp" "completing-read" "prompt" "combinations" "vimium") (:url . "https://github.com/erjoalgo/selcand"))])
+ (selcand . [(20240430 1408) ((emacs (25 1))) "Select a candidate from a tree of hint characters" tar ((:commit . "6baa1771eacbcfe7ec854362bed17baea865424e") (:authors ("Ernesto Alfonso")) (:maintainers (nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")")) (:maintainer nil . "(concat \"erjoalgo\" \"@\" \"gmail\" \".com\")") (:keywords "lisp" "completing-read" "prompt" "combinations" "vimium") (:url . "https://github.com/erjoalgo/selcand"))])
  (select-themes . [(20160221 106) nil "Color theme selection with completing-read" tar ((:commit . "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe") (:authors ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainers ("Jason Milkins" . "jasonm23@gmail.com")) (:maintainer "Jason Milkins" . "jasonm23@gmail.com") (:url . "https://github.com/jasonm23/emacs-select-themes"))])
  (selected . [(20230219 1328) nil "Keymap for when region is active" tar ((:commit . "1ca6e12f456caa1dc97c3d68597598662eb5de9a") (:authors ("Erik Sjöstrand")) (:maintainers ("Erik Sjöstrand")) (:maintainer "Erik Sjöstrand") (:keywords "convenience") (:url . "http://github.com/Kungsgeten/selected.el"))])
  (selected-window-accent-mode . [(20240427 833) ((emacs (25 1)) (visual-fill-column (0 0))) "Accent Selected Window" tar ((:commit . "79397e634a89c5e16de1d317f735aafe75c78aea") (:authors ("James Dyer" . "captainflasmr@gmail.com")) (:maintainers ("James Dyer" . "captainflasmr@gmail.com")) (:maintainer "James Dyer" . "captainflasmr@gmail.com") (:keywords "convenience") (:url . "https://github.com/captainflasmr/selected-window-accent-mode"))])
@@ -4764,22 +4780,22 @@
  (show-font-mode . [(20201225 2217) ((emacs (25 1))) "Show font at point on mode line" tar ((:commit . "c7328b85655688d257b769192d26b9f5c9bbe26d") (:authors ("Melissa Boiko" . "melissa@namakajiri.net")) (:maintainers ("Melissa Boiko" . "melissa@namakajiri.net")) (:maintainer "Melissa Boiko" . "melissa@namakajiri.net") (:keywords "faces" "i18n" "unicode" "fonts" "fontsets") (:url . "https://github.com/melissaboiko/show-font-mode"))])
  (showtip . [(20090830 1040) nil "Show tip at cursor" tar ((:commit . "930da302809a4257e8d69425455b29e1cc91949b") (:authors ("Ye Wenbin" . "wenbinye@gmail.com")) (:maintainers ("Ye Wenbin" . "wenbinye@gmail.com")) (:maintainer "Ye Wenbin" . "wenbinye@gmail.com") (:keywords "help"))])
  (shpec-mode . [(20150530 922) nil "Minor mode for shpec specification" tar ((:commit . "76bccd63e3b70233a6c9ca0798dd03550952cc76") (:authors ("AdrieanKhisbe" . "adriean.khisbe@live.fr")) (:maintainers ("AdrieanKhisbe" . "adriean.khisbe@live.fr")) (:maintainer "AdrieanKhisbe" . "adriean.khisbe@live.fr") (:keywords "languages" "tools") (:url . "http://github.com/shpec/shpec-mode"))])
- (shr-tag-pre-highlight . [(20200626 1047) ((emacs (25 1)) (language-detection (0 1 0))) "Syntax highlighting code block in HTML" tar ((:commit . "931c447bc0d6c134ddc9657c664eeee33afbc54d") (:authors ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainers ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainer "Chunyang Xu" . "mail@xuchunyang.me") (:keywords "html") (:url . "https://github.com/xuchunyang/shr-tag-pre-highlight.el"))])
+ (shr-tag-pre-highlight . [(20240515 1420) ((emacs (25 1)) (language-detection (0 1 0))) "Syntax highlighting code block in HTML" tar ((:commit . "af8ae8d558d1e26d276130c100e02746278ce037") (:authors ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainers ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainer "Chunyang Xu" . "mail@xuchunyang.me") (:keywords "html") (:url . "https://github.com/xuchunyang/shr-tag-pre-highlight.el"))])
  (shrface . [(20240401 957) ((emacs (25 1)) (org (9 0)) (language-detection (0 1 0))) "Extend shr/eww with org features and analysis capability" tar ((:commit . "b82a174ee33f19ed96c7e8c85ec362eab147d4aa") (:authors ("Damon Chan" . "elecming@gmail.com")) (:maintainers ("Damon Chan" . "elecming@gmail.com")) (:maintainer "Damon Chan" . "elecming@gmail.com") (:keywords "faces") (:url . "https://github.com/chenyanming/shrface"))])
  (shrink-path . [(20190208 1335) ((emacs (24)) (s (1 6 1)) (dash (1 8 0)) (f (0 10 0))) "fish-style path" tar ((:commit . "c14882c8599aec79a6e8ef2d06454254bb3e1e41") (:authors ("Benjamin Andresen")) (:maintainers ("Benjamin Andresen")) (:maintainer "Benjamin Andresen") (:url . "https://gitlab.com/bennya/shrink-path.el"))])
  (shrink-whitespace . [(20181003 321) nil "Whitespace removal DWIM key" tar ((:commit . "0407b89c142bd17e65edb666f35e2c6755bd0867") (:authors ("Jean-Christophe Petkovich" . "jcpetkovich@gmail.com")) (:maintainers ("Jean-Christophe Petkovich" . "jcpetkovich@gmail.com")) (:maintainer "Jean-Christophe Petkovich" . "jcpetkovich@gmail.com") (:keywords "convenience") (:url . "https://gitlab.com/jcpetkovich/shrink-whitespace.el"))])
  (shroud . [(20210220 1952) ((emacs (25)) (epg (1 0 0)) (s (1 6 0)) (bui (1 2 0)) (dash (2 18 0))) "Shroud secrets" tar ((:commit . "2e6ff2bab4a1e798c090c9d7fbd90b7f3463d5c5") (:authors ("Amar Singh" . "nly@disroot.org")) (:maintainers ("Amar Singh" . "nly@disroot.org")) (:maintainer "Amar Singh" . "nly@disroot.org") (:keywords "tools" "password") (:url . "https://github.com/o-nly/emacs-shroud"))])
- (shut-up . [(20210403 1249) ((cl-lib (0 3)) (emacs (24))) "Shut up would you!" tar ((:commit . "ff6f06f3b080ee833a25a22da8cb5b96e911dc77") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com") (:url . "http://github.com/rejeep/shut-up.el"))])
- (shx . [(20221224 2230) ((emacs (24 4))) "Extras for the comint-mode shell" tar ((:commit . "b99d16f36bc278d668d8428c4bc9af77064c336a") (:authors ("Chris Rayner and contributors")) (:maintainers ("Chris Rayner" . "dchrisrayner@gmail.com")) (:maintainer "Chris Rayner" . "dchrisrayner@gmail.com") (:keywords "terminals" "processes" "comint" "shell" "repl") (:url . "https://github.com/riscy/shx-for-emacs"))])
+ (shut-up . [(20240429 605) ((cl-lib (0 3)) (emacs (24))) "Shut up would you!" tar ((:commit . "ed62a7fefdf04c81346061016f1bc69ca045aaf6") (:authors ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainers ("Johan Andersson" . "johan.rejeep@gmail.com")) (:maintainer "Johan Andersson" . "johan.rejeep@gmail.com") (:url . "http://github.com/rejeep/shut-up.el"))])
+ (shx . [(20240512 1515) ((emacs (24 4))) "Extras for the comint-mode shell" tar ((:commit . "ae32d2f6917e16c8feb8b7372267449179abd608") (:authors ("Chris Rayner and contributors")) (:maintainers ("Chris Rayner" . "dchrisrayner@gmail.com")) (:maintainer "Chris Rayner" . "dchrisrayner@gmail.com") (:keywords "terminals" "processes" "comint" "shell" "repl") (:url . "https://github.com/riscy/shx-for-emacs"))])
  (sibilant-mode . [(20151119 2145) nil "Support for the Sibilant programming language" tar ((:commit . "5baf8c3e80ee0736c7298a2a17fb615ba5ac0d2d") (:authors ("Jacob Rothstein" . "hi@jbr.me")) (:maintainers ("Jacob Rothstein" . "hi@jbr.me")) (:maintainer "Jacob Rothstein" . "hi@jbr.me") (:keywords "languages") (:url . "http://sibilantjs.info"))])
  (sicp . [(20200512 1137) nil "Structure and Interpretation of Computer Programs in info format" tar ((:commit . "4002d83083d520c6b5ede2df36cc2cee885d450a") (:authors ("Hal Abelson") ("Jerry Sussman") ("Julie Sussman")) (:maintainers ("Hal Abelson")) (:maintainer "Hal Abelson") (:url . "https://mitpress.mit.edu/sicp"))])
  (side-hustle . [(20240325 205) ((emacs (24 4)) (seq (2 20))) "Hustle through Imenu in a side window" tar ((:commit . "903380cf9e08d98689c2c116965f8e47d002fad6") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "convenience") (:url . "https://github.com/rnkn/side-hustle"))])
  (side-notes . [(20230814 302) ((emacs (24 4))) "Easy access to a directory notes file" tar ((:commit . "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb") (:authors ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainers ("Paul W. Rankin" . "hello@paulwrankin.com")) (:maintainer "Paul W. Rankin" . "hello@paulwrankin.com") (:keywords "convenience") (:url . "https://github.com/rnkn/side-notes"))])
  (sidecar-locals . [(20240421 655) ((emacs (27 1))) "A flexible alternative to built-in dir-locals" tar ((:commit . "3daf8c07fac7c4ada7a02a1edad2f64894463614") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:keywords "convenience") (:url . "https://codeberg.org/ideasman42/emacs-sidecar-locals"))])
- (sideline . [(20240404 900) ((emacs (27 1)) (ht (2 4))) "Show information on the side" tar ((:commit . "c1729b2b9d2ca6b37bf605ca2271e570f30316f0") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience") (:url . "https://github.com/emacs-sideline/sideline"))])
+ (sideline . [(20240521 31) ((emacs (27 1)) (ht (2 4))) "Show information on the side" tar ((:commit . "31ef3c21d99785e7a066ad8c188ddcd2b478b5fe") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience") (:url . "https://github.com/emacs-sideline/sideline"))])
  (sideline-blame . [(20240101 918) ((emacs (27 1)) (sideline (0 1 0)) (vc-msg (1 1 1))) "Show blame messages with sideline" tar ((:commit . "b597c047d2a8ef7dd155e85e43fd65530ecf0a61") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "blame") (:url . "https://github.com/emacs-sideline/sideline-blame"))])
- (sideline-flycheck . [(20240402 2255) ((emacs (27 1)) (sideline (0 1 1)) (flycheck (0 14)) (ht (2 4))) "Show flycheck errors with sideline" tar ((:commit . "212b8193becc012d39ccb1e68abf0e19f68764f4") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "flycheck") (:url . "https://github.com/emacs-sideline/sideline-flycheck"))])
- (sideline-flymake . [(20240309 1112) ((emacs (27 1)) (sideline (0 1 0))) "Show flymake errors with sideline" tar ((:commit . "e6a9ae69fc048f8eaacbf653e7136678dbef4597") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "flymake") (:url . "https://github.com/emacs-sideline/sideline-flymake"))])
+ (sideline-flycheck . [(20240509 742) ((emacs (27 1)) (sideline (0 1 1)) (flycheck (0 14)) (ht (2 4))) "Show flycheck errors with sideline" tar ((:commit . "f809e627e433bd9a58471e4dea1ed50305eef7f2") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "flycheck") (:url . "https://github.com/emacs-sideline/sideline-flycheck"))])
+ (sideline-flymake . [(20240509 742) ((emacs (27 1)) (sideline (0 1 0))) "Show flymake errors with sideline" tar ((:commit . "06e84875022a5645ece8f4c2c8b56aa5f003c65d") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "flymake") (:url . "https://github.com/emacs-sideline/sideline-flymake"))])
  (sideline-lsp . [(20240403 2210) ((emacs (27 1)) (sideline (0 1 0)) (lsp-mode (6 0)) (dash (2 18 0)) (ht (2 4)) (s (1 12 0))) "Show lsp information with sideline" tar ((:commit . "69aca6403509abb4f5c5ba8499e98f80f81ebc88") (:authors ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "convenience" "lsp") (:url . "https://github.com/emacs-sideline/sideline-lsp"))])
  (sift . [(20200421 1423) nil "Front-end for sift, a fast and powerful grep alternative" tar ((:commit . "cdddba2d183146c340915003f1b5d09d13712c22") (:authors ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainers ("Nicolas Lamirault" . "nicolas.lamirault@gmail.com")) (:maintainer "Nicolas Lamirault" . "nicolas.lamirault@gmail.com") (:keywords "sift" "ack" "pt" "ag" "grep" "search") (:url . "https://github.com/nlamirault/sift.el"))])
  (signal . [(20160816 1438) ((emacs (24)) (cl-lib (0 5))) "Advanced hook" tar ((:commit . "aa58327e2297df921d72a0370468b48663efd438") (:authors ("Mola-T" . "Mola@molamola.xyz")) (:maintainers ("Mola-T" . "Mola@molamola.xyz")) (:maintainer "Mola-T" . "Mola@molamola.xyz") (:keywords "internal" "lisp" "processes" "tools") (:url . "https://github.com/mola-T/signal"))])
@@ -4802,7 +4818,7 @@
  (simplicity-theme . [(20221016 1444) ((emacs (24 1))) "A minimalist dark theme" tar ((:commit . "f4aab6aa07b536688eb62355b83dde5fcd16e049") (:authors ("Matthieu Petiteau" . "mpetiteau.pro@gmail.com")) (:maintainers ("Matthieu Petiteau" . "mpetiteau.pro@gmail.com")) (:maintainer "Matthieu Petiteau" . "mpetiteau.pro@gmail.com") (:keywords "faces" "theme" "minimal") (:url . "http://github.com/smallwat3r/emacs-simplicity-theme"))])
  (siri-shortcuts . [(20211229 1833) ((emacs (25 2))) "Interact with Siri Shortcuts" tar ((:commit . "190f242f71e071adfd89fa1f2f6ea22b62afd133") (:authors ("Daniils Petrovs" . "thedanpetrov@gmail.com")) (:maintainers ("Daniils Petrovs" . "thedanpetrov@gmail.com")) (:maintainer "Daniils Petrovs" . "thedanpetrov@gmail.com") (:keywords "convenience" "multimedia") (:url . "https://github.com/DaniruKun/siri-shortcuts.el"))])
  (sis . [(20231211 1602) ((emacs (27 1))) "Less manual switch for native or OS input source (input method)." tar ((:commit . "23f3fe8b95e0570b65aa21b9db57c906aa9f35fd") (:keywords "convenience") (:url . "https://github.com/laishulu/emacs-smart-input-source"))])
- (sisyphus . [(20240415 1548) ((emacs (27 1)) (compat (29 1 4 2)) (elx (1 6 0)) (llama (0 3 0)) (magit (3 4 0))) "Create releases of Emacs packages" tar ((:commit . "38285f880302b9a2363085d816d6cd660ff7d17d") (:authors ("Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/sisyphus"))])
+ (sisyphus . [(20240506 1558) ((emacs (27 1)) (compat (29 1 4 2)) (elx (1 6 0)) (llama (0 3 0)) (magit (3 4 0))) "Create releases of Emacs packages" tar ((:commit . "db9b36065faf149fef214248bdba1d90492cd2e9") (:authors ("Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.sisyphus@jonas.bernoulli.dev") (:keywords "git" "tools" "vc") (:url . "https://github.com/magit/sisyphus"))])
  (sixcolors-mode . [(20230406 1031) ((emacs (27 1))) "A customizable horizontal scrollbar" tar ((:commit . "4124a8cf664b04a4bf4c39f7c3b7da3e480b99c8") (:authors ("Davide Mastromatteo" . "mastro35@gmail.com")) (:maintainers ("Davide Mastromatteo" . "mastro35@gmail.com")) (:maintainer "Davide Mastromatteo" . "mastro35@gmail.com") (:keywords "convenience" "colors") (:url . "https://github.com/mastro35/sixcolors-mode"))])
  (skeletor . [(20210129 239) ((s (1 7 0)) (f (0 14 0)) (dash (2 2 0)) (cl-lib (0 3)) (let-alist (1 0 3)) (emacs (24 1))) "Provides project skeletons for Emacs" tar ((:commit . "f6e560a0bfe459e0b8a268047920ce1148f2ebf6") (:authors ("Chris Barrett" . "chris.d.barrett@me.com")) (:maintainers ("Chris Barrett" . "chris.d.barrett@me.com")) (:maintainer "Chris Barrett" . "chris.d.barrett@me.com"))])
  (skerrick . [(20220306 2139) ((emacs (27 1)) (request (0 3 2))) "REPL-driven development for NodeJS" tar ((:commit . "015de8369b8b6be0d4d1e21c24239a037350e87e") (:authors ("Rafael Nicdao <https://github.com/anonimitoraf>")) (:maintainers ("Rafael Nicdao" . "nicdaoraf@gmail.com")) (:maintainer "Rafael Nicdao" . "nicdaoraf@gmail.com") (:keywords "languages" "javascript" "js" "repl" "repl-driven") (:url . "https://github.com/anonimitoraf/skerrick"))])
@@ -4814,8 +4830,8 @@
  (sl . [(20161217 1404) ((cl-lib (0 5))) "An Emacs clone of sl(1)" tar ((:commit . "0882117728be91276b815e18c2a66106bf9d69d3") (:authors ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainers ("Chunyang Xu" . "mail@xuchunyang.me")) (:maintainer "Chunyang Xu" . "mail@xuchunyang.me") (:url . "https://github.com/xuchunyang/sl.el"))])
  (slack . [(20211129 310) ((websocket (1 8)) (request (0 2 0)) (oauth2 (0 10)) (circe (2 2)) (alert (1 2)) (emojify (0 2))) "Slack client for Emacs" tar ((:commit . "ff46d88726482211e3ac3d0b9c95dd4fdffe11c2") (:authors ("yuya.minami" . "yuya.minami@yuyaminami-no-MacBook-Pro.local")) (:maintainer "yuya.minami" . "yuya.minami@yuyaminami-no-MacBook-Pro.local") (:keywords "tools") (:url . "https://github.com/yuya373/emacs-slack"))])
  (slideview . [(20150324 2240) ((cl-lib (0 3))) "File slideshow" tar ((:commit . "b6d170bda139aedf81b47dc55cbd1a3af512fb4c") (:authors ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainers ("Masahiro Hayashi" . "mhayashi1120@gmail.com")) (:maintainer "Masahiro Hayashi" . "mhayashi1120@gmail.com") (:keywords "files") (:url . "https://github.com/mhayashi1120/Emacs-slideview"))])
- (slim-mode . [(20170728 1348) nil "Major mode for editing Slim files" tar ((:commit . "3636d18ab1c8b316eea71c4732eb44743e2ded87") (:authors ("Nathan Weizenbaum")) (:maintainers ("Nathan Weizenbaum")) (:maintainer "Nathan Weizenbaum") (:keywords "markup" "language") (:url . "http://github.com/slim-template/emacs-slim"))])
- (slime . [(20240427 406) ((emacs (24 3)) (macrostep (0 9))) "Superior Lisp Interaction Mode for Emacs" tar ((:commit . "c2e45e7004743fdd8620e2fea67f30a17b6a558a") (:keywords "languages" "lisp" "slime") (:url . "https://github.com/slime/slime"))])
+ (slim-mode . [(20240513 2118) nil "Major mode for editing Slim files" tar ((:commit . "8c92169817f2fa59255f547f0a9fb4fbb8309db9") (:authors ("Nathan Weizenbaum")) (:maintainers ("Nathan Weizenbaum")) (:maintainer "Nathan Weizenbaum") (:keywords "markup" "language") (:url . "http://github.com/slim-template/emacs-slim"))])
+ (slime . [(20240516 319) ((emacs (24 3)) (macrostep (0 9))) "Superior Lisp Interaction Mode for Emacs" tar ((:commit . "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3") (:keywords "languages" "lisp" "slime") (:url . "https://github.com/slime/slime"))])
  (slime-company . [(20210124 1627) ((emacs (24 4)) (slime (2 13)) (company (0 9 0))) "slime completion backend for company mode" tar ((:commit . "f20ecc4104d4c35052696e7e760109fb02060e72") (:authors ("Ole Arndt" . "anwyn@sugarshark.com")) (:maintainers ("Ole Arndt" . "anwyn@sugarshark.com")) (:maintainer "Ole Arndt" . "anwyn@sugarshark.com") (:keywords "convenience" "lisp" "abbrev"))])
  (slime-docker . [(20210426 1422) ((emacs (24 4)) (slime (2 16)) (docker-tramp (0 1))) "Integration of SLIME with Docker containers" tar ((:commit . "c7d073720f2bd8e9f72a20309fff2afa4c4e798d") (:keywords "docker" "lisp" "slime") (:url . "https://gitlab.common-lisp.net/cl-docker-images/slime-docker"))])
  (slime-repl-ansi-color . [(20230214 1453) ((emacs (24)) (slime (2 3 1))) "Turn on ANSI colors in REPL output;" tar ((:commit . "9e8af90490332217e45d7568f1690df3f4e25d4b") (:authors ("Max Mikhanosha" . "max@openchat.com")) (:maintainers ("Augustin Fabre" . "augustin@augfab.fr")) (:maintainer "Augustin Fabre" . "augustin@augfab.fr") (:keywords "lisp") (:url . "https://gitlab.com/augfab/slime-repl-ansi-color"))])
@@ -4827,7 +4843,7 @@
  (slow-keys . [(20220807 1425) ((emacs (24 1))) "Slow keys mode to avoid RSI" tar ((:commit . "b951ae4bdcea56ced03f227b82b28c3d91d15e61") (:authors ("Manuel Uberti" . "manuel.uberti@inventati.org")) (:maintainers ("Manuel Uberti" . "manuel.uberti@inventati.org")) (:maintainer "Manuel Uberti" . "manuel.uberti@inventati.org") (:keywords "convenience") (:url . "https://github.com/manuel-uberti/slow-keys"))])
  (slstats . [(20170823 849) ((cl-lib (0 5)) (emacs (24))) "Acquire and display stats about Second Life" tar ((:commit . "e9696066abf3f2b7b818a57c062530dfd9377033") (:authors ("Dave Pearson" . "davep@davep.org")) (:maintainers ("Dave Pearson" . "davep@davep.org")) (:maintainer "Dave Pearson" . "davep@davep.org") (:keywords "games") (:url . "https://github.com/davep/slstats.el"))])
  (slurm-mode . [(20210519 1109) nil "Interaction with the SLURM job scheduling system" tar ((:commit . "4e6ac09245313cf4018b8e5784b2fca8604269d7") (:url . "https://github.com/ffevotte/slurm.el"))])
- (sly . [(20240413 2145) ((emacs (24 3))) "Sylvester the Cat's Common Lisp IDE" tar ((:commit . "0ebe705c08af7126e0b2ce66a33fc7d23864b193") (:keywords "languages" "lisp" "sly") (:url . "https://github.com/joaotavora/sly"))])
+ (sly . [(20240501 1118) ((emacs (24 3))) "Sylvester the Cat's Common Lisp IDE" tar ((:commit . "ba40c8f054ec3b7040a6c36a1ef3e9596b936421") (:keywords "languages" "lisp" "sly") (:url . "https://github.com/joaotavora/sly"))])
  (sly-asdf . [(20221119 2235) ((emacs (24 3)) (sly (1 0 0 -2 2)) (popup (0 5 3))) "ASDF system support for SLY" tar ((:commit . "6f9d751469bb82530db1673c22e7437ca6c95f45") (:maintainers ("Matt George" . "mmge93@gmail.com")) (:maintainer "Matt George" . "mmge93@gmail.com") (:keywords "languages" "lisp" "sly" "asdf") (:url . "https://github.com/mmgeorge/sly-asdf"))])
  (sly-hello-world . [(20200225 1755) ((sly (1 0 0 -2 2))) "A template SLY contrib" tar ((:commit . "be257e9ad354db690c7378e89899335597348a0d") (:authors ("João Távora" . "joaotavora@gmail.com")) (:maintainers ("João Távora" . "joaotavora@gmail.com")) (:maintainer "João Távora" . "joaotavora@gmail.com") (:keywords "languages" "lisp" "sly") (:url . "https://github.com/capitaomorte/sly-hello-world"))])
  (sly-macrostep . [(20191211 1630) ((sly (1 0 0 -2 2)) (macrostep (0 9))) "fancy macro-expansion via macrostep.el" tar ((:commit . "5113e4e926cd752b1d0bcc1508b3ebad5def5fad") (:keywords "languages" "lisp" "sly") (:url . "https://github.com/capitaomorte/sly-macrostep"))])
@@ -4929,9 +4945,9 @@
  (sparkline . [(20150101 1319) ((cl-lib (0 3))) "Make sparkline images from a list of numbers" tar ((:commit . "a2b5d817d272d6363b67ed8f8cc75499a19fa8d2") (:authors ("Willem Rein Oudshoorn" . "woudshoo@xs4all.nl")) (:maintainers ("Willem Rein Oudshoorn" . "woudshoo@xs4all.nl")) (:maintainer "Willem Rein Oudshoorn" . "woudshoo@xs4all.nl") (:keywords "extensions"))])
  (sparql-mode . [(20230104 1113) ((cl-lib (0 5)) (emacs (24 3))) "Edit and interactively evaluate SPARQL queries." tar ((:commit . "1f6196094ec6626722c6e03a13f6844c68f62703") (:authors ("Craig Andera <candera at wangdera dot com>")) (:maintainers ("Bjarte Johansen <Bjarte dot Johansen at gmail dot com>")) (:maintainer "Bjarte Johansen <Bjarte dot Johansen at gmail dot com>") (:url . "https://github.com/ljos/sparql-mode"))])
  (spatial-navigate . [(20240421 908) ((emacs (29 1))) "Directional navigation between white-space blocks" tar ((:commit . "4f85fe3ae4d240a35d3d7edd8b865612024f9dda") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-spatial-navigate"))])
- (spdx . [(20240425 103) ((emacs (24 4))) "Insert SPDX license and copyright headers" tar ((:commit . "28801aa911d43bb0b2545f83781a3c629266fd72") (:authors ("Zhiwei Chen" . "condy0919@gmail.com")) (:maintainers ("Zhiwei Chen" . "condy0919@gmail.com")) (:maintainer "Zhiwei Chen" . "condy0919@gmail.com") (:keywords "license" "tools") (:url . "https://github.com/condy0919/spdx.el"))])
+ (spdx . [(20240521 104) ((emacs (24 4))) "Insert SPDX license and copyright headers" tar ((:commit . "a26f071d335e7987fd0377057d46056954120b34") (:authors ("Zhiwei Chen" . "condy0919@gmail.com")) (:maintainers ("Zhiwei Chen" . "condy0919@gmail.com")) (:maintainer "Zhiwei Chen" . "condy0919@gmail.com") (:keywords "license" "tools") (:url . "https://github.com/condy0919/spdx.el"))])
  (speech-tagger . [(20170728 1829) ((cl-lib (0 5))) "tag parts of speech using coreNLP" tar ((:commit . "61955b40d4e8b09e66a3e8033e82893f81657c06") (:authors ("Danny McClanahan" . "danieldmcclanahan@gmail.com")) (:maintainers ("Danny McClanahan" . "danieldmcclanahan@gmail.com")) (:maintainer "Danny McClanahan" . "danieldmcclanahan@gmail.com") (:keywords "speech" "tag" "nlp" "language" "corenlp" "parsing" "natural") (:url . "https://github.com/cosmicexplorer/speech-tagger"))])
- (speechd-el . [(20240427 2112) nil "Client to speech synthesizers and Braille displays." tar ((:commit . "64218c59f1636af6a0cb3690bf0bedae1dd17442") (:authors ("Milan Zamazal" . "pdm@zamazal.org")) (:maintainer "Milan Zamazal" . "pdm@zamazal.org") (:url . "https://github.com/brailcom/speechd-el"))])
+ (speechd-el . [(20240513 1716) nil "Client to speech synthesizers and Braille displays." tar ((:commit . "ac7497e394bf7d46e0b2c27570f5507f6a50a157") (:authors ("Milan Zamazal" . "pdm@zamazal.org")) (:maintainer "Milan Zamazal" . "pdm@zamazal.org") (:url . "https://github.com/brailcom/speechd-el"))])
  (speed-type . [(20230926 838) ((emacs (26 1)) (compat (29 1 3))) "Practice touch and speed typing" tar ((:commit . "28b8e8c1cc24511758168f30bcac18d8fb93706d") (:authors ("Gunther Hagleitner")) (:maintainers ("Daniel Kraus" . "daniel@kraus.my")) (:maintainer "Daniel Kraus" . "daniel@kraus.my") (:keywords "games") (:url . "https://github.com/dakra/speed-type"))])
  (speedbar-git-respect . [(20200901 246) ((f (0 8 0)) (emacs (25 1))) "Particular respect git repo in speedbar" tar ((:commit . "dd8f0849fc1dd21b42380e1a8c28a9a29acd9511") (:authors ("Muromi Ukari" . "chendianbuji@gmail.com")) (:maintainers ("Muromi Ukari" . "chendianbuji@gmail.com")) (:maintainer "Muromi Ukari" . "chendianbuji@gmail.com") (:url . "https://github.com/ukari/speedbar-git-respect"))])
  (speeddating . [(20180319 723) ((emacs (25))) "Increase date and time at point" tar ((:commit . "eeaf90cd10e376bff5a295590a3d5f7fd1402523") (:authors ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainers ("Xu Chunyang" . "mail@xuchunyang.me")) (:maintainer "Xu Chunyang" . "mail@xuchunyang.me") (:keywords "date" "time") (:url . "https://github.com/xuchunyang/emacs-speeddating"))])
@@ -4965,7 +4981,7 @@
  (sr-speedbar . [(20161025 831) nil "Same frame speedbar" tar ((:commit . "77a83fb50f763a465c021eca7343243f465b4a47") (:authors ("Sebastian Rose" . "sebastian_rose@gmx.de")) (:maintainers ("Sebastian Rose" . "sebastian_rose@gmx.de")) (:maintainer "Sebastian Rose" . "sebastian_rose@gmx.de") (:keywords "speedbar" "sr-speedbar.el") (:url . "http://www.emacswiki.org/emacs/download/sr-speedbar.el"))])
  (srcery-theme . [(20240220 805) ((emacs (24))) "Dark color theme" tar ((:commit . "60028633c5722e6b8ea12844618be0e9b31be55a") (:authors ("Daniel Berg")) (:maintainers ("Daniel Berg")) (:maintainer "Daniel Berg") (:keywords "faces") (:url . "https://github.com/srcery-colors/srcery-emacs"))])
  (srefactor . [(20230504 617) ((emacs (24 4))) "A refactoring tool based on Semantic parser framework" tar ((:commit . "95c70a94b5aad4c85b35569e2f2325047791153a") (:authors ("Tu, Do Hoang" . "tuhdo1710@gmail.com")) (:maintainers ("Tu, Do Hoang")) (:maintainer "Tu, Do Hoang") (:keywords "c" "languages" "tools") (:url . "https://github.com/tuhdo/semantic-refactor"))])
- (srfi . [(20240425 1823) ((emacs (25 1))) "Scheme Requests for Implementation browser" tar ((:commit . "75b5b3e9b49bb450c1245ba7d7627ecb27baa53d") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/srfi-explorations/emacs-srfi"))])
+ (srfi . [(20240507 58) ((emacs (25 1))) "Scheme Requests for Implementation browser" tar ((:commit . "7d3584b0b887a3bedebe5fd829fa7623c1d730fc") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "languages" "util") (:url . "https://github.com/srfi-explorations/emacs-srfi"))])
  (srv . [(20180715 1959) ((emacs (24 3))) "perform SRV DNS requests" tar ((:commit . "714387d5a5cf34d8d8cd96bdb1f9cb8ded823ff7") (:authors ("Magnus Henoch" . "magnus.henoch@gmail.com")) (:maintainers ("Magnus Henoch" . "magnus.henoch@gmail.com")) (:maintainer "Magnus Henoch" . "magnus.henoch@gmail.com") (:keywords "comm") (:url . "https://github.com/legoscia/srv.el"))])
  (ssass-mode . [(20200211 132) ((emacs (24 3))) "Edit Sass without a Turing Machine" tar ((:commit . "96f557887ad97a0066a60c54f92b7234b8407016") (:authors ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainers ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainer "Adam Niederer" . "adam.niederer@gmail.com") (:keywords "languages" "sass") (:url . "http://github.com/AdamNiederer/ssass-mode"))])
  (ssh . [(20120904 2042) nil "Support for remote logins using ssh." tar ((:commit . "c17cf5b43df8ac4662a0580f85898e1f078df0d1") (:authors ("Noah Friedman" . "friedman@splode.com")) (:maintainers ("Ian Eure" . "ian.eure@gmail.com")) (:maintainer "Ian Eure" . "ian.eure@gmail.com") (:keywords "unix" "comm"))])
@@ -4987,13 +5003,13 @@
  (stem . [(20131102 1109) nil "Routines for stemming" tar ((:commit . "dd704c3447bd5d3f5ac0a4840f8987d4f855d87e") (:authors ("Tsuchiya Masatoshi" . "tsuchiya@pine.kuee.kyoto-u.ac.jp")) (:maintainers ("Tsuchiya Masatoshi" . "tsuchiya@pine.kuee.kyoto-u.ac.jp")) (:maintainer "Tsuchiya Masatoshi" . "tsuchiya@pine.kuee.kyoto-u.ac.jp") (:keywords "stemming") (:url . "https://github.com/yuutayamada/stem"))])
  (stem-english . [(20180109 358) ((emacs (24 3))) "- routines for stemming English word" tar ((:commit . "c9fc4c6ed6bf82382e479dae80912f4ae17d31f4") (:authors ("Tsuchiya Masatoshi" . "tsuchiya@pine.kuee.kyoto-u.ac.jp")) (:maintainers ("KAWABATA, Taichi <kawabata.taichi_at_gmail.com>")) (:maintainer "KAWABATA, Taichi <kawabata.taichi_at_gmail.com>") (:keywords "text") (:url . "http://github.com/kawabata/stem-english"))])
  (stem-reading-mode . [(20220522 1053) ((emacs (25 1))) "Highlight word stems for speed-reading" tar ((:commit . "6efc9962e3a19a452c7ab9636cf1e2566a51bd38") (:authors ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainers ("Yuri D'Elia" . "wavexx@thregr.org")) (:maintainer "Yuri D'Elia" . "wavexx@thregr.org") (:keywords "convenience" "wp") (:url . "https://gitlab.com/wavexx/stem-reading-mode.el"))])
- (stgit . [(20240407 2229) nil "major mode for StGit interaction" tar ((:commit . "9afe502c74f51ed7d4e794da11c01e25718b0f64") (:authors ("David Kågedal" . "davidk@lysator.liu.se")) (:maintainers ("David Kågedal" . "davidk@lysator.liu.se")) (:maintainer "David Kågedal" . "davidk@lysator.liu.se") (:url . "http://stacked-git.github.io"))])
+ (stgit . [(20240505 2218) nil "major mode for StGit interaction" tar ((:commit . "e2b799d7bd39f69b66b54d556e345699dee740d6") (:authors ("David Kågedal" . "davidk@lysator.liu.se")) (:maintainers ("David Kågedal" . "davidk@lysator.liu.se")) (:maintainer "David Kågedal" . "davidk@lysator.liu.se") (:url . "http://stacked-git.github.io"))])
  (sticky . [(20170926 36) nil "Sticky key for capital letters" tar ((:commit . "fec4e1af38f17f5cd80eca361d8e8ef8772db366") (:authors ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainers ("rubikitch" . "rubikitch@ruby-lang.org")) (:maintainer "rubikitch" . "rubikitch@ruby-lang.org") (:keywords "convenience") (:url . "http://www.emacswiki.org/cgi-bin/wiki/download/sticky.el"))])
  (sticky-shell . [(20230207 1454) ((emacs (25 1))) "Minor mode to keep track of previous prompt in your shell" tar ((:commit . "030535451b7c12eea3a94dfc1a439b8baa96944b") (:authors ("Andrew De Angelis" . "bobodeangelis@gmail.com")) (:maintainers ("Andrew De Angelis" . "bobodeangelis@gmail.com")) (:maintainer "Andrew De Angelis" . "bobodeangelis@gmail.com") (:keywords "processes" "terminals" "tools") (:url . "https://github.com/andyjda/sticky-shell"))])
  (stickyfunc-enhance . [(20150429 1814) ((emacs (24 3))) "An enhancement to stock `semantic-stickyfunc-mode'" tar ((:commit . "13bdba51fcd83ccbc3267959d23afc94d458dcb0") (:authors ("Tu, Do Hoang" . "tuhdo1710@gmail.com")) (:maintainers ("Tu, Do Hoang")) (:maintainer "Tu, Do Hoang") (:keywords "c" "languages" "tools") (:url . "https://github.com/tuhdo/semantic-stickyfunc-enhance"))])
  (stimmung-themes . [(20240117 1324) ((emacs (25))) "Themes tuned to inner harmonies" tar ((:commit . "1a574973041cd5c318f39b95f6377b60337f2d6d") (:authors ("Love Lagerkvist")) (:maintainers ("Love Lagerkvist")) (:maintainer "Love Lagerkvist") (:keywords "faces") (:url . "https://github.com/motform/stimmung-themes"))])
  (stock-ticker . [(20150204 1052) ((s (1 9 0)) (request (0 2 0))) "Show stock prices in mode line" tar ((:commit . "74251cc810604af75f48333d51133326c053dd16") (:authors ("Gunther Hagleitner")) (:maintainers ("Gunther Hagleitner")) (:maintainer "Gunther Hagleitner") (:keywords "comms") (:url . "https://github.com/hagleitn/stock-ticker"))])
- (stock-tracker . [(20230625 524) ((emacs (27 1)) (dash (2 16 0)) (async (1 9 5))) "Track stock price" tar ((:commit . "cdffcaa6bb75c450a511a31d0c69e30a4edd562d") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "stock" "finance") (:url . "https://github.com/beacoder/stock-tracker"))])
+ (stock-tracker . [(20240430 247) ((emacs (27 1)) (dash (2 16 0)) (async (1 9 5))) "Track stock price" tar ((:commit . "7004467c995e0104cad874361669e6b395b3da48") (:authors ("Huming Chen" . "chenhuming@gmail.com")) (:maintainers ("Huming Chen" . "chenhuming@gmail.com")) (:maintainer "Huming Chen" . "chenhuming@gmail.com") (:keywords "convenience" "stock" "finance") (:url . "https://github.com/beacoder/stock-tracker"))])
  (strace-mode . [(20171116 2039) nil "strace output syntax highlighting" tar ((:commit . "2901baa968d5180ab985ac40ca22cc20914d01f5") (:authors ("Preston Moore" . "prestonkmoore@gmail.com")) (:maintainers ("Preston Moore" . "prestonkmoore@gmail.com")) (:maintainer "Preston Moore" . "prestonkmoore@gmail.com") (:keywords "languages"))])
  (streak . [(20240106 2145) ((emacs (27 1))) "Track a daily streak in your Mode Line" tar ((:commit . "2d56788cbbf6114e61c85dd57b05133f8f351ac6") (:authors ("Colin Woodbury <https://www.fosskers.ca>")) (:maintainers ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainer "Colin Woodbury" . "colin@fosskers.ca") (:keywords "calendar") (:url . "https://github.com/fosskers/streak"))])
  (streamlink . [(20210811 1429) ((s (1 12 0))) "A major mode for streamlink output" tar ((:commit . "13dff15121ac0276f693696db9b04ae5820058d5") (:keywords "multimedia" "streamlink") (:url . "https://github.com/BenediktBroich/streamlink"))])
@@ -5032,7 +5048,7 @@
  (sv-kalender-namnsdagar . [(20190421 1521) nil "Swedish celebrated name of the day" tar ((:commit . "fff970f49c77abfc69e37817f25a939818420971") (:authors ("Mats Lidell" . "mats.lidell@lidells.se")) (:maintainers ("Mats Lidell" . "mats.lidell@lidells.se")) (:maintainer "Mats Lidell" . "mats.lidell@lidells.se") (:keywords "calendar" "swedish" "localization") (:url . "https://github.com/matsl/sv-kalender-namnsdagar"))])
  (svelte-mode . [(20211016 652) ((emacs (26 1))) "Emacs major mode for Svelte" tar ((:commit . "6a1d4274af7f4c0f271f77bd96678c3dd1fa68e1") (:authors ("Leaf" . "leafvocation@gmail.com")) (:maintainers ("Leaf" . "leafvocation@gmail.com")) (:maintainer "Leaf" . "leafvocation@gmail.com") (:keywords "wp" "languages") (:url . "https://github.com/leafOfTree/svelte-mode"))])
  (svg-mode-line-themes . [(20150425 2006) ((xmlgen (0 4))) "SVG-based themes for mode-line" tar ((:commit . "80a0e01839cafbd66899202e7764c33231974259") (:authors ("sabof")) (:maintainers ("sabof")) (:maintainer "sabof") (:url . "https://github.com/sabof/svg-mode-line-themes"))])
- (svg-tag-mode . [(20240122 1209) ((emacs (27 1)) (svg-lib (0 2))) "Replace keywords with SVG tags" tar ((:commit . "f01307dd7720ed952355db0a552ae555c13ced13") (:authors ("Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")) (:maintainers ("Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")) (:maintainer "Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr") (:keywords "convenience") (:url . "https://github.com/rougier/svg-tag-mode"))])
+ (svg-tag-mode . [(20240429 1052) ((emacs (27 1)) (svg-lib (0 2))) "Replace keywords with SVG tags" tar ((:commit . "a152bc90a7c9dc17112893a19ddf91078b909057") (:authors ("Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")) (:maintainers ("Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr")) (:maintainer "Nicolas P. Rougier" . "Nicolas.Rougier@inria.fr") (:keywords "convenience") (:url . "https://github.com/rougier/svg-tag-mode"))])
  (svgo . [(20220525 2059) ((emacs (26 2))) "SVG optimization with SVGO" tar ((:commit . "9b01cc9eb1fdf2731cd2b931a7dfe1f601b70786") (:authors ("Mathis Hofer" . "mathis@fsfe.org")) (:maintainers ("Mathis Hofer" . "mathis@fsfe.org")) (:maintainer "Mathis Hofer" . "mathis@fsfe.org") (:keywords "tools") (:url . "https://github.com/hupf/svgo.el/"))])
  (svnwrapper . [(20180414 1843) ((e2ansi (0 1 1))) "Highlighting and paging for shell command `svn'" tar ((:commit . "de5069f5784e5d9e87a0af0159ba5f28a3716583") (:authors ("Anders Lindgren")) (:maintainers ("Anders Lindgren")) (:maintainer "Anders Lindgren") (:keywords "faces") (:url . "https://github.com/Lindydancer/svnwrapper"))])
  (swagg . [(20240326 737) ((emacs (27 1)) (compat (29 1 4 0)) (request (0 3 3)) (dash (2 19 1)) (yaml (0 5 1)) (s (1 13 1))) "Swagger UI" tar ((:commit . "27d5e7d06c2296cd356ac4a5b97ec84f2dabbb53") (:authors ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainers ("Isa Mert Gurbuz" . "isamertgurbuz@gmail.com")) (:maintainer "Isa Mert Gurbuz" . "isamertgurbuz@gmail.com") (:keywords "tools" "convenience") (:url . "https://github.com/isamert/swagg.el"))])
@@ -5047,7 +5063,7 @@
  (swift-mode . [(20240217 631) ((emacs (24 4)) (seq (2 3))) "Major-mode for Apple's Swift programming language" tar ((:commit . "25cf8237312bf5eddc2c90001feb8f73633ab523") (:authors ("taku0" . "mxxouy6x3m_github@tatapa.org") ("Chris Barrett" . "chris.d.barrett@me.com") ("Bozhidar Batsov" . "bozhidar@batsov.com") ("Arthur Evstifeev" . "lod@pisem.net")) (:maintainers ("taku0" . "mxxouy6x3m_github@tatapa.org")) (:maintainer "taku0" . "mxxouy6x3m_github@tatapa.org") (:keywords "languages" "swift") (:url . "https://github.com/swift-emacs/swift-mode"))])
  (swift-ts-mode . [(20240414 949) ((emacs (29 1))) "Major mode for Swift based on tree-sitter" tar ((:commit . "a62f4d84b836fe208d912c26fb561c93a0c8e296") (:authors ("Martin Rechsteiner")) (:maintainers ("Martin Rechsteiner")) (:maintainer "Martin Rechsteiner") (:keywords "swift" "languages" "tree-sitter") (:url . "https://github.com/rechsteiner/swift-ts-mode"))])
  (swift3-mode . [(20160918 1250) ((emacs (24 4))) "Major-mode for Apple's Swift programming language." tar ((:commit . "ea34d46bf9a4293e75ffdac9500d34989316d9e9") (:keywords "languages" "swift") (:url . "https://github.com/taku0/swift3-mode"))])
- (swiper . [(20240405 1642) ((emacs (24 5)) (ivy (0 14 2))) "Isearch with an overview.  Oh, man!" tar ((:commit . "e0b1a6c224afb652d11b315913b8ad0c3ca8ecbc") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "matching") (:url . "https://github.com/abo-abo/swiper"))])
+ (swiper . [(20240520 1202) ((emacs (24 5)) (ivy (0 14 2))) "Isearch with an overview.  Oh, man!" tar ((:commit . "c8808d88c633fdd00f7671fee054954f3a7598b8") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Basil L. Contovounesios" . "basil@contovou.net")) (:maintainer "Basil L. Contovounesios" . "basil@contovou.net") (:keywords "matching") (:url . "https://github.com/abo-abo/swiper"))])
  (swiper-helm . [(20180131 1744) ((emacs (24 1)) (swiper (0 1 0)) (helm (1 5 3))) "Helm version of Swiper." tar ((:commit . "93fb6db87bc6a5967898b5fd3286954cc72a0008") (:authors ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainers ("Oleh Krehel" . "ohwoeowho@gmail.com")) (:maintainer "Oleh Krehel" . "ohwoeowho@gmail.com") (:keywords "matching") (:url . "https://github.com/abo-abo/swiper-helm"))])
  (swiss-holidays . [(20200526 822) nil "Swiss holidays for the calendar" tar ((:commit . "0995c9685033a09466f5b2dceb7316362bde997a") (:authors ("Christian Egli" . "christian.egli@alumni.ethz.ch")) (:maintainers ("Christian Egli" . "christian.egli@alumni.ethz.ch")) (:maintainer "Christian Egli" . "christian.egli@alumni.ethz.ch") (:keywords "calendar") (:url . "https://github.com/egli/swiss-holidays"))])
  (switch-buffer-functions . [(20200127 409) nil "Hook run when current buffer changed" tar ((:commit . "40cb0c9e2c84b30e1c5c7458a795cda1bd8ad8fa") (:authors ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainers ("10sr <8slashes+el [at] gmail [dot] com>")) (:maintainer "10sr <8slashes+el [at] gmail [dot] com>") (:keywords "hook" "utility") (:url . "https://github.com/10sr/switch-buffer-functions-el"))])
@@ -5059,7 +5075,7 @@
  (symbol-navigation-hydra . [(20211010 2353) ((auto-highlight-symbol (1 61)) (hydra (0 15 0)) (emacs (24 4)) (multiple-cursors (1 4 0))) "A symbol-aware, range-aware hydra" tar ((:commit . "b3b1257e676514d93cd2d71a10a485bf00b5375f") (:authors ("Brett Wines" . "bgwines@cs.stanford.edu")) (:maintainers ("Brett Wines" . "bgwines@cs.stanford.edu")) (:maintainer "Brett Wines" . "bgwines@cs.stanford.edu") (:keywords "highlight" "face" "match" "convenience" "hydra" "symbol") (:url . "https://github.com/bgwines/symbol-navigation-hydra"))])
  (symbol-overlay . [(20240311 1207) ((emacs (24 3)) (seq (2 2))) "Highlight symbols with keymap-enabled overlays" tar ((:commit . "de215fff392c916ffab01950fcb6daf6fd18be4f") (:authors ("wolray" . "wolray@foxmail.com")) (:maintainers ("wolray" . "wolray@foxmail.com")) (:maintainer "wolray" . "wolray@foxmail.com") (:keywords "faces" "matching") (:url . "https://github.com/wolray/symbol-overlay/"))])
  (symbolist . [(20211107 1615) ((emacs (24 5))) "List and interactively unbind Emacs Lisp symbols" tar ((:commit . "92b712734941a45da7d47fd61b95e4013ff53481") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "lisp" "maint") (:url . "https://github.com/lassik/emacs-symbolist"))])
- (symbols-outline . [(20231229 941) ((emacs (27 1))) "Display symbols (functions, variables, etc) in outline view" tar ((:commit . "af4cba0c409a38e25eb572687a3a6848953ef868") (:authors ("Shihao Liu")) (:maintainers ("Shihao Liu")) (:maintainer "Shihao Liu") (:keywords "outlines") (:url . "https://github.com/liushihao456/symbols-outline.el"))])
+ (symbols-outline . [(20240517 819) ((emacs (27 1))) "Display symbols (functions, variables, etc) in outline view" tar ((:commit . "bfebe73b1322cdc32353375b55f5f56aad85fb57") (:authors ("Shihao Liu")) (:maintainers ("Shihao Liu")) (:maintainer "Shihao Liu") (:keywords "outlines") (:url . "https://github.com/liushihao456/symbols-outline.el"))])
  (symbolword-mode . [(20180401 1427) ((emacs (24)) (f (0 19 0))) "modify word split" tar ((:commit . "920e57f4c2b09b28c5a0c8fe9ebdba9961822163") (:authors ("ncaq" . "ncaq@ncaq.net")) (:maintainers ("ncaq" . "ncaq@ncaq.net")) (:maintainer "ncaq" . "ncaq@ncaq.net") (:url . "https://github.com/ncaq/symbolword-mode"))])
  (symex . [(20240418 806) ((emacs (25 1)) (tsc (0 15 2)) (tree-sitter (0 15 2)) (lispy (0 26 0)) (paredit (24)) (evil-cleverparens (20170718 413)) (evil (1 2 14)) (evil-surround (1 0 4)) (hydra (0 15 0)) (seq (2 22))) "An evil way to edit Lisp symbolic expressions as trees" tar ((:commit . "db8ac5b3039b91e28d4c403c98fcb799ec94369e") (:authors ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainers ("Siddhartha Kasivajhula" . "sid@countvajhula.com")) (:maintainer "Siddhartha Kasivajhula" . "sid@countvajhula.com") (:keywords "lisp" "convenience" "languages") (:url . "https://github.com/countvajhula/symex.el"))])
  (symon . [(20170224 833) nil "tiny graphical system monitor" tar ((:commit . "76461679dfe13a5dccd3c8735fb6f58b26b46733") (:authors ("zk_phi")) (:maintainers ("zk_phi")) (:maintainer "zk_phi") (:url . "http://hins11.yu-yake.com/"))])
@@ -5114,14 +5130,14 @@
  (tea-time . [(20120331 820) nil "Simple timer package, useful to make perfect tea." tar ((:commit . "1f6cf0bdd27c5eb3508989c5095427781f858eca") (:authors ("konsty" . "antipin.konstantin@googlemail.com")) (:maintainers ("Gabriel Saldana" . "gsaldana@gmail.com")) (:maintainer "Gabriel Saldana" . "gsaldana@gmail.com") (:keywords "timer" "tea-time"))])
  (teacode-expand . [(20181231 640) ((emacs (24 4))) "Expansion of text by TeaCode program." tar ((:commit . "7df6f9ec95da1fb47bbae489bb3f2c27ed3a9b3a") (:authors ("Richard Guay" . "raguay@customct.com")) (:maintainers ("Richard Guay" . "raguay@customct.com")) (:maintainer "Richard Guay" . "raguay@customct.com") (:keywords "lisp") (:url . "https://github.com/raguay/TeaCode-Expand"))])
  (teco . [(20200707 2309) nil "Teco interpreter" tar ((:commit . "2529eb0f7f35c526c1b6fca5250399718ff5138a") (:authors ("Dale R. Worley" . "worley@alum.mit.edu")) (:maintainers ("Mark T. Kennedy" . "mtk@acm.org")) (:maintainer "Mark T. Kennedy" . "mtk@acm.org") (:keywords "convenience" "emulations" "files") (:url . "https://github.com/mtk/teco.git"))])
- (telega . [(20240410 928) ((emacs (27 1)) (visual-fill-column (1 9)) (rainbow-identifiers (0 2 2)) (transient (0 3 0))) "Telegram client (unofficial)" tar ((:commit . "d73e02dfe41580ff2d93a6c6feb2af254087bbf6") (:authors ("Zajcev Evgeny" . "zevlg@yandex.ru")) (:maintainers ("Zajcev Evgeny" . "zevlg@yandex.ru")) (:maintainer "Zajcev Evgeny" . "zevlg@yandex.ru") (:keywords "comm") (:url . "https://github.com/zevlg/telega.el"))])
+ (telega . [(20240515 2217) ((emacs (27 1)) (visual-fill-column (1 9)) (rainbow-identifiers (0 2 2)) (transient (0 3 0))) "Telegram client (unofficial)" tar ((:commit . "3d2e5ee323366906b00d8ed40e818d41e82b73e5") (:authors ("Zajcev Evgeny" . "zevlg@yandex.ru")) (:maintainers ("Zajcev Evgeny" . "zevlg@yandex.ru")) (:maintainer "Zajcev Evgeny" . "zevlg@yandex.ru") (:keywords "comm") (:url . "https://github.com/zevlg/telega.el"))])
  (telepathy . [(20131209 1258) nil "Access Telepathy from Emacs" tar ((:commit . "211d785b02a29ddc254422fdcc3db45262582f8c") (:authors ("Nicolas Petton" . "petton.nicolas@gmail.com")) (:maintainers ("Nicolas Petton" . "petton.nicolas@gmail.com")) (:maintainer "Nicolas Petton" . "petton.nicolas@gmail.com") (:keywords "telepathy" "tools"))])
  (telephone-line . [(20240109 2021) ((emacs (24 4)) (cl-lib (0 5)) (cl-generic (0 2)) (seq (1 8))) "Rewrite of Powerline" tar ((:commit . "6016418a5e1e8e006cc202eff50ff28b594eeca4") (:authors ("Daniel Bordak" . "dbordak@fastmail.fm")) (:maintainers ("Daniel Bordak" . "dbordak@fastmail.fm")) (:maintainer "Daniel Bordak" . "dbordak@fastmail.fm") (:keywords "mode-line") (:url . "https://github.com/dbordak/telephone-line"))])
- (teleport . [(20240101 1358) ((emacs (28 1)) (dash (2 18 0))) "Integration for tsh (goteleport.com)" tar ((:commit . "d8fa80e7f548287279c9620e26c354e68b1559af") (:authors ("Caramel Hooves" . "caramel.hooves@protonmail.com")) (:maintainers ("Caramel Hooves" . "caramel.hooves@protonmail.com")) (:maintainer "Caramel Hooves" . "caramel.hooves@protonmail.com") (:keywords "tools") (:url . "https://github.com/caramelhooves/teleport.el"))])
+ (teleport . [(20240501 740) ((emacs (28 1)) (dash (2 18 0))) "Integration for tsh (goteleport.com)" tar ((:commit . "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9") (:authors ("Caramel Hooves" . "caramel.hooves@protonmail.com")) (:maintainers ("Caramel Hooves" . "caramel.hooves@protonmail.com")) (:maintainer "Caramel Hooves" . "caramel.hooves@protonmail.com") (:keywords "tools") (:url . "https://github.com/caramelhooves/teleport.el"))])
  (teletext . [(20231215 1524) ((emacs (24 3))) "Teletext broadcast viewer" tar ((:commit . "d59ae5f9b79007646815a38f31882a114ca8aee0") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "comm" "help" "hypermedia") (:url . "https://github.com/lassik/emacs-teletext"))])
  (teletext-yle . [(20231215 1609) ((emacs (24 3)) (teletext (0 1))) "Teletext provider for Finnish national network YLE" tar ((:commit . "59a287c26571db07e191ac86cdf0be312fec1964") (:authors ("Lassi Kortela" . "lassi@lassi.io")) (:maintainers ("Lassi Kortela" . "lassi@lassi.io")) (:maintainer "Lassi Kortela" . "lassi@lassi.io") (:keywords "comm" "help" "hypermedia") (:url . "https://github.com/lassik/emacs-teletext-yle"))])
  (tempel . [(20240216 1543) ((emacs (27 1)) (compat (29 1 4 4))) "Tempo templates/snippets with in-buffer field editing" tar ((:commit . "bcc3185202edce67c7f7fc74287cc2ecbeef10c6") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "abbrev" "languages" "tools" "text") (:url . "https://github.com/minad/tempel"))])
- (tempel-collection . [(20240404 1026) ((tempel (0 5)) (emacs (29 1))) "Collection of templates for Tempel" tar ((:commit . "e87b1fee9554f9bc7415df053c8d8c9f03c13955") (:authors ("Vitalii Drevenchuk" . "cradlemann@gmail.com") ("Max Penet" . "mpenetr@s-exp.com") ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Vitalii Drevenchuk" . "cradlemann@gmail.com")) (:maintainer "Vitalii Drevenchuk" . "cradlemann@gmail.com") (:keywords "tools") (:url . "https://github.com/Crandel/tempel-collection"))])
+ (tempel-collection . [(20240507 805) ((tempel (0 5)) (emacs (29 1))) "Collection of templates for Tempel" tar ((:commit . "cf2594313a41f6a29205e378411ebb10e9d764c3") (:authors ("Vitalii Drevenchuk" . "cradlemann@gmail.com") ("Max Penet" . "mpenetr@s-exp.com") ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Vitalii Drevenchuk" . "cradlemann@gmail.com")) (:maintainer "Vitalii Drevenchuk" . "cradlemann@gmail.com") (:keywords "tools") (:url . "https://github.com/Crandel/tempel-collection"))])
  (templ-ts-mode . [(20240118 338) ((emacs (29 1))) "Major mode for editing Templ files" tar ((:commit . "e43dc22adada160906bd411b03cfa022d787486d") (:authors ("David Anderson" . "dave@natulte.net")) (:maintainers ("David Anderson" . "dave@natulte.net")) (:maintainer "David Anderson" . "dave@natulte.net") (:keywords "languages") (:url . "https://github.com/danderson/templ-ts-mode"))])
  (template-overlays . [(20180706 1132) ((emacs (24 4)) (ov (1 0 6))) "Display template regions using overlays" tar ((:commit . "3cbc9a4882dcbbddf9b168883d119a6af0848784") (:authors ("Mariano Montone" . "marianomontone@gmail.com")) (:maintainers ("Mariano Montone" . "marianomontone@gmail.com")) (:maintainer "Mariano Montone" . "marianomontone@gmail.com") (:keywords "faces" "convenience" "templates" "overlays") (:url . "http://www.github.com/mmontone/template-overlays"))])
  (templatel . [(20210902 228) ((emacs (25 1))) "Templating language;" tar ((:commit . "e1ccb88cdc4b482b078276960f810b82ba3b7847") (:authors ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainers ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainer "Lincoln Clarete" . "lincoln@clarete.li") (:url . "https://clarete.li/templatel"))])
@@ -5148,7 +5164,7 @@
  (tesouro . [(20221003 1303) ((request (0 3 2)) (emacs (24 4))) "Brazilian Portuguese synonym search in dicio.com.br" tar ((:commit . "3dbfc49209237215163be1ea338dea099ddc0795") (:url . "https://github.com/rberaldo/tesouro.el"))])
  (test-c . [(20180423 1720) ((emacs (24 3))) "quickly test c code" tar ((:commit . "761a576f62c7021ba941f178f153c51289df1553") (:authors ("Aurélien Aptel" . "aurelien.aptel@gmail.com")) (:maintainers ("Aurélien Aptel" . "aurelien.aptel@gmail.com")) (:maintainer "Aurélien Aptel" . "aurelien.aptel@gmail.com") (:url . "http://github.com/aaptel/test-c"))])
  (test-case-mode . [(20130525 1434) ((fringe-helper (0 1 1))) "unit test front-end" tar ((:commit . "26e397c0f930b7eb0be413ef7dd257b1da052bec") (:authors ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainers ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainer "Nikolaj Schumacher <bugs * nschum de>") (:keywords "tools") (:url . "http://nschum.de/src/emacs/test-case-mode/"))])
- (test-cockpit . [(20240220 2058) ((emacs (28 1)) (projectile (2 7)) (toml (20230411 1449))) "A command center to run tests of a software project" tar ((:commit . "11c23ddb9284b21a1072c37f168574096ee3bd2f") (:authors ("Johannes Mueller" . "github@johannes-mueller.org")) (:maintainers ("Johannes Mueller" . "github@johannes-mueller.org")) (:maintainer "Johannes Mueller" . "github@johannes-mueller.org") (:url . "https://github.com/johannes-mueller/test-cockpit.el"))])
+ (test-cockpit . [(20240519 1747) ((emacs (28 1)) (projectile (2 7)) (toml (20230411 1449))) "A command center to run tests of a software project" tar ((:commit . "2b836e5f954059210b6efaecebfe5fd7c72e726c") (:authors ("Johannes Mueller" . "github@johannes-mueller.org")) (:maintainers ("Johannes Mueller" . "github@johannes-mueller.org")) (:maintainer "Johannes Mueller" . "github@johannes-mueller.org") (:url . "https://github.com/johannes-mueller/test-cockpit.el"))])
  (test-kitchen . [(20171129 2035) nil "Run test-kitchen inside of emacs" tar ((:commit . "0fc0ca4808425f03fbeb8125246043723e2a179a") (:authors ("JJ Asghar")) (:maintainers ("JJ Asghar")) (:maintainer "JJ Asghar") (:keywords "chef" "ruby" "test-kitchen") (:url . "http://github.com/jjasghar/test-kitchen-el"))])
  (test-simple . [(20230916 1634) ((cl-lib (0))) "Simple Unit Test Framework for Emacs Lisp" tar ((:commit . "8b191842318bb05da74052025192d32ebebb033a") (:authors ("Rocky Bernstein" . "rocky@gnu.org")) (:maintainers ("Rocky Bernstein" . "rocky@gnu.org")) (:maintainer "Rocky Bernstein" . "rocky@gnu.org") (:keywords "unit-test") (:url . "https://github.com/rocky/emacs-test-simple"))])
  (tex-smart-umlauts . [(20230416 2051) nil "Smart umlaut conversion for TeX." tar ((:commit . "b28bac71990e0442616157fdb64494179df5575e") (:authors ("Frank Fischer <frank-fischer at shadow-soft.de>")) (:maintainers ("Frank Fischer <frank-fischer at shadow-soft.de>")) (:maintainer "Frank Fischer <frank-fischer at shadow-soft.de>") (:keywords "tex" "wp") (:url . "http://hub.darcs.net/lyro/tex-smart-umlauts"))])
@@ -5161,7 +5177,7 @@
  (textx-mode . [(20230324 2020) ((emacs (24 3))) "Major mode for editing TextX files" tar ((:commit . "ecf90abec508cfd82d5da68474e976be907d9a77") (:authors ("Novak Boškov" . "gnovak.boskov@gmail.com")) (:maintainers ("Novak Boškov" . "gnovak.boskov@gmail.com")) (:maintainer "Novak Boškov" . "gnovak.boskov@gmail.com") (:keywords "textx") (:url . "https://github.com/novakboskov/textx-mode"))])
  (tf2-conf-mode . [(20161209 1620) nil "TF2 Configuration files syntax highlighting" tar ((:commit . "94c971da4a78d55da2848d1e76d513e5e0a8f7eb") (:authors ("Guillermo Robles" . "guillerobles1995@gmail.com")) (:maintainers ("Guillermo Robles" . "guillerobles1995@gmail.com")) (:maintainer "Guillermo Robles" . "guillerobles1995@gmail.com") (:keywords "languages") (:url . "https://github.com/wynro/emacs-tf2-conf-mode"))])
  (tfsmacs . [(20180911 2114) ((emacs (25)) (tablist (0 70))) "MS TFS source control interaction." tar ((:commit . "13ee3f528ff616880611f563a68d921250692ef8") (:authors ("Dino Chiesa <dpchiesa@outlook.com>, Sebastian Monia" . "smonia@outlook.com")) (:maintainers ("Dino Chiesa <dpchiesa@outlook.com>, Sebastian Monia" . "smonia@outlook.com")) (:maintainer "Dino Chiesa <dpchiesa@outlook.com>, Sebastian Monia" . "smonia@outlook.com") (:keywords "tfs" "vc") (:url . "http://github.com/sebasmonia/tfsmacs/"))])
- (the-matrix-theme . [(20240422 919) ((emacs (26 1))) "Green-on-black dark theme inspired by \"The Matrix\" movie" tar ((:commit . "2e373d5de799ef2546d6905949aa9ef21da5eea4") (:authors ("Dan Dee" . "monkeyjunglejuice@pm.me")) (:maintainers ("Dan Dee" . "monkeyjunglejuice@pm.me")) (:maintainer "Dan Dee" . "monkeyjunglejuice@pm.me") (:keywords "faces" "theme") (:url . "https://github.com/monkeyjunglejuice/matrix-emacs-theme"))])
+ (the-matrix-theme . [(20240429 920) ((emacs (26 1))) "Green-on-black dark theme inspired by \"The Matrix\" movie" tar ((:commit . "d0c7fd3584c07952de26a5ae44ca6159f1960bb7") (:authors ("Dan Dee" . "monkeyjunglejuice@pm.me")) (:maintainers ("Dan Dee" . "monkeyjunglejuice@pm.me")) (:maintainer "Dan Dee" . "monkeyjunglejuice@pm.me") (:keywords "faces" "theme") (:url . "https://github.com/monkeyjunglejuice/matrix-emacs-theme"))])
  (theme-anchor . [(20230924 2041) ((emacs (26))) "Apply theme in current buffer only" tar ((:commit . "dd69fe04d901e771cafde3992042a212e4a62620") (:authors ("Liāu, Kiong-Gē" . "gliao.tw@pm.me")) (:maintainers ("Liāu, Kiong-Gē" . "gliao.tw@pm.me")) (:maintainer "Liāu, Kiong-Gē" . "gliao.tw@pm.me") (:keywords "extensions" "lisp" "theme") (:url . "https://github.com/GongYiLiao/theme-anchor"))])
  (theme-changer . [(20230904 1706) ((cl-lib (0))) "Sunrise/Sunset Theme Changer for Emacs" tar ((:commit . "7febd7632451bb99a5d92f24623432c4de035ff1") (:authors ("Joshua B. Griffith" . "josh.griffith@gmail.com")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org") (:keywords "color-theme" "deftheme" "solar" "sunrise" "sunset") (:url . "https://github.com/hadronzoo/theme-changer"))])
  (theme-looper . [(20210827 424) ((emacs (24)) (cl-lib (0 5))) "A package for switching themes in Emacs interactively" tar ((:commit . "e6e8efd740df0b68db89805ba72492818dba61ab") (:authors ("Mohammed Ismail Ansari" . "team.terminal@gmail.com")) (:maintainers ("Mohammed Ismail Ansari" . "team.terminal@gmail.com")) (:maintainer "Mohammed Ismail Ansari" . "team.terminal@gmail.com") (:keywords "convenience" "color-themes") (:url . "http://ismail.teamfluxion.com"))])
@@ -5172,7 +5188,7 @@
  (third-time . [(20240207 1621) ((emacs (27 1))) "Third Time: A Better Way to Work" tar ((:commit . "093b74be860fac389fb173caef5fabf61e417eef") (:authors ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org") (:url . "https://git.sr.ht/~swflint/third-time"))])
  (thread-dump . [(20170816 1850) nil "Java thread dump viewer" tar ((:commit . "204c9600242756d4b514bb5ff6293e052bf4b49d") (:authors ("Dmitry Neverov")) (:maintainers ("Dmitry Neverov")) (:maintainer "Dmitry Neverov") (:url . "http://github.com/nd/thread-dump.el"))])
  (threes . [(20160820 1242) ((emacs (24)) (seq (1 11))) "A clone of Threes (a tiny puzzle game)" tar ((:commit . "6981acb30b856c77cba6aba63fefbf102cbdfbb2") (:authors ("Chunyang Xu" . "xuchunyang.me@gmail.com")) (:maintainers ("Chunyang Xu" . "xuchunyang.me@gmail.com")) (:maintainer "Chunyang Xu" . "xuchunyang.me@gmail.com") (:keywords "games") (:url . "https://github.com/xuchunyang/threes.el"))])
- (thrift . [(20240421 1632) ((emacs (24))) "major mode for fbthrift and Apache Thrift files" tar ((:commit . "a1067af97a4a6070f4247657faf66ff25c1caffd") (:keywords "languages"))])
+ (thrift . [(20240519 1631) ((emacs (24))) "major mode for fbthrift and Apache Thrift files" tar ((:commit . "8baf3aed99934494267647ee8f309f9d712d4325") (:keywords "languages"))])
  (thumb-through . [(20120119 534) nil "Plain text reader of HTML documents" tar ((:commit . "08d8fb720f93c6172653e035191a8fa9c3305e63") (:keywords "html"))])
  (tickscript-mode . [(20171219 203) ((emacs (24 1))) "A major mode for Tickscript files" tar ((:commit . "f0579f38ff14954df5002ce30ae6d4a2c978d461") (:authors ("Marc Sherry" . "msherry@gmail.com")) (:maintainers ("Marc Sherry" . "msherry@gmail.com")) (:maintainer "Marc Sherry" . "msherry@gmail.com") (:keywords "languages") (:url . "https://github.com/msherry/tickscript-mode"))])
  (tidal . [(20240407 1952) ((haskell-mode (16)) (emacs (25 1))) "Interact with TidalCycles for live coding patterns" tar ((:commit . "88f09edf6bef2228d5f530dea872b08a9d803066") (:authors (nil . "alex@slab.org")) (:maintainers (nil . "alex@slab.org")) (:maintainer nil . "alex@slab.org") (:keywords "tools") (:url . "https://github.com/tidalcycles/Tidal"))])
@@ -5241,7 +5257,7 @@
  (tramp-term . [(20220725 1441) nil "Automatic setup of directory tracking in ssh sessions" tar ((:commit . "ed75189122737d301f716a30a8013205aa3736f1") (:authors ("Randy Morris" . "randy.morris@archlinux.us")) (:maintainers ("Randy Morris" . "randy.morris@archlinux.us")) (:maintainer "Randy Morris" . "randy.morris@archlinux.us") (:keywords "comm" "terminals") (:url . "https://github.com/randymorris/tramp-term.el"))])
  (transducers . [(20240308 843) ((emacs (28 1))) "Ergonomic, efficient data processing" tar ((:commit . "2d452e4cdc3b5cfa29ee3d7a645ff53d4e993384") (:authors ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainers ("Colin Woodbury" . "colin@fosskers.ca")) (:maintainer "Colin Woodbury" . "colin@fosskers.ca") (:keywords "lisp") (:url . "https://git.sr.ht/~fosskers/transducers.el"))])
  (transfer-sh . [(20200601 1708) ((emacs (24 3)) (async (1 0))) "Simple interface for sending buffer contents to transfer.sh" tar ((:commit . "0621a66d00ec91a209a542c10b158095088bd44d") (:keywords "comm" "convenience" "files") (:url . "https://gitlab.com/tuedachu/transfer-sh.el"))])
- (transient . [(20240421 1737) ((emacs (26 1)) (compat (29 1 4 4)) (seq (2 24))) "Transient commands" tar ((:commit . "2dd0102ec3df901d421fc338e5c768467cc54ecf") (:authors ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev") (:keywords "extensions") (:url . "https://github.com/magit/transient"))])
+ (transient . [(20240509 1849) ((emacs (26 1)) (compat (29 1 4 4)) (seq (2 24))) "Transient commands" tar ((:commit . "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e") (:authors ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainers ("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")) (:maintainer "Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev") (:keywords "extensions") (:url . "https://github.com/magit/transient"))])
  (transient-dwim . [(20221225 1630) ((emacs (26 1)) (transient (0 1))) "Useful preset transient commands" tar ((:commit . "cb5e0d35729fc6448553b7a17fc5c843f00e8c1d") (:authors ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainers ("Naoya Yamashita" . "conao3@gmail.com")) (:maintainer "Naoya Yamashita" . "conao3@gmail.com") (:keywords "tools") (:url . "https://github.com/conao3/transient-dwim.el"))])
  (transient-extras . [(20230721 839) ((emacs (28 1))) "Extra features for transient" tar ((:commit . "ca0d5c597382615f0ee8300ff8718f54f8214359") (: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>, Samuel W. Flint" . "swflint@flintfam.org") (:keywords "convenience") (:url . "https://github.com/haji-ali/transient-extras.git"))])
  (transient-extras-a2ps . [(20230303 1511) ((emacs (28 1)) (transient-extras (1 0 0))) "A transient interface to a2ps" tar ((:commit . "e91a1cddb1f0cb8b99d2bd30db64d467e5fa7ea8") (:authors ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainers ("Samuel W. Flint" . "swflint@flintfam.org")) (:maintainer "Samuel W. Flint" . "swflint@flintfam.org") (:keywords "convenience") (:url . "https://git.sr.ht/~swflint/transient-extras-a2ps"))])
@@ -5260,11 +5276,11 @@
  (tree-sitter . [(20220212 1632) ((emacs (25 1)) (tsc (0 18 0))) "Incremental parsing system" tar ((:commit . "909717c685ff5a2327fa2ca8fb8a25216129361c") (: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") (:keywords "languages" "tools" "parsers" "tree-sitter") (:url . "https://github.com/emacs-tree-sitter/elisp-tree-sitter"))])
  (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 ((:commit . "9669c00f3d3463e6769725af74c392891e269eed") (:authors ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainers ("Shuguang Sun" . "shuguang79@qq.com")) (:maintainer "Shuguang Sun" . "shuguang79@qq.com") (:keywords "tools") (:url . "https://github.com/ShuguangSun/tree-sitter-ess-r"))])
  (tree-sitter-indent . [(20220411 1439) ((emacs (26 1)) (tree-sitter (0 12 1)) (seq (2 20))) "Provide indentation with a Tree-sitter backend" tar ((:commit . "4ef246db3e4ff99f672fe5e4b416c890f885c09e") (:authors ("Felipe Lema" . "felipelema@mortemale.org")) (:maintainers ("Felipe Lema" . "felipelema@mortemale.org")) (:maintainer "Felipe Lema" . "felipelema@mortemale.org") (:keywords "convenience" "internal") (:url . "https://codeberg.org/FelipeLema/tree-sitter-indent.el"))])
- (tree-sitter-ispell . [(20230205 533) ((emacs (26 1)) (tree-sitter (0 15 0))) "Run ispell on tree-sitter text nodes" tar ((:commit . "d8c33c05f689c2cab36b8a9856811f18a4ab7c59") (:authors ("Erick Navarro" . "erick@navarro.io")) (:maintainers ("Erick Navarro" . "erick@navarro.io")) (:maintainer "Erick Navarro" . "erick@navarro.io") (:url . "https://github.com/erickgnavar/tree-sitter-ispell.el"))])
- (tree-sitter-langs . [(20240428 808) ((emacs (25 1)) (tree-sitter (0 15 0))) "Grammar bundle for tree-sitter" tar ((:commit . "e62abcb5f67299132410ec864e6053c6b452cc64") (: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") (:keywords "languages" "tools" "parsers" "tree-sitter") (:url . "https://github.com/emacs-tree-sitter/tree-sitter-langs"))])
+ (tree-sitter-ispell . [(20240514 201) ((emacs (26 1)) (tree-sitter (0 15 0))) "Run ispell on tree-sitter text nodes" tar ((:commit . "16ba2d190cd387a0e5349c5b97a373bfad582eee") (:authors ("Erick Navarro" . "erick@navarro.io")) (:maintainers ("Erick Navarro" . "erick@navarro.io")) (:maintainer "Erick Navarro" . "erick@navarro.io") (:url . "https://github.com/erickgnavar/tree-sitter-ispell.el"))])
+ (tree-sitter-langs . [(20240519 717) ((emacs (25 1)) (tree-sitter (0 15 0))) "Grammar bundle for tree-sitter" tar ((:commit . "6ce3de71c21a55ffe33ecdead57fff290a5d07df") (: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") (:keywords "languages" "tools" "parsers" "tree-sitter") (:url . "https://github.com/emacs-tree-sitter/tree-sitter-langs"))])
  (treebundel . [(20240210 343) ((emacs (27 1)) (compat (29 1 4 2))) "Bundle related git-worktrees together" tar ((:commit . "2d6c69cb7798a8cb7fcf9923c4580220dd48b3d4") (:authors ("Ben Whitley")) (:maintainers ("Ben Whitley")) (:maintainer "Ben Whitley") (:keywords "convenience" "vc") (:url . "https://github.com/purplg/treebundel"))])
  (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 ((:commit . "75357757022a4399ab772ff0d92065bd114dabe9") (:authors ("Leo Littlebook" . "Leo.Littlebook@gmail.com")) (:maintainers ("Leo Littlebook" . "Leo.Littlebook@gmail.com")) (:maintainer "Leo Littlebook" . "Leo.Littlebook@gmail.com") (:keywords "outlines" "files" "convenience") (:url . "https://github.com/cyberthal/treefactor"))])
- (treemacs . [(20240229 2108) ((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 ((:commit . "8c6df39f01a4d47fda2cc943645fa067f771b748") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
+ (treemacs . [(20240518 932) ((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 ((:commit . "923fbbdea57b27ed3293079b13846206add85d9d") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
  (treemacs-all-the-icons . [(20240131 2042) ((emacs (26 1)) (all-the-icons (4 0 1)) (treemacs (0 0))) "all-the-icons integration for treemacs" tar ((:commit . "bcba09c1581c4bd93ff0217d464aead04f6d26d4") (:authors ("Eric Dallo" . "ercdll1337@gmail.com")) (:maintainers ("Eric Dallo" . "ercdll1337@gmail.com")) (:maintainer "Eric Dallo" . "ercdll1337@gmail.com") (:url . "https://github.com/Alexander-Miller/treemacs"))])
  (treemacs-evil . [(20240131 2042) ((emacs (26 1)) (evil (1 2 12)) (treemacs (0 0))) "Evil mode integration for treemacs" tar ((:commit . "bcba09c1581c4bd93ff0217d464aead04f6d26d4") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
  (treemacs-icons-dired . [(20240131 2042) ((treemacs (0 0)) (emacs (26 1))) "Treemacs icons for dired" tar ((:commit . "bcba09c1581c4bd93ff0217d464aead04f6d26d4") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
@@ -5275,7 +5291,7 @@
  (treemacs-projectile . [(20240131 2042) ((emacs (26 1)) (projectile (0 14 0)) (treemacs (0 0))) "Projectile integration for treemacs" tar ((:commit . "bcba09c1581c4bd93ff0217d464aead04f6d26d4") (:authors ("Alexander Miller" . "alexanderm@web.de")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
  (treemacs-tab-bar . [(20240131 2042) ((emacs (27 1)) (treemacs (0 0)) (dash (2 11 0))) "Tab bar integration for treemacs" tar ((:commit . "bcba09c1581c4bd93ff0217d464aead04f6d26d4") (:authors ("Alexander Miller" . "alexanderm@web.de") ("Jason Dufair" . "jase@dufair.org") ("Aaron Jensen" . "aaronjensen@gmail.com")) (:maintainers ("Alexander Miller" . "alexanderm@web.de")) (:maintainer "Alexander Miller" . "alexanderm@web.de") (:url . "https://github.com/Alexander-Miller/treemacs"))])
  (treepy . [(20230715 2154) ((emacs (25 1))) "Generic tree traversal tools" tar ((:commit . "75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e") (:authors ("Daniel Barreto" . "daniel.barreto.n@gmail.com")) (:maintainers ("Daniel Barreto" . "daniel.barreto.n@gmail.com")) (:maintainer "Daniel Barreto" . "daniel.barreto.n@gmail.com") (:keywords "lisp" "maint" "tools") (:url . "https://github.com/volrath/treepy.el"))])
- (treesit-auto . [(20240420 1457) ((emacs (29 0))) "Automatically use tree-sitter enhanced major modes" tar ((:commit . "ecd898c4879614bf36d84a77c08a10aca25c3841") (:authors ("Robb Enzmann" . "robbenzmann@gmail.com")) (:maintainers ("Robb Enzmann" . "robbenzmann@gmail.com")) (:maintainer "Robb Enzmann" . "robbenzmann@gmail.com") (:keywords "treesitter" "auto" "automatic" "major" "mode" "fallback" "convenience") (:url . "https://github.com/renzmann/treesit-auto.git"))])
+ (treesit-auto . [(20240511 1425) ((emacs (29 0))) "Automatically use tree-sitter enhanced major modes" tar ((:commit . "016bd286a1ba4628f833a626f8b9d497882ecdf3") (:authors ("Robb Enzmann" . "robbenzmann@gmail.com")) (:maintainers ("Robb Enzmann" . "robbenzmann@gmail.com")) (:maintainer "Robb Enzmann" . "robbenzmann@gmail.com") (:keywords "treesitter" "auto" "automatic" "major" "mode" "fallback" "convenience") (:url . "https://github.com/renzmann/treesit-auto.git"))])
  (treeview . [(20230728 2343) ((emacs (24 4))) "A generic tree navigation library" tar ((:commit . "c6888e5f3aa0d72a7b4db625fcc2a847fd3bb1ce") (:authors ("Tilman Rassy" . "tilman.rassy@googlemail.com")) (:maintainers ("Tilman Rassy" . "tilman.rassy@googlemail.com")) (:maintainer "Tilman Rassy" . "tilman.rassy@googlemail.com") (:keywords "lisp" "tools" "internal" "convenience") (:url . "https://github.com/tilmanrassy/emacs-treeview"))])
  (trident-mode . [(20190410 2036) ((emacs (24)) (slime (20130526)) (skewer-mode (1 5 0)) (dash (1 0 3))) "Live Parenscript interaction" tar ((:commit . "109a1bc10bd0c4b47679a6ca5c4cd27c7c8d4ccb") (:authors ("John Mastro" . "john.b.mastro@gmail.com")) (:maintainers ("John Mastro" . "john.b.mastro@gmail.com")) (:maintainer "John Mastro" . "john.b.mastro@gmail.com") (:keywords "languages" "lisp" "processes" "tools") (:url . "https://github.com/johnmastro/trident-mode.el"))])
  (trinary . [(20230301 2044) ((emacs (24))) "Trinary logic" tar ((:commit . "d4869d260f22d13a9a71327a6d40edc6980d022e") (:authors ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matúš Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matúš Goljer" . "matus.goljer@gmail.com") (:keywords "languages") (:url . "https://github.com/emacs-elsa/trinary-logic"))])
@@ -5304,7 +5320,7 @@
  (twitch-api . [(20220420 1547) ((emacs (27 1)) (dash (2 19 0))) "An elisp interface for the Twitch.tv API" tar ((:commit . "181681097d1fc8d7b78928f8a5b38c61d0e20ef5") (:keywords "multimedia" "twitch-api") (:url . "https://github.com/BenediktBroich/twitch-api"))])
  (twittering-mode . [(20181121 1402) nil "Major mode for Twitter" tar ((:commit . "114891e8fdb4f06b1326a6cf795e49c205cf9e29") (:authors ("Tadashi MATSUO" . "tad@mymail.twin.ne.jp") ("Y. Hayamizu" . "y.hayamizu@gmail.com") ("Tsuyoshi CHO" . "Tsuyoshi.CHO+develop@Gmail.com") ("Alberto Garcia" . "agarcia@igalia.com") ("Xavier Maillard" . "xavier@maillard.im")) (:maintainers ("Tadashi MATSUO" . "tad@mymail.twin.ne.jp")) (:maintainer "Tadashi MATSUO" . "tad@mymail.twin.ne.jp") (:keywords "twitter" "web") (:url . "http://twmode.sf.net/"))])
  (twtxt . [(20220628 309) ((emacs (25 1)) (request (0 2 0))) "A twtxt client for Emacs" tar ((:commit . "eb9efa19086fcae343353f6a5e88c3377fd06dd4") (:authors ("DEADBLACKCLOVER" . "deadblackclover@protonmail.com")) (:maintainers ("DEADBLACKCLOVER" . "deadblackclover@protonmail.com")) (:maintainer "DEADBLACKCLOVER" . "deadblackclover@protonmail.com") (:url . "https://github.com/deadblackclover/twtxt-el"))])
- (typescript-mode . [(20230116 1533) ((emacs (24 3))) "Major mode for editing typescript" tar ((:commit . "4fcb4594819caf472ae42ea068a1c7795cf07f46") (:keywords "typescript" "languages") (:url . "http://github.com/ananthakumaran/typescript.el"))])
+ (typescript-mode . [(20240507 617) ((emacs (24 3))) "Major mode for editing typescript" tar ((:commit . "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0") (:keywords "typescript" "languages") (:url . "http://github.com/ananthakumaran/typescript.el"))])
  (typewriter-roll-mode . [(20240225 1412) ((emacs (24 1))) "Aid for distraction-free writing" tar ((:commit . "99afeb13bd0340a23176c4ebfdabc93117c04069") (:authors ("Peter Badida" . "keyweeusr@gmail.com")) (:maintainers ("Peter Badida" . "keyweeusr@gmail.com")) (:maintainer "Peter Badida" . "keyweeusr@gmail.com") (:keywords "convenience" "line" "carriage" "writing" "distraction" "cr" "rewind") (:url . "https://github.com/KeyWeeUsr/typewriter-roll-mode"))])
  (typing . [(20180830 2203) nil "The Typing Of Emacs" tar ((:commit . "a2ef25dde2d8eb91bd9c0c6164cb5208208647fa") (:authors ("Alex Schroeder" . "alex@gnu.org")) (:maintainers ("Alex Schroeder" . "alex@gnu.org")) (:maintainer "Alex Schroeder" . "alex@gnu.org") (:keywords "games") (:url . "http://www.emacswiki.org/emacs/TypingOfEmacs"))])
  (typing-game . [(20160426 1220) nil "a simple typing game" tar ((:commit . "616435a5270274f4c7b698697674dbb2039049a4") (:authors ("DarkSun" . "lujun9972@gmail.com")) (:maintainers ("DarkSun" . "lujun9972@gmail.com")) (:maintainer "DarkSun" . "lujun9972@gmail.com") (:keywords "lisp" "game"))])
@@ -5351,11 +5367,11 @@
  (unisonlang-mode . [(20200803 808) ((emacs (25 1))) "Simple major mode for editing Unison" tar ((:commit . "b8da68fc2a6a62a255a6089b0c6794bfa2370f34") (:authors ("Dario Oddenino")) (:maintainers ("Dario Oddenino")) (:maintainer "Dario Oddenino") (:keywords "languages") (:url . "https://github.com/dariooddenino/unison-mode-emacs"))])
  (units-mode . [(20221027 303) ((emacs (24 4))) "Mode for conversion between different units" tar ((:commit . "10c8de24180f87b1a8a3b0a9b3fbb29eec925417") (:authors ("Gaurav Atreya" . "allmanpride@gmail.com")) (:maintainers ("Gaurav Atreya" . "allmanpride@gmail.com")) (:maintainer "Gaurav Atreya" . "allmanpride@gmail.com") (:keywords "units" "unit-conversion" "convenience") (:url . "https://github.com/Atreyagaurav/units-mode"))])
  (universal-emotions-emoticons . [(20180729 1941) ((emacs (24 4))) "Emoticons For The Six Universal Expressions" tar ((:commit . "9cedd09ee65cb9fa71f27b0ab46a8353bdc00902") (:authors ("Grant Rettke" . "gcr@wisdomandwonder.com")) (:maintainers (nil . "<gcr@wisdomandwonder.com>")) (:maintainer nil . "<gcr@wisdomandwonder.com>") (:keywords "convenience" "docs" "languages") (:url . "https://github.com/grettke/universal-emotions-emoticons"))])
- (universal-sidecar . [(20240130 2120) ((emacs (26 1)) (magit-section (3 0 0))) "A universal sidecar buffer" tar ((:commit . "d7a30e53fdda44a07160ef438ae1068178f23785") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
- (universal-sidecar-citeproc . [(20240115 1727) ((emacs (28 1)) (citeproc (0 9 4))) "Centralise Citeproc Support for Universal Sidecar" tar ((:commit . "9050eaea7946e613a4b9ecd9dd1462614699edb1") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
- (universal-sidecar-elfeed-related . [(20240115 1727) ((emacs (25 1)) (universal-sidecar (1 0 0)) (bibtex-completion (1 0 0)) (elfeed (3 4 1))) "Related Papers Sidecar Section for Elfeed" tar ((:commit . "9050eaea7946e613a4b9ecd9dd1462614699edb1") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
- (universal-sidecar-elfeed-score . [(20240115 1727) ((emacs (25 1)) (universal-sidecar (1 0 0)) (elfeed (3 4 1)) (elfeed-score (1 2 6))) "Show Elfeed Score information in sidecar" tar ((:commit . "9050eaea7946e613a4b9ecd9dd1462614699edb1") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
- (universal-sidecar-roam . [(20240115 1727) ((emacs (26 1)) (universal-sidecar (1 0 0)) (org-roam (2 0 0))) "Integrate universal-sidecar and org-roam" tar ((:commit . "9050eaea7946e613a4b9ecd9dd1462614699edb1") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (universal-sidecar . [(20240429 1525) ((emacs (26 1)) (magit-section (3 0 0))) "A universal sidecar buffer" tar ((:commit . "e16f5974c77e7126cd5c9b7448116ee94a6a1e72") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (universal-sidecar-citeproc . [(20240428 1852) ((emacs (28 1)) (citeproc (0 9 4))) "Centralise Citeproc Support for Universal Sidecar" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "bib" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (universal-sidecar-elfeed-related . [(20240428 1852) ((emacs (25 1)) (universal-sidecar (1 0 0)) (bibtex-completion (1 0 0)) (elfeed (3 4 1))) "Related Papers Sidecar Section for Elfeed" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (universal-sidecar-elfeed-score . [(20240428 1852) ((emacs (25 1)) (universal-sidecar (1 0 0)) (elfeed (3 4 1)) (elfeed-score (1 2 6))) "Show Elfeed Score information in sidecar" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (universal-sidecar-roam . [(20240428 1852) ((emacs (26 1)) (universal-sidecar (1 0 0)) (org-roam (2 0 0))) "Integrate universal-sidecar and org-roam" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
  (unkillable-scratch . [(20221015 1323) ((emacs (24))) "Disallow the \\*scratch\\* buffer from being killed" tar ((:commit . "6c752e4cd4762bb4bcde2b0b96f2e83740efd104") (:authors ("Eric Crosson" . "eric.s.crosson@utexas.com")) (:maintainers ("Eric Crosson" . "eric.s.crosson@utexas.com")) (:maintainer "Eric Crosson" . "eric.s.crosson@utexas.com") (:keywords "convenience") (:url . "https://github.com/EricCrosson/unkillable-scratch"))])
  (unmodified-buffer . [(20220129 2022) ((emacs (24 1))) "Auto revert modified buffer state" tar ((:commit . "9095a3f870aa570804a11d75aba0952294199715") (:authors ("Arthur Colombini Gusmao")) (:maintainers ("Arthur Colombini Gusmao")) (:maintainer "Arthur Colombini Gusmao") (:url . "https://github.com/arthurcgusmao/unmodified-buffer"))])
  (unobtrusive-magit-theme . [(20200411 1349) ((emacs (24 1))) "An unobtrusive Magit theme" tar ((:commit . "aede357009655d19d4468320b2b61b0f26a47593") (:authors ("Thomas A. Brown" . "tabsoftwareconsulting@gmail.com")) (:maintainers ("Thomas A. Brown" . "tabsoftwareconsulting@gmail.com")) (:maintainer "Thomas A. Brown" . "tabsoftwareconsulting@gmail.com") (:keywords "faces" "vc" "magit") (:url . "https://github.com/tee3/unobtrusive-magit-theme"))])
@@ -5421,8 +5437,8 @@
  (versuri . [(20211104 1301) ((emacs (26 1)) (dash (2 16 0)) (request (0 3 0)) (anaphora (1 0 4)) (esxml (0 1 0)) (s (1 12 0)) (esqlite (0 3 1))) "The lyrics package" tar ((:commit . "c8ea562304194f3379ed8f9c6a785ce8ee72898e") (:authors ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainers ("Mihai Olteanu" . "mihai_olteanu@fastmail.fm")) (:maintainer "Mihai Olteanu" . "mihai_olteanu@fastmail.fm") (:keywords "multimedia") (:url . "https://github.com/mihaiolteanu/versuri/"))])
  (vertica . [(20131217 1511) ((sql (3 0))) "Vertica SQL mode extension" tar ((:commit . "3c9647b425c5c13c30bf0cba483646af18196588") (:authors ("Roman Scherer" . "roman@burningswell.com")) (:maintainers ("Roman Scherer" . "roman@burningswell.com")) (:maintainer "Roman Scherer" . "roman@burningswell.com") (:keywords "sql" "vertica"))])
  (vertica-snippets . [(20240327 1013) ((yasnippet (0 6 1))) "Yasnippets for Vertica" tar ((:commit . "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4") (:authors ("Andreas Gerler" . "baron@bundesbrandschatzamt.de")) (:maintainers ("Andreas Gerler" . "baron@bundesbrandschatzamt.de")) (:maintainer "Andreas Gerler" . "baron@bundesbrandschatzamt.de") (:keywords "convenience" "snippets") (:url . "https://github.com/baron42bba/vertica-snippets"))])
- (vertico . [(20240424 1959) ((emacs (27 1)) (compat (29 1 4 4))) "VERTical Interactive COmpletion" tar ((:commit . "1def56a1e678ff9a8eeafafda9c474a5fbb097c4") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "convenience" "files" "matching" "completion") (:url . "https://github.com/minad/vertico"))])
- (vertico-prescient . [(20240226 204) ((emacs (27 1)) (prescient (6 1 0)) (vertico (0 28)) (compat (29 1))) "prescient.el + Vertico" tar ((:commit . "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5") (:authors ("Radian LLC" . "contact+prescient@radian.codes")) (:maintainers ("Radian LLC" . "contact+prescient@radian.codes")) (:maintainer "Radian LLC" . "contact+prescient@radian.codes") (:keywords "extensions") (:url . "https://github.com/radian-software/prescient.el"))])
+ (vertico . [(20240511 2047) ((emacs (27 1)) (compat (29 1 4 4))) "VERTical Interactive COmpletion" tar ((:commit . "ba650a7ab90d66686ba787937ac9e71f749c598e") (:authors ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainers ("Daniel Mendler" . "mail@daniel-mendler.de")) (:maintainer "Daniel Mendler" . "mail@daniel-mendler.de") (:keywords "convenience" "files" "matching" "completion") (:url . "https://github.com/minad/vertico"))])
+ (vertico-prescient . [(20240505 2249) ((emacs (27 1)) (prescient (6 1 0)) (vertico (0 28)) (compat (29 1))) "prescient.el + Vertico" tar ((:commit . "0765418e4362099db8788fcb745ce9b7602aa001") (:authors ("Radian LLC" . "contact+prescient@radian.codes")) (:maintainers ("Radian LLC" . "contact+prescient@radian.codes")) (:maintainer "Radian LLC" . "contact+prescient@radian.codes") (:keywords "extensions") (:url . "https://github.com/radian-software/prescient.el"))])
  (vertigo . [(20211224 1256) ((dash (2 11 0))) "Jump across lines using the home row." tar ((:commit . "280b30518529242ee36cd436bd2349c34c35abb0") (:authors ("Fox Kiester" . "noct@posteo.net")) (:maintainers ("Fox Kiester" . "noct@posteo.net")) (:maintainer "Fox Kiester" . "noct@posteo.net") (:keywords "vim" "vertigo") (:url . "https://github.com/noctuid/vertigo.el"))])
  (vhdl-capf . [(20160221 1734) nil "Completion at point function (capf) for vhdl-mode." tar ((:commit . "290abe217050f33532bc9ccb04f894123402f414") (:authors ("sh-ow" . "sh-ow@users.noreply.github.com")) (:maintainers ("sh-ow" . "sh-ow@users.noreply.github.com")) (:maintainer "sh-ow" . "sh-ow@users.noreply.github.com") (:keywords "convenience" "usability" "vhdl" "completion") (:url . "https://github.com/sh-ow/vhdl-capf"))])
  (vhdl-ext . [(20240407 1353) ((emacs (29 1)) (vhdl-ts-mode (0 1 2)) (lsp-mode (8 0 0)) (ag (0 48)) (ripgrep (0 4 0)) (hydra (0 15 0)) (flycheck (32)) (outshine (3 0 1)) (async (1 9 7))) "VHDL Extensions" tar ((:commit . "bd5f97d811f4444ab523a5faace8e599a90d972d") (:authors ("Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com")) (:maintainers ("Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com")) (:maintainer "Gonzalo Larumbe" . "gonzalomlarumbe@gmail.com") (:keywords "vhdl" "ide" "tools") (:url . "https://github.com/gmlarumbe/vhdl-ext"))])
@@ -5453,12 +5469,12 @@
  (voca-builder . [(20161101 1645) ((popup (0 5 2))) "Helps you build up your vocabulary" tar ((:commit . "51573beec8cd8308477b0faf453aad93e17f57c5") (:authors ("Yi Tang" . "yi.tang.uk@me.com")) (:maintainers ("Yi Tang" . "yi.tang.uk@me.com")) (:maintainer "Yi Tang" . "yi.tang.uk@me.com") (:keywords "english" "vocabulary") (:url . "https://github.com/yitang/voca-builder"))])
  (volatile-highlights . [(20230301 1402) nil "Minor mode for visual feedback on some operations." tar ((:commit . "fcf6e2778454ce514c189a7d1fe70e03ad81c325") (:authors ("K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>")) (:maintainers ("K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>")) (:maintainer "K-talo Miyazaki <Keitaro dot Miyazaki at gmail dot com>") (:keywords "emulations" "convenience" "wp") (:url . "http://www.emacswiki.org/emacs/download/volatile-highlights.el"))])
  (volume . [(20220904 1727) nil "tweak your sound card volume from Emacs" tar ((:commit . "050d3e6d2543a6771a13f95612055864679b6301") (:authors ("Daniel Brockman" . "daniel@brockman.se")) (:maintainers ("Daniel Brockman" . "daniel@brockman.se")) (:maintainer "Daniel Brockman" . "daniel@brockman.se") (:url . "http://www.brockman.se/software/volume-el/"))])
- (vs-dark-theme . [(20240410 216) ((emacs (24 1))) "Visual Studio IDE dark theme" tar ((:commit . "26fb8e1dee98fd8d423abc35655859e1098325ee") (:authors ("Jen-Chieh Shen")) (:maintainers ("Jen-Chieh Shen")) (:maintainer "Jen-Chieh Shen") (:url . "https://github.com/emacs-vs/vs-dark-theme"))])
- (vs-light-theme . [(20240410 216) ((emacs (24 1))) "Visual Studio IDE light theme" tar ((:commit . "0ede987bac1c8dbeb07990a75e70b63cf9baf7e2") (:authors ("Jen-Chieh Shen")) (:maintainers ("Jen-Chieh Shen")) (:maintainer "Jen-Chieh Shen") (:url . "https://github.com/emacs-vs/vs-light-theme"))])
+ (vs-dark-theme . [(20240520 654) ((emacs (24 1))) "Visual Studio IDE dark theme" tar ((:commit . "0eda8bae7fef2d050cf764c5e2b44d8e0a27ab47") (:authors ("Jen-Chieh Shen")) (:maintainers ("Jen-Chieh Shen")) (:maintainer "Jen-Chieh Shen") (:url . "https://github.com/emacs-vs/vs-dark-theme"))])
+ (vs-light-theme . [(20240520 105) ((emacs (24 1))) "Visual Studio IDE light theme" tar ((:commit . "ad61f777d374f67db5e5ef66ab6da2967ba83abd") (:authors ("Jen-Chieh Shen")) (:maintainers ("Jen-Chieh Shen")) (:maintainer "Jen-Chieh Shen") (:url . "https://github.com/emacs-vs/vs-light-theme"))])
  (vscdark-theme . [(20191212 107) ((emacs (24 1))) "VS Code Dark+ like theme" tar ((:commit . "f419553e2a2f091a8bc257fb5ab520326e93ddd4") (:authors ("Alexander L. Belikoff")) (:maintainers ("Alexander L. Belikoff")) (:maintainer "Alexander L. Belikoff") (:url . "https://github.com/abelikoff/vscdark-theme"))])
  (vscode-dark-plus-theme . [(20230725 1703) nil "Default Visual Studio Code Dark+ theme" tar ((:commit . "65420ca73b543e1e7955905bea1a8d7e5fe6c5ff") (:authors ("Ian Y.E. Pan")) (:maintainers ("Ian Y.E. Pan")) (:maintainer "Ian Y.E. Pan") (:url . "https://github.com/ianpan870102/vscode-dark-plus-emacs-theme"))])
  (vscode-icon . [(20230330 2206) ((emacs (25 1))) "Utility package to provide Vscode style icons" tar ((:commit . "3976bc2e7e2fe0068ae59c11d226f67e0e87aaea") (:authors ("James Nguyen" . "james@jojojames.com")) (:maintainers ("James Nguyen" . "james@jojojames.com")) (:maintainer "James Nguyen" . "james@jojojames.com") (:keywords "files" "tools") (:url . "https://github.com/jojojames/vscode-icon-emacs"))])
- (vterm . [(20240325 1551) ((emacs (25 1))) "Fully-featured terminal emulator" tar ((:commit . "ae4ae1aef2fcae98a37aad83f2a6aeeaeacedd4f") (:authors ("Lukas Fürmetz" . "fuermetz@mailbox.org")) (:maintainers ("Lukas Fürmetz" . "fuermetz@mailbox.org")) (:maintainer "Lukas Fürmetz" . "fuermetz@mailbox.org") (:keywords "terminals") (:url . "https://github.com/akermu/emacs-libvterm"))])
+ (vterm . [(20240520 231) ((emacs (25 1))) "Fully-featured terminal emulator" tar ((:commit . "df057b1af2bb89a1deb288086f13be296af42090") (:authors ("Lukas Fürmetz" . "fuermetz@mailbox.org")) (:maintainers ("Lukas Fürmetz" . "fuermetz@mailbox.org")) (:maintainer "Lukas Fürmetz" . "fuermetz@mailbox.org") (:keywords "terminals") (:url . "https://github.com/akermu/emacs-libvterm"))])
  (vterm-toggle . [(20230912 246) ((emacs (25 1)) (vterm (0 0 1))) "Toggles between the vterm buffer and other buffers." tar ((:commit . "06cb4f3c565e46470a3c4505c11e26066d869715") (:authors (nil . "jixiuf  jixiuf@qq.com")) (:maintainers (nil . "jixiuf  jixiuf@qq.com")) (:maintainer nil . "jixiuf  jixiuf@qq.com") (:keywords "vterm" "terminals") (:url . "https://github.com/jixiuf/vterm-toggle"))])
  (vtm . [(20200921 338) nil "Manages vterm buffers with configuration files" tar ((:commit . "d770fd8cff7c24688199392ad93c01485c6a9569") (:keywords "convenience") (:url . "https://github.com/laishulu/emacs-vterm-manager"))])
  (vue-html-mode . [(20180428 2035) nil "Major mode for editing Vue.js templates" tar ((:commit . "361a9fa117f044c3072dc5a7344ff7be31725849") (:authors ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainers ("Adam Niederer" . "adam.niederer@gmail.com")) (:maintainer "Adam Niederer" . "adam.niederer@gmail.com") (:keywords "languages" "vue" "template") (:url . "http://github.com/AdamNiederer/vue-html-mode"))])
@@ -5504,7 +5520,7 @@
  (web-server . [(20210708 2242) ((emacs (24 1)) (cl-lib (0 6))) "Emacs Web Server" tar ((:commit . "6357a1c2d1718778503f7ee0909585094117525b") (:authors ("Eric Schulte" . "schulte.eric@gmail.com")) (:maintainers ("Eric Schulte" . "schulte.eric@gmail.com")) (:maintainer "Eric Schulte" . "schulte.eric@gmail.com") (:keywords "http" "server" "network") (:url . "https://github.com/eschulte/emacs-web-server"))])
  (webdriver . [(20231016 1331) ((emacs (27 1))) "WebDriver local end implementation" tar ((:commit . "f73fc53aea5733d630e66d8da178218983d5898a") (:authors ("Mauro Aranda" . "maurooaranda@gmail.com")) (:maintainers ("Mauro Aranda" . "maurooaranda@gmail.com")) (:maintainer "Mauro Aranda" . "maurooaranda@gmail.com") (:keywords "tools") (:url . "https://gitlab.com/mauroaranda/emacs-webdriver"))])
  (webkit-color-picker . [(20180325 736) ((emacs (26 0)) (posframe (0 1 0))) "Insert and adjust colors using Webkit Widgets" tar ((:commit . "765cac80144cad4bc0bf59025ea0199f0486f737") (:authors ("Ozan Sener" . "hi@ozan.email")) (:maintainers ("Ozan Sener" . "hi@ozan.email")) (:maintainer "Ozan Sener" . "hi@ozan.email") (:keywords "tools") (:url . "https://github.com/osener/emacs-webkit-color-picker"))])
- (weblio . [(20210718 1410) ((request (0 3 3)) (emacs (25 1))) "Look up Japanese words on Weblio.jp" tar ((:commit . "2b4b0c206440b5c63960214feacfceb0c26231c7") (:authors ("Simon Zelazny")) (:maintainers ("Simon Zelazny")) (:maintainer "Simon Zelazny") (:keywords "langauges" "i18n") (:url . "https://github.com/pzel/weblio"))])
+ (weblio . [(20240514 1005) ((request (0 3 3)) (emacs (25 1))) "Look up Japanese words on Weblio.jp" tar ((:commit . "952d085fd814b139562ef947c7dcabc31f92341d") (:authors ("Simon Zelazny")) (:maintainers ("Simon Zelazny")) (:maintainer "Simon Zelazny") (:keywords "langauges" "i18n") (:url . "https://github.com/pzel/weblio"))])
  (weblogger . [(20110926 1618) ((xml-rpc (1 6 8))) "Weblog maintenance via XML-RPC APIs" tar ((:commit . "40cfbfc69be6a619173804441db2f407e3fa1731") (:keywords "weblog" "blogger" "cms" "movable" "type" "openweblog" "blog") (:url . "http://launchpad.net/weblogger-el"))])
  (weblorg . [(20230828 150) ((templatel (0 1 6)) (emacs (26 1))) "Static Site Generator for org-mode" tar ((:commit . "a889b29fc6e0d06a1480b1bf524f06a5be2022d7") (:authors ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainers ("Lincoln Clarete" . "lincoln@clarete.li")) (:maintainer "Lincoln Clarete" . "lincoln@clarete.li") (:url . "https://emacs.love/weblorg"))])
  (webpaste . [(20220524 1745) ((emacs (24 4)) (request (0 2 0)) (cl-lib (0 5))) "Paste to pastebin-like services" tar ((:commit . "d96da58fe42988d5c433c71ee9f8e6fb75d595a9") (:authors ("Elis \"etu\" Hirwing" . "elis@hirwing.se")) (:maintainers ("Elis \"etu\" Hirwing" . "elis@hirwing.se")) (:maintainer "Elis \"etu\" Hirwing" . "elis@hirwing.se") (:keywords "convenience" "comm" "paste") (:url . "https://github.com/etu/webpaste.el"))])
@@ -5524,7 +5540,7 @@
  (wgrep-pt . [(20230207 1125) ((emacs (25 1)) (wgrep (3 0 0))) "Writable pt buffer" tar ((:commit . "edf768732a56840db6879706b64c5773c316d619") (:authors ("Masahiro Hayashi <mhayashi1120@gmail.com>, Bailey Ling" . "bling@live.ca")) (:maintainers ("Masahiro Hayashi <mhayashi1120@gmail.com>, Bailey Ling" . "bling@live.ca")) (:maintainer "Masahiro Hayashi <mhayashi1120@gmail.com>, Bailey Ling" . "bling@live.ca") (:keywords "grep" "edit" "extensions") (:url . "http://github.com/mhayashi1120/Emacs-wgrep/raw/master/wgrep-pt.el"))])
  (wgsl-mode . [(20231118 1944) ((emacs (24))) "Syntax highlighting for the WebGPU Shading Language" tar ((:commit . "003a4e99491fa2a0b777f74658e6ffc70fd3a8c2") (:authors ("Anthony Cowley")) (:maintainers ("Anthony Cowley")) (:maintainer "Anthony Cowley") (:keywords "wgsl" "c") (:url . "https://github.com/acowley/wgsl-mode"))])
  (what-the-commit . [(20150901 1316) nil "Random commit message generator" tar ((:commit . "42604410cfd5be715c8aa730aef4673773454e8b") (:authors ("Dan Barbarito" . "dan@barbarito.me")) (:maintainers ("Dan Barbarito" . "dan@barbarito.me")) (:maintainer "Dan Barbarito" . "dan@barbarito.me") (:keywords "git" "commit" "message") (:url . "http://barbarito.me/"))])
- (which-key . [(20240423 1320) ((emacs (24 4))) "Display available keybindings in popup" tar ((:commit . "ba323d6712d54806aa82847d017e94eafcf99d6f") (:authors ("Justin Burkett" . "justin@burkett.cc")) (:maintainers ("Justin Burkett" . "justin@burkett.cc")) (:maintainer "Justin Burkett" . "justin@burkett.cc"))])
+ (which-key . [(20240501 1251) ((emacs (24 4))) "Display available keybindings in popup" tar ((:commit . "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a") (:authors ("Justin Burkett" . "justin@burkett.cc")) (:maintainers ("Justin Burkett" . "justin@burkett.cc")) (:maintainer "Justin Burkett" . "justin@burkett.cc"))])
  (which-key-posframe . [(20230313 1841) ((emacs (26 0)) (posframe (1 4 0)) (which-key (3 6 0))) "Using posframe to show which-key" tar ((:commit . "e4a9ce9a1b20de550fca51f14d055821980d534a") (:authors ("Yanghao Xie" . "yhaoxie@gmail.com")) (:maintainers ("Yanghao Xie" . "yhaoxie@gmail.com")) (:maintainer "Yanghao Xie" . "yhaoxie@gmail.com") (:keywords "convenience" "bindings" "tooltip") (:url . "https://github.com/emacsorphanage/which-key-posframe"))])
  (whiley-mode . [(20220501 2219) ((emacs (24 1))) "Major mode for Whiley language" tar ((:commit . "e7cc4759d46be589d421a2235af6771bcde9ae33") (:authors ("David J. Pearce" . "dave01001110@gmail.com")) (:maintainers ("David J. Pearce" . "dave01001110@gmail.com")) (:maintainer "David J. Pearce" . "dave01001110@gmail.com") (:keywords "languages") (:url . "http://github.com/Whiley/WhileyEmacsMode"))])
  (whitaker . [(20210203 1149) ((emacs (25))) "Comint interface for Whitaker's Words" tar ((:commit . "a6fda24ccb69a18c0706633326d5cc4fcfaed83a") (:authors ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainers ("Matus Goljer" . "matus.goljer@gmail.com")) (:maintainer "Matus Goljer" . "matus.goljer@gmail.com") (:keywords "processes"))])
@@ -5551,7 +5567,7 @@
  (window-layout . [(20170215 33) nil "window layout manager" tar ((:commit . "cd2e4f967b610c2bbef53182829e47250d027056") (:authors ("SAKURAI Masashi <m.sakurai atmark kiwanami.net>")) (:maintainers ("SAKURAI Masashi <m.sakurai atmark kiwanami.net>")) (:maintainer "SAKURAI Masashi <m.sakurai atmark kiwanami.net>") (:keywords "window" "layout"))])
  (window-number . [(20170801 151) nil "Select windows by numbers." tar ((:commit . "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87") (:authors ("Johann \"Myrkraverk\" Oskarsson" . "myrkraverk@users.sourceforge.net")) (:maintainers ("Nik Nyby" . "niknyby@riseup.net")) (:maintainer "Nik Nyby" . "niknyby@riseup.net") (:keywords "windows") (:url . "https://github.com/nikolas/window-number"))])
  (window-numbering . [(20160809 1810) nil "Numbered window shortcuts" tar ((:commit . "10809b3993a97c7b544240bf5d7ce9b1110a1b89") (:authors ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainers ("Nikolaj Schumacher <bugs * nschum de>")) (:maintainer "Nikolaj Schumacher <bugs * nschum de>") (:keywords "faces" "matching") (:url . "http://nschum.de/src/emacs/window-numbering-mode/"))])
- (window-purpose . [(20210628 715) ((emacs (24 4)) (let-alist (1 0 3)) (imenu-list (0 1))) "Purpose-based window management for Emacs" tar ((:commit . "bb462f12f836414425edac32ebd069b4fd5b98d4") (:authors ("Bar Magal")) (:maintainers ("Bar Magal")) (:maintainer "Bar Magal") (:keywords "frames") (:url . "https://github.com/bmag/emacs-purpose"))])
+ (window-purpose . [(20240504 1017) ((emacs (24 4)) (let-alist (1 0 3)) (imenu-list (0 1))) "Purpose-based window management for Emacs" tar ((:commit . "776c5ef8fe2f0da0f9885526e3556af0f5736600") (:authors ("Bar Magal")) (:maintainers ("Bar Magal")) (:maintainer "Bar Magal") (:keywords "frames") (:url . "https://github.com/bmag/emacs-purpose"))])
  (winds . [(20201121 123) ((emacs (25 1))) "Window configuration switcher grouped by workspaces" tar ((:commit . "5827e890059d0ce67ebb4779da63c15afccf0973") (:authors ("Javier A. Pollak" . "javi.po.123@gmail.com")) (:maintainers ("Javier A. Pollak" . "javi.po.123@gmail.com")) (:maintainer "Javier A. Pollak" . "javi.po.123@gmail.com") (:keywords "convenience") (:url . "https://github.com/Javyre/winds.el"))])
  (windsize . [(20181029 2257) nil "Simple, intuitive window resizing" tar ((:commit . "62c2846bbe95b0a73e996c75e4a644d05f57aaaa") (:authors ("Chris Perkins" . "chrisperkins99@gmail.com")) (:maintainers ("Chris Perkins" . "chrisperkins99@gmail.com")) (:maintainer "Chris Perkins" . "chrisperkins99@gmail.com") (:keywords "window" "resizing" "convenience") (:url . "http://github.com/grammati/windsize"))])
  (windswap . [(20200722 411) ((emacs (24 3))) "Like windmove, but swaps buffers while moving point" tar ((:commit . "1a334f6543e0a30c55ea1e6071e9732d948f9e4b") (:authors ("Steve Purcell" . "steve@sanityinc.com")) (:maintainers ("Steve Purcell" . "steve@sanityinc.com")) (:maintainer "Steve Purcell" . "steve@sanityinc.com") (:keywords "frames" "convenience") (:url . "https://github.com/purcell/windswap"))])
@@ -5573,7 +5589,7 @@
  (wolfram . [(20231220 1950) nil "Wolfram Alpha Integration" tar ((:commit . "743c92f88bb3b6a77bc84ac2221adc6222cebb94") (:authors ("Hans Sjunnesson" . "hans.sjunnesson@gmail.com")) (:maintainers ("Hans Sjunnesson" . "hans.sjunnesson@gmail.com")) (:maintainer "Hans Sjunnesson" . "hans.sjunnesson@gmail.com") (:keywords "math"))])
  (wolfram-mode . [(20180307 13) ((emacs (24 3))) "Mathematica editing and inferior mode." tar ((:commit . "be680190cac6ccf579dbce107deaae495928d1b3") (:authors ("Daichi Mochihashi <daichi at cslab.kecl.ntt.co.jp>")) (:maintainers ("Daichi Mochihashi <daichi at cslab.kecl.ntt.co.jp>")) (:maintainer "Daichi Mochihashi <daichi at cslab.kecl.ntt.co.jp>") (:keywords "languages" "processes" "tools") (:url . "https://github.com/kawabata/wolfram-mode/"))])
  (wonderland . [(20130913 119) ((dash (2 0 0)) (dash-functional (1 0 0)) (multi (2 0 0)) (emacs (24))) "declarative configuration for Emacsen" tar ((:commit . "28cf6b37000c395ece9519db53147fb826a42bc4") (:authors ("Christina Whyte" . "kurisu.whyte@gmail.com")) (:maintainers ("Christina Whyte" . "kurisu.whyte@gmail.com")) (:maintainer "Christina Whyte" . "kurisu.whyte@gmail.com") (:keywords "configuration" "profile" "wonderland") (:url . "http://github.com/kurisuwhyte/emacs-wonderland"))])
- (wordcount-section . [(20240323 1901) ((emacs (28 1)) (compat (29 1)) (universal-sidecar (1 5 1))) "Universal Sidecar Section to show Word Counts" tar ((:commit . "b67153c880284db0ed9864370b16287fd855fb54") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "text" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
+ (wordcount-section . [(20240428 1852) ((emacs (28 1)) (compat (29 1)) (universal-sidecar (1 5 1))) "Universal Sidecar Section to show Word Counts" tar ((:commit . "4c78015d10caba9c700e6e6b582004ae1c1d5344") (:authors ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainers ("Samuel W. Flint" . "me@samuelwflint.com")) (:maintainer "Samuel W. Flint" . "me@samuelwflint.com") (:keywords "text" "convenience") (:url . "https://git.sr.ht/~swflint/emacs-universal-sidecar"))])
  (wordel . [(20240104 603) ((emacs (27 1))) "An Elisp implementation of \"Wordle\" (aka \"Lingo\")" tar ((:commit . "38a05283c014812c0a54207aa6146f163c707fa5") (:authors ("Nicholas Vollmer" . "iarchivedmywholelife@gmail.com")) (:maintainers ("Nicholas Vollmer" . "iarchivedmywholelife@gmail.com")) (:maintainer "Nicholas Vollmer" . "iarchivedmywholelife@gmail.com") (:keywords "games") (:url . "https://github.com/progfolio/wordel"))])
  (wordgen . [(20170803 1820) ((emacs (24)) (cl-lib (0 5))) "Random word generator" tar ((:commit . "aacad928ae99a953e034a831dfd0ebdf7d52ac1d") (:authors ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainers ("Fanael Linithien" . "fanael4@gmail.com")) (:maintainer "Fanael Linithien" . "fanael4@gmail.com") (:url . "https://github.com/Fanael/wordgen.el"))])
  (wordnut . [(20180313 443) ((emacs (24 4))) "Major mode interface to WordNet" tar ((:commit . "feac531404041855312c1a046bde7ea18c674915"))])
@@ -5592,7 +5608,7 @@
  (writeroom-mode . [(20231103 931) ((emacs (25 1)) (visual-fill-column (2 2))) "Minor mode for distraction-free writing" tar ((:commit . "f4d035e91d20bf1dd3f2857b9cc344f844979a78") (:authors ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainers ("Joost Kremers" . "joostkremers@fastmail.fm")) (:maintainer "Joost Kremers" . "joostkremers@fastmail.fm") (:keywords "text") (:url . "https://github.com/joostkremers/writeroom-mode"))])
  (ws-butler . [(20201117 1528) nil "Unobtrusively remove trailing whitespace." tar ((:commit . "e3a38d93e01014cd47bf5af4924459bd145fd7c4") (:authors ("Le Wang")) (:maintainers ("Le Wang")) (:maintainer "Le Wang") (:url . "https://github.com/lewang/ws-butler"))])
  (wsd-mode . [(20191031 1211) nil "Emacs major-mode for www.websequencediagrams.com" tar ((:commit . "44aac55afb57cb540559aa1015f9ad2d770dd5c8") (:authors ("Jostein Kjønigsen" . "jostein@gmail.com")) (:maintainers ("Jostein Kjønigsen" . "jostein@gmail.com")) (:maintainer "Jostein Kjønigsen" . "jostein@gmail.com") (:keywords "wsd" "diagrams" "design" "process" "modelling" "uml") (:url . "https://github.com/josteink/wsd-mode"))])
- (wttrin . [(20240422 1633) ((emacs (24 4)) (xterm-color (1 0))) "Emacs Frontend for Service wttr.in" tar ((:commit . "9b98fedc44b1ddcebaa48df2975493b37797c2fb") (:maintainers ("Craig Jennings" . "c@cjennings.net")) (:maintainer "Craig Jennings" . "c@cjennings.net") (:keywords "weather" "wttrin" "games") (:url . "https://github.com/cjennings/emacs-wttrin"))])
+ (wttrin . [(20240521 2004) ((emacs (24 4)) (xterm-color (1 0))) "Emacs Frontend for Service wttr.in" tar ((:commit . "5655b5fd438622581f84eb84c8880f20e11b87ed") (:maintainers ("Craig Jennings" . "c@cjennings.net")) (:maintainer "Craig Jennings" . "c@cjennings.net") (:keywords "weather" "wttrin" "games") (:url . "https://github.com/cjennings/emacs-wttrin"))])
  (wucuo . [(20230529 735) ((emacs (25 1))) "Fastest solution to spell check camel case code or plain text" tar ((:commit . "8a9080019d294906f8be4e0285eda970679d6ca0") (:authors ("Chen Bin <chenbin DOT sh AT gmail DOT com>")) (:maintainers ("Chen Bin <chenbin DOT sh AT gmail DOT com>")) (:maintainer "Chen Bin <chenbin DOT sh AT gmail DOT com>") (:keywords "convenience") (:url . "http://github.com/redguardtoo/wucuo"))])
  (wwg . [(20210614 1527) ((emacs (25 1))) "Writer word goals" tar ((:commit . "46c8a7c71275ced2c662c1222d4b85319f80dd83") (:authors (nil . "Andrea andrea-dev@hotmail.com>")) (:maintainers (nil . "Andrea andrea-dev@hotmail.com>")) (:maintainer nil . "Andrea andrea-dev@hotmail.com>") (:keywords "wp") (:url . "https://github.com/ag91/writer-word-goals"))])
  (wwtime . [(20151122 1610) nil "Insert a time of day with appropriate world-wide localization" tar ((:commit . "d04d8fa814b5d3644efaeb28f25520ada69acbbd") (:authors ("Norman Walsh" . "ndw@nwalsh.com")) (:maintainers ("Norman Walsh" . "ndw@nwalsh.com")) (:maintainer "Norman Walsh" . "ndw@nwalsh.com") (:keywords "time"))])
@@ -5606,6 +5622,7 @@
  (xcscope . [(20230626 2109) nil "cscope interface for (X)Emacs" tar ((:commit . "2f35b26428dd82c016941744f03aad97df80c47b") (:authors ("Darryl Okahata" . "darrylo@sonic.net") ("Dima Kogan" . "dima@secretsauce.net")) (:maintainers ("Dima Kogan" . "dima@secretsauce.net")) (:maintainer "Dima Kogan" . "dima@secretsauce.net") (:keywords "languages" "c") (:url . "https://github.com/dkogan/xcscope.el"))])
  (xenops . [(20220821 1111) ((emacs (26 1)) (aio (1 0)) (auctex (12 2 0)) (avy (0 5 0)) (dash (2 18 0)) (f (0 20 0)) (s (1 12 0))) "A LaTeX editing environment for mathematical documents" tar ((:commit . "4d75c1cd5ee7afba62af3a39a1f43432b295c29c") (:authors ("Dan Davison" . "dandavison7@gmail.com")) (:maintainers ("Dan Davison" . "dandavison7@gmail.com")) (:maintainer "Dan Davison" . "dandavison7@gmail.com") (:url . "https://github.com/dandavison/xenops"))])
  (xhair . [(20210801 222) ((emacs (24 3)) (vline (1 0))) "Highlight the current line and column" tar ((:commit . "c7bd7c501c3545aa99dadac386c882fe7c5edd9c") (:keywords "convenience" "faces" "maint") (:url . "https://github.com/Boruch-Baum/emacs-xhair"))])
+ (xkb-mode . [(20240506 904) ((emacs (25 1))) "Major mode for editing X Keyboard Extension (XKB) files" tar ((:commit . "b1de5233dc12749a97ad6a63d86b921bf1e33d3b") (:authors ("James Dyer" . "captainflasmr@gmail.com")) (:maintainers ("James Dyer" . "captainflasmr@gmail.com")) (:maintainer "James Dyer" . "captainflasmr@gmail.com") (:keywords "convenience") (:url . "https://github.com/captainflasmr/xkb-mode"))])
  (xkcd . [(20220503 1109) ((json (1 3))) "View xkcd from Emacs" tar ((:commit . "80011da2e7def8f65233d4e0d790ca60d287081d") (:authors ("Vibhav Pant" . "vibhavp@gmail.com")) (:maintainers ("Vibhav Pant" . "vibhavp@gmail.com")) (:maintainer "Vibhav Pant" . "vibhavp@gmail.com") (:keywords "xkcd" "webcomic") (:url . "https://github.com/vibhavp/emacs-xkcd"))])
  (xmind-org . [(20220907 1310) ((emacs (27 1)) (org-ml (5 3)) (dash (2 12))) "Import XMind mindmaps into Org" tar ((:commit . "79f0b1d95af2a1b8436cee2d3d6c6115d9c6483d") (:authors ("Akira Komamura" . "akira.komamura@gmail.com")) (:maintainers ("Akira Komamura" . "akira.komamura@gmail.com")) (:maintainer "Akira Komamura" . "akira.komamura@gmail.com") (:keywords "outlines" "wp" "files") (:url . "https://github.com/akirak/xmind-org-el"))])
  (xml+ . [(20170727 2351) ((emacs (24 4)) (dash (2 12 0))) "Utilities for xml and html trees" tar ((:commit . "232fa863c08fc159b21dd58c39ea45dce3334895") (:authors ("Ben Dean" . "bendean837@gmail.com")) (:maintainers ("Ben Dean" . "bendean837@gmail.com")) (:maintainer "Ben Dean" . "bendean837@gmail.com") (:keywords "xml" "html") (:url . "https://github.com/bddean/xml-plus"))])
@@ -5618,7 +5635,7 @@
  (xonsh-mode . [(20201020 52) ((emacs (24 3))) "Major mode for editing xonshrc files" tar ((:commit . "7fa581524533a9b6b770426e4445e571a69e469d") (:authors ("Sean Farley" . "sean@farley.io")) (:maintainers ("Sean Farley" . "sean@farley.io")) (:maintainer "Sean Farley" . "sean@farley.io") (:keywords "languages") (:url . "https://github.com/seanfarley/xonsh-mode"))])
  (xquery-mode . [(20170214 1119) ((cl-lib (0 5))) "A simple mode for editing xquery programs" tar ((:commit . "19e6f9553ce05380843582b879712de00679e4ab") (:url . "https://github.com/xquery-mode/xquery-mode"))])
  (xquery-tool . [(20200907 811) nil "A simple interface to saxonb's xquery." tar ((:commit . "bd48e0f56b58e36309f7966dcf67db69d65100a4") (:authors ("Patrick McAllister" . "pma@rdorte.org")) (:maintainers ("Patrick McAllister" . "pma@rdorte.org")) (:maintainer "Patrick McAllister" . "pma@rdorte.org") (:keywords "xml" "xquery" "emacs") (:url . "https://github.com/paddymcall/xquery-tool.el"))])
- (xref-js2 . [(20240417 1454) ((emacs (25 1)) (js2-mode (20150909))) "Jump to references/definitions using ag & js2-mode's AST" tar ((:commit . "db816e926302293c134d1260322b0553953a43e2") (:authors ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainers ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainer "Nicolas Petton" . "nicolas@petton.fr") (:keywords "javascript" "convenience" "tools") (:url . "https://github.com/NicolasPetton/xref-js2"))])
+ (xref-js2 . [(20240504 1449) ((emacs (25 1)) (js2-mode (20150909))) "Jump to references/definitions using ag & js2-mode's AST" tar ((:commit . "e215af9eedac69b40942fff9d5514704f9f4d43e") (:authors ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainers ("Nicolas Petton" . "nicolas@petton.fr")) (:maintainer "Nicolas Petton" . "nicolas@petton.fr") (:keywords "javascript" "convenience" "tools") (:url . "https://github.com/NicolasPetton/xref-js2"))])
  (xref-rst . [(20240421 814) ((emacs (29 1))) "Lookup reStructuredText symbols" tar ((:commit . "c6dd6cc6df1d9dd311cb0f421b86beadfa3156ce") (:authors ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainers ("Campbell Barton" . "ideasman42@gmail.com")) (:maintainer "Campbell Barton" . "ideasman42@gmail.com") (:url . "https://codeberg.org/ideasman42/emacs-xref-rst"))])
  (xresources-theme . [(20221208 2015) nil "Use your .Xresources as your emacs theme" tar ((:commit . "76532fc4330e9e31accc580708514b83b15d70a7") (:authors ("Marten Lienen" . "marten.lienen@gmail.com")) (:maintainers ("Marten Lienen" . "marten.lienen@gmail.com")) (:maintainer "Marten Lienen" . "marten.lienen@gmail.com") (:keywords "xresources" "theme"))])
  (xterm-color . [(20230321 3) ((emacs (24 4))) "ANSI, XTERM 256 and Truecolor support" tar ((:commit . "2ad407c651e90fff2ea85d17bf074cee2c022912") (:authors ("xristos" . "xristos@sdf.org")) (:maintainers ("xristos" . "xristos@sdf.org")) (:maintainer "xristos" . "xristos@sdf.org") (:keywords "faces") (:url . "https://github.com/atomontage/xterm-color"))])
@@ -5639,7 +5656,7 @@
  (yaml . [(20231211 1501) ((emacs (25 1))) "YAML parser for Elisp" tar ((:commit . "70c4fcead97e9bd6594e418c922ae769818f4245") (:authors ("Zachary Romero" . "zkry@posteo.org")) (:maintainers ("Zachary Romero" . "zkry@posteo.org")) (:maintainer "Zachary Romero" . "zkry@posteo.org") (:keywords "tools") (:url . "https://github.com/zkry/yaml.el"))])
  (yaml-imenu . [(20220406 1703) ((emacs (24 4)) (yaml-mode (0))) "Enhancement of the imenu support in yaml-mode." tar ((:commit . "c1fbba8b03a7bef4fc2b87404914fa9c6eb67b55") (:authors ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainers ("Akinori MUSHA" . "knu@iDaemons.org")) (:maintainer "Akinori MUSHA" . "knu@iDaemons.org") (:keywords "outlining" "convenience" "imenu") (:url . "https://github.com/knu/yaml-imenu.el"))])
  (yaml-mode . [(20240317 1602) ((emacs (24 1))) "Major mode for editing YAML files" tar ((: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"))])
- (yaml-pro . [(20240313 307) ((emacs (26 1)) (yaml (0 5 1))) "Parser-aided YAML editing features" tar ((:commit . "775c0a4b82c79da0eb91620fb0cbbf6c8642815b") (:authors ("Zachary Romero")) (:maintainers ("Zachary Romero")) (:maintainer "Zachary Romero") (:keywords "tools") (:url . "https://github.com/zkry/yaml-pro"))])
+ (yaml-pro . [(20240520 1215) ((emacs (26 1)) (yaml (0 5 1))) "Parser-aided YAML editing features" tar ((:commit . "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39") (:authors ("Zachary Romero")) (:maintainers ("Zachary Romero")) (:maintainer "Zachary Romero") (:keywords "tools") (:url . "https://github.com/zkry/yaml-pro"))])
  (yaml-tomato . [(20151123 753) ((s (1 9))) "copy or show the yaml path currently under cursor." tar ((:commit . "1272c502fac6ce6b0f8b7f8a9beb353f0b35e13c") (:authors ("qrczeno")) (:maintainers ("qrczeno")) (:maintainer "qrczeno") (:keywords "yaml"))])
  (yang-mode . [(20190507 724) nil "major mode for editing YANG files" tar ((:commit . "4b4ab4d4a79d37d6c31c6ea7cccbc425e0b1eded") (:authors ("Martin Bjorklund" . "mbj4668@gmail.com")) (:maintainers ("Martin Bjorklund" . "mbj4668@gmail.com")) (:maintainer "Martin Bjorklund" . "mbj4668@gmail.com"))])
  (yankpad . [(20220201 2104) ((emacs (25 1))) "Paste snippets from an org-mode file" tar ((:commit . "927e6d26956ac7219b8a69d641acf486854fba16") (:authors ("Erik Sjöstrand")) (:maintainers ("Erik Sjöstrand")) (:maintainer "Erik Sjöstrand") (:keywords "abbrev" "convenience") (:url . "http://github.com/Kungsgeten/yankpad"))])
@@ -5652,7 +5669,7 @@
  (yasnippet . [(20240406 1314) ((cl-lib (0 5)) (emacs (24 4))) "Yet another snippet extension for Emacs" tar ((:commit . "eb5ba2664c3a68ae4a53bb38b85418dd131b208f") (:maintainers ("Noam Postavsky" . "npostavs@gmail.com")) (:maintainer "Noam Postavsky" . "npostavs@gmail.com") (:keywords "convenience" "emulation") (:url . "http://github.com/joaotavora/yasnippet"))])
  (yasnippet-capf . [(20240420 1531) ((emacs (25 1)) (yasnippet (0 14 0))) "Yasnippet Completion At Point Function" tar ((:commit . "ea2bbf4f1c5c133ca7105a5cda2bc01c8e378ef5") (:authors ("Ellis Kenyő" . "me@elken.dev")) (:maintainers ("Ellis Kenyő" . "me@elken.dev")) (:maintainer "Ellis Kenyő" . "me@elken.dev") (:url . "https://github.com/elken/yasnippet-capf"))])
  (yasnippet-lean . [(20220105 2251) ((yasnippet (0 8 0))) "Collection of snippets for the Lean prover" tar ((:commit . "c75485757cc8675ad4f36c1eb028d9d54dc21733") (:maintainers ("Simon Hudon" . "simon.hudon@gmail.com")) (:maintainer "Simon Hudon" . "simon.hudon@gmail.com") (:keywords "convenience" "snippets" "leanprover") (:url . "https://github.com/leanprover-community/yasnippet-lean"))])
- (yasnippet-snippets . [(20240221 1621) ((yasnippet (0 8 0))) "Collection of yasnippet snippets" tar ((:commit . "e6ec9f1822913cea7dc67cde6aeb8f2625980950") (:authors ("Andrea Crotti" . "andrea.crotti.0@gmail.com")) (:maintainers ("Andrea Crotti" . "andrea.crotti.0@gmail.com")) (:maintainer "Andrea Crotti" . "andrea.crotti.0@gmail.com") (:keywords "snippets") (:url . "https://github.com/AndreaCrotti/yasnippet-snippets"))])
+ (yasnippet-snippets . [(20240507 943) ((yasnippet (0 8 0))) "Collection of yasnippet snippets" tar ((:commit . "6fafad13bb4689600285d9e38c61958dd63c356d") (:authors ("Andrea Crotti" . "andrea.crotti.0@gmail.com")) (:maintainers ("Andrea Crotti" . "andrea.crotti.0@gmail.com")) (:maintainer "Andrea Crotti" . "andrea.crotti.0@gmail.com") (:keywords "snippets") (:url . "https://github.com/AndreaCrotti/yasnippet-snippets"))])
  (yatemplate . [(20211115 1208) ((yasnippet (0 8 1)) (emacs (24 3))) "File templates with yasnippet" tar ((:commit . "275745ce1482edc08efb0b7807bc86d832bcc734") (:authors ("Wieland Hoffmann" . "themineo+yatemplate@gmail.com")) (:maintainers ("Wieland Hoffmann" . "themineo+yatemplate@gmail.com")) (:maintainer "Wieland Hoffmann" . "themineo+yatemplate@gmail.com") (:keywords "files" "convenience") (:url . "https://github.com/mineo/yatemplate"))])
  (yatex . [(20221225 512) nil "Yet Another tex-mode for emacs //野鳥//" tar ((:commit . "157aa7974191bbb4707d26b05ce830282ad70ef5"))])
  (yaxception . [(20240107 504) ((emacs (28)) (dash (2 19 1))) "Provide framework about exception like Java for Elisp" tar ((:commit . "5941de88b19752c14e0dce0d2bf562b1288055a0") (:authors ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainers ("Hiroaki Otsu" . "ootsuhiroaki@gmail.com")) (:maintainer "Hiroaki Otsu" . "ootsuhiroaki@gmail.com") (:keywords "exception" "error" "signal") (:url . "https://github.com/aki2o/yaxception"))])
@@ -5692,7 +5709,7 @@
  (zetteldesk-kb . [(20230517 2020) ((zetteldesk (1 0 1)) (hydra (0 15)) (major-mode-hydra (0 2)) (emacs (24 1))) "Keybindings for zetteldesk.el" tar ((:commit . "73f691989c094ec196bb614318ae51b60209a8de") (:authors ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainers ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainer "Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com") (:url . "https://github.com/Vidianos-Giannitsis/zetteldesk-kb.el"))])
  (zetteldesk-ref . [(20230517 2020) ((zetteldesk (1 0)) (bibtex-completion (1 0)) (emacs (26 1))) "A zetteldesk extension for interfacing with literature nodes" tar ((:commit . "73f691989c094ec196bb614318ae51b60209a8de") (:authors ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainers ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainer "Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com") (:url . "https://github.com/Vidianos-Giannitsis/zetteldesk-ref.el"))])
  (zetteldesk-remark . [(20230517 2020) ((zetteldesk (1 0)) (org-remark (1 0)) (emacs (27 2))) "Org-Remark integration for zetteldesk.el" tar ((:commit . "73f691989c094ec196bb614318ae51b60209a8de") (:authors ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainers ("Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com")) (:maintainer "Vidianos Giannitsis" . "vidianosgiannitsis@gmail.com") (:url . "https://github.com/Vidianos-Giannitsis/zetteldesk-remark.el"))])
- (zettelkasten . [(20230108 1724) ((emacs (25 1)) (s (1 10 0))) "Helper functions to organise notes in a Zettelkasten style" tar ((:commit . "cc4d69c302a46b8f802a1871aae091df1f3398ba") (:authors ("Yann Herklotz" . "yann@ymhg.org")) (:maintainers ("Yann Herklotz" . "yann@ymhg.org")) (:maintainer "Yann Herklotz" . "yann@ymhg.org") (:keywords "files" "hypermedia" "notes") (:url . "https://github.com/ymherklotz/emacs-zettelkasten"))])
+ (zettelkasten . [(20240517 1319) ((emacs (25 1)) (s (1 10 0))) "Helper functions to organise notes in a Zettelkasten style" tar ((:commit . "6a33faf7b4231b03d056099a1aff40bbeee6e720") (:authors ("Yann Herklotz" . "yann@ymhg.org")) (:maintainers ("Yann Herklotz" . "yann@ymhg.org")) (:maintainer "Yann Herklotz" . "yann@ymhg.org") (:keywords "files" "hypermedia" "notes") (:url . "https://github.com/ymherklotz/emacs-zettelkasten"))])
  (zetz-mode . [(20200823 536) ((emacs (25 1)) (dash (2 17 0)) (hydra (0 15 0))) "A major mode for the ZetZ programming language" tar ((:commit . "04da33f4ffa9db5b3556f423276f4fd1db13ec67") (:keywords "languages" "programming") (:url . "https://github.com/damon-kwok/zetz-mode"))])
  (zig-mode . [(20240416 1636) ((emacs (26 1)) (reformatter (0 6))) "A major mode for the Zig programming language" tar ((:commit . "b4170b747ae4c45d145ff8bcb7fafe095e17b4c6") (:authors ("Andrea Orru" . "andreaorru1991@gmail.com") ("Andrew Kelley" . "superjoe30@gmail.com")) (:maintainers ("Shen, Jen-Chieh" . "jcs090218@gmail.com")) (:maintainer "Shen, Jen-Chieh" . "jcs090218@gmail.com") (:keywords "zig" "languages") (:url . "https://github.com/zig-lang/zig-mode"))])
  (zim-wiki-mode . [(20230927 1410) ((emacs (25 1)) (helm-ag (0 58)) (helm-projectile (0 14 0)) (dokuwiki-mode (0 1 1)) (link-hint (0 1)) (pretty-hydra (0 2 2))) "Zim Desktop Wiki edit mode" tar ((:commit . "7c62e0304750654709b4173bcc1e2681cf1fbe49") (:authors ("Will Foran" . "willforan+zim-wiki-mode@gmail.com")) (:maintainers ("Will Foran" . "willforan+zim-wiki-mode@gmail.com")) (:maintainer "Will Foran" . "willforan+zim-wiki-mode@gmail.com") (:keywords "outlines") (:url . "https://github.com/WillForan/zim-wiki-mode"))])
diff --git a/emacs/elpa/archives/nongnu/archive-contents b/emacs/elpa/archives/nongnu/archive-contents
@@ -42,13 +42,13 @@
 		 ("Jordon Biondo" . "jordonbiondo@gmail.com"))
 		(:commit . "33691c93ee302690e41f631f82083bcc15d229e8"))])
  (annotate .
-	   [(2 2 1)
+	   [(2 2 2)
 	    nil "annotate files without changing them" tar
 	    ((:url . "https://github.com/bastibe/annotate.el")
 	     (:maintainer
 	      ("Bastian Bechtold" . "bastibe.dev@mailbox.org")
 	      ("cage" . "cage-dev@twistfold.it"))
-	     (:commit . "a388c39231207f6234ca1af547dbd29995ee476f"))])
+	     (:commit . "deb43c7c429a021d16d6d67b82e7a3053a6eef67"))])
  (anti-zenburn-theme .
 		     [(2 5 1)
 		      nil "Low-contrast Zenburn-inverted theme" tar
@@ -489,7 +489,7 @@
 		   ("Fanael Linithien" . "fanael4@gmail.com"))
 		  (:commit . "82a28d8a85277cfe453af464603ea330eae41c05"))])
  (editorconfig .
-	       [(0 10 1)
+	       [(0 11 0)
 		((emacs
 		  (26 1))
 		 (nadvice
@@ -500,7 +500,7 @@
 		 (:maintainer "EditorConfig Team" . "editorconfig@googlegroups.com")
 		 (:authors
 		  ("EditorConfig Team" . "editorconfig@googlegroups.com"))
-		 (:commit . "ed760770ed5397120b3d68b69afc0778c48d3a47"))])
+		 (:commit . "f1531bab5b57e40759167b7e5db49acbbc09972f"))])
  (elixir-mode .
 	      [(2 5 0)
 	       ((emacs
@@ -1078,6 +1078,18 @@
 	     (:authors
 	      ("David Andersson" . "l.david.anderssonsverige.nu"))
 	     (:commit . "278cd3e6d5107693aa2bb33189ca503f22f227d0"))])
+ (gptel .
+	[(0 8 6)
+	 ((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")
+	  (:keywords "convenience")
+	  (:commit . "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78"))])
  (graphql-mode .
 	       [(1 0 0)
 		((emacs
@@ -1391,16 +1403,18 @@
 	      ("Aaron Smith" . "aaron-lua@gelatinous.com"))
 	     (:commit . "1cb83e691627fb92290d452cb08b6c5f73fe19b6"))])
  (macrostep .
-	    [(0 9 2)
+	    [(0 9 4)
 	     ((cl-lib
-	       (0 5)))
+	       (0 5))
+	      (compat
+	       (29)))
 	     "Interactive macro expander" tar
 	     ((:url . "https://github.com/emacsorphanage/macrostep")
 	      (:keywords "lisp" "languages" "macro" "debugging")
 	      (:maintainer "Jon Oddie" . "j.j.oddie@gmail.com")
 	      (:authors
 	       ("Jon Oddie" . "j.j.oddie@gmail.com"))
-	      (:commit . "633586421e7fc14072cc1ca1655c1103b81a9093"))])
+	      (:commit . "31d4adcca4f08cfd7a45f85e691aaa7a9316b355"))])
  (magit .
 	[(3 3 0)
 	 ((emacs
@@ -1893,7 +1907,7 @@
 	       ("David Christiansen" . "david@davidchristiansen.dk"))
 	      (:commit . "1edda80e2e32b72e77f4f16ae5b83c312c68ee95"))])
  (racket-mode .
-	      [(1 0 20240419 71343)
+	      [(1 0 20240514 112412)
 	       ((emacs
 		 (25 1)))
 	       "Racket editing, REPL, and more" tar
@@ -2475,14 +2489,14 @@
 	     ((:url . "https://github.com/lewang/ws-butler")
 	      (:commit . "323b651dd70ee40a25accc940b8f80c3a3185205"))])
  (xah-fly-keys .
-	       [(25 2 20240427131540)
+	       [(25 5 20240515230030)
 		((emacs
 		  (27)))
 		"ergonomic modal keybinding minor mode." tar
 		((:url . "http://xahlee.info/emacs/misc/xah-fly-keys.html")
 		 (:keywords "convenience" "vi" "vim" "ergoemacs" "keybinding")
 		 (:maintainer "Xah Lee" . "xah@xahlee.org")
-		 (:commit . "ba9d9cbfd08545336888642ea48a6b658be417ac"))])
+		 (:commit . "c8a34178419058c0fcdb821ae6c958a1e7f5d95e"))])
  (xkcd .
        [(1 1)
 	((json
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-04-28T09:10:03+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-05-21T09:05:05+0000 using EDDSA
+\ No newline at end of file
diff --git a/emacs/elpa/cape-20240411.2207/cape-pkg.el b/emacs/elpa/cape-20240411.2207/cape-pkg.el
@@ -1,15 +0,0 @@
-(define-package "cape" "20240411.2207" "Completion At Point Extensions"
-  '((emacs "27.1")
-    (compat "29.1.4.4"))
-  :commit "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0" :authors
-  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
-  :maintainers
-  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
-  :maintainer
-  '("Daniel Mendler" . "mail@daniel-mendler.de")
-  :keywords
-  '("abbrev" "convenience" "matching" "completion" "text")
-  :url "https://github.com/minad/cape")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/cape-20240411.2207/cape.el b/emacs/elpa/cape-20240411.2207/cape.el
@@ -1,1275 +0,0 @@
-;;; cape.el --- Completion At Point Extensions -*- lexical-binding: t -*-
-
-;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
-
-;; Author: Daniel Mendler <mail@daniel-mendler.de>
-;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
-;; Created: 2021
-;; Version: 1.5
-;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4"))
-;; Homepage: https://github.com/minad/cape
-;; Keywords: abbrev, convenience, matching, completion, text
-
-;; 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:
-
-;; Let your completions fly! This package provides additional completion
-;; backends in the form of Capfs (completion-at-point-functions).
-;;
-;; `cape-abbrev': Complete abbreviation (add-global-abbrev, add-mode-abbrev).
-;; `cape-dabbrev': Complete word from current buffers.
-;; `cape-dict': Complete word from dictionary file.
-;; `cape-elisp-block': Complete Elisp in Org or Markdown code block.
-;; `cape-elisp-symbol': Complete Elisp symbol.
-;; `cape-emoji': Complete Emoji.
-;; `cape-file': Complete file name.
-;; `cape-history': Complete from Eshell, Comint or minibuffer history.
-;; `cape-keyword': Complete programming language keyword.
-;; `cape-line': Complete entire line from file.
-;; `cape-rfc1345': Complete Unicode char using RFC 1345 mnemonics.
-;; `cape-sgml': Complete Unicode char from SGML entity, e.g., &alpha.
-;; `cape-tex': Complete Unicode char from TeX command, e.g. \hbar.
-
-;;; Code:
-
-(require 'compat)
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'subr-x))
-
-;;;; Customization
-
-(defgroup cape nil
-  "Completion At Point Extensions."
-  :link '(info-link :tag "Info Manual" "(cape)")
-  :link '(url-link :tag "Homepage" "https://github.com/minad/cape")
-  :link '(emacs-library-link :tag "Library Source" "cape.el")
-  :group 'convenience
-  :group 'tools
-  :group 'matching
-  :prefix "cape-")
-
-(defcustom cape-dict-limit 100
-  "Maximal number of completion candidates returned by `cape-dict'."
-  :type '(choice (const nil) natnum))
-
-(defcustom cape-dict-file "/usr/share/dict/words"
-  "Path to dictionary word list file.
-This variable can also be a list of paths or
-a function returning a single or more paths."
-  :type '(choice string (repeat string) function))
-
-(defcustom cape-dict-case-replace 'case-replace
-  "Preserve case of input.
-See `dabbrev-case-replace' for details."
-  :type '(choice (const :tag "off" nil)
-                 (const :tag "use `case-replace'" case-replace)
-                 (other :tag "on" t)))
-
-(defcustom cape-dict-case-fold 'case-fold-search
-  "Case fold search during search.
-See `dabbrev-case-fold-search' for details."
-  :type '(choice (const :tag "off" nil)
-                 (const :tag "use `case-fold-search'" case-fold-search)
-                 (other :tag "on" t)))
-
-(defcustom cape-dabbrev-min-length 4
-  "Minimum length of Dabbrev expansions.
-This setting ensures that words which are too short
-are not offered as completion candidates, such that
-auto completion does not pop up too aggressively."
-  :type 'natnum)
-
-(defcustom cape-dabbrev-check-other-buffers t
-  "Buffers to check for Dabbrev.
-
-If t, check all other buffers, subject to Dabbrev ignore rules.
-If a function, only search the buffers returned by this function.
-Any other non-nil value only checks some other buffers, as per
-`dabbrev-select-buffers-function'."
-  :type `(choice (const :tag "off" nil)
-                 (const :tag "same-mode buffers" ,#'cape--buffers-major-mode)
-                 (function :tag "function")
-                 (const :tag "some" some)
-                 (other :tag "all" t)))
-
-(defcustom cape-file-directory nil
-  "Base directory used by `cape-file."
-  :type '(choice (const nil) string function))
-
-(defcustom cape-file-prefix "file:"
-  "File completion trigger prefixes.
-The value can be a string or a list of strings.  The default
-`file:' is the prefix of Org file links which work in arbitrary
-buffers via `org-open-at-point-global'."
-  :type '(choice string (repeat string)))
-
-(defcustom cape-file-directory-must-exist t
-  "The parent directory must exist for file completion."
-  :type 'boolean)
-
-(defcustom cape-line-buffer-function #'cape--buffers-major-mode
-  "Function which returns list of buffers.
-The buffers are scanned for completion candidates by `cape-line'."
-  :type '(choice (const :tag "Current buffer" current-buffer)
-                 (const :tag "All buffers" buffer-list)
-                 (const :tag "Buffers with same major mode" cape--buffers-major-mode)
-                 (function :tag "Custom function")))
-
-(defcustom cape-elisp-symbol-wrapper
-  '((org-mode ?~ ?~)
-    (markdown-mode ?` ?`)
-    (rst-mode "``" "``")
-    (log-edit-mode "`" "'")
-    (change-log-mode "`" "'")
-    (message-mode "`" "'")
-    (rcirc-mode "`" "'"))
-  "Wrapper characters for symbols."
-  :type '(alist :key-type symbol :value-type (list (choice character string)
-                                                   (choice character string))))
-
-;;;; Helpers
-
-(defun cape--case-fold-p (fold)
-  "Return non-nil if case folding is enabled for FOLD."
-  (if (eq fold 'case-fold-search) case-fold-search fold))
-
-(defun cape--case-replace-list (flag input strs)
-  "Replace case of STRS depending on INPUT and FLAG."
-  (if (and (if (eq flag 'case-replace) case-replace flag)
-           (let (case-fold-search) (string-match-p "\\`[[:upper:]]" input)))
-      (mapcar (apply-partially #'cape--case-replace flag input) strs)
-    strs))
-
-(defun cape--case-replace (flag input str)
-  "Replace case of STR depending on INPUT and FLAG."
-  (or (and (if (eq flag 'case-replace) case-replace flag)
-           (string-prefix-p input str t)
-           (let (case-fold-search) (string-match-p "\\`[[:upper:]]" input))
-           (save-match-data
-             ;; Ensure that single character uppercase input does not lead to an
-             ;; all uppercase result.
-             (when (and (= (length input) 1) (> (length str) 1))
-               (setq input (concat input (substring str 1 2))))
-             (and (string-match input input)
-                  (replace-match str nil nil input))))
-      str))
-
-(defun cape--separator-p (str)
-  "Return non-nil if input STR has a separator character.
-Separator characters are used by completion styles like Orderless
-to split filter words.  In Corfu, the separator is configurable
-via the variable `corfu-separator'."
-  (string-search (string ;; Support `corfu-separator' and Orderless
-                  (or (and (bound-and-true-p corfu-mode)
-                           (bound-and-true-p corfu-separator))
-                      ?\s))
-                 str))
-
-(defmacro cape--silent (&rest body)
-  "Silence BODY."
-  (declare (indent 0))
-  `(cl-letf ((inhibit-message t)
-             (message-log-max nil)
-             ((symbol-function #'minibuffer-message) #'ignore))
-     (ignore-errors ,@body)))
-
-(defun cape--bounds (thing)
-  "Return bounds of THING."
-  (or (bounds-of-thing-at-point thing) (cons (point) (point))))
-
-(defmacro cape--wrapped-table (wrap body)
-  "Create wrapped completion table, handle `completion--unquote'.
-WRAP is the wrapper function.
-BODY is the wrapping expression."
-  (declare (indent 1))
-  `(lambda (str pred action)
-     (,@body
-      (let ((result (complete-with-action action table str pred)))
-        (when (and (eq action 'completion--unquote) (functionp (cadr result)))
-          (cl-callf ,wrap (cadr result)))
-        result))))
-
-(defun cape--accept-all-table (table)
-  "Create completion TABLE which accepts all input."
-  (cape--wrapped-table cape--accept-all-table
-    (or (eq action 'lambda))))
-
-(defun cape--passthrough-table (table)
-  "Create completion TABLE disabling any filtering."
-  (cape--wrapped-table cape--passthrough-table
-    (let (completion-ignore-case completion-regexp-list (_ (setq str ""))))))
-
-(defun cape--noninterruptible-table (table)
-  "Create non-interruptible completion TABLE."
-  (cape--wrapped-table cape--noninterruptible-table
-    (let (throw-on-input))))
-
-(defun cape--silent-table (table)
-  "Create a new completion TABLE which is silent (no messages, no errors)."
-  (cape--wrapped-table cape--silent-table
-    (cape--silent)))
-
-(defun cape--nonessential-table (table)
-  "Mark completion TABLE as `non-essential'."
-  (let ((dir default-directory))
-    (cape--wrapped-table cape--nonessential-table
-      (let ((default-directory dir)
-            (non-essential t))))))
-
-(defvar cape--debug-length 5
-  "Length of printed lists in `cape--debug-print'.")
-
-(defvar cape--debug-id 0
-  "Completion table identifier.")
-
-(defun cape--debug-message (&rest msg)
-  "Print debug MSG."
-  (let ((inhibit-message t))
-    (apply #'message msg)))
-
-(defun cape--debug-print (obj &optional full)
-  "Print OBJ as string, truncate lists if FULL is nil."
-  (cond
-   ((symbolp obj) (symbol-name obj))
-   ((functionp obj) "#<function>")
-   ((proper-list-p obj)
-    (concat
-     "("
-     (string-join
-      (mapcar #'cape--debug-print
-              (if full obj (take cape--debug-length obj)))
-      " ")
-     (if (and (not full) (length> obj cape--debug-length)) " ...)" ")")))
-   (t (let ((print-level 2))
-        (prin1-to-string obj)))))
-
-(defun cape--debug-table (table name beg end)
-  "Create completion TABLE with debug messages.
-NAME is the name of the Capf, BEG and END are the input markers."
-  (lambda (str pred action)
-    (let ((result (complete-with-action action table str pred)))
-      (if (and (eq action 'completion--unquote) (functionp (cadr result)))
-          ;; See `cape--wrapped-table'
-          (cl-callf cape--debug-table (cadr result) name beg end)
-        (cape--debug-message
-         "%s(action=%S input=%s:%s:%S prefix=%S ignore-case=%S%s%s) => %s"
-         name
-         (pcase action
-           ('nil 'try)
-           ('t 'all)
-           ('lambda 'test)
-           (_ action))
-         (+ beg 0) (+ end 0) (buffer-substring-no-properties beg end)
-         str completion-ignore-case
-         (if completion-regexp-list
-             (format " regexp=%s" (cape--debug-print completion-regexp-list t))
-           "")
-         (if pred
-             (format " predicate=%s" (cape--debug-print pred))
-           "")
-         (cape--debug-print result)))
-      result)))
-
-(cl-defun cape--properties-table (table &key category (sort t) &allow-other-keys)
-  "Create completion TABLE with properties.
-CATEGORY is the optional completion category.
-SORT should be nil to disable sorting."
-  ;; The metadata will be overridden if the category is non-nil, if the table is
-  ;; a function table or if sorting should be disabled for a non-nil
-  ;; non-function table.
-  (if (or category (functionp table) (and (not sort) table))
-      (let ((metadata `(metadata
-                        ,@(and category `((category . ,category)))
-                        ,@(and (not sort) '((display-sort-function . identity)
-                                            (cycle-sort-function . identity))))))
-        (lambda (str pred action)
-          (if (eq action 'metadata)
-              metadata
-            (complete-with-action action table str pred))))
-    table))
-
-(defun cape--dynamic-table (beg end fun)
-  "Create dynamic completion table from FUN with caching.
-BEG and END are the input bounds.  FUN is the function which
-computes the candidates.  FUN must return a pair of a predicate
-function function and the list of candidates.  The predicate is
-passed new input and must return non-nil if the candidates are
-still valid.
-
-It is only necessary to use this function if the set of
-candidates is computed dynamically based on the input and not
-statically determined.  The behavior is similar but slightly
-different to `completion-table-dynamic'.
-
-The difference to the builtins `completion-table-dynamic' and
-`completion-table-with-cache' is that this function does not use
-the prefix argument of the completion table to compute the
-candidates.  Instead it uses the input in the buffer between BEG
-and END to FUN to compute the candidates.  This way the dynamic
-candidate computation is compatible with non-prefix completion
-styles like `substring' or `orderless', which pass the empty
-string as first argument to the completion table."
-  (let ((beg (copy-marker beg))
-        (end (copy-marker end t))
-        valid table)
-    (lambda (str pred action)
-      ;; Bail out early for `metadata' and `boundaries'. This is a pointless
-      ;; move because of caching, but we do it anyway in the hope that the
-      ;; profiler report looks less confusing, since the weight of the expensive
-      ;; FUN computation is moved to the `all-completions' action.  Computing
-      ;; `all-completions' must surely be most expensive, so nobody will suspect
-      ;; a thing.
-      (unless (or (eq action 'metadata) (eq (car-safe action) 'boundaries))
-        (let ((input (buffer-substring-no-properties beg end)))
-          (unless (and valid
-                       (or (cape--separator-p input)
-                           (funcall valid input)))
-            (let* (;; Reset in case `all-completions' is used inside FUN
-                   completion-ignore-case completion-regexp-list
-                   ;; Retrieve new state by calling FUN
-                   (new (funcall fun input))
-                   ;; No interrupt during state update
-                   throw-on-input)
-              (setq valid (car new) table (cdr new)))))
-        (complete-with-action action table str pred)))))
-
-;;;; Capfs
-
-;;;;; cape-history
-
-(declare-function ring-elements "ring")
-(declare-function eshell-bol "eshell")
-(declare-function comint-bol "comint")
-(defvar eshell-history-ring)
-(defvar comint-input-ring)
-
-(defvar cape--history-properties
-  (list :company-kind (lambda (_) 'text)
-        :exclusive 'no)
-  "Completion extra properties for `cape-history'.")
-
-;;;###autoload
-(defun cape-history (&optional interactive)
-  "Complete from Eshell, Comint or minibuffer history.
-See also `consult-history' for a more flexible variant based on
-`completing-read'.  If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      (cape-interactive #'cape-history)
-    (let (history bol)
-      (cond
-       ((derived-mode-p 'eshell-mode)
-        (setq history eshell-history-ring
-              bol (save-excursion (eshell-bol) (point))))
-       ((derived-mode-p 'comint-mode)
-        (setq history comint-input-ring
-              bol (save-excursion (comint-bol) (point))))
-       ((and (minibufferp) (not (eq minibuffer-history-variable t)))
-        (setq history (symbol-value minibuffer-history-variable)
-              bol (line-beginning-position))))
-      (when (ring-p history)
-        (setq history (ring-elements history)))
-      (when history
-        `(,bol ,(point)
-          ,(cape--properties-table history :sort nil)
-          ,@cape--history-properties)))))
-
-;;;;; cape-file
-
-(defvar comint-unquote-function)
-(defvar comint-requote-function)
-
-(defvar cape--file-properties
-  (list :annotation-function (lambda (s) (if (string-suffix-p "/" s) " Dir" " File"))
-        :company-kind (lambda (s) (if (string-suffix-p "/" s) 'folder 'file))
-        :exclusive 'no)
-  "Completion extra properties for `cape-file'.")
-
-;;;###autoload
-(defun cape-file (&optional interactive)
-  "Complete file name at point.
-See the user option `cape-file-directory-must-exist'.
-If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      (cape-interactive '(cape-file-directory-must-exist) #'cape-file)
-    (pcase-let* ((default-directory (pcase cape-file-directory
-                                      ('nil default-directory)
-                                      ((pred stringp) cape-file-directory)
-                                      (_ (funcall cape-file-directory))))
-                 (prefix (and cape-file-prefix
-                              (looking-back
-                               (concat
-                                (regexp-opt (ensure-list cape-file-prefix) t)
-                                "[^ \n\t]*")
-                               (pos-bol))
-                              (match-end 1)))
-                 (`(,beg . ,end) (if prefix
-                                     (cons prefix (point))
-                                   (cape--bounds 'filename)))
-                 (non-essential t)
-                 (file (buffer-substring-no-properties beg end)))
-      (when (or prefix
-                (not cape-file-directory-must-exist)
-                (and (string-search "/" file)
-                     (file-exists-p (file-name-directory file))))
-        `(,beg ,end
-          ,(cape--nonessential-table
-            (if (or (derived-mode-p 'comint-mode) (derived-mode-p 'eshell-mode))
-                (completion-table-with-quoting
-                 #'read-file-name-internal
-                 comint-unquote-function
-                 comint-requote-function)
-              #'read-file-name-internal))
-          ,@(when (or prefix (string-match-p "./" file))
-              '(:company-prefix-length t))
-          ,@cape--file-properties)))))
-
-;;;;; cape-elisp-symbol
-
-(defvar cape--symbol-properties
-  (append
-   (list :annotation-function #'cape--symbol-annotation
-         :exit-function #'cape--symbol-exit
-         :predicate #'cape--symbol-predicate
-         :exclusive 'no)
-   (when (eval-when-compile (>= emacs-major-version 28))
-     (autoload 'elisp--company-kind "elisp-mode")
-     (autoload 'elisp--company-doc-buffer "elisp-mode")
-     (autoload 'elisp--company-doc-string "elisp-mode")
-     (autoload 'elisp--company-location "elisp-mode")
-     (list :company-kind 'elisp--company-kind
-           :company-doc-buffer 'elisp--company-doc-buffer
-           :company-docsig 'elisp--company-doc-string
-           :company-location 'elisp--company-location)))
-  "Completion extra properties for `cape-elisp-symbol'.")
-
-(defun cape--symbol-predicate (sym)
-  "Return t if SYM is bound, fbound or propertized."
-  (or (fboundp sym) (boundp sym) (symbol-plist sym)))
-
-(defun cape--symbol-exit (name status)
-  "Wrap symbol NAME with `cape-elisp-symbol-wrapper' buffers.
-STATUS is the exit status."
-  (when-let (((not (eq status 'exact)))
-             (c (cl-loop for (m . c) in cape-elisp-symbol-wrapper
-                         if (derived-mode-p m) return c)))
-    (save-excursion
-      (backward-char (length name))
-      (insert (car c)))
-    (insert (cadr c))))
-
-(defun cape--symbol-annotation (sym)
-  "Return kind of SYM."
-  (setq sym (intern-soft sym))
-  (cond
-   ((special-form-p sym) " Special")
-   ((macrop sym) " Macro")
-   ((commandp sym) " Command")
-   ((fboundp sym) " Function")
-   ((custom-variable-p sym) " Custom")
-   ((boundp sym) " Variable")
-   ((featurep sym) " Feature")
-   ((facep sym) " Face")
-   (t " Symbol")))
-
-;;;###autoload
-(defun cape-elisp-symbol (&optional interactive)
-  "Complete Elisp symbol at point.
-If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      ;; No cycling since it breaks the :exit-function.
-      (let (completion-cycle-threshold)
-        (cape-interactive #'cape-elisp-symbol))
-    (pcase-let ((`(,beg . ,end) (cape--bounds 'symbol)))
-      (when (eq (char-after beg) ?')
-        (setq beg (1+ beg) end (max beg end)))
-      `(,beg ,end
-        ,(cape--properties-table obarray :category 'symbol)
-        ,@cape--symbol-properties))))
-
-;;;;; cape-elisp-block
-
-(declare-function org-element-context "org-element")
-(declare-function markdown-code-block-lang "ext:markdown-mode")
-
-(defun cape--inside-block-p (&rest langs)
-  "Return non-nil if inside LANGS code block."
-  (when-let ((face (get-text-property (point) 'face))
-             (lang (or (and (if (listp face)
-                                (memq 'org-block face)
-                              (eq 'org-block face))
-                            (plist-get (cadr (org-element-context)) :language))
-                       (and (if (listp face)
-                                (memq 'markdown-code-face face)
-                              (eq 'markdown-code-face face))
-                            (save-excursion
-                              (markdown-code-block-lang))))))
-    (member lang langs)))
-
-;;;###autoload
-(defun cape-elisp-block (&optional interactive)
-  "Complete Elisp in Org or Markdown code block.
-This Capf is particularly useful for literate Emacs configurations.
-If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (cond
-   (interactive
-    ;; No code block check. Always complete Elisp when command was
-    ;; explicitly invoked interactively.
-    (cape-interactive #'elisp-completion-at-point))
-   ((cape--inside-block-p "elisp" "emacs-lisp")
-    (elisp-completion-at-point))))
-
-;;;;; cape-dabbrev
-
-(defvar cape--dabbrev-properties
-  (list :annotation-function (lambda (_) " Dabbrev")
-        :company-kind (lambda (_) 'text)
-        :exclusive 'no)
-  "Completion extra properties for `cape-dabbrev'.")
-
-(defvar dabbrev-case-replace)
-(defvar dabbrev-case-fold-search)
-(defvar dabbrev-abbrev-char-regexp)
-(defvar dabbrev-abbrev-skip-leading-regexp)
-(declare-function dabbrev--find-all-expansions "dabbrev")
-(declare-function dabbrev--reset-global-variables "dabbrev")
-
-(defun cape--dabbrev-list (input)
-  "Find all Dabbrev expansions for INPUT."
-  (cape--silent
-    (dlet ((dabbrev-check-other-buffers
-            (and cape-dabbrev-check-other-buffers
-                 (not (functionp cape-dabbrev-check-other-buffers))))
-           (dabbrev-check-all-buffers
-            (eq cape-dabbrev-check-other-buffers t))
-           (dabbrev-search-these-buffers-only
-            (and (functionp cape-dabbrev-check-other-buffers)
-                 (funcall cape-dabbrev-check-other-buffers))))
-      (dabbrev--reset-global-variables)
-      (cons
-       (apply-partially #'string-prefix-p input)
-       (cl-loop with min-len = (+ cape-dabbrev-min-length (length input))
-                with ic = (cape--case-fold-p dabbrev-case-fold-search)
-                for w in (dabbrev--find-all-expansions input ic)
-                if (>= (length w) min-len) collect
-                (cape--case-replace (and ic dabbrev-case-replace) input w))))))
-
-(defun cape--dabbrev-bounds ()
-  "Return bounds of abbreviation."
-  (unless (boundp 'dabbrev-abbrev-char-regexp)
-    (require 'dabbrev))
-  (let ((re (or dabbrev-abbrev-char-regexp "\\sw\\|\\s_"))
-        (limit (minibuffer-prompt-end)))
-    (when (or (looking-at re)
-              (and (> (point) limit)
-                   (save-excursion (forward-char -1) (looking-at re))))
-      (cons (save-excursion
-              (while (and (> (point) limit)
-                          (save-excursion (forward-char -1) (looking-at re)))
-                (forward-char -1))
-              (when dabbrev-abbrev-skip-leading-regexp
-                (while (looking-at dabbrev-abbrev-skip-leading-regexp)
-                  (forward-char 1)))
-              (point))
-            (save-excursion
-              (while (looking-at re)
-                (forward-char 1))
-              (point))))))
-
-;;;###autoload
-(defun cape-dabbrev (&optional interactive)
-  "Complete with Dabbrev at point.
-
-If INTERACTIVE is nil the function acts like a Capf.  In case you
-observe a performance issue with auto-completion and `cape-dabbrev'
-it is strongly recommended to disable scanning in other buffers.
-See the user options `cape-dabbrev-min-length' and
-`cape-dabbrev-check-other-buffers'."
-  (interactive (list t))
-  (if interactive
-      (cape-interactive '((cape-dabbrev-min-length 0)) #'cape-dabbrev)
-    (when-let ((bounds (cape--dabbrev-bounds)))
-      `(,(car bounds) ,(cdr bounds)
-        ,(cape--properties-table
-          (completion-table-case-fold
-           (cape--dynamic-table (car bounds) (cdr bounds) #'cape--dabbrev-list)
-           (not (cape--case-fold-p dabbrev-case-fold-search)))
-          :category 'cape-dabbrev)
-        ,@cape--dabbrev-properties))))
-
-;;;;; cape-dict
-
-(defvar cape--dict-properties
-  (list :annotation-function (lambda (_) " Dict")
-        :company-kind (lambda (_) 'text)
-        :exclusive 'no)
-  "Completion extra properties for `cape-dict'.")
-
-(defun cape--dict-list (input)
-  "Return all words from `cape-dict-file' matching INPUT."
-  (unless (equal input "")
-     (let* ((inhibit-message t)
-            (message-log-max nil)
-            (default-directory
-             (if (and (not (file-remote-p default-directory))
-                      (file-directory-p default-directory))
-                 default-directory
-               user-emacs-directory))
-            (files (mapcar #'expand-file-name
-                           (ensure-list
-                            (if (functionp cape-dict-file)
-                                (funcall cape-dict-file)
-                              cape-dict-file))))
-            (words
-             (apply #'process-lines-ignore-status
-                    "grep"
-                    (concat "-Fh"
-                            (and (cape--case-fold-p cape-dict-case-fold) "i")
-                            (and cape-dict-limit (format "m%d" cape-dict-limit)))
-                    input files)))
-       (cons
-        (apply-partially
-          (if (and cape-dict-limit (length= words cape-dict-limit))
-             #'equal #'string-search)
-         input)
-        (cape--case-replace-list cape-dict-case-replace input words)))))
-
-;;;###autoload
-(defun cape-dict (&optional interactive)
-  "Complete word from dictionary at point.
-This completion function works best if the dictionary is sorted
-by frequency.  See the custom option `cape-dict-file'.  If
-INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      (cape-interactive #'cape-dict)
-    (pcase-let ((`(,beg . ,end) (cape--bounds 'word)))
-      `(,beg ,end
-        ,(cape--properties-table
-          (completion-table-case-fold
-           (cape--dynamic-table beg end #'cape--dict-list)
-           (not (cape--case-fold-p cape-dict-case-fold)))
-          :sort nil ;; Presorted word list (by frequency)
-          :category 'cape-dict)
-        ,@cape--dict-properties))))
-
-;;;;; cape-abbrev
-
-(defun cape--abbrev-tables ()
-  "Return list of all active abbrev tables, including parents."
-  ;; Emacs 28: See abbrev--suggest-get-active-tables-including-parents.
-  (let ((tables (abbrev--active-tables)))
-    (append tables (cl-loop for table in tables
-                            append (abbrev-table-get table :parents)))))
-
-(defun cape--abbrev-list ()
-  "Abbreviation list."
-  (delete "" (cl-loop for table in (cape--abbrev-tables)
-                      nconc (all-completions "" table))))
-
-(defun cape--abbrev-annotation (abbrev)
-  "Annotate ABBREV with expansion."
-  (concat " "
-          (truncate-string-to-width
-           (format
-            "%s"
-            (symbol-value
-             (cl-loop for table in (cape--abbrev-tables)
-                      thereis (abbrev--symbol abbrev table))))
-           30 0 nil t)))
-
-(defun cape--abbrev-exit (_str status)
-  "Expand expansion if STATUS is not exact."
-  (unless (eq status 'exact)
-    (expand-abbrev)))
-
-(defvar cape--abbrev-properties
-  (list :annotation-function #'cape--abbrev-annotation
-        :exit-function #'cape--abbrev-exit
-        :company-kind (lambda (_) 'snippet)
-        :exclusive 'no)
-  "Completion extra properties for `cape-abbrev'.")
-
-;;;###autoload
-(defun cape-abbrev (&optional interactive)
-  "Complete abbreviation at point.
-If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      ;; No cycling since it breaks the :exit-function.
-      (let (completion-cycle-threshold)
-        (cape-interactive #'cape-abbrev))
-    (when-let (abbrevs (cape--abbrev-list))
-      (let ((bounds (cape--bounds 'symbol)))
-        `(,(car bounds) ,(cdr bounds)
-          ,(cape--properties-table abbrevs :category 'cape-abbrev)
-          ,@cape--abbrev-properties)))))
-
-;;;;; cape-line
-
-(defvar cape--line-properties nil
-  "Completion extra properties for `cape-line'.")
-
-(defun cape--buffers-major-mode ()
-  "Return buffers with same major mode as current buffer."
-  (cl-loop for buf in (buffer-list)
-           if (eq major-mode (buffer-local-value 'major-mode buf))
-           collect buf))
-
-(defun cape--line-list ()
-  "Return all lines from buffer."
-  (let ((ht (make-hash-table :test #'equal))
-        (curr-buf (current-buffer))
-        (buffers (funcall cape-line-buffer-function))
-        lines)
-    (dolist (buf (ensure-list buffers))
-      (with-current-buffer buf
-        (let ((beg (point-min))
-              (max (point-max))
-              (pt (if (eq curr-buf buf) (point) -1))
-              end)
-          (save-excursion
-            (while (< beg max)
-              (goto-char beg)
-              (setq end (pos-eol))
-              (unless (<= beg pt end)
-                (let ((line (buffer-substring-no-properties beg end)))
-                  (unless (or (string-blank-p line) (gethash line ht))
-                    (puthash line t ht)
-                    (push line lines))))
-              (setq beg (1+ end)))))))
-    (nreverse lines)))
-
-;;;###autoload
-(defun cape-line (&optional interactive)
-  "Complete current line from other lines.
-The buffers returned by `cape-line-buffer-function' are scanned for lines.
-If INTERACTIVE is nil the function acts like a Capf."
-  (interactive (list t))
-  (if interactive
-      (cape-interactive #'cape-line)
-    `(,(pos-bol) ,(point)
-      ,(cape--properties-table (cape--line-list) :sort nil)
-      ,@cape--line-properties)))
-
-;;;; Capf combinators
-
-(defun cape--company-call (&rest app)
-  "Apply APP and handle future return values."
-  ;; Backends are non-interruptible. Disable interrupts!
-  (let ((toi throw-on-input)
-        (throw-on-input nil))
-    (pcase (apply app)
-      ;; Handle async future return values.
-      (`(:async . ,fetch)
-       (let ((res 'cape--waiting))
-         (if toi
-             (unwind-protect
-                 (progn
-                   (funcall fetch
-                            (lambda (arg)
-                              (when (eq res 'cape--waiting)
-                                (push 'cape--done unread-command-events)
-                                (setq res arg))))
-                   (when (eq res 'cape--waiting)
-                     (let ((ev (let ((input-method-function nil)
-                                     (echo-keystrokes 0))
-                                 (read-event nil t))))
-                       (unless (eq ev 'cape--done)
-                         (push (cons t ev) unread-command-events)
-                         (setq res 'cape--cancelled)
-                         (throw toi t)))))
-               (setq unread-command-events
-                     (delq 'cape--done unread-command-events)))
-           (funcall fetch (lambda (arg) (setq res arg)))
-           ;; Force synchronization, not interruptible! We use polling
-           ;; here and ignore pending input since we don't use
-           ;; `sit-for'. This is the same method used by Company itself.
-           (while (eq res 'cape--waiting)
-             (sleep-for 0.01)))
-         res))
-      ;; Plain old synchronous return value.
-      (res res))))
-
-(defvar-local cape--company-init nil)
-
-;;;###autoload
-(defun cape-company-to-capf (backend &optional valid)
-  "Convert Company BACKEND function to Capf.
-VALID is a function taking the old and new input string.  It
-should return nil if the cached candidates became invalid.  The
-default value for VALID is `string-prefix-p' such that the
-candidates are only fetched again if the input prefix
-changed.  The function `cape-company-to-capf' is experimental."
-  (lambda ()
-    (when (and (symbolp backend) (not (fboundp backend)))
-      (ignore-errors (require backend nil t)))
-    (when (and (symbolp backend) (not (alist-get backend cape--company-init)))
-      (funcall backend 'init)
-      (put backend 'company-init t)
-      (setf (alist-get backend cape--company-init) t))
-    (when-let ((prefix (cape--company-call backend 'prefix))
-               (initial-input (if (stringp prefix) prefix (car-safe prefix))))
-      (let* ((end (point)) (beg (- end (length initial-input)))
-             (valid (if (cape--company-call backend 'no-cache initial-input)
-                        #'equal (or valid #'string-prefix-p)))
-             restore-props)
-        (list beg end
-              (funcall
-               (if (cape--company-call backend 'ignore-case)
-                   #'completion-table-case-fold
-                 #'identity)
-               (cape--properties-table
-                (cape--dynamic-table
-                 beg end
-                 (lambda (input)
-                   (let ((cands (cape--company-call backend 'candidates input)))
-                     ;; The candidate string including text properties should be
-                     ;; restored in the :exit-function, if the UI does not
-                     ;; guarantee this itself.  Restoration is not necessary for
-                     ;; Corfu since the introduction of `corfu--exit-function'.
-                     (unless (and (bound-and-true-p corfu-mode) (fboundp 'corfu--exit-function))
-                       (setq restore-props cands))
-                     (cons (apply-partially valid input) cands))))
-                :category backend
-                :sort (not (cape--company-call backend 'sorted))))
-              :exclusive 'no
-              :company-prefix-length (cdr-safe prefix)
-              :company-doc-buffer (lambda (x) (cape--company-call backend 'doc-buffer x))
-              :company-location (lambda (x) (cape--company-call backend 'location x))
-              :company-docsig (lambda (x) (cape--company-call backend 'meta x))
-              :company-deprecated (lambda (x) (cape--company-call backend 'deprecated x))
-              :company-kind (lambda (x) (cape--company-call backend 'kind x))
-              :annotation-function (lambda (x)
-                                     (when-let (ann (cape--company-call backend 'annotation x))
-                                       (concat " " (string-trim ann))))
-              :exit-function (lambda (x _status)
-                               ;; Restore the candidate string including
-                               ;; properties if restore-props is non-nil.  See
-                               ;; the comment above.
-                               (setq x (or (car (member x restore-props)) x))
-                               (cape--company-call backend 'post-completion x)))))))
-
-;;;###autoload
-(defun cape-interactive (&rest capfs)
-  "Complete interactively with the given CAPFS."
-  (let* ((ctx (and (consp (car capfs)) (car capfs)))
-         (capfs (if ctx (cdr capfs) capfs))
-         (completion-at-point-functions
-          (if ctx
-              (mapcar (lambda (f) `(lambda () (let ,ctx (funcall ',f)))) capfs)
-            capfs)))
-    (unless (completion-at-point)
-      (user-error "%s: No completions"
-                  (mapconcat (lambda (fun)
-                               (if (symbolp fun)
-                                   (symbol-name fun)
-                                 "anonymous-capf"))
-                             capfs ", ")))))
-
-;;;###autoload
-(defun cape-capf-interactive (capf)
-  "Create interactive completion function from CAPF."
-  (lambda (&optional interactive)
-    (interactive (list t))
-    (if interactive (cape-interactive capf) (funcall capf))))
-
-;;;###autoload
-(defun cape-wrap-super (&rest capfs)
-  "Call CAPFS and return merged completion result.
-The CAPFS list can contain the keyword `:with' to mark the Capfs
-afterwards as auxiliary One of the non-auxiliary Capfs before
-`:with' must return non-nil for the super Capf to set in and
-return a non-nil result.  Such behavior is useful when listing
-multiple super Capfs in the `completion-at-point-functions':
-
-  (setq completion-at-point-functions
-        (list (cape-capf-super \\='eglot-completion-at-point
-                               :with \\='tempel-complete)
-              (cape-capf-super \\='cape-dabbrev
-                               :with \\='tempel-complete)))
-
-The functions `cape-wrap-super' and `cape-capf-super' are
-experimental."
-  (when-let ((results (cl-loop for capf in capfs until (eq capf :with)
-                               for res = (funcall capf)
-                               if res collect (cons t res))))
-    (pcase-let* ((results (nconc results
-                                 (cl-loop for capf in (cdr (memq :with capfs))
-                                          for res = (funcall capf)
-                                          if res collect (cons nil res))))
-                 (`((,_main ,beg ,end . ,_)) results)
-                 (cand-ht nil)
-                 (tables nil)
-                 (exclusive nil)
-                 (prefix-len nil)
-                 (cand-functions
-                  '(:company-docsig :company-location :company-kind
-                    :company-doc-buffer :company-deprecated
-                    :annotation-function :exit-function)))
-      (cl-loop for (main beg2 end2 table . plist) in results do
-               ;; TODO `cape-capf-super' currently cannot merge Capfs which
-               ;; trigger at different beginning positions.  In order to support
-               ;; this, take the smallest BEG value and then normalize all
-               ;; candidates by prefixing them such that they all start at the
-               ;; smallest BEG position.
-               (when (= beg beg2)
-                 (push (list main (plist-get plist :predicate) table
-                             ;; Plist attached to the candidates
-                             (mapcan (lambda (f)
-                                       (when-let ((v (plist-get plist f)))
-                                         (list f v)))
-                                     cand-functions))
-                       tables)
-                 ;; The resulting merged Capf is exclusive if one of the main
-                 ;; Capfs is exclusive.
-                 (when (and main (not (eq (plist-get plist :exclusive) 'no)))
-                   (setq exclusive t))
-                 (setq end (max end end2))
-                 (let ((plen (plist-get plist :company-prefix-length)))
-                   (cond
-                    ((eq plen t)
-                     (setq prefix-len t))
-                    ((and (not prefix-len) (integerp plen))
-                     (setq prefix-len plen))
-                    ((and (integerp prefix-len) (integerp plen))
-                     (setq prefix-len (max prefix-len plen)))))))
-      (setq tables (nreverse tables))
-      `(,beg ,end
-        ,(lambda (str pred action)
-           (pcase action
-             (`(boundaries . ,_) nil)
-             ('metadata
-              '(metadata (category . cape-super)
-                         (display-sort-function . identity)
-                         (cycle-sort-function . identity)))
-             ('t ;; all-completions
-              (let ((ht (make-hash-table :test #'equal))
-                    (candidates nil))
-                (cl-loop for (main table-pred table cand-plist) in tables do
-                         (let* ((pr (if (and table-pred pred)
-                                        (lambda (x) (and (funcall table-pred x) (funcall pred x)))
-                                      (or table-pred pred)))
-                                (md (completion-metadata "" table pr))
-                                (sort (or (completion-metadata-get md 'display-sort-function)
-                                          #'identity))
-                                ;; Always compute candidates of the main Capf
-                                ;; tables, which come first in the tables
-                                ;; list. For the :with Capfs only compute
-                                ;; candidates if we've already determined that
-                                ;; main candidates are available.
-                                (cands (when (or main (or exclusive cand-ht candidates))
-                                         (funcall sort (all-completions str table pr)))))
-                           ;; Handle duplicates with a hash table.
-                           (cl-loop
-                            for cand in-ref cands
-                            for dup = (gethash cand ht t) do
-                            (cond
-                             ((eq dup t)
-                              ;; Candidate does not yet exist.
-                              (puthash cand cand-plist ht))
-                             ((not (equal dup cand-plist))
-                              ;; Duplicate candidate. Candidate plist is
-                              ;; different, therefore disambiguate the
-                              ;; candidates.
-                              (setf cand (propertize cand 'cape-capf-super
-                                                     (cons cand cand-plist))))))
-                           (when cands (push cands candidates))))
-                (when (or cand-ht candidates)
-                  (setq candidates (apply #'nconc (nreverse candidates))
-                        cand-ht ht)
-                  candidates)))
-             (_ ;; try-completion and test-completion
-              (cl-loop for (_main table-pred table _cand-plist) in tables thereis
-                       (complete-with-action
-                        action table str
-                        (if (and table-pred pred)
-                            (lambda (x) (and (funcall table-pred x) (funcall pred x)))
-                          (or table-pred pred)))))))
-        :company-prefix-length ,prefix-len
-        ,@(and (not exclusive) '(:exclusive no))
-        ,@(mapcan
-           (lambda (prop)
-             (list prop (lambda (cand &rest args)
-                          (let ((ref (get-text-property 0 'cape-capf-super cand)))
-                            (when-let ((fun (plist-get
-                                             (or (cdr ref)
-                                                 (and cand-ht (gethash cand cand-ht)))
-                                             prop)))
-                              (apply fun (or (car ref) cand) args))))))
-           cand-functions)))))
-
-;;;###autoload
-(defun cape-wrap-debug (capf &optional name)
-  "Call CAPF and return a completion table which prints trace messages.
-If CAPF is an anonymous lambda, pass the Capf NAME explicitly for
-meaningful debugging output."
-  (unless name
-    (setq name (if (symbolp capf) capf "capf")))
-  (setq name (format "%s@%s" name (cl-incf cape--debug-id)))
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     (let* ((limit (1+ cape--debug-length))
-            (pred (plist-get plist :predicate))
-            (cands
-             ;; Reset regexps for `all-completions'
-             (let (completion-ignore-case completion-regexp-list)
-               (all-completions
-                "" table
-                (lambda (&rest args)
-                  (and (or (not pred) (apply pred args)) (>= (cl-decf limit) 0))))))
-            (plist-str "")
-            (plist-elt plist))
-       (while (cdr plist-elt)
-         (setq plist-str (format "%s %s=%s" plist-str
-                                 (substring (symbol-name (car plist-elt)) 1)
-                                 (cape--debug-print (cadr plist-elt)))
-               plist-elt (cddr plist-elt)))
-       (cape--debug-message
-        "%s => input=%s:%s:%S table=%s%s"
-        name (+ beg 0) (+ end 0) (buffer-substring-no-properties beg end)
-        (cape--debug-print cands)
-        plist-str))
-     `(,beg ,end ,(cape--debug-table
-                   table name (copy-marker beg) (copy-marker end t))
-       ,@(when-let ((exit (plist-get plist :exit-function)))
-           (list :exit-function
-                 (lambda (cand status)
-                   (cape--debug-message "%s:exit(candidate=%S status=%s)"
-                                        name cand status)
-                   (funcall exit cand status))))
-       . ,plist))
-    (result
-     (cape--debug-message "%s() => %s (No completion)"
-                          name (cape--debug-print result)))))
-
-;;;###autoload
-(defun cape-wrap-buster (capf &optional valid)
-  "Call CAPF and return a completion table with cache busting.
-This function can be used as an advice around an existing Capf.
-The cache is busted when the input changes.  The argument VALID
-can be a function taking the old and new input string.  It should
-return nil if the new input requires that the completion table is
-refreshed.  The default value for VALID is `equal', such that the
-completion table is refreshed on every input change."
-  (setq valid (or valid #'equal))
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     (setq plist `(:cape--buster t . ,plist))
-     `(,beg ,end
-       ,(let* ((beg (copy-marker beg))
-               (end (copy-marker end t))
-               (input (buffer-substring-no-properties beg end)))
-          (lambda (str pred action)
-            (let ((new-input (buffer-substring-no-properties beg end)))
-              (unless (or (not (eq action t))
-                          (cape--separator-p new-input)
-                          (funcall valid input new-input))
-                (pcase
-                    ;; Reset in case `all-completions' is used inside CAPF
-                    (let (completion-ignore-case completion-regexp-list)
-                      (funcall capf))
-                  ((and `(,new-beg ,new-end ,new-table . ,new-plist)
-                        (guard (and (= beg new-beg) (= end new-end))))
-                   (let (throw-on-input) ;; No interrupt during state update
-                     (setf table new-table
-                           input new-input
-                           (cddr plist) new-plist))))))
-            (complete-with-action action table str pred)))
-       ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-passthrough (capf)
-  "Call CAPF and make sure that no completion style filtering takes place."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,(cape--passthrough-table table) ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-properties (capf &rest properties)
-  "Call CAPF and add additional completion PROPERTIES.
-Completion properties include for example :exclusive, :annotation-function and
-the various :company-* extensions.  Furthermore a boolean :sort flag and a
-completion :category symbol can be specified."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end
-            ,(apply #'cape--properties-table table properties)
-            ,@properties ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-nonexclusive (capf)
-  "Call CAPF and ensure that it is marked as non-exclusive.
-This function can be used as an advice around an existing Capf."
-  (cape-wrap-properties capf :exclusive 'no))
-
-;;;###autoload
-(defun cape-wrap-predicate (capf predicate)
-  "Call CAPF and add an additional candidate PREDICATE.
-The PREDICATE is passed the candidate symbol or string."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,table
-            :predicate
-            ,(if-let (pred (plist-get plist :predicate))
-                 ;; First argument is key, second is value for hash tables.
-                 ;; The first argument can be a cons cell for alists. Then
-                 ;; the candidate itself is either a string or a symbol. We
-                 ;; normalize the calling convention here such that PREDICATE
-                 ;; always receives a string or a symbol.
-                 (lambda (&rest args)
-                   (when (apply pred args)
-                     (setq args (car args))
-                     (funcall predicate (if (consp args) (car args) args))))
-               (lambda (key &optional _val)
-                 (funcall predicate (if (consp key) (car key) key))))
-            ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-silent (capf)
-  "Call CAPF and silence it (no messages, no errors).
-This function can be used as an advice around an existing Capf."
-  (pcase (cape--silent (funcall capf))
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,(cape--silent-table table) ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-case-fold (capf &optional dont-fold)
-  "Call CAPF and return a case-insensitive completion table.
-If DONT-FOLD is non-nil return a case sensitive table instead.
-This function can be used as an advice around an existing Capf."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,(completion-table-case-fold table dont-fold) ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-noninterruptible (capf)
-  "Call CAPF and return a non-interruptible completion table.
-This function can be used as an advice around an existing Capf."
-  (pcase (let (throw-on-input) (funcall capf))
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,(cape--noninterruptible-table table) ,@plist))))
-
-;;;###autoload
-(defun cape-wrap-prefix-length (capf length)
-  "Call CAPF and ensure that prefix length is greater or equal than LENGTH.
-If the prefix is long enough, enforce auto completion."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     (when (>= (- end beg) length)
-       `(,beg ,end ,table
-         :company-prefix-length t
-         ,@plist)))))
-
-;;;###autoload
-(defun cape-wrap-inside-faces (capf &rest faces)
-  "Call CAPF only if inside FACES.
-This function can be used as an advice around an existing Capf."
-  (when-let (((> (point) (point-min)))
-             (fs (get-text-property (1- (point)) 'face))
-             ((if (listp fs)
-                  (cl-loop for f in fs thereis (memq f faces))
-                (memq fs faces))))
-    (funcall capf)))
-
-;;;###autoload
-(defun cape-wrap-inside-code (capf)
-  "Call CAPF only if inside code, not inside a comment or string.
-This function can be used as an advice around an existing Capf."
-  (let ((s (syntax-ppss)))
-    (and (not (nth 3 s)) (not (nth 4 s)) (funcall capf))))
-
-;;;###autoload
-(defun cape-wrap-inside-comment (capf)
-  "Call CAPF only if inside comment.
-This function can be used as an advice around an existing Capf."
-  (and (nth 4 (syntax-ppss)) (funcall capf)))
-
-;;;###autoload
-(defun cape-wrap-inside-string (capf)
-  "Call CAPF only if inside string.
-This function can be used as an advice around an existing Capf."
-  (and (nth 3 (syntax-ppss)) (funcall capf)))
-
-;;;###autoload
-(defun cape-wrap-purify (capf)
-  "Call CAPF and ensure that it does not illegally modify the buffer.
-This function can be used as an advice around an existing
-Capf.  It has been introduced mainly to fix the broken
-`pcomplete-completions-at-point' function in Emacs versions < 29."
-  ;; bug#50470: Fix Capfs which illegally modify the buffer or which illegally
-  ;; call `completion-in-region'.  The workaround here was proposed by
-  ;; @jakanakaevangeli and is used in his capf-autosuggest package.  In Emacs 29
-  ;; the purity bug of Pcomplete has been fixed, such that make
-  ;; `cape-wrap-purify' is not necessary anymore.
-  (catch 'cape--illegal-completion-in-region
-    (condition-case nil
-        (let ((buffer-read-only t)
-              (inhibit-read-only nil)
-              (completion-in-region-function
-               (lambda (beg end coll pred)
-                 (throw 'cape--illegal-completion-in-region
-                        (list beg end coll :predicate pred)))))
-          (funcall capf))
-      (buffer-read-only nil))))
-
-;;;###autoload
-(defun cape-wrap-accept-all (capf)
-  "Call CAPF and return a completion table which accepts every input.
-This function can be used as an advice around an existing Capf."
-  (pcase (funcall capf)
-    (`(,beg ,end ,table . ,plist)
-     `(,beg ,end ,(cape--accept-all-table table) . ,plist))))
-
-;;;###autoload (autoload 'cape-capf-accept-all "cape")
-;;;###autoload (autoload 'cape-capf-buster "cape")
-;;;###autoload (autoload 'cape-capf-case-fold "cape")
-;;;###autoload (autoload 'cape-capf-debug "cape")
-;;;###autoload (autoload 'cape-capf-inside-code "cape")
-;;;###autoload (autoload 'cape-capf-inside-comment "cape")
-;;;###autoload (autoload 'cape-capf-inside-faces "cape")
-;;;###autoload (autoload 'cape-capf-inside-string "cape")
-;;;###autoload (autoload 'cape-capf-nonexclusive "cape")
-;;;###autoload (autoload 'cape-capf-noninterruptible "cape")
-;;;###autoload (autoload 'cape-capf-passthrough "cape")
-;;;###autoload (autoload 'cape-capf-predicate "cape")
-;;;###autoload (autoload 'cape-capf-prefix-length "cape")
-;;;###autoload (autoload 'cape-capf-properties "cape")
-;;;###autoload (autoload 'cape-capf-purify "cape")
-;;;###autoload (autoload 'cape-capf-silent "cape")
-;;;###autoload (autoload 'cape-capf-super "cape")
-
-(dolist (wrapper (list #'cape-wrap-accept-all #'cape-wrap-buster
-                       #'cape-wrap-case-fold #'cape-wrap-debug
-                       #'cape-wrap-inside-code #'cape-wrap-inside-comment
-                       #'cape-wrap-inside-faces #'cape-wrap-inside-string
-                       #'cape-wrap-nonexclusive #'cape-wrap-noninterruptible
-                       #'cape-wrap-passthrough #'cape-wrap-predicate
-                       #'cape-wrap-prefix-length #'cape-wrap-properties
-                       #'cape-wrap-purify #'cape-wrap-silent #'cape-wrap-super))
-  (let ((name (string-remove-prefix "cape-wrap-" (symbol-name wrapper))))
-    (defalias (intern (format "cape-capf-%s" name))
-      (lambda (capf &rest args) (lambda () (apply wrapper capf args)))
-      (format "Create a %s Capf from CAPF.
-The Capf calls `%s' with CAPF and ARGS as arguments." name wrapper))))
-
-(provide 'cape)
-;;; cape.el ends here
diff --git a/emacs/elpa/cape-20240411.2207/cape.elc b/emacs/elpa/cape-20240411.2207/cape.elc
Binary files differ.
diff --git a/emacs/elpa/cape-20240411.2207/cape-autoloads.el b/emacs/elpa/cape-20240517.2216/cape-autoloads.el
diff --git a/emacs/elpa/cape-20240411.2207/cape-char.el b/emacs/elpa/cape-20240517.2216/cape-char.el
diff --git a/emacs/elpa/cape-20240411.2207/cape-char.elc b/emacs/elpa/cape-20240517.2216/cape-char.elc
Binary files differ.
diff --git a/emacs/elpa/cape-20240411.2207/cape-keyword.el b/emacs/elpa/cape-20240517.2216/cape-keyword.el
diff --git a/emacs/elpa/cape-20240411.2207/cape-keyword.elc b/emacs/elpa/cape-20240517.2216/cape-keyword.elc
Binary files differ.
diff --git a/emacs/elpa/cape-20240517.2216/cape-pkg.el b/emacs/elpa/cape-20240517.2216/cape-pkg.el
@@ -0,0 +1,15 @@
+(define-package "cape" "20240517.2216" "Completion At Point Extensions"
+  '((emacs "27.1")
+    (compat "29.1.4.4"))
+  :commit "a71e5c96564163837810b96bd34322b42f6e4d9c" :authors
+  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
+  :maintainers
+  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
+  :maintainer
+  '("Daniel Mendler" . "mail@daniel-mendler.de")
+  :keywords
+  '("abbrev" "convenience" "matching" "completion" "text")
+  :url "https://github.com/minad/cape")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/cape-20240517.2216/cape.el b/emacs/elpa/cape-20240517.2216/cape.el
@@ -0,0 +1,1277 @@
+;;; cape.el --- Completion At Point Extensions -*- lexical-binding: t -*-
+
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
+
+;; Author: Daniel Mendler <mail@daniel-mendler.de>
+;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
+;; Created: 2021
+;; Version: 1.5
+;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4"))
+;; Homepage: https://github.com/minad/cape
+;; Keywords: abbrev, convenience, matching, completion, text
+
+;; 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:
+
+;; Let your completions fly! This package provides additional completion
+;; backends in the form of Capfs (completion-at-point-functions).
+;;
+;; `cape-abbrev': Complete abbreviation (add-global-abbrev, add-mode-abbrev).
+;; `cape-dabbrev': Complete word from current buffers.
+;; `cape-dict': Complete word from dictionary file.
+;; `cape-elisp-block': Complete Elisp in Org or Markdown code block.
+;; `cape-elisp-symbol': Complete Elisp symbol.
+;; `cape-emoji': Complete Emoji.
+;; `cape-file': Complete file name.
+;; `cape-history': Complete from Eshell, Comint or minibuffer history.
+;; `cape-keyword': Complete programming language keyword.
+;; `cape-line': Complete entire line from file.
+;; `cape-rfc1345': Complete Unicode char using RFC 1345 mnemonics.
+;; `cape-sgml': Complete Unicode char from SGML entity, e.g., &alpha.
+;; `cape-tex': Complete Unicode char from TeX command, e.g. \hbar.
+
+;;; Code:
+
+(require 'compat)
+(eval-when-compile
+  (require 'cl-lib)
+  (require 'subr-x))
+
+;;;; Customization
+
+(defgroup cape nil
+  "Completion At Point Extensions."
+  :link '(info-link :tag "Info Manual" "(cape)")
+  :link '(url-link :tag "Homepage" "https://github.com/minad/cape")
+  :link '(emacs-library-link :tag "Library Source" "cape.el")
+  :group 'convenience
+  :group 'tools
+  :group 'matching
+  :prefix "cape-")
+
+(defcustom cape-dict-limit 100
+  "Maximal number of completion candidates returned by `cape-dict'."
+  :type '(choice (const nil) natnum))
+
+(defcustom cape-dict-file "/usr/share/dict/words"
+  "Path to dictionary word list file.
+This variable can also be a list of paths or
+a function returning a single or more paths."
+  :type '(choice string (repeat string) function))
+
+(defcustom cape-dict-case-replace 'case-replace
+  "Preserve case of input.
+See `dabbrev-case-replace' for details."
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "use `case-replace'" case-replace)
+                 (other :tag "on" t)))
+
+(defcustom cape-dict-case-fold 'case-fold-search
+  "Case fold search during search.
+See `dabbrev-case-fold-search' for details."
+  :type '(choice (const :tag "off" nil)
+                 (const :tag "use `case-fold-search'" case-fold-search)
+                 (other :tag "on" t)))
+
+(defcustom cape-dabbrev-min-length 4
+  "Minimum length of Dabbrev expansions.
+This setting ensures that words which are too short
+are not offered as completion candidates, such that
+auto completion does not pop up too aggressively."
+  :type 'natnum)
+
+(defcustom cape-dabbrev-check-other-buffers t
+  "Buffers to check for Dabbrev.
+
+If t, check all other buffers, subject to Dabbrev ignore rules.
+If a function, only search the buffers returned by this function.
+Any other non-nil value only checks some other buffers, as per
+`dabbrev-select-buffers-function'."
+  :type `(choice (const :tag "off" nil)
+                 (const :tag "same-mode buffers" ,#'cape--buffers-major-mode)
+                 (function :tag "function")
+                 (const :tag "some" some)
+                 (other :tag "all" t)))
+
+(defcustom cape-file-directory nil
+  "Base directory used by `cape-file."
+  :type '(choice (const nil) string function))
+
+(defcustom cape-file-prefix "file:"
+  "File completion trigger prefixes.
+The value can be a string or a list of strings.  The default
+`file:' is the prefix of Org file links which work in arbitrary
+buffers via `org-open-at-point-global'."
+  :type '(choice string (repeat string)))
+
+(defcustom cape-file-directory-must-exist t
+  "The parent directory must exist for file completion."
+  :type 'boolean)
+
+(defcustom cape-line-buffer-function #'cape--buffers-major-mode
+  "Function which returns list of buffers.
+The buffers are scanned for completion candidates by `cape-line'."
+  :type '(choice (const :tag "Current buffer" current-buffer)
+                 (const :tag "All buffers" buffer-list)
+                 (const :tag "Buffers with same major mode" cape--buffers-major-mode)
+                 (function :tag "Custom function")))
+
+(defcustom cape-elisp-symbol-wrapper
+  '((org-mode ?~ ?~)
+    (markdown-mode ?` ?`)
+    (rst-mode "``" "``")
+    (log-edit-mode "`" "'")
+    (change-log-mode "`" "'")
+    (message-mode "`" "'")
+    (rcirc-mode "`" "'"))
+  "Wrapper characters for symbols."
+  :type '(alist :key-type symbol :value-type (list (choice character string)
+                                                   (choice character string))))
+
+;;;; Helpers
+
+(defun cape--case-fold-p (fold)
+  "Return non-nil if case folding is enabled for FOLD."
+  (if (eq fold 'case-fold-search) case-fold-search fold))
+
+(defun cape--case-replace-list (flag input strs)
+  "Replace case of STRS depending on INPUT and FLAG."
+  (if (and (if (eq flag 'case-replace) case-replace flag)
+           (let (case-fold-search) (string-match-p "\\`[[:upper:]]" input)))
+      (mapcar (apply-partially #'cape--case-replace flag input) strs)
+    strs))
+
+(defun cape--case-replace (flag input str)
+  "Replace case of STR depending on INPUT and FLAG."
+  (or (and (if (eq flag 'case-replace) case-replace flag)
+           (string-prefix-p input str t)
+           (let (case-fold-search) (string-match-p "\\`[[:upper:]]" input))
+           (save-match-data
+             ;; Ensure that single character uppercase input does not lead to an
+             ;; all uppercase result.
+             (when (and (= (length input) 1) (> (length str) 1))
+               (setq input (concat input (substring str 1 2))))
+             (and (string-match input input)
+                  (replace-match str nil nil input))))
+      str))
+
+(defun cape--separator-p (str)
+  "Return non-nil if input STR has a separator character.
+Separator characters are used by completion styles like Orderless
+to split filter words.  In Corfu, the separator is configurable
+via the variable `corfu-separator'."
+  (string-search (string ;; Support `corfu-separator' and Orderless
+                  (or (and (bound-and-true-p corfu-mode)
+                           (bound-and-true-p corfu-separator))
+                      ?\s))
+                 str))
+
+(defmacro cape--silent (&rest body)
+  "Silence BODY."
+  (declare (indent 0))
+  `(cl-letf ((inhibit-message t)
+             (message-log-max nil)
+             ((symbol-function #'minibuffer-message) #'ignore))
+     (ignore-errors ,@body)))
+
+(defun cape--bounds (thing)
+  "Return bounds of THING."
+  (or (bounds-of-thing-at-point thing) (cons (point) (point))))
+
+(defmacro cape--wrapped-table (wrap body)
+  "Create wrapped completion table, handle `completion--unquote'.
+WRAP is the wrapper function.
+BODY is the wrapping expression."
+  (declare (indent 1))
+  `(lambda (str pred action)
+     (,@body
+      (let ((result (complete-with-action action table str pred)))
+        (when (and (eq action 'completion--unquote) (functionp (cadr result)))
+          (cl-callf ,wrap (cadr result)))
+        result))))
+
+(defun cape--accept-all-table (table)
+  "Create completion TABLE which accepts all input."
+  (cape--wrapped-table cape--accept-all-table
+    (or (eq action 'lambda))))
+
+(defun cape--passthrough-table (table)
+  "Create completion TABLE disabling any filtering."
+  (cape--wrapped-table cape--passthrough-table
+    (let (completion-ignore-case completion-regexp-list (_ (setq str ""))))))
+
+(defun cape--noninterruptible-table (table)
+  "Create non-interruptible completion TABLE."
+  (cape--wrapped-table cape--noninterruptible-table
+    (let (throw-on-input))))
+
+(defun cape--silent-table (table)
+  "Create a new completion TABLE which is silent (no messages, no errors)."
+  (cape--wrapped-table cape--silent-table
+    (cape--silent)))
+
+(defun cape--nonessential-table (table)
+  "Mark completion TABLE as `non-essential'."
+  (let ((dir default-directory))
+    (cape--wrapped-table cape--nonessential-table
+      (let ((default-directory dir)
+            (non-essential t))))))
+
+(defvar cape--debug-length 5
+  "Length of printed lists in `cape--debug-print'.")
+
+(defvar cape--debug-id 0
+  "Completion table identifier.")
+
+(defun cape--debug-message (&rest msg)
+  "Print debug MSG."
+  (let ((inhibit-message t))
+    (apply #'message msg)))
+
+(defun cape--debug-print (obj &optional full)
+  "Print OBJ as string, truncate lists if FULL is nil."
+  (cond
+   ((symbolp obj) (symbol-name obj))
+   ((functionp obj) "#<function>")
+   ((proper-list-p obj)
+    (concat
+     "("
+     (string-join
+      (mapcar #'cape--debug-print
+              (if full obj (take cape--debug-length obj)))
+      " ")
+     (if (and (not full) (length> obj cape--debug-length)) " ...)" ")")))
+   (t (let ((print-level 2))
+        (prin1-to-string obj)))))
+
+(defun cape--debug-table (table name beg end)
+  "Create completion TABLE with debug messages.
+NAME is the name of the Capf, BEG and END are the input markers."
+  (lambda (str pred action)
+    (let ((result (complete-with-action action table str pred)))
+      (if (and (eq action 'completion--unquote) (functionp (cadr result)))
+          ;; See `cape--wrapped-table'
+          (cl-callf cape--debug-table (cadr result) name beg end)
+        (cape--debug-message
+         "%s(action=%S input=%s:%s:%S prefix=%S ignore-case=%S%s%s) => %s"
+         name
+         (pcase action
+           ('nil 'try)
+           ('t 'all)
+           ('lambda 'test)
+           (_ action))
+         (+ beg 0) (+ end 0) (buffer-substring-no-properties beg end)
+         str completion-ignore-case
+         (if completion-regexp-list
+             (format " regexp=%s" (cape--debug-print completion-regexp-list t))
+           "")
+         (if pred
+             (format " predicate=%s" (cape--debug-print pred))
+           "")
+         (cape--debug-print result)))
+      result)))
+
+(cl-defun cape--properties-table (table &key category (sort t) &allow-other-keys)
+  "Create completion TABLE with properties.
+CATEGORY is the optional completion category.
+SORT should be nil to disable sorting."
+  ;; The metadata will be overridden if the category is non-nil, if the table is
+  ;; a function table or if sorting should be disabled for a non-nil
+  ;; non-function table.
+  (if (or category (functionp table) (and (not sort) table))
+      (let ((metadata `(metadata
+                        ,@(and category `((category . ,category)))
+                        ,@(and (not sort) '((display-sort-function . identity)
+                                            (cycle-sort-function . identity))))))
+        (lambda (str pred action)
+          (if (eq action 'metadata)
+              metadata
+            (complete-with-action action table str pred))))
+    table))
+
+(defun cape--dynamic-table (beg end fun)
+  "Create dynamic completion table from FUN with caching.
+BEG and END are the input bounds.  FUN is the function which
+computes the candidates.  FUN must return a pair of a predicate
+function function and the list of candidates.  The predicate is
+passed new input and must return non-nil if the candidates are
+still valid.
+
+It is only necessary to use this function if the set of
+candidates is computed dynamically based on the input and not
+statically determined.  The behavior is similar but slightly
+different to `completion-table-dynamic'.
+
+The difference to the builtins `completion-table-dynamic' and
+`completion-table-with-cache' is that this function does not use
+the prefix argument of the completion table to compute the
+candidates.  Instead it uses the input in the buffer between BEG
+and END to FUN to compute the candidates.  This way the dynamic
+candidate computation is compatible with non-prefix completion
+styles like `substring' or `orderless', which pass the empty
+string as first argument to the completion table."
+  (let ((beg (copy-marker beg))
+        (end (copy-marker end t))
+        valid table)
+    (lambda (str pred action)
+      ;; Bail out early for `metadata' and `boundaries'. This is a pointless
+      ;; move because of caching, but we do it anyway in the hope that the
+      ;; profiler report looks less confusing, since the weight of the expensive
+      ;; FUN computation is moved to the `all-completions' action.  Computing
+      ;; `all-completions' must surely be most expensive, so nobody will suspect
+      ;; a thing.
+      (unless (or (eq action 'metadata) (eq (car-safe action) 'boundaries))
+        (let ((input (buffer-substring-no-properties beg end)))
+          (unless (and valid
+                       (or (cape--separator-p input)
+                           (funcall valid input)))
+            (let* (;; Reset in case `all-completions' is used inside FUN
+                   completion-ignore-case completion-regexp-list
+                   ;; Retrieve new state by calling FUN
+                   (new (funcall fun input))
+                   ;; No interrupt during state update
+                   throw-on-input)
+              (setq valid (car new) table (cdr new)))))
+        (complete-with-action action table str pred)))))
+
+;;;; Capfs
+
+;;;;; cape-history
+
+(declare-function ring-elements "ring")
+(declare-function eshell-bol "eshell")
+(declare-function comint-line-beginning-position "comint")
+(defvar eshell-history-ring)
+(defvar comint-input-ring)
+
+(defvar cape--history-properties
+  (list :company-kind (lambda (_) 'text)
+        :exclusive 'no)
+  "Completion extra properties for `cape-history'.")
+
+;;;###autoload
+(defun cape-history (&optional interactive)
+  "Complete from Eshell, Comint or minibuffer history.
+See also `consult-history' for a more flexible variant based on
+`completing-read'.  If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      (cape-interactive #'cape-history)
+    (let (history bol)
+      (cond
+       ((derived-mode-p 'eshell-mode)
+        (setq history eshell-history-ring
+              bol (if (eval-when-compile (< emacs-major-version 30))
+                      (save-excursion (eshell-bol) (point))
+                    (line-beginning-position))))
+       ((derived-mode-p 'comint-mode)
+        (setq history comint-input-ring
+              bol (comint-line-beginning-position)))
+       ((and (minibufferp) (not (eq minibuffer-history-variable t)))
+        (setq history (symbol-value minibuffer-history-variable)
+              bol (line-beginning-position))))
+      (when (ring-p history)
+        (setq history (ring-elements history)))
+      (when history
+        `(,bol ,(point)
+          ,(cape--properties-table history :sort nil)
+          ,@cape--history-properties)))))
+
+;;;;; cape-file
+
+(defvar comint-unquote-function)
+(defvar comint-requote-function)
+
+(defvar cape--file-properties
+  (list :annotation-function (lambda (s) (if (string-suffix-p "/" s) " Dir" " File"))
+        :company-kind (lambda (s) (if (string-suffix-p "/" s) 'folder 'file))
+        :exclusive 'no)
+  "Completion extra properties for `cape-file'.")
+
+;;;###autoload
+(defun cape-file (&optional interactive)
+  "Complete file name at point.
+See the user option `cape-file-directory-must-exist'.
+If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      (cape-interactive '(cape-file-directory-must-exist) #'cape-file)
+    (pcase-let* ((default-directory (pcase cape-file-directory
+                                      ('nil default-directory)
+                                      ((pred stringp) cape-file-directory)
+                                      (_ (funcall cape-file-directory))))
+                 (prefix (and cape-file-prefix
+                              (looking-back
+                               (concat
+                                (regexp-opt (ensure-list cape-file-prefix) t)
+                                "[^ \n\t]*")
+                               (pos-bol))
+                              (match-end 1)))
+                 (`(,beg . ,end) (if prefix
+                                     (cons prefix (point))
+                                   (cape--bounds 'filename)))
+                 (non-essential t)
+                 (file (buffer-substring-no-properties beg end)))
+      (when (or prefix
+                (not cape-file-directory-must-exist)
+                (and (string-search "/" file)
+                     (file-exists-p (file-name-directory file))))
+        `(,beg ,end
+          ,(cape--nonessential-table
+            (if (or (derived-mode-p 'comint-mode) (derived-mode-p 'eshell-mode))
+                (completion-table-with-quoting
+                 #'read-file-name-internal
+                 comint-unquote-function
+                 comint-requote-function)
+              #'read-file-name-internal))
+          ,@(when (or prefix (string-match-p "./" file))
+              '(:company-prefix-length t))
+          ,@cape--file-properties)))))
+
+;;;;; cape-elisp-symbol
+
+(defvar cape--symbol-properties
+  (append
+   (list :annotation-function #'cape--symbol-annotation
+         :exit-function #'cape--symbol-exit
+         :predicate #'cape--symbol-predicate
+         :exclusive 'no)
+   (when (eval-when-compile (>= emacs-major-version 28))
+     (autoload 'elisp--company-kind "elisp-mode")
+     (autoload 'elisp--company-doc-buffer "elisp-mode")
+     (autoload 'elisp--company-doc-string "elisp-mode")
+     (autoload 'elisp--company-location "elisp-mode")
+     (list :company-kind 'elisp--company-kind
+           :company-doc-buffer 'elisp--company-doc-buffer
+           :company-docsig 'elisp--company-doc-string
+           :company-location 'elisp--company-location)))
+  "Completion extra properties for `cape-elisp-symbol'.")
+
+(defun cape--symbol-predicate (sym)
+  "Return t if SYM is bound, fbound or propertized."
+  (or (fboundp sym) (boundp sym) (symbol-plist sym)))
+
+(defun cape--symbol-exit (name status)
+  "Wrap symbol NAME with `cape-elisp-symbol-wrapper' buffers.
+STATUS is the exit status."
+  (when-let (((not (eq status 'exact)))
+             (c (cl-loop for (m . c) in cape-elisp-symbol-wrapper
+                         if (derived-mode-p m) return c)))
+    (save-excursion
+      (backward-char (length name))
+      (insert (car c)))
+    (insert (cadr c))))
+
+(defun cape--symbol-annotation (sym)
+  "Return kind of SYM."
+  (setq sym (intern-soft sym))
+  (cond
+   ((special-form-p sym) " Special")
+   ((macrop sym) " Macro")
+   ((commandp sym) " Command")
+   ((fboundp sym) " Function")
+   ((custom-variable-p sym) " Custom")
+   ((boundp sym) " Variable")
+   ((featurep sym) " Feature")
+   ((facep sym) " Face")
+   (t " Symbol")))
+
+;;;###autoload
+(defun cape-elisp-symbol (&optional interactive)
+  "Complete Elisp symbol at point.
+If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      ;; No cycling since it breaks the :exit-function.
+      (let (completion-cycle-threshold)
+        (cape-interactive #'cape-elisp-symbol))
+    (pcase-let ((`(,beg . ,end) (cape--bounds 'symbol)))
+      (when (eq (char-after beg) ?')
+        (setq beg (1+ beg) end (max beg end)))
+      `(,beg ,end
+        ,(cape--properties-table obarray :category 'symbol)
+        ,@cape--symbol-properties))))
+
+;;;;; cape-elisp-block
+
+(declare-function org-element-context "org-element")
+(declare-function markdown-code-block-lang "ext:markdown-mode")
+
+(defun cape--inside-block-p (&rest langs)
+  "Return non-nil if inside LANGS code block."
+  (when-let ((face (get-text-property (point) 'face))
+             (lang (or (and (if (listp face)
+                                (memq 'org-block face)
+                              (eq 'org-block face))
+                            (plist-get (cadr (org-element-context)) :language))
+                       (and (if (listp face)
+                                (memq 'markdown-code-face face)
+                              (eq 'markdown-code-face face))
+                            (save-excursion
+                              (markdown-code-block-lang))))))
+    (member lang langs)))
+
+;;;###autoload
+(defun cape-elisp-block (&optional interactive)
+  "Complete Elisp in Org or Markdown code block.
+This Capf is particularly useful for literate Emacs configurations.
+If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (cond
+   (interactive
+    ;; No code block check. Always complete Elisp when command was
+    ;; explicitly invoked interactively.
+    (cape-interactive #'elisp-completion-at-point))
+   ((cape--inside-block-p "elisp" "emacs-lisp")
+    (elisp-completion-at-point))))
+
+;;;;; cape-dabbrev
+
+(defvar cape--dabbrev-properties
+  (list :annotation-function (lambda (_) " Dabbrev")
+        :company-kind (lambda (_) 'text)
+        :exclusive 'no)
+  "Completion extra properties for `cape-dabbrev'.")
+
+(defvar dabbrev-case-replace)
+(defvar dabbrev-case-fold-search)
+(defvar dabbrev-abbrev-char-regexp)
+(defvar dabbrev-abbrev-skip-leading-regexp)
+(declare-function dabbrev--find-all-expansions "dabbrev")
+(declare-function dabbrev--reset-global-variables "dabbrev")
+
+(defun cape--dabbrev-list (input)
+  "Find all Dabbrev expansions for INPUT."
+  (cape--silent
+    (dlet ((dabbrev-check-other-buffers
+            (and cape-dabbrev-check-other-buffers
+                 (not (functionp cape-dabbrev-check-other-buffers))))
+           (dabbrev-check-all-buffers
+            (eq cape-dabbrev-check-other-buffers t))
+           (dabbrev-search-these-buffers-only
+            (and (functionp cape-dabbrev-check-other-buffers)
+                 (funcall cape-dabbrev-check-other-buffers))))
+      (dabbrev--reset-global-variables)
+      (cons
+       (apply-partially #'string-prefix-p input)
+       (cl-loop with min-len = (+ cape-dabbrev-min-length (length input))
+                with ic = (cape--case-fold-p dabbrev-case-fold-search)
+                for w in (dabbrev--find-all-expansions input ic)
+                if (>= (length w) min-len) collect
+                (cape--case-replace (and ic dabbrev-case-replace) input w))))))
+
+(defun cape--dabbrev-bounds ()
+  "Return bounds of abbreviation."
+  (unless (boundp 'dabbrev-abbrev-char-regexp)
+    (require 'dabbrev))
+  (let ((re (or dabbrev-abbrev-char-regexp "\\sw\\|\\s_"))
+        (limit (minibuffer-prompt-end)))
+    (when (or (looking-at re)
+              (and (> (point) limit)
+                   (save-excursion (forward-char -1) (looking-at re))))
+      (cons (save-excursion
+              (while (and (> (point) limit)
+                          (save-excursion (forward-char -1) (looking-at re)))
+                (forward-char -1))
+              (when dabbrev-abbrev-skip-leading-regexp
+                (while (looking-at dabbrev-abbrev-skip-leading-regexp)
+                  (forward-char 1)))
+              (point))
+            (save-excursion
+              (while (looking-at re)
+                (forward-char 1))
+              (point))))))
+
+;;;###autoload
+(defun cape-dabbrev (&optional interactive)
+  "Complete with Dabbrev at point.
+
+If INTERACTIVE is nil the function acts like a Capf.  In case you
+observe a performance issue with auto-completion and `cape-dabbrev'
+it is strongly recommended to disable scanning in other buffers.
+See the user options `cape-dabbrev-min-length' and
+`cape-dabbrev-check-other-buffers'."
+  (interactive (list t))
+  (if interactive
+      (cape-interactive '((cape-dabbrev-min-length 0)) #'cape-dabbrev)
+    (when-let ((bounds (cape--dabbrev-bounds)))
+      `(,(car bounds) ,(cdr bounds)
+        ,(cape--properties-table
+          (completion-table-case-fold
+           (cape--dynamic-table (car bounds) (cdr bounds) #'cape--dabbrev-list)
+           (not (cape--case-fold-p dabbrev-case-fold-search)))
+          :category 'cape-dabbrev)
+        ,@cape--dabbrev-properties))))
+
+;;;;; cape-dict
+
+(defvar cape--dict-properties
+  (list :annotation-function (lambda (_) " Dict")
+        :company-kind (lambda (_) 'text)
+        :exclusive 'no)
+  "Completion extra properties for `cape-dict'.")
+
+(defun cape--dict-list (input)
+  "Return all words from `cape-dict-file' matching INPUT."
+  (unless (equal input "")
+     (let* ((inhibit-message t)
+            (message-log-max nil)
+            (default-directory
+             (if (and (not (file-remote-p default-directory))
+                      (file-directory-p default-directory))
+                 default-directory
+               user-emacs-directory))
+            (files (mapcar #'expand-file-name
+                           (ensure-list
+                            (if (functionp cape-dict-file)
+                                (funcall cape-dict-file)
+                              cape-dict-file))))
+            (words
+             (apply #'process-lines-ignore-status
+                    "grep"
+                    (concat "-Fh"
+                            (and (cape--case-fold-p cape-dict-case-fold) "i")
+                            (and cape-dict-limit (format "m%d" cape-dict-limit)))
+                    input files)))
+       (cons
+        (apply-partially
+          (if (and cape-dict-limit (length= words cape-dict-limit))
+             #'equal #'string-search)
+         input)
+        (cape--case-replace-list cape-dict-case-replace input words)))))
+
+;;;###autoload
+(defun cape-dict (&optional interactive)
+  "Complete word from dictionary at point.
+This completion function works best if the dictionary is sorted
+by frequency.  See the custom option `cape-dict-file'.  If
+INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      (cape-interactive #'cape-dict)
+    (pcase-let ((`(,beg . ,end) (cape--bounds 'word)))
+      `(,beg ,end
+        ,(cape--properties-table
+          (completion-table-case-fold
+           (cape--dynamic-table beg end #'cape--dict-list)
+           (not (cape--case-fold-p cape-dict-case-fold)))
+          :sort nil ;; Presorted word list (by frequency)
+          :category 'cape-dict)
+        ,@cape--dict-properties))))
+
+;;;;; cape-abbrev
+
+(defun cape--abbrev-tables ()
+  "Return list of all active abbrev tables, including parents."
+  ;; Emacs 28: See abbrev--suggest-get-active-tables-including-parents.
+  (let ((tables (abbrev--active-tables)))
+    (append tables (cl-loop for table in tables
+                            append (abbrev-table-get table :parents)))))
+
+(defun cape--abbrev-list ()
+  "Abbreviation list."
+  (delete "" (cl-loop for table in (cape--abbrev-tables)
+                      nconc (all-completions "" table))))
+
+(defun cape--abbrev-annotation (abbrev)
+  "Annotate ABBREV with expansion."
+  (concat " "
+          (truncate-string-to-width
+           (format
+            "%s"
+            (symbol-value
+             (cl-loop for table in (cape--abbrev-tables)
+                      thereis (abbrev--symbol abbrev table))))
+           30 0 nil t)))
+
+(defun cape--abbrev-exit (_str status)
+  "Expand expansion if STATUS is not exact."
+  (unless (eq status 'exact)
+    (expand-abbrev)))
+
+(defvar cape--abbrev-properties
+  (list :annotation-function #'cape--abbrev-annotation
+        :exit-function #'cape--abbrev-exit
+        :company-kind (lambda (_) 'snippet)
+        :exclusive 'no)
+  "Completion extra properties for `cape-abbrev'.")
+
+;;;###autoload
+(defun cape-abbrev (&optional interactive)
+  "Complete abbreviation at point.
+If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      ;; No cycling since it breaks the :exit-function.
+      (let (completion-cycle-threshold)
+        (cape-interactive #'cape-abbrev))
+    (when-let (abbrevs (cape--abbrev-list))
+      (let ((bounds (cape--bounds 'symbol)))
+        `(,(car bounds) ,(cdr bounds)
+          ,(cape--properties-table abbrevs :category 'cape-abbrev)
+          ,@cape--abbrev-properties)))))
+
+;;;;; cape-line
+
+(defvar cape--line-properties nil
+  "Completion extra properties for `cape-line'.")
+
+(defun cape--buffers-major-mode ()
+  "Return buffers with same major mode as current buffer."
+  (cl-loop for buf in (buffer-list)
+           if (eq major-mode (buffer-local-value 'major-mode buf))
+           collect buf))
+
+(defun cape--line-list ()
+  "Return all lines from buffer."
+  (let ((ht (make-hash-table :test #'equal))
+        (curr-buf (current-buffer))
+        (buffers (funcall cape-line-buffer-function))
+        lines)
+    (dolist (buf (ensure-list buffers))
+      (with-current-buffer buf
+        (let ((beg (point-min))
+              (max (point-max))
+              (pt (if (eq curr-buf buf) (point) -1))
+              end)
+          (save-excursion
+            (while (< beg max)
+              (goto-char beg)
+              (setq end (pos-eol))
+              (unless (<= beg pt end)
+                (let ((line (buffer-substring-no-properties beg end)))
+                  (unless (or (string-blank-p line) (gethash line ht))
+                    (puthash line t ht)
+                    (push line lines))))
+              (setq beg (1+ end)))))))
+    (nreverse lines)))
+
+;;;###autoload
+(defun cape-line (&optional interactive)
+  "Complete current line from other lines.
+The buffers returned by `cape-line-buffer-function' are scanned for lines.
+If INTERACTIVE is nil the function acts like a Capf."
+  (interactive (list t))
+  (if interactive
+      (cape-interactive #'cape-line)
+    `(,(pos-bol) ,(point)
+      ,(cape--properties-table (cape--line-list) :sort nil)
+      ,@cape--line-properties)))
+
+;;;; Capf combinators
+
+(defun cape--company-call (&rest app)
+  "Apply APP and handle future return values."
+  ;; Backends are non-interruptible. Disable interrupts!
+  (let ((toi throw-on-input)
+        (throw-on-input nil))
+    (pcase (apply app)
+      ;; Handle async future return values.
+      (`(:async . ,fetch)
+       (let ((res 'cape--waiting))
+         (if toi
+             (unwind-protect
+                 (progn
+                   (funcall fetch
+                            (lambda (arg)
+                              (when (eq res 'cape--waiting)
+                                (push 'cape--done unread-command-events)
+                                (setq res arg))))
+                   (when (eq res 'cape--waiting)
+                     (let ((ev (let ((input-method-function nil)
+                                     (echo-keystrokes 0))
+                                 (read-event nil t))))
+                       (unless (eq ev 'cape--done)
+                         (push (cons t ev) unread-command-events)
+                         (setq res 'cape--cancelled)
+                         (throw toi t)))))
+               (setq unread-command-events
+                     (delq 'cape--done unread-command-events)))
+           (funcall fetch (lambda (arg) (setq res arg)))
+           ;; Force synchronization, not interruptible! We use polling
+           ;; here and ignore pending input since we don't use
+           ;; `sit-for'. This is the same method used by Company itself.
+           (while (eq res 'cape--waiting)
+             (sleep-for 0.01)))
+         res))
+      ;; Plain old synchronous return value.
+      (res res))))
+
+(defvar-local cape--company-init nil)
+
+;;;###autoload
+(defun cape-company-to-capf (backend &optional valid)
+  "Convert Company BACKEND function to Capf.
+VALID is a function taking the old and new input string.  It
+should return nil if the cached candidates became invalid.  The
+default value for VALID is `string-prefix-p' such that the
+candidates are only fetched again if the input prefix
+changed.  The function `cape-company-to-capf' is experimental."
+  (lambda ()
+    (when (and (symbolp backend) (not (fboundp backend)))
+      (ignore-errors (require backend nil t)))
+    (when (and (symbolp backend) (not (alist-get backend cape--company-init)))
+      (funcall backend 'init)
+      (put backend 'company-init t)
+      (setf (alist-get backend cape--company-init) t))
+    (when-let ((prefix (cape--company-call backend 'prefix))
+               (initial-input (if (stringp prefix) prefix (car-safe prefix))))
+      (let* ((end (point)) (beg (- end (length initial-input)))
+             (valid (if (cape--company-call backend 'no-cache initial-input)
+                        #'equal (or valid #'string-prefix-p)))
+             restore-props)
+        (list beg end
+              (funcall
+               (if (cape--company-call backend 'ignore-case)
+                   #'completion-table-case-fold
+                 #'identity)
+               (cape--properties-table
+                (cape--dynamic-table
+                 beg end
+                 (lambda (input)
+                   (let ((cands (cape--company-call backend 'candidates input)))
+                     ;; The candidate string including text properties should be
+                     ;; restored in the :exit-function, if the UI does not
+                     ;; guarantee this itself.  Restoration is not necessary for
+                     ;; Corfu since the introduction of `corfu--exit-function'.
+                     (unless (and (bound-and-true-p corfu-mode) (fboundp 'corfu--exit-function))
+                       (setq restore-props cands))
+                     (cons (apply-partially valid input) cands))))
+                :category backend
+                :sort (not (cape--company-call backend 'sorted))))
+              :exclusive 'no
+              :company-prefix-length (cdr-safe prefix)
+              :company-doc-buffer (lambda (x) (cape--company-call backend 'doc-buffer x))
+              :company-location (lambda (x) (cape--company-call backend 'location x))
+              :company-docsig (lambda (x) (cape--company-call backend 'meta x))
+              :company-deprecated (lambda (x) (cape--company-call backend 'deprecated x))
+              :company-kind (lambda (x) (cape--company-call backend 'kind x))
+              :annotation-function (lambda (x)
+                                     (when-let (ann (cape--company-call backend 'annotation x))
+                                       (concat " " (string-trim ann))))
+              :exit-function (lambda (x _status)
+                               ;; Restore the candidate string including
+                               ;; properties if restore-props is non-nil.  See
+                               ;; the comment above.
+                               (setq x (or (car (member x restore-props)) x))
+                               (cape--company-call backend 'post-completion x)))))))
+
+;;;###autoload
+(defun cape-interactive (&rest capfs)
+  "Complete interactively with the given CAPFS."
+  (let* ((ctx (and (consp (car capfs)) (car capfs)))
+         (capfs (if ctx (cdr capfs) capfs))
+         (completion-at-point-functions
+          (if ctx
+              (mapcar (lambda (f) `(lambda () (let ,ctx (funcall ',f)))) capfs)
+            capfs)))
+    (unless (completion-at-point)
+      (user-error "%s: No completions"
+                  (mapconcat (lambda (fun)
+                               (if (symbolp fun)
+                                   (symbol-name fun)
+                                 "anonymous-capf"))
+                             capfs ", ")))))
+
+;;;###autoload
+(defun cape-capf-interactive (capf)
+  "Create interactive completion function from CAPF."
+  (lambda (&optional interactive)
+    (interactive (list t))
+    (if interactive (cape-interactive capf) (funcall capf))))
+
+;;;###autoload
+(defun cape-wrap-super (&rest capfs)
+  "Call CAPFS and return merged completion result.
+The CAPFS list can contain the keyword `:with' to mark the Capfs
+afterwards as auxiliary One of the non-auxiliary Capfs before
+`:with' must return non-nil for the super Capf to set in and
+return a non-nil result.  Such behavior is useful when listing
+multiple super Capfs in the `completion-at-point-functions':
+
+  (setq completion-at-point-functions
+        (list (cape-capf-super \\='eglot-completion-at-point
+                               :with \\='tempel-complete)
+              (cape-capf-super \\='cape-dabbrev
+                               :with \\='tempel-complete)))
+
+The functions `cape-wrap-super' and `cape-capf-super' are
+experimental."
+  (when-let ((results (cl-loop for capf in capfs until (eq capf :with)
+                               for res = (funcall capf)
+                               if res collect (cons t res))))
+    (pcase-let* ((results (nconc results
+                                 (cl-loop for capf in (cdr (memq :with capfs))
+                                          for res = (funcall capf)
+                                          if res collect (cons nil res))))
+                 (`((,_main ,beg ,end . ,_)) results)
+                 (cand-ht nil)
+                 (tables nil)
+                 (exclusive nil)
+                 (prefix-len nil)
+                 (cand-functions
+                  '(:company-docsig :company-location :company-kind
+                    :company-doc-buffer :company-deprecated
+                    :annotation-function :exit-function)))
+      (cl-loop for (main beg2 end2 table . plist) in results do
+               ;; TODO `cape-capf-super' currently cannot merge Capfs which
+               ;; trigger at different beginning positions.  In order to support
+               ;; this, take the smallest BEG value and then normalize all
+               ;; candidates by prefixing them such that they all start at the
+               ;; smallest BEG position.
+               (when (= beg beg2)
+                 (push (list main (plist-get plist :predicate) table
+                             ;; Plist attached to the candidates
+                             (mapcan (lambda (f)
+                                       (when-let ((v (plist-get plist f)))
+                                         (list f v)))
+                                     cand-functions))
+                       tables)
+                 ;; The resulting merged Capf is exclusive if one of the main
+                 ;; Capfs is exclusive.
+                 (when (and main (not (eq (plist-get plist :exclusive) 'no)))
+                   (setq exclusive t))
+                 (setq end (max end end2))
+                 (let ((plen (plist-get plist :company-prefix-length)))
+                   (cond
+                    ((eq plen t)
+                     (setq prefix-len t))
+                    ((and (not prefix-len) (integerp plen))
+                     (setq prefix-len plen))
+                    ((and (integerp prefix-len) (integerp plen))
+                     (setq prefix-len (max prefix-len plen)))))))
+      (setq tables (nreverse tables))
+      `(,beg ,end
+        ,(lambda (str pred action)
+           (pcase action
+             (`(boundaries . ,_) nil)
+             ('metadata
+              '(metadata (category . cape-super)
+                         (display-sort-function . identity)
+                         (cycle-sort-function . identity)))
+             ('t ;; all-completions
+              (let ((ht (make-hash-table :test #'equal))
+                    (candidates nil))
+                (cl-loop for (main table-pred table cand-plist) in tables do
+                         (let* ((pr (if (and table-pred pred)
+                                        (lambda (x) (and (funcall table-pred x) (funcall pred x)))
+                                      (or table-pred pred)))
+                                (md (completion-metadata "" table pr))
+                                (sort (or (completion-metadata-get md 'display-sort-function)
+                                          #'identity))
+                                ;; Always compute candidates of the main Capf
+                                ;; tables, which come first in the tables
+                                ;; list. For the :with Capfs only compute
+                                ;; candidates if we've already determined that
+                                ;; main candidates are available.
+                                (cands (when (or main (or exclusive cand-ht candidates))
+                                         (funcall sort (all-completions str table pr)))))
+                           ;; Handle duplicates with a hash table.
+                           (cl-loop
+                            for cand in-ref cands
+                            for dup = (gethash cand ht t) do
+                            (cond
+                             ((eq dup t)
+                              ;; Candidate does not yet exist.
+                              (puthash cand cand-plist ht))
+                             ((not (equal dup cand-plist))
+                              ;; Duplicate candidate. Candidate plist is
+                              ;; different, therefore disambiguate the
+                              ;; candidates.
+                              (setf cand (propertize cand 'cape-capf-super
+                                                     (cons cand cand-plist))))))
+                           (when cands (push cands candidates))))
+                (when (or cand-ht candidates)
+                  (setq candidates (apply #'nconc (nreverse candidates))
+                        cand-ht ht)
+                  candidates)))
+             (_ ;; try-completion and test-completion
+              (cl-loop for (_main table-pred table _cand-plist) in tables thereis
+                       (complete-with-action
+                        action table str
+                        (if (and table-pred pred)
+                            (lambda (x) (and (funcall table-pred x) (funcall pred x)))
+                          (or table-pred pred)))))))
+        :company-prefix-length ,prefix-len
+        ,@(and (not exclusive) '(:exclusive no))
+        ,@(mapcan
+           (lambda (prop)
+             (list prop (lambda (cand &rest args)
+                          (let ((ref (get-text-property 0 'cape-capf-super cand)))
+                            (when-let ((fun (plist-get
+                                             (or (cdr ref)
+                                                 (and cand-ht (gethash cand cand-ht)))
+                                             prop)))
+                              (apply fun (or (car ref) cand) args))))))
+           cand-functions)))))
+
+;;;###autoload
+(defun cape-wrap-debug (capf &optional name)
+  "Call CAPF and return a completion table which prints trace messages.
+If CAPF is an anonymous lambda, pass the Capf NAME explicitly for
+meaningful debugging output."
+  (unless name
+    (setq name (if (symbolp capf) capf "capf")))
+  (setq name (format "%s@%s" name (cl-incf cape--debug-id)))
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     (let* ((limit (1+ cape--debug-length))
+            (pred (plist-get plist :predicate))
+            (cands
+             ;; Reset regexps for `all-completions'
+             (let (completion-ignore-case completion-regexp-list)
+               (all-completions
+                "" table
+                (lambda (&rest args)
+                  (and (or (not pred) (apply pred args)) (>= (cl-decf limit) 0))))))
+            (plist-str "")
+            (plist-elt plist))
+       (while (cdr plist-elt)
+         (setq plist-str (format "%s %s=%s" plist-str
+                                 (substring (symbol-name (car plist-elt)) 1)
+                                 (cape--debug-print (cadr plist-elt)))
+               plist-elt (cddr plist-elt)))
+       (cape--debug-message
+        "%s => input=%s:%s:%S table=%s%s"
+        name (+ beg 0) (+ end 0) (buffer-substring-no-properties beg end)
+        (cape--debug-print cands)
+        plist-str))
+     `(,beg ,end ,(cape--debug-table
+                   table name (copy-marker beg) (copy-marker end t))
+       ,@(when-let ((exit (plist-get plist :exit-function)))
+           (list :exit-function
+                 (lambda (cand status)
+                   (cape--debug-message "%s:exit(candidate=%S status=%s)"
+                                        name cand status)
+                   (funcall exit cand status))))
+       . ,plist))
+    (result
+     (cape--debug-message "%s() => %s (No completion)"
+                          name (cape--debug-print result)))))
+
+;;;###autoload
+(defun cape-wrap-buster (capf &optional valid)
+  "Call CAPF and return a completion table with cache busting.
+This function can be used as an advice around an existing Capf.
+The cache is busted when the input changes.  The argument VALID
+can be a function taking the old and new input string.  It should
+return nil if the new input requires that the completion table is
+refreshed.  The default value for VALID is `equal', such that the
+completion table is refreshed on every input change."
+  (setq valid (or valid #'equal))
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     (setq plist `(:cape--buster t . ,plist))
+     `(,beg ,end
+       ,(let* ((beg (copy-marker beg))
+               (end (copy-marker end t))
+               (input (buffer-substring-no-properties beg end)))
+          (lambda (str pred action)
+            (let ((new-input (buffer-substring-no-properties beg end)))
+              (unless (or (not (eq action t))
+                          (cape--separator-p new-input)
+                          (funcall valid input new-input))
+                (pcase
+                    ;; Reset in case `all-completions' is used inside CAPF
+                    (let (completion-ignore-case completion-regexp-list)
+                      (funcall capf))
+                  ((and `(,new-beg ,new-end ,new-table . ,new-plist)
+                        (guard (and (= beg new-beg) (= end new-end))))
+                   (let (throw-on-input) ;; No interrupt during state update
+                     (setf table new-table
+                           input new-input
+                           (cddr plist) new-plist))))))
+            (complete-with-action action table str pred)))
+       ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-passthrough (capf)
+  "Call CAPF and make sure that no completion style filtering takes place."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,(cape--passthrough-table table) ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-properties (capf &rest properties)
+  "Call CAPF and add additional completion PROPERTIES.
+Completion properties include for example :exclusive, :annotation-function and
+the various :company-* extensions.  Furthermore a boolean :sort flag and a
+completion :category symbol can be specified."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end
+            ,(apply #'cape--properties-table table properties)
+            ,@properties ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-nonexclusive (capf)
+  "Call CAPF and ensure that it is marked as non-exclusive.
+This function can be used as an advice around an existing Capf."
+  (cape-wrap-properties capf :exclusive 'no))
+
+;;;###autoload
+(defun cape-wrap-predicate (capf predicate)
+  "Call CAPF and add an additional candidate PREDICATE.
+The PREDICATE is passed the candidate symbol or string."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,table
+            :predicate
+            ,(if-let (pred (plist-get plist :predicate))
+                 ;; First argument is key, second is value for hash tables.
+                 ;; The first argument can be a cons cell for alists. Then
+                 ;; the candidate itself is either a string or a symbol. We
+                 ;; normalize the calling convention here such that PREDICATE
+                 ;; always receives a string or a symbol.
+                 (lambda (&rest args)
+                   (when (apply pred args)
+                     (setq args (car args))
+                     (funcall predicate (if (consp args) (car args) args))))
+               (lambda (key &optional _val)
+                 (funcall predicate (if (consp key) (car key) key))))
+            ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-silent (capf)
+  "Call CAPF and silence it (no messages, no errors).
+This function can be used as an advice around an existing Capf."
+  (pcase (cape--silent (funcall capf))
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,(cape--silent-table table) ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-case-fold (capf &optional dont-fold)
+  "Call CAPF and return a case-insensitive completion table.
+If DONT-FOLD is non-nil return a case sensitive table instead.
+This function can be used as an advice around an existing Capf."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,(completion-table-case-fold table dont-fold) ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-noninterruptible (capf)
+  "Call CAPF and return a non-interruptible completion table.
+This function can be used as an advice around an existing Capf."
+  (pcase (let (throw-on-input) (funcall capf))
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,(cape--noninterruptible-table table) ,@plist))))
+
+;;;###autoload
+(defun cape-wrap-prefix-length (capf length)
+  "Call CAPF and ensure that prefix length is greater or equal than LENGTH.
+If the prefix is long enough, enforce auto completion."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     (when (>= (- end beg) length)
+       `(,beg ,end ,table
+         :company-prefix-length t
+         ,@plist)))))
+
+;;;###autoload
+(defun cape-wrap-inside-faces (capf &rest faces)
+  "Call CAPF only if inside FACES.
+This function can be used as an advice around an existing Capf."
+  (when-let (((> (point) (point-min)))
+             (fs (get-text-property (1- (point)) 'face))
+             ((if (listp fs)
+                  (cl-loop for f in fs thereis (memq f faces))
+                (memq fs faces))))
+    (funcall capf)))
+
+;;;###autoload
+(defun cape-wrap-inside-code (capf)
+  "Call CAPF only if inside code, not inside a comment or string.
+This function can be used as an advice around an existing Capf."
+  (let ((s (syntax-ppss)))
+    (and (not (nth 3 s)) (not (nth 4 s)) (funcall capf))))
+
+;;;###autoload
+(defun cape-wrap-inside-comment (capf)
+  "Call CAPF only if inside comment.
+This function can be used as an advice around an existing Capf."
+  (and (nth 4 (syntax-ppss)) (funcall capf)))
+
+;;;###autoload
+(defun cape-wrap-inside-string (capf)
+  "Call CAPF only if inside string.
+This function can be used as an advice around an existing Capf."
+  (and (nth 3 (syntax-ppss)) (funcall capf)))
+
+;;;###autoload
+(defun cape-wrap-purify (capf)
+  "Call CAPF and ensure that it does not illegally modify the buffer.
+This function can be used as an advice around an existing
+Capf.  It has been introduced mainly to fix the broken
+`pcomplete-completions-at-point' function in Emacs versions < 29."
+  ;; bug#50470: Fix Capfs which illegally modify the buffer or which illegally
+  ;; call `completion-in-region'.  The workaround here was proposed by
+  ;; @jakanakaevangeli and is used in his capf-autosuggest package.  In Emacs 29
+  ;; the purity bug of Pcomplete has been fixed, such that make
+  ;; `cape-wrap-purify' is not necessary anymore.
+  (catch 'cape--illegal-completion-in-region
+    (condition-case nil
+        (let ((buffer-read-only t)
+              (inhibit-read-only nil)
+              (completion-in-region-function
+               (lambda (beg end coll pred)
+                 (throw 'cape--illegal-completion-in-region
+                        (list beg end coll :predicate pred)))))
+          (funcall capf))
+      (buffer-read-only nil))))
+
+;;;###autoload
+(defun cape-wrap-accept-all (capf)
+  "Call CAPF and return a completion table which accepts every input.
+This function can be used as an advice around an existing Capf."
+  (pcase (funcall capf)
+    (`(,beg ,end ,table . ,plist)
+     `(,beg ,end ,(cape--accept-all-table table) . ,plist))))
+
+;;;###autoload (autoload 'cape-capf-accept-all "cape")
+;;;###autoload (autoload 'cape-capf-buster "cape")
+;;;###autoload (autoload 'cape-capf-case-fold "cape")
+;;;###autoload (autoload 'cape-capf-debug "cape")
+;;;###autoload (autoload 'cape-capf-inside-code "cape")
+;;;###autoload (autoload 'cape-capf-inside-comment "cape")
+;;;###autoload (autoload 'cape-capf-inside-faces "cape")
+;;;###autoload (autoload 'cape-capf-inside-string "cape")
+;;;###autoload (autoload 'cape-capf-nonexclusive "cape")
+;;;###autoload (autoload 'cape-capf-noninterruptible "cape")
+;;;###autoload (autoload 'cape-capf-passthrough "cape")
+;;;###autoload (autoload 'cape-capf-predicate "cape")
+;;;###autoload (autoload 'cape-capf-prefix-length "cape")
+;;;###autoload (autoload 'cape-capf-properties "cape")
+;;;###autoload (autoload 'cape-capf-purify "cape")
+;;;###autoload (autoload 'cape-capf-silent "cape")
+;;;###autoload (autoload 'cape-capf-super "cape")
+
+(dolist (wrapper (list #'cape-wrap-accept-all #'cape-wrap-buster
+                       #'cape-wrap-case-fold #'cape-wrap-debug
+                       #'cape-wrap-inside-code #'cape-wrap-inside-comment
+                       #'cape-wrap-inside-faces #'cape-wrap-inside-string
+                       #'cape-wrap-nonexclusive #'cape-wrap-noninterruptible
+                       #'cape-wrap-passthrough #'cape-wrap-predicate
+                       #'cape-wrap-prefix-length #'cape-wrap-properties
+                       #'cape-wrap-purify #'cape-wrap-silent #'cape-wrap-super))
+  (let ((name (string-remove-prefix "cape-wrap-" (symbol-name wrapper))))
+    (defalias (intern (format "cape-capf-%s" name))
+      (lambda (capf &rest args) (lambda () (apply wrapper capf args)))
+      (format "Create a %s Capf from CAPF.
+The Capf calls `%s' with CAPF and ARGS as arguments." name wrapper))))
+
+(provide 'cape)
+;;; cape.el ends here
diff --git a/emacs/elpa/cape-20240517.2216/cape.elc b/emacs/elpa/cape-20240517.2216/cape.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-pkg.el b/emacs/elpa/consult-20240420.929/consult-pkg.el
@@ -1,15 +0,0 @@
-(define-package "consult" "20240420.929" "Consulting completing-read"
-  '((emacs "27.1")
-    (compat "29.1.4.4"))
-  :commit "8989c7a5c5035f9e3429f85f1006d0c6cb5d5e8d" :authors
-  '(("Daniel Mendler and Consult contributors"))
-  :maintainers
-  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
-  :maintainer
-  '("Daniel Mendler" . "mail@daniel-mendler.de")
-  :keywords
-  '("matching" "files" "completion")
-  :url "https://github.com/minad/consult")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/consult-20240420.929/consult-xref.el b/emacs/elpa/consult-20240420.929/consult-xref.el
@@ -1,122 +0,0 @@
-;;; consult-xref.el --- Xref integration for Consult -*- lexical-binding: t -*-
-
-;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
-
-;; 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:
-
-;; Provides Xref integration for Consult.  This is an extra package, to
-;; allow lazy loading of xref.el.  The `consult-xref' function is
-;; autoloaded.
-
-;;; Code:
-
-(require 'consult)
-(require 'xref)
-
-(defvar consult-xref--history nil)
-
-(defvar consult-xref--fetcher nil
-  "The current xref fetcher.
-The fetch is stored globally such that it can be accessed by
- Embark for `embark-export'.")
-
-(defun consult-xref--candidates ()
-  "Return xref candidate list."
-  (let ((root (consult--project-root)))
-    (mapcar (lambda (xref)
-              (let* ((loc (xref-item-location xref))
-                     (group (if (fboundp 'xref--group-name-for-display)
-                                ;; This function is available in xref 1.3.2
-                                (xref--group-name-for-display
-                                 (xref-location-group loc) root)
-                              (xref-location-group loc)))
-                     (cand (consult--format-file-line-match
-                            group
-                            (or (xref-location-line loc) 0)
-                            (xref-item-summary xref))))
-                (add-text-properties
-                 0 1 `(consult-xref ,xref consult--prefix-group ,group) cand)
-                cand))
-            (funcall consult-xref--fetcher))))
-
-(defun consult-xref--preview (display)
-  "Xref preview with DISPLAY function."
-  (let ((open (consult--temporary-files))
-        (preview (consult--jump-preview)))
-    (lambda (action cand)
-      (unless cand
-        (funcall open))
-      (let ((consult--buffer-display display))
-        (funcall preview action
-                 (when-let (loc (and cand (eq action 'preview)
-                                     (xref-item-location cand)))
-                   (let ((type (type-of loc)))
-                     ;; Only preview file and buffer markers
-                     (pcase type
-                       ('xref-buffer-location
-                        (xref-location-marker loc))
-                       ((or 'xref-file-location 'xref-etags-location)
-                        (consult--marker-from-line-column
-                         (funcall open
-                                  ;; xref-location-group returns the file name
-                                  (let ((xref-file-name-display 'abs))
-                                    (xref-location-group loc)))
-                         (xref-location-line loc)
-                         (if (eq type 'xref-file-location)
-                             (xref-file-location-column loc)
-                           0)))))))))))
-
-;;;###autoload
-(defun consult-xref (fetcher &optional alist)
-  "Show xrefs with preview in the minibuffer.
-
-This function can be used for `xref-show-xrefs-function'.
-See `xref-show-xrefs-function' for the description of the
-FETCHER and ALIST arguments."
-  (let* ((consult-xref--fetcher fetcher)
-         (candidates (consult-xref--candidates))
-         (display (alist-get 'display-action alist)))
-    (unless candidates
-      (user-error "No xref locations"))
-    (xref-pop-to-location
-     (if (cdr candidates)
-         (apply
-          #'consult--read
-          candidates
-          (append
-           (consult--customize-get #'consult-xref)
-           (list
-            :prompt "Go to xref: "
-            :history 'consult-xref--history
-            :require-match t
-            :sort nil
-            :category 'consult-xref
-            :group #'consult--prefix-group
-            :state
-            ;; do not preview other frame
-            (when-let (fun (pcase-exhaustive display
-                             ('frame nil)
-                             ('window #'switch-to-buffer-other-window)
-                             ('nil #'switch-to-buffer)))
-              (consult-xref--preview fun))
-            :lookup (apply-partially #'consult--lookup-prop 'consult-xref))))
-       (get-text-property 0 'consult-xref (car candidates)))
-     display)))
-
-(provide 'consult-xref)
-;;; consult-xref.el ends here
diff --git a/emacs/elpa/consult-20240420.929/consult-xref.elc b/emacs/elpa/consult-20240420.929/consult-xref.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult.el b/emacs/elpa/consult-20240420.929/consult.el
@@ -1,5237 +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
-;; Version: 1.5
-;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4"))
-;; Homepage: 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 "Homepage" "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' is
-supported on Emacs 28 and newer.  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\\*\\'"
-    "\\`\\*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."
-  :type 'natnum)
-
-(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-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-check-buffers
-    save-place-find-file-hook)
-  "List of `find-file' hooks, which should be executed during file preview."
-  :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))))
-
-(defcustom consult-yank-rotate
-  (if (boundp 'yank-from-kill-ring-rotate)
-      yank-from-kill-ring-rotate
-    t)
-  "Rotate the `kill-ring' in the `consult-yank' commands."
-  :type 'boolean)
-
-;;;; 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)))
-
-;; Upstream bug#46326, Consult issue gh:minad/consult#193.
-(defmacro consult--minibuffer-with-setup-hook (fun &rest body)
-  "Variant of `minibuffer-with-setup-hook' using a symbol and `fset'.
-
-This macro is only needed to prevent memory leaking issues with
-the upstream `minibuffer-with-setup-hook' macro.
-FUN is the hook function and BODY opens the minibuffer."
-  (declare (indent 1) (debug t))
-  (let ((hook (gensym "hook"))
-        (append))
-    (when (eq (car-safe fun) :append)
-      (setq append '(t) fun (cadr fun)))
-    `(let ((,hook (make-symbol "consult--minibuffer-setup-hook")))
-       (fset ,hook (lambda ()
-                     (remove-hook 'minibuffer-setup-hook ,hook)
-                     (funcall ,fun)))
-       (unwind-protect
-           (progn
-             (add-hook 'minibuffer-setup-hook ,hook ,@append)
-             ,@body)
-         (remove-hook 'minibuffer-setup-hook ,hook)))))
-
-(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 (compat-call 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 ((afile (abbreviate-file-name file)))
-      (if (string-match "/\\([^/]+\\)/\\([^/]+/?\\)\\'" afile)
-          (propertize (format "…/%s/%s" (match-string 1 afile) (match-string 2 afile))
-                      'help-echo afile)
-        afile))))
-
-(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)
-            ('nil (or (consult--project-root) 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))
-                          (consult--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
-               (`(,p) (consult--left-truncate-file p))
-               (`(,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)))
-
-(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))
-    (cond
-     ((fboundp 'project-root) (project-root proj))
-     ((fboundp 'project-roots) (car (project-roots 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))
-  `(let (set-message-function) ;; bug#63253: Broken `with-delayed-message'
-     (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--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 (lambda (x)
-                                (memq x consult-preview-allowed-hooks))
-                              (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)))
-            (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)
-    (consult--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'."
-  (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."
-  (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)))
-
-;; Emacs 28: hide in M-X
-(put #'consult-narrow-help 'completion-predicate #'ignore)
-(put #'consult-narrow 'completion-predicate #'ignore)
-
-;;;; 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)
-       (consult--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 %S\n" args)
-                 (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."
-  (consult--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."
-  (consult--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 (&optional cmd)
-  "Get configuration from `consult--customize-alist' for CMD."
-  (mapcar (lambda (x) (eval x 'lexical))
-          (alist-get (or cmd 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
-        (consult--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))
-                           ;; Emacs 28 has a `read-extended-command-predicate'
-                           (if (bound-and-true-p read-extended-command-predicate)
-                               (funcall read-extended-command-predicate sym buffer)
-                             t))
-                  (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 consult-yank-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' in Emacs 28, 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 consult-yank-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' in Emacs 28, 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.
-
-There exists no equivalent of this command in Emacs 28."
-  (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."
-  (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."
-  (interactive)
-  (consult-isearch-forward (not reverse)))
-
-;; Emacs 28: hide in M-X
-(put #'consult-isearch-backward 'completion-predicate #'ignore)
-(put #'consult-isearch-forward 'completion-predicate #'ignore)
-
-(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 (current-buffer)))
-    (consult--keep! buffers
-      (unless (eq it current)
-        (if (get-buffer-window it 'visible)
-            it
-          (push it hidden)
-          nil)))
-    (nconc (nreverse hidden) buffers (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))
-  "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.
-AS is a conversion function."
-  (let ((root (consult--normalize-directory directory))
-        (buffers (buffer-list)))
-    (when sort
-      (setq buffers (funcall (intern (format "consult--buffer-sort-%s" sort)) buffers)))
-    (when (or filter mode as root)
-      (let ((exclude-re (consult--regexp-filter exclude))
-            (include-re (consult--regexp-filter include))
-            (case-fold-search))
-        (consult--keep! buffers
-          (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)))))
-    buffers))
-
-(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))
-             (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 (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 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.
-
-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
-                            (cdr (mapcan (lambda (x) `("--and" ,x)) re))
-                            opts 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-20240420.929/consult.elc b/emacs/elpa/consult-20240420.929/consult.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-autoloads.el b/emacs/elpa/consult-20240516.2240/consult-autoloads.el
diff --git a/emacs/elpa/consult-20240420.929/consult-compile.el b/emacs/elpa/consult-20240516.2240/consult-compile.el
diff --git a/emacs/elpa/consult-20240420.929/consult-compile.elc b/emacs/elpa/consult-20240516.2240/consult-compile.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-flymake.el b/emacs/elpa/consult-20240516.2240/consult-flymake.el
diff --git a/emacs/elpa/consult-20240420.929/consult-flymake.elc b/emacs/elpa/consult-20240516.2240/consult-flymake.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-imenu.el b/emacs/elpa/consult-20240516.2240/consult-imenu.el
diff --git a/emacs/elpa/consult-20240420.929/consult-imenu.elc b/emacs/elpa/consult-20240516.2240/consult-imenu.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-info.el b/emacs/elpa/consult-20240516.2240/consult-info.el
diff --git a/emacs/elpa/consult-20240420.929/consult-info.elc b/emacs/elpa/consult-20240516.2240/consult-info.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-kmacro.el b/emacs/elpa/consult-20240516.2240/consult-kmacro.el
diff --git a/emacs/elpa/consult-20240420.929/consult-kmacro.elc b/emacs/elpa/consult-20240516.2240/consult-kmacro.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240420.929/consult-org.el b/emacs/elpa/consult-20240516.2240/consult-org.el
diff --git a/emacs/elpa/consult-20240420.929/consult-org.elc b/emacs/elpa/consult-20240516.2240/consult-org.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240516.2240/consult-pkg.el b/emacs/elpa/consult-20240516.2240/consult-pkg.el
@@ -0,0 +1,15 @@
+(define-package "consult" "20240516.2240" "Consulting completing-read"
+  '((emacs "27.1")
+    (compat "29.1.4.4"))
+  :commit "80407622f323669c735737272ecbc3b602434b77" :authors
+  '(("Daniel Mendler and Consult contributors"))
+  :maintainers
+  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
+  :maintainer
+  '("Daniel Mendler" . "mail@daniel-mendler.de")
+  :keywords
+  '("matching" "files" "completion")
+  :url "https://github.com/minad/consult")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/consult-20240420.929/consult-register.el b/emacs/elpa/consult-20240516.2240/consult-register.el
diff --git a/emacs/elpa/consult-20240420.929/consult-register.elc b/emacs/elpa/consult-20240516.2240/consult-register.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240516.2240/consult-xref.el b/emacs/elpa/consult-20240516.2240/consult-xref.el
@@ -0,0 +1,120 @@
+;;; consult-xref.el --- Xref integration for Consult -*- lexical-binding: t -*-
+
+;; Copyright (C) 2021-2024 Free Software Foundation, Inc.
+
+;; 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:
+
+;; Provides Xref integration for Consult.  This is an extra package, to
+;; allow lazy loading of xref.el.  The `consult-xref' function is
+;; autoloaded.
+
+;;; Code:
+
+(require 'consult)
+(require 'xref)
+(eval-when-compile (require 'subr-x))
+
+(defvar consult-xref--history nil)
+
+(defvar consult-xref--fetcher nil
+  "The current xref fetcher.
+The fetch is stored globally such that it can be accessed by
+ Embark for `embark-export'.")
+
+(defun consult-xref--candidates ()
+  "Return xref candidate list."
+  (let ((root (consult--project-root)))
+    (mapcar (lambda (xref)
+              (let* ((loc (xref-item-location xref))
+                     (group (xref-location-group loc))
+                     (group (if root (string-remove-prefix root group) group))
+                     (cand (consult--format-file-line-match
+                            group
+                            (or (xref-location-line loc) 0)
+                            (xref-item-summary xref))))
+                (add-text-properties
+                 0 1 `(consult-xref ,xref consult--prefix-group ,group) cand)
+                cand))
+            (funcall consult-xref--fetcher))))
+
+(defun consult-xref--preview (display)
+  "Xref preview with DISPLAY function."
+  (let ((open (consult--temporary-files))
+        (preview (consult--jump-preview)))
+    (lambda (action cand)
+      (unless cand
+        (funcall open))
+      (let ((consult--buffer-display display))
+        (funcall preview action
+                 (when-let (loc (and cand (eq action 'preview)
+                                     (xref-item-location cand)))
+                   (let ((type (type-of loc)))
+                     ;; Only preview file and buffer markers
+                     (pcase type
+                       ('xref-buffer-location
+                        (xref-location-marker loc))
+                       ((or 'xref-file-location 'xref-etags-location)
+                        (consult--marker-from-line-column
+                         (funcall open
+                                  ;; xref-location-group returns the file name
+                                  (let ((xref-file-name-display 'abs))
+                                    (xref-location-group loc)))
+                         (xref-location-line loc)
+                         (if (eq type 'xref-file-location)
+                             (xref-file-location-column loc)
+                           0)))))))))))
+
+;;;###autoload
+(defun consult-xref (fetcher &optional alist)
+  "Show xrefs with preview in the minibuffer.
+
+This function can be used for `xref-show-xrefs-function'.
+See `xref-show-xrefs-function' for the description of the
+FETCHER and ALIST arguments."
+  (let* ((consult-xref--fetcher fetcher)
+         (candidates (consult-xref--candidates))
+         (display (alist-get 'display-action alist)))
+    (unless candidates
+      (user-error "No xref locations"))
+    (xref-pop-to-location
+     (if (cdr candidates)
+         (apply
+          #'consult--read
+          candidates
+          (append
+           (consult--customize-get #'consult-xref)
+           (list
+            :prompt "Go to xref: "
+            :history 'consult-xref--history
+            :require-match t
+            :sort nil
+            :category 'consult-xref
+            :group #'consult--prefix-group
+            :state
+            ;; do not preview other frame
+            (when-let (fun (pcase-exhaustive display
+                             ('frame nil)
+                             ('window #'switch-to-buffer-other-window)
+                             ('nil #'switch-to-buffer)))
+              (consult-xref--preview fun))
+            :lookup (apply-partially #'consult--lookup-prop 'consult-xref))))
+       (get-text-property 0 'consult-xref (car candidates)))
+     display)))
+
+(provide 'consult-xref)
+;;; consult-xref.el ends here
diff --git a/emacs/elpa/consult-20240516.2240/consult-xref.elc b/emacs/elpa/consult-20240516.2240/consult-xref.elc
Binary files differ.
diff --git a/emacs/elpa/consult-20240516.2240/consult.el b/emacs/elpa/consult-20240516.2240/consult.el
@@ -0,0 +1,5262 @@
+;;; 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
+;; Version: 1.6
+;; Package-Requires: ((emacs "27.1") (compat "29.1.4.4"))
+;; Homepage: 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 "Homepage" "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' is
+supported on Emacs 28 and newer.  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\\*\\'"
+    "\\`\\*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."
+  :type 'natnum)
+
+(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-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))))
+
+(defcustom consult-yank-rotate
+  (if (boundp 'yank-from-kill-ring-rotate)
+      yank-from-kill-ring-rotate
+    t)
+  "Rotate the `kill-ring' in the `consult-yank' commands."
+  :type 'boolean)
+
+;;;; 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)))
+
+;; Upstream bug#46326, Consult issue gh:minad/consult#193.
+(defmacro consult--minibuffer-with-setup-hook (fun &rest body)
+  "Variant of `minibuffer-with-setup-hook' using a symbol and `fset'.
+
+This macro is only needed to prevent memory leaking issues with
+the upstream `minibuffer-with-setup-hook' macro.
+FUN is the hook function and BODY opens the minibuffer."
+  (declare (indent 1) (debug t))
+  (let ((hook (gensym "hook"))
+        (append))
+    (when (eq (car-safe fun) :append)
+      (setq append '(t) fun (cadr fun)))
+    `(let ((,hook (make-symbol "consult--minibuffer-setup-hook")))
+       (fset ,hook (lambda ()
+                     (remove-hook 'minibuffer-setup-hook ,hook)
+                     (funcall ,fun)))
+       (unwind-protect
+           (progn
+             (add-hook 'minibuffer-setup-hook ,hook ,@append)
+             ,@body)
+         (remove-hook 'minibuffer-setup-hook ,hook)))))
+
+(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 (compat-call 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 ((afile (abbreviate-file-name file)))
+      (if (string-match "/\\([^/]+\\)/\\([^/]+/?\\)\\'" afile)
+          (propertize (format "…/%s/%s" (match-string 1 afile) (match-string 2 afile))
+                      'help-echo afile)
+        afile))))
+
+(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)
+            ('nil (or (consult--project-root) 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))
+                          (consult--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
+               (`(,p) (consult--left-truncate-file p))
+               (`(,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)))
+
+(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))
+    (cond
+     ((fboundp 'project-root) (project-root proj))
+     ((fboundp 'project-roots) (car (project-roots 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))
+  `(let (set-message-function) ;; bug#63253: Broken `with-delayed-message'
+     (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 (if (eval-when-compile (>= 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)
+    (consult--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'."
+  (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."
+  (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)))
+
+;; Emacs 28: hide in M-X
+(put #'consult-narrow-help 'completion-predicate #'ignore)
+(put #'consult-narrow 'completion-predicate #'ignore)
+
+;;;; 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)
+       (consult--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 %S\n" args)
+                 (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."
+  (consult--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."
+  (consult--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 (&optional cmd)
+  "Get configuration from `consult--customize-alist' for CMD."
+  (mapcar (lambda (x) (eval x 'lexical))
+          (alist-get (or cmd 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
+        (consult--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))
+                           ;; Emacs 28 has a `read-extended-command-predicate'
+                           (if (bound-and-true-p read-extended-command-predicate)
+                               (funcall read-extended-command-predicate sym buffer)
+                             t))
+                  (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 consult-yank-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' in Emacs 28, 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 consult-yank-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' in Emacs 28, 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.
+
+There exists no equivalent of this command in Emacs 28."
+  (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."
+  (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."
+  (interactive)
+  (consult-isearch-forward (not reverse)))
+
+;; Emacs 28: hide in M-X
+(put #'consult-isearch-backward 'completion-predicate #'ignore)
+(put #'consult-isearch-forward 'completion-predicate #'ignore)
+
+(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))
+             (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 (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 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.
+
+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 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-20240516.2240/consult.elc b/emacs/elpa/consult-20240516.2240/consult.elc
Binary files differ.
diff --git a/emacs/elpa/consult-lsp-20230209.714/consult-lsp-pkg.el b/emacs/elpa/consult-lsp-20230209.714/consult-lsp-pkg.el
@@ -1,17 +0,0 @@
-(define-package "consult-lsp" "20230209.714" "LSP-mode Consult integration"
-  '((emacs "27.1")
-    (lsp-mode "5.0")
-    (consult "0.16")
-    (f "0.20.0"))
-  :commit "f8db3252c0daa41225ba4ed1c0d178b281cd3e90" :authors
-  '(("Gerry Agbobada"))
-  :maintainers
-  '(("Gerry Agbobada"))
-  :maintainer
-  '("Gerry Agbobada")
-  :keywords
-  '("tools" "completion" "lsp")
-  :url "https://github.com/gagbo/consult-lsp")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/consult-lsp-20230209.714/consult-lsp.el b/emacs/elpa/consult-lsp-20230209.714/consult-lsp.el
@@ -1,579 +0,0 @@
-;;; consult-lsp.el --- LSP-mode Consult integration -*- lexical-binding: t; -*-
-
-;; Licence: MIT
-;; Keywords: tools, completion, lsp
-;; Author: Gerry Agbobada
-;; Maintainer: Gerry Agbobada
-;; Package-Requires: ((emacs "27.1") (lsp-mode "5.0") (consult "0.16") (f "0.20.0"))
-;; Version: 1.1-dev
-;; Homepage: https://github.com/gagbo/consult-lsp
-
-;; Copyright (c) 2021 Gerry Agbobada and contributors
-;;
-;; Permission is hereby granted, free of charge, to any person obtaining a copy
-;; of this software and associated documentation files (the "Software"), to deal
-;; in the Software without restriction, including without limitation the rights
-;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-;; copies of the Software, and to permit persons to whom the Software is
-;; furnished to do so, subject to the following conditions:
-;;
-;; The above copyright notice and this permission notice shall be included in all
-;; copies or substantial portions of the Software.
-;;
-;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-;; SOFTWARE.
-
-;;; Commentary:
-;; Provides LSP-mode related commands for consult
-;;
-;; The commands are autoloaded so you don't need to require anything to make them
-;; available. Just use M-x and go!
-;;
-;;;; Diagnostics
-;; M-x consult-lsp-diagnostics provides a view of all diagnostics in the current
-;; workspace (or all workspaces if passed a prefix argument).
-;;
-;; You can use prefixes to filter diagnostics per severity, and
-;; previewing/selecting a candidate will go to it directly.
-;;
-;;;; Symbols
-;; M-x consult-lsp-symbols provides a selection/narrowing command to search
-;; and go to any arbitrary symbol in the workspace (or all workspaces if
-;; passed a prefix argument).
-;;
-;; You can use prefixes as well to filter candidates per type, and
-;; previewing/selecting a candidate will go to it.
-;;
-;;;; File symbols
-;; M-x consult-lsp-file-symbols provides a selection/narrowing command to search
-;; and go to any arbitrary symbol in the selected buffer (like imenu)
-;;
-;;;; Contributions
-;; Possible contributions for ameliorations include:
-;; - using a custom format for the propertized candidates
-;;   This should be done with :type 'function custom variables probably.
-;; - checking the properties in LSP to see how diagnostic-sources should be used
-;; - checking the properties in LSP to see how symbol-sources should be used
-;;; Code:
-
-(eval-when-compile
-  (require 'subr-x))
-(require 'consult)
-(require 'lsp)
-(require 'f)
-(require 'cl-lib)
-
-;; Poorman's breaking change detection
-;; The state protocol change happened in https://github.com/minad/consult/commit/3668df6afaa8c188d7c255fa6ae4e62d54cb20c9
-;; which also happened to remove this macro
-(when (fboundp 'consult--with-location-upgrade)
-  (user-error "This version of consult-lsp is unstable with older versions of consult. Please:
- - upgrade consult past https://github.com/minad/consult/commit/3668df6afaa8c188d7c255fa6ae4e62d54cb20c9 or
- - downgrade consult-lsp to 0.7 tag."))
-
-(defgroup consult-lsp nil
-  "Consult commands for `lsp-mode'."
-  :group 'tools
-  :prefix "consult-lsp-")
-
-;;;; Customization
-(defcustom consult-lsp-diagnostics-transformer-function #'consult-lsp--diagnostics--transformer
-  "Function that transform LSP-mode diagnostic from a (file diag) pair
-to a candidate for `consult-lsp-diagnostics'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-diagnostics-annotate-builder-function #'consult-lsp--diagnostics-annotate-builder
-  "Annotation function builder for `consult-lsp-diagnostics'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-symbols-transformer-function #'consult-lsp--symbols--transformer
-  "Function that transform LSP symbols from symbol-info
-to a candidate for `consult-lsp-symbols'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-symbols-annotate-builder-function #'consult-lsp--symbols-annotate-builder
-  "Annotation function builder for `consult-lsp-symbols'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-file-symbols-transformer-function #'consult-lsp--file-symbols--transformer
-  "Function that transform LSP file symbols from symbol-info
- to a candidate for `consult-lsp-file-symbols'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-file-symbols-annotate-builder-function #'consult-lsp--file-symbols-annotate-builder
-  "Annotation function builder for `consult-lsp-file-symbols'."
-  :type 'function
-  :group 'consult-lsp)
-
-(defcustom consult-lsp-symbols-narrow
-  '(
-    ;; Lowercase classes
-    (?c . "Class")
-    (?f . "Field")
-    (?e . "Enum")
-    (?i . "Interface")
-    (?m . "Module")
-    (?n . "Namespace")
-    (?p . "Package")
-    (?s . "Struct")
-    (?t . "Type Parameter")
-    (?v . "Variable")
-
-    ;; Uppercase classes
-    (?A . "Array")
-    (?B . "Boolean")
-    (?C . "Constant")
-    (?E . "Enum Member")
-    (?F . "Function")
-    (?M . "Method")
-    (?N . "Number")
-    (?O . "Object")
-    (?P . "Property")
-    (?S . "String")
-
-    (?o . "Other")
-    ;; Example types included in "Other" (i.e. the ignored)
-    ;; (?n . "Null")
-    ;; (?c . "Constructor")
-    ;; (?e . "Event")
-    ;; (?k . "Key")
-    ;; (?o . "Operator")
-    )
-  "Set of narrow keys for `consult-lsp-symbols' and `consult-lsp-file-symbols'.
-
-It MUST have a \"Other\" category for everything that is not listed."
-  :group 'consult-lsp
-  :type '(alist :key-type character :value-type string))
-
-
-
-;;;; Inner functions
-;; These helpers are mostly verbatim copies of consult internal functions that are needed,
-;; but are unstable and would break if relied upon
-(defun consult-lsp--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-restriction
-        (save-excursion
-          (widen)
-          (goto-char (point-min))
-          ;; Location data might be invalid by now!
-          (ignore-errors
-            (forward-line (1- line))
-            (forward-char column))
-          (point-marker))))))
-
-(defun consult-lsp--format-file-line-match (file line &optional match)
-  "Format string FILE:LINE:MATCH with faces."
-  (setq line (number-to-string line)
-        match (concat file ":" line (and match ":") 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)
-
-
-;;;; Diagnostics
-
-(defun consult-lsp--diagnostics--flatten-diagnostics (transformer &optional current-workspace?)
-  "Flatten the list of LSP-mode diagnostics to consult candidates.
-
-TRANSFORMER takes (file diag) and returns a suitable element for
-`consult--read'.
-CURRENT-WORKSPACE? has the same meaning as in `lsp-diagnostics'."
-  (sort
-   (flatten-list
-    (ht-map
-     (lambda (file diags)
-       (mapcar (lambda (diag) (funcall transformer file diag))
-               diags))
-     (lsp-diagnostics current-workspace?)))
-   ;; Sort by ascending severity
-   (lambda (cand-left cand-right)
-     (let* ((diag-left (cdr (get-text-property 0 'consult--candidate cand-left)))
-            (diag-right (cdr (get-text-property 0 'consult--candidate cand-right)))
-            (sev-left (or (lsp:diagnostic-severity? diag-left) 12))
-            (sev-right (or (lsp:diagnostic-severity? diag-right) 12)))
-       (< sev-left sev-right)))))
-
-(defun consult-lsp--diagnostics--severity-to-level (diag)
-  "Convert diagnostic severity of DIAG to a string."
-  (pcase (lsp:diagnostic-severity? diag)
-    (1 (propertize "error" 'face 'error))
-    (2 (propertize "warn" 'face 'warning))
-    (3 (propertize "info" 'face 'success))
-    (4 (propertize "hint" 'face 'italic))
-    (_ "unknown")))
-
-(defconst consult-lsp--diagnostics--narrow
-  '((?e . "Errors")
-    (?w . "Warnings")
-    (?i . "Infos")
-    (?h . "Hints")
-    (?u . "Unknown"))
-  "Set of narrow keys for `consult-lsp-diagnostics'.")
-
-(defun consult-lsp--diagnostics--severity-to-type (diag)
-  "Convert diagnostic severity of DIAG to a type for consult--type."
-  (pcase (lsp:diagnostic-severity? diag)
-    (1 (car (rassoc "Errors" consult-lsp--diagnostics--narrow)))
-    (2 (car (rassoc "Warnings" consult-lsp--diagnostics--narrow)))
-    (3 (car (rassoc "Infos" consult-lsp--diagnostics--narrow)))
-    (4 (car (rassoc "Hints" consult-lsp--diagnostics--narrow)))
-    (_ (car (rassoc "Unknown" consult-lsp--diagnostics--narrow)))))
-
-(defun consult-lsp--diagnostics--source (diag)
-  "Convert source of DIAG to a propertized string."
-  (propertize (lsp:diagnostic-source? diag) 'face 'success))
-
-(defun consult-lsp--diagnostics--diagnostic-marker (file diag)
-  "Return a marker in FILE at the beginning of DIAG."
-  (consult-lsp--marker-from-line-column
-   file
-   (lsp-translate-line (1+ (lsp:position-line (lsp:range-start (lsp:diagnostic-range diag)))))
-   (lsp-translate-column (1+ (lsp:position-character (lsp:range-start (lsp:diagnostic-range diag)))))))
-
-(defun consult-lsp--diagnostics--transformer (file diag)
-  "Transform LSP-mode diagnostics from a pair FILE DIAG to a candidate."
-  (propertize
-   (format "%-60.60s"
-           (consult-lsp--format-file-line-match
-            (if-let ((wks (lsp-workspace-root file)))
-                (f-relative file wks)
-              file)
-            (lsp-translate-line (1+ (lsp-get (lsp-get (lsp-get diag :range) :start) :line)))))
-   'consult--candidate (cons file diag)
-   'consult--type (consult-lsp--diagnostics--severity-to-type diag)))
-
-(defun consult-lsp--diagnostics-annotate-builder ()
-  "Annotation function for `consult-lsp-diagnostics'.
-
-See `consult-lsp--diagnostics--transformer' for the usable text-properties
-in candidates."
-  (let* ((width (length (number-to-string (line-number-at-pos
-                                           (point-max)
-                                           consult-line-numbers-widen)))))
-    (lambda (cand)
-      (let* ((diag (cdr (get-text-property 0 'consult--candidate cand))))
-        (list cand
-              (format "%-5s " (consult-lsp--diagnostics--severity-to-level diag))
-              (concat
-               (format "%s" (lsp:diagnostic-message diag))
-               (when-let ((source (consult-lsp--diagnostics--source diag)))
-                 (propertize (format " - %s" source) 'face 'font-lock-doc-face))))))))
-
-(defun consult-lsp--diagnostics--state ()
-  "LSP diagnostic preview."
-  (let ((open (consult--temporary-files))
-        (jump (consult--jump-state)))
-    (lambda (action cand)
-      (when (eq action 'exit)
-        (funcall open))
-      (funcall jump action
-               (when cand (consult-lsp--marker-from-line-column
-                           (and (car cand) (funcall (if (eq action 'finish) #'find-file open) (car cand)))
-                           (lsp-translate-line (1+ (lsp:position-line (lsp:range-start (lsp:diagnostic-range (cdr cand))))))
-                           (lsp-translate-column (1+ (lsp:position-character (lsp:range-start (lsp:diagnostic-range (cdr cand))))))))))))
-
-;;;###autoload
-(defun consult-lsp-diagnostics (arg)
-  "Query LSP-mode diagnostics.
-
-When ARG is set through prefix, query all workspaces."
-  (interactive "P")
-  (let ((all-workspaces? arg))
-    (consult--read (consult-lsp--diagnostics--flatten-diagnostics consult-lsp-diagnostics-transformer-function (not all-workspaces?))
-                   :prompt (concat  "LSP Diagnostics " (when arg "(all workspaces) "))
-                   :annotate (funcall consult-lsp-diagnostics-annotate-builder-function)
-                   :require-match t
-                   :history t
-                   :category 'consult-lsp-diagnostics
-                   :sort nil
-                   :group (consult--type-group consult-lsp--diagnostics--narrow)
-                   :narrow (consult--type-narrow consult-lsp--diagnostics--narrow)
-                   :state (consult-lsp--diagnostics--state)
-                   :lookup #'consult--lookup-candidate)))
-
-
-;;;; Symbols
-
-(defun consult-lsp--symbols--kind-to-narrow (symbol-info)
-  "Get the narrow character for SYMBOL-INFO."
-  (if-let ((pair (rassoc
-                  (alist-get (lsp:symbol-information-kind symbol-info) lsp-symbol-kinds)
-                  consult-lsp-symbols-narrow)))
-      (car pair)
-    (rassoc "Other" consult-lsp-symbols-narrow)))
-
-(defun consult-lsp--symbols--state ()
-  "Return a LSP symbol preview function."
-  (let ((open (consult--temporary-files))
-        (jump (consult--jump-state)))
-    (lambda (action cand)
-      (when (eq action 'exit)
-        (funcall open))
-      (funcall jump action
-               (when cand (let* ((location (lsp:symbol-information-location cand))
-                                 (uri (lsp:location-uri location)))
-                            (consult-lsp--marker-from-line-column
-                             (and uri (funcall (if (eq action 'finish) #'find-file open) (lsp--uri-to-path uri)))
-                             (thread-first location
-                                           (lsp:location-range)
-                                           (lsp:range-start)
-                                           (lsp:position-line)
-                                           (1+)
-                                           (lsp-translate-line))
-                             (thread-first location
-                                           (lsp:location-range)
-                                           (lsp:range-start)
-                                           (lsp:position-character)
-                                           (1+)
-                                           (lsp-translate-column)))))))))
-
-;; It is an async source because some servers, like rust-analyzer, send a
-;; max count of results for queries (120 last time checked). Therefore, in
-;; big projects the first query might not have the target result to filter on.
-;; To avoid this issue, we use an async source that retriggers the request.
-(defun consult-lsp--symbols--make-async-source (async workspaces)
-  "Pipe a `consult--read' compatible async-source ASYNC to search for symbols in WORKSPACES."
-  (let ((cancel-token :consult-lsp--symbols))
-    (lambda (action)
-      (pcase-exhaustive action
-        ((or 'setup (pred stringp))
-         (let ((query (if (stringp action) action "")))
-           (with-lsp-workspaces workspaces
-             (consult--async-log "consult-lsp-symbols request started for %S\n" action)
-             (lsp-request-async
-              "workspace/symbol"
-              (list :query query)
-              (lambda (res)
-                ;; Flush old candidates list
-                (funcall async 'flush)
-                (funcall async res))
-              :mode 'detached
-              :no-merge nil
-              :cancel-token cancel-token)))
-         (funcall async action))
-        ('destroy
-         (lsp-cancel-request-by-token cancel-token)
-         (funcall async action))
-        (_ (funcall async action))))))
-
-(defun consult-lsp--symbols--transformer (symbol-info)
-  "Default transformer to produce a completion candidate from SYMBOL-INFO."
-  (propertize
-   ;; We have to add the location in the candidate string for 2 purposes,
-   ;; in case symbols have the same name:
-   ;; - being able to narrow using the path
-   ;; - because it breaks marginalia integration otherwise
-   ;;   (it uses a cache where candidates are caching keys through `marginalia--cached')
-   (format "%s — %s"
-           (lsp:symbol-information-name symbol-info)
-           (consult-lsp--format-file-line-match
-            (let ((file
-                   (lsp--uri-to-path (lsp:location-uri (lsp:symbol-information-location symbol-info)))))
-              (if-let ((wks (lsp-workspace-root file)))
-                  (f-relative file wks)
-                file))
-            (thread-first symbol-info
-                          (lsp:symbol-information-location)
-                          (lsp:location-range)
-                          (lsp:range-start)
-                          (lsp:position-line)
-                          (1+)
-                          (lsp-translate-line))))
-   'consult--type (consult-lsp--symbols--kind-to-narrow symbol-info)
-   'consult--candidate symbol-info
-   'consult--details (lsp:document-symbol-detail? symbol-info)))
-
-(defun consult-lsp--symbols-annotate-builder ()
-  "Annotation function for `consult-lsp-symbols'.
-
-See `consult-lsp--symbols--transformer' for the available text-properties
-usable in the annotation-function."
-  (let* ((width (length (number-to-string (line-number-at-pos
-                                           (point-max)
-                                           consult-line-numbers-widen))))
-         (fmt (propertize (format "%%%dd " width) 'face 'consult-line-number-prefix)))
-    (lambda (cand)
-      (let* ((symbol-info (get-text-property 0 'consult--candidate cand))
-             (line (thread-first symbol-info
-                     (lsp:symbol-information-location)
-                     (lsp:location-range)
-                     (lsp:range-start)
-                     (lsp:position-line)
-                     (1+)
-                     (lsp-translate-line))))
-        (list
-         cand
-         (format "%-10s "
-                 (alist-get (lsp:symbol-information-kind symbol-info) lsp-symbol-kinds))
-         (concat
-          (or
-           (when-let ((details (get-text-property 0 'consult--details cand)))
-             (propertize (format " — %s" details) 'face 'font-lock-doc-face))
-           "")))))))
-
-;;;###autoload
-(defun consult-lsp-symbols (arg)
-  "Query workspace symbols. When ARG is set through prefix, query all workspaces."
-  (interactive "P")
-  (let* ((initial "")
-         (all-workspaces? arg)
-         (ws (or (and all-workspaces? (-uniq (-flatten (ht-values (lsp-session-folder->servers (lsp-session))))))
-                 (lsp-workspaces)
-                 (lsp-get (lsp-session-folder->servers (lsp-session))
-                          (lsp-workspace-root default-directory)))))
-    (unless ws
-      (user-error "There is no active workspace !"))
-    (consult--read
-     (thread-first
-         (consult--async-sink)
-       (consult--async-refresh-immediate)
-       (consult--async-map consult-lsp-symbols-transformer-function)
-       (consult-lsp--symbols--make-async-source ws)
-       (consult--async-throttle)
-       (consult--async-split))
-     :prompt "LSP Symbols "
-     :annotate (funcall consult-lsp-symbols-annotate-builder-function)
-     :require-match t
-     :history t
-     :add-history (consult--async-split-thingatpt 'symbol)
-     :initial (consult--async-split-initial initial)
-     :category 'consult-lsp-symbols
-     :lookup #'consult--lookup-candidate
-     :group (consult--type-group consult-lsp-symbols-narrow)
-     :narrow (consult--type-narrow consult-lsp-symbols-narrow)
-     :state (consult-lsp--symbols--state))))
-
-
-;;;; File symbols
-
-(defun consult-lsp--flatten-document-symbols (to-flatten)
-  "Helper function for flattening document symbols TO-FLATTEN to a plain list."
-  (cl-labels ((rec-helper
-               (to-flatten accumulator)
-               (dolist (table to-flatten)
-                 (push table accumulator)
-                 (when-let ((children (lsp-get table :children)))
-                   (setq accumulator (rec-helper
-                                      (append children nil) ; convert children from vector to list
-                                      accumulator))))
-               accumulator))
-    (nreverse (rec-helper to-flatten nil))))
-
-(defun consult-lsp--file-symbols--transformer (symbol)
-  "Default transformer to produce a completion candidate from SYMBOL."
-  (let ((lbeg (thread-first symbol
-                            (lsp:document-symbol-selection-range)
-                            (lsp:range-start)
-                            (lsp:position-line)
-                            (lsp-translate-line)))
-        (lend (thread-first symbol
-                            (lsp:document-symbol-selection-range)
-                            (lsp:range-end)
-                            (lsp:position-line)
-                            (lsp-translate-line)))
-        (cbeg (thread-first symbol
-                            (lsp:document-symbol-selection-range)
-                            (lsp:range-start)
-                            (lsp:position-character)
-                            (lsp-translate-column)))
-        (cend (thread-first symbol
-                            (lsp:document-symbol-selection-range)
-                            (lsp:range-end)
-                            (lsp:position-character)
-                            (lsp-translate-column))))
-    (let ((beg (lsp--line-character-to-point lbeg cbeg))
-          (end (lsp--line-character-to-point lend cend))
-          (marker (make-marker)))
-      (set-marker marker beg)
-      ;; Pre-condition to respect narrowing
-      (unless (or (< beg (point-min))
-                  (> end (point-max)))
-        ;; NOTE: no need to add anything to the candidate string like
-        ;; for consult-lsp-symbols because
-        ;; - we have the line location and there are less hits in this command,
-        ;; - the candidates are different caching keys because of
-        ;;   `consult--location-candidate' usage.
-        ;;
-        ;; `consult--location-candidate' is unavailable for
-        ;; `consult-lsp--symbols--transformer'because it needs a marker,
-        ;; and we cannot create marker for buffers that aren't open.
-        (consult--location-candidate
-         (let ((substr (consult--buffer-substring beg end 'fontify))
-               (symb-info-name (lsp:symbol-information-name symbol)))
-           (concat substr
-                   (unless (string= substr symb-info-name)
-                     (format " (%s)"
-                             symb-info-name))))
-         marker
-         (1+ lbeg)
-         marker
-         'consult--type (consult-lsp--symbols--kind-to-narrow symbol)
-         'consult--name (lsp:symbol-information-name symbol)
-         'consult--details (lsp:document-symbol-detail? symbol))))))
-
-(defun consult-lsp--file-symbols-candidates ()
-  "Returns all candidates for a `consult-lsp-file-symbols' search.
-
-See the :annotate documentation of `consult--read' for more information."
-  (consult--forbid-minibuffer)
-  (let* ((all-symbols (consult-lsp--flatten-document-symbols
-                       (lsp-request "textDocument/documentSymbol"
-                                    (lsp-make-document-symbol-params :text-document
-                                                                     (lsp--text-document-identifier)))))
-         (candidates (mapcar consult-lsp-file-symbols-transformer-function all-symbols)))
-    (unless candidates
-      (user-error "No symbols"))
-    candidates))
-
-(defun consult-lsp--file-symbols-annotate-builder ()
-  "Annotation function for `consult-lsp-file-symbols'."
-  (let* ((width (length (number-to-string (line-number-at-pos
-                                           (point-max)
-                                           consult-line-numbers-widen))))
-         (fmt (propertize (format "%%%dd " width) 'face 'consult-line-number-prefix)))
-    (lambda (cand)
-      (let ((line (cdr (get-text-property 0 'consult-location cand))))
-        (list cand
-              (format fmt line)
-              (concat
-               (when-let ((details (get-text-property 0 'consult--details cand)))
-                 (propertize (format " - %s" details) 'face 'font-lock-doc-face))))))))
-
-;;;###autoload
-(defun consult-lsp-file-symbols (group-results)
-  "Search symbols defined in current file in a manner similar to `consult-line'.
-
-If the prefix argument GROUP-RESULTS is specified, symbols are grouped by their
-kind; otherwise they are returned in the order that they appear in the file."
-  (interactive "P")
-  (consult--read
-   (consult--with-increased-gc (consult-lsp--file-symbols-candidates))
-   :prompt "Go to symbol: "
-   :annotate (funcall consult-lsp-file-symbols-annotate-builder-function)
-   :require-match t
-   :sort nil
-   :history '(:input consult--line-history)
-   :category 'consult-lsp-file-symbols
-   :lookup #'consult--line-match
-   :narrow (consult--type-narrow consult-lsp-symbols-narrow)
-   :group (when group-results (consult--type-group consult-lsp-symbols-narrow))
-   :state (consult--jump-state)))
-
-
-
-(provide 'consult-lsp)
-;;; consult-lsp.el ends here
diff --git a/emacs/elpa/consult-lsp-20230209.714/consult-lsp.elc b/emacs/elpa/consult-lsp-20230209.714/consult-lsp.elc
Binary files differ.
diff --git a/emacs/elpa/consult-lsp-20230209.714/consult-lsp-autoloads.el b/emacs/elpa/consult-lsp-20240507.2105/consult-lsp-autoloads.el
diff --git a/emacs/elpa/consult-lsp-20240507.2105/consult-lsp-pkg.el b/emacs/elpa/consult-lsp-20240507.2105/consult-lsp-pkg.el
@@ -0,0 +1,17 @@
+(define-package "consult-lsp" "20240507.2105" "LSP-mode Consult integration"
+  '((emacs "27.1")
+    (lsp-mode "5.0")
+    (consult "0.16")
+    (f "0.20.0"))
+  :commit "68583913168bf66fd4d542b2517a2dcab19c447c" :authors
+  '(("Gerry Agbobada"))
+  :maintainers
+  '(("Gerry Agbobada"))
+  :maintainer
+  '("Gerry Agbobada")
+  :keywords
+  '("tools" "completion" "lsp")
+  :url "https://github.com/gagbo/consult-lsp")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/consult-lsp-20240507.2105/consult-lsp.el b/emacs/elpa/consult-lsp-20240507.2105/consult-lsp.el
@@ -0,0 +1,618 @@
+;;; consult-lsp.el --- LSP-mode Consult integration -*- lexical-binding: t; -*-
+
+;; Licence: MIT
+;; Keywords: tools, completion, lsp
+;; Author: Gerry Agbobada
+;; Maintainer: Gerry Agbobada
+;; Package-Requires: ((emacs "27.1") (lsp-mode "5.0") (consult "0.16") (f "0.20.0"))
+;; Version: 1.1-dev
+;; Homepage: https://github.com/gagbo/consult-lsp
+
+;; Copyright (c) 2021 Gerry Agbobada and contributors
+;;
+;; Permission is hereby granted, free of charge, to any person obtaining a copy
+;; of this software and associated documentation files (the "Software"), to deal
+;; in the Software without restriction, including without limitation the rights
+;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+;; copies of the Software, and to permit persons to whom the Software is
+;; furnished to do so, subject to the following conditions:
+;;
+;; The above copyright notice and this permission notice shall be included in all
+;; copies or substantial portions of the Software.
+;;
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+;; SOFTWARE.
+
+;;; Commentary:
+;; Provides LSP-mode related commands for consult
+;;
+;; The commands are autoloaded so you don't need to require anything to make them
+;; available. Just use M-x and go!
+;;
+;;;; Diagnostics
+;; M-x consult-lsp-diagnostics provides a view of all diagnostics in the current
+;; workspace (or all workspaces if passed a prefix argument).
+;;
+;; You can use prefixes to filter diagnostics per severity, and
+;; previewing/selecting a candidate will go to it directly.
+;;
+;;;; Symbols
+;; M-x consult-lsp-symbols provides a selection/narrowing command to search
+;; and go to any arbitrary symbol in the workspace (or all workspaces if
+;; passed a prefix argument).
+;;
+;; You can use prefixes as well to filter candidates per type, and
+;; previewing/selecting a candidate will go to it.
+;;
+;;;; File symbols
+;; M-x consult-lsp-file-symbols provides a selection/narrowing command to search
+;; and go to any arbitrary symbol in the selected buffer (like imenu)
+;;
+;;;; Contributions
+;; Possible contributions for ameliorations include:
+;; - using a custom format for the propertized candidates
+;;   This should be done with :type 'function custom variables probably.
+;; - checking the properties in LSP to see how diagnostic-sources should be used
+;; - checking the properties in LSP to see how symbol-sources should be used
+;;; Code:
+
+(eval-when-compile
+  (require 'subr-x))
+(require 'consult)
+(require 'lsp)
+(require 'f)
+(require 'cl-lib)
+
+;; Poorman's breaking change detection
+;; The state protocol change happened in https://github.com/minad/consult/commit/3668df6afaa8c188d7c255fa6ae4e62d54cb20c9
+;; which also happened to remove this macro
+(when (fboundp 'consult--with-location-upgrade)
+  (user-error "This version of consult-lsp is unstable with older versions of consult. Please:
+ - upgrade consult past https://github.com/minad/consult/commit/3668df6afaa8c188d7c255fa6ae4e62d54cb20c9 or
+ - downgrade consult-lsp to 0.7 tag."))
+
+(defgroup consult-lsp nil
+  "Consult commands for `lsp-mode'."
+  :group 'tools
+  :prefix "consult-lsp-")
+
+;;;; Customization
+(defcustom consult-lsp-diagnostics-transformer-function #'consult-lsp--diagnostics--transformer
+  "Function that transform LSP-mode diagnostic from a (file diag) pair
+to a candidate for `consult-lsp-diagnostics'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-diagnostics-annotate-builder-function #'consult-lsp--diagnostics-annotate-builder
+  "Annotation function builder for `consult-lsp-diagnostics'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-symbols-transformer-function #'consult-lsp--symbols--transformer
+  "Function that transform LSP symbols from symbol-info
+to a candidate for `consult-lsp-symbols'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-symbols-annotate-builder-function #'consult-lsp--symbols-annotate-builder
+  "Annotation function builder for `consult-lsp-symbols'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-file-symbols-transformer-function #'consult-lsp--file-symbols--transformer
+  "Function that transform LSP file symbols from symbol-info
+ to a candidate for `consult-lsp-file-symbols'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-file-symbols-annotate-builder-function #'consult-lsp--file-symbols-annotate-builder
+  "Annotation function builder for `consult-lsp-file-symbols'."
+  :type 'function
+  :group 'consult-lsp)
+
+(defcustom consult-lsp-symbols-narrow
+  '(
+    ;; Lowercase classes
+    (?c . "Class")
+    (?f . "Field")
+    (?e . "Enum")
+    (?i . "Interface")
+    (?m . "Module")
+    (?n . "Namespace")
+    (?p . "Package")
+    (?s . "Struct")
+    (?t . "Type Parameter")
+    (?v . "Variable")
+
+    ;; Uppercase classes
+    (?A . "Array")
+    (?B . "Boolean")
+    (?C . "Constant")
+    (?E . "Enum Member")
+    (?F . "Function")
+    (?M . "Method")
+    (?N . "Number")
+    (?O . "Object")
+    (?P . "Property")
+    (?S . "String")
+
+    (?o . "Other"))
+    ;; Example types included in "Other" (i.e. the ignored)
+    ;; (?n . "Null")
+    ;; (?c . "Constructor")
+    ;; (?e . "Event")
+    ;; (?k . "Key")
+    ;; (?o . "Operator")
+    
+  "Set of narrow keys for `consult-lsp-symbols' and `consult-lsp-file-symbols'.
+
+It MUST have a \"Other\" category for everything that is not listed."
+  :group 'consult-lsp
+  :type '(alist :key-type character :value-type string))
+
+(defcustom consult-lsp-min-query-length consult-async-min-input
+  "Don't query LSP server with fewer than this many characters of input."
+  :type 'integer
+  :group 'consult-lsp)
+
+
+
+;;;; Inner functions
+;; These helpers are mostly verbatim copies of consult internal functions that are needed,
+;; but are unstable and would break if relied upon
+(defun consult-lsp--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-restriction
+        (save-excursion
+          (widen)
+          (goto-char (point-min))
+          ;; Location data might be invalid by now!
+          (ignore-errors
+            (forward-line (1- line))
+            (forward-char column))
+          (point-marker))))))
+
+(defun consult-lsp--format-file-line-match (file line &optional match)
+  "Format string FILE:LINE:MATCH with faces."
+  (setq line (number-to-string line)
+        match (concat file ":" line (and match ":") 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)
+
+
+;;;; Diagnostics
+
+(defun consult-lsp--diagnostics--flatten-diagnostics (transformer &optional current-workspace?)
+  "Flatten the list of LSP-mode diagnostics to consult candidates.
+
+TRANSFORMER takes (file diag) and returns a suitable element for
+`consult--read'.
+CURRENT-WORKSPACE? has the same meaning as in `lsp-diagnostics'."
+  (sort
+   (flatten-list
+    (ht-map
+     (lambda (file diags)
+       (mapcar (lambda (diag) (funcall transformer file diag))
+               diags))
+     (lsp-diagnostics current-workspace?)))
+   ;; Sort by ascending severity
+   (lambda (cand-left cand-right)
+     (let* ((diag-left (cdr (get-text-property 0 'consult--candidate cand-left)))
+            (diag-right (cdr (get-text-property 0 'consult--candidate cand-right)))
+            (sev-left (or (lsp:diagnostic-severity? diag-left) 12))
+            (sev-right (or (lsp:diagnostic-severity? diag-right) 12)))
+       (< sev-left sev-right)))))
+
+(defun consult-lsp--diagnostics--severity-to-level (diag)
+  "Convert diagnostic severity of DIAG to a string."
+  (pcase (lsp:diagnostic-severity? diag)
+    (1 (propertize "error" 'face 'error))
+    (2 (propertize "warn" 'face 'warning))
+    (3 (propertize "info" 'face 'success))
+    (4 (propertize "hint" 'face 'italic))
+    (_ "unknown")))
+
+(defconst consult-lsp--diagnostics--narrow
+  '((?e . "Errors")
+    (?w . "Warnings")
+    (?i . "Infos")
+    (?h . "Hints")
+    (?u . "Unknown"))
+  "Set of narrow keys for `consult-lsp-diagnostics'.")
+
+(defun consult-lsp--diagnostics--severity-to-type (diag)
+  "Convert diagnostic severity of DIAG to a type for consult--type."
+  (pcase (lsp:diagnostic-severity? diag)
+    (1 (car (rassoc "Errors" consult-lsp--diagnostics--narrow)))
+    (2 (car (rassoc "Warnings" consult-lsp--diagnostics--narrow)))
+    (3 (car (rassoc "Infos" consult-lsp--diagnostics--narrow)))
+    (4 (car (rassoc "Hints" consult-lsp--diagnostics--narrow)))
+    (_ (car (rassoc "Unknown" consult-lsp--diagnostics--narrow)))))
+
+(defun consult-lsp--diagnostics--source (diag)
+  "Convert source of DIAG to a propertized string."
+  (propertize (lsp:diagnostic-source? diag) 'face 'success))
+
+(defun consult-lsp--diagnostics--diagnostic-marker (file diag)
+  "Return a marker in FILE at the beginning of DIAG."
+  (consult-lsp--marker-from-line-column
+   file
+   (lsp-translate-line (1+ (lsp:position-line (lsp:range-start (lsp:diagnostic-range diag)))))
+   (lsp-translate-column (1+ (lsp:position-character (lsp:range-start (lsp:diagnostic-range diag)))))))
+
+(defun consult-lsp--diagnostics--transformer (file diag)
+  "Transform LSP-mode diagnostics from a pair FILE DIAG to a candidate."
+  (propertize
+   (format "%-60.60s"
+           (consult-lsp--format-file-line-match
+            (if-let ((wks (lsp-workspace-root file)))
+                (f-relative file wks)
+              file)
+            (lsp-translate-line (1+ (lsp-get (lsp-get (lsp-get diag :range) :start) :line)))))
+   'consult--candidate (cons file diag)
+   'consult--type (consult-lsp--diagnostics--severity-to-type diag)))
+
+(defun consult-lsp--diagnostics-annotate-builder ()
+  "Annotation function for `consult-lsp-diagnostics'.
+
+See `consult-lsp--diagnostics--transformer' for the usable text-properties
+in candidates."
+  (let* ((width (length (number-to-string (line-number-at-pos
+                                           (point-max)
+                                           consult-line-numbers-widen)))))
+    (lambda (cand)
+      (let* ((diag (cdr (get-text-property 0 'consult--candidate cand))))
+        (list cand
+              (format "%-5s " (consult-lsp--diagnostics--severity-to-level diag))
+              (concat
+               (format "%s" (lsp:diagnostic-message diag))
+               (when-let ((source (consult-lsp--diagnostics--source diag)))
+                 (propertize (format " - %s" source) 'face 'font-lock-doc-face))))))))
+
+(defun consult-lsp--diagnostics--state ()
+  "LSP diagnostic preview."
+  (let ((open (consult--temporary-files))
+        (jump (consult--jump-state)))
+    (lambda (action cand)
+      (when (eq action 'exit)
+        (funcall open))
+      (funcall jump action
+               (when cand (consult-lsp--marker-from-line-column
+                           (and (car cand) (funcall (if (eq action 'finish) #'find-file open) (car cand)))
+                           (lsp-translate-line (1+ (lsp:position-line (lsp:range-start (lsp:diagnostic-range (cdr cand))))))
+                           (lsp-translate-column (1+ (lsp:position-character (lsp:range-start (lsp:diagnostic-range (cdr cand))))))))))))
+
+;;;###autoload
+(defun consult-lsp-diagnostics (arg)
+  "Query LSP-mode diagnostics.
+
+When ARG is set through prefix, query all workspaces."
+  (interactive "P")
+  (let ((all-workspaces? arg))
+    (consult--read (consult-lsp--diagnostics--flatten-diagnostics consult-lsp-diagnostics-transformer-function (not all-workspaces?))
+                   :prompt (concat  "LSP Diagnostics " (when arg "(all workspaces) "))
+                   :annotate (funcall consult-lsp-diagnostics-annotate-builder-function)
+                   :require-match t
+                   :history t
+                   :category 'consult-lsp-diagnostics
+                   :sort nil
+                   :group (consult--type-group consult-lsp--diagnostics--narrow)
+                   :narrow (consult--type-narrow consult-lsp--diagnostics--narrow)
+                   :state (consult-lsp--diagnostics--state)
+                   :lookup #'consult--lookup-candidate)))
+
+
+;;;; Symbols
+
+(defun consult-lsp--symbols--kind-to-narrow (symbol-info)
+  "Get the narrow character for SYMBOL-INFO."
+  (if-let ((pair (rassoc
+                  (alist-get (lsp:symbol-information-kind symbol-info) lsp-symbol-kinds)
+                  consult-lsp-symbols-narrow)))
+      (car pair)
+    (rassoc "Other" consult-lsp-symbols-narrow)))
+
+(defun consult-lsp--symbols--state ()
+  "Return a LSP symbol preview function."
+  (let ((open (consult--temporary-files))
+        (jump (consult--jump-state)))
+    (lambda (action cand)
+      (when (eq action 'exit)
+        (funcall open))
+      (funcall jump action
+               (when cand (let* ((location (lsp:symbol-information-location cand))
+                                 (uri (lsp:location-uri location)))
+                            (consult-lsp--marker-from-line-column
+                             (and uri (funcall (if (eq action 'finish) #'find-file open) (lsp--uri-to-path uri)))
+                             (thread-first location
+                                           (lsp:location-range)
+                                           (lsp:range-start)
+                                           (lsp:position-line)
+                                           (1+)
+                                           (lsp-translate-line))
+                             (thread-first location
+                                           (lsp:location-range)
+                                           (lsp:range-start)
+                                           (lsp:position-character)
+                                           (1+)
+                                           (lsp-translate-column)))))))))
+
+;; It is an async source because some servers, like rust-analyzer, send a
+;; max count of results for queries (120 last time checked). Therefore, in
+;; big projects the first query might not have the target result to filter on.
+;; To avoid this issue, we use an async source that retriggers the request.
+(defun consult-lsp--symbols--make-async-source (async workspaces)
+  "Pipe a `consult--read' compatible async-source ASYNC to search for symbols in WORKSPACES."
+  (let* ((async (consult--async-indicator async))
+         (cancel-token :consult-lsp--symbols)
+         (query-lsp (lambda (query)
+                      (with-lsp-workspaces workspaces
+                        (consult--async-log "consult-lsp-symbols request started for %S\n" query)
+                        (funcall async 'indicator 'running)
+                        (lsp-request-async "workspace/symbol"
+                                           (list :query query)
+                                           (lambda (res)
+                                             ;; Flush old candidates list
+                                             (funcall async 'flush)
+                                             (funcall async res)
+                                             (funcall async 'indicator 'finished))
+                                           :mode 'detached
+                                           :no-merge t
+                                           :cancel-token cancel-token)))))
+    (lambda (action)
+      (pcase-exhaustive action
+        ('setup
+         (funcall async action)
+         (funcall query-lsp ""))
+        ((pred stringp)
+         (funcall async action)
+         (unless (string= "" action)
+           (funcall query-lsp action)))
+        ('destroy
+         (funcall async action)
+         (lsp-cancel-request-by-token cancel-token))
+        (_ (funcall async action))))))
+
+(defun consult-lsp--symbols--transformer (workspace symbol-info)
+  "Default transformer to produce a completion candidate from the WORKSPACE's SYMBOL-INFO."
+  (propertize
+   ;; We have to add the location in the candidate string for 2 purposes,
+   ;; in case symbols have the same name:
+   ;; - being able to narrow using the path
+   ;; - because it breaks marginalia integration otherwise
+   ;;   (it uses a cache where candidates are caching keys through `marginalia--cached')
+   (format "%s — %s"
+           (lsp:symbol-information-name symbol-info)
+           (consult-lsp--format-file-line-match
+            (let ((file
+                   (lsp--uri-to-path (lsp:location-uri (lsp:symbol-information-location symbol-info)))))
+              (if-let ((wks (lsp--workspace-root workspace)))
+                  (f-relative file wks)
+                file))
+            (thread-first symbol-info
+                          (lsp:symbol-information-location)
+                          (lsp:location-range)
+                          (lsp:range-start)
+                          (lsp:position-line)
+                          (1+)
+                          (lsp-translate-line))))
+   'consult--type (consult-lsp--symbols--kind-to-narrow symbol-info)
+   'consult--candidate symbol-info
+   'consult--details (lsp:document-symbol-detail? symbol-info)
+   'consult--container-name (lsp-get symbol-info :containerName)))
+
+(defun consult-lsp--symbols--make-transformer (workspace-symbols-info)
+  "Invokes the default transformer for each SYMBOL-INFO in the response.
+
+WORKSPACE-SYMBOLS-INFO is of the form (lsp--workspace . (list symbol-info))"
+  (let ((workspace (car workspace-symbols-info))
+        (symbols-info (cdr workspace-symbols-info)))
+    (mapcar (lambda (symbol-info)
+              (funcall consult-lsp-symbols-transformer-function workspace symbol-info))
+            symbols-info)))
+
+(defun consult-lsp--symbols-annotate-builder ()
+  "Annotation function for `consult-lsp-symbols'.
+
+See `consult-lsp--symbols--transformer' for the available text-properties
+usable in the annotation-function."
+  (let* ((width (length (number-to-string (line-number-at-pos
+                                           (point-max)
+                                           consult-line-numbers-widen))))
+         (fmt (propertize (format "%%%dd " width) 'face 'consult-line-number-prefix)))
+    (lambda (cand)
+      (let* ((symbol-info (get-text-property 0 'consult--candidate cand))
+             (line (thread-first symbol-info
+                                 (lsp:symbol-information-location)
+                                 (lsp:location-range)
+                                 (lsp:range-start)
+                                 (lsp:position-line)
+                                 (1+)
+                                 (lsp-translate-line))))
+        (list
+         cand
+         (format "%-10s "
+                 (alist-get (lsp:symbol-information-kind symbol-info) lsp-symbol-kinds))
+         (concat
+          (or
+           (when-let ((details (get-text-property 0 'consult--details cand)))
+             (propertize (format " — %s" details) 'face 'font-lock-doc-face))
+           (when-let ((cont (get-text-property 0 'consult--container-name cand)))
+             (propertize (format " %s" cont) 'face 'completions-annotations))
+           "")))))))
+
+;;;###autoload
+(defun consult-lsp-symbols (arg)
+  "Query workspace symbols. When ARG is set through prefix, query all workspaces."
+  (interactive "P")
+  (let* ((initial "")
+         (all-workspaces? arg)
+         (ws (or (and all-workspaces? (-uniq (-flatten (ht-values (lsp-session-folder->servers (lsp-session))))))
+                 (lsp-workspaces)
+                 (lsp-get (lsp-session-folder->servers (lsp-session))
+                          (lsp-workspace-root default-directory))))
+         (consult-async-min-input consult-lsp-min-query-length))
+    (unless ws
+      (user-error "There is no active workspace !"))
+    (consult--read
+     (thread-first
+       (consult--async-sink)
+       (consult--async-refresh-timer)
+       (consult--async-transform mapcan #'consult-lsp--symbols--make-transformer)
+       (consult-lsp--symbols--make-async-source ws)
+       (consult--async-throttle)
+       (consult--async-split))
+     :prompt "LSP Symbols "
+     :annotate (funcall consult-lsp-symbols-annotate-builder-function)
+     :require-match t
+     :history t
+     :add-history (consult--async-split-thingatpt 'symbol)
+     :initial (consult--async-split-initial initial)
+     :category 'consult-lsp-symbols
+     :lookup #'consult--lookup-candidate
+     :group (consult--type-group consult-lsp-symbols-narrow)
+     :narrow (consult--type-narrow consult-lsp-symbols-narrow)
+     :state (consult-lsp--symbols--state))))
+
+
+;;;; File symbols
+
+(defun consult-lsp--flatten-document-symbols (to-flatten)
+  "Helper function for flattening document symbols TO-FLATTEN to a plain list."
+  (cl-labels ((rec-helper
+                (to-flatten accumulator parents)
+               (dolist (table to-flatten)
+                 ;; Table may be of type SymbolInformation or DocumentSymbol. See
+                 ;; https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_documentSymbol
+                 ;; SymbolInformation already has containerName, but one have to
+                 ;; recreate it when DocumentSymbol has returned.
+                 (when (and parents
+                            (null (lsp-get table :containerName)))
+                   (lsp-put table :containerName (string-join parents ".")))
+                 (push table accumulator)
+                 (when-let ((children (lsp-get table :children)))
+                   (setq parents (append parents (list (lsp-get table :name))))
+                   (setq accumulator (rec-helper
+                                      (append children nil) ; convert children from vector to list
+                                      accumulator
+                                      parents))
+                   (setq parents (nbutlast parents))))
+               accumulator))
+    (nreverse (rec-helper to-flatten nil nil))))
+
+(defun consult-lsp--file-symbols--transformer (symbol)
+  "Default transformer to produce a completion candidate from SYMBOL."
+  (let ((lbeg (thread-first symbol
+                            (lsp:document-symbol-selection-range)
+                            (lsp:range-start)
+                            (lsp:position-line)
+                            (lsp-translate-line)))
+        (lend (thread-first symbol
+                            (lsp:document-symbol-selection-range)
+                            (lsp:range-end)
+                            (lsp:position-line)
+                            (lsp-translate-line)))
+        (cbeg (thread-first symbol
+                            (lsp:document-symbol-selection-range)
+                            (lsp:range-start)
+                            (lsp:position-character)
+                            (lsp-translate-column)))
+        (cend (thread-first symbol
+                            (lsp:document-symbol-selection-range)
+                            (lsp:range-end)
+                            (lsp:position-character)
+                            (lsp-translate-column))))
+    (let ((beg (lsp--line-character-to-point lbeg cbeg))
+          (end (lsp--line-character-to-point lend cend))
+          (marker (make-marker)))
+      (set-marker marker beg)
+      ;; Pre-condition to respect narrowing
+      (unless (or (< beg (point-min))
+                  (> end (point-max)))
+        ;; NOTE: no need to add anything to the candidate string like
+        ;; for consult-lsp-symbols because
+        ;; - we have the line location and there are less hits in this command,
+        ;; - the candidates are different caching keys because of
+        ;;   `consult--location-candidate' usage.
+        ;;
+        ;; `consult--location-candidate' is unavailable for
+        ;; `consult-lsp--symbols--transformer'because it needs a marker,
+        ;; and we cannot create marker for buffers that aren't open.
+        (consult--location-candidate
+         (let ((substr (consult--buffer-substring beg end 'fontify))
+               (symb-info-name (lsp:symbol-information-name symbol)))
+           (concat substr
+                   (unless (string= substr symb-info-name)
+                     (format " (%s)"
+                             symb-info-name))))
+         marker
+         (1+ lbeg)
+         marker
+         'consult--type (consult-lsp--symbols--kind-to-narrow symbol)
+         'consult--name (lsp:symbol-information-name symbol)
+         'consult--details (lsp:document-symbol-detail? symbol)
+         'consult--container-name (lsp-get symbol :containerName))))))
+
+(defun consult-lsp--file-symbols-candidates ()
+  "Returns all candidates for a `consult-lsp-file-symbols' search.
+
+See the :annotate documentation of `consult--read' for more information."
+  (consult--forbid-minibuffer)
+  (let* ((all-symbols (consult-lsp--flatten-document-symbols
+                       (lsp-request "textDocument/documentSymbol"
+                                    (lsp-make-document-symbol-params :text-document
+                                                                     (lsp--text-document-identifier)))))
+         (candidates (mapcar consult-lsp-file-symbols-transformer-function all-symbols)))
+    (unless candidates
+      (user-error "No symbols"))
+    candidates))
+
+(defun consult-lsp--file-symbols-annotate-builder ()
+  "Annotation function for `consult-lsp-file-symbols'."
+  (let* ((width (length (number-to-string (line-number-at-pos
+                                           (point-max)
+                                           consult-line-numbers-widen))))
+         (fmt (propertize (format "%%%dd " width) 'face 'consult-line-number-prefix)))
+    (lambda (cand)
+      (let ((line (cdr (get-text-property 0 'consult-location cand))))
+        (list cand
+              (format fmt line)
+              (concat
+               (when-let ((details (get-text-property 0 'consult--details cand)))
+                 (propertize (format " - %s" details) 'face 'font-lock-doc-face))
+               (when-let ((container (get-text-property 0 'consult--container-name cand)))
+                 (propertize (format " %s" container) 'face 'completions-annotations))))))))
+
+;;;###autoload
+(defun consult-lsp-file-symbols (group-results)
+  "Search symbols defined in current file in a manner similar to `consult-line'.
+
+If the prefix argument GROUP-RESULTS is specified, symbols are grouped by their
+kind; otherwise they are returned in the order that they appear in the file."
+  (interactive "P")
+  (consult--read
+   (consult--with-increased-gc (consult-lsp--file-symbols-candidates))
+   :prompt "Go to symbol: "
+   :annotate (funcall consult-lsp-file-symbols-annotate-builder-function)
+   :require-match t
+   :sort nil
+   :history '(:input consult--line-history)
+   :category 'consult-lsp-file-symbols
+   :lookup #'consult--line-match
+   :narrow (consult--type-narrow consult-lsp-symbols-narrow)
+   :group (when group-results (consult--type-group consult-lsp-symbols-narrow))
+   :state (consult--jump-state)))
+
+
+
+(provide 'consult-lsp)
+;;; consult-lsp.el ends here
diff --git a/emacs/elpa/consult-lsp-20240507.2105/consult-lsp.elc b/emacs/elpa/consult-lsp-20240507.2105/consult-lsp.elc
Binary files differ.
diff --git a/emacs/elpa/dash-20240405.946/dash-pkg.el b/emacs/elpa/dash-20240405.946/dash-pkg.el
@@ -1,14 +0,0 @@
-(define-package "dash" "20240405.946" "A modern list library for Emacs"
-  '((emacs "24"))
-  :commit "885332bbc4582b08d4f24526250876f3a7569067" :authors
-  '(("Magnar Sveen" . "magnars@gmail.com"))
-  :maintainers
-  '(("Magnar Sveen" . "magnars@gmail.com"))
-  :maintainer
-  '("Magnar Sveen" . "magnars@gmail.com")
-  :keywords
-  '("extensions" "lisp")
-  :url "https://github.com/magnars/dash.el")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/dash-20240405.946/dash.el b/emacs/elpa/dash-20240405.946/dash.el
@@ -1,4136 +0,0 @@
-;;; dash.el --- A modern list library for Emacs  -*- lexical-binding: t -*-
-
-;; Copyright (C) 2012-2024 Free Software Foundation, Inc.
-
-;; Author: Magnar Sveen <magnars@gmail.com>
-;; Version: 2.19.1
-;; Package-Requires: ((emacs "24"))
-;; Keywords: extensions, lisp
-;; Homepage: https://github.com/magnars/dash.el
-
-;; 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:
-
-;; A modern list API for Emacs.
-;;
-;; See its overview at https://github.com/magnars/dash.el#functions.
-
-;;; Code:
-
-(eval-when-compile
-  ;; TODO: Emacs 24.3 first introduced `gv', so remove this and all
-  ;; calls to `defsetf' when support for earlier versions is dropped.
-  (unless (fboundp 'gv-define-setter)
-    (require 'cl))
-
-  ;; - 24.3 started complaining about unknown `declare' props.
-  ;; - 25 introduced `pure' and `side-effect-free'.
-  ;; - 30 introduced `important-return-value'.
-  (when (boundp 'defun-declarations-alist)
-    (dolist (prop '(important-return-value pure side-effect-free))
-      (unless (assq prop defun-declarations-alist)
-        (push (list prop #'ignore) defun-declarations-alist)))))
-
-(defgroup dash ()
-  "Customize group for Dash, a modern list library."
-  :group 'extensions
-  :group 'lisp
-  :prefix "dash-")
-
-(defmacro !cons (car cdr)
-  "Destructive: Set CDR to the cons of CAR and CDR."
-  (declare (debug (form symbolp)))
-  `(setq ,cdr (cons ,car ,cdr)))
-
-(defmacro !cdr (list)
-  "Destructive: Set LIST to the cdr of LIST."
-  (declare (debug (symbolp)))
-  `(setq ,list (cdr ,list)))
-
-(defmacro --each (list &rest body)
-  "Evaluate BODY for each element of LIST and return nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating BODY.
-This is the anaphoric counterpart to `-each'."
-  (declare (debug (form body)) (indent 1))
-  (let ((l (make-symbol "list"))
-        (i (make-symbol "i")))
-    `(let ((,l ,list)
-           (,i 0))
-       (while ,l
-         (let ((it (pop ,l)) (it-index ,i))
-           (ignore it it-index)
-           ,@body)
-         (setq ,i (1+ ,i))))))
-
-(defun -each (list fn)
-  "Call FN on each element of LIST.
-Return nil; this function is intended for side effects.
-
-Its anaphoric counterpart is `--each'.
-
-For access to the current element's index in LIST, see
-`-each-indexed'."
-  (declare (indent 1))
-  (ignore (mapc fn list)))
-
-(defalias '--each-indexed '--each)
-
-(defun -each-indexed (list fn)
-  "Call FN on each index and element of LIST.
-For each ITEM at INDEX in LIST, call (funcall FN INDEX ITEM).
-Return nil; this function is intended for side effects.
-
-See also: `-map-indexed'."
-  (declare (indent 1))
-  (--each list (funcall fn it-index it)))
-
-(defmacro --each-while (list pred &rest body)
-  "Evaluate BODY for each item in LIST, while PRED evaluates to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating PRED or BODY.  Once
-an element is reached for which PRED evaluates to nil, no further
-BODY is evaluated.  The return value is always nil.
-This is the anaphoric counterpart to `-each-while'."
-  (declare (debug (form form body)) (indent 2))
-  (let ((l (make-symbol "list"))
-        (i (make-symbol "i"))
-        (elt (make-symbol "elt")))
-    `(let ((,l ,list)
-           (,i 0)
-           ,elt)
-       (while (when ,l
-                (setq ,elt (car-safe ,l))
-                (let ((it ,elt) (it-index ,i))
-                  (ignore it it-index)
-                  ,pred))
-         (let ((it ,elt) (it-index ,i))
-           (ignore it it-index)
-           ,@body)
-         (setq ,i (1+ ,i) ,l (cdr ,l))))))
-
-(defun -each-while (list pred fn)
-  "Call FN on each ITEM in LIST, while (PRED ITEM) is non-nil.
-Once an ITEM is reached for which PRED returns nil, FN is no
-longer called.  Return nil; this function is intended for side
-effects.
-
-Its anaphoric counterpart is `--each-while'."
-  (declare (indent 2))
-  (--each-while list (funcall pred it) (funcall fn it)))
-
-(defmacro --each-r (list &rest body)
-  "Evaluate BODY for each element of LIST in reversed order.
-Each element of LIST in turn, starting at its end, is bound to
-`it' and its index within LIST to `it-index' before evaluating
-BODY.  The return value is always nil.
-This is the anaphoric counterpart to `-each-r'."
-  (declare (debug (form body)) (indent 1))
-  (let ((v (make-symbol "vector"))
-        (i (make-symbol "i")))
-    ;; Implementation note: building a vector is considerably faster
-    ;; than building a reversed list (vector takes less memory, so
-    ;; there is less GC), plus `length' comes naturally.  In-place
-    ;; `nreverse' would be faster still, but BODY would be able to see
-    ;; that, even if the modification was undone before we return.
-    `(let* ((,v (vconcat ,list))
-            (,i (length ,v))
-            it it-index)
-       (ignore it it-index)
-       (while (> ,i 0)
-         (setq ,i (1- ,i) it-index ,i it (aref ,v ,i))
-         ,@body))))
-
-(defun -each-r (list fn)
-  "Call FN on each element of LIST in reversed order.
-Return nil; this function is intended for side effects.
-
-Its anaphoric counterpart is `--each-r'."
-  (--each-r list (funcall fn it)))
-
-(defmacro --each-r-while (list pred &rest body)
-  "Eval BODY for each item in reversed LIST, while PRED evals to non-nil.
-Each element of LIST in turn, starting at its end, is bound to
-`it' and its index within LIST to `it-index' before evaluating
-PRED or BODY.  Once an element is reached for which PRED
-evaluates to nil, no further BODY is evaluated.  The return value
-is always nil.
-This is the anaphoric counterpart to `-each-r-while'."
-  (declare (debug (form form body)) (indent 2))
-  (let ((v (make-symbol "vector"))
-        (i (make-symbol "i"))
-        (elt (make-symbol "elt")))
-    `(let* ((,v (vconcat ,list))
-            (,i (length ,v))
-            ,elt it it-index)
-       (ignore it it-index)
-       (while (when (> ,i 0)
-                (setq ,i (1- ,i) it-index ,i)
-                (setq ,elt (aref ,v ,i) it ,elt)
-                ,pred)
-         (setq it-index ,i it ,elt)
-         ,@body))))
-
-(defun -each-r-while (list pred fn)
-  "Call FN on each ITEM in reversed LIST, while (PRED ITEM) is non-nil.
-Once an ITEM is reached for which PRED returns nil, FN is no
-longer called.  Return nil; this function is intended for side
-effects.
-
-Its anaphoric counterpart is `--each-r-while'."
-  (--each-r-while list (funcall pred it) (funcall fn it)))
-
-(defmacro --dotimes (num &rest body)
-  "Evaluate BODY NUM times, presumably for side effects.
-BODY is evaluated with the local variable `it' temporarily bound
-to successive integers running from 0, inclusive, to NUM,
-exclusive.  BODY is not evaluated if NUM is less than 1.
-This is the anaphoric counterpart to `-dotimes'."
-  (declare (debug (form body)) (indent 1))
-  (let ((n (make-symbol "num"))
-        (i (make-symbol "i")))
-    `(let ((,n ,num)
-           (,i 0)
-           it)
-       (ignore it)
-       (while (< ,i ,n)
-         (setq it ,i ,i (1+ ,i))
-         ,@body))))
-
-(defun -dotimes (num fn)
-  "Call FN NUM times, presumably for side effects.
-FN is called with a single argument on successive integers
-running from 0, inclusive, to NUM, exclusive.  FN is not called
-if NUM is less than 1.
-
-This function's anaphoric counterpart is `--dotimes'."
-  (declare (indent 1))
-  (--dotimes num (funcall fn it)))
-
-(defun -map (fn list)
-  "Apply FN to each item in LIST and return the list of results.
-
-This function's anaphoric counterpart is `--map'."
-  (declare (important-return-value t))
-  (mapcar fn list))
-
-(defmacro --map (form list)
-  "Eval FORM for each item in LIST and return the list of results.
-Each element of LIST in turn is bound to `it' before evaluating
-FORM.
-This is the anaphoric counterpart to `-map'."
-  (declare (debug (def-form form)))
-  `(mapcar (lambda (it) (ignore it) ,form) ,list))
-
-(defmacro --reduce-from (form init list)
-  "Accumulate a value by evaluating FORM across LIST.
-This macro is like `--each' (which see), but it additionally
-provides an accumulator variable `acc' which it successively
-binds to the result of evaluating FORM for the current LIST
-element before processing the next element.  For the first
-element, `acc' is initialized with the result of evaluating INIT.
-The return value is the resulting value of `acc'.  If LIST is
-empty, FORM is not evaluated, and the return value is the result
-of INIT.
-This is the anaphoric counterpart to `-reduce-from'."
-  (declare (debug (form form form)))
-  `(let ((acc ,init))
-     (--each ,list (setq acc ,form))
-     acc))
-
-(defun -reduce-from (fn init list)
-  "Reduce the function FN across LIST, starting with INIT.
-Return the result of applying FN to INIT and the first element of
-LIST, then applying FN to that result and the second element,
-etc.  If LIST is empty, return INIT without calling FN.
-
-This function's anaphoric counterpart is `--reduce-from'.
-
-For other folds, see also `-reduce' and `-reduce-r'."
-  (declare (important-return-value t))
-  (--reduce-from (funcall fn acc it) init list))
-
-(defmacro --reduce (form list)
-  "Accumulate a value by evaluating FORM across LIST.
-This macro is like `--reduce-from' (which see), except the first
-element of LIST is taken as INIT.  Thus if LIST contains a single
-item, it is returned without evaluating FORM.  If LIST is empty,
-FORM is evaluated with `it' and `acc' bound to nil.
-This is the anaphoric counterpart to `-reduce'."
-  (declare (debug (form form)))
-  (let ((lv (make-symbol "list-value")))
-    `(let ((,lv ,list))
-       (if ,lv
-           (--reduce-from ,form (car ,lv) (cdr ,lv))
-         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
-         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
-         (let ((acc nil) (it nil))
-           (ignore acc it)
-           ,form)))))
-
-(defun -reduce (fn list)
-  "Reduce the function FN across LIST.
-Return the result of applying FN to the first two elements of
-LIST, then applying FN to that result and the third element, etc.
-If LIST contains a single element, return it without calling FN.
-If LIST is empty, return the result of calling FN with no
-arguments.
-
-This function's anaphoric counterpart is `--reduce'.
-
-For other folds, see also `-reduce-from' and `-reduce-r'."
-  (declare (important-return-value t))
-  (if list
-      (-reduce-from fn (car list) (cdr list))
-    (funcall fn)))
-
-(defmacro --reduce-r-from (form init list)
-  "Accumulate a value by evaluating FORM across LIST in reverse.
-This macro is like `--reduce-from', except it starts from the end
-of LIST.
-This is the anaphoric counterpart to `-reduce-r-from'."
-  (declare (debug (form form form)))
-  `(let ((acc ,init))
-     (--each-r ,list (setq acc ,form))
-     acc))
-
-(defun -reduce-r-from (fn init list)
-  "Reduce the function FN across LIST in reverse, starting with INIT.
-Return the result of applying FN to the last element of LIST and
-INIT, then applying FN to the second-to-last element and the
-previous result of FN, etc.  That is, the first argument of FN is
-the current element, and its second argument the accumulated
-value.  If LIST is empty, return INIT without calling FN.
-
-This function is like `-reduce-from' but the operation associates
-from the right rather than left.  In other words, it starts from
-the end of LIST and flips the arguments to FN.  Conceptually, it
-is like replacing the conses in LIST with applications of FN, and
-its last link with INIT, and evaluating the resulting expression.
-
-This function's anaphoric counterpart is `--reduce-r-from'.
-
-For other folds, see also `-reduce-r' and `-reduce'."
-  (declare (important-return-value t))
-  (--reduce-r-from (funcall fn it acc) init list))
-
-(defmacro --reduce-r (form list)
-  "Accumulate a value by evaluating FORM across LIST in reverse order.
-This macro is like `--reduce', except it starts from the end of
-LIST.
-This is the anaphoric counterpart to `-reduce-r'."
-  (declare (debug (form form)))
-  `(--reduce ,form (reverse ,list)))
-
-(defun -reduce-r (fn list)
-  "Reduce the function FN across LIST in reverse.
-Return the result of applying FN to the last two elements of
-LIST, then applying FN to the third-to-last element and the
-previous result of FN, etc.  That is, the first argument of FN is
-the current element, and its second argument the accumulated
-value.  If LIST contains a single element, return it without
-calling FN.  If LIST is empty, return the result of calling FN
-with no arguments.
-
-This function is like `-reduce' but the operation associates from
-the right rather than left.  In other words, it starts from the
-end of LIST and flips the arguments to FN.  Conceptually, it is
-like replacing the conses in LIST with applications of FN,
-ignoring its last link, and evaluating the resulting expression.
-
-This function's anaphoric counterpart is `--reduce-r'.
-
-For other folds, see also `-reduce-r-from' and `-reduce'."
-  (declare (important-return-value t))
-  (if list
-      (--reduce-r (funcall fn it acc) list)
-    (funcall fn)))
-
-(defmacro --reductions-from (form init list)
-  "Return a list of FORM's intermediate reductions across LIST.
-That is, a list of the intermediate values of the accumulator
-when `--reduce-from' (which see) is called with the same
-arguments.
-This is the anaphoric counterpart to `-reductions-from'."
-  (declare (debug (form form form)))
-  `(nreverse
-    (--reduce-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
-                   (list ,init)
-                   ,list)))
-
-(defun -reductions-from (fn init list)
-  "Return a list of FN's intermediate reductions across LIST.
-That is, a list of the intermediate values of the accumulator
-when `-reduce-from' (which see) is called with the same
-arguments.
-
-This function's anaphoric counterpart is `--reductions-from'.
-
-For other folds, see also `-reductions' and `-reductions-r'."
-  (declare (important-return-value t))
-  (--reductions-from (funcall fn acc it) init list))
-
-(defmacro --reductions (form list)
-  "Return a list of FORM's intermediate reductions across LIST.
-That is, a list of the intermediate values of the accumulator
-when `--reduce' (which see) is called with the same arguments.
-This is the anaphoric counterpart to `-reductions'."
-  (declare (debug (form form)))
-  (let ((lv (make-symbol "list-value")))
-    `(let ((,lv ,list))
-       (if ,lv
-           (--reductions-from ,form (car ,lv) (cdr ,lv))
-         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
-         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
-         (let ((acc nil) (it nil))
-           (ignore acc it)
-           (list ,form))))))
-
-(defun -reductions (fn list)
-  "Return a list of FN's intermediate reductions across LIST.
-That is, a list of the intermediate values of the accumulator
-when `-reduce' (which see) is called with the same arguments.
-
-This function's anaphoric counterpart is `--reductions'.
-
-For other folds, see also `-reductions' and `-reductions-r'."
-  (declare (important-return-value t))
-  (if list
-      (--reductions-from (funcall fn acc it) (car list) (cdr list))
-    (list (funcall fn))))
-
-(defmacro --reductions-r-from (form init list)
-  "Return a list of FORM's intermediate reductions across reversed LIST.
-That is, a list of the intermediate values of the accumulator
-when `--reduce-r-from' (which see) is called with the same
-arguments.
-This is the anaphoric counterpart to `-reductions-r-from'."
-  (declare (debug (form form form)))
-  `(--reduce-r-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
-                    (list ,init)
-                    ,list))
-
-(defun -reductions-r-from (fn init list)
-  "Return a list of FN's intermediate reductions across reversed LIST.
-That is, a list of the intermediate values of the accumulator
-when `-reduce-r-from' (which see) is called with the same
-arguments.
-
-This function's anaphoric counterpart is `--reductions-r-from'.
-
-For other folds, see also `-reductions' and `-reductions-r'."
-  (declare (important-return-value t))
-  (--reductions-r-from (funcall fn it acc) init list))
-
-(defmacro --reductions-r (form list)
-  "Return a list of FORM's intermediate reductions across reversed LIST.
-That is, a list of the intermediate values of the accumulator
-when `--reduce-re' (which see) is called with the same arguments.
-This is the anaphoric counterpart to `-reductions-r'."
-  (declare (debug (form list)))
-  (let ((lv (make-symbol "list-value")))
-    `(let ((,lv (reverse ,list)))
-       (if ,lv
-           (--reduce-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
-                          (list (car ,lv))
-                          (cdr ,lv))
-         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
-         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
-         (let ((acc nil) (it nil))
-           (ignore acc it)
-           (list ,form))))))
-
-(defun -reductions-r (fn list)
-  "Return a list of FN's intermediate reductions across reversed LIST.
-That is, a list of the intermediate values of the accumulator
-when `-reduce-r' (which see) is called with the same arguments.
-
-This function's anaphoric counterpart is `--reductions-r'.
-
-For other folds, see also `-reductions-r-from' and
-`-reductions'."
-  (declare (important-return-value t))
-  (if list
-      (--reductions-r (funcall fn it acc) list)
-    (list (funcall fn))))
-
-(defmacro --filter (form list)
-  "Return a new list of the items in LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-filter'.
-For the opposite operation, see also `--remove'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list (when ,form (push it ,r)))
-       (nreverse ,r))))
-
-(defun -filter (pred list)
-  "Return a new list of the items in LIST for which PRED returns non-nil.
-
-Alias: `-select'.
-
-This function's anaphoric counterpart is `--filter'.
-
-For similar operations, see also `-keep' and `-remove'."
-  (declare (important-return-value t))
-  (--filter (funcall pred it) list))
-
-(defalias '-select '-filter)
-(defalias '--select '--filter)
-
-(defmacro --remove (form list)
-  "Return a new list of the items in LIST for which FORM evals to nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-remove'.
-For the opposite operation, see also `--filter'."
-  (declare (debug (form form)))
-  `(--filter (not ,form) ,list))
-
-(defun -remove (pred list)
-  "Return a new list of the items in LIST for which PRED returns nil.
-
-Alias: `-reject'.
-
-This function's anaphoric counterpart is `--remove'.
-
-For similar operations, see also `-keep' and `-filter'."
-  (declare (important-return-value t))
-  (--remove (funcall pred it) list))
-
-(defalias '-reject '-remove)
-(defalias '--reject '--remove)
-
-(defmacro --remove-first (form list)
-  "Remove the first item from LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.  This is a
-non-destructive operation, but only the front of LIST leading up
-to the removed item is a copy; the rest is LIST's original tail.
-If no item is removed, then the result is a complete copy.
-This is the anaphoric counterpart to `-remove-first'."
-  (declare (debug (form form)))
-  (let ((front (make-symbol "front"))
-        (tail (make-symbol "tail")))
-    `(let ((,tail ,list) ,front)
-       (--each-while ,tail (not ,form)
-         (push (pop ,tail) ,front))
-       (if ,tail
-           (nconc (nreverse ,front) (cdr ,tail))
-         (nreverse ,front)))))
-
-(defun -remove-first (pred list)
-  "Remove the first item from LIST for which PRED returns non-nil.
-This is a non-destructive operation, but only the front of LIST
-leading up to the removed item is a copy; the rest is LIST's
-original tail.  If no item is removed, then the result is a
-complete copy.
-
-Alias: `-reject-first'.
-
-This function's anaphoric counterpart is `--remove-first'.
-
-See also `-map-first', `-remove-item', and `-remove-last'."
-  (declare (important-return-value t))
-  (--remove-first (funcall pred it) list))
-
-;; TODO: #'-quoting the macro upsets Emacs 24.
-(defalias '-reject-first #'-remove-first)
-(defalias '--reject-first '--remove-first)
-
-(defmacro --remove-last (form list)
-  "Remove the last item from LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' before evaluating
-FORM.  The result is a copy of LIST regardless of whether an
-element is removed.
-This is the anaphoric counterpart to `-remove-last'."
-  (declare (debug (form form)))
-  `(nreverse (--remove-first ,form (reverse ,list))))
-
-(defun -remove-last (pred list)
-  "Remove the last item from LIST for which PRED returns non-nil.
-The result is a copy of LIST regardless of whether an element is
-removed.
-
-Alias: `-reject-last'.
-
-This function's anaphoric counterpart is `--remove-last'.
-
-See also `-map-last', `-remove-item', and `-remove-first'."
-  (declare (important-return-value t))
-  (--remove-last (funcall pred it) list))
-
-(defalias '-reject-last '-remove-last)
-(defalias '--reject-last '--remove-last)
-
-(defalias '-remove-item #'remove
-  "Return a copy of LIST with all occurrences of ITEM removed.
-The comparison is done with `equal'.
-\n(fn ITEM LIST)")
-
-(defmacro --keep (form list)
-  "Eval FORM for each item in LIST and return the non-nil results.
-Like `--filter', but returns the non-nil results of FORM instead
-of the corresponding elements of LIST.  Each element of LIST in
-turn is bound to `it' and its index within LIST to `it-index'
-before evaluating FORM.
-This is the anaphoric counterpart to `-keep'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (m (make-symbol "mapped")))
-    `(let (,r)
-       (--each ,list (let ((,m ,form)) (when ,m (push ,m ,r))))
-       (nreverse ,r))))
-
-(defun -keep (fn list)
-  "Return a new list of the non-nil results of applying FN to each item in LIST.
-Like `-filter', but returns the non-nil results of FN instead of
-the corresponding elements of LIST.
-
-Its anaphoric counterpart is `--keep'."
-  (declare (important-return-value t))
-  (--keep (funcall fn it) list))
-
-(defun -non-nil (list)
-  "Return a copy of LIST with all nil items removed."
-  (declare (side-effect-free t))
-  (--filter it list))
-
-(defmacro --map-indexed (form list)
-  "Eval FORM for each item in LIST and return the list of results.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.  This is like
-`--map', but additionally makes `it-index' available to FORM.
-
-This is the anaphoric counterpart to `-map-indexed'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list
-         (push ,form ,r))
-       (nreverse ,r))))
-
-(defun -map-indexed (fn list)
-  "Apply FN to each index and item in LIST and return the list of results.
-This is like `-map', but FN takes two arguments: the index of the
-current element within LIST, and the element itself.
-
-This function's anaphoric counterpart is `--map-indexed'.
-
-For a side-effecting variant, see also `-each-indexed'."
-  (declare (important-return-value t))
-  (--map-indexed (funcall fn it-index it) list))
-
-(defmacro --map-when (pred rep list)
-  "Anaphoric form of `-map-when'."
-  (declare (debug (form form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list (!cons (if ,pred ,rep it) ,r))
-       (nreverse ,r))))
-
-(defun -map-when (pred rep list)
-  "Use PRED to conditionally apply REP to each item in LIST.
-Return a copy of LIST where the items for which PRED returns nil
-are unchanged, and the rest are mapped through the REP function.
-
-Alias: `-replace-where'
-
-See also: `-update-at'"
-  (declare (important-return-value t))
-  (--map-when (funcall pred it) (funcall rep it) list))
-
-(defalias '-replace-where '-map-when)
-(defalias '--replace-where '--map-when)
-
-(defun -map-first (pred rep list)
-  "Use PRED to determine the first item in LIST to call REP on.
-Return a copy of LIST where the first item for which PRED returns
-non-nil is replaced with the result of calling REP on that item.
-
-See also: `-map-when', `-replace-first'"
-  (declare (important-return-value t))
-  (let (front)
-    (while (and list (not (funcall pred (car list))))
-      (push (car list) front)
-      (!cdr list))
-    (if list
-        (-concat (nreverse front) (cons (funcall rep (car list)) (cdr list)))
-      (nreverse front))))
-
-(defmacro --map-first (pred rep list)
-  "Anaphoric form of `-map-first'."
-  (declare (debug (def-form def-form form)))
-  `(-map-first (lambda (it) (ignore it) ,pred)
-               (lambda (it) (ignore it) ,rep)
-               ,list))
-
-(defun -map-last (pred rep list)
-  "Use PRED to determine the last item in LIST to call REP on.
-Return a copy of LIST where the last item for which PRED returns
-non-nil is replaced with the result of calling REP on that item.
-
-See also: `-map-when', `-replace-last'"
-  (declare (important-return-value t))
-  (nreverse (-map-first pred rep (reverse list))))
-
-(defmacro --map-last (pred rep list)
-  "Anaphoric form of `-map-last'."
-  (declare (debug (def-form def-form form)))
-  `(-map-last (lambda (it) (ignore it) ,pred)
-              (lambda (it) (ignore it) ,rep)
-              ,list))
-
-(defun -replace (old new list)
-  "Replace all OLD items in LIST with NEW.
-
-Elements are compared using `equal'.
-
-See also: `-replace-at'"
-  (declare (pure t) (side-effect-free t))
-  (--map-when (equal it old) new list))
-
-(defun -replace-first (old new list)
-  "Replace the first occurrence of OLD with NEW in LIST.
-
-Elements are compared using `equal'.
-
-See also: `-map-first'"
-  (declare (pure t) (side-effect-free t))
-  (--map-first (equal old it) new list))
-
-(defun -replace-last (old new list)
-  "Replace the last occurrence of OLD with NEW in LIST.
-
-Elements are compared using `equal'.
-
-See also: `-map-last'"
-  (declare (pure t) (side-effect-free t))
-  (--map-last (equal old it) new list))
-
-(defmacro --mapcat (form list)
-  "Anaphoric form of `-mapcat'."
-  (declare (debug (form form)))
-  `(apply #'append (--map ,form ,list)))
-
-(defun -mapcat (fn list)
-  "Return the concatenation of the result of mapping FN over LIST.
-Thus function FN should return a list."
-  (declare (important-return-value t))
-  (--mapcat (funcall fn it) list))
-
-(defmacro --iterate (form init n)
-  "Anaphoric version of `-iterate'."
-  (declare (debug (form form form)))
-  (let ((res (make-symbol "result"))
-        (len (make-symbol "n")))
-    `(let ((,len ,n))
-       (when (> ,len 0)
-         (let* ((it ,init)
-                (,res (list it)))
-           (dotimes (_ (1- ,len))
-             (push (setq it ,form) ,res))
-           (nreverse ,res))))))
-
-(defun -iterate (fun init n)
-  "Return a list of iterated applications of FUN to INIT.
-
-This means a list of the form:
-
-  (INIT (FUN INIT) (FUN (FUN INIT)) ...)
-
-N is the length of the returned list."
-  (declare (important-return-value t))
-  (--iterate (funcall fun it) init n))
-
-(defun -flatten (l)
-  "Take a nested list L and return its contents as a single, flat list.
-
-Note that because nil represents a list of zero elements (an
-empty list), any mention of nil in L will disappear after
-flattening.  If you need to preserve nils, consider `-flatten-n'
-or map them to some unique symbol and then map them back.
-
-Conses of two atoms are considered \"terminals\", that is, they
-aren't flattened further.
-
-See also: `-flatten-n'"
-  (declare (pure t) (side-effect-free t))
-  (if (and (listp l) (listp (cdr l)))
-      (-mapcat '-flatten l)
-    (list l)))
-
-(defun -flatten-n (num list)
-  "Flatten NUM levels of a nested LIST.
-
-See also: `-flatten'"
-  (declare (pure t) (side-effect-free t))
-  (dotimes (_ num)
-    (setq list (apply #'append (mapcar #'-list list))))
-  list)
-
-(defalias '-concat #'append
-  "Concatenate all the arguments and make the result a list.
-The result is a list whose elements are the elements of all the arguments.
-Each argument may be a list, vector or string.
-
-All arguments except the last argument are copied.  The last argument
-is just used as the tail of the new list.
-
-\(fn &rest SEQUENCES)")
-
-(defalias '-copy #'copy-sequence
-  "Create a shallow copy of LIST.
-
-\(fn LIST)")
-
-(defmacro --splice (pred form list)
-  "Splice lists generated by FORM in place of items satisfying PRED in LIST.
-
-Evaluate PRED for each element of LIST in turn bound to `it'.
-Whenever the result of PRED is nil, leave that `it' is-is.
-Otherwise, evaluate FORM with the same `it' binding still in
-place.  The result should be a (possibly empty) list of items to
-splice in place of `it' in LIST.
-
-This can be useful as an alternative to the `,@' construct in a
-`\\=`' structure, in case you need to splice several lists at
-marked positions (for example with keywords).
-
-This is the anaphoric counterpart to `-splice'."
-  (declare (debug (form form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each ,list
-         (if ,pred
-             (--each ,form (push it ,r))
-           (push it ,r)))
-       (nreverse ,r))))
-
-(defun -splice (pred fun list)
-  "Splice lists generated by FUN in place of items satisfying PRED in LIST.
-
-Call PRED on each element of LIST.  Whenever the result of PRED
-is nil, leave that `it' as-is.  Otherwise, call FUN on the same
-`it' that satisfied PRED.  The result should be a (possibly
-empty) list of items to splice in place of `it' in LIST.
-
-This can be useful as an alternative to the `,@' construct in a
-`\\=`' structure, in case you need to splice several lists at
-marked positions (for example with keywords).
-
-This function's anaphoric counterpart is `--splice'.
-
-See also: `-splice-list', `-insert-at'."
-  (declare (important-return-value t))
-  (--splice (funcall pred it) (funcall fun it) list))
-
-(defun -splice-list (pred new-list list)
-  "Splice NEW-LIST in place of elements matching PRED in LIST.
-
-See also: `-splice', `-insert-at'"
-  (declare (important-return-value t))
-  (-splice pred (lambda (_) new-list) list))
-
-(defmacro --splice-list (pred new-list list)
-  "Anaphoric form of `-splice-list'."
-  (declare (debug (def-form form form)))
-  `(-splice-list (lambda (it) (ignore it) ,pred) ,new-list ,list))
-
-(defun -cons* (&rest args)
-  "Make a new list from the elements of ARGS.
-The last 2 elements of ARGS are used as the final cons of the
-result, so if the final element of ARGS is not a list, the result
-is a dotted list.  With no ARGS, return nil."
-  (declare (side-effect-free t))
-  (let* ((len (length args))
-         (tail (nthcdr (- len 2) args))
-         (last (cdr tail)))
-    (if (null last)
-        (car args)
-      (setcdr tail (car last))
-      args)))
-
-(defun -snoc (list elem &rest elements)
-  "Append ELEM to the end of the list.
-
-This is like `cons', but operates on the end of list.
-
-If any ELEMENTS are given, append them to the list as well."
-  (declare (side-effect-free t))
-  (-concat list (list elem) elements))
-
-(defmacro --first (form list)
-  "Return the first item in LIST for which FORM evals to non-nil.
-Return nil if no such element is found.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-first'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each-while ,list (or (not ,form)
-                               (ignore (setq ,n it))))
-       ,n)))
-
-(defun -first (pred list)
-  "Return the first item in LIST for which PRED returns non-nil.
-Return nil if no such element is found.
-
-To get the first item in the list no questions asked,
-use `-first-item'.
-
-Alias: `-find'.
-
-This function's anaphoric counterpart is `--first'."
-  (declare (important-return-value t))
-  (--first (funcall pred it) list))
-
-(defalias '-find #'-first)
-(defalias '--find '--first)
-
-(defmacro --some (form list)
-  "Return non-nil if FORM evals to non-nil for at least one item in LIST.
-If so, return the first such result of FORM.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-some'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each-while ,list (not (setq ,n ,form)))
-       ,n)))
-
-(defun -some (pred list)
-  "Return (PRED x) for the first LIST item where (PRED x) is non-nil, else nil.
-
-Alias: `-any'.
-
-This function's anaphoric counterpart is `--some'."
-  (declare (important-return-value t))
-  (--some (funcall pred it) list))
-
-(defalias '-any '-some)
-(defalias '--any '--some)
-
-(defmacro --every (form list)
-  "Return non-nil if FORM evals to non-nil for all items in LIST.
-If so, return the last such result of FORM.  Otherwise, once an
-item is reached for which FORM yields nil, return nil without
-evaluating FORM for any further LIST elements.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-
-This macro is like `--every-p', but on success returns the last
-non-nil result of FORM instead of just t.
-
-This is the anaphoric counterpart to `-every'."
-  (declare (debug (form form)))
-  (let ((a (make-symbol "all")))
-    `(let ((,a t))
-       (--each-while ,list (setq ,a ,form))
-       ,a)))
-
-(defun -every (pred list)
-  "Return non-nil if PRED returns non-nil for all items in LIST.
-If so, return the last such result of PRED.  Otherwise, once an
-item is reached for which PRED returns nil, return nil without
-calling PRED on any further LIST elements.
-
-This function is like `-every-p', but on success returns the last
-non-nil result of PRED instead of just t.
-
-This function's anaphoric counterpart is `--every'."
-  (declare (important-return-value t))
-  (--every (funcall pred it) list))
-
-(defmacro --last (form list)
-  "Anaphoric form of `-last'."
-  (declare (debug (form form)))
-  (let ((n (make-symbol "needle")))
-    `(let (,n)
-       (--each ,list
-         (when ,form (setq ,n it)))
-       ,n)))
-
-(defun -last (pred list)
-  "Return the last x in LIST where (PRED x) is non-nil, else nil."
-  (declare (important-return-value t))
-  (--last (funcall pred it) list))
-
-(defalias '-first-item #'car
-  "Return the first item of LIST, or nil on an empty list.
-
-See also: `-second-item', `-last-item', etc.
-
-\(fn LIST)")
-
-;; Ensure that calls to `-first-item' are compiled to a single opcode,
-;; just like `car'.
-(put '-first-item 'byte-opcode 'byte-car)
-(put '-first-item 'byte-compile 'byte-compile-one-arg)
-(put '-first-item 'pure t)
-(put '-first-item 'side-effect-free t)
-
-(defalias '-second-item #'cadr
-  "Return the second item of LIST, or nil if LIST is too short.
-
-See also: `-first-item', `-third-item', etc.
-
-\(fn LIST)")
-
-(put '-second-item 'pure t)
-(put '-second-item 'side-effect-free t)
-
-(defalias '-third-item
-  (if (fboundp 'caddr)
-      #'caddr
-    (lambda (list) (car (cddr list))))
-  "Return the third item of LIST, or nil if LIST is too short.
-
-See also: `-second-item', `-fourth-item', etc.
-
-\(fn LIST)")
-
-(put '-third-item 'pure t)
-(put '-third-item 'side-effect-free t)
-
-(defalias '-fourth-item
-  (if (fboundp 'cadddr)
-      #'cadddr
-    (lambda (list) (cadr (cddr list))))
-  "Return the fourth item of LIST, or nil if LIST is too short.
-
-See also: `-third-item', `-fifth-item', etc.
-
-\(fn LIST)")
-
-(put '-fourth-item 'pure t)
-(put '-fourth-item 'side-effect-free t)
-
-(defun -fifth-item (list)
-  "Return the fifth item of LIST, or nil if LIST is too short.
-
-See also: `-fourth-item', `-last-item', etc."
-  (declare (pure t) (side-effect-free t))
-  (car (cddr (cddr list))))
-
-(defun -last-item (list)
-  "Return the last item of LIST, or nil on an empty list.
-
-See also: `-first-item', etc."
-  (declare (pure t) (side-effect-free t))
-  (car (last list)))
-
-;; Use `with-no-warnings' to suppress unbound `-last-item' or
-;; undefined `gv--defsetter' warnings arising from both
-;; `gv-define-setter' and `defsetf' in certain Emacs versions.
-(with-no-warnings
-  (if (fboundp 'gv-define-setter)
-      (gv-define-setter -last-item (val x) `(setcar (last ,x) ,val))
-    (defsetf -last-item (x) (val) `(setcar (last ,x) ,val))))
-
-(defun -butlast (list)
-  "Return a list of all items in list except for the last."
-  ;; no alias as we don't want magic optional argument
-  (declare (pure t) (side-effect-free t))
-  (butlast list))
-
-(defmacro --count (pred list)
-  "Anaphoric form of `-count'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let ((,r 0))
-       (--each ,list (when ,pred (setq ,r (1+ ,r))))
-       ,r)))
-
-(defun -count (pred list)
-  "Counts the number of items in LIST where (PRED item) is non-nil."
-  (declare (important-return-value t))
-  (--count (funcall pred it) list))
-
-(defun ---truthy? (obj)
-  "Return OBJ as a boolean value (t or nil)."
-  (declare (pure t) (side-effect-free error-free))
-  (and obj t))
-
-(defmacro --any? (form list)
-  "Anaphoric form of `-any?'."
-  (declare (debug (form form)))
-  `(and (--some ,form ,list) t))
-
-(defun -any? (pred list)
-  "Return t if (PRED X) is non-nil for any X in LIST, else nil.
-
-Alias: `-any-p', `-some?', `-some-p'"
-  (declare (important-return-value t))
-  (--any? (funcall pred it) list))
-
-(defalias '-some? '-any?)
-(defalias '--some? '--any?)
-(defalias '-any-p '-any?)
-(defalias '--any-p '--any?)
-(defalias '-some-p '-any?)
-(defalias '--some-p '--any?)
-
-(defmacro --all? (form list)
-  "Return t if FORM evals to non-nil for all items in LIST.
-Otherwise, once an item is reached for which FORM yields nil,
-return nil without evaluating FORM for any further LIST elements.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-
-The similar macro `--every' is more widely useful, since it
-returns the last non-nil result of FORM instead of just t on
-success.
-
-Alias: `--all-p', `--every-p', `--every?'.
-
-This is the anaphoric counterpart to `-all?'."
-  (declare (debug (form form)))
-  `(and (--every ,form ,list) t))
-
-(defun -all? (pred list)
-  "Return t if (PRED X) is non-nil for all X in LIST, else nil.
-In the latter case, stop after the first X for which (PRED X) is
-nil, without calling PRED on any subsequent elements of LIST.
-
-The similar function `-every' is more widely useful, since it
-returns the last non-nil result of PRED instead of just t on
-success.
-
-Alias: `-all-p', `-every-p', `-every?'.
-
-This function's anaphoric counterpart is `--all?'."
-  (declare (important-return-value t))
-  (--all? (funcall pred it) list))
-
-(defalias '-every? '-all?)
-(defalias '--every? '--all?)
-(defalias '-all-p '-all?)
-(defalias '--all-p '--all?)
-(defalias '-every-p '-all?)
-(defalias '--every-p '--all?)
-
-(defmacro --none? (form list)
-  "Anaphoric form of `-none?'."
-  (declare (debug (form form)))
-  `(--all? (not ,form) ,list))
-
-(defun -none? (pred list)
-  "Return t if (PRED X) is nil for all X in LIST, else nil.
-
-Alias: `-none-p'"
-  (declare (important-return-value t))
-  (--none? (funcall pred it) list))
-
-(defalias '-none-p '-none?)
-(defalias '--none-p '--none?)
-
-(defmacro --only-some? (form list)
-  "Anaphoric form of `-only-some?'."
-  (declare (debug (form form)))
-  (let ((y (make-symbol "yes"))
-        (n (make-symbol "no")))
-    `(let (,y ,n)
-       (--each-while ,list (not (and ,y ,n))
-         (if ,form (setq ,y t) (setq ,n t)))
-       (---truthy? (and ,y ,n)))))
-
-(defun -only-some? (pred list)
-  "Return t if different LIST items both satisfy and do not satisfy PRED.
-That is, if PRED returns both nil for at least one item, and
-non-nil for at least one other item in LIST.  Return nil if all
-items satisfy the predicate or none of them do.
-
-Alias: `-only-some-p'"
-  (declare (important-return-value t))
-  (--only-some? (funcall pred it) list))
-
-(defalias '-only-some-p '-only-some?)
-(defalias '--only-some-p '--only-some?)
-
-(defun -slice (list from &optional to step)
-  "Return copy of LIST, starting from index FROM to index TO.
-
-FROM or TO may be negative.  These values are then interpreted
-modulo the length of the list.
-
-If STEP is a number, only each STEPth item in the resulting
-section is returned.  Defaults to 1."
-  (declare (side-effect-free t))
-  (let ((length (length list))
-        (new-list nil))
-    ;; to defaults to the end of the list
-    (setq to (or to length))
-    (setq step (or step 1))
-    ;; handle negative indices
-    (when (< from 0)
-      (setq from (mod from length)))
-    (when (< to 0)
-      (setq to (mod to length)))
-
-    ;; iterate through the list, keeping the elements we want
-    (--each-while list (< it-index to)
-      (when (and (>= it-index from)
-                 (= (mod (- from it-index) step) 0))
-        (push it new-list)))
-    (nreverse new-list)))
-
-(defmacro --take-while (form list)
-  "Take successive items from LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.  Return a new
-list of the successive elements from the start of LIST for which
-FORM evaluates to non-nil.
-This is the anaphoric counterpart to `-take-while'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result")))
-    `(let (,r)
-       (--each-while ,list ,form (push it ,r))
-       (nreverse ,r))))
-
-(defun -take-while (pred list)
-  "Take successive items from LIST for which PRED returns non-nil.
-PRED is a function of one argument.  Return a new list of the
-successive elements from the start of LIST for which PRED returns
-non-nil.
-
-This function's anaphoric counterpart is `--take-while'.
-
-For another variant, see also `-drop-while'."
-  (declare (important-return-value t))
-  (--take-while (funcall pred it) list))
-
-(defmacro --drop-while (form list)
-  "Drop successive items from LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.  Return the
-tail (not a copy) of LIST starting from its first element for
-which FORM evaluates to nil.
-This is the anaphoric counterpart to `-drop-while'."
-  (declare (debug (form form)))
-  (let ((l (make-symbol "list")))
-    `(let ((,l ,list))
-       (--each-while ,l ,form (pop ,l))
-       ,l)))
-
-(defun -drop-while (pred list)
-  "Drop successive items from LIST for which PRED returns non-nil.
-PRED is a function of one argument.  Return the tail (not a copy)
-of LIST starting from its first element for which PRED returns
-nil.
-
-This function's anaphoric counterpart is `--drop-while'.
-
-For another variant, see also `-take-while'."
-  (declare (important-return-value t))
-  (--drop-while (funcall pred it) list))
-
-(defun -take (n list)
-  "Return a copy of the first N items in LIST.
-Return a copy of LIST if it contains N items or fewer.
-Return nil if N is zero or less.
-
-See also: `-take-last'."
-  (declare (side-effect-free t))
-  (--take-while (< it-index n) list))
-
-(defun -take-last (n list)
-  "Return a copy of the last N items of LIST in order.
-Return a copy of LIST if it contains N items or fewer.
-Return nil if N is zero or less.
-
-See also: `-take'."
-  (declare (side-effect-free t))
-  (copy-sequence (last list n)))
-
-(defalias '-drop #'nthcdr
-  "Return the tail (not a copy) of LIST without the first N items.
-Return nil if LIST contains N items or fewer.
-Return LIST if N is zero or less.
-
-For another variant, see also `-drop-last'.
-\n(fn N LIST)")
-
-(defun -drop-last (n list)
-  "Return a copy of LIST without its last N items.
-Return a copy of LIST if N is zero or less.
-Return nil if LIST contains N items or fewer.
-
-See also: `-drop'."
-  (declare (side-effect-free t))
-  (nbutlast (copy-sequence list) n))
-
-(defun -split-at (n list)
-  "Split LIST into two sublists after the Nth element.
-The result is a list of two elements (TAKE DROP) where TAKE is a
-new list of the first N elements of LIST, and DROP is the
-remaining elements of LIST (not a copy).  TAKE and DROP are like
-the results of `-take' and `-drop', respectively, but the split
-is done in a single list traversal."
-  (declare (side-effect-free t))
-  (let (result)
-    (--each-while list (< it-index n)
-      (push (pop list) result))
-    (list (nreverse result) list)))
-
-(defun -rotate (n list)
-  "Rotate LIST N places to the right (left if N is negative).
-The time complexity is O(n)."
-  (declare (pure t) (side-effect-free t))
-  (cond ((null list) ())
-        ((zerop n) (copy-sequence list))
-        ((let* ((len (length list))
-                (n-mod-len (mod n len))
-                (new-tail-len (- len n-mod-len)))
-           (append (nthcdr new-tail-len list) (-take new-tail-len list))))))
-
-(defun -insert-at (n x list)
-  "Return a list with X inserted into LIST at position N.
-
-See also: `-splice', `-splice-list'"
-  (declare (pure t) (side-effect-free t))
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list) (cons x (cadr split-list)))))
-
-(defun -replace-at (n x list)
-  "Return a list with element at Nth position in LIST replaced with X.
-
-See also: `-replace'"
-  (declare (pure t) (side-effect-free t))
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list) (cons x (cdr (cadr split-list))))))
-
-(defun -update-at (n func list)
-  "Use FUNC to update the Nth element of LIST.
-Return a copy of LIST where the Nth element is replaced with the
-result of calling FUNC on it.
-
-See also: `-map-when'"
-  (declare (important-return-value t))
-  (let ((split-list (-split-at n list)))
-    (nconc (car split-list)
-           (cons (funcall func (car (cadr split-list)))
-                 (cdr (cadr split-list))))))
-
-(defmacro --update-at (n form list)
-  "Anaphoric version of `-update-at'."
-  (declare (debug (form def-form form)))
-  `(-update-at ,n (lambda (it) (ignore it) ,form) ,list))
-
-(defun -remove-at (n list)
-  "Return LIST with its element at index N removed.
-That is, remove any element selected as (nth N LIST) from LIST
-and return the result.
-
-This is a non-destructive operation: parts of LIST (but not
-necessarily all of it) are copied as needed to avoid
-destructively modifying it.
-
-See also: `-remove-at-indices', `-remove'."
-  (declare (pure t) (side-effect-free t))
-  (if (zerop n)
-      (cdr list)
-    (--remove-first (= it-index n) list)))
-
-(defun -remove-at-indices (indices list)
-  "Return LIST with its elements at INDICES removed.
-That is, for each index I in INDICES, remove any element selected
-as (nth I LIST) from LIST.
-
-This is a non-destructive operation: parts of LIST (but not
-necessarily all of it) are copied as needed to avoid
-destructively modifying it.
-
-See also: `-remove-at', `-remove'."
-  (declare (pure t) (side-effect-free t))
-  (setq indices (--drop-while (< it 0) (-sort #'< indices)))
-  (let ((i (pop indices)) res)
-    (--each-while list i
-      (pop list)
-      (if (/= it-index i)
-          (push it res)
-        (while (and indices (= (car indices) i))
-          (pop indices))
-        (setq i (pop indices))))
-    (nconc (nreverse res) list)))
-
-(defmacro --split-with (pred list)
-  "Anaphoric form of `-split-with'."
-  (declare (debug (form form)))
-  (let ((l (make-symbol "list"))
-        (r (make-symbol "result"))
-        (c (make-symbol "continue")))
-    `(let ((,l ,list)
-           (,r nil)
-           (,c t))
-       (while (and ,l ,c)
-         (let ((it (car ,l)))
-           (if (not ,pred)
-               (setq ,c nil)
-             (!cons it ,r)
-             (!cdr ,l))))
-       (list (nreverse ,r) ,l))))
-
-(defun -split-with (pred list)
-  "Split LIST into a prefix satisfying PRED, and the rest.
-The first sublist is the prefix of LIST with successive elements
-satisfying PRED, and the second sublist is the remaining elements
-that do not.  The result is like performing
-
-  ((-take-while PRED LIST) (-drop-while PRED LIST))
-
-but in no more than a single pass through LIST."
-  (declare (important-return-value t))
-  (--split-with (funcall pred it) list))
-
-(defmacro -split-on (item list)
-  "Split the LIST each time ITEM is found.
-
-Unlike `-partition-by', the ITEM is discarded from the results.
-Empty lists are also removed from the result.
-
-Comparison is done by `equal'.
-
-See also `-split-when'"
-  (declare (debug (def-form form)))
-  `(-split-when (lambda (it) (equal it ,item)) ,list))
-
-(defmacro --split-when (form list)
-  "Anaphoric version of `-split-when'."
-  (declare (debug (def-form form)))
-  `(-split-when (lambda (it) (ignore it) ,form) ,list))
-
-(defun -split-when (fn list)
-  "Split the LIST on each element where FN returns non-nil.
-
-Unlike `-partition-by', the \"matched\" element is discarded from
-the results.  Empty lists are also removed from the result.
-
-This function can be thought of as a generalization of
-`split-string'."
-  (declare (important-return-value t))
-  (let (r s)
-    (while list
-      (if (not (funcall fn (car list)))
-          (push (car list) s)
-        (when s (push (nreverse s) r))
-        (setq s nil))
-      (!cdr list))
-    (when s (push (nreverse s) r))
-    (nreverse r)))
-
-(defmacro --separate (form list)
-  "Anaphoric form of `-separate'."
-  (declare (debug (form form)))
-  (let ((y (make-symbol "yes"))
-        (n (make-symbol "no")))
-    `(let (,y ,n)
-       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
-       (list (nreverse ,y) (nreverse ,n)))))
-
-(defun -separate (pred list)
-  "Split LIST into two sublists based on whether items satisfy PRED.
-The result is like performing
-
-  ((-filter PRED LIST) (-remove PRED LIST))
-
-but in a single pass through LIST."
-  (declare (important-return-value t))
-  (--separate (funcall pred it) list))
-
-(defun dash--partition-all-in-steps-reversed (n step list)
-  "Like `-partition-all-in-steps', but the result is reversed."
-  (when (< step 1)
-    (signal 'wrong-type-argument
-            `("Step size < 1 results in juicy infinite loops" ,step)))
-  (let (result)
-    (while list
-      (push (-take n list) result)
-      (setq list (nthcdr step list)))
-    result))
-
-(defun -partition-all-in-steps (n step list)
-  "Partition LIST into sublists of length N that are STEP items apart.
-Adjacent groups may overlap if N exceeds the STEP stride.
-Trailing groups may contain less than N items."
-  (declare (pure t) (side-effect-free t))
-  (nreverse (dash--partition-all-in-steps-reversed n step list)))
-
-(defun -partition-in-steps (n step list)
-  "Partition LIST into sublists of length N that are STEP items apart.
-Like `-partition-all-in-steps', but if there are not enough items
-to make the last group N-sized, those items are discarded."
-  (declare (pure t) (side-effect-free t))
-  (let ((result (dash--partition-all-in-steps-reversed n step list)))
-    (while (and result (< (length (car result)) n))
-      (pop result))
-    (nreverse result)))
-
-(defun -partition-all (n list)
-  "Return a new list with the items in LIST grouped into N-sized sublists.
-The last group may contain less than N items."
-  (declare (pure t) (side-effect-free t))
-  (-partition-all-in-steps n n list))
-
-(defun -partition (n list)
-  "Return a new list with the items in LIST grouped into N-sized sublists.
-If there are not enough items to make the last group N-sized,
-those items are discarded."
-  (declare (pure t) (side-effect-free t))
-  (-partition-in-steps n n list))
-
-(defmacro --partition-by (form list)
-  "Anaphoric form of `-partition-by'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (s (make-symbol "sublist"))
-        (v (make-symbol "value"))
-        (n (make-symbol "new-value"))
-        (l (make-symbol "list")))
-    `(let ((,l ,list))
-       (when ,l
-         (let* ((,r nil)
-                (it (car ,l))
-                (,s (list it))
-                (,v ,form)
-                (,l (cdr ,l)))
-           (while ,l
-             (let* ((it (car ,l))
-                    (,n ,form))
-               (unless (equal ,v ,n)
-                 (!cons (nreverse ,s) ,r)
-                 (setq ,s nil)
-                 (setq ,v ,n))
-               (!cons it ,s)
-               (!cdr ,l)))
-           (!cons (nreverse ,s) ,r)
-           (nreverse ,r))))))
-
-(defun -partition-by (fn list)
-  "Apply FN to each item in LIST, splitting it each time FN returns a new value."
-  (declare (important-return-value t))
-  (--partition-by (funcall fn it) list))
-
-(defmacro --partition-by-header (form list)
-  "Anaphoric form of `-partition-by-header'."
-  (declare (debug (form form)))
-  (let ((r (make-symbol "result"))
-        (s (make-symbol "sublist"))
-        (h (make-symbol "header-value"))
-        (b (make-symbol "seen-body?"))
-        (n (make-symbol "new-value"))
-        (l (make-symbol "list")))
-    `(let ((,l ,list))
-       (when ,l
-         (let* ((,r nil)
-                (it (car ,l))
-                (,s (list it))
-                (,h ,form)
-                (,b nil)
-                (,l (cdr ,l)))
-           (while ,l
-             (let* ((it (car ,l))
-                    (,n ,form))
-               (if (equal ,h ,n)
-                   (when ,b
-                     (!cons (nreverse ,s) ,r)
-                     (setq ,s nil)
-                     (setq ,b nil))
-                 (setq ,b t))
-               (!cons it ,s)
-               (!cdr ,l)))
-           (!cons (nreverse ,s) ,r)
-           (nreverse ,r))))))
-
-(defun -partition-by-header (fn list)
-  "Apply FN to the first item in LIST. That is the header
-value. Apply FN to each item in LIST, splitting it each time FN
-returns the header value, but only after seeing at least one
-other value (the body)."
-  (declare (important-return-value t))
-  (--partition-by-header (funcall fn it) list))
-
-(defmacro --partition-after-pred (form list)
-  "Partition LIST after each element for which FORM evaluates to non-nil.
-Each element of LIST in turn is bound to `it' before evaluating
-FORM.
-
-This is the anaphoric counterpart to `-partition-after-pred'."
-  (let ((l (make-symbol "list"))
-        (r (make-symbol "result"))
-        (s (make-symbol "sublist")))
-    `(let ((,l ,list) ,r ,s)
-       (when ,l
-         (--each ,l
-           (push it ,s)
-           (when ,form
-             (push (nreverse ,s) ,r)
-             (setq ,s ())))
-         (when ,s
-           (push (nreverse ,s) ,r))
-         (nreverse ,r)))))
-
-(defun -partition-after-pred (pred list)
-  "Partition LIST after each element for which PRED returns non-nil.
-
-This function's anaphoric counterpart is `--partition-after-pred'."
-  (declare (important-return-value t))
-  (--partition-after-pred (funcall pred it) list))
-
-(defun -partition-before-pred (pred list)
-  "Partition directly before each time PRED is true on an element of LIST."
-  (declare (important-return-value t))
-  (nreverse (-map #'reverse
-                  (-partition-after-pred pred (reverse list)))))
-
-(defun -partition-after-item (item list)
-  "Partition directly after each time ITEM appears in LIST."
-  (declare (pure t) (side-effect-free t))
-  (-partition-after-pred (lambda (ele) (equal ele item))
-                         list))
-
-(defun -partition-before-item (item list)
-  "Partition directly before each time ITEM appears in LIST."
-  (declare (pure t) (side-effect-free t))
-  (-partition-before-pred (lambda (ele) (equal ele item))
-                          list))
-
-(defmacro --group-by (form list)
-  "Anaphoric form of `-group-by'."
-  (declare (debug t))
-  (let ((n (make-symbol "n"))
-        (k (make-symbol "k"))
-        (grp (make-symbol "grp")))
-    `(nreverse
-      (-map
-       (lambda (,n)
-         (cons (car ,n)
-               (nreverse (cdr ,n))))
-       (--reduce-from
-        (let* ((,k (,@form))
-               (,grp (assoc ,k acc)))
-          (if ,grp
-              (setcdr ,grp (cons it (cdr ,grp)))
-            (push
-             (list ,k it)
-             acc))
-          acc)
-        nil ,list)))))
-
-(defun -group-by (fn list)
-  "Separate LIST into an alist whose keys are FN applied to the
-elements of LIST.  Keys are compared by `equal'."
-  (declare (important-return-value t))
-  (--group-by (funcall fn it) list))
-
-(defun -interpose (sep list)
-  "Return a new list of all elements in LIST separated by SEP."
-  (declare (side-effect-free t))
-  (let (result)
-    (when list
-      (!cons (car list) result)
-      (!cdr list))
-    (while list
-      (setq result (cons (car list) (cons sep result)))
-      (!cdr list))
-    (nreverse result)))
-
-(defun -interleave (&rest lists)
-  "Return a new list of the first item in each list, then the second etc."
-  (declare (side-effect-free t))
-  (when lists
-    (let (result)
-      (while (-none? 'null lists)
-        (--each lists (!cons (car it) result))
-        (setq lists (-map 'cdr lists)))
-      (nreverse result))))
-
-(defmacro --zip-with (form list1 list2)
-  "Zip LIST1 and LIST2 into a new list according to FORM.
-That is, evaluate FORM for each item pair from the two lists, and
-return the list of results.  The result is as long as the shorter
-list.
-
-Each element of LIST1 and each element of LIST2 in turn are bound
-pairwise to `it' and `other', respectively, and their index
-within the list to `it-index', before evaluating FORM.
-
-This is the anaphoric counterpart to `-zip-with'."
-  (declare (debug (form form form)))
-  (let ((r (make-symbol "result"))
-        (l2 (make-symbol "list2")))
-    `(let ((,l2 ,list2) ,r)
-       (--each-while ,list1 ,l2
-         (let ((other (pop ,l2)))
-           (ignore other)
-           (push ,form ,r)))
-       (nreverse ,r))))
-
-(defun -zip-with (fn list1 list2)
-  "Zip LIST1 and LIST2 into a new list using the function FN.
-That is, apply FN pairwise taking as first argument the next
-element of LIST1 and as second argument the next element of LIST2
-at the corresponding position.  The result is as long as the
-shorter list.
-
-This function's anaphoric counterpart is `--zip-with'.
-
-For other zips, see also `-zip-lists' and `-zip-fill'."
-  (declare (important-return-value t))
-  (--zip-with (funcall fn it other) list1 list2))
-
-(defun -zip-lists (&rest lists)
-  "Zip LISTS together.
-
-Group the head of each list, followed by the second element of
-each list, and so on.  The number of returned groupings is equal
-to the length of the shortest input list, and the length of each
-grouping is equal to the number of input LISTS.
-
-The return value is always a list of proper lists, in contrast to
-`-zip' which returns a list of dotted pairs when only two input
-LISTS are provided.
-
-See also: `-zip-pair'."
-  (declare (pure t) (side-effect-free t))
-  (when lists
-    (let (results)
-      (while (--every it lists)
-        (push (mapcar #'car lists) results)
-        (setq lists (mapcar #'cdr lists)))
-      (nreverse results))))
-
-(defun -zip-lists-fill (fill-value &rest lists)
-  "Zip LISTS together, padding shorter lists with FILL-VALUE.
-This is like `-zip-lists' (which see), except it retains all
-elements at positions beyond the end of the shortest list.  The
-number of returned groupings is equal to the length of the
-longest input list, and the length of each grouping is equal to
-the number of input LISTS."
-  (declare (pure t) (side-effect-free t))
-  (when lists
-    (let (results)
-      (while (--some it lists)
-        (push (--map (if it (car it) fill-value) lists) results)
-        (setq lists (mapcar #'cdr lists)))
-      (nreverse results))))
-
-(defun -unzip-lists (lists)
-  "Unzip LISTS.
-
-This works just like `-zip-lists' (which see), but takes a list
-of lists instead of a variable number of arguments, such that
-
-  (-unzip-lists (-zip-lists ARGS...))
-
-is identity (given that the lists comprising ARGS are of the same
-length)."
-  (declare (pure t) (side-effect-free t))
-  (apply #'-zip-lists lists))
-
-(defalias 'dash--length=
-  (if (fboundp 'length=)
-      #'length=
-    (lambda (list length)
-      (cond ((< length 0) nil)
-            ((zerop length) (null list))
-            ((let ((last (nthcdr (1- length) list)))
-               (and last (null (cdr last))))))))
-  "Return non-nil if LIST is of LENGTH.
-This is a compatibility shim for `length=' in Emacs 28.
-\n(fn LIST LENGTH)")
-
-(defun dash--zip-lists-or-pair (_form &rest lists)
-  "Return a form equivalent to applying `-zip' to LISTS.
-This `compiler-macro' warns about discouraged `-zip' usage and
-delegates to `-zip-lists' or `-zip-pair' depending on the number
-of LISTS."
-  (if (not (dash--length= lists 2))
-      (cons #'-zip-lists lists)
-    (let ((pair (cons #'-zip-pair lists))
-          (msg "Use -zip-pair instead of -zip to get a list of pairs"))
-      (if (fboundp 'macroexp-warn-and-return)
-          (macroexp-warn-and-return msg pair)
-        (message msg)
-        pair))))
-
-(defun -zip (&rest lists)
-  "Zip LISTS together.
-
-Group the head of each list, followed by the second element of
-each list, and so on.  The number of returned groupings is equal
-to the length of the shortest input list, and the number of items
-in each grouping is equal to the number of input LISTS.
-
-If only two LISTS are provided as arguments, return the groupings
-as a list of dotted pairs.  Otherwise, return the groupings as a
-list of proper lists.
-
-Since the return value changes form depending on the number of
-arguments, it is generally recommended to use `-zip-lists'
-instead, or `-zip-pair' if a list of dotted pairs is desired.
-
-See also: `-unzip'."
-  (declare (compiler-macro dash--zip-lists-or-pair)
-           (pure t) (side-effect-free t))
-  ;; For backward compatibility, return a list of dotted pairs if two
-  ;; arguments were provided.
-  (apply (if (dash--length= lists 2) #'-zip-pair #'-zip-lists) lists))
-
-(defun -zip-pair (&rest lists)
-  "Zip LIST1 and LIST2 together.
-
-Make a pair with the head of each list, followed by a pair with
-the second element of each list, and so on.  The number of pairs
-returned is equal to the length of the shorter input list.
-
-See also: `-zip-lists'."
-  (declare (advertised-calling-convention (list1 list2) "2.20.0")
-           (pure t) (side-effect-free t))
-  (if (dash--length= lists 2)
-      (--zip-with (cons it other) (car lists) (cadr lists))
-    (apply #'-zip-lists lists)))
-
-(defun -zip-fill (fill-value &rest lists)
-  "Zip LISTS together, padding shorter lists with FILL-VALUE.
-This is like `-zip' (which see), except it retains all elements
-at positions beyond the end of the shortest list.  The number of
-returned groupings is equal to the length of the longest input
-list, and the length of each grouping is equal to the number of
-input LISTS.
-
-Since the return value changes form depending on the number of
-arguments, it is generally recommended to use `-zip-lists-fill'
-instead, unless a list of dotted pairs is explicitly desired."
-  (declare (pure t) (side-effect-free t))
-  (cond ((null lists) ())
-        ((dash--length= lists 2)
-         (let ((list1 (car lists))
-               (list2 (cadr lists))
-               results)
-           (while (or list1 list2)
-             (push (cons (if list1 (pop list1) fill-value)
-                         (if list2 (pop list2) fill-value))
-                   results))
-           (nreverse results)))
-        ((apply #'-zip-lists-fill fill-value lists))))
-
-(defun -unzip (lists)
-  "Unzip LISTS.
-
-This works just like `-zip' (which see), but takes a list of
-lists instead of a variable number of arguments, such that
-
-  (-unzip (-zip L1 L2 L3 ...))
-
-is identity (given that the lists are of the same length, and
-that `-zip' is not called with two arguments, because of the
-caveat described in its docstring).
-
-Note in particular that calling `-unzip' on a list of two lists
-will return a list of dotted pairs.
-
-Since the return value changes form depending on the number of
-LISTS, it is generally recommended to use `-unzip-lists' instead."
-  (declare (pure t) (side-effect-free t))
-  (apply #'-zip lists))
-
-(defun -cycle (list)
-  "Return an infinite circular copy of LIST.
-The returned list cycles through the elements of LIST and repeats
-from the beginning."
-  (declare (pure t) (side-effect-free t))
-  ;; Also works with sequences that aren't lists.
-  (let ((newlist (append list ())))
-    (nconc newlist newlist)))
-
-(defun -pad (fill-value &rest lists)
-  "Pad each of LISTS with FILL-VALUE until they all have equal lengths.
-
-Ensure all LISTS are as long as the longest one by repeatedly
-appending FILL-VALUE to the shorter lists, and return the
-resulting LISTS."
-  (declare (pure t) (side-effect-free t))
-  (let* ((lens (mapcar #'length lists))
-         (maxlen (apply #'max 0 lens)))
-    (--map (append it (make-list (- maxlen (pop lens)) fill-value)) lists)))
-
-(defmacro --annotate (form list)
-  "Pair each item in LIST with the result of evaluating FORM.
-
-Return an alist of (RESULT . ITEM), where each ITEM is the
-corresponding element of LIST, and RESULT is the value obtained
-by evaluating FORM with ITEM bound to `it'.
-
-This is the anaphoric counterpart to `-annotate'."
-  (declare (debug (form form)))
-  `(--map (cons ,form it) ,list))
-
-(defun -annotate (fn list)
-  "Pair each item in LIST with the result of passing it to FN.
-
-Return an alist of (RESULT . ITEM), where each ITEM is the
-corresponding element of LIST, and RESULT is the value obtained
-by calling FN on ITEM.
-
-This function's anaphoric counterpart is `--annotate'."
-  (declare (important-return-value t))
-  (--annotate (funcall fn it) list))
-
-(defun dash--table-carry (lists restore-lists &optional re)
-  "Helper for `-table' and `-table-flat'.
-
-If a list overflows, carry to the right and reset the list."
-  (while (not (or (car lists)
-                  (equal lists '(nil))))
-    (setcar lists (car restore-lists))
-    (pop (cadr lists))
-    (!cdr lists)
-    (!cdr restore-lists)
-    (when re
-      (push (nreverse (car re)) (cadr re))
-      (setcar re nil)
-      (!cdr re))))
-
-(defun -table (fn &rest lists)
-  "Compute outer product of LISTS using function FN.
-
-The function FN should have the same arity as the number of
-supplied lists.
-
-The outer product is computed by applying fn to all possible
-combinations created by taking one element from each list in
-order.  The dimension of the result is (length lists).
-
-See also: `-table-flat'"
-  (declare (important-return-value t))
-  (let ((restore-lists (copy-sequence lists))
-        (last-list (last lists))
-        (re (make-list (length lists) nil)))
-    (while (car last-list)
-      (let ((item (apply fn (-map 'car lists))))
-        (push item (car re))
-        (setcar lists (cdar lists)) ;; silence byte compiler
-        (dash--table-carry lists restore-lists re)))
-    (nreverse (car (last re)))))
-
-(defun -table-flat (fn &rest lists)
-  "Compute flat outer product of LISTS using function FN.
-
-The function FN should have the same arity as the number of
-supplied lists.
-
-The outer product is computed by applying fn to all possible
-combinations created by taking one element from each list in
-order.  The results are flattened, ignoring the tensor structure
-of the result.  This is equivalent to calling:
-
-  (-flatten-n (1- (length lists)) (apply \\='-table fn lists))
-
-but the implementation here is much more efficient.
-
-See also: `-flatten-n', `-table'"
-  (declare (important-return-value t))
-  (let ((restore-lists (copy-sequence lists))
-        (last-list (last lists))
-        re)
-    (while (car last-list)
-      (let ((item (apply fn (-map 'car lists))))
-        (push item re)
-        (setcar lists (cdar lists)) ;; silence byte compiler
-        (dash--table-carry lists restore-lists)))
-    (nreverse re)))
-
-(defmacro --find-index (form list)
-  "Return the first index in LIST for which FORM evals to non-nil.
-Return nil if no such index is found.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-find-index'."
-  (declare (debug (form form)))
-  `(--some (and ,form it-index) ,list))
-
-(defun -find-index (pred list)
-  "Return the index of the first item satisfying PRED in LIST.
-Return nil if no such item is found.
-
-PRED is called with one argument, the current list element, until
-it returns non-nil, at which point the search terminates.
-
-This function's anaphoric counterpart is `--find-index'.
-
-See also: `-first', `-find-last-index'."
-  (declare (important-return-value t))
-  (--find-index (funcall pred it) list))
-
-(defun -elem-index (elem list)
-  "Return the first index of ELEM in LIST.
-That is, the index within LIST of the first element that is
-`equal' to ELEM.  Return nil if there is no such element.
-
-See also: `-find-index'."
-  (declare (pure t) (side-effect-free t))
-  (--find-index (equal elem it) list))
-
-(defmacro --find-indices (form list)
-  "Return the list of indices in LIST for which FORM evals to non-nil.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-find-indices'."
-  (declare (debug (form form)))
-  `(--keep (and ,form it-index) ,list))
-
-(defun -find-indices (pred list)
-  "Return the list of indices in LIST satisfying PRED.
-
-Each element of LIST in turn is passed to PRED.  If the result is
-non-nil, the index of that element in LIST is included in the
-result.  The returned indices are in ascending order, i.e., in
-the same order as they appear in LIST.
-
-This function's anaphoric counterpart is `--find-indices'.
-
-See also: `-find-index', `-elem-indices'."
-  (declare (important-return-value t))
-  (--find-indices (funcall pred it) list))
-
-(defun -elem-indices (elem list)
-  "Return the list of indices at which ELEM appears in LIST.
-That is, the indices of all elements of LIST `equal' to ELEM, in
-the same ascending order as they appear in LIST."
-  (declare (pure t) (side-effect-free t))
-  (--find-indices (equal elem it) list))
-
-(defmacro --find-last-index (form list)
-  "Return the last index in LIST for which FORM evals to non-nil.
-Return nil if no such index is found.
-Each element of LIST in turn is bound to `it' and its index
-within LIST to `it-index' before evaluating FORM.
-This is the anaphoric counterpart to `-find-last-index'."
-  (declare (debug (form form)))
-  (let ((i (make-symbol "index")))
-    `(let (,i)
-       (--each ,list
-         (when ,form (setq ,i it-index)))
-       ,i)))
-
-(defun -find-last-index (pred list)
-  "Return the index of the last item satisfying PRED in LIST.
-Return nil if no such item is found.
-
-Predicate PRED is called with one argument each time, namely the
-current list element.
-
-This function's anaphoric counterpart is `--find-last-index'.
-
-See also: `-last', `-find-index'."
-  (declare (important-return-value t))
-  (--find-last-index (funcall pred it) list))
-
-(defun -select-by-indices (indices list)
-  "Return a list whose elements are elements from LIST selected
-as `(nth i list)` for all i from INDICES."
-  (declare (pure t) (side-effect-free t))
-  (let (r)
-    (--each indices
-      (!cons (nth it list) r))
-    (nreverse r)))
-
-(defun -select-columns (columns table)
-  "Select COLUMNS from TABLE.
-
-TABLE is a list of lists where each element represents one row.
-It is assumed each row has the same length.
-
-Each row is transformed such that only the specified COLUMNS are
-selected.
-
-See also: `-select-column', `-select-by-indices'"
-  (declare (pure t) (side-effect-free t))
-  (--map (-select-by-indices columns it) table))
-
-(defun -select-column (column table)
-  "Select COLUMN from TABLE.
-
-TABLE is a list of lists where each element represents one row.
-It is assumed each row has the same length.
-
-The single selected column is returned as a list.
-
-See also: `-select-columns', `-select-by-indices'"
-  (declare (pure t) (side-effect-free t))
-  (--mapcat (-select-by-indices (list column) it) table))
-
-(defmacro -> (x &optional form &rest more)
-  "Thread the expr through the forms. Insert X as the second item
-in the first form, making a list of it if it is not a list
-already. If there are more forms, insert the first form as the
-second item in second form, etc."
-  (declare (debug (form &rest [&or symbolp (sexp &rest form)])))
-  (cond
-   ((null form) x)
-   ((null more) (if (listp form)
-                    `(,(car form) ,x ,@(cdr form))
-                  (list form x)))
-   (:else `(-> (-> ,x ,form) ,@more))))
-
-(defmacro ->> (x &optional form &rest more)
-  "Thread the expr through the forms. Insert X as the last item
-in the first form, making a list of it if it is not a list
-already. If there are more forms, insert the first form as the
-last item in second form, etc."
-  (declare (debug ->))
-  (cond
-   ((null form) x)
-   ((null more) (if (listp form)
-                    `(,@form ,x)
-                  (list form x)))
-   (:else `(->> (->> ,x ,form) ,@more))))
-
-(defmacro --> (x &rest forms)
-  "Starting with the value of X, thread each expression through FORMS.
-
-Insert X at the position signified by the symbol `it' in the first
-form.  If there are more forms, insert the first form at the position
-signified by `it' in in second form, etc."
-  (declare (debug (form body)))
-  `(-as-> ,x it ,@forms))
-
-(defmacro -as-> (value variable &rest forms)
-  "Starting with VALUE, thread VARIABLE through FORMS.
-
-In the first form, bind VARIABLE to VALUE.  In the second form, bind
-VARIABLE to the result of the first form, and so forth."
-  (declare (debug (form symbolp body)))
-  (if (null forms)
-      `,value
-    `(let ((,variable ,value))
-       (-as-> ,(if (symbolp (car forms))
-                   (list (car forms) variable)
-                 (car forms))
-              ,variable
-              ,@(cdr forms)))))
-
-(defmacro -some-> (x &optional form &rest more)
-  "When expr is non-nil, thread it through the first form (via `->'),
-and when that result is non-nil, through the next form, etc."
-  (declare (debug ->)
-           (indent 1))
-  (if (null form) x
-    (let ((result (make-symbol "result")))
-      `(-some-> (-when-let (,result ,x)
-                  (-> ,result ,form))
-         ,@more))))
-
-(defmacro -some->> (x &optional form &rest more)
-  "When expr is non-nil, thread it through the first form (via `->>'),
-and when that result is non-nil, through the next form, etc."
-  (declare (debug ->)
-           (indent 1))
-  (if (null form) x
-    (let ((result (make-symbol "result")))
-      `(-some->> (-when-let (,result ,x)
-                   (->> ,result ,form))
-         ,@more))))
-
-(defmacro -some--> (expr &rest forms)
-  "Thread EXPR through FORMS via `-->', while the result is non-nil.
-When EXPR evaluates to non-nil, thread the result through the
-first of FORMS, and when that result is non-nil, thread it
-through the next form, etc."
-  (declare (debug (form &rest &or symbolp consp)) (indent 1))
-  (if (null forms) expr
-    (let ((result (make-symbol "result")))
-      `(-some--> (-when-let (,result ,expr)
-                   (--> ,result ,(car forms)))
-         ,@(cdr forms)))))
-
-(defmacro -doto (init &rest forms)
-  "Evaluate INIT and pass it as argument to FORMS with `->'.
-The RESULT of evaluating INIT is threaded through each of FORMS
-individually using `->', which see.  The return value is RESULT,
-which FORMS may have modified by side effect."
-  (declare (debug (form &rest &or symbolp consp)) (indent 1))
-  (let ((retval (make-symbol "result")))
-    `(let ((,retval ,init))
-       ,@(mapcar (lambda (form) `(-> ,retval ,form)) forms)
-       ,retval)))
-
-(defmacro --doto (init &rest forms)
-  "Anaphoric form of `-doto'.
-This just evaluates INIT, binds the result to `it', evaluates
-FORMS, and returns the final value of `it'.
-Note: `it' need not be used in each form."
-  (declare (debug (form body)) (indent 1))
-  `(let ((it ,init))
-     ,@forms
-     it))
-
-(defun -grade-up (comparator list)
-  "Grade elements of LIST using COMPARATOR relation.
-This yields a permutation vector such that applying this
-permutation to LIST sorts it in ascending order."
-  (declare (important-return-value t))
-  (->> (--map-indexed (cons it it-index) list)
-       (-sort (lambda (it other) (funcall comparator (car it) (car other))))
-       (mapcar #'cdr)))
-
-(defun -grade-down (comparator list)
-  "Grade elements of LIST using COMPARATOR relation.
-This yields a permutation vector such that applying this
-permutation to LIST sorts it in descending order."
-  (declare (important-return-value t))
-  (->> (--map-indexed (cons it it-index) list)
-       (-sort (lambda (it other) (funcall comparator (car other) (car it))))
-       (mapcar #'cdr)))
-
-(defvar dash--source-counter 0
-  "Monotonic counter for generated symbols.")
-
-(defun dash--match-make-source-symbol ()
-  "Generate a new dash-source symbol.
-
-All returned symbols are guaranteed to be unique."
-  (prog1 (make-symbol (format "--dash-source-%d--" dash--source-counter))
-    (setq dash--source-counter (1+ dash--source-counter))))
-
-(defun dash--match-ignore-place-p (symbol)
-  "Return non-nil if SYMBOL is a symbol and starts with _."
-  (and (symbolp symbol)
-       (eq (aref (symbol-name symbol) 0) ?_)))
-
-(defun dash--match-cons-skip-cdr (skip-cdr source)
-  "Helper function generating idiomatic shifting code."
-  (cond
-   ((= skip-cdr 0)
-    `(pop ,source))
-   (t
-    `(prog1 ,(dash--match-cons-get-car skip-cdr source)
-       (setq ,source ,(dash--match-cons-get-cdr (1+ skip-cdr) source))))))
-
-(defun dash--match-cons-get-car (skip-cdr source)
-  "Helper function generating idiomatic code to get nth car."
-  (cond
-   ((= skip-cdr 0)
-    `(car ,source))
-   ((= skip-cdr 1)
-    `(cadr ,source))
-   (t
-    `(nth ,skip-cdr ,source))))
-
-(defun dash--match-cons-get-cdr (skip-cdr source)
-  "Helper function generating idiomatic code to get nth cdr."
-  (cond
-   ((= skip-cdr 0)
-    source)
-   ((= skip-cdr 1)
-    `(cdr ,source))
-   (t
-    `(nthcdr ,skip-cdr ,source))))
-
-(defun dash--match-cons (match-form source)
-  "Setup a cons matching environment and call the real matcher."
-  (let ((s (dash--match-make-source-symbol))
-        (n 0)
-        (m match-form))
-    (while (and (consp m)
-                (dash--match-ignore-place-p (car m)))
-      (setq n (1+ n)) (!cdr m))
-    (cond
-     ;; when we only have one pattern in the list, we don't have to
-     ;; create a temporary binding (--dash-source--) for the source
-     ;; and just use the input directly
-     ((and (consp m)
-           (not (cdr m)))
-      (dash--match (car m) (dash--match-cons-get-car n source)))
-     ;; handle other special types
-     ((> n 0)
-      (dash--match m (dash--match-cons-get-cdr n source)))
-     ;; this is the only entry-point for dash--match-cons-1, that's
-     ;; why we can't simply use the above branch, it would produce
-     ;; infinite recursion
-     (t
-      (cons (list s source) (dash--match-cons-1 match-form s))))))
-
-(defun dash--get-expand-function (type)
-  "Get expand function name for TYPE."
-  (intern-soft (format "dash-expand:%s" type)))
-
-(defun dash--match-cons-1 (match-form source &optional props)
-  "Match MATCH-FORM against SOURCE.
-
-MATCH-FORM is a proper or improper list.  Each element of
-MATCH-FORM is either a symbol, which gets bound to the respective
-value in source or another match form which gets destructured
-recursively.
-
-If the cdr of last cons cell in the list is nil, matching stops
-there.
-
-SOURCE is a proper or improper list."
-  (let ((skip-cdr (or (plist-get props :skip-cdr) 0)))
-    (cond
-     ((consp match-form)
-      (cond
-       ((cdr match-form)
-        (cond
-         ((and (symbolp (car match-form))
-               (functionp (dash--get-expand-function (car match-form))))
-          (dash--match-kv (dash--match-kv-normalize-match-form match-form) (dash--match-cons-get-cdr skip-cdr source)))
-         ((dash--match-ignore-place-p (car match-form))
-          (dash--match-cons-1 (cdr match-form) source
-                              (plist-put props :skip-cdr (1+ skip-cdr))))
-         (t
-          (-concat (dash--match (car match-form) (dash--match-cons-skip-cdr skip-cdr source))
-                   (dash--match-cons-1 (cdr match-form) source)))))
-       (t ;; Last matching place, no need for shift
-        (dash--match (car match-form) (dash--match-cons-get-car skip-cdr source)))))
-     ((eq match-form nil)
-      nil)
-     (t ;; Handle improper lists.  Last matching place, no need for shift
-      (dash--match match-form (dash--match-cons-get-cdr skip-cdr source))))))
-
-(defun dash--match-vector (match-form source)
-  "Setup a vector matching environment and call the real matcher."
-  (let ((s (dash--match-make-source-symbol)))
-    (cond
-     ;; don't bind `s' if we only have one sub-pattern
-     ((= (length match-form) 1)
-      (dash--match (aref match-form 0) `(aref ,source 0)))
-     ;; if the source is a symbol, we don't need to re-bind it
-     ((symbolp source)
-      (dash--match-vector-1 match-form source))
-     ;; don't bind `s' if we only have one sub-pattern which is not ignored
-     ((let* ((ignored-places (mapcar 'dash--match-ignore-place-p match-form))
-             (ignored-places-n (length (-remove 'null ignored-places))))
-        (when (= ignored-places-n (1- (length match-form)))
-          (let ((n (-find-index 'null ignored-places)))
-            (dash--match (aref match-form n) `(aref ,source ,n))))))
-     (t
-      (cons (list s source) (dash--match-vector-1 match-form s))))))
-
-(defun dash--match-vector-1 (match-form source)
-  "Match MATCH-FORM against SOURCE.
-
-MATCH-FORM is a vector.  Each element of MATCH-FORM is either a
-symbol, which gets bound to the respective value in source or
-another match form which gets destructured recursively.
-
-If second-from-last place in MATCH-FORM is the symbol &rest, the
-next element of the MATCH-FORM is matched against the tail of
-SOURCE, starting at index of the &rest symbol.  This is
-conceptually the same as the (head . tail) match for improper
-lists, where dot plays the role of &rest.
-
-SOURCE is a vector.
-
-If the MATCH-FORM vector is shorter than SOURCE vector, only
-the (length MATCH-FORM) places are bound, the rest of the SOURCE
-is discarded."
-  (let ((i 0)
-        (l (length match-form))
-        (re))
-    (while (< i l)
-      (let ((m (aref match-form i)))
-        (push (cond
-               ((and (symbolp m)
-                     (eq m '&rest))
-                (prog1 (dash--match
-                        (aref match-form (1+ i))
-                        `(substring ,source ,i))
-                  (setq i l)))
-               ((and (symbolp m)
-                     ;; do not match symbols starting with _
-                     (not (eq (aref (symbol-name m) 0) ?_)))
-                (list (list m `(aref ,source ,i))))
-               ((not (symbolp m))
-                (dash--match m `(aref ,source ,i))))
-              re)
-        (setq i (1+ i))))
-    (-flatten-n 1 (nreverse re))))
-
-(defun dash--match-kv-normalize-match-form (pattern)
-  "Normalize kv PATTERN.
-
-This method normalizes PATTERN to the format expected by
-`dash--match-kv'.  See `-let' for the specification."
-  (let ((normalized (list (car pattern)))
-        (skip nil)
-        (fill-placeholder (make-symbol "--dash-fill-placeholder--")))
-    (-each (-zip-fill fill-placeholder (cdr pattern) (cddr pattern))
-      (lambda (pair)
-        (let ((current (car pair))
-              (next (cdr pair)))
-          (if skip
-              (setq skip nil)
-            (if (or (eq fill-placeholder next)
-                    (not (or (and (symbolp next)
-                                  (not (keywordp next))
-                                  (not (eq next t))
-                                  (not (eq next nil)))
-                             (and (consp next)
-                                  (not (eq (car next) 'quote)))
-                             (vectorp next))))
-                (progn
-                  (cond
-                   ((keywordp current)
-                    (push current normalized)
-                    (push (intern (substring (symbol-name current) 1)) normalized))
-                   ((stringp current)
-                    (push current normalized)
-                    (push (intern current) normalized))
-                   ((and (consp current)
-                         (eq (car current) 'quote))
-                    (push current normalized)
-                    (push (cadr current) normalized))
-                   (t (error "-let: found key `%s' in kv destructuring but its pattern `%s' is invalid and can not be derived from the key" current next)))
-                  (setq skip nil))
-              (push current normalized)
-              (push next normalized)
-              (setq skip t))))))
-    (nreverse normalized)))
-
-(defun dash--match-kv (match-form source)
-  "Setup a kv matching environment and call the real matcher.
-
-kv can be any key-value store, such as plist, alist or hash-table."
-  (let ((s (dash--match-make-source-symbol)))
-    (cond
-     ;; don't bind `s' if we only have one sub-pattern (&type key val)
-     ((= (length match-form) 3)
-      (dash--match-kv-1 (cdr match-form) source (car match-form)))
-     ;; if the source is a symbol, we don't need to re-bind it
-     ((symbolp source)
-      (dash--match-kv-1 (cdr match-form) source (car match-form)))
-     (t
-      (cons (list s source) (dash--match-kv-1 (cdr match-form) s (car match-form)))))))
-
-(defun dash-expand:&hash (key source)
-  "Generate extracting KEY from SOURCE for &hash destructuring."
-  `(gethash ,key ,source))
-
-(defun dash-expand:&plist (key source)
-  "Generate extracting KEY from SOURCE for &plist destructuring."
-  `(plist-get ,source ,key))
-
-(defun dash-expand:&alist (key source)
-  "Generate extracting KEY from SOURCE for &alist destructuring."
-  `(cdr (assoc ,key ,source)))
-
-(defun dash-expand:&hash? (key source)
-  "Generate extracting KEY from SOURCE for &hash? destructuring.
-Similar to &hash but check whether the map is not nil."
-  (let ((src (make-symbol "src")))
-    `(let ((,src ,source))
-       (when ,src (gethash ,key ,src)))))
-
-(defalias 'dash-expand:&keys 'dash-expand:&plist)
-
-(defun dash--match-kv-1 (match-form source type)
-  "Match MATCH-FORM against SOURCE of type TYPE.
-
-MATCH-FORM is a proper list of the form (key1 place1 ... keyN
-placeN).  Each placeK is either a symbol, which gets bound to the
-value of keyK retrieved from the key-value store, or another
-match form which gets destructured recursively.
-
-SOURCE is a key-value store of type TYPE, which can be a plist,
-an alist or a hash table.
-
-TYPE is a token specifying the type of the key-value store.
-Valid values are &plist, &alist and &hash."
-  (-flatten-n 1 (-map
-                 (lambda (kv)
-                   (let* ((k (car kv))
-                          (v (cadr kv))
-                          (getter
-                           (funcall (dash--get-expand-function type) k source)))
-                     (cond
-                      ((symbolp v)
-                       (list (list v getter)))
-                      (t (dash--match v getter)))))
-                 (-partition 2 match-form))))
-
-(defun dash--match-symbol (match-form source)
-  "Bind a symbol.
-
-This works just like `let', there is no destructuring."
-  (list (list match-form source)))
-
-(defun dash--match (match-form source)
-  "Match MATCH-FORM against SOURCE.
-
-This function tests the MATCH-FORM and dispatches to specific
-matchers based on the type of the expression.
-
-Key-value stores are disambiguated by placing a token &plist,
-&alist or &hash as a first item in the MATCH-FORM."
-  (cond
-   ((and (symbolp match-form)
-         ;; Don't bind things like &keys as if they were vars (#395).
-         (not (functionp (dash--get-expand-function match-form))))
-    (dash--match-symbol match-form source))
-   ((consp match-form)
-    (cond
-     ;; Handle the "x &as" bindings first.
-     ((and (consp (cdr match-form))
-           (symbolp (car match-form))
-           (eq '&as (cadr match-form)))
-      (let ((s (car match-form)))
-        (cons (list s source)
-              (dash--match (cddr match-form) s))))
-     ((functionp (dash--get-expand-function (car match-form)))
-      (dash--match-kv (dash--match-kv-normalize-match-form match-form) source))
-     (t (dash--match-cons match-form source))))
-   ((vectorp match-form)
-    ;; We support the &as binding in vectors too
-    (cond
-     ((and (> (length match-form) 2)
-           (symbolp (aref match-form 0))
-           (eq '&as (aref match-form 1)))
-      (let ((s (aref match-form 0)))
-        (cons (list s source)
-              (dash--match (substring match-form 2) s))))
-     (t (dash--match-vector match-form source))))))
-
-(defun dash--normalize-let-varlist (varlist)
-  "Normalize VARLIST so that every binding is a list.
-
-`let' allows specifying a binding which is not a list but simply
-the place which is then automatically bound to nil, such that all
-three of the following are identical and evaluate to nil.
-
-  (let (a) a)
-  (let ((a)) a)
-  (let ((a nil)) a)
-
-This function normalizes all of these to the last form."
-  (--map (if (consp it) it (list it nil)) varlist))
-
-(defmacro -let* (varlist &rest body)
-  "Bind variables according to VARLIST then eval BODY.
-
-VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-PATTERN is matched against the SOURCE structurally.  SOURCE is
-only evaluated once for each PATTERN.
-
-Each SOURCE can refer to the symbols already bound by this
-VARLIST.  This is useful if you want to destructure SOURCE
-recursively but also want to name the intermediate structures.
-
-See `-let' for the list of all possible patterns."
-  (declare (debug ((&rest [&or (sexp form) sexp]) body))
-           (indent 1))
-  (let* ((varlist (dash--normalize-let-varlist varlist))
-         (bindings (--mapcat (dash--match (car it) (cadr it)) varlist)))
-    `(let* ,bindings
-       ,@body)))
-
-(defmacro -let (varlist &rest body)
-  "Bind variables according to VARLIST then eval BODY.
-
-VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-PATTERN is matched against the SOURCE \"structurally\".  SOURCE
-is only evaluated once for each PATTERN.  Each PATTERN is matched
-recursively, and can therefore contain sub-patterns which are
-matched against corresponding sub-expressions of SOURCE.
-
-All the SOURCEs are evalled before any symbols are
-bound (i.e. \"in parallel\").
-
-If VARLIST only contains one (PATTERN SOURCE) element, you can
-optionally specify it using a vector and discarding the
-outer-most parens.  Thus
-
-  (-let ((PATTERN SOURCE)) ...)
-
-becomes
-
-  (-let [PATTERN SOURCE] ...).
-
-`-let' uses a convention of not binding places (symbols) starting
-with _ whenever it's possible.  You can use this to skip over
-entries you don't care about.  However, this is not *always*
-possible (as a result of implementation) and these symbols might
-get bound to undefined values.
-
-Following is the overview of supported patterns.  Remember that
-patterns can be matched recursively, so every a, b, aK in the
-following can be a matching construct and not necessarily a
-symbol/variable.
-
-Symbol:
-
-  a - bind the SOURCE to A.  This is just like regular `let'.
-
-Conses and lists:
-
-  (a) - bind `car' of cons/list to A
-
-  (a . b) - bind car of cons to A and `cdr' to B
-
-  (a b) - bind car of list to A and `cadr' to B
-
-  (a1 a2 a3 ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3...
-
-  (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to REST.
-
-Vectors:
-
-  [a] - bind 0th element of a non-list sequence to A (works with
-        vectors, strings, bit arrays...)
-
-  [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st to
-                   A1, 2nd to A2, ...
-                   If the PATTERN is shorter than SOURCE, the values at
-                   places not in PATTERN are ignored.
-                   If the PATTERN is longer than SOURCE, an `error' is
-                   thrown.
-
-  [a1 a2 a3 ... &rest rest] - as above, but bind the rest of
-                              the sequence to REST.  This is
-                              conceptually the same as improper list
-                              matching (a1 a2 ... aN . rest)
-
-Key/value stores:
-
-  (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                 SOURCE plist to aK.  If the
-                                 value is not found, aK is nil.
-                                 Uses `plist-get' to fetch values.
-
-  (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                 SOURCE alist to aK.  If the
-                                 value is not found, aK is nil.
-                                 Uses `assoc' to fetch values.
-
-  (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
-                                SOURCE hash table to aK.  If the
-                                value is not found, aK is nil.
-                                Uses `gethash' to fetch values.
-
-Further, special keyword &keys supports \"inline\" matching of
-plist-like key-value pairs, similarly to &keys keyword of
-`cl-defun'.
-
-  (a1 a2 ... aN &keys key1 b1 ... keyN bK)
-
-This binds N values from the list to a1 ... aN, then interprets
-the cdr as a plist (see key/value matching above).
-
-A shorthand notation for kv-destructuring exists which allows the
-patterns be optionally left out and derived from the key name in
-the following fashion:
-
-- a key :foo is converted into `foo' pattern,
-- a key \\='bar is converted into `bar' pattern,
-- a key \"baz\" is converted into `baz' pattern.
-
-That is, the entire value under the key is bound to the derived
-variable without any further destructuring.
-
-This is possible only when the form following the key is not a
-valid pattern (i.e. not a symbol, a cons cell or a vector).
-Otherwise the matching proceeds as usual and in case of an
-invalid spec fails with an error.
-
-Thus the patterns are normalized as follows:
-
-   ;; derive all the missing patterns
-   (&plist :foo \\='bar \"baz\") => (&plist :foo foo \\='bar bar \"baz\" baz)
-
-   ;; we can specify some but not others
-   (&plist :foo \\='bar explicit-bar) => (&plist :foo foo \\='bar explicit-bar)
-
-   ;; nothing happens, we store :foo in x
-   (&plist :foo x) => (&plist :foo x)
-
-   ;; nothing happens, we match recursively
-   (&plist :foo (a b c)) => (&plist :foo (a b c))
-
-You can name the source using the syntax SYMBOL &as PATTERN.
-This syntax works with lists (proper or improper), vectors and
-all types of maps.
-
-  (list &as a b c) (list 1 2 3)
-
-binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
-
-Similarly:
-
-  (bounds &as beg . end) (cons 1 2)
-
-binds BEG to 1, END to 2 and BOUNDS to (1 . 2).
-
-  (items &as first . rest) (list 1 2 3)
-
-binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
-
-  [vect &as _ b c] [1 2 3]
-
-binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as usual).
-
-  (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
-
-binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and &hash.
-
-This is especially useful when we want to capture the result of a
-computation and destructure at the same time.  Consider the
-form (function-returning-complex-structure) returning a list of
-two vectors with two items each.  We want to capture this entire
-result and pass it to another computation, but at the same time
-we want to get the second item from each vector.  We can achieve
-it with pattern
-
-  (result &as [_ a] [_ b]) (function-returning-complex-structure)
-
-Note: Clojure programmers may know this feature as the \":as
-binding\".  The difference is that we put the &as at the front
-because we need to support improper list binding."
-  (declare (debug ([&or (&rest [&or (sexp form) sexp])
-                        (vector [&rest [sexp form]])]
-                   body))
-           (indent 1))
-  (if (vectorp varlist)
-      `(let* ,(dash--match (aref varlist 0) (aref varlist 1))
-         ,@body)
-    (let* ((varlist (dash--normalize-let-varlist varlist))
-           (inputs (--map-indexed (list (make-symbol (format "input%d" it-index)) (cadr it)) varlist))
-           (new-varlist (--zip-with (list (car it) (car other))
-                                    varlist inputs)))
-      `(let ,inputs
-         (-let* ,new-varlist ,@body)))))
-
-(defmacro -lambda (match-form &rest body)
-  "Return a lambda which destructures its input as MATCH-FORM and executes BODY.
-
-Note that you have to enclose the MATCH-FORM in a pair of parens,
-such that:
-
-  (-lambda (x) body)
-  (-lambda (x y ...) body)
-
-has the usual semantics of `lambda'.  Furthermore, these get
-translated into normal `lambda', so there is no performance
-penalty.
-
-See `-let' for a description of the destructuring mechanism."
-  (declare (doc-string 2) (indent defun)
-           (debug (&define sexp
-                           [&optional stringp]
-                           [&optional ("interactive" interactive)]
-                           def-body)))
-  (cond
-   ((nlistp match-form)
-    (signal 'wrong-type-argument (list #'listp match-form)))
-   ;; No destructuring, so just return regular `lambda' for speed.
-   ((-all? #'symbolp match-form)
-    `(lambda ,match-form ,@body))
-   ((let ((inputs (--map-indexed
-                   (list it (make-symbol (format "input%d" it-index)))
-                   match-form)))
-      ;; TODO: because inputs to the `lambda' are evaluated only once,
-      ;; `-let*' need not create the extra bindings to ensure that.
-      ;; We should find a way to optimize that.  Not critical however.
-      `(lambda ,(mapcar #'cadr inputs)
-         (-let* ,inputs ,@body))))))
-
-(defmacro -setq (&rest forms)
-  "Bind each MATCH-FORM to the value of its VAL.
-
-MATCH-FORM destructuring is done according to the rules of `-let'.
-
-This macro allows you to bind multiple variables by destructuring
-the value, so for example:
-
-  (-setq (a b) x
-         (&plist :c c) plist)
-
-expands roughly speaking to the following code
-
-  (setq a (car x)
-        b (cadr x)
-        c (plist-get plist :c))
-
-Care is taken to only evaluate each VAL once so that in case of
-multiple assignments it does not cause unexpected side effects.
-
-\(fn [MATCH-FORM VAL]...)"
-  (declare (debug (&rest sexp form))
-           (indent 1))
-  (when (= (mod (length forms) 2) 1)
-    (signal 'wrong-number-of-arguments (list '-setq (1+ (length forms)))))
-  (let* ((forms-and-sources
-          ;; First get all the necessary mappings with all the
-          ;; intermediate bindings.
-          (-map (lambda (x) (dash--match (car x) (cadr x)))
-                (-partition 2 forms)))
-         ;; To preserve the logic of dynamic scoping we must ensure
-         ;; that we `setq' the variables outside of the `let*' form
-         ;; which holds the destructured intermediate values.  For
-         ;; this we generate for each variable a placeholder which is
-         ;; bound to (lexically) the result of the destructuring.
-         ;; Then outside of the helper `let*' form we bind all the
-         ;; original variables to their respective placeholders.
-         ;; TODO: There is a lot of room for possible optimization,
-         ;; for start playing with `special-variable-p' to eliminate
-         ;; unnecessary re-binding.
-         (variables-to-placeholders
-          (-mapcat
-           (lambda (bindings)
-             (-map
-              (lambda (binding)
-                (let ((var (car binding)))
-                  (list var (make-symbol (concat "--dash-binding-" (symbol-name var) "--")))))
-              (--filter (not (string-prefix-p "--" (symbol-name (car it)))) bindings)))
-           forms-and-sources)))
-    `(let ,(-map 'cadr variables-to-placeholders)
-       (let* ,(-flatten-n 1 forms-and-sources)
-         (setq ,@(-flatten (-map 'reverse variables-to-placeholders))))
-       (setq ,@(-flatten variables-to-placeholders)))))
-
-(defmacro -if-let* (vars-vals then &rest else)
-  "If all VALS evaluate to true, bind them to their corresponding
-VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
-of (VAR VAL) pairs.
-
-Note: binding is done according to `-let*'.  VALS are evaluated
-sequentially, and evaluation stops after the first nil VAL is
-encountered."
-  (declare (debug ((&rest (sexp form)) form body))
-           (indent 2))
-  (->> vars-vals
-       (--mapcat (dash--match (car it) (cadr it)))
-       (--reduce-r-from
-        (let ((var (car it))
-              (val (cadr it)))
-          `(let ((,var ,val))
-             (if ,var ,acc ,@else)))
-        then)))
-
-(defmacro -if-let (var-val then &rest else)
-  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
-otherwise do ELSE.
-
-Note: binding is done according to `-let'.
-
-\(fn (VAR VAL) THEN &rest ELSE)"
-  (declare (debug ((sexp form) form body))
-           (indent 2))
-  `(-if-let* (,var-val) ,then ,@else))
-
-(defmacro --if-let (val then &rest else)
-  "If VAL evaluates to non-nil, bind it to symbol `it' and do THEN,
-otherwise do ELSE."
-  (declare (debug (form form body))
-           (indent 2))
-  `(-if-let (it ,val) ,then ,@else))
-
-(defmacro -when-let* (vars-vals &rest body)
-  "If all VALS evaluate to true, bind them to their corresponding
-VARS and execute body. VARS-VALS should be a list of (VAR VAL)
-pairs.
-
-Note: binding is done according to `-let*'.  VALS are evaluated
-sequentially, and evaluation stops after the first nil VAL is
-encountered."
-  (declare (debug ((&rest (sexp form)) body))
-           (indent 1))
-  `(-if-let* ,vars-vals (progn ,@body)))
-
-(defmacro -when-let (var-val &rest body)
-  "If VAL evaluates to non-nil, bind it to VAR and execute body.
-
-Note: binding is done according to `-let'.
-
-\(fn (VAR VAL) &rest BODY)"
-  (declare (debug ((sexp form) body))
-           (indent 1))
-  `(-if-let ,var-val (progn ,@body)))
-
-(defmacro --when-let (val &rest body)
-  "If VAL evaluates to non-nil, bind it to symbol `it' and
-execute body."
-  (declare (debug (form body))
-           (indent 1))
-  `(--if-let ,val (progn ,@body)))
-
-;; TODO: Get rid of this dynamic variable, passing it as an argument
-;; instead?
-(defvar -compare-fn nil
-  "Tests for equality use this function, or `equal' if this is nil.
-
-As a dynamic variable, this should be temporarily bound around
-the relevant operation, rather than permanently modified.  For
-example:
-
-  (let ((-compare-fn #\\='=))
-    (-union \\='(1 2 3) \\='(2 3 4)))")
-
-(defun dash--member-fn ()
-  "Return the flavor of `member' that goes best with `-compare-fn'."
-  (declare (side-effect-free error-free))
-  (let ((cmp -compare-fn))
-    (cond ((memq cmp '(nil equal)) #'member)
-          ((eq cmp #'eq) #'memq)
-          ((eq cmp #'eql) #'memql)
-          ((lambda (elt list)
-             (while (and list (not (funcall cmp elt (car list))))
-               (pop list))
-             list)))))
-
-(defun dash--assoc-fn ()
-  "Return the flavor of `assoc' that goes best with `-compare-fn'."
-  (declare (side-effect-free error-free))
-  (let ((cmp -compare-fn))
-    (cond ((memq cmp '(nil equal)) #'assoc)
-          ((eq cmp #'eq) #'assq)
-          ;; Since Emacs 26, `assoc' accepts a custom `testfn'.
-          ;; Version testing would be simpler here, but feature
-          ;; testing gets more brownie points, I guess.
-          ((condition-case nil
-               (with-no-warnings (assoc nil () #'eql))
-             (wrong-number-of-arguments t))
-           (lambda (key alist)
-             (--first (and (consp it) (funcall cmp (car it) key)) alist)))
-          ((with-no-warnings
-             (lambda (key alist)
-               (assoc key alist cmp)))))))
-
-(defun dash--hash-test-fn ()
-  "Return the hash table test function corresponding to `-compare-fn'.
-Return nil if `-compare-fn' is not a known test function."
-  (declare (side-effect-free error-free))
-  ;; In theory this could also recognize values that are custom
-  ;; `hash-table-test's, but too often the :test name is different
-  ;; from the equality function, so it doesn't seem worthwhile.
-  (car (memq (or -compare-fn #'equal) '(equal eq eql))))
-
-(defvar dash--short-list-length 32
-  "Maximum list length considered short, for optimizations.
-For example, the speedup afforded by hash table lookup may start
-to outweigh its runtime and memory overhead for problem sizes
-greater than this value.  See also the discussion in PR #305.")
-
-(defun -distinct (list)
-  "Return a copy of LIST with all duplicate elements removed.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil.
-
-Alias: `-uniq'."
-  (declare (important-return-value t))
-  (let (test len)
-    (cond ((null list) ())
-          ;; Use a hash table if `-compare-fn' is a known hash table
-          ;; test function and the list is long enough.
-          ((and (setq test (dash--hash-test-fn))
-                (> (setq len (length list)) dash--short-list-length))
-           (let ((ht (make-hash-table :test test :size len)))
-             (--filter (unless (gethash it ht) (puthash it t ht)) list)))
-          ((let ((member (dash--member-fn)) uniq)
-             (--each list (unless (funcall member it uniq) (push it uniq)))
-             (nreverse uniq))))))
-
-(defalias '-uniq #'-distinct)
-
-(defun dash--size+ (size1 size2)
-  "Return the sum of nonnegative fixnums SIZE1 and SIZE2.
-Return `most-positive-fixnum' on overflow.  This ensures the
-result is a valid size, particularly for allocating hash tables,
-even in the presence of bignum support."
-  (declare (side-effect-free t))
-  (if (< size1 (- most-positive-fixnum size2))
-      (+ size1 size2)
-    most-positive-fixnum))
-
-(defun -union (list1 list2)
-  "Return a new list of distinct elements appearing in either LIST1 or LIST2.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil."
-  (declare (important-return-value t))
-  (let ((lists (list list1 list2)) test len union)
-    (cond ((null (or list1 list2)))
-          ;; Use a hash table if `-compare-fn' is a known hash table
-          ;; test function and the lists are long enough.
-          ((and (setq test (dash--hash-test-fn))
-                (> (setq len (dash--size+ (length list1) (length list2)))
-                   dash--short-list-length))
-           (let ((ht (make-hash-table :test test :size len)))
-             (dolist (l lists)
-               (--each l (unless (gethash it ht)
-                           (puthash it t ht)
-                           (push it union))))))
-          ((let ((member (dash--member-fn)))
-             (dolist (l lists)
-               (--each l (unless (funcall member it union) (push it union)))))))
-    (nreverse union)))
-
-(defun -intersection (list1 list2)
-  "Return a new list of distinct elements appearing in both LIST1 and LIST2.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil."
-  (declare (important-return-value t))
-  (let (test len)
-    (cond ((null (and list1 list2)) ())
-          ;; Use a hash table if `-compare-fn' is a known hash table
-          ;; test function and either list is long enough.
-          ((and (setq test (dash--hash-test-fn))
-                (> (setq len (length list2)) dash--short-list-length))
-           (let ((ht (make-hash-table :test test :size len)))
-             (--each list2 (puthash it t ht))
-             ;; Remove visited elements to avoid duplicates.
-             (--filter (when (gethash it ht) (remhash it ht) t) list1)))
-          ((let ((member (dash--member-fn)) intersection)
-             (--each list1 (and (funcall member it list2)
-                                (not (funcall member it intersection))
-                                (push it intersection)))
-             (nreverse intersection))))))
-
-(defun -difference (list1 list2)
-  "Return a new list with the distinct members of LIST1 that are not in LIST2.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil."
-  (declare (important-return-value t))
-  (let (test len1 len2)
-    (cond ((null list1) ())
-          ((null list2) (-distinct list1))
-          ;; Use a hash table if `-compare-fn' is a known hash table
-          ;; test function and the subtrahend is long enough.
-          ((and (setq test (dash--hash-test-fn))
-                (setq len1 (length list1))
-                (setq len2 (length list2))
-                (> (max len1 len2) dash--short-list-length))
-           (let ((ht1 (make-hash-table :test test :size len1))
-                 (ht2 (make-hash-table :test test :size len2)))
-             (--each list2 (puthash it t ht2))
-             ;; Avoid duplicates by tracking visited items in `ht1'.
-             (--filter (unless (or (gethash it ht2) (gethash it ht1))
-                         (puthash it t ht1))
-                       list1)))
-          ((let ((member (dash--member-fn)) difference)
-             (--each list1
-               (unless (or (funcall member it list2)
-                           (funcall member it difference))
-                 (push it difference)))
-             (nreverse difference))))))
-
-(defun -powerset (list)
-  "Return the power set of LIST."
-  (declare (pure t) (side-effect-free t))
-  (if (null list) (list ())
-    (let ((last (-powerset (cdr list))))
-      (nconc (mapcar (lambda (x) (cons (car list) x)) last)
-             last))))
-
-(defun -frequencies (list)
-  "Count the occurrences of each distinct element of LIST.
-
-Return an alist of (ELEMENT . N), where each ELEMENT occurs N
-times in LIST.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil.
-
-See also `-count' and `-group-by'."
-  (declare (important-return-value t))
-  (let (test len freqs)
-    (cond ((null list))
-          ((and (setq test (dash--hash-test-fn))
-                (> (setq len (length list)) dash--short-list-length))
-           (let ((ht (make-hash-table :test test :size len)))
-             ;; Share structure between hash table and returned list.
-             ;; This affords a single pass that preserves the input
-             ;; order, conses less garbage, and is faster than a
-             ;; second traversal (e.g., with `maphash').
-             (--each list
-               (let ((freq (gethash it ht)))
-                 (if freq
-                     (setcdr freq (1+ (cdr freq)))
-                   (push (puthash it (cons it 1) ht) freqs))))))
-          ((let ((assoc (dash--assoc-fn)))
-             (--each list
-               (let ((freq (funcall assoc it freqs)))
-                 (if freq
-                     (setcdr freq (1+ (cdr freq)))
-                   (push (cons it 1) freqs)))))))
-    (nreverse freqs)))
-
-(defun dash--numbers<= (nums)
-  "Return non-nil if NUMS is a list of non-decreasing numbers."
-  (declare (pure t) (side-effect-free t))
-  (or (null nums)
-      (let ((prev (pop nums)))
-        (and (numberp prev)
-             (--every (and (numberp it) (<= prev (setq prev it))) nums)))))
-
-(defun dash--next-lex-perm (array n)
-  "Update ARRAY of N numbers with its next lexicographic permutation.
-Return nil if there is no such successor.  N should be nonzero.
-
-This implements the salient steps of Algorithm L (Lexicographic
-permutation generation) as described in DE Knuth's The Art of
-Computer Programming, Volume 4A / Combinatorial Algorithms,
-Part I, Addison-Wesley, 2011, § 7.2.1.2, p. 319."
-  (setq n (1- n))
-  (let* ((l n)
-         (j (1- n))
-         (al (aref array n))
-         (aj al))
-    ;; L2. [Find j].
-    ;; Decrement j until a[j] < a[j+1].
-    (while (and (<= 0 j)
-                (<= aj (setq aj (aref array j))))
-      (setq j (1- j)))
-    ;; Terminate algorithm if j not found.
-    (when (>= j 0)
-      ;; L3. [Increase a[j]].
-      ;; Decrement l until a[j] < a[l].
-      (while (>= aj al)
-        (setq l (1- l) al (aref array l)))
-      ;; Swap a[j] and a[l].
-      (aset array j al)
-      (aset array l aj)
-      ;; L4. [Reverse a[j+1]...a[n]].
-      (setq l n)
-      (while (< (setq j (1+ j)) l)
-        (setq aj (aref array j))
-        (aset array j (aref array l))
-        (aset array l aj)
-        (setq l (1- l)))
-      array)))
-
-(defun dash--lex-perms (vec &optional original)
-  "Return a list of permutations of VEC in lexicographic order.
-Specifically, return only the successors of VEC in lexicographic
-order.  Each returned permutation is a list.  VEC should comprise
-one or more numbers, and may be destructively modified.
-
-If ORIGINAL is a vector, then VEC is interpreted as a set of
-indices into ORIGINAL.  In this case, the indices are permuted,
-and the resulting index permutations are used to dereference
-elements of ORIGINAL."
-  (let ((len (length vec)) perms)
-    (while vec
-      (push (if original
-                (--map (aref original it) vec)
-              (append vec ()))
-            perms)
-      (setq vec (dash--next-lex-perm vec len)))
-    (nreverse perms)))
-
-(defun dash--uniq-perms (list)
-  "Return a list of permutations of LIST.
-LIST is treated as if all its elements are distinct."
-  (let* ((vec (vconcat list))
-         (idxs (copy-sequence vec)))
-    ;; Just construct a vector of the list's indices and permute that.
-    (dotimes (i (length idxs))
-      (aset idxs i i))
-    (dash--lex-perms idxs vec)))
-
-(defun dash--multi-perms (list freqs)
-  "Return a list of permutations of the multiset LIST.
-FREQS should be an alist describing the frequency of each element
-in LIST, as returned by `-frequencies'."
-  (let (;; Distinct items in `list', aka the cars of `freqs'.
-        (uniq (make-vector (length freqs) nil))
-        ;; Indices into `uniq'.
-        (idxs (make-vector (length list) nil))
-        ;; Current index into `idxs'.
-        (i 0))
-    (--each freqs
-      (aset uniq it-index (car it))
-      ;; Populate `idxs' with as many copies of each `it-index' as
-      ;; there are corresponding duplicates.
-      (dotimes (_ (cdr it))
-        (aset idxs i it-index)
-        (setq i (1+ i))))
-    (dash--lex-perms idxs uniq)))
-
-(defun -permutations (list)
-  "Return the distinct permutations of LIST.
-
-Duplicate elements of LIST are determined by `equal', or by
-`-compare-fn' if that is non-nil."
-  (declare (important-return-value t))
-  (cond ((null list) (list ()))
-        ;; Optimization: a traversal of `list' is faster than the
-        ;; round trip via `dash--uniq-perms' or `dash--multi-perms'.
-        ((dash--numbers<= list)
-         (dash--lex-perms (vconcat list)))
-        ((let ((freqs (-frequencies list)))
-           ;; Is each element distinct?
-           (unless (--every (= (cdr it) 1) freqs)
-             (dash--multi-perms list freqs))))
-        ((dash--uniq-perms list))))
-
-(defun -inits (list)
-  "Return all prefixes of LIST."
-  (declare (pure t) (side-effect-free t))
-  (let ((res (list list)))
-    (setq list (reverse list))
-    (while list
-      (push (reverse (!cdr list)) res))
-    res))
-
-(defun -tails (list)
-  "Return all suffixes of LIST."
-  (declare (pure t) (side-effect-free t))
-  (-reductions-r-from #'cons nil list))
-
-(defun -common-prefix (&rest lists)
-  "Return the longest common prefix of LISTS."
-  (declare (pure t) (side-effect-free t))
-  (--reduce (--take-while (and acc (equal (pop acc) it)) it)
-            lists))
-
-(defun -common-suffix (&rest lists)
-  "Return the longest common suffix of LISTS."
-  (declare (pure t) (side-effect-free t))
-  (nreverse (apply #'-common-prefix (mapcar #'reverse lists))))
-
-(defun -contains? (list element)
-  "Return non-nil if LIST contains ELEMENT.
-
-The test for equality is done with `equal', or with `-compare-fn'
-if that is non-nil.  As with `member', the return value is
-actually the tail of LIST whose car is ELEMENT.
-
-Alias: `-contains-p'."
-  (declare (important-return-value t))
-  (funcall (dash--member-fn) element list))
-
-(defalias '-contains-p #'-contains?)
-
-(defun -same-items? (list1 list2)
-  "Return non-nil if LIST1 and LIST2 have the same distinct elements.
-
-The order of the elements in the lists does not matter.  The
-lists may be of different lengths, i.e., contain duplicate
-elements.  The test for equality is done with `equal', or with
-`-compare-fn' if that is non-nil.
-
-Alias: `-same-items-p'."
-  (declare (important-return-value t))
-  (let (test len1 len2)
-    (cond ((null (or list1 list2)))
-          ((null (and list1 list2)) nil)
-          ;; Use a hash table if `-compare-fn' is a known hash table
-          ;; test function and either list is long enough.
-          ((and (setq test (dash--hash-test-fn))
-                (setq len1 (length list1))
-                (setq len2 (length list2))
-                (> (max len1 len2) dash--short-list-length))
-           (let ((ht1 (make-hash-table :test test :size len1))
-                 (ht2 (make-hash-table :test test :size len2)))
-             (--each list1 (puthash it t ht1))
-             ;; Move visited elements from `ht1' to `ht2'.  This way,
-             ;; if visiting all of `list2' leaves `ht1' empty, then
-             ;; all elements from both lists have been accounted for.
-             (and (--every (cond ((gethash it ht1)
-                                  (remhash it ht1)
-                                  (puthash it t ht2))
-                                 ((gethash it ht2)))
-                           list2)
-                  (zerop (hash-table-count ht1)))))
-          ((let ((member (dash--member-fn)))
-             (and (--all? (funcall member it list2) list1)
-                  (--all? (funcall member it list1) list2)))))))
-
-(defalias '-same-items-p #'-same-items?)
-
-(defun -is-prefix? (prefix list)
-  "Return non-nil if PREFIX is a prefix of LIST.
-
-Alias: `-is-prefix-p'."
-  (declare (pure t) (side-effect-free t))
-  (--each-while list (and (equal (car prefix) it)
-                          (!cdr prefix)))
-  (null prefix))
-
-(defun -is-suffix? (suffix list)
-  "Return non-nil if SUFFIX is a suffix of LIST.
-
-Alias: `-is-suffix-p'."
-  (declare (pure t) (side-effect-free t))
-  (equal suffix (last list (length suffix))))
-
-(defun -is-infix? (infix list)
-  "Return non-nil if INFIX is infix of LIST.
-
-This operation runs in O(n^2) time
-
-Alias: `-is-infix-p'"
-  (declare (pure t) (side-effect-free t))
-  (let (done)
-    (while (and (not done) list)
-      (setq done (-is-prefix? infix list))
-      (!cdr list))
-    done))
-
-(defalias '-is-prefix-p '-is-prefix?)
-(defalias '-is-suffix-p '-is-suffix?)
-(defalias '-is-infix-p '-is-infix?)
-
-(defun -sort (comparator list)
-  "Sort LIST, stably, comparing elements using COMPARATOR.
-Return the sorted list.  LIST is NOT modified by side effects.
-COMPARATOR is called with two elements of LIST, and should return non-nil
-if the first element should sort before the second."
-  (declare (important-return-value t))
-  ;; Not yet worth changing to (sort list :lessp comparator);
-  ;; still seems as fast or slightly faster.
-  (sort (copy-sequence list) comparator))
-
-(defmacro --sort (form list)
-  "Anaphoric form of `-sort'."
-  (declare (debug (def-form form)))
-  `(-sort (lambda (it other) (ignore it other) ,form) ,list))
-
-(defun -list (&optional arg &rest args)
-  "Ensure ARG is a list.
-If ARG is already a list, return it as is (not a copy).
-Otherwise, return a new list with ARG as its only element.
-
-Another supported calling convention is (-list &rest ARGS).
-In this case, if ARG is not a list, a new list with all of
-ARGS as elements is returned.  This use is supported for
-backward compatibility and is otherwise deprecated."
-  (declare (advertised-calling-convention (arg) "2.18.0")
-           (pure t) (side-effect-free error-free))
-  (if (listp arg) arg (cons arg args)))
-
-(defun -repeat (n x)
-  "Return a new list of length N with each element being X.
-Return nil if N is less than 1."
-  (declare (side-effect-free t))
-  (and (>= n 0) (make-list n x)))
-
-(defun -sum (list)
-  "Return the sum of LIST."
-  (declare (pure t) (side-effect-free t))
-  (apply #'+ list))
-
-(defun -running-sum (list)
-  "Return a list with running sums of items in LIST.
-LIST must be non-empty."
-  (declare (pure t) (side-effect-free t))
-  (or list (signal 'wrong-type-argument (list #'consp list)))
-  (-reductions #'+ list))
-
-(defun -product (list)
-  "Return the product of LIST."
-  (declare (pure t) (side-effect-free t))
-  (apply #'* list))
-
-(defun -running-product (list)
-  "Return a list with running products of items in LIST.
-LIST must be non-empty."
-  (declare (pure t) (side-effect-free t))
-  (or list (signal 'wrong-type-argument (list #'consp list)))
-  (-reductions #'* list))
-
-(defun -max (list)
-  "Return the largest value from LIST of numbers or markers."
-  (declare (pure t) (side-effect-free t))
-  (apply #'max list))
-
-(defun -min (list)
-  "Return the smallest value from LIST of numbers or markers."
-  (declare (pure t) (side-effect-free t))
-  (apply #'min list))
-
-(defun -max-by (comparator list)
-  "Take a comparison function COMPARATOR and a LIST and return
-the greatest element of the list by the comparison function.
-
-See also combinator `-on' which can transform the values before
-comparing them."
-  (declare (important-return-value t))
-  (--reduce (if (funcall comparator it acc) it acc) list))
-
-(defun -min-by (comparator list)
-  "Take a comparison function COMPARATOR and a LIST and return
-the least element of the list by the comparison function.
-
-See also combinator `-on' which can transform the values before
-comparing them."
-  (declare (important-return-value t))
-  (--reduce (if (funcall comparator it acc) acc it) list))
-
-(defmacro --max-by (form list)
-  "Anaphoric version of `-max-by'.
-
-The items for the comparator form are exposed as \"it\" and \"other\"."
-  (declare (debug (def-form form)))
-  `(-max-by (lambda (it other) (ignore it other) ,form) ,list))
-
-(defmacro --min-by (form list)
-  "Anaphoric version of `-min-by'.
-
-The items for the comparator form are exposed as \"it\" and \"other\"."
-  (declare (debug (def-form form)))
-  `(-min-by (lambda (it other) (ignore it other) ,form) ,list))
-
-(defun -iota (count &optional start step)
-  "Return a list containing COUNT numbers.
-Starts from START and adds STEP each time.  The default START is
-zero, the default STEP is 1.
-This function takes its name from the corresponding primitive in
-the APL language."
-  (declare (side-effect-free t))
-  (unless (natnump count)
-    (signal 'wrong-type-argument (list #'natnump count)))
-  (or start (setq start 0))
-  (or step (setq step 1))
-  (if (zerop step)
-      (make-list count start)
-    (--iterate (+ it step) start count)))
-
-(defun -fix (fn list)
-  "Compute the (least) fixpoint of FN with initial input LIST.
-
-FN is called at least once, results are compared with `equal'."
-  (declare (important-return-value t))
-  (let ((re (funcall fn list)))
-    (while (not (equal list re))
-      (setq list re)
-      (setq re (funcall fn re)))
-    re))
-
-(defmacro --fix (form list)
-  "Anaphoric form of `-fix'."
-  (declare (debug (def-form form)))
-  `(-fix (lambda (it) (ignore it) ,form) ,list))
-
-(defun -unfold (fun seed)
-  "Build a list from SEED using FUN.
-
-This is \"dual\" operation to `-reduce-r': while -reduce-r
-consumes a list to produce a single value, `-unfold' takes a
-seed value and builds a (potentially infinite!) list.
-
-FUN should return nil to stop the generating process, or a
-cons (A . B), where A will be prepended to the result and B is
-the new seed."
-  (declare (important-return-value t))
-  (let ((last (funcall fun seed)) r)
-    (while last
-      (push (car last) r)
-      (setq last (funcall fun (cdr last))))
-    (nreverse r)))
-
-(defmacro --unfold (form seed)
-  "Anaphoric version of `-unfold'."
-  (declare (debug (def-form form)))
-  `(-unfold (lambda (it) (ignore it) ,form) ,seed))
-
-(defun -cons-pair? (obj)
-  "Return non-nil if OBJ is a true cons pair.
-That is, a cons (A . B) where B is not a list.
-
-Alias: `-cons-pair-p'."
-  (declare (pure t) (side-effect-free error-free))
-  (nlistp (cdr-safe obj)))
-
-(defalias '-cons-pair-p '-cons-pair?)
-
-(defun -cons-to-list (con)
-  "Convert a cons pair to a list with `car' and `cdr' of the pair respectively."
-  (declare (pure t) (side-effect-free t))
-  (list (car con) (cdr con)))
-
-(defun -value-to-list (val)
-  "Convert a value to a list.
-
-If the value is a cons pair, make a list with two elements, `car'
-and `cdr' of the pair respectively.
-
-If the value is anything else, wrap it in a list."
-  (declare (pure t) (side-effect-free t))
-  (if (-cons-pair? val) (-cons-to-list val) (list val)))
-
-(defun -tree-mapreduce-from (fn folder init-value tree)
-  "Apply FN to each element of TREE, and make a list of the results.
-If elements of TREE are lists themselves, apply FN recursively to
-elements of these nested lists.
-
-Then reduce the resulting lists using FOLDER and initial value
-INIT-VALUE. See `-reduce-r-from'.
-
-This is the same as calling `-tree-reduce-from' after `-tree-map'
-but is twice as fast as it only traverse the structure once."
-  (declare (important-return-value t))
-  (cond
-   ((null tree) ())
-   ((-cons-pair? tree) (funcall fn tree))
-   ((consp tree)
-    (-reduce-r-from
-     folder init-value
-     (mapcar (lambda (x) (-tree-mapreduce-from fn folder init-value x)) tree)))
-   ((funcall fn tree))))
-
-(defmacro --tree-mapreduce-from (form folder init-value tree)
-  "Anaphoric form of `-tree-mapreduce-from'."
-  (declare (debug (def-form def-form form form)))
-  `(-tree-mapreduce-from (lambda (it) (ignore it) ,form)
-                         (lambda (it acc) (ignore it acc) ,folder)
-                         ,init-value
-                         ,tree))
-
-(defun -tree-mapreduce (fn folder tree)
-  "Apply FN to each element of TREE, and make a list of the results.
-If elements of TREE are lists themselves, apply FN recursively to
-elements of these nested lists.
-
-Then reduce the resulting lists using FOLDER and initial value
-INIT-VALUE. See `-reduce-r-from'.
-
-This is the same as calling `-tree-reduce' after `-tree-map'
-but is twice as fast as it only traverse the structure once."
-  (declare (important-return-value t))
-  (cond
-   ((null tree) ())
-   ((-cons-pair? tree) (funcall fn tree))
-   ((consp tree)
-    (-reduce-r folder (mapcar (lambda (x) (-tree-mapreduce fn folder x)) tree)))
-   ((funcall fn tree))))
-
-(defmacro --tree-mapreduce (form folder tree)
-  "Anaphoric form of `-tree-mapreduce'."
-  (declare (debug (def-form def-form form)))
-  `(-tree-mapreduce (lambda (it) (ignore it) ,form)
-                    (lambda (it acc) (ignore it acc) ,folder)
-                    ,tree))
-
-(defun -tree-map (fn tree)
-  "Apply FN to each element of TREE while preserving the tree structure."
-  (declare (important-return-value t))
-  (cond
-   ((null tree) ())
-   ((-cons-pair? tree) (funcall fn tree))
-   ((consp tree)
-    (mapcar (lambda (x) (-tree-map fn x)) tree))
-   ((funcall fn tree))))
-
-(defmacro --tree-map (form tree)
-  "Anaphoric form of `-tree-map'."
-  (declare (debug (def-form form)))
-  `(-tree-map (lambda (it) (ignore it) ,form) ,tree))
-
-(defun -tree-reduce-from (fn init-value tree)
-  "Use FN to reduce elements of list TREE.
-If elements of TREE are lists themselves, apply the reduction recursively.
-
-FN is first applied to INIT-VALUE and first element of the list,
-then on this result and second element from the list etc.
-
-The initial value is ignored on cons pairs as they always contain
-two elements."
-  (declare (important-return-value t))
-  (cond
-   ((null tree) ())
-   ((-cons-pair? tree) tree)
-   ((consp tree)
-    (-reduce-r-from
-     fn init-value
-     (mapcar (lambda (x) (-tree-reduce-from fn init-value x)) tree)))
-   (tree)))
-
-(defmacro --tree-reduce-from (form init-value tree)
-  "Anaphoric form of `-tree-reduce-from'."
-  (declare (debug (def-form form form)))
-  `(-tree-reduce-from (lambda (it acc) (ignore it acc) ,form)
-                      ,init-value ,tree))
-
-(defun -tree-reduce (fn tree)
-  "Use FN to reduce elements of list TREE.
-If elements of TREE are lists themselves, apply the reduction recursively.
-
-FN is first applied to first element of the list and second
-element, then on this result and third element from the list etc.
-
-See `-reduce-r' for how exactly are lists of zero or one element handled."
-  (declare (important-return-value t))
-  (cond
-   ((null tree) ())
-   ((-cons-pair? tree) tree)
-   ((consp tree)
-    (-reduce-r fn (mapcar (lambda (x) (-tree-reduce fn x)) tree)))
-   (tree)))
-
-(defmacro --tree-reduce (form tree)
-  "Anaphoric form of `-tree-reduce'."
-  (declare (debug (def-form form)))
-  `(-tree-reduce (lambda (it acc) (ignore it acc) ,form) ,tree))
-
-(defun -tree-map-nodes (pred fun tree)
-  "Call FUN on each node of TREE that satisfies PRED.
-
-If PRED returns nil, continue descending down this node.  If PRED
-returns non-nil, apply FUN to this node and do not descend
-further."
-  (cond ((funcall pred tree) (funcall fun tree))
-        ((and (listp tree) (listp (cdr tree)))
-         (-map (lambda (x) (-tree-map-nodes pred fun x)) tree))
-        (tree)))
-
-(defmacro --tree-map-nodes (pred form tree)
-  "Anaphoric form of `-tree-map-nodes'."
-  (declare (debug (def-form def-form form)))
-  `(-tree-map-nodes (lambda (it) (ignore it) ,pred)
-                    (lambda (it) (ignore it) ,form)
-                    ,tree))
-
-(defun -tree-seq (branch children tree)
-  "Return a sequence of the nodes in TREE, in depth-first search order.
-
-BRANCH is a predicate of one argument that returns non-nil if the
-passed argument is a branch, that is, a node that can have children.
-
-CHILDREN is a function of one argument that returns the children
-of the passed branch node.
-
-Non-branch nodes are simply copied."
-  (declare (important-return-value t))
-  (cons tree
-        (and (funcall branch tree)
-             (-mapcat (lambda (x) (-tree-seq branch children x))
-                      (funcall children tree)))))
-
-(defmacro --tree-seq (branch children tree)
-  "Anaphoric form of `-tree-seq'."
-  (declare (debug (def-form def-form form)))
-  `(-tree-seq (lambda (it) (ignore it) ,branch)
-              (lambda (it) (ignore it) ,children)
-              ,tree))
-
-(defun -clone (list)
-  "Create a deep copy of LIST.
-The new list has the same elements and structure but all cons are
-replaced with new ones.  This is useful when you need to clone a
-structure such as plist or alist."
-  (declare (side-effect-free t))
-  (-tree-map #'identity list))
-
-;;; Combinators
-
-(defalias '-partial #'apply-partially)
-
-(defun -rpartial (fn &rest args)
-  "Return a function that is a partial application of FN to ARGS.
-ARGS is a list of the last N arguments to pass to FN.  The result
-is a new function which does the same as FN, except that the last
-N arguments are fixed at the values with which this function was
-called.  This is like `-partial', except the arguments are fixed
-starting from the right rather than the left."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest args-before) (apply fn (append args-before args))))
-
-(defun -juxt (&rest fns)
-  "Return a function that is the juxtaposition of FNS.
-The returned function takes a variable number of ARGS, applies
-each of FNS in turn to ARGS, and returns the list of results."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest args) (mapcar (lambda (x) (apply x args)) fns)))
-
-(defun -compose (&rest fns)
-  "Compose FNS into a single composite function.
-Return a function that takes a variable number of ARGS, applies
-the last function in FNS to ARGS, and returns the result of
-calling each remaining function on the result of the previous
-function, right-to-left.  If no FNS are given, return a variadic
-`identity' function."
-  (declare (pure t) (side-effect-free error-free))
-  (let* ((fns (nreverse fns))
-         (head (car fns))
-         (tail (cdr fns)))
-    (cond (tail
-           (lambda (&rest args)
-             (--reduce-from (funcall it acc) (apply head args) tail)))
-          (fns head)
-          ((lambda (&optional arg &rest _) arg)))))
-
-(defun -applify (fn)
-  "Return a function that applies FN to a single list of args.
-This changes the arity of FN from taking N distinct arguments to
-taking 1 argument which is a list of N arguments."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (args) (apply fn args)))
-
-(defun -on (op trans)
-  "Return a function that calls TRANS on each arg and OP on the results.
-The returned function takes a variable number of arguments, calls
-the function TRANS on each one in turn, and then passes those
-results as the list of arguments to OP, in the same order.
-
-For example, the following pairs of expressions are morally
-equivalent:
-
-  (funcall (-on #\\='+ #\\='1+) 1 2 3) = (+ (1+ 1) (1+ 2) (1+ 3))
-  (funcall (-on #\\='+ #\\='1+))       = (+)"
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest args)
-    ;; This unrolling seems to be a relatively cheap way to keep the
-    ;; overhead of `mapcar' + `apply' in check.
-    (cond ((cddr args)
-           (apply op (mapcar trans args)))
-          ((cdr args)
-           (funcall op (funcall trans (car args)) (funcall trans (cadr args))))
-          (args
-           (funcall op (funcall trans (car args))))
-          ((funcall op)))))
-
-(defun -flip (fn)
-  "Return a function that calls FN with its arguments reversed.
-The returned function takes the same number of arguments as FN.
-
-For example, the following two expressions are morally
-equivalent:
-
-  (funcall (-flip #\\='-) 1 2) = (- 2 1)
-
-See also: `-rotate-args'."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest args) ;; Open-code for speed.
-    (cond ((cddr args) (apply fn (nreverse args)))
-          ((cdr args) (funcall fn (cadr args) (car args)))
-          (args (funcall fn (car args)))
-          ((funcall fn)))))
-
-(defun -rotate-args (n fn)
-  "Return a function that calls FN with args rotated N places to the right.
-The returned function takes the same number of arguments as FN,
-rotates the list of arguments N places to the right (left if N is
-negative) just like `-rotate', and applies FN to the result.
-
-See also: `-flip'."
-  (declare (pure t) (side-effect-free t))
-  (if (zerop n)
-      fn
-    (let ((even (= (% n 2) 0)))
-      (lambda (&rest args)
-        (cond ((cddr args) ;; Open-code for speed.
-               (apply fn (-rotate n args)))
-              ((cdr args)
-               (let ((fst (car args))
-                     (snd (cadr args)))
-                 (funcall fn (if even fst snd) (if even snd fst))))
-              (args
-               (funcall fn (car args)))
-              ((funcall fn)))))))
-
-(defun -const (c)
-  "Return a function that returns C ignoring any additional arguments.
-
-In types: a -> b -> a"
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest _) c))
-
-(defmacro -cut (&rest params)
-  "Take n-ary function and n arguments and specialize some of them.
-Arguments denoted by <> will be left unspecialized.
-
-See SRFI-26 for detailed description."
-  (declare (debug (&optional sexp &rest &or "<>" form)))
-  (let* ((i 0)
-         (args (--keep (when (eq it '<>)
-                         (setq i (1+ i))
-                         (make-symbol (format "D%d" i)))
-                       params)))
-    `(lambda ,args
-       ,(let ((body (--map (if (eq it '<>) (pop args) it) params)))
-          (if (eq (car params) '<>)
-              (cons #'funcall body)
-            body)))))
-
-(defun -not (pred)
-  "Return a predicate that negates the result of PRED.
-The returned predicate passes its arguments to PRED.  If PRED
-returns nil, the result is non-nil; otherwise the result is nil.
-
-See also: `-andfn' and `-orfn'."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (&rest args) (not (apply pred args))))
-
-(defun -orfn (&rest preds)
-  "Return a predicate that returns the first non-nil result of PREDS.
-The returned predicate takes a variable number of arguments,
-passes them to each predicate in PREDS in turn until one of them
-returns non-nil, and returns that non-nil result without calling
-the remaining PREDS.  If all PREDS return nil, or if no PREDS are
-given, the returned predicate returns nil.
-
-See also: `-andfn' and `-not'."
-  (declare (pure t) (side-effect-free error-free))
-  ;; Open-code for speed.
-  (cond ((cdr preds) (lambda (&rest args) (--some (apply it args) preds)))
-        (preds (car preds))
-        (#'ignore)))
-
-(defun -andfn (&rest preds)
-  "Return a predicate that returns non-nil if all PREDS do so.
-The returned predicate P takes a variable number of arguments and
-passes them to each predicate in PREDS in turn.  If any one of
-PREDS returns nil, P also returns nil without calling the
-remaining PREDS.  If all PREDS return non-nil, P returns the last
-such value.  If no PREDS are given, P always returns non-nil.
-
-See also: `-orfn' and `-not'."
-  (declare (pure t) (side-effect-free error-free))
-  ;; Open-code for speed.
-  (cond ((cdr preds) (lambda (&rest args) (--every (apply it args) preds)))
-        (preds (car preds))
-        ;; As a `pure' function, this runtime check may generate
-        ;; backward-incompatible bytecode for `(-andfn)' at compile-time,
-        ;; but I doubt that's a problem in practice (famous last words).
-        ((fboundp 'always) #'always)
-        ((lambda (&rest _) t))))
-
-(defun -iteratefn (fn n)
-  "Return a function FN composed N times with itself.
-
-FN is a unary function.  If you need to use a function of higher
-arity, use `-applify' first to turn it into a unary function.
-
-With n = 0, this acts as identity function.
-
-In types: (a -> a) -> Int -> a -> a.
-
-This function satisfies the following law:
-
-  (funcall (-iteratefn fn n) init) = (-last-item (-iterate fn init (1+ n)))."
-  (declare (pure t) (side-effect-free error-free))
-  (lambda (x) (--dotimes n (setq x (funcall fn x))) x))
-
-(defun -counter (&optional beg end inc)
-  "Return a closure that counts from BEG to END, with increment INC.
-
-The closure will return the next value in the counting sequence
-each time it is called, and nil after END is reached. BEG
-defaults to 0, INC defaults to 1, and if END is nil, the counter
-will increment indefinitely.
-
-The closure accepts any number of arguments, which are discarded."
-  (declare (pure t) (side-effect-free error-free))
-  (let ((inc (or inc 1))
-        (n (or beg 0)))
-    (lambda (&rest _)
-      (when (or (not end) (< n end))
-        (prog1 n
-          (setq n (+ n inc)))))))
-
-(defvar -fixfn-max-iterations 1000
-  "The default maximum number of iterations performed by `-fixfn'
-  unless otherwise specified.")
-
-(defun -fixfn (fn &optional equal-test halt-test)
-  "Return a function that computes the (least) fixpoint of FN.
-
-FN must be a unary function. The returned lambda takes a single
-argument, X, the initial value for the fixpoint iteration. The
-iteration halts when either of the following conditions is satisfied:
-
- 1. Iteration converges to the fixpoint, with equality being
-    tested using EQUAL-TEST. If EQUAL-TEST is not specified,
-    `equal' is used. For functions over the floating point
-    numbers, it may be necessary to provide an appropriate
-    approximate comparison test.
-
- 2. HALT-TEST returns a non-nil value. HALT-TEST defaults to a
-    simple counter that returns t after `-fixfn-max-iterations',
-    to guard against infinite iteration. Otherwise, HALT-TEST
-    must be a function that accepts a single argument, the
-    current value of X, and returns non-nil as long as iteration
-    should continue. In this way, a more sophisticated
-    convergence test may be supplied by the caller.
-
-The return value of the lambda is either the fixpoint or, if
-iteration halted before converging, a cons with car `halted' and
-cdr the final output from HALT-TEST.
-
-In types: (a -> a) -> a -> a."
-  (declare (important-return-value t))
-  (let ((eqfn   (or equal-test 'equal))
-        (haltfn (or halt-test
-                    (-not
-                     (-counter 0 -fixfn-max-iterations)))))
-    (lambda (x)
-      (let ((re (funcall fn x))
-            (halt? (funcall haltfn x)))
-        (while (and (not halt?) (not (funcall eqfn x re)))
-          (setq x     re
-                re    (funcall fn re)
-                halt? (funcall haltfn re)))
-        (if halt? (cons 'halted halt?)
-          re)))))
-
-(defun -prodfn (&rest fns)
-  "Return a function that applies each of FNS to each of a list of arguments.
-
-Takes a list of N functions and returns a function that takes a
-list of length N, applying Ith function to Ith element of the
-input list.  Returns a list of length N.
-
-In types (for N=2): ((a -> b), (c -> d)) -> (a, c) -> (b, d)
-
-This function satisfies the following laws:
-
-    (-compose (-prodfn f g ...)
-              (-prodfn f\\=' g\\=' ...))
-  = (-prodfn (-compose f f\\=')
-             (-compose g g\\=')
-             ...)
-
-    (-prodfn f g ...)
-  = (-juxt (-compose f (-partial #\\='nth 0))
-           (-compose g (-partial #\\='nth 1))
-           ...)
-
-    (-compose (-prodfn f g ...)
-              (-juxt f\\=' g\\=' ...))
-  = (-juxt (-compose f f\\=')
-           (-compose g g\\=')
-           ...)
-
-    (-compose (-partial #\\='nth n)
-              (-prod f1 f2 ...))
-  = (-compose fn (-partial #\\='nth n))"
-  (declare (pure t) (side-effect-free t))
-  (lambda (x) (--zip-with (funcall it other) fns x)))
-
-;;; Font lock
-
-(defvar dash--keywords
-  `(;; TODO: Do not fontify the following automatic variables
-    ;; globally; detect and limit to their local anaphoric scope.
-    (,(rx symbol-start (| "acc" "it" "it-index" "other") symbol-end)
-     0 font-lock-variable-name-face)
-    ;; Macros in dev/examples.el.  Based on `lisp-mode-symbol-regexp'.
-    (,(rx ?\( (group (| "defexamples" "def-example-group")) symbol-end
-          (+ (in "\t "))
-          (group (* (| (syntax word) (syntax symbol) (: ?\\ nonl)))))
-     (1 font-lock-keyword-face)
-     (2 font-lock-function-name-face))
-    ;; Symbols in dev/examples.el.
-    ,(rx symbol-start (| "=>" "~>" "!!>") symbol-end)
-    ;; Elisp macro fontification was static prior to Emacs 25.
-    ,@(when (< emacs-major-version 25)
-        (let ((macs '("!cdr"
-                      "!cons"
-                      "-->"
-                      "--all-p"
-                      "--all?"
-                      "--annotate"
-                      "--any"
-                      "--any-p"
-                      "--any?"
-                      "--count"
-                      "--dotimes"
-                      "--doto"
-                      "--drop-while"
-                      "--each"
-                      "--each-indexed"
-                      "--each-r"
-                      "--each-r-while"
-                      "--each-while"
-                      "--every"
-                      "--every-p"
-                      "--every?"
-                      "--filter"
-                      "--find"
-                      "--find-index"
-                      "--find-indices"
-                      "--find-last-index"
-                      "--first"
-                      "--fix"
-                      "--group-by"
-                      "--if-let"
-                      "--iterate"
-                      "--keep"
-                      "--last"
-                      "--map"
-                      "--map-first"
-                      "--map-indexed"
-                      "--map-last"
-                      "--map-when"
-                      "--mapcat"
-                      "--max-by"
-                      "--min-by"
-                      "--none-p"
-                      "--none?"
-                      "--only-some-p"
-                      "--only-some?"
-                      "--partition-after-pred"
-                      "--partition-by"
-                      "--partition-by-header"
-                      "--reduce"
-                      "--reduce-from"
-                      "--reduce-r"
-                      "--reduce-r-from"
-                      "--reductions"
-                      "--reductions-from"
-                      "--reductions-r"
-                      "--reductions-r-from"
-                      "--reject"
-                      "--reject-first"
-                      "--reject-last"
-                      "--remove"
-                      "--remove-first"
-                      "--remove-last"
-                      "--replace-where"
-                      "--select"
-                      "--separate"
-                      "--some"
-                      "--some-p"
-                      "--some?"
-                      "--sort"
-                      "--splice"
-                      "--splice-list"
-                      "--split-when"
-                      "--split-with"
-                      "--take-while"
-                      "--tree-map"
-                      "--tree-map-nodes"
-                      "--tree-mapreduce"
-                      "--tree-mapreduce-from"
-                      "--tree-reduce"
-                      "--tree-reduce-from"
-                      "--tree-seq"
-                      "--unfold"
-                      "--update-at"
-                      "--when-let"
-                      "--zip-with"
-                      "->"
-                      "->>"
-                      "-as->"
-                      "-cut"
-                      "-doto"
-                      "-if-let"
-                      "-if-let*"
-                      "-lambda"
-                      "-let"
-                      "-let*"
-                      "-setq"
-                      "-some-->"
-                      "-some->"
-                      "-some->>"
-                      "-split-on"
-                      "-when-let"
-                      "-when-let*")))
-          `((,(concat "(" (regexp-opt macs 'symbols)) . 1)))))
-  "Font lock keywords for `dash-fontify-mode'.")
-
-(defcustom dash-fontify-mode-lighter nil
-  "Mode line lighter for `dash-fontify-mode'.
-Either a string to display in the mode line when
-`dash-fontify-mode' is on, or nil to display
-nothing (the default)."
-  :package-version '(dash . "2.18.0")
-  :type '(choice (string :tag "Lighter" :value " Dash")
-                 (const :tag "Nothing" nil)))
-
-;;;###autoload
-(define-minor-mode dash-fontify-mode
-  "Toggle fontification of Dash special variables.
-
-Dash-Fontify mode is a buffer-local minor mode intended for Emacs
-Lisp buffers.  Enabling it causes the special variables bound in
-anaphoric Dash macros to be fontified.  These anaphoras include
-`it', `it-index', `acc', and `other'.  In older Emacs versions
-which do not dynamically detect macros, Dash-Fontify mode
-additionally fontifies Dash macro calls.
-
-See also `dash-fontify-mode-lighter' and
-`global-dash-fontify-mode'."
-  :lighter dash-fontify-mode-lighter
-  (if dash-fontify-mode
-      (font-lock-add-keywords nil dash--keywords t)
-    (font-lock-remove-keywords nil dash--keywords))
-  (cond ((fboundp 'font-lock-flush) ;; Added in Emacs 25.
-         (font-lock-flush))
-        ;; `font-lock-fontify-buffer' unconditionally enables
-        ;; `font-lock-mode' and is marked `interactive-only' in later
-        ;; Emacs versions which have `font-lock-flush', so we guard
-        ;; and pacify as needed, respectively.
-        (font-lock-mode
-         (with-no-warnings
-           (font-lock-fontify-buffer)))))
-
-(defun dash--turn-on-fontify-mode ()
-  "Enable `dash-fontify-mode' if in an Emacs Lisp buffer."
-  (when (derived-mode-p #'emacs-lisp-mode)
-    (dash-fontify-mode)))
-
-;;;###autoload
-(define-globalized-minor-mode global-dash-fontify-mode
-  dash-fontify-mode dash--turn-on-fontify-mode)
-
-(defcustom dash-enable-fontlock nil
-  "If non-nil, fontify Dash macro calls and special variables."
-  :set (lambda (sym val)
-         (set-default sym val)
-         (global-dash-fontify-mode (if val 1 0)))
-  :type 'boolean)
-
-(make-obsolete-variable
- 'dash-enable-fontlock #'global-dash-fontify-mode "2.18.0")
-
-(define-obsolete-function-alias
-  'dash-enable-font-lock #'global-dash-fontify-mode "2.18.0")
-
-;;; Info
-
-(defvar dash--info-doc-spec '("(dash) Index" nil "^ -+ .*: " "\\( \\|$\\)")
-  "The Dash :doc-spec entry for `info-lookup-alist'.
-It is based on that for `emacs-lisp-mode'.")
-
-(defun dash--info-elisp-docs ()
-  "Return the `emacs-lisp-mode' symbol docs from `info-lookup-alist'.
-Specifically, return the cons containing their
-`info-lookup->doc-spec' so that we can modify it."
-  (defvar info-lookup-alist)
-  (nthcdr 3 (assq #'emacs-lisp-mode (cdr (assq 'symbol info-lookup-alist)))))
-
-;;;###autoload
-(defun dash-register-info-lookup ()
-  "Register the Dash Info manual with `info-lookup-symbol'.
-This allows Dash symbols to be looked up with \\[info-lookup-symbol]."
-  (interactive)
-  (require 'info-look)
-  (let ((docs (dash--info-elisp-docs)))
-    (setcar docs (append (car docs) (list dash--info-doc-spec)))
-    (info-lookup-reset)))
-
-(defun dash-unload-function ()
-  "Remove Dash from `info-lookup-alist'.
-Used by `unload-feature', which see."
-  (let ((docs (and (featurep 'info-look)
-                   (dash--info-elisp-docs))))
-    (when (member dash--info-doc-spec (car docs))
-      (setcar docs (remove dash--info-doc-spec (car docs)))
-      (info-lookup-reset)))
-  nil)
-
-(provide 'dash)
-;;; dash.el ends here
diff --git a/emacs/elpa/dash-20240405.946/dash.elc b/emacs/elpa/dash-20240405.946/dash.elc
Binary files differ.
diff --git a/emacs/elpa/dash-20240405.946/dash.info b/emacs/elpa/dash-20240405.946/dash.info
@@ -1,4948 +0,0 @@
-This is dash.info, produced by makeinfo version 6.7 from dash.texi.
-
-This manual is for Dash version 2.19.1.
-
-   Copyright © 2012–2024 Free Software Foundation, Inc.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.3 or any later version published by the Free Software
-     Foundation; with the Invariant Sections being “GNU General Public
-     License,” and no Front-Cover Texts or Back-Cover Texts.  A copy of
-     the license is included in the section entitled “GNU Free
-     Documentation License”.
-INFO-DIR-SECTION Emacs
-START-INFO-DIR-ENTRY
-* Dash: (dash.info).    A modern list library for GNU Emacs.
-END-INFO-DIR-ENTRY
-
-
-File: dash.info,  Node: Top,  Next: Installation,  Up: (dir)
-
-Dash
-****
-
-This manual is for Dash version 2.19.1.
-
-   Copyright © 2012–2024 Free Software Foundation, Inc.
-
-     Permission is granted to copy, distribute and/or modify this
-     document under the terms of the GNU Free Documentation License,
-     Version 1.3 or any later version published by the Free Software
-     Foundation; with the Invariant Sections being “GNU General Public
-     License,” and no Front-Cover Texts or Back-Cover Texts.  A copy of
-     the license is included in the section entitled “GNU Free
-     Documentation License”.
-
-* Menu:
-
-* Installation::        Installing and configuring Dash.
-* Functions::           Dash API reference.
-* Development::         Contributing to Dash development.
-
-Appendices
-
-* FDL::                 The license for this documentation.
-* GPL::                 Conditions for copying and changing Dash.
-* Index::               Index including functions and macros.
-
- — The Detailed Node Listing —
-
-Installation
-
-* Using in a package::  Listing Dash as a package dependency.
-* Fontification of special variables::  Font Lock of anaphoric macro variables.
-* Info symbol lookup::  Looking up Dash symbols in this manual.
-
-Functions
-
-* Maps::
-* Sublist selection::
-* List to list::
-* Reductions::
-* Unfolding::
-* Predicates::
-* Partitioning::
-* Indexing::
-* Set operations::
-* Other list operations::
-* Tree operations::
-* Threading macros::
-* Binding::
-* Side effects::
-* Destructive operations::
-* Function combinators::
-
-Development
-
-* Contribute::          How to contribute.
-* Contributors::        List of contributors.
-
-
-File: dash.info,  Node: Installation,  Next: Functions,  Prev: Top,  Up: Top
-
-1 Installation
-**************
-
-Dash is available on GNU ELPA (https://elpa.gnu.org/), GNU-devel ELPA
-(https://elpa.gnu.org/devel/), and MELPA (https://melpa.org/), and can
-be installed with the standard command ‘package-install’ (*note
-(emacs)Package Installation::).
-
-‘M-x package-install <RET> dash <RET>’
-     Install the Dash library.
-
-   Alternatively, you can just dump ‘dash.el’ in your ‘load-path’
-somewhere (*note (emacs)Lisp Libraries::).
-
-* Menu:
-
-* Using in a package::  Listing Dash as a package dependency.
-* Fontification of special variables::  Font Lock of anaphoric macro variables.
-* Info symbol lookup::  Looking up Dash symbols in this manual.
-
-
-File: dash.info,  Node: Using in a package,  Next: Fontification of special variables,  Up: Installation
-
-1.1 Using in a package
-======================
-
-If you use Dash in your own package, be sure to list it as a dependency
-in the library’s headers as follows (*note (elisp)Library Headers::).
-
-     ;; Package-Requires: ((dash "2.19.1"))
-
-
-File: dash.info,  Node: Fontification of special variables,  Next: Info symbol lookup,  Prev: Using in a package,  Up: Installation
-
-1.2 Fontification of special variables
-======================================
-
-The autoloaded minor mode ‘dash-fontify-mode’ is provided for optional
-fontification of anaphoric Dash variables (‘it’, ‘acc’, etc.) in Emacs
-Lisp buffers using search-based Font Lock (*note (emacs)Font Lock::).
-In older Emacs versions which do not dynamically detect macros, the
-minor mode also fontifies calls to Dash macros.
-
-   To automatically enable the minor mode in all Emacs Lisp buffers,
-just call its autoloaded global counterpart ‘global-dash-fontify-mode’,
-either interactively or from your ‘user-init-file’:
-
-     (global-dash-fontify-mode)
-
-
-File: dash.info,  Node: Info symbol lookup,  Prev: Fontification of special variables,  Up: Installation
-
-1.3 Info symbol lookup
-======================
-
-While editing Elisp files, you can use ‘C-h S’ (‘info-lookup-symbol’) to
-look up Elisp symbols in the relevant Info manuals (*note (emacs)Info
-Lookup::).  To enable the same for Dash symbols, use the command
-‘dash-register-info-lookup’.  It can be called directly when needed, or
-automatically from your ‘user-init-file’.  For example:
-
-     (with-eval-after-load 'info-look
-       (dash-register-info-lookup))
-
-
-File: dash.info,  Node: Functions,  Next: Development,  Prev: Installation,  Up: Top
-
-2 Functions
-***********
-
-This chapter contains reference documentation for the Dash API
-(Application Programming Interface).  The names of all public functions
-defined in the library are prefixed with a dash character (‘-’).
-
-   The library also provides anaphoric macro versions of functions where
-that makes sense.  The names of these macros are prefixed with two
-dashes (‘--’) instead of one.
-
-   For instance, while the function ‘-map’ applies a function to each
-element of a list, its anaphoric counterpart ‘--map’ evaluates a form
-with the local variable ‘it’ temporarily bound to the current list
-element instead.
-
-     ;; Normal version.
-     (-map (lambda (n) (* n n)) '(1 2 3 4))
-         ⇒ (1 4 9 16)
-
-     ;; Anaphoric version.
-     (--map (* it it) '(1 2 3 4))
-         ⇒ (1 4 9 16)
-
-   The normal version can, of course, also be written as in the
-following example, which demonstrates the utility of both versions.
-
-     (defun my-square (n)
-       "Return N multiplied by itself."
-       (* n n))
-
-     (-map #'my-square '(1 2 3 4))
-         ⇒ (1 4 9 16)
-
-* Menu:
-
-* Maps::
-* Sublist selection::
-* List to list::
-* Reductions::
-* Unfolding::
-* Predicates::
-* Partitioning::
-* Indexing::
-* Set operations::
-* Other list operations::
-* Tree operations::
-* Threading macros::
-* Binding::
-* Side effects::
-* Destructive operations::
-* Function combinators::
-
-
-File: dash.info,  Node: Maps,  Next: Sublist selection,  Up: Functions
-
-2.1 Maps
-========
-
-Functions in this category take a transforming function, which is then
-applied sequentially to each or selected elements of the input list.
-The results are collected in order and returned as a new list.
-
- -- Function: -map (fn list)
-     Apply FN to each item in LIST and return the list of results.
-
-     This function’s anaphoric counterpart is ‘--map’.
-
-          (-map (lambda (num) (* num num)) '(1 2 3 4))
-              ⇒ (1 4 9 16)
-          (-map #'1+ '(1 2 3 4))
-              ⇒ (2 3 4 5)
-          (--map (* it it) '(1 2 3 4))
-              ⇒ (1 4 9 16)
-
- -- Function: -map-when (pred rep list)
-     Use PRED to conditionally apply REP to each item in LIST.  Return a
-     copy of LIST where the items for which PRED returns ‘nil’ are
-     unchanged, and the rest are mapped through the REP function.
-
-     Alias: ‘-replace-where’
-
-     See also: ‘-update-at’ (*note -update-at::)
-
-          (-map-when 'even? 'square '(1 2 3 4))
-              ⇒ (1 4 3 16)
-          (--map-when (> it 2) (* it it) '(1 2 3 4))
-              ⇒ (1 2 9 16)
-          (--map-when (= it 2) 17 '(1 2 3 4))
-              ⇒ (1 17 3 4)
-
- -- Function: -map-first (pred rep list)
-     Use PRED to determine the first item in LIST to call REP on.
-     Return a copy of LIST where the first item for which PRED returns
-     non-‘nil’ is replaced with the result of calling REP on that item.
-
-     See also: ‘-map-when’ (*note -map-when::), ‘-replace-first’ (*note
-     -replace-first::)
-
-          (-map-first 'even? 'square '(1 2 3 4))
-              ⇒ (1 4 3 4)
-          (--map-first (> it 2) (* it it) '(1 2 3 4))
-              ⇒ (1 2 9 4)
-          (--map-first (= it 2) 17 '(1 2 3 2))
-              ⇒ (1 17 3 2)
-
- -- Function: -map-last (pred rep list)
-     Use PRED to determine the last item in LIST to call REP on.  Return
-     a copy of LIST where the last item for which PRED returns non-‘nil’
-     is replaced with the result of calling REP on that item.
-
-     See also: ‘-map-when’ (*note -map-when::), ‘-replace-last’ (*note
-     -replace-last::)
-
-          (-map-last 'even? 'square '(1 2 3 4))
-              ⇒ (1 2 3 16)
-          (--map-last (> it 2) (* it it) '(1 2 3 4))
-              ⇒ (1 2 3 16)
-          (--map-last (= it 2) 17 '(1 2 3 2))
-              ⇒ (1 2 3 17)
-
- -- Function: -map-indexed (fn list)
-     Apply FN to each index and item in LIST and return the list of
-     results.  This is like ‘-map’ (*note -map::), but FN takes two
-     arguments: the index of the current element within LIST, and the
-     element itself.
-
-     This function’s anaphoric counterpart is ‘--map-indexed’.
-
-     For a side-effecting variant, see also ‘-each-indexed’ (*note
-     -each-indexed::).
-
-          (-map-indexed (lambda (index item) (- item index)) '(1 2 3 4))
-              ⇒ (1 1 1 1)
-          (--map-indexed (- it it-index) '(1 2 3 4))
-              ⇒ (1 1 1 1)
-          (-map-indexed #'* '(1 2 3 4))
-              ⇒ (0 2 6 12)
-
- -- Function: -annotate (fn list)
-     Pair each item in LIST with the result of passing it to FN.
-
-     Return an alist of (RESULT .  ITEM), where each ITEM is the
-     corresponding element of LIST, and RESULT is the value obtained by
-     calling FN on ITEM.
-
-     This function’s anaphoric counterpart is ‘--annotate’.
-
-          (-annotate #'1+ '(1 2 3))
-              ⇒ ((2 . 1) (3 . 2) (4 . 3))
-          (-annotate #'length '((f o o) (bar baz)))
-              ⇒ ((3 f o o) (2 bar baz))
-          (--annotate (> it 1) '(0 1 2 3))
-              ⇒ ((nil . 0) (nil . 1) (t . 2) (t . 3))
-
- -- Function: -splice (pred fun list)
-     Splice lists generated by FUN in place of items satisfying PRED in
-     LIST.
-
-     Call PRED on each element of LIST.  Whenever the result of PRED is
-     ‘nil’, leave that ‘it’ as-is.  Otherwise, call FUN on the same ‘it’
-     that satisfied PRED.  The result should be a (possibly empty) list
-     of items to splice in place of ‘it’ in LIST.
-
-     This can be useful as an alternative to the ‘,@’ construct in a ‘`’
-     structure, in case you need to splice several lists at marked
-     positions (for example with keywords).
-
-     This function’s anaphoric counterpart is ‘--splice’.
-
-     See also: ‘-splice-list’ (*note -splice-list::), ‘-insert-at’
-     (*note -insert-at::).
-
-          (-splice #'numberp (lambda (n) (list n n)) '(a 1 b 2))
-              ⇒ (a 1 1 b 2 2)
-          (--splice t (list it it) '(1 2 3 4))
-              ⇒ (1 1 2 2 3 3 4 4)
-          (--splice (eq it :magic) '((magical) (code)) '((foo) :magic (bar)))
-              ⇒ ((foo) (magical) (code) (bar))
-
- -- Function: -splice-list (pred new-list list)
-     Splice NEW-LIST in place of elements matching PRED in LIST.
-
-     See also: ‘-splice’ (*note -splice::), ‘-insert-at’ (*note
-     -insert-at::)
-
-          (-splice-list 'keywordp '(a b c) '(1 :foo 2))
-              ⇒ (1 a b c 2)
-          (-splice-list 'keywordp nil '(1 :foo 2))
-              ⇒ (1 2)
-          (--splice-list (keywordp it) '(a b c) '(1 :foo 2))
-              ⇒ (1 a b c 2)
-
- -- Function: -mapcat (fn list)
-     Return the concatenation of the result of mapping FN over LIST.
-     Thus function FN should return a list.
-
-          (-mapcat 'list '(1 2 3))
-              ⇒ (1 2 3)
-          (-mapcat (lambda (item) (list 0 item)) '(1 2 3))
-              ⇒ (0 1 0 2 0 3)
-          (--mapcat (list 0 it) '(1 2 3))
-              ⇒ (0 1 0 2 0 3)
-
- -- Function: -copy (list)
-     Create a shallow copy of LIST.
-
-          (-copy '(1 2 3))
-              ⇒ (1 2 3)
-          (let ((a '(1 2 3))) (eq a (-copy a)))
-              ⇒ nil
-
-
-File: dash.info,  Node: Sublist selection,  Next: List to list,  Prev: Maps,  Up: Functions
-
-2.2 Sublist selection
-=====================
-
-Functions returning a sublist of the original list.
-
- -- Function: -filter (pred list)
-     Return a new list of the items in LIST for which PRED returns
-     non-‘nil’.
-
-     Alias: ‘-select’.
-
-     This function’s anaphoric counterpart is ‘--filter’.
-
-     For similar operations, see also ‘-keep’ (*note -keep::) and
-     ‘-remove’ (*note -remove::).
-
-          (-filter (lambda (num) (= 0 (% num 2))) '(1 2 3 4))
-              ⇒ (2 4)
-          (-filter #'natnump '(-2 -1 0 1 2))
-              ⇒ (0 1 2)
-          (--filter (= 0 (% it 2)) '(1 2 3 4))
-              ⇒ (2 4)
-
- -- Function: -remove (pred list)
-     Return a new list of the items in LIST for which PRED returns
-     ‘nil’.
-
-     Alias: ‘-reject’.
-
-     This function’s anaphoric counterpart is ‘--remove’.
-
-     For similar operations, see also ‘-keep’ (*note -keep::) and
-     ‘-filter’ (*note -filter::).
-
-          (-remove (lambda (num) (= 0 (% num 2))) '(1 2 3 4))
-              ⇒ (1 3)
-          (-remove #'natnump '(-2 -1 0 1 2))
-              ⇒ (-2 -1)
-          (--remove (= 0 (% it 2)) '(1 2 3 4))
-              ⇒ (1 3)
-
- -- Function: -remove-first (pred list)
-     Remove the first item from LIST for which PRED returns non-‘nil’.
-     This is a non-destructive operation, but only the front of LIST
-     leading up to the removed item is a copy; the rest is LIST’s
-     original tail.  If no item is removed, then the result is a
-     complete copy.
-
-     Alias: ‘-reject-first’.
-
-     This function’s anaphoric counterpart is ‘--remove-first’.
-
-     See also ‘-map-first’ (*note -map-first::), ‘-remove-item’ (*note
-     -remove-item::), and ‘-remove-last’ (*note -remove-last::).
-
-          (-remove-first #'natnump '(-2 -1 0 1 2))
-              ⇒ (-2 -1 1 2)
-          (-remove-first #'stringp '(1 2 "first" "second"))
-              ⇒ (1 2 "second")
-          (--remove-first (> it 3) '(1 2 3 4 5 6))
-              ⇒ (1 2 3 5 6)
-
- -- Function: -remove-last (pred list)
-     Remove the last item from LIST for which PRED returns non-‘nil’.
-     The result is a copy of LIST regardless of whether an element is
-     removed.
-
-     Alias: ‘-reject-last’.
-
-     This function’s anaphoric counterpart is ‘--remove-last’.
-
-     See also ‘-map-last’ (*note -map-last::), ‘-remove-item’ (*note
-     -remove-item::), and ‘-remove-first’ (*note -remove-first::).
-
-          (-remove-last #'natnump '(1 3 5 4 7 8 10 -11))
-              ⇒ (1 3 5 4 7 8 -11)
-          (-remove-last #'stringp '(1 2 "last" "second"))
-              ⇒ (1 2 "last")
-          (--remove-last (> it 3) '(1 2 3 4 5 6 7 8 9 10))
-              ⇒ (1 2 3 4 5 6 7 8 9)
-
- -- Function: -remove-item (item list)
-     Return a copy of LIST with all occurrences of ITEM removed.  The
-     comparison is done with ‘equal’.
-
-          (-remove-item 3 '(1 2 3 2 3 4 5 3))
-              ⇒ (1 2 2 4 5)
-          (-remove-item 'foo '(foo bar baz foo))
-              ⇒ (bar baz)
-          (-remove-item "bob" '("alice" "bob" "eve" "bob"))
-              ⇒ ("alice" "eve")
-
- -- Function: -non-nil (list)
-     Return a copy of LIST with all ‘nil’ items removed.
-
-          (-non-nil '(nil 1 nil 2 nil nil 3 4 nil 5 nil))
-              ⇒ (1 2 3 4 5)
-          (-non-nil '((nil)))
-              ⇒ ((nil))
-          (-non-nil ())
-              ⇒ ()
-
- -- Function: -slice (list from &optional to step)
-     Return copy of LIST, starting from index FROM to index TO.
-
-     FROM or TO may be negative.  These values are then interpreted
-     modulo the length of the list.
-
-     If STEP is a number, only each STEPth item in the resulting section
-     is returned.  Defaults to 1.
-
-          (-slice '(1 2 3 4 5) 1)
-              ⇒ (2 3 4 5)
-          (-slice '(1 2 3 4 5) 0 3)
-              ⇒ (1 2 3)
-          (-slice '(1 2 3 4 5 6 7 8 9) 1 -1 2)
-              ⇒ (2 4 6 8)
-
- -- Function: -take (n list)
-     Return a copy of the first N items in LIST.  Return a copy of LIST
-     if it contains N items or fewer.  Return ‘nil’ if N is zero or
-     less.
-
-     See also: ‘-take-last’ (*note -take-last::).
-
-          (-take 3 '(1 2 3 4 5))
-              ⇒ (1 2 3)
-          (-take 17 '(1 2 3 4 5))
-              ⇒ (1 2 3 4 5)
-          (-take 0 '(1 2 3 4 5))
-              ⇒ ()
-
- -- Function: -take-last (n list)
-     Return a copy of the last N items of LIST in order.  Return a copy
-     of LIST if it contains N items or fewer.  Return ‘nil’ if N is zero
-     or less.
-
-     See also: ‘-take’ (*note -take::).
-
-          (-take-last 3 '(1 2 3 4 5))
-              ⇒ (3 4 5)
-          (-take-last 17 '(1 2 3 4 5))
-              ⇒ (1 2 3 4 5)
-          (-take-last 1 '(1 2 3 4 5))
-              ⇒ (5)
-
- -- Function: -drop (n list)
-     Return the tail (not a copy) of LIST without the first N items.
-     Return ‘nil’ if LIST contains N items or fewer.  Return LIST if N
-     is zero or less.
-
-     For another variant, see also ‘-drop-last’ (*note -drop-last::).
-
-          (-drop 3 '(1 2 3 4 5))
-              ⇒ (4 5)
-          (-drop 17 '(1 2 3 4 5))
-              ⇒ ()
-          (-drop 0 '(1 2 3 4 5))
-              ⇒ (1 2 3 4 5)
-
- -- Function: -drop-last (n list)
-     Return a copy of LIST without its last N items.  Return a copy of
-     LIST if N is zero or less.  Return ‘nil’ if LIST contains N items
-     or fewer.
-
-     See also: ‘-drop’ (*note -drop::).
-
-          (-drop-last 3 '(1 2 3 4 5))
-              ⇒ (1 2)
-          (-drop-last 17 '(1 2 3 4 5))
-              ⇒ ()
-          (-drop-last 0 '(1 2 3 4 5))
-              ⇒ (1 2 3 4 5)
-
- -- Function: -take-while (pred list)
-     Take successive items from LIST for which PRED returns non-‘nil’.
-     PRED is a function of one argument.  Return a new list of the
-     successive elements from the start of LIST for which PRED returns
-     non-‘nil’.
-
-     This function’s anaphoric counterpart is ‘--take-while’.
-
-     For another variant, see also ‘-drop-while’ (*note -drop-while::).
-
-          (-take-while #'even? '(1 2 3 4))
-              ⇒ ()
-          (-take-while #'even? '(2 4 5 6))
-              ⇒ (2 4)
-          (--take-while (< it 4) '(1 2 3 4 3 2 1))
-              ⇒ (1 2 3)
-
- -- Function: -drop-while (pred list)
-     Drop successive items from LIST for which PRED returns non-‘nil’.
-     PRED is a function of one argument.  Return the tail (not a copy)
-     of LIST starting from its first element for which PRED returns
-     ‘nil’.
-
-     This function’s anaphoric counterpart is ‘--drop-while’.
-
-     For another variant, see also ‘-take-while’ (*note -take-while::).
-
-          (-drop-while #'even? '(1 2 3 4))
-              ⇒ (1 2 3 4)
-          (-drop-while #'even? '(2 4 5 6))
-              ⇒ (5 6)
-          (--drop-while (< it 4) '(1 2 3 4 3 2 1))
-              ⇒ (4 3 2 1)
-
- -- Function: -select-by-indices (indices list)
-     Return a list whose elements are elements from LIST selected as
-     ‘(nth i list)‘ for all i from INDICES.
-
-          (-select-by-indices '(4 10 2 3 6) '("v" "e" "l" "o" "c" "i" "r" "a" "p" "t" "o" "r"))
-              ⇒ ("c" "o" "l" "o" "r")
-          (-select-by-indices '(2 1 0) '("a" "b" "c"))
-              ⇒ ("c" "b" "a")
-          (-select-by-indices '(0 1 2 0 1 3 3 1) '("f" "a" "r" "l"))
-              ⇒ ("f" "a" "r" "f" "a" "l" "l" "a")
-
- -- Function: -select-columns (columns table)
-     Select COLUMNS from TABLE.
-
-     TABLE is a list of lists where each element represents one row.  It
-     is assumed each row has the same length.
-
-     Each row is transformed such that only the specified COLUMNS are
-     selected.
-
-     See also: ‘-select-column’ (*note -select-column::),
-     ‘-select-by-indices’ (*note -select-by-indices::)
-
-          (-select-columns '(0 2) '((1 2 3) (a b c) (:a :b :c)))
-              ⇒ ((1 3) (a c) (:a :c))
-          (-select-columns '(1) '((1 2 3) (a b c) (:a :b :c)))
-              ⇒ ((2) (b) (:b))
-          (-select-columns nil '((1 2 3) (a b c) (:a :b :c)))
-              ⇒ (nil nil nil)
-
- -- Function: -select-column (column table)
-     Select COLUMN from TABLE.
-
-     TABLE is a list of lists where each element represents one row.  It
-     is assumed each row has the same length.
-
-     The single selected column is returned as a list.
-
-     See also: ‘-select-columns’ (*note -select-columns::),
-     ‘-select-by-indices’ (*note -select-by-indices::)
-
-          (-select-column 1 '((1 2 3) (a b c) (:a :b :c)))
-              ⇒ (2 b :b)
-
-
-File: dash.info,  Node: List to list,  Next: Reductions,  Prev: Sublist selection,  Up: Functions
-
-2.3 List to list
-================
-
-Functions returning a modified copy of the input list.
-
- -- Function: -keep (fn list)
-     Return a new list of the non-‘nil’ results of applying FN to each
-     item in LIST.  Like ‘-filter’ (*note -filter::), but returns the
-     non-‘nil’ results of FN instead of the corresponding elements of
-     LIST.
-
-     Its anaphoric counterpart is ‘--keep’.
-
-          (-keep #'cdr '((1 2 3) (4 5) (6)))
-              ⇒ ((2 3) (5))
-          (-keep (lambda (n) (and (> n 3) (* 10 n))) '(1 2 3 4 5 6))
-              ⇒ (40 50 60)
-          (--keep (and (> it 3) (* 10 it)) '(1 2 3 4 5 6))
-              ⇒ (40 50 60)
-
- -- Function: -concat (&rest sequences)
-     Concatenate all the arguments and make the result a list.  The
-     result is a list whose elements are the elements of all the
-     arguments.  Each argument may be a list, vector or string.
-
-     All arguments except the last argument are copied.  The last
-     argument is just used as the tail of the new list.
-
-          (-concat '(1))
-              ⇒ (1)
-          (-concat '(1) '(2))
-              ⇒ (1 2)
-          (-concat '(1) '(2 3) '(4))
-              ⇒ (1 2 3 4)
-
- -- Function: -flatten (l)
-     Take a nested list L and return its contents as a single, flat
-     list.
-
-     Note that because ‘nil’ represents a list of zero elements (an
-     empty list), any mention of ‘nil’ in L will disappear after
-     flattening.  If you need to preserve nils, consider ‘-flatten-n’
-     (*note -flatten-n::) or map them to some unique symbol and then map
-     them back.
-
-     Conses of two atoms are considered "terminals", that is, they
-     aren’t flattened further.
-
-     See also: ‘-flatten-n’ (*note -flatten-n::)
-
-          (-flatten '((1)))
-              ⇒ (1)
-          (-flatten '((1 (2 3) (((4 (5)))))))
-              ⇒ (1 2 3 4 5)
-          (-flatten '(1 2 (3 . 4)))
-              ⇒ (1 2 (3 . 4))
-
- -- Function: -flatten-n (num list)
-     Flatten NUM levels of a nested LIST.
-
-     See also: ‘-flatten’ (*note -flatten::)
-
-          (-flatten-n 1 '((1 2) ((3 4) ((5 6)))))
-              ⇒ (1 2 (3 4) ((5 6)))
-          (-flatten-n 2 '((1 2) ((3 4) ((5 6)))))
-              ⇒ (1 2 3 4 (5 6))
-          (-flatten-n 3 '((1 2) ((3 4) ((5 6)))))
-              ⇒ (1 2 3 4 5 6)
-
- -- Function: -replace (old new list)
-     Replace all OLD items in LIST with NEW.
-
-     Elements are compared using ‘equal’.
-
-     See also: ‘-replace-at’ (*note -replace-at::)
-
-          (-replace 1 "1" '(1 2 3 4 3 2 1))
-              ⇒ ("1" 2 3 4 3 2 "1")
-          (-replace "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
-              ⇒ ("a" "nice" "bar" "sentence" "about" "bar")
-          (-replace 1 2 nil)
-              ⇒ nil
-
- -- Function: -replace-first (old new list)
-     Replace the first occurrence of OLD with NEW in LIST.
-
-     Elements are compared using ‘equal’.
-
-     See also: ‘-map-first’ (*note -map-first::)
-
-          (-replace-first 1 "1" '(1 2 3 4 3 2 1))
-              ⇒ ("1" 2 3 4 3 2 1)
-          (-replace-first "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
-              ⇒ ("a" "nice" "bar" "sentence" "about" "foo")
-          (-replace-first 1 2 nil)
-              ⇒ nil
-
- -- Function: -replace-last (old new list)
-     Replace the last occurrence of OLD with NEW in LIST.
-
-     Elements are compared using ‘equal’.
-
-     See also: ‘-map-last’ (*note -map-last::)
-
-          (-replace-last 1 "1" '(1 2 3 4 3 2 1))
-              ⇒ (1 2 3 4 3 2 "1")
-          (-replace-last "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
-              ⇒ ("a" "nice" "foo" "sentence" "about" "bar")
-          (-replace-last 1 2 nil)
-              ⇒ nil
-
- -- Function: -insert-at (n x list)
-     Return a list with X inserted into LIST at position N.
-
-     See also: ‘-splice’ (*note -splice::), ‘-splice-list’ (*note
-     -splice-list::)
-
-          (-insert-at 1 'x '(a b c))
-              ⇒ (a x b c)
-          (-insert-at 12 'x '(a b c))
-              ⇒ (a b c x)
-
- -- Function: -replace-at (n x list)
-     Return a list with element at Nth position in LIST replaced with X.
-
-     See also: ‘-replace’ (*note -replace::)
-
-          (-replace-at 0 9 '(0 1 2 3 4 5))
-              ⇒ (9 1 2 3 4 5)
-          (-replace-at 1 9 '(0 1 2 3 4 5))
-              ⇒ (0 9 2 3 4 5)
-          (-replace-at 4 9 '(0 1 2 3 4 5))
-              ⇒ (0 1 2 3 9 5)
-
- -- Function: -update-at (n func list)
-     Use FUNC to update the Nth element of LIST.  Return a copy of LIST
-     where the Nth element is replaced with the result of calling FUNC
-     on it.
-
-     See also: ‘-map-when’ (*note -map-when::)
-
-          (-update-at 0 (lambda (x) (+ x 9)) '(0 1 2 3 4 5))
-              ⇒ (9 1 2 3 4 5)
-          (-update-at 1 (lambda (x) (+ x 8)) '(0 1 2 3 4 5))
-              ⇒ (0 9 2 3 4 5)
-          (--update-at 2 (length it) '("foo" "bar" "baz" "quux"))
-              ⇒ ("foo" "bar" 3 "quux")
-
- -- Function: -remove-at (n list)
-     Return LIST with its element at index N removed.  That is, remove
-     any element selected as (nth N LIST) from LIST and return the
-     result.
-
-     This is a non-destructive operation: parts of LIST (but not
-     necessarily all of it) are copied as needed to avoid destructively
-     modifying it.
-
-     See also: ‘-remove-at-indices’ (*note -remove-at-indices::),
-     ‘-remove’ (*note -remove::).
-
-          (-remove-at 0 '(a b c))
-              ⇒ (b c)
-          (-remove-at 1 '(a b c))
-              ⇒ (a c)
-          (-remove-at 2 '(a b c))
-              ⇒ (a b)
-
- -- Function: -remove-at-indices (indices list)
-     Return LIST with its elements at INDICES removed.  That is, for
-     each index I in INDICES, remove any element selected as (nth I
-     LIST) from LIST.
-
-     This is a non-destructive operation: parts of LIST (but not
-     necessarily all of it) are copied as needed to avoid destructively
-     modifying it.
-
-     See also: ‘-remove-at’ (*note -remove-at::), ‘-remove’ (*note
-     -remove::).
-
-          (-remove-at-indices '(0) '(a b c d e))
-              ⇒ (b c d e)
-          (-remove-at-indices '(1 3) '(a b c d e))
-              ⇒ (a c e)
-          (-remove-at-indices '(4 0 2) '(a b c d e))
-              ⇒ (b d)
-
-
-File: dash.info,  Node: Reductions,  Next: Unfolding,  Prev: List to list,  Up: Functions
-
-2.4 Reductions
-==============
-
-Functions reducing lists to a single value (which may also be a list).
-
- -- Function: -reduce-from (fn init list)
-     Reduce the function FN across LIST, starting with INIT.  Return the
-     result of applying FN to INIT and the first element of LIST, then
-     applying FN to that result and the second element, etc.  If LIST is
-     empty, return INIT without calling FN.
-
-     This function’s anaphoric counterpart is ‘--reduce-from’.
-
-     For other folds, see also ‘-reduce’ (*note -reduce::) and
-     ‘-reduce-r’ (*note -reduce-r::).
-
-          (-reduce-from #'- 10 '(1 2 3))
-              ⇒ 4
-          (-reduce-from #'list 10 '(1 2 3))
-              ⇒ (((10 1) 2) 3)
-          (--reduce-from (concat acc " " it) "START" '("a" "b" "c"))
-              ⇒ "START a b c"
-
- -- Function: -reduce-r-from (fn init list)
-     Reduce the function FN across LIST in reverse, starting with INIT.
-     Return the result of applying FN to the last element of LIST and
-     INIT, then applying FN to the second-to-last element and the
-     previous result of FN, etc.  That is, the first argument of FN is
-     the current element, and its second argument the accumulated value.
-     If LIST is empty, return INIT without calling FN.
-
-     This function is like ‘-reduce-from’ (*note -reduce-from::) but the
-     operation associates from the right rather than left.  In other
-     words, it starts from the end of LIST and flips the arguments to
-     FN.  Conceptually, it is like replacing the conses in LIST with
-     applications of FN, and its last link with INIT, and evaluating the
-     resulting expression.
-
-     This function’s anaphoric counterpart is ‘--reduce-r-from’.
-
-     For other folds, see also ‘-reduce-r’ (*note -reduce-r::) and
-     ‘-reduce’ (*note -reduce::).
-
-          (-reduce-r-from #'- 10 '(1 2 3))
-              ⇒ -8
-          (-reduce-r-from #'list 10 '(1 2 3))
-              ⇒ (1 (2 (3 10)))
-          (--reduce-r-from (concat it " " acc) "END" '("a" "b" "c"))
-              ⇒ "a b c END"
-
- -- Function: -reduce (fn list)
-     Reduce the function FN across LIST.  Return the result of applying
-     FN to the first two elements of LIST, then applying FN to that
-     result and the third element, etc.  If LIST contains a single
-     element, return it without calling FN.  If LIST is empty, return
-     the result of calling FN with no arguments.
-
-     This function’s anaphoric counterpart is ‘--reduce’.
-
-     For other folds, see also ‘-reduce-from’ (*note -reduce-from::) and
-     ‘-reduce-r’ (*note -reduce-r::).
-
-          (-reduce #'- '(1 2 3 4))
-              ⇒ -8
-          (-reduce #'list '(1 2 3 4))
-              ⇒ (((1 2) 3) 4)
-          (--reduce (format "%s-%d" acc it) '(1 2 3))
-              ⇒ "1-2-3"
-
- -- Function: -reduce-r (fn list)
-     Reduce the function FN across LIST in reverse.  Return the result
-     of applying FN to the last two elements of LIST, then applying FN
-     to the third-to-last element and the previous result of FN, etc.
-     That is, the first argument of FN is the current element, and its
-     second argument the accumulated value.  If LIST contains a single
-     element, return it without calling FN.  If LIST is empty, return
-     the result of calling FN with no arguments.
-
-     This function is like ‘-reduce’ (*note -reduce::) but the operation
-     associates from the right rather than left.  In other words, it
-     starts from the end of LIST and flips the arguments to FN.
-     Conceptually, it is like replacing the conses in LIST with
-     applications of FN, ignoring its last link, and evaluating the
-     resulting expression.
-
-     This function’s anaphoric counterpart is ‘--reduce-r’.
-
-     For other folds, see also ‘-reduce-r-from’ (*note -reduce-r-from::)
-     and ‘-reduce’ (*note -reduce::).
-
-          (-reduce-r #'- '(1 2 3 4))
-              ⇒ -2
-          (-reduce-r #'list '(1 2 3 4))
-              ⇒ (1 (2 (3 4)))
-          (--reduce-r (format "%s-%d" acc it) '(1 2 3))
-              ⇒ "3-2-1"
-
- -- Function: -reductions-from (fn init list)
-     Return a list of FN’s intermediate reductions across LIST.  That
-     is, a list of the intermediate values of the accumulator when
-     ‘-reduce-from’ (*note -reduce-from::) (which see) is called with
-     the same arguments.
-
-     This function’s anaphoric counterpart is ‘--reductions-from’.
-
-     For other folds, see also ‘-reductions’ (*note -reductions::) and
-     ‘-reductions-r’ (*note -reductions-r::).
-
-          (-reductions-from #'max 0 '(2 1 4 3))
-              ⇒ (0 2 2 4 4)
-          (-reductions-from #'* 1 '(1 2 3 4))
-              ⇒ (1 1 2 6 24)
-          (--reductions-from (format "(FN %s %d)" acc it) "INIT" '(1 2 3))
-              ⇒ ("INIT" "(FN INIT 1)" "(FN (FN INIT 1) 2)" "(FN (FN (FN INIT 1) 2) 3)")
-
- -- Function: -reductions-r-from (fn init list)
-     Return a list of FN’s intermediate reductions across reversed LIST.
-     That is, a list of the intermediate values of the accumulator when
-     ‘-reduce-r-from’ (*note -reduce-r-from::) (which see) is called
-     with the same arguments.
-
-     This function’s anaphoric counterpart is ‘--reductions-r-from’.
-
-     For other folds, see also ‘-reductions’ (*note -reductions::) and
-     ‘-reductions-r’ (*note -reductions-r::).
-
-          (-reductions-r-from #'max 0 '(2 1 4 3))
-              ⇒ (4 4 4 3 0)
-          (-reductions-r-from #'* 1 '(1 2 3 4))
-              ⇒ (24 24 12 4 1)
-          (--reductions-r-from (format "(FN %d %s)" it acc) "INIT" '(1 2 3))
-              ⇒ ("(FN 1 (FN 2 (FN 3 INIT)))" "(FN 2 (FN 3 INIT))" "(FN 3 INIT)" "INIT")
-
- -- Function: -reductions (fn list)
-     Return a list of FN’s intermediate reductions across LIST.  That
-     is, a list of the intermediate values of the accumulator when
-     ‘-reduce’ (*note -reduce::) (which see) is called with the same
-     arguments.
-
-     This function’s anaphoric counterpart is ‘--reductions’.
-
-     For other folds, see also ‘-reductions’ (*note -reductions::) and
-     ‘-reductions-r’ (*note -reductions-r::).
-
-          (-reductions #'+ '(1 2 3 4))
-              ⇒ (1 3 6 10)
-          (-reductions #'* '(1 2 3 4))
-              ⇒ (1 2 6 24)
-          (--reductions (format "(FN %s %d)" acc it) '(1 2 3))
-              ⇒ (1 "(FN 1 2)" "(FN (FN 1 2) 3)")
-
- -- Function: -reductions-r (fn list)
-     Return a list of FN’s intermediate reductions across reversed LIST.
-     That is, a list of the intermediate values of the accumulator when
-     ‘-reduce-r’ (*note -reduce-r::) (which see) is called with the same
-     arguments.
-
-     This function’s anaphoric counterpart is ‘--reductions-r’.
-
-     For other folds, see also ‘-reductions-r-from’ (*note
-     -reductions-r-from::) and ‘-reductions’ (*note -reductions::).
-
-          (-reductions-r #'+ '(1 2 3 4))
-              ⇒ (10 9 7 4)
-          (-reductions-r #'* '(1 2 3 4))
-              ⇒ (24 24 12 4)
-          (--reductions-r (format "(FN %d %s)" it acc) '(1 2 3))
-              ⇒ ("(FN 1 (FN 2 3))" "(FN 2 3)" 3)
-
- -- Function: -count (pred list)
-     Counts the number of items in LIST where (PRED item) is non-‘nil’.
-
-          (-count 'even? '(1 2 3 4 5))
-              ⇒ 2
-          (--count (< it 4) '(1 2 3 4))
-              ⇒ 3
-
- -- Function: -sum (list)
-     Return the sum of LIST.
-
-          (-sum ())
-              ⇒ 0
-          (-sum '(1))
-              ⇒ 1
-          (-sum '(1 2 3 4))
-              ⇒ 10
-
- -- Function: -running-sum (list)
-     Return a list with running sums of items in LIST.  LIST must be
-     non-empty.
-
-          (-running-sum '(1 2 3 4))
-              ⇒ (1 3 6 10)
-          (-running-sum '(1))
-              ⇒ (1)
-          (-running-sum ())
-              error→ Wrong type argument: consp, nil
-
- -- Function: -product (list)
-     Return the product of LIST.
-
-          (-product ())
-              ⇒ 1
-          (-product '(1))
-              ⇒ 1
-          (-product '(1 2 3 4))
-              ⇒ 24
-
- -- Function: -running-product (list)
-     Return a list with running products of items in LIST.  LIST must be
-     non-empty.
-
-          (-running-product '(1 2 3 4))
-              ⇒ (1 2 6 24)
-          (-running-product '(1))
-              ⇒ (1)
-          (-running-product ())
-              error→ Wrong type argument: consp, nil
-
- -- Function: -inits (list)
-     Return all prefixes of LIST.
-
-          (-inits '(1 2 3 4))
-              ⇒ (nil (1) (1 2) (1 2 3) (1 2 3 4))
-          (-inits nil)
-              ⇒ (nil)
-          (-inits '(1))
-              ⇒ (nil (1))
-
- -- Function: -tails (list)
-     Return all suffixes of LIST.
-
-          (-tails '(1 2 3 4))
-              ⇒ ((1 2 3 4) (2 3 4) (3 4) (4) nil)
-          (-tails nil)
-              ⇒ (nil)
-          (-tails '(1))
-              ⇒ ((1) nil)
-
- -- Function: -common-prefix (&rest lists)
-     Return the longest common prefix of LISTS.
-
-          (-common-prefix '(1))
-              ⇒ (1)
-          (-common-prefix '(1 2) '(3 4) '(1 2))
-              ⇒ ()
-          (-common-prefix '(1 2) '(1 2 3) '(1 2 3 4))
-              ⇒ (1 2)
-
- -- Function: -common-suffix (&rest lists)
-     Return the longest common suffix of LISTS.
-
-          (-common-suffix '(1))
-              ⇒ (1)
-          (-common-suffix '(1 2) '(3 4) '(1 2))
-              ⇒ ()
-          (-common-suffix '(1 2 3 4) '(2 3 4) '(3 4))
-              ⇒ (3 4)
-
- -- Function: -min (list)
-     Return the smallest value from LIST of numbers or markers.
-
-          (-min '(0))
-              ⇒ 0
-          (-min '(3 2 1))
-              ⇒ 1
-          (-min '(1 2 3))
-              ⇒ 1
-
- -- Function: -min-by (comparator list)
-     Take a comparison function COMPARATOR and a LIST and return the
-     least element of the list by the comparison function.
-
-     See also combinator ‘-on’ (*note -on::) which can transform the
-     values before comparing them.
-
-          (-min-by '> '(4 3 6 1))
-              ⇒ 1
-          (--min-by (> (car it) (car other)) '((1 2 3) (2) (3 2)))
-              ⇒ (1 2 3)
-          (--min-by (> (length it) (length other)) '((1 2 3) (2) (3 2)))
-              ⇒ (2)
-
- -- Function: -max (list)
-     Return the largest value from LIST of numbers or markers.
-
-          (-max '(0))
-              ⇒ 0
-          (-max '(3 2 1))
-              ⇒ 3
-          (-max '(1 2 3))
-              ⇒ 3
-
- -- Function: -max-by (comparator list)
-     Take a comparison function COMPARATOR and a LIST and return the
-     greatest element of the list by the comparison function.
-
-     See also combinator ‘-on’ (*note -on::) which can transform the
-     values before comparing them.
-
-          (-max-by '> '(4 3 6 1))
-              ⇒ 6
-          (--max-by (> (car it) (car other)) '((1 2 3) (2) (3 2)))
-              ⇒ (3 2)
-          (--max-by (> (length it) (length other)) '((1 2 3) (2) (3 2)))
-              ⇒ (1 2 3)
-
- -- Function: -frequencies (list)
-     Count the occurrences of each distinct element of LIST.
-
-     Return an alist of (ELEMENT .  N), where each ELEMENT occurs N
-     times in LIST.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.
-
-     See also ‘-count’ (*note -count::) and ‘-group-by’ (*note
-     -group-by::).
-
-          (-frequencies ())
-              ⇒ ()
-          (-frequencies '(1 2 3 1 2 1))
-              ⇒ ((1 . 3) (2 . 2) (3 . 1))
-          (let ((-compare-fn #'string=)) (-frequencies '(a "a")))
-              ⇒ ((a . 2))
-
-
-File: dash.info,  Node: Unfolding,  Next: Predicates,  Prev: Reductions,  Up: Functions
-
-2.5 Unfolding
-=============
-
-Operations dual to reductions, building lists from a seed value rather
-than consuming a list to produce a single value.
-
- -- Function: -iterate (fun init n)
-     Return a list of iterated applications of FUN to INIT.
-
-     This means a list of the form:
-
-     (INIT (FUN INIT) (FUN (FUN INIT)) ...)
-
-     N is the length of the returned list.
-
-          (-iterate #'1+ 1 10)
-              ⇒ (1 2 3 4 5 6 7 8 9 10)
-          (-iterate (lambda (x) (+ x x)) 2 5)
-              ⇒ (2 4 8 16 32)
-          (--iterate (* it it) 2 5)
-              ⇒ (2 4 16 256 65536)
-
- -- Function: -unfold (fun seed)
-     Build a list from SEED using FUN.
-
-     This is "dual" operation to ‘-reduce-r’ (*note -reduce-r::): while
-     -reduce-r consumes a list to produce a single value, ‘-unfold’
-     (*note -unfold::) takes a seed value and builds a (potentially
-     infinite!)  list.
-
-     FUN should return ‘nil’ to stop the generating process, or a cons
-     (A .  B), where A will be prepended to the result and B is the new
-     seed.
-
-          (-unfold (lambda (x) (unless (= x 0) (cons x (1- x)))) 10)
-              ⇒ (10 9 8 7 6 5 4 3 2 1)
-          (--unfold (when it (cons it (cdr it))) '(1 2 3 4))
-              ⇒ ((1 2 3 4) (2 3 4) (3 4) (4))
-          (--unfold (when it (cons it (butlast it))) '(1 2 3 4))
-              ⇒ ((1 2 3 4) (1 2 3) (1 2) (1))
-
- -- Function: -repeat (n x)
-     Return a new list of length N with each element being X.  Return
-     ‘nil’ if N is less than 1.
-
-          (-repeat 3 :a)
-              ⇒ (:a :a :a)
-          (-repeat 1 :a)
-              ⇒ (:a)
-          (-repeat 0 :a)
-              ⇒ ()
-
- -- Function: -cycle (list)
-     Return an infinite circular copy of LIST.  The returned list cycles
-     through the elements of LIST and repeats from the beginning.
-
-          (-take 5 (-cycle '(1 2 3)))
-              ⇒ (1 2 3 1 2)
-          (-take 7 (-cycle '(1 "and" 3)))
-              ⇒ (1 "and" 3 1 "and" 3 1)
-          (-zip-lists (-cycle '(3)) '(1 2))
-              ⇒ ((3 1) (3 2))
-
-
-File: dash.info,  Node: Predicates,  Next: Partitioning,  Prev: Unfolding,  Up: Functions
-
-2.6 Predicates
-==============
-
-Reductions of one or more lists to a boolean value.
-
- -- Function: -some (pred list)
-     Return (PRED x) for the first LIST item where (PRED x) is
-     non-‘nil’, else ‘nil’.
-
-     Alias: ‘-any’.
-
-     This function’s anaphoric counterpart is ‘--some’.
-
-          (-some #'stringp '(1 "2" 3))
-              ⇒ t
-          (--some (string-match-p "x" it) '("foo" "axe" "xor"))
-              ⇒ 1
-          (--some (= it-index 3) '(0 1 2))
-              ⇒ nil
-
- -- Function: -every (pred list)
-     Return non-‘nil’ if PRED returns non-‘nil’ for all items in LIST.
-     If so, return the last such result of PRED.  Otherwise, once an
-     item is reached for which PRED returns ‘nil’, return ‘nil’ without
-     calling PRED on any further LIST elements.
-
-     This function is like ‘-every-p’, but on success returns the last
-     non-‘nil’ result of PRED instead of just ‘t’.
-
-     This function’s anaphoric counterpart is ‘--every’.
-
-          (-every #'numberp '(1 2 3))
-              ⇒ t
-          (--every (string-match-p "x" it) '("axe" "xor"))
-              ⇒ 0
-          (--every (= it it-index) '(0 1 3))
-              ⇒ nil
-
- -- Function: -any? (pred list)
-     Return ‘t’ if (PRED X) is non-‘nil’ for any X in LIST, else ‘nil’.
-
-     Alias: ‘-any-p’, ‘-some?’, ‘-some-p’
-
-          (-any? #'numberp '(nil 0 t))
-              ⇒ t
-          (-any? #'numberp '(nil t t))
-              ⇒ nil
-          (-any? #'null '(1 3 5))
-              ⇒ nil
-
- -- Function: -all? (pred list)
-     Return ‘t’ if (PRED X) is non-‘nil’ for all X in LIST, else ‘nil’.
-     In the latter case, stop after the first X for which (PRED X) is
-     ‘nil’, without calling PRED on any subsequent elements of LIST.
-
-     The similar function ‘-every’ (*note -every::) is more widely
-     useful, since it returns the last non-‘nil’ result of PRED instead
-     of just ‘t’ on success.
-
-     Alias: ‘-all-p’, ‘-every-p’, ‘-every?’.
-
-     This function’s anaphoric counterpart is ‘--all?’.
-
-          (-all? #'numberp '(1 2 3))
-              ⇒ t
-          (-all? #'numberp '(2 t 6))
-              ⇒ nil
-          (--all? (= 0 (% it 2)) '(2 4 6))
-              ⇒ t
-
- -- Function: -none? (pred list)
-     Return ‘t’ if (PRED X) is ‘nil’ for all X in LIST, else ‘nil’.
-
-     Alias: ‘-none-p’
-
-          (-none? 'even? '(1 2 3))
-              ⇒ nil
-          (-none? 'even? '(1 3 5))
-              ⇒ t
-          (--none? (= 0 (% it 2)) '(1 2 3))
-              ⇒ nil
-
- -- Function: -only-some? (pred list)
-     Return ‘t’ if different LIST items both satisfy and do not satisfy
-     PRED.  That is, if PRED returns both ‘nil’ for at least one item,
-     and non-‘nil’ for at least one other item in LIST.  Return ‘nil’ if
-     all items satisfy the predicate or none of them do.
-
-     Alias: ‘-only-some-p’
-
-          (-only-some? 'even? '(1 2 3))
-              ⇒ t
-          (-only-some? 'even? '(1 3 5))
-              ⇒ nil
-          (-only-some? 'even? '(2 4 6))
-              ⇒ nil
-
- -- Function: -contains? (list element)
-     Return non-‘nil’ if LIST contains ELEMENT.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.  As with ‘member’, the return value is
-     actually the tail of LIST whose car is ELEMENT.
-
-     Alias: ‘-contains-p’.
-
-          (-contains? '(1 2 3) 1)
-              ⇒ (1 2 3)
-          (-contains? '(1 2 3) 2)
-              ⇒ (2 3)
-          (-contains? '(1 2 3) 4)
-              ⇒ ()
-
- -- Function: -is-prefix? (prefix list)
-     Return non-‘nil’ if PREFIX is a prefix of LIST.
-
-     Alias: ‘-is-prefix-p’.
-
-          (-is-prefix? '(1 2 3) '(1 2 3 4 5))
-              ⇒ t
-          (-is-prefix? '(1 2 3 4 5) '(1 2 3))
-              ⇒ nil
-          (-is-prefix? '(1 3) '(1 2 3 4 5))
-              ⇒ nil
-
- -- Function: -is-suffix? (suffix list)
-     Return non-‘nil’ if SUFFIX is a suffix of LIST.
-
-     Alias: ‘-is-suffix-p’.
-
-          (-is-suffix? '(3 4 5) '(1 2 3 4 5))
-              ⇒ t
-          (-is-suffix? '(1 2 3 4 5) '(3 4 5))
-              ⇒ nil
-          (-is-suffix? '(3 5) '(1 2 3 4 5))
-              ⇒ nil
-
- -- Function: -is-infix? (infix list)
-     Return non-‘nil’ if INFIX is infix of LIST.
-
-     This operation runs in O(n^2) time
-
-     Alias: ‘-is-infix-p’
-
-          (-is-infix? '(1 2 3) '(1 2 3 4 5))
-              ⇒ t
-          (-is-infix? '(2 3 4) '(1 2 3 4 5))
-              ⇒ t
-          (-is-infix? '(3 4 5) '(1 2 3 4 5))
-              ⇒ t
-
- -- Function: -cons-pair? (obj)
-     Return non-‘nil’ if OBJ is a true cons pair.  That is, a cons (A .
-     B) where B is not a list.
-
-     Alias: ‘-cons-pair-p’.
-
-          (-cons-pair? '(1 . 2))
-              ⇒ t
-          (-cons-pair? '(1 2))
-              ⇒ nil
-          (-cons-pair? '(1))
-              ⇒ nil
-
-
-File: dash.info,  Node: Partitioning,  Next: Indexing,  Prev: Predicates,  Up: Functions
-
-2.7 Partitioning
-================
-
-Functions partitioning the input list into a list of lists.
-
- -- Function: -split-at (n list)
-     Split LIST into two sublists after the Nth element.  The result is
-     a list of two elements (TAKE DROP) where TAKE is a new list of the
-     first N elements of LIST, and DROP is the remaining elements of
-     LIST (not a copy).  TAKE and DROP are like the results of ‘-take’
-     (*note -take::) and ‘-drop’ (*note -drop::), respectively, but the
-     split is done in a single list traversal.
-
-          (-split-at 3 '(1 2 3 4 5))
-              ⇒ ((1 2 3) (4 5))
-          (-split-at 17 '(1 2 3 4 5))
-              ⇒ ((1 2 3 4 5) nil)
-          (-split-at 0 '(1 2 3 4 5))
-              ⇒ (nil (1 2 3 4 5))
-
- -- Function: -split-with (pred list)
-     Split LIST into a prefix satisfying PRED, and the rest.  The first
-     sublist is the prefix of LIST with successive elements satisfying
-     PRED, and the second sublist is the remaining elements that do not.
-     The result is like performing
-
-     ((-take-while PRED LIST) (-drop-while PRED LIST))
-
-     but in no more than a single pass through LIST.
-
-          (-split-with 'even? '(1 2 3 4))
-              ⇒ (nil (1 2 3 4))
-          (-split-with 'even? '(2 4 5 6))
-              ⇒ ((2 4) (5 6))
-          (--split-with (< it 4) '(1 2 3 4 3 2 1))
-              ⇒ ((1 2 3) (4 3 2 1))
-
- -- Macro: -split-on (item list)
-     Split the LIST each time ITEM is found.
-
-     Unlike ‘-partition-by’ (*note -partition-by::), the ITEM is
-     discarded from the results.  Empty lists are also removed from the
-     result.
-
-     Comparison is done by ‘equal’.
-
-     See also ‘-split-when’ (*note -split-when::)
-
-          (-split-on '| '(Nil | Leaf a | Node [Tree a]))
-              ⇒ ((Nil) (Leaf a) (Node [Tree a]))
-          (-split-on :endgroup '("a" "b" :endgroup "c" :endgroup "d" "e"))
-              ⇒ (("a" "b") ("c") ("d" "e"))
-          (-split-on :endgroup '("a" "b" :endgroup :endgroup "d" "e"))
-              ⇒ (("a" "b") ("d" "e"))
-
- -- Function: -split-when (fn list)
-     Split the LIST on each element where FN returns non-‘nil’.
-
-     Unlike ‘-partition-by’ (*note -partition-by::), the "matched"
-     element is discarded from the results.  Empty lists are also
-     removed from the result.
-
-     This function can be thought of as a generalization of
-     ‘split-string’.
-
-          (-split-when 'even? '(1 2 3 4 5 6))
-              ⇒ ((1) (3) (5))
-          (-split-when 'even? '(1 2 3 4 6 8 9))
-              ⇒ ((1) (3) (9))
-          (--split-when (memq it '(&optional &rest)) '(a b &optional c d &rest args))
-              ⇒ ((a b) (c d) (args))
-
- -- Function: -separate (pred list)
-     Split LIST into two sublists based on whether items satisfy PRED.
-     The result is like performing
-
-     ((-filter PRED LIST) (-remove PRED LIST))
-
-     but in a single pass through LIST.
-
-          (-separate (lambda (num) (= 0 (% num 2))) '(1 2 3 4 5 6 7))
-              ⇒ ((2 4 6) (1 3 5 7))
-          (--separate (< it 5) '(3 7 5 9 3 2 1 4 6))
-              ⇒ ((3 3 2 1 4) (7 5 9 6))
-          (-separate 'cdr '((1 2) (1) (1 2 3) (4)))
-              ⇒ (((1 2) (1 2 3)) ((1) (4)))
-
- -- Function: -partition (n list)
-     Return a new list with the items in LIST grouped into N-sized
-     sublists.  If there are not enough items to make the last group
-     N-sized, those items are discarded.
-
-          (-partition 2 '(1 2 3 4 5 6))
-              ⇒ ((1 2) (3 4) (5 6))
-          (-partition 2 '(1 2 3 4 5 6 7))
-              ⇒ ((1 2) (3 4) (5 6))
-          (-partition 3 '(1 2 3 4 5 6 7))
-              ⇒ ((1 2 3) (4 5 6))
-
- -- Function: -partition-all (n list)
-     Return a new list with the items in LIST grouped into N-sized
-     sublists.  The last group may contain less than N items.
-
-          (-partition-all 2 '(1 2 3 4 5 6))
-              ⇒ ((1 2) (3 4) (5 6))
-          (-partition-all 2 '(1 2 3 4 5 6 7))
-              ⇒ ((1 2) (3 4) (5 6) (7))
-          (-partition-all 3 '(1 2 3 4 5 6 7))
-              ⇒ ((1 2 3) (4 5 6) (7))
-
- -- Function: -partition-in-steps (n step list)
-     Partition LIST into sublists of length N that are STEP items apart.
-     Like ‘-partition-all-in-steps’ (*note -partition-all-in-steps::),
-     but if there are not enough items to make the last group N-sized,
-     those items are discarded.
-
-          (-partition-in-steps 2 1 '(1 2 3 4))
-              ⇒ ((1 2) (2 3) (3 4))
-          (-partition-in-steps 3 2 '(1 2 3 4))
-              ⇒ ((1 2 3))
-          (-partition-in-steps 3 2 '(1 2 3 4 5))
-              ⇒ ((1 2 3) (3 4 5))
-
- -- Function: -partition-all-in-steps (n step list)
-     Partition LIST into sublists of length N that are STEP items apart.
-     Adjacent groups may overlap if N exceeds the STEP stride.  Trailing
-     groups may contain less than N items.
-
-          (-partition-all-in-steps 2 1 '(1 2 3 4))
-              ⇒ ((1 2) (2 3) (3 4) (4))
-          (-partition-all-in-steps 3 2 '(1 2 3 4))
-              ⇒ ((1 2 3) (3 4))
-          (-partition-all-in-steps 3 2 '(1 2 3 4 5))
-              ⇒ ((1 2 3) (3 4 5) (5))
-
- -- Function: -partition-by (fn list)
-     Apply FN to each item in LIST, splitting it each time FN returns a
-     new value.
-
-          (-partition-by 'even? ())
-              ⇒ ()
-          (-partition-by 'even? '(1 1 2 2 2 3 4 6 8))
-              ⇒ ((1 1) (2 2 2) (3) (4 6 8))
-          (--partition-by (< it 3) '(1 2 3 4 3 2 1))
-              ⇒ ((1 2) (3 4 3) (2 1))
-
- -- Function: -partition-by-header (fn list)
-     Apply FN to the first item in LIST.  That is the header value.
-     Apply FN to each item in LIST, splitting it each time FN returns
-     the header value, but only after seeing at least one other value
-     (the body).
-
-          (--partition-by-header (= it 1) '(1 2 3 1 2 1 2 3 4))
-              ⇒ ((1 2 3) (1 2) (1 2 3 4))
-          (--partition-by-header (> it 0) '(1 2 0 1 0 1 2 3 0))
-              ⇒ ((1 2 0) (1 0) (1 2 3 0))
-          (-partition-by-header 'even? '(2 1 1 1 4 1 3 5 6 6 1))
-              ⇒ ((2 1 1 1) (4 1 3 5) (6 6 1))
-
- -- Function: -partition-after-pred (pred list)
-     Partition LIST after each element for which PRED returns non-‘nil’.
-
-     This function’s anaphoric counterpart is ‘--partition-after-pred’.
-
-          (-partition-after-pred #'booleanp ())
-              ⇒ ()
-          (-partition-after-pred #'booleanp '(t t))
-              ⇒ ((t) (t))
-          (-partition-after-pred #'booleanp '(0 0 t t 0 t))
-              ⇒ ((0 0 t) (t) (0 t))
-
- -- Function: -partition-before-pred (pred list)
-     Partition directly before each time PRED is true on an element of
-     LIST.
-
-          (-partition-before-pred #'booleanp ())
-              ⇒ ()
-          (-partition-before-pred #'booleanp '(0 t))
-              ⇒ ((0) (t))
-          (-partition-before-pred #'booleanp '(0 0 t 0 t t))
-              ⇒ ((0 0) (t 0) (t) (t))
-
- -- Function: -partition-before-item (item list)
-     Partition directly before each time ITEM appears in LIST.
-
-          (-partition-before-item 3 ())
-              ⇒ ()
-          (-partition-before-item 3 '(1))
-              ⇒ ((1))
-          (-partition-before-item 3 '(3))
-              ⇒ ((3))
-
- -- Function: -partition-after-item (item list)
-     Partition directly after each time ITEM appears in LIST.
-
-          (-partition-after-item 3 ())
-              ⇒ ()
-          (-partition-after-item 3 '(1))
-              ⇒ ((1))
-          (-partition-after-item 3 '(3))
-              ⇒ ((3))
-
- -- Function: -group-by (fn list)
-     Separate LIST into an alist whose keys are FN applied to the
-     elements of LIST.  Keys are compared by ‘equal’.
-
-          (-group-by 'even? ())
-              ⇒ ()
-          (-group-by 'even? '(1 1 2 2 2 3 4 6 8))
-              ⇒ ((nil 1 1 3) (t 2 2 2 4 6 8))
-          (--group-by (car (split-string it "/")) '("a/b" "c/d" "a/e"))
-              ⇒ (("a" "a/b" "a/e") ("c" "c/d"))
-
-
-File: dash.info,  Node: Indexing,  Next: Set operations,  Prev: Partitioning,  Up: Functions
-
-2.8 Indexing
-============
-
-Functions retrieving or sorting based on list indices and related
-predicates.
-
- -- Function: -elem-index (elem list)
-     Return the first index of ELEM in LIST.  That is, the index within
-     LIST of the first element that is ‘equal’ to ELEM.  Return ‘nil’ if
-     there is no such element.
-
-     See also: ‘-find-index’ (*note -find-index::).
-
-          (-elem-index 2 '(6 7 8 3 4))
-              ⇒ nil
-          (-elem-index "bar" '("foo" "bar" "baz"))
-              ⇒ 1
-          (-elem-index '(1 2) '((3) (5 6) (1 2) nil))
-              ⇒ 2
-
- -- Function: -elem-indices (elem list)
-     Return the list of indices at which ELEM appears in LIST.  That is,
-     the indices of all elements of LIST ‘equal’ to ELEM, in the same
-     ascending order as they appear in LIST.
-
-          (-elem-indices 2 '(6 7 8 3 4 1))
-              ⇒ ()
-          (-elem-indices "bar" '("foo" "bar" "baz"))
-              ⇒ (1)
-          (-elem-indices '(1 2) '((3) (1 2) (5 6) (1 2) nil))
-              ⇒ (1 3)
-
- -- Function: -find-index (pred list)
-     Return the index of the first item satisfying PRED in LIST.  Return
-     ‘nil’ if no such item is found.
-
-     PRED is called with one argument, the current list element, until
-     it returns non-‘nil’, at which point the search terminates.
-
-     This function’s anaphoric counterpart is ‘--find-index’.
-
-     See also: ‘-first’ (*note -first::), ‘-find-last-index’ (*note
-     -find-last-index::).
-
-          (-find-index #'numberp '(a b c))
-              ⇒ nil
-          (-find-index #'natnump '(1 0 -1))
-              ⇒ 0
-          (--find-index (> it 5) '(2 4 1 6 3 3 5 8))
-              ⇒ 3
-
- -- Function: -find-last-index (pred list)
-     Return the index of the last item satisfying PRED in LIST.  Return
-     ‘nil’ if no such item is found.
-
-     Predicate PRED is called with one argument each time, namely the
-     current list element.
-
-     This function’s anaphoric counterpart is ‘--find-last-index’.
-
-     See also: ‘-last’ (*note -last::), ‘-find-index’ (*note
-     -find-index::).
-
-          (-find-last-index #'numberp '(a b c))
-              ⇒ nil
-          (--find-last-index (> it 5) '(2 7 1 6 3 8 5 2))
-              ⇒ 5
-          (-find-last-index (-partial #'string< 'a) '(c b a))
-              ⇒ 1
-
- -- Function: -find-indices (pred list)
-     Return the list of indices in LIST satisfying PRED.
-
-     Each element of LIST in turn is passed to PRED.  If the result is
-     non-‘nil’, the index of that element in LIST is included in the
-     result.  The returned indices are in ascending order, i.e., in the
-     same order as they appear in LIST.
-
-     This function’s anaphoric counterpart is ‘--find-indices’.
-
-     See also: ‘-find-index’ (*note -find-index::), ‘-elem-indices’
-     (*note -elem-indices::).
-
-          (-find-indices #'numberp '(a b c))
-              ⇒ ()
-          (-find-indices #'numberp '(8 1 d 2 b c a 3))
-              ⇒ (0 1 3 7)
-          (--find-indices (> it 5) '(2 4 1 6 3 3 5 8))
-              ⇒ (3 7)
-
- -- Function: -grade-up (comparator list)
-     Grade elements of LIST using COMPARATOR relation.  This yields a
-     permutation vector such that applying this permutation to LIST
-     sorts it in ascending order.
-
-          (-grade-up #'< '(3 1 4 2 1 3 3))
-              ⇒ (1 4 3 0 5 6 2)
-          (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-up #'< l) l))
-              ⇒ (1 1 2 3 3 3 4)
-
- -- Function: -grade-down (comparator list)
-     Grade elements of LIST using COMPARATOR relation.  This yields a
-     permutation vector such that applying this permutation to LIST
-     sorts it in descending order.
-
-          (-grade-down #'< '(3 1 4 2 1 3 3))
-              ⇒ (2 0 5 6 3 1 4)
-          (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-down #'< l) l))
-              ⇒ (4 3 3 3 2 1 1)
-
-
-File: dash.info,  Node: Set operations,  Next: Other list operations,  Prev: Indexing,  Up: Functions
-
-2.9 Set operations
-==================
-
-Operations pretending lists are sets.
-
- -- Function: -union (list1 list2)
-     Return a new list of distinct elements appearing in either LIST1 or
-     LIST2.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.
-
-          (-union '(1 2 3) '(3 4 5))
-              ⇒ (1 2 3 4 5)
-          (-union '(1 2 2 4) ())
-              ⇒ (1 2 4)
-          (-union '(1 1 2 2) '(4 4 3 2 1))
-              ⇒ (1 2 4 3)
-
- -- Function: -difference (list1 list2)
-     Return a new list with the distinct members of LIST1 that are not
-     in LIST2.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.
-
-          (-difference () ())
-              ⇒ ()
-          (-difference '(1 2 3) '(4 5 6))
-              ⇒ (1 2 3)
-          (-difference '(1 2 3 4) '(3 4 5 6))
-              ⇒ (1 2)
-
- -- Function: -intersection (list1 list2)
-     Return a new list of distinct elements appearing in both LIST1 and
-     LIST2.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.
-
-          (-intersection () ())
-              ⇒ ()
-          (-intersection '(1 2 3) '(4 5 6))
-              ⇒ ()
-          (-intersection '(1 2 2 3) '(4 3 3 2))
-              ⇒ (2 3)
-
- -- Function: -powerset (list)
-     Return the power set of LIST.
-
-          (-powerset ())
-              ⇒ (nil)
-          (-powerset '(x y))
-              ⇒ ((x y) (x) (y) nil)
-          (-powerset '(x y z))
-              ⇒ ((x y z) (x y) (x z) (x) (y z) (y) (z) nil)
-
- -- Function: -permutations (list)
-     Return the distinct permutations of LIST.
-
-     Duplicate elements of LIST are determined by ‘equal’, or by
-     ‘-compare-fn’ if that is non-‘nil’.
-
-          (-permutations ())
-              ⇒ (nil)
-          (-permutations '(a a b))
-              ⇒ ((a a b) (a b a) (b a a))
-          (-permutations '(a b c))
-              ⇒ ((a b c) (a c b) (b a c) (b c a) (c a b) (c b a))
-
- -- Function: -distinct (list)
-     Return a copy of LIST with all duplicate elements removed.
-
-     The test for equality is done with ‘equal’, or with ‘-compare-fn’
-     if that is non-‘nil’.
-
-     Alias: ‘-uniq’.
-
-          (-distinct ())
-              ⇒ ()
-          (-distinct '(1 1 2 3 3))
-              ⇒ (1 2 3)
-          (-distinct '(t t t))
-              ⇒ (t)
-
- -- Function: -same-items? (list1 list2)
-     Return non-‘nil’ if LIST1 and LIST2 have the same distinct
-     elements.
-
-     The order of the elements in the lists does not matter.  The lists
-     may be of different lengths, i.e., contain duplicate elements.  The
-     test for equality is done with ‘equal’, or with ‘-compare-fn’ if
-     that is non-‘nil’.
-
-     Alias: ‘-same-items-p’.
-
-          (-same-items? '(1 2 3) '(1 2 3))
-              ⇒ t
-          (-same-items? '(1 1 2 3) '(3 3 2 1))
-              ⇒ t
-          (-same-items? '(1 2 3) '(1 2 3 4))
-              ⇒ nil
-
-
-File: dash.info,  Node: Other list operations,  Next: Tree operations,  Prev: Set operations,  Up: Functions
-
-2.10 Other list operations
-==========================
-
-Other list functions not fit to be classified elsewhere.
-
- -- Function: -rotate (n list)
-     Rotate LIST N places to the right (left if N is negative).  The
-     time complexity is O(n).
-
-          (-rotate 3 '(1 2 3 4 5 6 7))
-              ⇒ (5 6 7 1 2 3 4)
-          (-rotate -3 '(1 2 3 4 5 6 7))
-              ⇒ (4 5 6 7 1 2 3)
-          (-rotate 16 '(1 2 3 4 5 6 7))
-              ⇒ (6 7 1 2 3 4 5)
-
- -- Function: -cons* (&rest args)
-     Make a new list from the elements of ARGS.  The last 2 elements of
-     ARGS are used as the final cons of the result, so if the final
-     element of ARGS is not a list, the result is a dotted list.  With
-     no ARGS, return ‘nil’.
-
-          (-cons* 1 2)
-              ⇒ (1 . 2)
-          (-cons* 1 2 3)
-              ⇒ (1 2 . 3)
-          (-cons* 1)
-              ⇒ 1
-
- -- Function: -snoc (list elem &rest elements)
-     Append ELEM to the end of the list.
-
-     This is like ‘cons’, but operates on the end of list.
-
-     If any ELEMENTS are given, append them to the list as well.
-
-          (-snoc '(1 2 3) 4)
-              ⇒ (1 2 3 4)
-          (-snoc '(1 2 3) 4 5 6)
-              ⇒ (1 2 3 4 5 6)
-          (-snoc '(1 2 3) '(4 5 6))
-              ⇒ (1 2 3 (4 5 6))
-
- -- Function: -interpose (sep list)
-     Return a new list of all elements in LIST separated by SEP.
-
-          (-interpose "-" ())
-              ⇒ ()
-          (-interpose "-" '("a"))
-              ⇒ ("a")
-          (-interpose "-" '("a" "b" "c"))
-              ⇒ ("a" "-" "b" "-" "c")
-
- -- Function: -interleave (&rest lists)
-     Return a new list of the first item in each list, then the second
-     etc.
-
-          (-interleave '(1 2) '("a" "b"))
-              ⇒ (1 "a" 2 "b")
-          (-interleave '(1 2) '("a" "b") '("A" "B"))
-              ⇒ (1 "a" "A" 2 "b" "B")
-          (-interleave '(1 2 3) '("a" "b"))
-              ⇒ (1 "a" 2 "b")
-
- -- Function: -iota (count &optional start step)
-     Return a list containing COUNT numbers.  Starts from START and adds
-     STEP each time.  The default START is zero, the default STEP is 1.
-     This function takes its name from the corresponding primitive in
-     the APL language.
-
-          (-iota 6)
-              ⇒ (0 1 2 3 4 5)
-          (-iota 4 2.5 -2)
-              ⇒ (2.5 0.5 -1.5 -3.5)
-          (-iota -1)
-              error→ Wrong type argument: natnump, -1
-
- -- Function: -zip-with (fn list1 list2)
-     Zip LIST1 and LIST2 into a new list using the function FN.  That
-     is, apply FN pairwise taking as first argument the next element of
-     LIST1 and as second argument the next element of LIST2 at the
-     corresponding position.  The result is as long as the shorter list.
-
-     This function’s anaphoric counterpart is ‘--zip-with’.
-
-     For other zips, see also ‘-zip-lists’ (*note -zip-lists::) and
-     ‘-zip-fill’ (*note -zip-fill::).
-
-          (-zip-with #'+ '(1 2 3 4) '(5 6 7))
-              ⇒ (6 8 10)
-          (-zip-with #'cons '(1 2 3) '(4 5 6 7))
-              ⇒ ((1 . 4) (2 . 5) (3 . 6))
-          (--zip-with (format "%s & %s" it other) '(Batman Jekyll) '(Robin Hyde))
-              ⇒ ("Batman & Robin" "Jekyll & Hyde")
-
- -- Function: -zip-pair (list1 list2)
-     Zip LIST1 and LIST2 together.
-
-     Make a pair with the head of each list, followed by a pair with the
-     second element of each list, and so on.  The number of pairs
-     returned is equal to the length of the shorter input list.
-
-     See also: ‘-zip-lists’ (*note -zip-lists::).
-
-          (-zip-pair '(1 2 3 4) '(5 6 7))
-              ⇒ ((1 . 5) (2 . 6) (3 . 7))
-          (-zip-pair '(1 2 3) '(4 5 6))
-              ⇒ ((1 . 4) (2 . 5) (3 . 6))
-          (-zip-pair '(1 2) '(3))
-              ⇒ ((1 . 3))
-
- -- Function: -zip-lists (&rest lists)
-     Zip LISTS together.
-
-     Group the head of each list, followed by the second element of each
-     list, and so on.  The number of returned groupings is equal to the
-     length of the shortest input list, and the length of each grouping
-     is equal to the number of input LISTS.
-
-     The return value is always a list of proper lists, in contrast to
-     ‘-zip’ (*note -zip::) which returns a list of dotted pairs when
-     only two input LISTS are provided.
-
-     See also: ‘-zip-pair’ (*note -zip-pair::).
-
-          (-zip-lists '(1 2 3) '(4 5 6))
-              ⇒ ((1 4) (2 5) (3 6))
-          (-zip-lists '(1 2 3) '(4 5 6 7))
-              ⇒ ((1 4) (2 5) (3 6))
-          (-zip-lists '(1 2) '(3 4 5) '(6))
-              ⇒ ((1 3 6))
-
- -- Function: -zip-lists-fill (fill-value &rest lists)
-     Zip LISTS together, padding shorter lists with FILL-VALUE.  This is
-     like ‘-zip-lists’ (*note -zip-lists::) (which see), except it
-     retains all elements at positions beyond the end of the shortest
-     list.  The number of returned groupings is equal to the length of
-     the longest input list, and the length of each grouping is equal to
-     the number of input LISTS.
-
-          (-zip-lists-fill 0 '(1 2) '(3 4 5) '(6))
-              ⇒ ((1 3 6) (2 4 0) (0 5 0))
-          (-zip-lists-fill 0 '(1 2) '(3 4) '(5 6))
-              ⇒ ((1 3 5) (2 4 6))
-          (-zip-lists-fill 0 '(1 2 3) nil)
-              ⇒ ((1 0) (2 0) (3 0))
-
- -- Function: -zip (&rest lists)
-     Zip LISTS together.
-
-     Group the head of each list, followed by the second element of each
-     list, and so on.  The number of returned groupings is equal to the
-     length of the shortest input list, and the number of items in each
-     grouping is equal to the number of input LISTS.
-
-     If only two LISTS are provided as arguments, return the groupings
-     as a list of dotted pairs.  Otherwise, return the groupings as a
-     list of proper lists.
-
-     Since the return value changes form depending on the number of
-     arguments, it is generally recommended to use ‘-zip-lists’ (*note
-     -zip-lists::) instead, or ‘-zip-pair’ (*note -zip-pair::) if a list
-     of dotted pairs is desired.
-
-     See also: ‘-unzip’ (*note -unzip::).
-
-          (-zip '(1 2 3 4) '(5 6 7) '(8 9))
-              ⇒ ((1 5 8) (2 6 9))
-          (-zip '(1 2 3) '(4 5 6) '(7 8 9))
-              ⇒ ((1 4 7) (2 5 8) (3 6 9))
-          (-zip '(1 2 3))
-              ⇒ ((1) (2) (3))
-
- -- Function: -zip-fill (fill-value &rest lists)
-     Zip LISTS together, padding shorter lists with FILL-VALUE.  This is
-     like ‘-zip’ (*note -zip::) (which see), except it retains all
-     elements at positions beyond the end of the shortest list.  The
-     number of returned groupings is equal to the length of the longest
-     input list, and the length of each grouping is equal to the number
-     of input LISTS.
-
-     Since the return value changes form depending on the number of
-     arguments, it is generally recommended to use ‘-zip-lists-fill’
-     (*note -zip-lists-fill::) instead, unless a list of dotted pairs is
-     explicitly desired.
-
-          (-zip-fill 0 '(1 2 3) '(4 5))
-              ⇒ ((1 . 4) (2 . 5) (3 . 0))
-          (-zip-fill 0 () '(1 2 3))
-              ⇒ ((0 . 1) (0 . 2) (0 . 3))
-          (-zip-fill 0 '(1 2) '(3 4) '(5 6))
-              ⇒ ((1 3 5) (2 4 6))
-
- -- Function: -unzip-lists (lists)
-     Unzip LISTS.
-
-     This works just like ‘-zip-lists’ (*note -zip-lists::) (which see),
-     but takes a list of lists instead of a variable number of
-     arguments, such that
-
-     (-unzip-lists (-zip-lists ARGS...))
-
-     is identity (given that the lists comprising ARGS are of the same
-     length).
-
-          (-unzip-lists (-zip-lists '(1 2) '(3 4) '(5 6)))
-              ⇒ ((1 2) (3 4) (5 6))
-          (-unzip-lists '((1 2 3) (4 5) (6 7) (8 9)))
-              ⇒ ((1 4 6 8) (2 5 7 9))
-          (-unzip-lists '((1 2 3) (4 5 6)))
-              ⇒ ((1 4) (2 5) (3 6))
-
- -- Function: -unzip (lists)
-     Unzip LISTS.
-
-     This works just like ‘-zip’ (*note -zip::) (which see), but takes a
-     list of lists instead of a variable number of arguments, such that
-
-     (-unzip (-zip L1 L2 L3 ...))
-
-     is identity (given that the lists are of the same length, and that
-     ‘-zip’ (*note -zip::) is not called with two arguments, because of
-     the caveat described in its docstring).
-
-     Note in particular that calling ‘-unzip’ (*note -unzip::) on a list
-     of two lists will return a list of dotted pairs.
-
-     Since the return value changes form depending on the number of
-     LISTS, it is generally recommended to use ‘-unzip-lists’ (*note
-     -unzip-lists::) instead.
-
-          (-unzip (-zip '(1 2) '(3 4) '(5 6)))
-              ⇒ ((1 . 2) (3 . 4) (5 . 6))
-          (-unzip '((1 2 3) (4 5 6)))
-              ⇒ ((1 . 4) (2 . 5) (3 . 6))
-          (-unzip '((1 2 3) (4 5) (6 7) (8 9)))
-              ⇒ ((1 4 6 8) (2 5 7 9))
-
- -- Function: -pad (fill-value &rest lists)
-     Pad each of LISTS with FILL-VALUE until they all have equal
-     lengths.
-
-     Ensure all LISTS are as long as the longest one by repeatedly
-     appending FILL-VALUE to the shorter lists, and return the resulting
-     LISTS.
-
-          (-pad 0 ())
-              ⇒ (nil)
-          (-pad 0 '(1 2) '(3 4))
-              ⇒ ((1 2) (3 4))
-          (-pad 0 '(1 2) '(3 4 5 6) '(7 8 9))
-              ⇒ ((1 2 0 0) (3 4 5 6) (7 8 9 0))
-
- -- Function: -table (fn &rest lists)
-     Compute outer product of LISTS using function FN.
-
-     The function FN should have the same arity as the number of
-     supplied lists.
-
-     The outer product is computed by applying fn to all possible
-     combinations created by taking one element from each list in order.
-     The dimension of the result is (length lists).
-
-     See also: ‘-table-flat’ (*note -table-flat::)
-
-          (-table '* '(1 2 3) '(1 2 3))
-              ⇒ ((1 2 3) (2 4 6) (3 6 9))
-          (-table (lambda (a b) (-sum (-zip-with '* a b))) '((1 2) (3 4)) '((1 3) (2 4)))
-              ⇒ ((7 15) (10 22))
-          (apply '-table 'list (-repeat 3 '(1 2)))
-              ⇒ ((((1 1 1) (2 1 1)) ((1 2 1) (2 2 1))) (((1 1 2) (2 1 2)) ((1 2 2) (2 2 2))))
-
- -- Function: -table-flat (fn &rest lists)
-     Compute flat outer product of LISTS using function FN.
-
-     The function FN should have the same arity as the number of
-     supplied lists.
-
-     The outer product is computed by applying fn to all possible
-     combinations created by taking one element from each list in order.
-     The results are flattened, ignoring the tensor structure of the
-     result.  This is equivalent to calling:
-
-     (-flatten-n (1- (length lists)) (apply ’-table fn lists))
-
-     but the implementation here is much more efficient.
-
-     See also: ‘-flatten-n’ (*note -flatten-n::), ‘-table’ (*note
-     -table::)
-
-          (-table-flat 'list '(1 2 3) '(a b c))
-              ⇒ ((1 a) (2 a) (3 a) (1 b) (2 b) (3 b) (1 c) (2 c) (3 c))
-          (-table-flat '* '(1 2 3) '(1 2 3))
-              ⇒ (1 2 3 2 4 6 3 6 9)
-          (apply '-table-flat 'list (-repeat 3 '(1 2)))
-              ⇒ ((1 1 1) (2 1 1) (1 2 1) (2 2 1) (1 1 2) (2 1 2) (1 2 2) (2 2 2))
-
- -- Function: -first (pred list)
-     Return the first item in LIST for which PRED returns non-‘nil’.
-     Return ‘nil’ if no such element is found.
-
-     To get the first item in the list no questions asked, use
-     ‘-first-item’ (*note -first-item::).
-
-     Alias: ‘-find’.
-
-     This function’s anaphoric counterpart is ‘--first’.
-
-          (-first #'natnump '(-1 0 1))
-              ⇒ 0
-          (-first #'null '(1 2 3))
-              ⇒ nil
-          (--first (> it 2) '(1 2 3))
-              ⇒ 3
-
- -- Function: -last (pred list)
-     Return the last x in LIST where (PRED x) is non-‘nil’, else ‘nil’.
-
-          (-last 'even? '(1 2 3 4 5 6 3 3 3))
-              ⇒ 6
-          (-last 'even? '(1 3 7 5 9))
-              ⇒ nil
-          (--last (> (length it) 3) '("a" "looong" "word" "and" "short" "one"))
-              ⇒ "short"
-
- -- Function: -first-item (list)
-     Return the first item of LIST, or ‘nil’ on an empty list.
-
-     See also: ‘-second-item’ (*note -second-item::), ‘-last-item’
-     (*note -last-item::), etc.
-
-          (-first-item ())
-              ⇒ ()
-          (-first-item '(1 2 3 4 5))
-              ⇒ 1
-          (let ((list (list 1 2 3))) (setf (-first-item list) 5) list)
-              ⇒ (5 2 3)
-
- -- Function: -second-item (list)
-     Return the second item of LIST, or ‘nil’ if LIST is too short.
-
-     See also: ‘-first-item’ (*note -first-item::), ‘-third-item’ (*note
-     -third-item::), etc.
-
-          (-second-item ())
-              ⇒ ()
-          (-second-item '(1 2 3 4 5))
-              ⇒ 2
-          (let ((list (list 1 2))) (setf (-second-item list) 5) list)
-              ⇒ (1 5)
-
- -- Function: -third-item (list)
-     Return the third item of LIST, or ‘nil’ if LIST is too short.
-
-     See also: ‘-second-item’ (*note -second-item::), ‘-fourth-item’
-     (*note -fourth-item::), etc.
-
-          (-third-item ())
-              ⇒ ()
-          (-third-item '(1 2))
-              ⇒ ()
-          (-third-item '(1 2 3 4 5))
-              ⇒ 3
-
- -- Function: -fourth-item (list)
-     Return the fourth item of LIST, or ‘nil’ if LIST is too short.
-
-     See also: ‘-third-item’ (*note -third-item::), ‘-fifth-item’ (*note
-     -fifth-item::), etc.
-
-          (-fourth-item ())
-              ⇒ ()
-          (-fourth-item '(1 2 3))
-              ⇒ ()
-          (-fourth-item '(1 2 3 4 5))
-              ⇒ 4
-
- -- Function: -fifth-item (list)
-     Return the fifth item of LIST, or ‘nil’ if LIST is too short.
-
-     See also: ‘-fourth-item’ (*note -fourth-item::), ‘-last-item’
-     (*note -last-item::), etc.
-
-          (-fifth-item ())
-              ⇒ ()
-          (-fifth-item '(1 2 3 4))
-              ⇒ ()
-          (-fifth-item '(1 2 3 4 5))
-              ⇒ 5
-
- -- Function: -last-item (list)
-     Return the last item of LIST, or ‘nil’ on an empty list.
-
-     See also: ‘-first-item’ (*note -first-item::), etc.
-
-          (-last-item ())
-              ⇒ ()
-          (-last-item '(1 2 3 4 5))
-              ⇒ 5
-          (let ((list (list 1 2 3))) (setf (-last-item list) 5) list)
-              ⇒ (1 2 5)
-
- -- Function: -butlast (list)
-     Return a list of all items in list except for the last.
-
-          (-butlast '(1 2 3))
-              ⇒ (1 2)
-          (-butlast '(1 2))
-              ⇒ (1)
-          (-butlast '(1))
-              ⇒ nil
-
- -- Function: -sort (comparator list)
-     Sort LIST, stably, comparing elements using COMPARATOR.  Return the
-     sorted list.  LIST is NOT modified by side effects.  COMPARATOR is
-     called with two elements of LIST, and should return non-‘nil’ if
-     the first element should sort before the second.
-
-          (-sort #'< '(3 1 2))
-              ⇒ (1 2 3)
-          (-sort #'> '(3 1 2))
-              ⇒ (3 2 1)
-          (--sort (< it other) '(3 1 2))
-              ⇒ (1 2 3)
-
- -- Function: -list (arg)
-     Ensure ARG is a list.  If ARG is already a list, return it as is
-     (not a copy).  Otherwise, return a new list with ARG as its only
-     element.
-
-     Another supported calling convention is (-list &rest ARGS).  In
-     this case, if ARG is not a list, a new list with all of ARGS as
-     elements is returned.  This use is supported for backward
-     compatibility and is otherwise deprecated.
-
-          (-list 1)
-              ⇒ (1)
-          (-list ())
-              ⇒ ()
-          (-list '(1 2 3))
-              ⇒ (1 2 3)
-
- -- Function: -fix (fn list)
-     Compute the (least) fixpoint of FN with initial input LIST.
-
-     FN is called at least once, results are compared with ‘equal’.
-
-          (-fix (lambda (l) (-non-nil (--mapcat (-split-at (/ (length it) 2) it) l))) '((1 2 3)))
-              ⇒ ((1) (2) (3))
-          (let ((l '((starwars scifi) (jedi starwars warrior)))) (--fix (-uniq (--mapcat (cons it (cdr (assq it l))) it)) '(jedi book)))
-              ⇒ (jedi starwars warrior scifi book)
-
-
-File: dash.info,  Node: Tree operations,  Next: Threading macros,  Prev: Other list operations,  Up: Functions
-
-2.11 Tree operations
-====================
-
-Functions pretending lists are trees.
-
- -- Function: -tree-seq (branch children tree)
-     Return a sequence of the nodes in TREE, in depth-first search
-     order.
-
-     BRANCH is a predicate of one argument that returns non-‘nil’ if the
-     passed argument is a branch, that is, a node that can have
-     children.
-
-     CHILDREN is a function of one argument that returns the children of
-     the passed branch node.
-
-     Non-branch nodes are simply copied.
-
-          (-tree-seq 'listp 'identity '(1 (2 3) 4 (5 (6 7))))
-              ⇒ ((1 (2 3) 4 (5 (6 7))) 1 (2 3) 2 3 4 (5 (6 7)) 5 (6 7) 6 7)
-          (-tree-seq 'listp 'reverse '(1 (2 3) 4 (5 (6 7))))
-              ⇒ ((1 (2 3) 4 (5 (6 7))) (5 (6 7)) (6 7) 7 6 5 4 (2 3) 3 2 1)
-          (--tree-seq (vectorp it) (append it nil) [1 [2 3] 4 [5 [6 7]]])
-              ⇒ ([1 [2 3] 4 [5 [6 7]]] 1 [2 3] 2 3 4 [5 [6 7]] 5 [6 7] 6 7)
-
- -- Function: -tree-map (fn tree)
-     Apply FN to each element of TREE while preserving the tree
-     structure.
-
-          (-tree-map '1+ '(1 (2 3) (4 (5 6) 7)))
-              ⇒ (2 (3 4) (5 (6 7) 8))
-          (-tree-map '(lambda (x) (cons x (expt 2 x))) '(1 (2 3) 4))
-              ⇒ ((1 . 2) ((2 . 4) (3 . 8)) (4 . 16))
-          (--tree-map (length it) '("<body>" ("<p>" "text" "</p>") "</body>"))
-              ⇒ (6 (3 4 4) 7)
-
- -- Function: -tree-map-nodes (pred fun tree)
-     Call FUN on each node of TREE that satisfies PRED.
-
-     If PRED returns ‘nil’, continue descending down this node.  If PRED
-     returns non-‘nil’, apply FUN to this node and do not descend
-     further.
-
-          (-tree-map-nodes 'vectorp (lambda (x) (-sum (append x nil))) '(1 [2 3] 4 (5 [6 7] 8)))
-              ⇒ (1 5 4 (5 13 8))
-          (-tree-map-nodes 'keywordp (lambda (x) (symbol-name x)) '(1 :foo 4 ((5 6 :bar) :baz 8)))
-              ⇒ (1 ":foo" 4 ((5 6 ":bar") ":baz" 8))
-          (--tree-map-nodes (eq (car-safe it) 'add-mode) (-concat it (list :mode 'emacs-lisp-mode)) '(with-mode emacs-lisp-mode (foo bar) (add-mode a b) (baz (add-mode c d))))
-              ⇒ (with-mode emacs-lisp-mode (foo bar) (add-mode a b :mode emacs-lisp-mode) (baz (add-mode c d :mode emacs-lisp-mode)))
-
- -- Function: -tree-reduce (fn tree)
-     Use FN to reduce elements of list TREE.  If elements of TREE are
-     lists themselves, apply the reduction recursively.
-
-     FN is first applied to first element of the list and second
-     element, then on this result and third element from the list etc.
-
-     See ‘-reduce-r’ (*note -reduce-r::) for how exactly are lists of
-     zero or one element handled.
-
-          (-tree-reduce '+ '(1 (2 3) (4 5)))
-              ⇒ 15
-          (-tree-reduce 'concat '("strings" (" on" " various") ((" levels"))))
-              ⇒ "strings on various levels"
-          (--tree-reduce (cond ((stringp it) (concat it " " acc)) (t (let ((sn (symbol-name it))) (concat "<" sn ">" acc "</" sn ">")))) '(body (p "some words") (div "more" (b "bold") "words")))
-              ⇒ "<body><p>some words</p> <div>more <b>bold</b> words</div></body>"
-
- -- Function: -tree-reduce-from (fn init-value tree)
-     Use FN to reduce elements of list TREE.  If elements of TREE are
-     lists themselves, apply the reduction recursively.
-
-     FN is first applied to INIT-VALUE and first element of the list,
-     then on this result and second element from the list etc.
-
-     The initial value is ignored on cons pairs as they always contain
-     two elements.
-
-          (-tree-reduce-from '+ 1 '(1 (1 1) ((1))))
-              ⇒ 8
-          (--tree-reduce-from (-concat acc (list it)) nil '(1 (2 3 (4 5)) (6 7)))
-              ⇒ ((7 6) ((5 4) 3 2) 1)
-
- -- Function: -tree-mapreduce (fn folder tree)
-     Apply FN to each element of TREE, and make a list of the results.
-     If elements of TREE are lists themselves, apply FN recursively to
-     elements of these nested lists.
-
-     Then reduce the resulting lists using FOLDER and initial value
-     INIT-VALUE.  See ‘-reduce-r-from’ (*note -reduce-r-from::).
-
-     This is the same as calling ‘-tree-reduce’ (*note -tree-reduce::)
-     after ‘-tree-map’ (*note -tree-map::) but is twice as fast as it
-     only traverse the structure once.
-
-          (-tree-mapreduce 'list 'append '(1 (2 (3 4) (5 6)) (7 (8 9))))
-              ⇒ (1 2 3 4 5 6 7 8 9)
-          (--tree-mapreduce 1 (+ it acc) '(1 (2 (4 9) (2 1)) (7 (4 3))))
-              ⇒ 9
-          (--tree-mapreduce 0 (max acc (1+ it)) '(1 (2 (4 9) (2 1)) (7 (4 3))))
-              ⇒ 3
-
- -- Function: -tree-mapreduce-from (fn folder init-value tree)
-     Apply FN to each element of TREE, and make a list of the results.
-     If elements of TREE are lists themselves, apply FN recursively to
-     elements of these nested lists.
-
-     Then reduce the resulting lists using FOLDER and initial value
-     INIT-VALUE.  See ‘-reduce-r-from’ (*note -reduce-r-from::).
-
-     This is the same as calling ‘-tree-reduce-from’ (*note
-     -tree-reduce-from::) after ‘-tree-map’ (*note -tree-map::) but is
-     twice as fast as it only traverse the structure once.
-
-          (-tree-mapreduce-from 'identity '* 1 '(1 (2 (3 4) (5 6)) (7 (8 9))))
-              ⇒ 362880
-          (--tree-mapreduce-from (+ it it) (cons it acc) nil '(1 (2 (4 9) (2 1)) (7 (4 3))))
-              ⇒ (2 (4 (8 18) (4 2)) (14 (8 6)))
-          (concat "{" (--tree-mapreduce-from (cond ((-cons-pair? it) (concat (symbol-name (car it)) " -> " (symbol-name (cdr it)))) (t (concat (symbol-name it) " : {"))) (concat it (unless (or (equal acc "}") (equal (substring it (1- (length it))) "{")) ", ") acc) "}" '((elisp-mode (foo (bar . booze)) (baz . qux)) (c-mode (foo . bla) (bum . bam)))))
-              ⇒ "{elisp-mode : {foo : {bar -> booze}, baz -> qux}, c-mode : {foo -> bla, bum -> bam}}"
-
- -- Function: -clone (list)
-     Create a deep copy of LIST.  The new list has the same elements and
-     structure but all cons are replaced with new ones.  This is useful
-     when you need to clone a structure such as plist or alist.
-
-          (let* ((a (list (list 1))) (b (-clone a))) (setcar (car a) 2) b)
-              ⇒ ((1))
-
-
-File: dash.info,  Node: Threading macros,  Next: Binding,  Prev: Tree operations,  Up: Functions
-
-2.12 Threading macros
-=====================
-
-Macros that conditionally combine sequential forms for brevity or
-readability.
-
- -- Macro: -> (x &optional form &rest more)
-     Thread the expr through the forms.  Insert X as the second item in
-     the first form, making a list of it if it is not a list already.
-     If there are more forms, insert the first form as the second item
-     in second form, etc.
-
-          (-> '(2 3 5))
-              ⇒ (2 3 5)
-          (-> '(2 3 5) (append '(8 13)))
-              ⇒ (2 3 5 8 13)
-          (-> '(2 3 5) (append '(8 13)) (-slice 1 -1))
-              ⇒ (3 5 8)
-
- -- Macro: ->> (x &optional form &rest more)
-     Thread the expr through the forms.  Insert X as the last item in
-     the first form, making a list of it if it is not a list already.
-     If there are more forms, insert the first form as the last item in
-     second form, etc.
-
-          (->> '(1 2 3) (-map 'square))
-              ⇒ (1 4 9)
-          (->> '(1 2 3) (-map 'square) (-remove 'even?))
-              ⇒ (1 9)
-          (->> '(1 2 3) (-map 'square) (-reduce '+))
-              ⇒ 14
-
- -- Macro: --> (x &rest forms)
-     Starting with the value of X, thread each expression through FORMS.
-
-     Insert X at the position signified by the symbol ‘it’ in the first
-     form.  If there are more forms, insert the first form at the
-     position signified by ‘it’ in in second form, etc.
-
-          (--> "def" (concat "abc" it "ghi"))
-              ⇒ "abcdefghi"
-          (--> "def" (concat "abc" it "ghi") (upcase it))
-              ⇒ "ABCDEFGHI"
-          (--> "def" (concat "abc" it "ghi") upcase)
-              ⇒ "ABCDEFGHI"
-
- -- Macro: -as-> (value variable &rest forms)
-     Starting with VALUE, thread VARIABLE through FORMS.
-
-     In the first form, bind VARIABLE to VALUE.  In the second form,
-     bind VARIABLE to the result of the first form, and so forth.
-
-          (-as-> 3 my-var (1+ my-var) (list my-var) (mapcar (lambda (ele) (* 2 ele)) my-var))
-              ⇒ (8)
-          (-as-> 3 my-var 1+)
-              ⇒ 4
-          (-as-> 3 my-var)
-              ⇒ 3
-
- -- Macro: -some-> (x &optional form &rest more)
-     When expr is non-‘nil’, thread it through the first form (via ‘->’
-     (*note ->::)), and when that result is non-‘nil’, through the next
-     form, etc.
-
-          (-some-> '(2 3 5))
-              ⇒ (2 3 5)
-          (-some-> 5 square)
-              ⇒ 25
-          (-some-> 5 even? square)
-              ⇒ nil
-
- -- Macro: -some->> (x &optional form &rest more)
-     When expr is non-‘nil’, thread it through the first form (via ‘->>’
-     (*note ->>::)), and when that result is non-‘nil’, through the next
-     form, etc.
-
-          (-some->> '(1 2 3) (-map 'square))
-              ⇒ (1 4 9)
-          (-some->> '(1 3 5) (-last 'even?) (+ 100))
-              ⇒ nil
-          (-some->> '(2 4 6) (-last 'even?) (+ 100))
-              ⇒ 106
-
- -- Macro: -some--> (expr &rest forms)
-     Thread EXPR through FORMS via ‘-->’ (*note -->::), while the result
-     is non-‘nil’.  When EXPR evaluates to non-‘nil’, thread the result
-     through the first of FORMS, and when that result is non-‘nil’,
-     thread it through the next form, etc.
-
-          (-some--> "def" (concat "abc" it "ghi"))
-              ⇒ "abcdefghi"
-          (-some--> nil (concat "abc" it "ghi"))
-              ⇒ nil
-          (-some--> '(0 1) (-remove #'natnump it) (append it it) (-map #'1+ it))
-              ⇒ ()
-
- -- Macro: -doto (init &rest forms)
-     Evaluate INIT and pass it as argument to FORMS with ‘->’ (*note
-     ->::).  The RESULT of evaluating INIT is threaded through each of
-     FORMS individually using ‘->’ (*note ->::), which see.  The return
-     value is RESULT, which FORMS may have modified by side effect.
-
-          (-doto (list 1 2 3) pop pop)
-              ⇒ (3)
-          (-doto (cons 1 2) (setcar 3) (setcdr 4))
-              ⇒ (3 . 4)
-          (gethash 'k (--doto (make-hash-table) (puthash 'k 'v it)))
-              ⇒ v
-
-
-File: dash.info,  Node: Binding,  Next: Side effects,  Prev: Threading macros,  Up: Functions
-
-2.13 Binding
-============
-
-Macros that combine ‘let’ and ‘let*’ with destructuring and flow
-control.
-
- -- Macro: -when-let ((var val) &rest body)
-     If VAL evaluates to non-‘nil’, bind it to VAR and execute body.
-
-     Note: binding is done according to ‘-let’ (*note -let::).
-
-          (-when-let (match-index (string-match "d" "abcd")) (+ match-index 2))
-              ⇒ 5
-          (-when-let ((&plist :foo foo) (list :foo "foo")) foo)
-              ⇒ "foo"
-          (-when-let ((&plist :foo foo) (list :bar "bar")) foo)
-              ⇒ nil
-
- -- Macro: -when-let* (vars-vals &rest body)
-     If all VALS evaluate to true, bind them to their corresponding VARS
-     and execute body.  VARS-VALS should be a list of (VAR VAL) pairs.
-
-     Note: binding is done according to ‘-let*’ (*note -let*::).  VALS
-     are evaluated sequentially, and evaluation stops after the first
-     ‘nil’ VAL is encountered.
-
-          (-when-let* ((x 5) (y 3) (z (+ y 4))) (+ x y z))
-              ⇒ 15
-          (-when-let* ((x 5) (y nil) (z 7)) (+ x y z))
-              ⇒ nil
-
- -- Macro: -if-let ((var val) then &rest else)
-     If VAL evaluates to non-‘nil’, bind it to VAR and do THEN,
-     otherwise do ELSE.
-
-     Note: binding is done according to ‘-let’ (*note -let::).
-
-          (-if-let (match-index (string-match "d" "abc")) (+ match-index 3) 7)
-              ⇒ 7
-          (--if-let (even? 4) it nil)
-              ⇒ t
-
- -- Macro: -if-let* (vars-vals then &rest else)
-     If all VALS evaluate to true, bind them to their corresponding VARS
-     and do THEN, otherwise do ELSE.  VARS-VALS should be a list of (VAR
-     VAL) pairs.
-
-     Note: binding is done according to ‘-let*’ (*note -let*::).  VALS
-     are evaluated sequentially, and evaluation stops after the first
-     ‘nil’ VAL is encountered.
-
-          (-if-let* ((x 5) (y 3) (z 7)) (+ x y z) "foo")
-              ⇒ 15
-          (-if-let* ((x 5) (y nil) (z 7)) (+ x y z) "foo")
-              ⇒ "foo"
-          (-if-let* (((_ _ x) '(nil nil 7))) x)
-              ⇒ 7
-
- -- Macro: -let (varlist &rest body)
-     Bind variables according to VARLIST then eval BODY.
-
-     VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-     PATTERN is matched against the SOURCE "structurally".  SOURCE is
-     only evaluated once for each PATTERN.  Each PATTERN is matched
-     recursively, and can therefore contain sub-patterns which are
-     matched against corresponding sub-expressions of SOURCE.
-
-     All the SOURCEs are evalled before any symbols are bound (i.e.  "in
-     parallel").
-
-     If VARLIST only contains one (PATTERN SOURCE) element, you can
-     optionally specify it using a vector and discarding the outer-most
-     parens.  Thus
-
-     (-let ((PATTERN SOURCE)) ...)
-
-     becomes
-
-     (-let [PATTERN SOURCE] ...).
-
-     ‘-let’ (*note -let::) uses a convention of not binding places
-     (symbols) starting with _ whenever it’s possible.  You can use this
-     to skip over entries you don’t care about.  However, this is not
-     *always* possible (as a result of implementation) and these symbols
-     might get bound to undefined values.
-
-     Following is the overview of supported patterns.  Remember that
-     patterns can be matched recursively, so every a, b, aK in the
-     following can be a matching construct and not necessarily a
-     symbol/variable.
-
-     Symbol:
-
-     a - bind the SOURCE to A.  This is just like regular ‘let’.
-
-     Conses and lists:
-
-     (a) - bind ‘car’ of cons/list to A
-
-     (a .  b) - bind car of cons to A and ‘cdr’ to B
-
-     (a b) - bind car of list to A and ‘cadr’ to B
-
-     (a1 a2 a3 ...) - bind 0th car of list to A1, 1st to A2, 2nd to
-     A3...
-
-     (a1 a2 a3 ... aN .  rest) - as above, but bind the Nth cdr to REST.
-
-     Vectors:
-
-     [a] - bind 0th element of a non-list sequence to A (works with
-     vectors, strings, bit arrays...)
-
-     [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st
-     to A1, 2nd to A2, ...  If the PATTERN is shorter than SOURCE, the
-     values at places not in PATTERN are ignored.  If the PATTERN is
-     longer than SOURCE, an ‘error’ is thrown.
-
-     [a1 a2 a3 ... &rest rest] - as above, but bind the rest of the
-     sequence to REST.  This is conceptually the same as improper list
-     matching (a1 a2 ... aN .  rest)
-
-     Key/value stores:
-
-     (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-     SOURCE plist to aK. If the value is not found, aK is ‘nil’.  Uses
-     ‘plist-get’ to fetch values.
-
-     (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
-     SOURCE alist to aK. If the value is not found, aK is ‘nil’.  Uses
-     ‘assoc’ to fetch values.
-
-     (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
-     SOURCE hash table to aK. If the value is not found, aK is ‘nil’.
-     Uses ‘gethash’ to fetch values.
-
-     Further, special keyword &keys supports "inline" matching of
-     plist-like key-value pairs, similarly to &keys keyword of
-     ‘cl-defun’.
-
-     (a1 a2 ... aN &keys key1 b1 ... keyN bK)
-
-     This binds N values from the list to a1 ... aN, then interprets the
-     cdr as a plist (see key/value matching above).
-
-     A shorthand notation for kv-destructuring exists which allows the
-     patterns be optionally left out and derived from the key name in
-     the following fashion:
-
-     - a key :foo is converted into ‘foo’ pattern, - a key ’bar is
-     converted into ‘bar’ pattern, - a key "baz" is converted into ‘baz’
-     pattern.
-
-     That is, the entire value under the key is bound to the derived
-     variable without any further destructuring.
-
-     This is possible only when the form following the key is not a
-     valid pattern (i.e.  not a symbol, a cons cell or a vector).
-     Otherwise the matching proceeds as usual and in case of an invalid
-     spec fails with an error.
-
-     Thus the patterns are normalized as follows:
-
-     ;; derive all the missing patterns (&plist :foo ’bar "baz") =>
-     (&plist :foo foo ’bar bar "baz" baz)
-
-     ;; we can specify some but not others (&plist :foo ’bar
-     explicit-bar) => (&plist :foo foo ’bar explicit-bar)
-
-     ;; nothing happens, we store :foo in x (&plist :foo x) => (&plist
-     :foo x)
-
-     ;; nothing happens, we match recursively (&plist :foo (a b c)) =>
-     (&plist :foo (a b c))
-
-     You can name the source using the syntax SYMBOL &as PATTERN.  This
-     syntax works with lists (proper or improper), vectors and all types
-     of maps.
-
-     (list &as a b c) (list 1 2 3)
-
-     binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
-
-     Similarly:
-
-     (bounds &as beg .  end) (cons 1 2)
-
-     binds BEG to 1, END to 2 and BOUNDS to (1 .  2).
-
-     (items &as first .  rest) (list 1 2 3)
-
-     binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
-
-     [vect &as _ b c] [1 2 3]
-
-     binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as
-     usual).
-
-     (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
-
-     binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and
-     &hash.
-
-     This is especially useful when we want to capture the result of a
-     computation and destructure at the same time.  Consider the form
-     (function-returning-complex-structure) returning a list of two
-     vectors with two items each.  We want to capture this entire result
-     and pass it to another computation, but at the same time we want to
-     get the second item from each vector.  We can achieve it with
-     pattern
-
-     (result &as [_ a] [_ b]) (function-returning-complex-structure)
-
-     Note: Clojure programmers may know this feature as the ":as
-     binding".  The difference is that we put the &as at the front
-     because we need to support improper list binding.
-
-          (-let (([a (b c) d] [1 (2 3) 4])) (list a b c d))
-              ⇒ (1 2 3 4)
-          (-let [(a b c . d) (list 1 2 3 4 5 6)] (list a b c d))
-              ⇒ (1 2 3 (4 5 6))
-          (-let [(&plist :foo foo :bar bar) (list :baz 3 :foo 1 :qux 4 :bar 2)] (list foo bar))
-              ⇒ (1 2)
-
- -- Macro: -let* (varlist &rest body)
-     Bind variables according to VARLIST then eval BODY.
-
-     VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
-     PATTERN is matched against the SOURCE structurally.  SOURCE is only
-     evaluated once for each PATTERN.
-
-     Each SOURCE can refer to the symbols already bound by this VARLIST.
-     This is useful if you want to destructure SOURCE recursively but
-     also want to name the intermediate structures.
-
-     See ‘-let’ (*note -let::) for the list of all possible patterns.
-
-          (-let* (((a . b) (cons 1 2)) ((c . d) (cons 3 4))) (list a b c d))
-              ⇒ (1 2 3 4)
-          (-let* (((a . b) (cons 1 (cons 2 3))) ((c . d) b)) (list a b c d))
-              ⇒ (1 (2 . 3) 2 3)
-          (-let* (((&alist "foo" foo "bar" bar) (list (cons "foo" 1) (cons "bar" (list 'a 'b 'c)))) ((a b c) bar)) (list foo a b c bar))
-              ⇒ (1 a b c (a b c))
-
- -- Macro: -lambda (match-form &rest body)
-     Return a lambda which destructures its input as MATCH-FORM and
-     executes BODY.
-
-     Note that you have to enclose the MATCH-FORM in a pair of parens,
-     such that:
-
-     (-lambda (x) body) (-lambda (x y ...) body)
-
-     has the usual semantics of ‘lambda’.  Furthermore, these get
-     translated into normal ‘lambda’, so there is no performance
-     penalty.
-
-     See ‘-let’ (*note -let::) for a description of the destructuring
-     mechanism.
-
-          (-map (-lambda ((x y)) (+ x y)) '((1 2) (3 4) (5 6)))
-              ⇒ (3 7 11)
-          (-map (-lambda ([x y]) (+ x y)) '([1 2] [3 4] [5 6]))
-              ⇒ (3 7 11)
-          (funcall (-lambda ((_ . a) (_ . b)) (-concat a b)) '(1 2 3) '(4 5 6))
-              ⇒ (2 3 5 6)
-
- -- Macro: -setq ([match-form val] ...)
-     Bind each MATCH-FORM to the value of its VAL.
-
-     MATCH-FORM destructuring is done according to the rules of ‘-let’
-     (*note -let::).
-
-     This macro allows you to bind multiple variables by destructuring
-     the value, so for example:
-
-     (-setq (a b) x (&plist :c c) plist)
-
-     expands roughly speaking to the following code
-
-     (setq a (car x) b (cadr x) c (plist-get plist :c))
-
-     Care is taken to only evaluate each VAL once so that in case of
-     multiple assignments it does not cause unexpected side effects.
-
-          (let (a) (-setq a 1) a)
-              ⇒ 1
-          (let (a b) (-setq (a b) (list 1 2)) (list a b))
-              ⇒ (1 2)
-          (let (c) (-setq (&plist :c c) (list :c "c")) c)
-              ⇒ "c"
-
-
-File: dash.info,  Node: Side effects,  Next: Destructive operations,  Prev: Binding,  Up: Functions
-
-2.14 Side effects
-=================
-
-Functions iterating over lists for side effect only.
-
- -- Function: -each (list fn)
-     Call FN on each element of LIST.  Return ‘nil’; this function is
-     intended for side effects.
-
-     Its anaphoric counterpart is ‘--each’.
-
-     For access to the current element’s index in LIST, see
-     ‘-each-indexed’ (*note -each-indexed::).
-
-          (let (l) (-each '(1 2 3) (lambda (x) (push x l))) l)
-              ⇒ (3 2 1)
-          (let (l) (--each '(1 2 3) (push it l)) l)
-              ⇒ (3 2 1)
-          (-each '(1 2 3) #'identity)
-              ⇒ nil
-
- -- Function: -each-while (list pred fn)
-     Call FN on each ITEM in LIST, while (PRED ITEM) is non-‘nil’.  Once
-     an ITEM is reached for which PRED returns ‘nil’, FN is no longer
-     called.  Return ‘nil’; this function is intended for side effects.
-
-     Its anaphoric counterpart is ‘--each-while’.
-
-          (let (l) (-each-while '(2 4 5 6) #'even? (lambda (x) (push x l))) l)
-              ⇒ (4 2)
-          (let (l) (--each-while '(1 2 3 4) (< it 3) (push it l)) l)
-              ⇒ (2 1)
-          (let ((s 0)) (--each-while '(1 3 4 5) (< it 5) (setq s (+ s it))) s)
-              ⇒ 8
-
- -- Function: -each-indexed (list fn)
-     Call FN on each index and element of LIST.  For each ITEM at INDEX
-     in LIST, call (funcall FN INDEX ITEM).  Return ‘nil’; this function
-     is intended for side effects.
-
-     See also: ‘-map-indexed’ (*note -map-indexed::).
-
-          (let (l) (-each-indexed '(a b c) (lambda (i x) (push (list x i) l))) l)
-              ⇒ ((c 2) (b 1) (a 0))
-          (let (l) (--each-indexed '(a b c) (push (list it it-index) l)) l)
-              ⇒ ((c 2) (b 1) (a 0))
-          (let (l) (--each-indexed () (push it l)) l)
-              ⇒ ()
-
- -- Function: -each-r (list fn)
-     Call FN on each element of LIST in reversed order.  Return ‘nil’;
-     this function is intended for side effects.
-
-     Its anaphoric counterpart is ‘--each-r’.
-
-          (let (l) (-each-r '(1 2 3) (lambda (x) (push x l))) l)
-              ⇒ (1 2 3)
-          (let (l) (--each-r '(1 2 3) (push it l)) l)
-              ⇒ (1 2 3)
-          (-each-r '(1 2 3) #'identity)
-              ⇒ nil
-
- -- Function: -each-r-while (list pred fn)
-     Call FN on each ITEM in reversed LIST, while (PRED ITEM) is
-     non-‘nil’.  Once an ITEM is reached for which PRED returns ‘nil’,
-     FN is no longer called.  Return ‘nil’; this function is intended
-     for side effects.
-
-     Its anaphoric counterpart is ‘--each-r-while’.
-
-          (let (l) (-each-r-while '(2 4 5 6) #'even? (lambda (x) (push x l))) l)
-              ⇒ (6)
-          (let (l) (--each-r-while '(1 2 3 4) (>= it 3) (push it l)) l)
-              ⇒ (3 4)
-          (let ((s 0)) (--each-r-while '(1 2 3 5) (> it 1) (setq s (+ s it))) s)
-              ⇒ 10
-
- -- Function: -dotimes (num fn)
-     Call FN NUM times, presumably for side effects.  FN is called with
-     a single argument on successive integers running from 0, inclusive,
-     to NUM, exclusive.  FN is not called if NUM is less than 1.
-
-     This function’s anaphoric counterpart is ‘--dotimes’.
-
-          (let (s) (-dotimes 3 (lambda (n) (push n s))) s)
-              ⇒ (2 1 0)
-          (let (s) (-dotimes 0 (lambda (n) (push n s))) s)
-              ⇒ ()
-          (let (s) (--dotimes 5 (push it s)) s)
-              ⇒ (4 3 2 1 0)
-
-
-File: dash.info,  Node: Destructive operations,  Next: Function combinators,  Prev: Side effects,  Up: Functions
-
-2.15 Destructive operations
-===========================
-
-Macros that modify variables holding lists.
-
- -- Macro: !cons (car cdr)
-     Destructive: Set CDR to the cons of CAR and CDR.
-
-          (let (l) (!cons 5 l) l)
-              ⇒ (5)
-          (let ((l '(3))) (!cons 5 l) l)
-              ⇒ (5 3)
-
- -- Macro: !cdr (list)
-     Destructive: Set LIST to the cdr of LIST.
-
-          (let ((l '(3))) (!cdr l) l)
-              ⇒ ()
-          (let ((l '(3 5))) (!cdr l) l)
-              ⇒ (5)
-
-
-File: dash.info,  Node: Function combinators,  Prev: Destructive operations,  Up: Functions
-
-2.16 Function combinators
-=========================
-
-Functions that manipulate and compose other functions.
-
- -- Function: -partial (fun &rest args)
-     Return a function that is a partial application of FUN to ARGS.
-     ARGS is a list of the first N arguments to pass to FUN.  The result
-     is a new function which does the same as FUN, except that the first
-     N arguments are fixed at the values with which this function was
-     called.
-
-          (funcall (-partial #'+ 5))
-              ⇒ 5
-          (funcall (-partial #'- 5) 3)
-              ⇒ 2
-          (funcall (-partial #'+ 5 2) 3)
-              ⇒ 10
-
- -- Function: -rpartial (fn &rest args)
-     Return a function that is a partial application of FN to ARGS.
-     ARGS is a list of the last N arguments to pass to FN.  The result
-     is a new function which does the same as FN, except that the last N
-     arguments are fixed at the values with which this function was
-     called.  This is like ‘-partial’ (*note -partial::), except the
-     arguments are fixed starting from the right rather than the left.
-
-          (funcall (-rpartial #'- 5))
-              ⇒ -5
-          (funcall (-rpartial #'- 5) 8)
-              ⇒ 3
-          (funcall (-rpartial #'- 5 2) 10)
-              ⇒ 3
-
- -- Function: -juxt (&rest fns)
-     Return a function that is the juxtaposition of FNS.  The returned
-     function takes a variable number of ARGS, applies each of FNS in
-     turn to ARGS, and returns the list of results.
-
-          (funcall (-juxt) 1 2)
-              ⇒ ()
-          (funcall (-juxt #'+ #'- #'* #'/) 7 5)
-              ⇒ (12 2 35 1)
-          (mapcar (-juxt #'number-to-string #'1+) '(1 2))
-              ⇒ (("1" 2) ("2" 3))
-
- -- Function: -compose (&rest fns)
-     Compose FNS into a single composite function.  Return a function
-     that takes a variable number of ARGS, applies the last function in
-     FNS to ARGS, and returns the result of calling each remaining
-     function on the result of the previous function, right-to-left.  If
-     no FNS are given, return a variadic ‘identity’ function.
-
-          (funcall (-compose #'- #'1+ #'+) 1 2 3)
-              ⇒ -7
-          (funcall (-compose #'identity #'1+) 3)
-              ⇒ 4
-          (mapcar (-compose #'not #'stringp) '(nil ""))
-              ⇒ (t nil)
-
- -- Function: -applify (fn)
-     Return a function that applies FN to a single list of args.  This
-     changes the arity of FN from taking N distinct arguments to taking
-     1 argument which is a list of N arguments.
-
-          (funcall (-applify #'+) nil)
-              ⇒ 0
-          (mapcar (-applify #'+) '((1 1 1) (1 2 3) (5 5 5)))
-              ⇒ (3 6 15)
-          (funcall (-applify #'<) '(3 6))
-              ⇒ t
-
- -- Function: -on (op trans)
-     Return a function that calls TRANS on each arg and OP on the
-     results.  The returned function takes a variable number of
-     arguments, calls the function TRANS on each one in turn, and then
-     passes those results as the list of arguments to OP, in the same
-     order.
-
-     For example, the following pairs of expressions are morally
-     equivalent:
-
-     (funcall (-on #’+ #’1+) 1 2 3) = (+ (1+ 1) (1+ 2) (1+ 3)) (funcall
-     (-on #’+ #’1+)) = (+)
-
-          (-sort (-on #'< #'length) '((1 2 3) (1) (1 2)))
-              ⇒ ((1) (1 2) (1 2 3))
-          (funcall (-on #'min #'string-to-number) "22" "2" "1" "12")
-              ⇒ 1
-          (-min-by (-on #'> #'length) '((1 2 3) (4) (1 2)))
-              ⇒ (4)
-
- -- Function: -flip (fn)
-     Return a function that calls FN with its arguments reversed.  The
-     returned function takes the same number of arguments as FN.
-
-     For example, the following two expressions are morally equivalent:
-
-     (funcall (-flip #’-) 1 2) = (- 2 1)
-
-     See also: ‘-rotate-args’ (*note -rotate-args::).
-
-          (-sort (-flip #'<) '(4 3 6 1))
-              ⇒ (6 4 3 1)
-          (funcall (-flip #'-) 3 2 1 10)
-              ⇒ 4
-          (funcall (-flip #'1+) 1)
-              ⇒ 2
-
- -- Function: -rotate-args (n fn)
-     Return a function that calls FN with args rotated N places to the
-     right.  The returned function takes the same number of arguments as
-     FN, rotates the list of arguments N places to the right (left if N
-     is negative) just like ‘-rotate’ (*note -rotate::), and applies FN
-     to the result.
-
-     See also: ‘-flip’ (*note -flip::).
-
-          (funcall (-rotate-args -1 #'list) 1 2 3 4)
-              ⇒ (2 3 4 1)
-          (funcall (-rotate-args 1 #'-) 1 10 100)
-              ⇒ 89
-          (funcall (-rotate-args 2 #'list) 3 4 5 1 2)
-              ⇒ (1 2 3 4 5)
-
- -- Function: -const (c)
-     Return a function that returns C ignoring any additional arguments.
-
-     In types: a -> b -> a
-
-          (funcall (-const 2) 1 3 "foo")
-              ⇒ 2
-          (mapcar (-const 1) '("a" "b" "c" "d"))
-              ⇒ (1 1 1 1)
-          (-sum (mapcar (-const 1) '("a" "b" "c" "d")))
-              ⇒ 4
-
- -- Macro: -cut (&rest params)
-     Take n-ary function and n arguments and specialize some of them.
-     Arguments denoted by <> will be left unspecialized.
-
-     See SRFI-26 for detailed description.
-
-          (funcall (-cut list 1 <> 3 <> 5) 2 4)
-              ⇒ (1 2 3 4 5)
-          (-map (-cut funcall <> 5) `(1+ 1- ,(lambda (x) (/ 1.0 x))))
-              ⇒ (6 4 0.2)
-          (-map (-cut <> 1 2 3) '(list vector string))
-              ⇒ ((1 2 3) [1 2 3] "\1\2\3")
-
- -- Function: -not (pred)
-     Return a predicate that negates the result of PRED.  The returned
-     predicate passes its arguments to PRED.  If PRED returns ‘nil’, the
-     result is non-‘nil’; otherwise the result is ‘nil’.
-
-     See also: ‘-andfn’ (*note -andfn::) and ‘-orfn’ (*note -orfn::).
-
-          (funcall (-not #'numberp) "5")
-              ⇒ t
-          (-sort (-not #'<) '(5 2 1 0 6))
-              ⇒ (6 5 2 1 0)
-          (-filter (-not (-partial #'< 4)) '(1 2 3 4 5 6 7 8))
-              ⇒ (1 2 3 4)
-
- -- Function: -orfn (&rest preds)
-     Return a predicate that returns the first non-‘nil’ result of
-     PREDS.  The returned predicate takes a variable number of
-     arguments, passes them to each predicate in PREDS in turn until one
-     of them returns non-‘nil’, and returns that non-‘nil’ result
-     without calling the remaining PREDS.  If all PREDS return ‘nil’, or
-     if no PREDS are given, the returned predicate returns ‘nil’.
-
-     See also: ‘-andfn’ (*note -andfn::) and ‘-not’ (*note -not::).
-
-          (-filter (-orfn #'natnump #'booleanp) '(1 nil "a" -4 b c t))
-              ⇒ (1 nil t)
-          (funcall (-orfn #'symbolp (-cut string-match-p "x" <>)) "axe")
-              ⇒ 1
-          (funcall (-orfn #'= #'+) 1 1)
-              ⇒ t
-
- -- Function: -andfn (&rest preds)
-     Return a predicate that returns non-‘nil’ if all PREDS do so.  The
-     returned predicate P takes a variable number of arguments and
-     passes them to each predicate in PREDS in turn.  If any one of
-     PREDS returns ‘nil’, P also returns ‘nil’ without calling the
-     remaining PREDS.  If all PREDS return non-‘nil’, P returns the last
-     such value.  If no PREDS are given, P always returns non-‘nil’.
-
-     See also: ‘-orfn’ (*note -orfn::) and ‘-not’ (*note -not::).
-
-          (-filter (-andfn #'numberp (-cut < <> 5)) '(a 1 b 6 c 2))
-              ⇒ (1 2)
-          (mapcar (-andfn #'numberp #'1+) '(a 1 b 6))
-              ⇒ (nil 2 nil 7)
-          (funcall (-andfn #'= #'+) 1 1)
-              ⇒ 2
-
- -- Function: -iteratefn (fn n)
-     Return a function FN composed N times with itself.
-
-     FN is a unary function.  If you need to use a function of higher
-     arity, use ‘-applify’ (*note -applify::) first to turn it into a
-     unary function.
-
-     With n = 0, this acts as identity function.
-
-     In types: (a -> a) -> Int -> a -> a.
-
-     This function satisfies the following law:
-
-     (funcall (-iteratefn fn n) init) = (-last-item (-iterate fn init
-     (1+ n))).
-
-          (funcall (-iteratefn (lambda (x) (* x x)) 3) 2)
-              ⇒ 256
-          (funcall (-iteratefn '1+ 3) 1)
-              ⇒ 4
-          (funcall (-iteratefn 'cdr 3) '(1 2 3 4 5))
-              ⇒ (4 5)
-
- -- Function: -fixfn (fn &optional equal-test halt-test)
-     Return a function that computes the (least) fixpoint of FN.
-
-     FN must be a unary function.  The returned lambda takes a single
-     argument, X, the initial value for the fixpoint iteration.  The
-     iteration halts when either of the following conditions is
-     satisfied:
-
-     1.  Iteration converges to the fixpoint, with equality being tested
-     using EQUAL-TEST.  If EQUAL-TEST is not specified, ‘equal’ is used.
-     For functions over the floating point numbers, it may be necessary
-     to provide an appropriate approximate comparison test.
-
-     2.  HALT-TEST returns a non-‘nil’ value.  HALT-TEST defaults to a
-     simple counter that returns ‘t’ after ‘-fixfn-max-iterations’, to
-     guard against infinite iteration.  Otherwise, HALT-TEST must be a
-     function that accepts a single argument, the current value of X,
-     and returns non-‘nil’ as long as iteration should continue.  In
-     this way, a more sophisticated convergence test may be supplied by
-     the caller.
-
-     The return value of the lambda is either the fixpoint or, if
-     iteration halted before converging, a cons with car ‘halted’ and
-     cdr the final output from HALT-TEST.
-
-     In types: (a -> a) -> a -> a.
-
-          (funcall (-fixfn #'cos #'approx=) 0.7)
-              ⇒ 0.7390851332151607
-          (funcall (-fixfn (lambda (x) (expt (+ x 10) 0.25))) 2.0)
-              ⇒ 1.8555845286409378
-          (funcall (-fixfn #'sin #'approx=) 0.1)
-              ⇒ (halted . t)
-
- -- Function: -prodfn (&rest fns)
-     Return a function that applies each of FNS to each of a list of
-     arguments.
-
-     Takes a list of N functions and returns a function that takes a
-     list of length N, applying Ith function to Ith element of the input
-     list.  Returns a list of length N.
-
-     In types (for N=2): ((a -> b), (c -> d)) -> (a, c) -> (b, d)
-
-     This function satisfies the following laws:
-
-     (-compose (-prodfn f g ...) (-prodfn f’ g’ ...)) = (-prodfn
-     (-compose f f’) (-compose g g’) ...)
-
-     (-prodfn f g ...) = (-juxt (-compose f (-partial #’nth 0))
-     (-compose g (-partial #’nth 1)) ...)
-
-     (-compose (-prodfn f g ...) (-juxt f’ g’ ...)) = (-juxt (-compose f
-     f’) (-compose g g’) ...)
-
-     (-compose (-partial #’nth n) (-prod f1 f2 ...)) = (-compose fn
-     (-partial #’nth n))
-
-          (funcall (-prodfn #'1+ #'1- #'number-to-string) '(1 2 3))
-              ⇒ (2 1 "3")
-          (-map (-prodfn #'1- #'1+) '((1 2) (3 4) (5 6)))
-              ⇒ ((0 3) (2 5) (4 7))
-          (apply #'+ (funcall (-prodfn #'length #'string-to-number) '((t) "5")))
-              ⇒ 6
-
-
-File: dash.info,  Node: Development,  Next: FDL,  Prev: Functions,  Up: Top
-
-3 Development
-*************
-
-The Dash repository is hosted on GitHub at
-<https://github.com/magnars/dash.el>.
-
-* Menu:
-
-* Contribute::          How to contribute.
-* Contributors::        List of contributors.
-
-
-File: dash.info,  Node: Contribute,  Next: Contributors,  Up: Development
-
-3.1 Contribute
-==============
-
-Yes, please do.  Pure functions in the list manipulation realm only,
-please.  There’s a suite of examples/tests in ‘dev/examples.el’, so
-remember to add tests for your additions, or they may get broken later.
-
-   Run the tests with ‘make check’.  Regenerate the docs with ‘make
-docs’.  Contributors are encouraged to install these commands as a Git
-pre-commit hook, so that the tests are always running and the docs are
-always in sync:
-
-     $ cp dev/pre-commit.sh .git/hooks/pre-commit
-
-   Oh, and don’t edit ‘README.md’ or ‘dash.texi’ directly, as they are
-auto-generated.  Instead, change their respective templates
-‘readme-template.md’ or ‘dash-template.texi’.
-
-   To ensure that Dash can be distributed with GNU ELPA or Emacs, we
-require that all contributors assign copyright to the Free Software
-Foundation.  For more on this, *note (emacs)Copyright Assignment::.
-
-
-File: dash.info,  Node: Contributors,  Prev: Contribute,  Up: Development
-
-3.2 Contributors
-================
-
-   • Matus Goljer (https://github.com/Fuco1) contributed lots of
-     features and functions.
-   • Takafumi Arakaki (https://github.com/tkf) contributed ‘-group-by’.
-   • tali713 (https://github.com/tali713) is the author of ‘-applify’.
-   • Víctor M. Valenzuela (https://github.com/vemv) contributed
-     ‘-repeat’.
-   • Nic Ferrier (https://github.com/nicferrier) contributed ‘-cons*’.
-   • Wilfred Hughes (https://github.com/Wilfred) contributed ‘-slice’,
-     ‘-first-item’, and ‘-last-item’.
-   • Emanuel Evans (https://github.com/shosti) contributed ‘-if-let’,
-     ‘-when-let’, and ‘-insert-at’.
-   • Johan Andersson (https://github.com/rejeep) contributed ‘-sum’,
-     ‘-product’, and ‘-same-items?’.
-   • Christina Whyte (https://github.com/kurisuwhyte) contributed
-     ‘-compose’.
-   • Steve Lamb (https://github.com/steventlamb) contributed ‘-cycle’,
-     ‘-pad’, ‘-annotate’, ‘-zip-fill’, and a variadic version of ‘-zip’.
-   • Fredrik Bergroth (https://github.com/fbergroth) made the ‘-if-let’
-     family use ‘-let’ destructuring and improved the script for
-     generating documentation.
-   • Mark Oteiza (https://github.com/holomorph) contributed ‘-iota’ and
-     the script to create an Info manual.
-   • Vasilij Schneidermann (https://github.com/wasamasa) contributed
-     ‘-some’.
-   • William West (https://github.com/occidens) made ‘-fixfn’ more
-     robust at handling floats.
-   • Cam Saul (https://github.com/camsaul) contributed ‘-some->’,
-     ‘-some->>’, and ‘-some-->’.
-   • Basil L. Contovounesios (https://github.com/basil-conto)
-     contributed ‘-common-prefix’, ‘-common-suffix’, and various other
-     improvements.
-   • Paul Pogonyshev (https://github.com/doublep) contributed ‘-each-r’
-     and ‘-each-r-while’.
-
-   Thanks!
-
-   New contributors are very welcome.  *Note Contribute::.
-
-
-File: dash.info,  Node: FDL,  Next: GPL,  Prev: Development,  Up: Top
-
-Appendix A GNU Free Documentation License
-*****************************************
-
-                     Version 1.3, 3 November 2008
-
-     Copyright © 2000, 2001, 2002, 2007, 2008 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.
-
-  0. PREAMBLE
-
-     The purpose of this License is to make a manual, textbook, or other
-     functional and useful document “free” in the sense of freedom: to
-     assure everyone the effective freedom to copy and redistribute it,
-     with or without modifying it, either commercially or
-     noncommercially.  Secondarily, this License preserves for the
-     author and publisher a way to get credit for their work, while not
-     being considered responsible for modifications made by others.
-
-     This License is a kind of “copyleft”, which means that derivative
-     works of the document must themselves be free in the same sense.
-     It complements the GNU General Public License, which is a copyleft
-     license designed for free software.
-
-     We have designed this License in order to use it for manuals for
-     free software, because free software needs free documentation: a
-     free program should come with manuals providing the same freedoms
-     that the software does.  But this License is not limited to
-     software manuals; it can be used for any textual work, regardless
-     of subject matter or whether it is published as a printed book.  We
-     recommend this License principally for works whose purpose is
-     instruction or reference.
-
-  1. APPLICABILITY AND DEFINITIONS
-
-     This License applies to any manual or other work, in any medium,
-     that contains a notice placed by the copyright holder saying it can
-     be distributed under the terms of this License.  Such a notice
-     grants a world-wide, royalty-free license, unlimited in duration,
-     to use that work under the conditions stated herein.  The
-     “Document”, below, refers to any such manual or work.  Any member
-     of the public is a licensee, and is addressed as “you”.  You accept
-     the license if you copy, modify or distribute the work in a way
-     requiring permission under copyright law.
-
-     A “Modified Version” of the Document means any work containing the
-     Document or a portion of it, either copied verbatim, or with
-     modifications and/or translated into another language.
-
-     A “Secondary Section” is a named appendix or a front-matter section
-     of the Document that deals exclusively with the relationship of the
-     publishers or authors of the Document to the Document’s overall
-     subject (or to related matters) and contains nothing that could
-     fall directly within that overall subject.  (Thus, if the Document
-     is in part a textbook of mathematics, a Secondary Section may not
-     explain any mathematics.)  The relationship could be a matter of
-     historical connection with the subject or with related matters, or
-     of legal, commercial, philosophical, ethical or political position
-     regarding them.
-
-     The “Invariant Sections” are certain Secondary Sections whose
-     titles are designated, as being those of Invariant Sections, in the
-     notice that says that the Document is released under this License.
-     If a section does not fit the above definition of Secondary then it
-     is not allowed to be designated as Invariant.  The Document may
-     contain zero Invariant Sections.  If the Document does not identify
-     any Invariant Sections then there are none.
-
-     The “Cover Texts” are certain short passages of text that are
-     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
-     that says that the Document is released under this License.  A
-     Front-Cover Text may be at most 5 words, and a Back-Cover Text may
-     be at most 25 words.
-
-     A “Transparent” copy of the Document means a machine-readable copy,
-     represented in a format whose specification is available to the
-     general public, that is suitable for revising the document
-     straightforwardly with generic text editors or (for images composed
-     of pixels) generic paint programs or (for drawings) some widely
-     available drawing editor, and that is suitable for input to text
-     formatters or for automatic translation to a variety of formats
-     suitable for input to text formatters.  A copy made in an otherwise
-     Transparent file format whose markup, or absence of markup, has
-     been arranged to thwart or discourage subsequent modification by
-     readers is not Transparent.  An image format is not Transparent if
-     used for any substantial amount of text.  A copy that is not
-     “Transparent” is called “Opaque”.
-
-     Examples of suitable formats for Transparent copies include plain
-     ASCII without markup, Texinfo input format, LaTeX input format,
-     SGML or XML using a publicly available DTD, and standard-conforming
-     simple HTML, PostScript or PDF designed for human modification.
-     Examples of transparent image formats include PNG, XCF and JPG.
-     Opaque formats include proprietary formats that can be read and
-     edited only by proprietary word processors, SGML or XML for which
-     the DTD and/or processing tools are not generally available, and
-     the machine-generated HTML, PostScript or PDF produced by some word
-     processors for output purposes only.
-
-     The “Title Page” means, for a printed book, the title page itself,
-     plus such following pages as are needed to hold, legibly, the
-     material this License requires to appear in the title page.  For
-     works in formats which do not have any title page as such, “Title
-     Page” means the text near the most prominent appearance of the
-     work’s title, preceding the beginning of the body of the text.
-
-     The “publisher” means any person or entity that distributes copies
-     of the Document to the public.
-
-     A section “Entitled XYZ” means a named subunit of the Document
-     whose title either is precisely XYZ or contains XYZ in parentheses
-     following text that translates XYZ in another language.  (Here XYZ
-     stands for a specific section name mentioned below, such as
-     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
-     To “Preserve the Title” of such a section when you modify the
-     Document means that it remains a section “Entitled XYZ” according
-     to this definition.
-
-     The Document may include Warranty Disclaimers next to the notice
-     which states that this License applies to the Document.  These
-     Warranty Disclaimers are considered to be included by reference in
-     this License, but only as regards disclaiming warranties: any other
-     implication that these Warranty Disclaimers may have is void and
-     has no effect on the meaning of this License.
-
-  2. VERBATIM COPYING
-
-     You may copy and distribute the Document in any medium, either
-     commercially or noncommercially, provided that this License, the
-     copyright notices, and the license notice saying this License
-     applies to the Document are reproduced in all copies, and that you
-     add no other conditions whatsoever to those of this License.  You
-     may not use technical measures to obstruct or control the reading
-     or further copying of the copies you make or distribute.  However,
-     you may accept compensation in exchange for copies.  If you
-     distribute a large enough number of copies you must also follow the
-     conditions in section 3.
-
-     You may also lend copies, under the same conditions stated above,
-     and you may publicly display copies.
-
-  3. COPYING IN QUANTITY
-
-     If you publish printed copies (or copies in media that commonly
-     have printed covers) of the Document, numbering more than 100, and
-     the Document’s license notice requires Cover Texts, you must
-     enclose the copies in covers that carry, clearly and legibly, all
-     these Cover Texts: Front-Cover Texts on the front cover, and
-     Back-Cover Texts on the back cover.  Both covers must also clearly
-     and legibly identify you as the publisher of these copies.  The
-     front cover must present the full title with all words of the title
-     equally prominent and visible.  You may add other material on the
-     covers in addition.  Copying with changes limited to the covers, as
-     long as they preserve the title of the Document and satisfy these
-     conditions, can be treated as verbatim copying in other respects.
-
-     If the required texts for either cover are too voluminous to fit
-     legibly, you should put the first ones listed (as many as fit
-     reasonably) on the actual cover, and continue the rest onto
-     adjacent pages.
-
-     If you publish or distribute Opaque copies of the Document
-     numbering more than 100, you must either include a machine-readable
-     Transparent copy along with each Opaque copy, or state in or with
-     each Opaque copy a computer-network location from which the general
-     network-using public has access to download using public-standard
-     network protocols a complete Transparent copy of the Document, free
-     of added material.  If you use the latter option, you must take
-     reasonably prudent steps, when you begin distribution of Opaque
-     copies in quantity, to ensure that this Transparent copy will
-     remain thus accessible at the stated location until at least one
-     year after the last time you distribute an Opaque copy (directly or
-     through your agents or retailers) of that edition to the public.
-
-     It is requested, but not required, that you contact the authors of
-     the Document well before redistributing any large number of copies,
-     to give them a chance to provide you with an updated version of the
-     Document.
-
-  4. MODIFICATIONS
-
-     You may copy and distribute a Modified Version of the Document
-     under the conditions of sections 2 and 3 above, provided that you
-     release the Modified Version under precisely this License, with the
-     Modified Version filling the role of the Document, thus licensing
-     distribution and modification of the Modified Version to whoever
-     possesses a copy of it.  In addition, you must do these things in
-     the Modified Version:
-
-       A. Use in the Title Page (and on the covers, if any) a title
-          distinct from that of the Document, and from those of previous
-          versions (which should, if there were any, be listed in the
-          History section of the Document).  You may use the same title
-          as a previous version if the original publisher of that
-          version gives permission.
-
-       B. List on the Title Page, as authors, one or more persons or
-          entities responsible for authorship of the modifications in
-          the Modified Version, together with at least five of the
-          principal authors of the Document (all of its principal
-          authors, if it has fewer than five), unless they release you
-          from this requirement.
-
-       C. State on the Title page the name of the publisher of the
-          Modified Version, as the publisher.
-
-       D. Preserve all the copyright notices of the Document.
-
-       E. Add an appropriate copyright notice for your modifications
-          adjacent to the other copyright notices.
-
-       F. Include, immediately after the copyright notices, a license
-          notice giving the public permission to use the Modified
-          Version under the terms of this License, in the form shown in
-          the Addendum below.
-
-       G. Preserve in that license notice the full lists of Invariant
-          Sections and required Cover Texts given in the Document’s
-          license notice.
-
-       H. Include an unaltered copy of this License.
-
-       I. Preserve the section Entitled “History”, Preserve its Title,
-          and add to it an item stating at least the title, year, new
-          authors, and publisher of the Modified Version as given on the
-          Title Page.  If there is no section Entitled “History” in the
-          Document, create one stating the title, year, authors, and
-          publisher of the Document as given on its Title Page, then add
-          an item describing the Modified Version as stated in the
-          previous sentence.
-
-       J. Preserve the network location, if any, given in the Document
-          for public access to a Transparent copy of the Document, and
-          likewise the network locations given in the Document for
-          previous versions it was based on.  These may be placed in the
-          “History” section.  You may omit a network location for a work
-          that was published at least four years before the Document
-          itself, or if the original publisher of the version it refers
-          to gives permission.
-
-       K. For any section Entitled “Acknowledgements” or “Dedications”,
-          Preserve the Title of the section, and preserve in the section
-          all the substance and tone of each of the contributor
-          acknowledgements and/or dedications given therein.
-
-       L. Preserve all the Invariant Sections of the Document, unaltered
-          in their text and in their titles.  Section numbers or the
-          equivalent are not considered part of the section titles.
-
-       M. Delete any section Entitled “Endorsements”.  Such a section
-          may not be included in the Modified Version.
-
-       N. Do not retitle any existing section to be Entitled
-          “Endorsements” or to conflict in title with any Invariant
-          Section.
-
-       O. Preserve any Warranty Disclaimers.
-
-     If the Modified Version includes new front-matter sections or
-     appendices that qualify as Secondary Sections and contain no
-     material copied from the Document, you may at your option designate
-     some or all of these sections as invariant.  To do this, add their
-     titles to the list of Invariant Sections in the Modified Version’s
-     license notice.  These titles must be distinct from any other
-     section titles.
-
-     You may add a section Entitled “Endorsements”, provided it contains
-     nothing but endorsements of your Modified Version by various
-     parties—for example, statements of peer review or that the text has
-     been approved by an organization as the authoritative definition of
-     a standard.
-
-     You may add a passage of up to five words as a Front-Cover Text,
-     and a passage of up to 25 words as a Back-Cover Text, to the end of
-     the list of Cover Texts in the Modified Version.  Only one passage
-     of Front-Cover Text and one of Back-Cover Text may be added by (or
-     through arrangements made by) any one entity.  If the Document
-     already includes a cover text for the same cover, previously added
-     by you or by arrangement made by the same entity you are acting on
-     behalf of, you may not add another; but you may replace the old
-     one, on explicit permission from the previous publisher that added
-     the old one.
-
-     The author(s) and publisher(s) of the Document do not by this
-     License give permission to use their names for publicity for or to
-     assert or imply endorsement of any Modified Version.
-
-  5. COMBINING DOCUMENTS
-
-     You may combine the Document with other documents released under
-     this License, under the terms defined in section 4 above for
-     modified versions, provided that you include in the combination all
-     of the Invariant Sections of all of the original documents,
-     unmodified, and list them all as Invariant Sections of your
-     combined work in its license notice, and that you preserve all
-     their Warranty Disclaimers.
-
-     The combined work need only contain one copy of this License, and
-     multiple identical Invariant Sections may be replaced with a single
-     copy.  If there are multiple Invariant Sections with the same name
-     but different contents, make the title of each such section unique
-     by adding at the end of it, in parentheses, the name of the
-     original author or publisher of that section if known, or else a
-     unique number.  Make the same adjustment to the section titles in
-     the list of Invariant Sections in the license notice of the
-     combined work.
-
-     In the combination, you must combine any sections Entitled
-     “History” in the various original documents, forming one section
-     Entitled “History”; likewise combine any sections Entitled
-     “Acknowledgements”, and any sections Entitled “Dedications”.  You
-     must delete all sections Entitled “Endorsements.”
-
-  6. COLLECTIONS OF DOCUMENTS
-
-     You may make a collection consisting of the Document and other
-     documents released under this License, and replace the individual
-     copies of this License in the various documents with a single copy
-     that is included in the collection, provided that you follow the
-     rules of this License for verbatim copying of each of the documents
-     in all other respects.
-
-     You may extract a single document from such a collection, and
-     distribute it individually under this License, provided you insert
-     a copy of this License into the extracted document, and follow this
-     License in all other respects regarding verbatim copying of that
-     document.
-
-  7. AGGREGATION WITH INDEPENDENT WORKS
-
-     A compilation of the Document or its derivatives with other
-     separate and independent documents or works, in or on a volume of a
-     storage or distribution medium, is called an “aggregate” if the
-     copyright resulting from the compilation is not used to limit the
-     legal rights of the compilation’s users beyond what the individual
-     works permit.  When the Document is included in an aggregate, this
-     License does not apply to the other works in the aggregate which
-     are not themselves derivative works of the Document.
-
-     If the Cover Text requirement of section 3 is applicable to these
-     copies of the Document, then if the Document is less than one half
-     of the entire aggregate, the Document’s Cover Texts may be placed
-     on covers that bracket the Document within the aggregate, or the
-     electronic equivalent of covers if the Document is in electronic
-     form.  Otherwise they must appear on printed covers that bracket
-     the whole aggregate.
-
-  8. TRANSLATION
-
-     Translation is considered a kind of modification, so you may
-     distribute translations of the Document under the terms of section
-     4.  Replacing Invariant Sections with translations requires special
-     permission from their copyright holders, but you may include
-     translations of some or all Invariant Sections in addition to the
-     original versions of these Invariant Sections.  You may include a
-     translation of this License, and all the license notices in the
-     Document, and any Warranty Disclaimers, provided that you also
-     include the original English version of this License and the
-     original versions of those notices and disclaimers.  In case of a
-     disagreement between the translation and the original version of
-     this License or a notice or disclaimer, the original version will
-     prevail.
-
-     If a section in the Document is Entitled “Acknowledgements”,
-     “Dedications”, or “History”, the requirement (section 4) to
-     Preserve its Title (section 1) will typically require changing the
-     actual title.
-
-  9. TERMINATION
-
-     You may not copy, modify, sublicense, or distribute the Document
-     except as expressly provided under this License.  Any attempt
-     otherwise to copy, modify, sublicense, or distribute it is void,
-     and will automatically terminate your rights under this License.
-
-     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, receipt of a copy of some or all of the
-     same material does not give you any rights to use it.
-
-  10. FUTURE REVISIONS OF THIS LICENSE
-
-     The Free Software Foundation may publish new, revised versions of
-     the GNU Free Documentation 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.  See
-     <https://www.gnu.org/licenses/>.
-
-     Each version of the License is given a distinguishing version
-     number.  If the Document specifies that a particular numbered
-     version of this License “or any later version” applies to it, you
-     have the option of following the terms and conditions either of
-     that specified version or of any later version that has been
-     published (not as a draft) by the Free Software Foundation.  If the
-     Document does not specify a version number of this License, you may
-     choose any version ever published (not as a draft) by the Free
-     Software Foundation.  If the Document specifies that a proxy can
-     decide which future versions of this License can be used, that
-     proxy’s public statement of acceptance of a version permanently
-     authorizes you to choose that version for the Document.
-
-  11. RELICENSING
-
-     “Massive Multiauthor Collaboration Site” (or “MMC Site”) means any
-     World Wide Web server that publishes copyrightable works and also
-     provides prominent facilities for anybody to edit those works.  A
-     public wiki that anybody can edit is an example of such a server.
-     A “Massive Multiauthor Collaboration” (or “MMC”) contained in the
-     site means any set of copyrightable works thus published on the MMC
-     site.
-
-     “CC-BY-SA” means the Creative Commons Attribution-Share Alike 3.0
-     license published by Creative Commons Corporation, a not-for-profit
-     corporation with a principal place of business in San Francisco,
-     California, as well as future copyleft versions of that license
-     published by that same organization.
-
-     “Incorporate” means to publish or republish a Document, in whole or
-     in part, as part of another Document.
-
-     An MMC is “eligible for relicensing” if it is licensed under this
-     License, and if all works that were first published under this
-     License somewhere other than this MMC, and subsequently
-     incorporated in whole or in part into the MMC, (1) had no cover
-     texts or invariant sections, and (2) were thus incorporated prior
-     to November 1, 2008.
-
-     The operator of an MMC Site may republish an MMC contained in the
-     site under CC-BY-SA on the same site at any time before August 1,
-     2009, provided the MMC is eligible for relicensing.
-
-ADDENDUM: How to use this License for your documents
-====================================================
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and license
-notices just after the title page:
-
-       Copyright (C)  YEAR  YOUR NAME.
-       Permission is granted to copy, distribute and/or modify this document
-       under the terms of the GNU Free Documentation License, Version 1.3
-       or any later version published by the Free Software Foundation;
-       with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-       Texts.  A copy of the license is included in the section entitled ``GNU
-       Free Documentation License''.
-
-   If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the “with...Texts.” line with this:
-
-         with the Invariant Sections being LIST THEIR TITLES, with
-         the Front-Cover Texts being LIST, and with the Back-Cover Texts
-         being LIST.
-
-   If you have Invariant Sections without Cover Texts, or some other
-combination of the three, merge those two alternatives to suit the
-situation.
-
-   If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of free
-software license, such as the GNU General Public License, to permit
-their use in free software.
-
-
-File: dash.info,  Node: GPL,  Next: Index,  Prev: FDL,  Up: Top
-
-Appendix B 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>.
-
-
-File: dash.info,  Node: Index,  Prev: GPL,  Up: Top
-
-Index
-*****
-
-
-* Menu:
-
-* !cdr:                                  Destructive operations.
-                                                              (line  16)
-* !cons:                                 Destructive operations.
-                                                              (line   8)
-* -->:                                   Threading macros.    (line  35)
-* ->:                                    Threading macros.    (line   9)
-* ->>:                                   Threading macros.    (line  22)
-* -all?:                                 Predicates.          (line  53)
-* -andfn:                                Function combinators.
-                                                              (line 184)
-* -annotate:                             Maps.                (line  86)
-* -any?:                                 Predicates.          (line  41)
-* -applify:                              Function combinators.
-                                                              (line  63)
-* -as->:                                 Threading macros.    (line  49)
-* -butlast:                              Other list operations.
-                                                              (line 405)
-* -clone:                                Tree operations.     (line 123)
-* -common-prefix:                        Reductions.          (line 242)
-* -common-suffix:                        Reductions.          (line 252)
-* -compose:                              Function combinators.
-                                                              (line  49)
-* -concat:                               List to list.        (line  23)
-* -cons*:                                Other list operations.
-                                                              (line  19)
-* -cons-pair?:                           Predicates.          (line 154)
-* -const:                                Function combinators.
-                                                              (line 128)
-* -contains?:                            Predicates.          (line 100)
-* -copy:                                 Maps.                (line 151)
-* -count:                                Reductions.          (line 172)
-* -cut:                                  Function combinators.
-                                                              (line 140)
-* -cycle:                                Unfolding.           (line  55)
-* -difference:                           Set operations.      (line  22)
-* -distinct:                             Set operations.      (line  73)
-* -dotimes:                              Side effects.        (line  80)
-* -doto:                                 Threading macros.    (line  99)
-* -drop:                                 Sublist selection.   (line 149)
-* -drop-last:                            Sublist selection.   (line 163)
-* -drop-while:                           Sublist selection.   (line 194)
-* -each:                                 Side effects.        (line   8)
-* -each-indexed:                         Side effects.        (line  38)
-* -each-r:                               Side effects.        (line  52)
-* -each-r-while:                         Side effects.        (line  65)
-* -each-while:                           Side effects.        (line  24)
-* -elem-index:                           Indexing.            (line   9)
-* -elem-indices:                         Indexing.            (line  23)
-* -every:                                Predicates.          (line  23)
-* -fifth-item:                           Other list operations.
-                                                              (line 380)
-* -filter:                               Sublist selection.   (line   8)
-* -find-index:                           Indexing.            (line  35)
-* -find-indices:                         Indexing.            (line  73)
-* -find-last-index:                      Indexing.            (line  54)
-* -first:                                Other list operations.
-                                                              (line 300)
-* -first-item:                           Other list operations.
-                                                              (line 328)
-* -fix:                                  Other list operations.
-                                                              (line 445)
-* -fixfn:                                Function combinators.
-                                                              (line 224)
-* -flatten:                              List to list.        (line  38)
-* -flatten-n:                            List to list.        (line  60)
-* -flip:                                 Function combinators.
-                                                              (line  95)
-* -fourth-item:                          Other list operations.
-                                                              (line 367)
-* -frequencies:                          Reductions.          (line 310)
-* -grade-down:                           Indexing.            (line 103)
-* -grade-up:                             Indexing.            (line  93)
-* -group-by:                             Partitioning.        (line 205)
-* -if-let:                               Binding.             (line  34)
-* -if-let*:                              Binding.             (line  45)
-* -inits:                                Reductions.          (line 222)
-* -insert-at:                            List to list.        (line 114)
-* -interleave:                           Other list operations.
-                                                              (line  56)
-* -interpose:                            Other list operations.
-                                                              (line  46)
-* -intersection:                         Set operations.      (line  36)
-* -iota:                                 Other list operations.
-                                                              (line  67)
-* -is-infix?:                            Predicates.          (line 140)
-* -is-prefix?:                           Predicates.          (line 116)
-* -is-suffix?:                           Predicates.          (line 128)
-* -iterate:                              Unfolding.           (line   9)
-* -iteratefn:                            Function combinators.
-                                                              (line 201)
-* -juxt:                                 Function combinators.
-                                                              (line  37)
-* -keep:                                 List to list.        (line   8)
-* -lambda:                               Binding.             (line 247)
-* -last:                                 Other list operations.
-                                                              (line 318)
-* -last-item:                            Other list operations.
-                                                              (line 393)
-* -let:                                  Binding.             (line  61)
-* -let*:                                 Binding.             (line 227)
-* -list:                                 Other list operations.
-                                                              (line 428)
-* -map:                                  Maps.                (line  10)
-* -map-first:                            Maps.                (line  38)
-* -map-indexed:                          Maps.                (line  68)
-* -map-last:                             Maps.                (line  53)
-* -map-when:                             Maps.                (line  22)
-* -mapcat:                               Maps.                (line 140)
-* -max:                                  Reductions.          (line 286)
-* -max-by:                               Reductions.          (line 296)
-* -min:                                  Reductions.          (line 262)
-* -min-by:                               Reductions.          (line 272)
-* -non-nil:                              Sublist selection.   (line  95)
-* -none?:                                Predicates.          (line  73)
-* -not:                                  Function combinators.
-                                                              (line 153)
-* -on:                                   Function combinators.
-                                                              (line  75)
-* -only-some?:                           Predicates.          (line  85)
-* -orfn:                                 Function combinators.
-                                                              (line 167)
-* -pad:                                  Other list operations.
-                                                              (line 241)
-* -partial:                              Function combinators.
-                                                              (line   8)
-* -partition:                            Partitioning.        (line  90)
-* -partition-after-item:                 Partitioning.        (line 195)
-* -partition-after-pred:                 Partitioning.        (line 162)
-* -partition-all:                        Partitioning.        (line 102)
-* -partition-all-in-steps:               Partitioning.        (line 126)
-* -partition-before-item:                Partitioning.        (line 185)
-* -partition-before-pred:                Partitioning.        (line 174)
-* -partition-by:                         Partitioning.        (line 138)
-* -partition-by-header:                  Partitioning.        (line 149)
-* -partition-in-steps:                   Partitioning.        (line 113)
-* -permutations:                         Set operations.      (line  60)
-* -powerset:                             Set operations.      (line  50)
-* -prodfn:                               Function combinators.
-                                                              (line 258)
-* -product:                              Reductions.          (line 201)
-* -reduce:                               Reductions.          (line  53)
-* -reduce-from:                          Reductions.          (line   8)
-* -reduce-r:                             Reductions.          (line  72)
-* -reduce-r-from:                        Reductions.          (line  26)
-* -reductions:                           Reductions.          (line 136)
-* -reductions-from:                      Reductions.          (line 100)
-* -reductions-r:                         Reductions.          (line 154)
-* -reductions-r-from:                    Reductions.          (line 118)
-* -remove:                               Sublist selection.   (line  26)
-* -remove-at:                            List to list.        (line 151)
-* -remove-at-indices:                    List to list.        (line 170)
-* -remove-first:                         Sublist selection.   (line  44)
-* -remove-item:                          Sublist selection.   (line  84)
-* -remove-last:                          Sublist selection.   (line  65)
-* -repeat:                               Unfolding.           (line  44)
-* -replace:                              List to list.        (line  72)
-* -replace-at:                           List to list.        (line 125)
-* -replace-first:                        List to list.        (line  86)
-* -replace-last:                         List to list.        (line 100)
-* -rotate:                               Other list operations.
-                                                              (line   8)
-* -rotate-args:                          Function combinators.
-                                                              (line 112)
-* -rpartial:                             Function combinators.
-                                                              (line  22)
-* -running-product:                      Reductions.          (line 211)
-* -running-sum:                          Reductions.          (line 190)
-* -same-items?:                          Set operations.      (line  88)
-* -second-item:                          Other list operations.
-                                                              (line 341)
-* -select-by-indices:                    Sublist selection.   (line 211)
-* -select-column:                        Sublist selection.   (line 241)
-* -select-columns:                       Sublist selection.   (line 222)
-* -separate:                             Partitioning.        (line  75)
-* -setq:                                 Binding.             (line 270)
-* -slice:                                Sublist selection.   (line 105)
-* -snoc:                                 Other list operations.
-                                                              (line  32)
-* -some:                                 Predicates.          (line   8)
-* -some-->:                              Threading macros.    (line  86)
-* -some->:                               Threading macros.    (line  62)
-* -some->>:                              Threading macros.    (line  74)
-* -sort:                                 Other list operations.
-                                                              (line 415)
-* -splice:                               Maps.                (line 102)
-* -splice-list:                          Maps.                (line 127)
-* -split-at:                             Partitioning.        (line   8)
-* -split-on:                             Partitioning.        (line  40)
-* -split-when:                           Partitioning.        (line  58)
-* -split-with:                           Partitioning.        (line  23)
-* -sum:                                  Reductions.          (line 180)
-* -table:                                Other list operations.
-                                                              (line 256)
-* -table-flat:                           Other list operations.
-                                                              (line 275)
-* -tails:                                Reductions.          (line 232)
-* -take:                                 Sublist selection.   (line 121)
-* -take-last:                            Sublist selection.   (line 135)
-* -take-while:                           Sublist selection.   (line 177)
-* -third-item:                           Other list operations.
-                                                              (line 354)
-* -tree-map:                             Tree operations.     (line  28)
-* -tree-map-nodes:                       Tree operations.     (line  39)
-* -tree-mapreduce:                       Tree operations.     (line  85)
-* -tree-mapreduce-from:                  Tree operations.     (line 104)
-* -tree-reduce:                          Tree operations.     (line  53)
-* -tree-reduce-from:                     Tree operations.     (line  70)
-* -tree-seq:                             Tree operations.     (line   8)
-* -unfold:                               Unfolding.           (line  25)
-* -union:                                Set operations.      (line   8)
-* -unzip:                                Other list operations.
-                                                              (line 215)
-* -unzip-lists:                          Other list operations.
-                                                              (line 196)
-* -update-at:                            List to list.        (line 137)
-* -when-let:                             Binding.             (line   9)
-* -when-let*:                            Binding.             (line  21)
-* -zip:                                  Other list operations.
-                                                              (line 150)
-* -zip-fill:                             Other list operations.
-                                                              (line 176)
-* -zip-lists:                            Other list operations.
-                                                              (line 114)
-* -zip-lists-fill:                       Other list operations.
-                                                              (line 135)
-* -zip-pair:                             Other list operations.
-                                                              (line  98)
-* -zip-with:                             Other list operations.
-                                                              (line  80)
-* dash-fontify-mode:                     Fontification of special variables.
-                                                              (line   6)
-* dash-register-info-lookup:             Info symbol lookup.  (line   6)
-* global-dash-fontify-mode:              Fontification of special variables.
-                                                              (line  12)
-
-
-
-Tag Table:
-Node: Top742
-Node: Installation2397
-Node: Using in a package3159
-Node: Fontification of special variables3504
-Node: Info symbol lookup4294
-Node: Functions4877
-Node: Maps6361
-Ref: -map6658
-Ref: -map-when7031
-Ref: -map-first7605
-Ref: -map-last8200
-Ref: -map-indexed8790
-Ref: -annotate9476
-Ref: -splice10080
-Ref: -splice-list11155
-Ref: -mapcat11614
-Ref: -copy11987
-Node: Sublist selection12175
-Ref: -filter12368
-Ref: -remove12921
-Ref: -remove-first13470
-Ref: -remove-last14318
-Ref: -remove-item15048
-Ref: -non-nil15448
-Ref: -slice15730
-Ref: -take16259
-Ref: -take-last16677
-Ref: -drop17114
-Ref: -drop-last17561
-Ref: -take-while17993
-Ref: -drop-while18620
-Ref: -select-by-indices19253
-Ref: -select-columns19764
-Ref: -select-column20467
-Node: List to list20930
-Ref: -keep21122
-Ref: -concat21698
-Ref: -flatten22226
-Ref: -flatten-n22988
-Ref: -replace23372
-Ref: -replace-first23833
-Ref: -replace-last24328
-Ref: -insert-at24816
-Ref: -replace-at25141
-Ref: -update-at25528
-Ref: -remove-at26069
-Ref: -remove-at-indices26696
-Node: Reductions27386
-Ref: -reduce-from27582
-Ref: -reduce-r-from28306
-Ref: -reduce29569
-Ref: -reduce-r30320
-Ref: -reductions-from31598
-Ref: -reductions-r-from32404
-Ref: -reductions33234
-Ref: -reductions-r33945
-Ref: -count34690
-Ref: -sum34920
-Ref: -running-sum35108
-Ref: -product35429
-Ref: -running-product35637
-Ref: -inits35978
-Ref: -tails36223
-Ref: -common-prefix36468
-Ref: -common-suffix36762
-Ref: -min37056
-Ref: -min-by37282
-Ref: -max37803
-Ref: -max-by38028
-Ref: -frequencies38554
-Node: Unfolding39169
-Ref: -iterate39410
-Ref: -unfold39857
-Ref: -repeat40662
-Ref: -cycle40946
-Node: Predicates41343
-Ref: -some41520
-Ref: -every41949
-Ref: -any?42663
-Ref: -all?43012
-Ref: -none?43754
-Ref: -only-some?44074
-Ref: -contains?44619
-Ref: -is-prefix?45125
-Ref: -is-suffix?45457
-Ref: -is-infix?45789
-Ref: -cons-pair?46149
-Node: Partitioning46480
-Ref: -split-at46668
-Ref: -split-with47332
-Ref: -split-on47972
-Ref: -split-when48643
-Ref: -separate49286
-Ref: -partition49820
-Ref: -partition-all50269
-Ref: -partition-in-steps50694
-Ref: -partition-all-in-steps51240
-Ref: -partition-by51754
-Ref: -partition-by-header52132
-Ref: -partition-after-pred52733
-Ref: -partition-before-pred53186
-Ref: -partition-before-item53571
-Ref: -partition-after-item53878
-Ref: -group-by54180
-Node: Indexing54613
-Ref: -elem-index54815
-Ref: -elem-indices55302
-Ref: -find-index55761
-Ref: -find-last-index56430
-Ref: -find-indices57081
-Ref: -grade-up57843
-Ref: -grade-down58250
-Node: Set operations58664
-Ref: -union58847
-Ref: -difference59277
-Ref: -intersection59705
-Ref: -powerset60134
-Ref: -permutations60411
-Ref: -distinct60849
-Ref: -same-items?61243
-Node: Other list operations61852
-Ref: -rotate62077
-Ref: -cons*62430
-Ref: -snoc62852
-Ref: -interpose63264
-Ref: -interleave63558
-Ref: -iota63924
-Ref: -zip-with64407
-Ref: -zip-pair65215
-Ref: -zip-lists65781
-Ref: -zip-lists-fill66579
-Ref: -zip67289
-Ref: -zip-fill68316
-Ref: -unzip-lists69230
-Ref: -unzip69853
-Ref: -pad70846
-Ref: -table71331
-Ref: -table-flat72117
-Ref: -first73122
-Ref: -last73655
-Ref: -first-item74001
-Ref: -second-item74413
-Ref: -third-item74830
-Ref: -fourth-item75205
-Ref: -fifth-item75583
-Ref: -last-item75958
-Ref: -butlast76319
-Ref: -sort76564
-Ref: -list77058
-Ref: -fix77627
-Node: Tree operations78116
-Ref: -tree-seq78312
-Ref: -tree-map79173
-Ref: -tree-map-nodes79613
-Ref: -tree-reduce80477
-Ref: -tree-reduce-from81359
-Ref: -tree-mapreduce81959
-Ref: -tree-mapreduce-from82818
-Ref: -clone84103
-Node: Threading macros84441
-Ref: ->84666
-Ref: ->>85154
-Ref: -->85657
-Ref: -as->86213
-Ref: -some->86667
-Ref: -some->>87052
-Ref: -some-->87499
-Ref: -doto88066
-Node: Binding88619
-Ref: -when-let88826
-Ref: -when-let*89287
-Ref: -if-let89816
-Ref: -if-let*90182
-Ref: -let90805
-Ref: -let*96895
-Ref: -lambda97832
-Ref: -setq98638
-Node: Side effects99439
-Ref: -each99633
-Ref: -each-while100160
-Ref: -each-indexed100780
-Ref: -each-r101372
-Ref: -each-r-while101814
-Ref: -dotimes102458
-Node: Destructive operations103011
-Ref: !cons103229
-Ref: !cdr103433
-Node: Function combinators103626
-Ref: -partial103830
-Ref: -rpartial104348
-Ref: -juxt104996
-Ref: -compose105448
-Ref: -applify106055
-Ref: -on106485
-Ref: -flip107257
-Ref: -rotate-args107781
-Ref: -const108410
-Ref: -cut108752
-Ref: -not109232
-Ref: -orfn109776
-Ref: -andfn110569
-Ref: -iteratefn111356
-Ref: -fixfn112058
-Ref: -prodfn113632
-Node: Development114783
-Node: Contribute115072
-Node: Contributors116084
-Node: FDL118177
-Node: GPL143497
-Node: Index181246
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/emacs/elpa/dash-20240405.946/dash-autoloads.el b/emacs/elpa/dash-20240510.1327/dash-autoloads.el
diff --git a/emacs/elpa/dash-20240510.1327/dash-pkg.el b/emacs/elpa/dash-20240510.1327/dash-pkg.el
@@ -0,0 +1,14 @@
+(define-package "dash" "20240510.1327" "A modern list library for Emacs"
+  '((emacs "24"))
+  :commit "1de9dcb83eacfb162b6d9a118a4770b1281bcd84" :authors
+  '(("Magnar Sveen" . "magnars@gmail.com"))
+  :maintainers
+  '(("Magnar Sveen" . "magnars@gmail.com"))
+  :maintainer
+  '("Magnar Sveen" . "magnars@gmail.com")
+  :keywords
+  '("extensions" "lisp")
+  :url "https://github.com/magnars/dash.el")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/dash-20240510.1327/dash.el b/emacs/elpa/dash-20240510.1327/dash.el
@@ -0,0 +1,4136 @@
+;;; dash.el --- A modern list library for Emacs  -*- lexical-binding: t -*-
+
+;; Copyright (C) 2012-2024 Free Software Foundation, Inc.
+
+;; Author: Magnar Sveen <magnars@gmail.com>
+;; Version: 2.19.1
+;; Package-Requires: ((emacs "24"))
+;; Keywords: extensions, lisp
+;; Homepage: https://github.com/magnars/dash.el
+
+;; 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:
+
+;; A modern list API for Emacs.
+;;
+;; See its overview at https://github.com/magnars/dash.el#functions.
+
+;;; Code:
+
+(eval-when-compile
+  ;; TODO: Emacs 24.3 first introduced `gv', so remove this and all
+  ;; calls to `defsetf' when support for earlier versions is dropped.
+  (unless (fboundp 'gv-define-setter)
+    (require 'cl))
+
+  ;; - 24.3 started complaining about unknown `declare' props.
+  ;; - 25 introduced `pure' and `side-effect-free'.
+  ;; - 30 introduced `important-return-value'.
+  (when (boundp 'defun-declarations-alist)
+    (dolist (prop '(important-return-value pure side-effect-free))
+      (unless (assq prop defun-declarations-alist)
+        (push (list prop #'ignore) defun-declarations-alist)))))
+
+(defgroup dash ()
+  "Customize group for Dash, a modern list library."
+  :group 'extensions
+  :group 'lisp
+  :prefix "dash-")
+
+(defmacro !cons (car cdr)
+  "Destructive: Set CDR to the cons of CAR and CDR."
+  (declare (debug (form symbolp)))
+  `(setq ,cdr (cons ,car ,cdr)))
+
+(defmacro !cdr (list)
+  "Destructive: Set LIST to the cdr of LIST."
+  (declare (debug (symbolp)))
+  `(setq ,list (cdr ,list)))
+
+(defmacro --each (list &rest body)
+  "Evaluate BODY for each element of LIST and return nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating BODY.
+This is the anaphoric counterpart to `-each'."
+  (declare (debug (form body)) (indent 1))
+  (let ((l (make-symbol "list"))
+        (i (make-symbol "i")))
+    `(let ((,l ,list)
+           (,i 0))
+       (while ,l
+         (let ((it (pop ,l)) (it-index ,i))
+           (ignore it it-index)
+           ,@body)
+         (setq ,i (1+ ,i))))))
+
+(defun -each (list fn)
+  "Call FN on each element of LIST.
+Return nil; this function is intended for side effects.
+
+Its anaphoric counterpart is `--each'.
+
+For access to the current element's index in LIST, see
+`-each-indexed'."
+  (declare (indent 1))
+  (ignore (mapc fn list)))
+
+(defalias '--each-indexed '--each)
+
+(defun -each-indexed (list fn)
+  "Call FN on each index and element of LIST.
+For each ITEM at INDEX in LIST, call (funcall FN INDEX ITEM).
+Return nil; this function is intended for side effects.
+
+See also: `-map-indexed'."
+  (declare (indent 1))
+  (--each list (funcall fn it-index it)))
+
+(defmacro --each-while (list pred &rest body)
+  "Evaluate BODY for each item in LIST, while PRED evaluates to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating PRED or BODY.  Once
+an element is reached for which PRED evaluates to nil, no further
+BODY is evaluated.  The return value is always nil.
+This is the anaphoric counterpart to `-each-while'."
+  (declare (debug (form form body)) (indent 2))
+  (let ((l (make-symbol "list"))
+        (i (make-symbol "i"))
+        (elt (make-symbol "elt")))
+    `(let ((,l ,list)
+           (,i 0)
+           ,elt)
+       (while (when ,l
+                (setq ,elt (car-safe ,l))
+                (let ((it ,elt) (it-index ,i))
+                  (ignore it it-index)
+                  ,pred))
+         (let ((it ,elt) (it-index ,i))
+           (ignore it it-index)
+           ,@body)
+         (setq ,i (1+ ,i) ,l (cdr ,l))))))
+
+(defun -each-while (list pred fn)
+  "Call FN on each ITEM in LIST, while (PRED ITEM) is non-nil.
+Once an ITEM is reached for which PRED returns nil, FN is no
+longer called.  Return nil; this function is intended for side
+effects.
+
+Its anaphoric counterpart is `--each-while'."
+  (declare (indent 2))
+  (--each-while list (funcall pred it) (funcall fn it)))
+
+(defmacro --each-r (list &rest body)
+  "Evaluate BODY for each element of LIST in reversed order.
+Each element of LIST in turn, starting at its end, is bound to
+`it' and its index within LIST to `it-index' before evaluating
+BODY.  The return value is always nil.
+This is the anaphoric counterpart to `-each-r'."
+  (declare (debug (form body)) (indent 1))
+  (let ((v (make-symbol "vector"))
+        (i (make-symbol "i")))
+    ;; Implementation note: building a vector is considerably faster
+    ;; than building a reversed list (vector takes less memory, so
+    ;; there is less GC), plus `length' comes naturally.  In-place
+    ;; `nreverse' would be faster still, but BODY would be able to see
+    ;; that, even if the modification was undone before we return.
+    `(let* ((,v (vconcat ,list))
+            (,i (length ,v))
+            it it-index)
+       (ignore it it-index)
+       (while (> ,i 0)
+         (setq ,i (1- ,i) it-index ,i it (aref ,v ,i))
+         ,@body))))
+
+(defun -each-r (list fn)
+  "Call FN on each element of LIST in reversed order.
+Return nil; this function is intended for side effects.
+
+Its anaphoric counterpart is `--each-r'."
+  (--each-r list (funcall fn it)))
+
+(defmacro --each-r-while (list pred &rest body)
+  "Eval BODY for each item in reversed LIST, while PRED evals to non-nil.
+Each element of LIST in turn, starting at its end, is bound to
+`it' and its index within LIST to `it-index' before evaluating
+PRED or BODY.  Once an element is reached for which PRED
+evaluates to nil, no further BODY is evaluated.  The return value
+is always nil.
+This is the anaphoric counterpart to `-each-r-while'."
+  (declare (debug (form form body)) (indent 2))
+  (let ((v (make-symbol "vector"))
+        (i (make-symbol "i"))
+        (elt (make-symbol "elt")))
+    `(let* ((,v (vconcat ,list))
+            (,i (length ,v))
+            ,elt it it-index)
+       (ignore it it-index)
+       (while (when (> ,i 0)
+                (setq ,i (1- ,i) it-index ,i)
+                (setq ,elt (aref ,v ,i) it ,elt)
+                ,pred)
+         (setq it-index ,i it ,elt)
+         ,@body))))
+
+(defun -each-r-while (list pred fn)
+  "Call FN on each ITEM in reversed LIST, while (PRED ITEM) is non-nil.
+Once an ITEM is reached for which PRED returns nil, FN is no
+longer called.  Return nil; this function is intended for side
+effects.
+
+Its anaphoric counterpart is `--each-r-while'."
+  (--each-r-while list (funcall pred it) (funcall fn it)))
+
+(defmacro --dotimes (num &rest body)
+  "Evaluate BODY NUM times, presumably for side effects.
+BODY is evaluated with the local variable `it' temporarily bound
+to successive integers running from 0, inclusive, to NUM,
+exclusive.  BODY is not evaluated if NUM is less than 1.
+This is the anaphoric counterpart to `-dotimes'."
+  (declare (debug (form body)) (indent 1))
+  (let ((n (make-symbol "num"))
+        (i (make-symbol "i")))
+    `(let ((,n ,num)
+           (,i 0)
+           it)
+       (ignore it)
+       (while (< ,i ,n)
+         (setq it ,i ,i (1+ ,i))
+         ,@body))))
+
+(defun -dotimes (num fn)
+  "Call FN NUM times, presumably for side effects.
+FN is called with a single argument on successive integers
+running from 0, inclusive, to NUM, exclusive.  FN is not called
+if NUM is less than 1.
+
+This function's anaphoric counterpart is `--dotimes'."
+  (declare (indent 1))
+  (--dotimes num (funcall fn it)))
+
+(defun -map (fn list)
+  "Apply FN to each item in LIST and return the list of results.
+
+This function's anaphoric counterpart is `--map'."
+  (declare (important-return-value t))
+  (mapcar fn list))
+
+(defmacro --map (form list)
+  "Eval FORM for each item in LIST and return the list of results.
+Each element of LIST in turn is bound to `it' before evaluating
+FORM.
+This is the anaphoric counterpart to `-map'."
+  (declare (debug (def-form form)))
+  `(mapcar (lambda (it) (ignore it) ,form) ,list))
+
+(defmacro --reduce-from (form init list)
+  "Accumulate a value by evaluating FORM across LIST.
+This macro is like `--each' (which see), but it additionally
+provides an accumulator variable `acc' which it successively
+binds to the result of evaluating FORM for the current LIST
+element before processing the next element.  For the first
+element, `acc' is initialized with the result of evaluating INIT.
+The return value is the resulting value of `acc'.  If LIST is
+empty, FORM is not evaluated, and the return value is the result
+of INIT.
+This is the anaphoric counterpart to `-reduce-from'."
+  (declare (debug (form form form)))
+  `(let ((acc ,init))
+     (--each ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-from (fn init list)
+  "Reduce the function FN across LIST, starting with INIT.
+Return the result of applying FN to INIT and the first element of
+LIST, then applying FN to that result and the second element,
+etc.  If LIST is empty, return INIT without calling FN.
+
+This function's anaphoric counterpart is `--reduce-from'.
+
+For other folds, see also `-reduce' and `-reduce-r'."
+  (declare (important-return-value t))
+  (--reduce-from (funcall fn acc it) init list))
+
+(defmacro --reduce (form list)
+  "Accumulate a value by evaluating FORM across LIST.
+This macro is like `--reduce-from' (which see), except the first
+element of LIST is taken as INIT.  Thus if LIST contains a single
+item, it is returned without evaluating FORM.  If LIST is empty,
+FORM is evaluated with `it' and `acc' bound to nil.
+This is the anaphoric counterpart to `-reduce'."
+  (declare (debug (form form)))
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv ,list))
+       (if ,lv
+           (--reduce-from ,form (car ,lv) (cdr ,lv))
+         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
+         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
+         (let ((acc nil) (it nil))
+           (ignore acc it)
+           ,form)))))
+
+(defun -reduce (fn list)
+  "Reduce the function FN across LIST.
+Return the result of applying FN to the first two elements of
+LIST, then applying FN to that result and the third element, etc.
+If LIST contains a single element, return it without calling FN.
+If LIST is empty, return the result of calling FN with no
+arguments.
+
+This function's anaphoric counterpart is `--reduce'.
+
+For other folds, see also `-reduce-from' and `-reduce-r'."
+  (declare (important-return-value t))
+  (if list
+      (-reduce-from fn (car list) (cdr list))
+    (funcall fn)))
+
+(defmacro --reduce-r-from (form init list)
+  "Accumulate a value by evaluating FORM across LIST in reverse.
+This macro is like `--reduce-from', except it starts from the end
+of LIST.
+This is the anaphoric counterpart to `-reduce-r-from'."
+  (declare (debug (form form form)))
+  `(let ((acc ,init))
+     (--each-r ,list (setq acc ,form))
+     acc))
+
+(defun -reduce-r-from (fn init list)
+  "Reduce the function FN across LIST in reverse, starting with INIT.
+Return the result of applying FN to the last element of LIST and
+INIT, then applying FN to the second-to-last element and the
+previous result of FN, etc.  That is, the first argument of FN is
+the current element, and its second argument the accumulated
+value.  If LIST is empty, return INIT without calling FN.
+
+This function is like `-reduce-from' but the operation associates
+from the right rather than left.  In other words, it starts from
+the end of LIST and flips the arguments to FN.  Conceptually, it
+is like replacing the conses in LIST with applications of FN, and
+its last link with INIT, and evaluating the resulting expression.
+
+This function's anaphoric counterpart is `--reduce-r-from'.
+
+For other folds, see also `-reduce-r' and `-reduce'."
+  (declare (important-return-value t))
+  (--reduce-r-from (funcall fn it acc) init list))
+
+(defmacro --reduce-r (form list)
+  "Accumulate a value by evaluating FORM across LIST in reverse order.
+This macro is like `--reduce', except it starts from the end of
+LIST.
+This is the anaphoric counterpart to `-reduce-r'."
+  (declare (debug (form form)))
+  `(--reduce ,form (reverse ,list)))
+
+(defun -reduce-r (fn list)
+  "Reduce the function FN across LIST in reverse.
+Return the result of applying FN to the last two elements of
+LIST, then applying FN to the third-to-last element and the
+previous result of FN, etc.  That is, the first argument of FN is
+the current element, and its second argument the accumulated
+value.  If LIST contains a single element, return it without
+calling FN.  If LIST is empty, return the result of calling FN
+with no arguments.
+
+This function is like `-reduce' but the operation associates from
+the right rather than left.  In other words, it starts from the
+end of LIST and flips the arguments to FN.  Conceptually, it is
+like replacing the conses in LIST with applications of FN,
+ignoring its last link, and evaluating the resulting expression.
+
+This function's anaphoric counterpart is `--reduce-r'.
+
+For other folds, see also `-reduce-r-from' and `-reduce'."
+  (declare (important-return-value t))
+  (if list
+      (--reduce-r (funcall fn it acc) list)
+    (funcall fn)))
+
+(defmacro --reductions-from (form init list)
+  "Return a list of FORM's intermediate reductions across LIST.
+That is, a list of the intermediate values of the accumulator
+when `--reduce-from' (which see) is called with the same
+arguments.
+This is the anaphoric counterpart to `-reductions-from'."
+  (declare (debug (form form form)))
+  `(nreverse
+    (--reduce-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
+                   (list ,init)
+                   ,list)))
+
+(defun -reductions-from (fn init list)
+  "Return a list of FN's intermediate reductions across LIST.
+That is, a list of the intermediate values of the accumulator
+when `-reduce-from' (which see) is called with the same
+arguments.
+
+This function's anaphoric counterpart is `--reductions-from'.
+
+For other folds, see also `-reductions' and `-reductions-r'."
+  (declare (important-return-value t))
+  (--reductions-from (funcall fn acc it) init list))
+
+(defmacro --reductions (form list)
+  "Return a list of FORM's intermediate reductions across LIST.
+That is, a list of the intermediate values of the accumulator
+when `--reduce' (which see) is called with the same arguments.
+This is the anaphoric counterpart to `-reductions'."
+  (declare (debug (form form)))
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv ,list))
+       (if ,lv
+           (--reductions-from ,form (car ,lv) (cdr ,lv))
+         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
+         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
+         (let ((acc nil) (it nil))
+           (ignore acc it)
+           (list ,form))))))
+
+(defun -reductions (fn list)
+  "Return a list of FN's intermediate reductions across LIST.
+That is, a list of the intermediate values of the accumulator
+when `-reduce' (which see) is called with the same arguments.
+
+This function's anaphoric counterpart is `--reductions'.
+
+For other folds, see also `-reductions' and `-reductions-r'."
+  (declare (important-return-value t))
+  (if list
+      (--reductions-from (funcall fn acc it) (car list) (cdr list))
+    (list (funcall fn))))
+
+(defmacro --reductions-r-from (form init list)
+  "Return a list of FORM's intermediate reductions across reversed LIST.
+That is, a list of the intermediate values of the accumulator
+when `--reduce-r-from' (which see) is called with the same
+arguments.
+This is the anaphoric counterpart to `-reductions-r-from'."
+  (declare (debug (form form form)))
+  `(--reduce-r-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
+                    (list ,init)
+                    ,list))
+
+(defun -reductions-r-from (fn init list)
+  "Return a list of FN's intermediate reductions across reversed LIST.
+That is, a list of the intermediate values of the accumulator
+when `-reduce-r-from' (which see) is called with the same
+arguments.
+
+This function's anaphoric counterpart is `--reductions-r-from'.
+
+For other folds, see also `-reductions' and `-reductions-r'."
+  (declare (important-return-value t))
+  (--reductions-r-from (funcall fn it acc) init list))
+
+(defmacro --reductions-r (form list)
+  "Return a list of FORM's intermediate reductions across reversed LIST.
+That is, a list of the intermediate values of the accumulator
+when `--reduce-re' (which see) is called with the same arguments.
+This is the anaphoric counterpart to `-reductions-r'."
+  (declare (debug (form list)))
+  (let ((lv (make-symbol "list-value")))
+    `(let ((,lv (reverse ,list)))
+       (if ,lv
+           (--reduce-from (cons (let ((acc (car acc))) (ignore acc) ,form) acc)
+                          (list (car ,lv))
+                          (cdr ,lv))
+         ;; Explicit nil binding pacifies lexical "variable left uninitialized"
+         ;; warning.  See issue #377 and upstream https://bugs.gnu.org/47080.
+         (let ((acc nil) (it nil))
+           (ignore acc it)
+           (list ,form))))))
+
+(defun -reductions-r (fn list)
+  "Return a list of FN's intermediate reductions across reversed LIST.
+That is, a list of the intermediate values of the accumulator
+when `-reduce-r' (which see) is called with the same arguments.
+
+This function's anaphoric counterpart is `--reductions-r'.
+
+For other folds, see also `-reductions-r-from' and
+`-reductions'."
+  (declare (important-return-value t))
+  (if list
+      (--reductions-r (funcall fn it acc) list)
+    (list (funcall fn))))
+
+(defmacro --filter (form list)
+  "Return a new list of the items in LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-filter'.
+For the opposite operation, see also `--remove'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (when ,form (push it ,r)))
+       (nreverse ,r))))
+
+(defun -filter (pred list)
+  "Return a new list of the items in LIST for which PRED returns non-nil.
+
+Alias: `-select'.
+
+This function's anaphoric counterpart is `--filter'.
+
+For similar operations, see also `-keep' and `-remove'."
+  (declare (important-return-value t))
+  (--filter (funcall pred it) list))
+
+(defalias '-select '-filter)
+(defalias '--select '--filter)
+
+(defmacro --remove (form list)
+  "Return a new list of the items in LIST for which FORM evals to nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-remove'.
+For the opposite operation, see also `--filter'."
+  (declare (debug (form form)))
+  `(--filter (not ,form) ,list))
+
+(defun -remove (pred list)
+  "Return a new list of the items in LIST for which PRED returns nil.
+
+Alias: `-reject'.
+
+This function's anaphoric counterpart is `--remove'.
+
+For similar operations, see also `-keep' and `-filter'."
+  (declare (important-return-value t))
+  (--remove (funcall pred it) list))
+
+(defalias '-reject '-remove)
+(defalias '--reject '--remove)
+
+(defmacro --remove-first (form list)
+  "Remove the first item from LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.  This is a
+non-destructive operation, but only the front of LIST leading up
+to the removed item is a copy; the rest is LIST's original tail.
+If no item is removed, then the result is a complete copy.
+This is the anaphoric counterpart to `-remove-first'."
+  (declare (debug (form form)))
+  (let ((front (make-symbol "front"))
+        (tail (make-symbol "tail")))
+    `(let ((,tail ,list) ,front)
+       (--each-while ,tail (not ,form)
+         (push (pop ,tail) ,front))
+       (if ,tail
+           (nconc (nreverse ,front) (cdr ,tail))
+         (nreverse ,front)))))
+
+(defun -remove-first (pred list)
+  "Remove the first item from LIST for which PRED returns non-nil.
+This is a non-destructive operation, but only the front of LIST
+leading up to the removed item is a copy; the rest is LIST's
+original tail.  If no item is removed, then the result is a
+complete copy.
+
+Alias: `-reject-first'.
+
+This function's anaphoric counterpart is `--remove-first'.
+
+See also `-map-first', `-remove-item', and `-remove-last'."
+  (declare (important-return-value t))
+  (--remove-first (funcall pred it) list))
+
+;; TODO: #'-quoting the macro upsets Emacs 24.
+(defalias '-reject-first #'-remove-first)
+(defalias '--reject-first '--remove-first)
+
+(defmacro --remove-last (form list)
+  "Remove the last item from LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' before evaluating
+FORM.  The result is a copy of LIST regardless of whether an
+element is removed.
+This is the anaphoric counterpart to `-remove-last'."
+  (declare (debug (form form)))
+  `(nreverse (--remove-first ,form (reverse ,list))))
+
+(defun -remove-last (pred list)
+  "Remove the last item from LIST for which PRED returns non-nil.
+The result is a copy of LIST regardless of whether an element is
+removed.
+
+Alias: `-reject-last'.
+
+This function's anaphoric counterpart is `--remove-last'.
+
+See also `-map-last', `-remove-item', and `-remove-first'."
+  (declare (important-return-value t))
+  (--remove-last (funcall pred it) list))
+
+(defalias '-reject-last '-remove-last)
+(defalias '--reject-last '--remove-last)
+
+(defalias '-remove-item #'remove
+  "Return a copy of LIST with all occurrences of ITEM removed.
+The comparison is done with `equal'.
+\n(fn ITEM LIST)")
+
+(defmacro --keep (form list)
+  "Eval FORM for each item in LIST and return the non-nil results.
+Like `--filter', but returns the non-nil results of FORM instead
+of the corresponding elements of LIST.  Each element of LIST in
+turn is bound to `it' and its index within LIST to `it-index'
+before evaluating FORM.
+This is the anaphoric counterpart to `-keep'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (m (make-symbol "mapped")))
+    `(let (,r)
+       (--each ,list (let ((,m ,form)) (when ,m (push ,m ,r))))
+       (nreverse ,r))))
+
+(defun -keep (fn list)
+  "Return a new list of the non-nil results of applying FN to each item in LIST.
+Like `-filter', but returns the non-nil results of FN instead of
+the corresponding elements of LIST.
+
+Its anaphoric counterpart is `--keep'."
+  (declare (important-return-value t))
+  (--keep (funcall fn it) list))
+
+(defun -non-nil (list)
+  "Return a copy of LIST with all nil items removed."
+  (declare (side-effect-free t))
+  (--filter it list))
+
+(defmacro --map-indexed (form list)
+  "Eval FORM for each item in LIST and return the list of results.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.  This is like
+`--map', but additionally makes `it-index' available to FORM.
+
+This is the anaphoric counterpart to `-map-indexed'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (push ,form ,r))
+       (nreverse ,r))))
+
+(defun -map-indexed (fn list)
+  "Apply FN to each index and item in LIST and return the list of results.
+This is like `-map', but FN takes two arguments: the index of the
+current element within LIST, and the element itself.
+
+This function's anaphoric counterpart is `--map-indexed'.
+
+For a side-effecting variant, see also `-each-indexed'."
+  (declare (important-return-value t))
+  (--map-indexed (funcall fn it-index it) list))
+
+(defmacro --map-when (pred rep list)
+  "Anaphoric form of `-map-when'."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list (!cons (if ,pred ,rep it) ,r))
+       (nreverse ,r))))
+
+(defun -map-when (pred rep list)
+  "Use PRED to conditionally apply REP to each item in LIST.
+Return a copy of LIST where the items for which PRED returns nil
+are unchanged, and the rest are mapped through the REP function.
+
+Alias: `-replace-where'
+
+See also: `-update-at'"
+  (declare (important-return-value t))
+  (--map-when (funcall pred it) (funcall rep it) list))
+
+(defalias '-replace-where '-map-when)
+(defalias '--replace-where '--map-when)
+
+(defun -map-first (pred rep list)
+  "Use PRED to determine the first item in LIST to call REP on.
+Return a copy of LIST where the first item for which PRED returns
+non-nil is replaced with the result of calling REP on that item.
+
+See also: `-map-when', `-replace-first'"
+  (declare (important-return-value t))
+  (let (front)
+    (while (and list (not (funcall pred (car list))))
+      (push (car list) front)
+      (!cdr list))
+    (if list
+        (-concat (nreverse front) (cons (funcall rep (car list)) (cdr list)))
+      (nreverse front))))
+
+(defmacro --map-first (pred rep list)
+  "Anaphoric form of `-map-first'."
+  (declare (debug (def-form def-form form)))
+  `(-map-first (lambda (it) (ignore it) ,pred)
+               (lambda (it) (ignore it) ,rep)
+               ,list))
+
+(defun -map-last (pred rep list)
+  "Use PRED to determine the last item in LIST to call REP on.
+Return a copy of LIST where the last item for which PRED returns
+non-nil is replaced with the result of calling REP on that item.
+
+See also: `-map-when', `-replace-last'"
+  (declare (important-return-value t))
+  (nreverse (-map-first pred rep (reverse list))))
+
+(defmacro --map-last (pred rep list)
+  "Anaphoric form of `-map-last'."
+  (declare (debug (def-form def-form form)))
+  `(-map-last (lambda (it) (ignore it) ,pred)
+              (lambda (it) (ignore it) ,rep)
+              ,list))
+
+(defun -replace (old new list)
+  "Replace all OLD items in LIST with NEW.
+
+Elements are compared using `equal'.
+
+See also: `-replace-at'"
+  (declare (pure t) (side-effect-free t))
+  (--map-when (equal it old) new list))
+
+(defun -replace-first (old new list)
+  "Replace the first occurrence of OLD with NEW in LIST.
+
+Elements are compared using `equal'.
+
+See also: `-map-first'"
+  (declare (pure t) (side-effect-free t))
+  (--map-first (equal old it) new list))
+
+(defun -replace-last (old new list)
+  "Replace the last occurrence of OLD with NEW in LIST.
+
+Elements are compared using `equal'.
+
+See also: `-map-last'"
+  (declare (pure t) (side-effect-free t))
+  (--map-last (equal old it) new list))
+
+(defmacro --mapcat (form list)
+  "Anaphoric form of `-mapcat'."
+  (declare (debug (form form)))
+  `(apply #'append (--map ,form ,list)))
+
+(defun -mapcat (fn list)
+  "Return the concatenation of the result of mapping FN over LIST.
+Thus function FN should return a list."
+  (declare (important-return-value t))
+  (--mapcat (funcall fn it) list))
+
+(defmacro --iterate (form init n)
+  "Anaphoric version of `-iterate'."
+  (declare (debug (form form form)))
+  (let ((res (make-symbol "result"))
+        (len (make-symbol "n")))
+    `(let ((,len ,n))
+       (when (> ,len 0)
+         (let* ((it ,init)
+                (,res (list it)))
+           (dotimes (_ (1- ,len))
+             (push (setq it ,form) ,res))
+           (nreverse ,res))))))
+
+(defun -iterate (fun init n)
+  "Return a list of iterated applications of FUN to INIT.
+
+This means a list of the form:
+
+  (INIT (FUN INIT) (FUN (FUN INIT)) ...)
+
+N is the length of the returned list."
+  (declare (important-return-value t))
+  (--iterate (funcall fun it) init n))
+
+(defun -flatten (l)
+  "Take a nested list L and return its contents as a single, flat list.
+
+Note that because nil represents a list of zero elements (an
+empty list), any mention of nil in L will disappear after
+flattening.  If you need to preserve nils, consider `-flatten-n'
+or map them to some unique symbol and then map them back.
+
+Conses of two atoms are considered \"terminals\", that is, they
+aren't flattened further.
+
+See also: `-flatten-n'"
+  (declare (pure t) (side-effect-free t))
+  (if (and (listp l) (listp (cdr l)))
+      (-mapcat '-flatten l)
+    (list l)))
+
+(defun -flatten-n (num list)
+  "Flatten NUM levels of a nested LIST.
+
+See also: `-flatten'"
+  (declare (pure t) (side-effect-free t))
+  (dotimes (_ num)
+    (setq list (apply #'append (mapcar #'-list list))))
+  list)
+
+(defalias '-concat #'append
+  "Concatenate all the arguments and make the result a list.
+The result is a list whose elements are the elements of all the arguments.
+Each argument may be a list, vector or string.
+
+All arguments except the last argument are copied.  The last argument
+is just used as the tail of the new list.
+
+\(fn &rest SEQUENCES)")
+
+(defalias '-copy #'copy-sequence
+  "Create a shallow copy of LIST.
+
+\(fn LIST)")
+
+(defmacro --splice (pred form list)
+  "Splice lists generated by FORM in place of items satisfying PRED in LIST.
+
+Evaluate PRED for each element of LIST in turn bound to `it'.
+Whenever the result of PRED is nil, leave that `it' is-is.
+Otherwise, evaluate FORM with the same `it' binding still in
+place.  The result should be a (possibly empty) list of items to
+splice in place of `it' in LIST.
+
+This can be useful as an alternative to the `,@' construct in a
+`\\=`' structure, in case you need to splice several lists at
+marked positions (for example with keywords).
+
+This is the anaphoric counterpart to `-splice'."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each ,list
+         (if ,pred
+             (--each ,form (push it ,r))
+           (push it ,r)))
+       (nreverse ,r))))
+
+(defun -splice (pred fun list)
+  "Splice lists generated by FUN in place of items satisfying PRED in LIST.
+
+Call PRED on each element of LIST.  Whenever the result of PRED
+is nil, leave that `it' as-is.  Otherwise, call FUN on the same
+`it' that satisfied PRED.  The result should be a (possibly
+empty) list of items to splice in place of `it' in LIST.
+
+This can be useful as an alternative to the `,@' construct in a
+`\\=`' structure, in case you need to splice several lists at
+marked positions (for example with keywords).
+
+This function's anaphoric counterpart is `--splice'.
+
+See also: `-splice-list', `-insert-at'."
+  (declare (important-return-value t))
+  (--splice (funcall pred it) (funcall fun it) list))
+
+(defun -splice-list (pred new-list list)
+  "Splice NEW-LIST in place of elements matching PRED in LIST.
+
+See also: `-splice', `-insert-at'"
+  (declare (important-return-value t))
+  (-splice pred (lambda (_) new-list) list))
+
+(defmacro --splice-list (pred new-list list)
+  "Anaphoric form of `-splice-list'."
+  (declare (debug (def-form form form)))
+  `(-splice-list (lambda (it) (ignore it) ,pred) ,new-list ,list))
+
+(defun -cons* (&rest args)
+  "Make a new list from the elements of ARGS.
+The last 2 elements of ARGS are used as the final cons of the
+result, so if the final element of ARGS is not a list, the result
+is a dotted list.  With no ARGS, return nil."
+  (declare (side-effect-free t))
+  (let* ((len (length args))
+         (tail (nthcdr (- len 2) args))
+         (last (cdr tail)))
+    (if (null last)
+        (car args)
+      (setcdr tail (car last))
+      args)))
+
+(defun -snoc (list elem &rest elements)
+  "Append ELEM to the end of the list.
+
+This is like `cons', but operates on the end of list.
+
+If any ELEMENTS are given, append them to the list as well."
+  (declare (side-effect-free t))
+  (-concat list (list elem) elements))
+
+(defmacro --first (form list)
+  "Return the first item in LIST for which FORM evals to non-nil.
+Return nil if no such element is found.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-first'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (or (not ,form)
+                               (ignore (setq ,n it))))
+       ,n)))
+
+(defun -first (pred list)
+  "Return the first item in LIST for which PRED returns non-nil.
+Return nil if no such element is found.
+
+To get the first item in the list no questions asked,
+use `-first-item'.
+
+Alias: `-find'.
+
+This function's anaphoric counterpart is `--first'."
+  (declare (important-return-value t))
+  (--first (funcall pred it) list))
+
+(defalias '-find #'-first)
+(defalias '--find '--first)
+
+(defmacro --some (form list)
+  "Return non-nil if FORM evals to non-nil for at least one item in LIST.
+If so, return the first such result of FORM.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-some'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each-while ,list (not (setq ,n ,form)))
+       ,n)))
+
+(defun -some (pred list)
+  "Return (PRED x) for the first LIST item where (PRED x) is non-nil, else nil.
+
+Alias: `-any'.
+
+This function's anaphoric counterpart is `--some'."
+  (declare (important-return-value t))
+  (--some (funcall pred it) list))
+
+(defalias '-any '-some)
+(defalias '--any '--some)
+
+(defmacro --every (form list)
+  "Return non-nil if FORM evals to non-nil for all items in LIST.
+If so, return the last such result of FORM.  Otherwise, once an
+item is reached for which FORM yields nil, return nil without
+evaluating FORM for any further LIST elements.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+
+This macro is like `--every-p', but on success returns the last
+non-nil result of FORM instead of just t.
+
+This is the anaphoric counterpart to `-every'."
+  (declare (debug (form form)))
+  (let ((a (make-symbol "all")))
+    `(let ((,a t))
+       (--each-while ,list (setq ,a ,form))
+       ,a)))
+
+(defun -every (pred list)
+  "Return non-nil if PRED returns non-nil for all items in LIST.
+If so, return the last such result of PRED.  Otherwise, once an
+item is reached for which PRED returns nil, return nil without
+calling PRED on any further LIST elements.
+
+This function is like `-every-p', but on success returns the last
+non-nil result of PRED instead of just t.
+
+This function's anaphoric counterpart is `--every'."
+  (declare (important-return-value t))
+  (--every (funcall pred it) list))
+
+(defmacro --last (form list)
+  "Anaphoric form of `-last'."
+  (declare (debug (form form)))
+  (let ((n (make-symbol "needle")))
+    `(let (,n)
+       (--each ,list
+         (when ,form (setq ,n it)))
+       ,n)))
+
+(defun -last (pred list)
+  "Return the last x in LIST where (PRED x) is non-nil, else nil."
+  (declare (important-return-value t))
+  (--last (funcall pred it) list))
+
+(defalias '-first-item #'car
+  "Return the first item of LIST, or nil on an empty list.
+
+See also: `-second-item', `-last-item', etc.
+
+\(fn LIST)")
+
+;; Ensure that calls to `-first-item' are compiled to a single opcode,
+;; just like `car'.
+(put '-first-item 'byte-opcode 'byte-car)
+(put '-first-item 'byte-compile 'byte-compile-one-arg)
+(put '-first-item 'pure t)
+(put '-first-item 'side-effect-free t)
+
+(defalias '-second-item #'cadr
+  "Return the second item of LIST, or nil if LIST is too short.
+
+See also: `-first-item', `-third-item', etc.
+
+\(fn LIST)")
+
+(put '-second-item 'pure t)
+(put '-second-item 'side-effect-free t)
+
+(defalias '-third-item
+  (if (fboundp 'caddr)
+      #'caddr
+    (lambda (list) (car (cddr list))))
+  "Return the third item of LIST, or nil if LIST is too short.
+
+See also: `-second-item', `-fourth-item', etc.
+
+\(fn LIST)")
+
+(put '-third-item 'pure t)
+(put '-third-item 'side-effect-free t)
+
+(defalias '-fourth-item
+  (if (fboundp 'cadddr)
+      #'cadddr
+    (lambda (list) (cadr (cddr list))))
+  "Return the fourth item of LIST, or nil if LIST is too short.
+
+See also: `-third-item', `-fifth-item', etc.
+
+\(fn LIST)")
+
+(put '-fourth-item 'pure t)
+(put '-fourth-item 'side-effect-free t)
+
+(defun -fifth-item (list)
+  "Return the fifth item of LIST, or nil if LIST is too short.
+
+See also: `-fourth-item', `-last-item', etc."
+  (declare (pure t) (side-effect-free t))
+  (car (cddr (cddr list))))
+
+(defun -last-item (list)
+  "Return the last item of LIST, or nil on an empty list.
+
+See also: `-first-item', etc."
+  (declare (pure t) (side-effect-free t))
+  (car (last list)))
+
+;; Use `with-no-warnings' to suppress unbound `-last-item' or
+;; undefined `gv--defsetter' warnings arising from both
+;; `gv-define-setter' and `defsetf' in certain Emacs versions.
+(with-no-warnings
+  (if (fboundp 'gv-define-setter)
+      (gv-define-setter -last-item (val x) `(setcar (last ,x) ,val))
+    (defsetf -last-item (x) (val) `(setcar (last ,x) ,val))))
+
+(defun -butlast (list)
+  "Return a list of all items in list except for the last."
+  ;; no alias as we don't want magic optional argument
+  (declare (pure t) (side-effect-free t))
+  (butlast list))
+
+(defmacro --count (pred list)
+  "Anaphoric form of `-count'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let ((,r 0))
+       (--each ,list (when ,pred (setq ,r (1+ ,r))))
+       ,r)))
+
+(defun -count (pred list)
+  "Counts the number of items in LIST where (PRED item) is non-nil."
+  (declare (important-return-value t))
+  (--count (funcall pred it) list))
+
+(defun ---truthy? (obj)
+  "Return OBJ as a boolean value (t or nil)."
+  (declare (pure t) (side-effect-free error-free))
+  (and obj t))
+
+(defmacro --any? (form list)
+  "Anaphoric form of `-any?'."
+  (declare (debug (form form)))
+  `(and (--some ,form ,list) t))
+
+(defun -any? (pred list)
+  "Return t if (PRED X) is non-nil for any X in LIST, else nil.
+
+Alias: `-any-p', `-some?', `-some-p'"
+  (declare (important-return-value t))
+  (--any? (funcall pred it) list))
+
+(defalias '-some? '-any?)
+(defalias '--some? '--any?)
+(defalias '-any-p '-any?)
+(defalias '--any-p '--any?)
+(defalias '-some-p '-any?)
+(defalias '--some-p '--any?)
+
+(defmacro --all? (form list)
+  "Return t if FORM evals to non-nil for all items in LIST.
+Otherwise, once an item is reached for which FORM yields nil,
+return nil without evaluating FORM for any further LIST elements.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+
+The similar macro `--every' is more widely useful, since it
+returns the last non-nil result of FORM instead of just t on
+success.
+
+Alias: `--all-p', `--every-p', `--every?'.
+
+This is the anaphoric counterpart to `-all?'."
+  (declare (debug (form form)))
+  `(and (--every ,form ,list) t))
+
+(defun -all? (pred list)
+  "Return t if (PRED X) is non-nil for all X in LIST, else nil.
+In the latter case, stop after the first X for which (PRED X) is
+nil, without calling PRED on any subsequent elements of LIST.
+
+The similar function `-every' is more widely useful, since it
+returns the last non-nil result of PRED instead of just t on
+success.
+
+Alias: `-all-p', `-every-p', `-every?'.
+
+This function's anaphoric counterpart is `--all?'."
+  (declare (important-return-value t))
+  (--all? (funcall pred it) list))
+
+(defalias '-every? '-all?)
+(defalias '--every? '--all?)
+(defalias '-all-p '-all?)
+(defalias '--all-p '--all?)
+(defalias '-every-p '-all?)
+(defalias '--every-p '--all?)
+
+(defmacro --none? (form list)
+  "Anaphoric form of `-none?'."
+  (declare (debug (form form)))
+  `(--all? (not ,form) ,list))
+
+(defun -none? (pred list)
+  "Return t if (PRED X) is nil for all X in LIST, else nil.
+
+Alias: `-none-p'"
+  (declare (important-return-value t))
+  (--none? (funcall pred it) list))
+
+(defalias '-none-p '-none?)
+(defalias '--none-p '--none?)
+
+(defmacro --only-some? (form list)
+  "Anaphoric form of `-only-some?'."
+  (declare (debug (form form)))
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each-while ,list (not (and ,y ,n))
+         (if ,form (setq ,y t) (setq ,n t)))
+       (---truthy? (and ,y ,n)))))
+
+(defun -only-some? (pred list)
+  "Return t if different LIST items both satisfy and do not satisfy PRED.
+That is, if PRED returns both nil for at least one item, and
+non-nil for at least one other item in LIST.  Return nil if all
+items satisfy the predicate or none of them do.
+
+Alias: `-only-some-p'"
+  (declare (important-return-value t))
+  (--only-some? (funcall pred it) list))
+
+(defalias '-only-some-p '-only-some?)
+(defalias '--only-some-p '--only-some?)
+
+(defun -slice (list from &optional to step)
+  "Return copy of LIST, starting from index FROM to index TO.
+
+FROM or TO may be negative.  These values are then interpreted
+modulo the length of the list.
+
+If STEP is a number, only each STEPth item in the resulting
+section is returned.  Defaults to 1."
+  (declare (side-effect-free t))
+  (let ((length (length list))
+        (new-list nil))
+    ;; to defaults to the end of the list
+    (setq to (or to length))
+    (setq step (or step 1))
+    ;; handle negative indices
+    (when (< from 0)
+      (setq from (mod from length)))
+    (when (< to 0)
+      (setq to (mod to length)))
+
+    ;; iterate through the list, keeping the elements we want
+    (--each-while list (< it-index to)
+      (when (and (>= it-index from)
+                 (= (mod (- from it-index) step) 0))
+        (push it new-list)))
+    (nreverse new-list)))
+
+(defmacro --take-while (form list)
+  "Take successive items from LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.  Return a new
+list of the successive elements from the start of LIST for which
+FORM evaluates to non-nil.
+This is the anaphoric counterpart to `-take-while'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result")))
+    `(let (,r)
+       (--each-while ,list ,form (push it ,r))
+       (nreverse ,r))))
+
+(defun -take-while (pred list)
+  "Take successive items from LIST for which PRED returns non-nil.
+PRED is a function of one argument.  Return a new list of the
+successive elements from the start of LIST for which PRED returns
+non-nil.
+
+This function's anaphoric counterpart is `--take-while'.
+
+For another variant, see also `-drop-while'."
+  (declare (important-return-value t))
+  (--take-while (funcall pred it) list))
+
+(defmacro --drop-while (form list)
+  "Drop successive items from LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.  Return the
+tail (not a copy) of LIST starting from its first element for
+which FORM evaluates to nil.
+This is the anaphoric counterpart to `-drop-while'."
+  (declare (debug (form form)))
+  (let ((l (make-symbol "list")))
+    `(let ((,l ,list))
+       (--each-while ,l ,form (pop ,l))
+       ,l)))
+
+(defun -drop-while (pred list)
+  "Drop successive items from LIST for which PRED returns non-nil.
+PRED is a function of one argument.  Return the tail (not a copy)
+of LIST starting from its first element for which PRED returns
+nil.
+
+This function's anaphoric counterpart is `--drop-while'.
+
+For another variant, see also `-take-while'."
+  (declare (important-return-value t))
+  (--drop-while (funcall pred it) list))
+
+(defun -take (n list)
+  "Return a copy of the first N items in LIST.
+Return a copy of LIST if it contains N items or fewer.
+Return nil if N is zero or less.
+
+See also: `-take-last'."
+  (declare (side-effect-free t))
+  (--take-while (< it-index n) list))
+
+(defun -take-last (n list)
+  "Return a copy of the last N items of LIST in order.
+Return a copy of LIST if it contains N items or fewer.
+Return nil if N is zero or less.
+
+See also: `-take'."
+  (declare (side-effect-free t))
+  (copy-sequence (last list n)))
+
+(defalias '-drop #'nthcdr
+  "Return the tail (not a copy) of LIST without the first N items.
+Return nil if LIST contains N items or fewer.
+Return LIST if N is zero or less.
+
+For another variant, see also `-drop-last'.
+\n(fn N LIST)")
+
+(defun -drop-last (n list)
+  "Return a copy of LIST without its last N items.
+Return a copy of LIST if N is zero or less.
+Return nil if LIST contains N items or fewer.
+
+See also: `-drop'."
+  (declare (side-effect-free t))
+  (nbutlast (copy-sequence list) n))
+
+(defun -split-at (n list)
+  "Split LIST into two sublists after the Nth element.
+The result is a list of two elements (TAKE DROP) where TAKE is a
+new list of the first N elements of LIST, and DROP is the
+remaining elements of LIST (not a copy).  TAKE and DROP are like
+the results of `-take' and `-drop', respectively, but the split
+is done in a single list traversal."
+  (declare (side-effect-free t))
+  (let (result)
+    (--each-while list (< it-index n)
+      (push (pop list) result))
+    (list (nreverse result) list)))
+
+(defun -rotate (n list)
+  "Rotate LIST N places to the right (left if N is negative).
+The time complexity is O(n)."
+  (declare (pure t) (side-effect-free t))
+  (cond ((null list) ())
+        ((zerop n) (copy-sequence list))
+        ((let* ((len (length list))
+                (n-mod-len (mod n len))
+                (new-tail-len (- len n-mod-len)))
+           (append (nthcdr new-tail-len list) (-take new-tail-len list))))))
+
+(defun -insert-at (n x list)
+  "Return a list with X inserted into LIST at position N.
+
+See also: `-splice', `-splice-list'"
+  (declare (pure t) (side-effect-free t))
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cadr split-list)))))
+
+(defun -replace-at (n x list)
+  "Return a list with element at Nth position in LIST replaced with X.
+
+See also: `-replace'"
+  (declare (pure t) (side-effect-free t))
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list) (cons x (cdr (cadr split-list))))))
+
+(defun -update-at (n func list)
+  "Use FUNC to update the Nth element of LIST.
+Return a copy of LIST where the Nth element is replaced with the
+result of calling FUNC on it.
+
+See also: `-map-when'"
+  (declare (important-return-value t))
+  (let ((split-list (-split-at n list)))
+    (nconc (car split-list)
+           (cons (funcall func (car (cadr split-list)))
+                 (cdr (cadr split-list))))))
+
+(defmacro --update-at (n form list)
+  "Anaphoric version of `-update-at'."
+  (declare (debug (form def-form form)))
+  `(-update-at ,n (lambda (it) (ignore it) ,form) ,list))
+
+(defun -remove-at (n list)
+  "Return LIST with its element at index N removed.
+That is, remove any element selected as (nth N LIST) from LIST
+and return the result.
+
+This is a non-destructive operation: parts of LIST (but not
+necessarily all of it) are copied as needed to avoid
+destructively modifying it.
+
+See also: `-remove-at-indices', `-remove'."
+  (declare (pure t) (side-effect-free t))
+  (if (zerop n)
+      (cdr list)
+    (--remove-first (= it-index n) list)))
+
+(defun -remove-at-indices (indices list)
+  "Return LIST with its elements at INDICES removed.
+That is, for each index I in INDICES, remove any element selected
+as (nth I LIST) from LIST.
+
+This is a non-destructive operation: parts of LIST (but not
+necessarily all of it) are copied as needed to avoid
+destructively modifying it.
+
+See also: `-remove-at', `-remove'."
+  (declare (pure t) (side-effect-free t))
+  (setq indices (--drop-while (< it 0) (-sort #'< indices)))
+  (let ((i (pop indices)) res)
+    (--each-while list i
+      (pop list)
+      (if (/= it-index i)
+          (push it res)
+        (while (and indices (= (car indices) i))
+          (pop indices))
+        (setq i (pop indices))))
+    (nconc (nreverse res) list)))
+
+(defmacro --split-with (pred list)
+  "Anaphoric form of `-split-with'."
+  (declare (debug (form form)))
+  (let ((l (make-symbol "list"))
+        (r (make-symbol "result"))
+        (c (make-symbol "continue")))
+    `(let ((,l ,list)
+           (,r nil)
+           (,c t))
+       (while (and ,l ,c)
+         (let ((it (car ,l)))
+           (if (not ,pred)
+               (setq ,c nil)
+             (!cons it ,r)
+             (!cdr ,l))))
+       (list (nreverse ,r) ,l))))
+
+(defun -split-with (pred list)
+  "Split LIST into a prefix satisfying PRED, and the rest.
+The first sublist is the prefix of LIST with successive elements
+satisfying PRED, and the second sublist is the remaining elements
+that do not.  The result is like performing
+
+  ((-take-while PRED LIST) (-drop-while PRED LIST))
+
+but in no more than a single pass through LIST."
+  (declare (important-return-value t))
+  (--split-with (funcall pred it) list))
+
+(defmacro -split-on (item list)
+  "Split the LIST each time ITEM is found.
+
+Unlike `-partition-by', the ITEM is discarded from the results.
+Empty lists are also removed from the result.
+
+Comparison is done by `equal'.
+
+See also `-split-when'"
+  (declare (debug (def-form form)))
+  `(-split-when (lambda (it) (equal it ,item)) ,list))
+
+(defmacro --split-when (form list)
+  "Anaphoric version of `-split-when'."
+  (declare (debug (def-form form)))
+  `(-split-when (lambda (it) (ignore it) ,form) ,list))
+
+(defun -split-when (fn list)
+  "Split the LIST on each element where FN returns non-nil.
+
+Unlike `-partition-by', the \"matched\" element is discarded from
+the results.  Empty lists are also removed from the result.
+
+This function can be thought of as a generalization of
+`split-string'."
+  (declare (important-return-value t))
+  (let (r s)
+    (while list
+      (if (not (funcall fn (car list)))
+          (push (car list) s)
+        (when s (push (nreverse s) r))
+        (setq s nil))
+      (!cdr list))
+    (when s (push (nreverse s) r))
+    (nreverse r)))
+
+(defmacro --separate (form list)
+  "Anaphoric form of `-separate'."
+  (declare (debug (form form)))
+  (let ((y (make-symbol "yes"))
+        (n (make-symbol "no")))
+    `(let (,y ,n)
+       (--each ,list (if ,form (!cons it ,y) (!cons it ,n)))
+       (list (nreverse ,y) (nreverse ,n)))))
+
+(defun -separate (pred list)
+  "Split LIST into two sublists based on whether items satisfy PRED.
+The result is like performing
+
+  ((-filter PRED LIST) (-remove PRED LIST))
+
+but in a single pass through LIST."
+  (declare (important-return-value t))
+  (--separate (funcall pred it) list))
+
+(defun dash--partition-all-in-steps-reversed (n step list)
+  "Like `-partition-all-in-steps', but the result is reversed."
+  (when (< step 1)
+    (signal 'wrong-type-argument
+            `("Step size < 1 results in juicy infinite loops" ,step)))
+  (let (result)
+    (while list
+      (push (-take n list) result)
+      (setq list (nthcdr step list)))
+    result))
+
+(defun -partition-all-in-steps (n step list)
+  "Partition LIST into sublists of length N that are STEP items apart.
+Adjacent groups may overlap if N exceeds the STEP stride.
+Trailing groups may contain less than N items."
+  (declare (pure t) (side-effect-free t))
+  (nreverse (dash--partition-all-in-steps-reversed n step list)))
+
+(defun -partition-in-steps (n step list)
+  "Partition LIST into sublists of length N that are STEP items apart.
+Like `-partition-all-in-steps', but if there are not enough items
+to make the last group N-sized, those items are discarded."
+  (declare (pure t) (side-effect-free t))
+  (let ((result (dash--partition-all-in-steps-reversed n step list)))
+    (while (and result (< (length (car result)) n))
+      (pop result))
+    (nreverse result)))
+
+(defun -partition-all (n list)
+  "Return a new list with the items in LIST grouped into N-sized sublists.
+The last group may contain less than N items."
+  (declare (pure t) (side-effect-free t))
+  (-partition-all-in-steps n n list))
+
+(defun -partition (n list)
+  "Return a new list with the items in LIST grouped into N-sized sublists.
+If there are not enough items to make the last group N-sized,
+those items are discarded."
+  (declare (pure t) (side-effect-free t))
+  (-partition-in-steps n n list))
+
+(defmacro --partition-by (form list)
+  "Anaphoric form of `-partition-by'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (v (make-symbol "value"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,v ,form)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (unless (equal ,v ,n)
+                 (!cons (nreverse ,s) ,r)
+                 (setq ,s nil)
+                 (setq ,v ,n))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by (fn list)
+  "Apply FN to each item in LIST, splitting it each time FN returns a new value."
+  (declare (important-return-value t))
+  (--partition-by (funcall fn it) list))
+
+(defmacro --partition-by-header (form list)
+  "Anaphoric form of `-partition-by-header'."
+  (declare (debug (form form)))
+  (let ((r (make-symbol "result"))
+        (s (make-symbol "sublist"))
+        (h (make-symbol "header-value"))
+        (b (make-symbol "seen-body?"))
+        (n (make-symbol "new-value"))
+        (l (make-symbol "list")))
+    `(let ((,l ,list))
+       (when ,l
+         (let* ((,r nil)
+                (it (car ,l))
+                (,s (list it))
+                (,h ,form)
+                (,b nil)
+                (,l (cdr ,l)))
+           (while ,l
+             (let* ((it (car ,l))
+                    (,n ,form))
+               (if (equal ,h ,n)
+                   (when ,b
+                     (!cons (nreverse ,s) ,r)
+                     (setq ,s nil)
+                     (setq ,b nil))
+                 (setq ,b t))
+               (!cons it ,s)
+               (!cdr ,l)))
+           (!cons (nreverse ,s) ,r)
+           (nreverse ,r))))))
+
+(defun -partition-by-header (fn list)
+  "Apply FN to the first item in LIST. That is the header
+value. Apply FN to each item in LIST, splitting it each time FN
+returns the header value, but only after seeing at least one
+other value (the body)."
+  (declare (important-return-value t))
+  (--partition-by-header (funcall fn it) list))
+
+(defmacro --partition-after-pred (form list)
+  "Partition LIST after each element for which FORM evaluates to non-nil.
+Each element of LIST in turn is bound to `it' before evaluating
+FORM.
+
+This is the anaphoric counterpart to `-partition-after-pred'."
+  (let ((l (make-symbol "list"))
+        (r (make-symbol "result"))
+        (s (make-symbol "sublist")))
+    `(let ((,l ,list) ,r ,s)
+       (when ,l
+         (--each ,l
+           (push it ,s)
+           (when ,form
+             (push (nreverse ,s) ,r)
+             (setq ,s ())))
+         (when ,s
+           (push (nreverse ,s) ,r))
+         (nreverse ,r)))))
+
+(defun -partition-after-pred (pred list)
+  "Partition LIST after each element for which PRED returns non-nil.
+
+This function's anaphoric counterpart is `--partition-after-pred'."
+  (declare (important-return-value t))
+  (--partition-after-pred (funcall pred it) list))
+
+(defun -partition-before-pred (pred list)
+  "Partition directly before each time PRED is true on an element of LIST."
+  (declare (important-return-value t))
+  (nreverse (-map #'reverse
+                  (-partition-after-pred pred (reverse list)))))
+
+(defun -partition-after-item (item list)
+  "Partition directly after each time ITEM appears in LIST."
+  (declare (pure t) (side-effect-free t))
+  (-partition-after-pred (lambda (ele) (equal ele item))
+                         list))
+
+(defun -partition-before-item (item list)
+  "Partition directly before each time ITEM appears in LIST."
+  (declare (pure t) (side-effect-free t))
+  (-partition-before-pred (lambda (ele) (equal ele item))
+                          list))
+
+(defmacro --group-by (form list)
+  "Anaphoric form of `-group-by'."
+  (declare (debug t))
+  (let ((n (make-symbol "n"))
+        (k (make-symbol "k"))
+        (grp (make-symbol "grp")))
+    `(nreverse
+      (-map
+       (lambda (,n)
+         (cons (car ,n)
+               (nreverse (cdr ,n))))
+       (--reduce-from
+        (let* ((,k (,@form))
+               (,grp (assoc ,k acc)))
+          (if ,grp
+              (setcdr ,grp (cons it (cdr ,grp)))
+            (push
+             (list ,k it)
+             acc))
+          acc)
+        nil ,list)))))
+
+(defun -group-by (fn list)
+  "Separate LIST into an alist whose keys are FN applied to the
+elements of LIST.  Keys are compared by `equal'."
+  (declare (important-return-value t))
+  (--group-by (funcall fn it) list))
+
+(defun -interpose (sep list)
+  "Return a new list of all elements in LIST separated by SEP."
+  (declare (side-effect-free t))
+  (let (result)
+    (when list
+      (!cons (car list) result)
+      (!cdr list))
+    (while list
+      (setq result (cons (car list) (cons sep result)))
+      (!cdr list))
+    (nreverse result)))
+
+(defun -interleave (&rest lists)
+  "Return a new list of the first item in each list, then the second etc."
+  (declare (side-effect-free t))
+  (when lists
+    (let (result)
+      (while (-none? 'null lists)
+        (--each lists (!cons (car it) result))
+        (setq lists (-map 'cdr lists)))
+      (nreverse result))))
+
+(defmacro --zip-with (form list1 list2)
+  "Zip LIST1 and LIST2 into a new list according to FORM.
+That is, evaluate FORM for each item pair from the two lists, and
+return the list of results.  The result is as long as the shorter
+list.
+
+Each element of LIST1 and each element of LIST2 in turn are bound
+pairwise to `it' and `other', respectively, and their index
+within the list to `it-index', before evaluating FORM.
+
+This is the anaphoric counterpart to `-zip-with'."
+  (declare (debug (form form form)))
+  (let ((r (make-symbol "result"))
+        (l2 (make-symbol "list2")))
+    `(let ((,l2 ,list2) ,r)
+       (--each-while ,list1 ,l2
+         (let ((other (pop ,l2)))
+           (ignore other)
+           (push ,form ,r)))
+       (nreverse ,r))))
+
+(defun -zip-with (fn list1 list2)
+  "Zip LIST1 and LIST2 into a new list using the function FN.
+That is, apply FN pairwise taking as first argument the next
+element of LIST1 and as second argument the next element of LIST2
+at the corresponding position.  The result is as long as the
+shorter list.
+
+This function's anaphoric counterpart is `--zip-with'.
+
+For other zips, see also `-zip-lists' and `-zip-fill'."
+  (declare (important-return-value t))
+  (--zip-with (funcall fn it other) list1 list2))
+
+(defun -zip-lists (&rest lists)
+  "Zip LISTS together.
+
+Group the head of each list, followed by the second element of
+each list, and so on.  The number of returned groupings is equal
+to the length of the shortest input list, and the length of each
+grouping is equal to the number of input LISTS.
+
+The return value is always a list of proper lists, in contrast to
+`-zip' which returns a list of dotted pairs when only two input
+LISTS are provided.
+
+See also: `-zip-pair'."
+  (declare (pure t) (side-effect-free t))
+  (when lists
+    (let (results)
+      (while (--every it lists)
+        (push (mapcar #'car lists) results)
+        (setq lists (mapcar #'cdr lists)))
+      (nreverse results))))
+
+(defun -zip-lists-fill (fill-value &rest lists)
+  "Zip LISTS together, padding shorter lists with FILL-VALUE.
+This is like `-zip-lists' (which see), except it retains all
+elements at positions beyond the end of the shortest list.  The
+number of returned groupings is equal to the length of the
+longest input list, and the length of each grouping is equal to
+the number of input LISTS."
+  (declare (pure t) (side-effect-free t))
+  (when lists
+    (let (results)
+      (while (--some it lists)
+        (push (--map (if it (car it) fill-value) lists) results)
+        (setq lists (mapcar #'cdr lists)))
+      (nreverse results))))
+
+(defun -unzip-lists (lists)
+  "Unzip LISTS.
+
+This works just like `-zip-lists' (which see), but takes a list
+of lists instead of a variable number of arguments, such that
+
+  (-unzip-lists (-zip-lists ARGS...))
+
+is identity (given that the lists comprising ARGS are of the same
+length)."
+  (declare (pure t) (side-effect-free t))
+  (apply #'-zip-lists lists))
+
+(defalias 'dash--length=
+  (if (fboundp 'length=)
+      #'length=
+    (lambda (list length)
+      (cond ((< length 0) nil)
+            ((zerop length) (null list))
+            ((let ((last (nthcdr (1- length) list)))
+               (and last (null (cdr last))))))))
+  "Return non-nil if LIST is of LENGTH.
+This is a compatibility shim for `length=' in Emacs 28.
+\n(fn LIST LENGTH)")
+
+(defun dash--zip-lists-or-pair (_form &rest lists)
+  "Return a form equivalent to applying `-zip' to LISTS.
+This `compiler-macro' warns about discouraged `-zip' usage and
+delegates to `-zip-lists' or `-zip-pair' depending on the number
+of LISTS."
+  (if (not (dash--length= lists 2))
+      (cons #'-zip-lists lists)
+    (let ((pair (cons #'-zip-pair lists))
+          (msg "Use -zip-pair instead of -zip to get a list of pairs"))
+      (if (fboundp 'macroexp-warn-and-return)
+          (macroexp-warn-and-return msg pair)
+        (message msg)
+        pair))))
+
+(defun -zip (&rest lists)
+  "Zip LISTS together.
+
+Group the head of each list, followed by the second element of
+each list, and so on.  The number of returned groupings is equal
+to the length of the shortest input list, and the number of items
+in each grouping is equal to the number of input LISTS.
+
+If only two LISTS are provided as arguments, return the groupings
+as a list of dotted pairs.  Otherwise, return the groupings as a
+list of proper lists.
+
+Since the return value changes form depending on the number of
+arguments, it is generally recommended to use `-zip-lists'
+instead, or `-zip-pair' if a list of dotted pairs is desired.
+
+See also: `-unzip'."
+  (declare (compiler-macro dash--zip-lists-or-pair)
+           (pure t) (side-effect-free t))
+  ;; For backward compatibility, return a list of dotted pairs if two
+  ;; arguments were provided.
+  (apply (if (dash--length= lists 2) #'-zip-pair #'-zip-lists) lists))
+
+(defun -zip-pair (&rest lists)
+  "Zip LIST1 and LIST2 together.
+
+Make a pair with the head of each list, followed by a pair with
+the second element of each list, and so on.  The number of pairs
+returned is equal to the length of the shorter input list.
+
+See also: `-zip-lists'."
+  (declare (advertised-calling-convention (list1 list2) "2.20.0")
+           (pure t) (side-effect-free t))
+  (if (dash--length= lists 2)
+      (--zip-with (cons it other) (car lists) (cadr lists))
+    (apply #'-zip-lists lists)))
+
+(defun -zip-fill (fill-value &rest lists)
+  "Zip LISTS together, padding shorter lists with FILL-VALUE.
+This is like `-zip' (which see), except it retains all elements
+at positions beyond the end of the shortest list.  The number of
+returned groupings is equal to the length of the longest input
+list, and the length of each grouping is equal to the number of
+input LISTS.
+
+Since the return value changes form depending on the number of
+arguments, it is generally recommended to use `-zip-lists-fill'
+instead, unless a list of dotted pairs is explicitly desired."
+  (declare (pure t) (side-effect-free t))
+  (cond ((null lists) ())
+        ((dash--length= lists 2)
+         (let ((list1 (car lists))
+               (list2 (cadr lists))
+               results)
+           (while (or list1 list2)
+             (push (cons (if list1 (pop list1) fill-value)
+                         (if list2 (pop list2) fill-value))
+                   results))
+           (nreverse results)))
+        ((apply #'-zip-lists-fill fill-value lists))))
+
+(defun -unzip (lists)
+  "Unzip LISTS.
+
+This works just like `-zip' (which see), but takes a list of
+lists instead of a variable number of arguments, such that
+
+  (-unzip (-zip L1 L2 L3 ...))
+
+is identity (given that the lists are of the same length, and
+that `-zip' is not called with two arguments, because of the
+caveat described in its docstring).
+
+Note in particular that calling `-unzip' on a list of two lists
+will return a list of dotted pairs.
+
+Since the return value changes form depending on the number of
+LISTS, it is generally recommended to use `-unzip-lists' instead."
+  (declare (pure t) (side-effect-free t))
+  (apply #'-zip lists))
+
+(defun -cycle (list)
+  "Return an infinite circular copy of LIST.
+The returned list cycles through the elements of LIST and repeats
+from the beginning."
+  (declare (pure t) (side-effect-free t))
+  ;; Also works with sequences that aren't lists.
+  (let ((newlist (append list ())))
+    (nconc newlist newlist)))
+
+(defun -pad (fill-value &rest lists)
+  "Pad each of LISTS with FILL-VALUE until they all have equal lengths.
+
+Ensure all LISTS are as long as the longest one by repeatedly
+appending FILL-VALUE to the shorter lists, and return the
+resulting LISTS."
+  (declare (pure t) (side-effect-free t))
+  (let* ((lens (mapcar #'length lists))
+         (maxlen (apply #'max 0 lens)))
+    (--map (append it (make-list (- maxlen (pop lens)) fill-value)) lists)))
+
+(defmacro --annotate (form list)
+  "Pair each item in LIST with the result of evaluating FORM.
+
+Return an alist of (RESULT . ITEM), where each ITEM is the
+corresponding element of LIST, and RESULT is the value obtained
+by evaluating FORM with ITEM bound to `it'.
+
+This is the anaphoric counterpart to `-annotate'."
+  (declare (debug (form form)))
+  `(--map (cons ,form it) ,list))
+
+(defun -annotate (fn list)
+  "Pair each item in LIST with the result of passing it to FN.
+
+Return an alist of (RESULT . ITEM), where each ITEM is the
+corresponding element of LIST, and RESULT is the value obtained
+by calling FN on ITEM.
+
+This function's anaphoric counterpart is `--annotate'."
+  (declare (important-return-value t))
+  (--annotate (funcall fn it) list))
+
+(defun dash--table-carry (lists restore-lists &optional re)
+  "Helper for `-table' and `-table-flat'.
+
+If a list overflows, carry to the right and reset the list."
+  (while (not (or (car lists)
+                  (equal lists '(nil))))
+    (setcar lists (car restore-lists))
+    (pop (cadr lists))
+    (!cdr lists)
+    (!cdr restore-lists)
+    (when re
+      (push (nreverse (car re)) (cadr re))
+      (setcar re nil)
+      (!cdr re))))
+
+(defun -table (fn &rest lists)
+  "Compute outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The dimension of the result is (length lists).
+
+See also: `-table-flat'"
+  (declare (important-return-value t))
+  (let ((restore-lists (copy-sequence lists))
+        (last-list (last lists))
+        (re (make-list (length lists) nil)))
+    (while (car last-list)
+      (let ((item (apply fn (-map 'car lists))))
+        (push item (car re))
+        (setcar lists (cdar lists)) ;; silence byte compiler
+        (dash--table-carry lists restore-lists re)))
+    (nreverse (car (last re)))))
+
+(defun -table-flat (fn &rest lists)
+  "Compute flat outer product of LISTS using function FN.
+
+The function FN should have the same arity as the number of
+supplied lists.
+
+The outer product is computed by applying fn to all possible
+combinations created by taking one element from each list in
+order.  The results are flattened, ignoring the tensor structure
+of the result.  This is equivalent to calling:
+
+  (-flatten-n (1- (length lists)) (apply \\='-table fn lists))
+
+but the implementation here is much more efficient.
+
+See also: `-flatten-n', `-table'"
+  (declare (important-return-value t))
+  (let ((restore-lists (copy-sequence lists))
+        (last-list (last lists))
+        re)
+    (while (car last-list)
+      (let ((item (apply fn (-map 'car lists))))
+        (push item re)
+        (setcar lists (cdar lists)) ;; silence byte compiler
+        (dash--table-carry lists restore-lists)))
+    (nreverse re)))
+
+(defmacro --find-index (form list)
+  "Return the first index in LIST for which FORM evals to non-nil.
+Return nil if no such index is found.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-find-index'."
+  (declare (debug (form form)))
+  `(--some (and ,form it-index) ,list))
+
+(defun -find-index (pred list)
+  "Return the index of the first item satisfying PRED in LIST.
+Return nil if no such item is found.
+
+PRED is called with one argument, the current list element, until
+it returns non-nil, at which point the search terminates.
+
+This function's anaphoric counterpart is `--find-index'.
+
+See also: `-first', `-find-last-index'."
+  (declare (important-return-value t))
+  (--find-index (funcall pred it) list))
+
+(defun -elem-index (elem list)
+  "Return the first index of ELEM in LIST.
+That is, the index within LIST of the first element that is
+`equal' to ELEM.  Return nil if there is no such element.
+
+See also: `-find-index'."
+  (declare (pure t) (side-effect-free t))
+  (--find-index (equal elem it) list))
+
+(defmacro --find-indices (form list)
+  "Return the list of indices in LIST for which FORM evals to non-nil.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-find-indices'."
+  (declare (debug (form form)))
+  `(--keep (and ,form it-index) ,list))
+
+(defun -find-indices (pred list)
+  "Return the list of indices in LIST satisfying PRED.
+
+Each element of LIST in turn is passed to PRED.  If the result is
+non-nil, the index of that element in LIST is included in the
+result.  The returned indices are in ascending order, i.e., in
+the same order as they appear in LIST.
+
+This function's anaphoric counterpart is `--find-indices'.
+
+See also: `-find-index', `-elem-indices'."
+  (declare (important-return-value t))
+  (--find-indices (funcall pred it) list))
+
+(defun -elem-indices (elem list)
+  "Return the list of indices at which ELEM appears in LIST.
+That is, the indices of all elements of LIST `equal' to ELEM, in
+the same ascending order as they appear in LIST."
+  (declare (pure t) (side-effect-free t))
+  (--find-indices (equal elem it) list))
+
+(defmacro --find-last-index (form list)
+  "Return the last index in LIST for which FORM evals to non-nil.
+Return nil if no such index is found.
+Each element of LIST in turn is bound to `it' and its index
+within LIST to `it-index' before evaluating FORM.
+This is the anaphoric counterpart to `-find-last-index'."
+  (declare (debug (form form)))
+  (let ((i (make-symbol "index")))
+    `(let (,i)
+       (--each ,list
+         (when ,form (setq ,i it-index)))
+       ,i)))
+
+(defun -find-last-index (pred list)
+  "Return the index of the last item satisfying PRED in LIST.
+Return nil if no such item is found.
+
+Predicate PRED is called with one argument each time, namely the
+current list element.
+
+This function's anaphoric counterpart is `--find-last-index'.
+
+See also: `-last', `-find-index'."
+  (declare (important-return-value t))
+  (--find-last-index (funcall pred it) list))
+
+(defun -select-by-indices (indices list)
+  "Return a list whose elements are elements from LIST selected
+as `(nth i list)` for all i from INDICES."
+  (declare (pure t) (side-effect-free t))
+  (let (r)
+    (--each indices
+      (!cons (nth it list) r))
+    (nreverse r)))
+
+(defun -select-columns (columns table)
+  "Select COLUMNS from TABLE.
+
+TABLE is a list of lists where each element represents one row.
+It is assumed each row has the same length.
+
+Each row is transformed such that only the specified COLUMNS are
+selected.
+
+See also: `-select-column', `-select-by-indices'"
+  (declare (pure t) (side-effect-free t))
+  (--map (-select-by-indices columns it) table))
+
+(defun -select-column (column table)
+  "Select COLUMN from TABLE.
+
+TABLE is a list of lists where each element represents one row.
+It is assumed each row has the same length.
+
+The single selected column is returned as a list.
+
+See also: `-select-columns', `-select-by-indices'"
+  (declare (pure t) (side-effect-free t))
+  (--mapcat (-select-by-indices (list column) it) table))
+
+(defmacro -> (x &optional form &rest more)
+  "Thread the expr through the forms. Insert X as the second item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, insert the first form as the
+second item in second form, etc."
+  (declare (debug (form &rest [&or symbolp (sexp &rest form)])))
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,(car form) ,x ,@(cdr form))
+                  (list form x)))
+   (:else `(-> (-> ,x ,form) ,@more))))
+
+(defmacro ->> (x &optional form &rest more)
+  "Thread the expr through the forms. Insert X as the last item
+in the first form, making a list of it if it is not a list
+already. If there are more forms, insert the first form as the
+last item in second form, etc."
+  (declare (debug ->))
+  (cond
+   ((null form) x)
+   ((null more) (if (listp form)
+                    `(,@form ,x)
+                  (list form x)))
+   (:else `(->> (->> ,x ,form) ,@more))))
+
+(defmacro --> (x &rest forms)
+  "Starting with the value of X, thread each expression through FORMS.
+
+Insert X at the position signified by the symbol `it' in the first
+form.  If there are more forms, insert the first form at the position
+signified by `it' in the second form, etc."
+  (declare (debug (form body)))
+  `(-as-> ,x it ,@forms))
+
+(defmacro -as-> (value variable &rest forms)
+  "Starting with VALUE, thread VARIABLE through FORMS.
+
+In the first form, bind VARIABLE to VALUE.  In the second form, bind
+VARIABLE to the result of the first form, and so forth."
+  (declare (debug (form symbolp body)))
+  (if (null forms)
+      `,value
+    `(let ((,variable ,value))
+       (-as-> ,(if (symbolp (car forms))
+                   (list (car forms) variable)
+                 (car forms))
+              ,variable
+              ,@(cdr forms)))))
+
+(defmacro -some-> (x &optional form &rest more)
+  "When expr is non-nil, thread it through the first form (via `->'),
+and when that result is non-nil, through the next form, etc."
+  (declare (debug ->)
+           (indent 1))
+  (if (null form) x
+    (let ((result (make-symbol "result")))
+      `(-some-> (-when-let (,result ,x)
+                  (-> ,result ,form))
+         ,@more))))
+
+(defmacro -some->> (x &optional form &rest more)
+  "When expr is non-nil, thread it through the first form (via `->>'),
+and when that result is non-nil, through the next form, etc."
+  (declare (debug ->)
+           (indent 1))
+  (if (null form) x
+    (let ((result (make-symbol "result")))
+      `(-some->> (-when-let (,result ,x)
+                   (->> ,result ,form))
+         ,@more))))
+
+(defmacro -some--> (expr &rest forms)
+  "Thread EXPR through FORMS via `-->', while the result is non-nil.
+When EXPR evaluates to non-nil, thread the result through the
+first of FORMS, and when that result is non-nil, thread it
+through the next form, etc."
+  (declare (debug (form &rest &or symbolp consp)) (indent 1))
+  (if (null forms) expr
+    (let ((result (make-symbol "result")))
+      `(-some--> (-when-let (,result ,expr)
+                   (--> ,result ,(car forms)))
+         ,@(cdr forms)))))
+
+(defmacro -doto (init &rest forms)
+  "Evaluate INIT and pass it as argument to FORMS with `->'.
+The RESULT of evaluating INIT is threaded through each of FORMS
+individually using `->', which see.  The return value is RESULT,
+which FORMS may have modified by side effect."
+  (declare (debug (form &rest &or symbolp consp)) (indent 1))
+  (let ((retval (make-symbol "result")))
+    `(let ((,retval ,init))
+       ,@(mapcar (lambda (form) `(-> ,retval ,form)) forms)
+       ,retval)))
+
+(defmacro --doto (init &rest forms)
+  "Anaphoric form of `-doto'.
+This just evaluates INIT, binds the result to `it', evaluates
+FORMS, and returns the final value of `it'.
+Note: `it' need not be used in each form."
+  (declare (debug (form body)) (indent 1))
+  `(let ((it ,init))
+     ,@forms
+     it))
+
+(defun -grade-up (comparator list)
+  "Grade elements of LIST using COMPARATOR relation.
+This yields a permutation vector such that applying this
+permutation to LIST sorts it in ascending order."
+  (declare (important-return-value t))
+  (->> (--map-indexed (cons it it-index) list)
+       (-sort (lambda (it other) (funcall comparator (car it) (car other))))
+       (mapcar #'cdr)))
+
+(defun -grade-down (comparator list)
+  "Grade elements of LIST using COMPARATOR relation.
+This yields a permutation vector such that applying this
+permutation to LIST sorts it in descending order."
+  (declare (important-return-value t))
+  (->> (--map-indexed (cons it it-index) list)
+       (-sort (lambda (it other) (funcall comparator (car other) (car it))))
+       (mapcar #'cdr)))
+
+(defvar dash--source-counter 0
+  "Monotonic counter for generated symbols.")
+
+(defun dash--match-make-source-symbol ()
+  "Generate a new dash-source symbol.
+
+All returned symbols are guaranteed to be unique."
+  (prog1 (make-symbol (format "--dash-source-%d--" dash--source-counter))
+    (setq dash--source-counter (1+ dash--source-counter))))
+
+(defun dash--match-ignore-place-p (symbol)
+  "Return non-nil if SYMBOL is a symbol and starts with _."
+  (and (symbolp symbol)
+       (eq (aref (symbol-name symbol) 0) ?_)))
+
+(defun dash--match-cons-skip-cdr (skip-cdr source)
+  "Helper function generating idiomatic shifting code."
+  (cond
+   ((= skip-cdr 0)
+    `(pop ,source))
+   (t
+    `(prog1 ,(dash--match-cons-get-car skip-cdr source)
+       (setq ,source ,(dash--match-cons-get-cdr (1+ skip-cdr) source))))))
+
+(defun dash--match-cons-get-car (skip-cdr source)
+  "Helper function generating idiomatic code to get nth car."
+  (cond
+   ((= skip-cdr 0)
+    `(car ,source))
+   ((= skip-cdr 1)
+    `(cadr ,source))
+   (t
+    `(nth ,skip-cdr ,source))))
+
+(defun dash--match-cons-get-cdr (skip-cdr source)
+  "Helper function generating idiomatic code to get nth cdr."
+  (cond
+   ((= skip-cdr 0)
+    source)
+   ((= skip-cdr 1)
+    `(cdr ,source))
+   (t
+    `(nthcdr ,skip-cdr ,source))))
+
+(defun dash--match-cons (match-form source)
+  "Setup a cons matching environment and call the real matcher."
+  (let ((s (dash--match-make-source-symbol))
+        (n 0)
+        (m match-form))
+    (while (and (consp m)
+                (dash--match-ignore-place-p (car m)))
+      (setq n (1+ n)) (!cdr m))
+    (cond
+     ;; when we only have one pattern in the list, we don't have to
+     ;; create a temporary binding (--dash-source--) for the source
+     ;; and just use the input directly
+     ((and (consp m)
+           (not (cdr m)))
+      (dash--match (car m) (dash--match-cons-get-car n source)))
+     ;; handle other special types
+     ((> n 0)
+      (dash--match m (dash--match-cons-get-cdr n source)))
+     ;; this is the only entry-point for dash--match-cons-1, that's
+     ;; why we can't simply use the above branch, it would produce
+     ;; infinite recursion
+     (t
+      (cons (list s source) (dash--match-cons-1 match-form s))))))
+
+(defun dash--get-expand-function (type)
+  "Get expand function name for TYPE."
+  (intern-soft (format "dash-expand:%s" type)))
+
+(defun dash--match-cons-1 (match-form source &optional props)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a proper or improper list.  Each element of
+MATCH-FORM is either a symbol, which gets bound to the respective
+value in source or another match form which gets destructured
+recursively.
+
+If the cdr of last cons cell in the list is nil, matching stops
+there.
+
+SOURCE is a proper or improper list."
+  (let ((skip-cdr (or (plist-get props :skip-cdr) 0)))
+    (cond
+     ((consp match-form)
+      (cond
+       ((cdr match-form)
+        (cond
+         ((and (symbolp (car match-form))
+               (functionp (dash--get-expand-function (car match-form))))
+          (dash--match-kv (dash--match-kv-normalize-match-form match-form) (dash--match-cons-get-cdr skip-cdr source)))
+         ((dash--match-ignore-place-p (car match-form))
+          (dash--match-cons-1 (cdr match-form) source
+                              (plist-put props :skip-cdr (1+ skip-cdr))))
+         (t
+          (-concat (dash--match (car match-form) (dash--match-cons-skip-cdr skip-cdr source))
+                   (dash--match-cons-1 (cdr match-form) source)))))
+       (t ;; Last matching place, no need for shift
+        (dash--match (car match-form) (dash--match-cons-get-car skip-cdr source)))))
+     ((eq match-form nil)
+      nil)
+     (t ;; Handle improper lists.  Last matching place, no need for shift
+      (dash--match match-form (dash--match-cons-get-cdr skip-cdr source))))))
+
+(defun dash--match-vector (match-form source)
+  "Setup a vector matching environment and call the real matcher."
+  (let ((s (dash--match-make-source-symbol)))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern
+     ((= (length match-form) 1)
+      (dash--match (aref match-form 0) `(aref ,source 0)))
+     ;; if the source is a symbol, we don't need to re-bind it
+     ((symbolp source)
+      (dash--match-vector-1 match-form source))
+     ;; don't bind `s' if we only have one sub-pattern which is not ignored
+     ((let* ((ignored-places (mapcar 'dash--match-ignore-place-p match-form))
+             (ignored-places-n (length (-remove 'null ignored-places))))
+        (when (= ignored-places-n (1- (length match-form)))
+          (let ((n (-find-index 'null ignored-places)))
+            (dash--match (aref match-form n) `(aref ,source ,n))))))
+     (t
+      (cons (list s source) (dash--match-vector-1 match-form s))))))
+
+(defun dash--match-vector-1 (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+MATCH-FORM is a vector.  Each element of MATCH-FORM is either a
+symbol, which gets bound to the respective value in source or
+another match form which gets destructured recursively.
+
+If second-from-last place in MATCH-FORM is the symbol &rest, the
+next element of the MATCH-FORM is matched against the tail of
+SOURCE, starting at index of the &rest symbol.  This is
+conceptually the same as the (head . tail) match for improper
+lists, where dot plays the role of &rest.
+
+SOURCE is a vector.
+
+If the MATCH-FORM vector is shorter than SOURCE vector, only
+the (length MATCH-FORM) places are bound, the rest of the SOURCE
+is discarded."
+  (let ((i 0)
+        (l (length match-form))
+        (re))
+    (while (< i l)
+      (let ((m (aref match-form i)))
+        (push (cond
+               ((and (symbolp m)
+                     (eq m '&rest))
+                (prog1 (dash--match
+                        (aref match-form (1+ i))
+                        `(substring ,source ,i))
+                  (setq i l)))
+               ((and (symbolp m)
+                     ;; do not match symbols starting with _
+                     (not (eq (aref (symbol-name m) 0) ?_)))
+                (list (list m `(aref ,source ,i))))
+               ((not (symbolp m))
+                (dash--match m `(aref ,source ,i))))
+              re)
+        (setq i (1+ i))))
+    (-flatten-n 1 (nreverse re))))
+
+(defun dash--match-kv-normalize-match-form (pattern)
+  "Normalize kv PATTERN.
+
+This method normalizes PATTERN to the format expected by
+`dash--match-kv'.  See `-let' for the specification."
+  (let ((normalized (list (car pattern)))
+        (skip nil)
+        (fill-placeholder (make-symbol "--dash-fill-placeholder--")))
+    (-each (-zip-fill fill-placeholder (cdr pattern) (cddr pattern))
+      (lambda (pair)
+        (let ((current (car pair))
+              (next (cdr pair)))
+          (if skip
+              (setq skip nil)
+            (if (or (eq fill-placeholder next)
+                    (not (or (and (symbolp next)
+                                  (not (keywordp next))
+                                  (not (eq next t))
+                                  (not (eq next nil)))
+                             (and (consp next)
+                                  (not (eq (car next) 'quote)))
+                             (vectorp next))))
+                (progn
+                  (cond
+                   ((keywordp current)
+                    (push current normalized)
+                    (push (intern (substring (symbol-name current) 1)) normalized))
+                   ((stringp current)
+                    (push current normalized)
+                    (push (intern current) normalized))
+                   ((and (consp current)
+                         (eq (car current) 'quote))
+                    (push current normalized)
+                    (push (cadr current) normalized))
+                   (t (error "-let: found key `%s' in kv destructuring but its pattern `%s' is invalid and can not be derived from the key" current next)))
+                  (setq skip nil))
+              (push current normalized)
+              (push next normalized)
+              (setq skip t))))))
+    (nreverse normalized)))
+
+(defun dash--match-kv (match-form source)
+  "Setup a kv matching environment and call the real matcher.
+
+kv can be any key-value store, such as plist, alist or hash-table."
+  (let ((s (dash--match-make-source-symbol)))
+    (cond
+     ;; don't bind `s' if we only have one sub-pattern (&type key val)
+     ((= (length match-form) 3)
+      (dash--match-kv-1 (cdr match-form) source (car match-form)))
+     ;; if the source is a symbol, we don't need to re-bind it
+     ((symbolp source)
+      (dash--match-kv-1 (cdr match-form) source (car match-form)))
+     (t
+      (cons (list s source) (dash--match-kv-1 (cdr match-form) s (car match-form)))))))
+
+(defun dash-expand:&hash (key source)
+  "Generate extracting KEY from SOURCE for &hash destructuring."
+  `(gethash ,key ,source))
+
+(defun dash-expand:&plist (key source)
+  "Generate extracting KEY from SOURCE for &plist destructuring."
+  `(plist-get ,source ,key))
+
+(defun dash-expand:&alist (key source)
+  "Generate extracting KEY from SOURCE for &alist destructuring."
+  `(cdr (assoc ,key ,source)))
+
+(defun dash-expand:&hash? (key source)
+  "Generate extracting KEY from SOURCE for &hash? destructuring.
+Similar to &hash but check whether the map is not nil."
+  (let ((src (make-symbol "src")))
+    `(let ((,src ,source))
+       (when ,src (gethash ,key ,src)))))
+
+(defalias 'dash-expand:&keys 'dash-expand:&plist)
+
+(defun dash--match-kv-1 (match-form source type)
+  "Match MATCH-FORM against SOURCE of type TYPE.
+
+MATCH-FORM is a proper list of the form (key1 place1 ... keyN
+placeN).  Each placeK is either a symbol, which gets bound to the
+value of keyK retrieved from the key-value store, or another
+match form which gets destructured recursively.
+
+SOURCE is a key-value store of type TYPE, which can be a plist,
+an alist or a hash table.
+
+TYPE is a token specifying the type of the key-value store.
+Valid values are &plist, &alist and &hash."
+  (-flatten-n 1 (-map
+                 (lambda (kv)
+                   (let* ((k (car kv))
+                          (v (cadr kv))
+                          (getter
+                           (funcall (dash--get-expand-function type) k source)))
+                     (cond
+                      ((symbolp v)
+                       (list (list v getter)))
+                      (t (dash--match v getter)))))
+                 (-partition 2 match-form))))
+
+(defun dash--match-symbol (match-form source)
+  "Bind a symbol.
+
+This works just like `let', there is no destructuring."
+  (list (list match-form source)))
+
+(defun dash--match (match-form source)
+  "Match MATCH-FORM against SOURCE.
+
+This function tests the MATCH-FORM and dispatches to specific
+matchers based on the type of the expression.
+
+Key-value stores are disambiguated by placing a token &plist,
+&alist or &hash as a first item in the MATCH-FORM."
+  (cond
+   ((and (symbolp match-form)
+         ;; Don't bind things like &keys as if they were vars (#395).
+         (not (functionp (dash--get-expand-function match-form))))
+    (dash--match-symbol match-form source))
+   ((consp match-form)
+    (cond
+     ;; Handle the "x &as" bindings first.
+     ((and (consp (cdr match-form))
+           (symbolp (car match-form))
+           (eq '&as (cadr match-form)))
+      (let ((s (car match-form)))
+        (cons (list s source)
+              (dash--match (cddr match-form) s))))
+     ((functionp (dash--get-expand-function (car match-form)))
+      (dash--match-kv (dash--match-kv-normalize-match-form match-form) source))
+     (t (dash--match-cons match-form source))))
+   ((vectorp match-form)
+    ;; We support the &as binding in vectors too
+    (cond
+     ((and (> (length match-form) 2)
+           (symbolp (aref match-form 0))
+           (eq '&as (aref match-form 1)))
+      (let ((s (aref match-form 0)))
+        (cons (list s source)
+              (dash--match (substring match-form 2) s))))
+     (t (dash--match-vector match-form source))))))
+
+(defun dash--normalize-let-varlist (varlist)
+  "Normalize VARLIST so that every binding is a list.
+
+`let' allows specifying a binding which is not a list but simply
+the place which is then automatically bound to nil, such that all
+three of the following are identical and evaluate to nil.
+
+  (let (a) a)
+  (let ((a)) a)
+  (let ((a nil)) a)
+
+This function normalizes all of these to the last form."
+  (--map (if (consp it) it (list it nil)) varlist))
+
+(defmacro -let* (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE structurally.  SOURCE is
+only evaluated once for each PATTERN.
+
+Each SOURCE can refer to the symbols already bound by this
+VARLIST.  This is useful if you want to destructure SOURCE
+recursively but also want to name the intermediate structures.
+
+See `-let' for the list of all possible patterns."
+  (declare (debug ((&rest [&or (sexp form) sexp]) body))
+           (indent 1))
+  (let* ((varlist (dash--normalize-let-varlist varlist))
+         (bindings (--mapcat (dash--match (car it) (cadr it)) varlist)))
+    `(let* ,bindings
+       ,@body)))
+
+(defmacro -let (varlist &rest body)
+  "Bind variables according to VARLIST then eval BODY.
+
+VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+PATTERN is matched against the SOURCE \"structurally\".  SOURCE
+is only evaluated once for each PATTERN.  Each PATTERN is matched
+recursively, and can therefore contain sub-patterns which are
+matched against corresponding sub-expressions of SOURCE.
+
+All the SOURCEs are evalled before any symbols are
+bound (i.e. \"in parallel\").
+
+If VARLIST only contains one (PATTERN SOURCE) element, you can
+optionally specify it using a vector and discarding the
+outer-most parens.  Thus
+
+  (-let ((PATTERN SOURCE)) ...)
+
+becomes
+
+  (-let [PATTERN SOURCE] ...).
+
+`-let' uses a convention of not binding places (symbols) starting
+with _ whenever it's possible.  You can use this to skip over
+entries you don't care about.  However, this is not *always*
+possible (as a result of implementation) and these symbols might
+get bound to undefined values.
+
+Following is the overview of supported patterns.  Remember that
+patterns can be matched recursively, so every a, b, aK in the
+following can be a matching construct and not necessarily a
+symbol/variable.
+
+Symbol:
+
+  a - bind the SOURCE to A.  This is just like regular `let'.
+
+Conses and lists:
+
+  (a) - bind `car' of cons/list to A
+
+  (a . b) - bind car of cons to A and `cdr' to B
+
+  (a b) - bind car of list to A and `cadr' to B
+
+  (a1 a2 a3 ...) - bind 0th car of list to A1, 1st to A2, 2nd to A3...
+
+  (a1 a2 a3 ... aN . rest) - as above, but bind the Nth cdr to REST.
+
+Vectors:
+
+  [a] - bind 0th element of a non-list sequence to A (works with
+        vectors, strings, bit arrays...)
+
+  [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st to
+                   A1, 2nd to A2, ...
+                   If the PATTERN is shorter than SOURCE, the values at
+                   places not in PATTERN are ignored.
+                   If the PATTERN is longer than SOURCE, an `error' is
+                   thrown.
+
+  [a1 a2 a3 ... &rest rest] - as above, but bind the rest of
+                              the sequence to REST.  This is
+                              conceptually the same as improper list
+                              matching (a1 a2 ... aN . rest)
+
+Key/value stores:
+
+  (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE plist to aK.  If the
+                                 value is not found, aK is nil.
+                                 Uses `plist-get' to fetch values.
+
+  (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                 SOURCE alist to aK.  If the
+                                 value is not found, aK is nil.
+                                 Uses `assoc' to fetch values.
+
+  (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
+                                SOURCE hash table to aK.  If the
+                                value is not found, aK is nil.
+                                Uses `gethash' to fetch values.
+
+Further, special keyword &keys supports \"inline\" matching of
+plist-like key-value pairs, similarly to &keys keyword of
+`cl-defun'.
+
+  (a1 a2 ... aN &keys key1 b1 ... keyN bK)
+
+This binds N values from the list to a1 ... aN, then interprets
+the cdr as a plist (see key/value matching above).
+
+A shorthand notation for kv-destructuring exists which allows the
+patterns be optionally left out and derived from the key name in
+the following fashion:
+
+- a key :foo is converted into `foo' pattern,
+- a key \\='bar is converted into `bar' pattern,
+- a key \"baz\" is converted into `baz' pattern.
+
+That is, the entire value under the key is bound to the derived
+variable without any further destructuring.
+
+This is possible only when the form following the key is not a
+valid pattern (i.e. not a symbol, a cons cell or a vector).
+Otherwise the matching proceeds as usual and in case of an
+invalid spec fails with an error.
+
+Thus the patterns are normalized as follows:
+
+   ;; derive all the missing patterns
+   (&plist :foo \\='bar \"baz\") => (&plist :foo foo \\='bar bar \"baz\" baz)
+
+   ;; we can specify some but not others
+   (&plist :foo \\='bar explicit-bar) => (&plist :foo foo \\='bar explicit-bar)
+
+   ;; nothing happens, we store :foo in x
+   (&plist :foo x) => (&plist :foo x)
+
+   ;; nothing happens, we match recursively
+   (&plist :foo (a b c)) => (&plist :foo (a b c))
+
+You can name the source using the syntax SYMBOL &as PATTERN.
+This syntax works with lists (proper or improper), vectors and
+all types of maps.
+
+  (list &as a b c) (list 1 2 3)
+
+binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
+
+Similarly:
+
+  (bounds &as beg . end) (cons 1 2)
+
+binds BEG to 1, END to 2 and BOUNDS to (1 . 2).
+
+  (items &as first . rest) (list 1 2 3)
+
+binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
+
+  [vect &as _ b c] [1 2 3]
+
+binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as usual).
+
+  (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
+
+binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and &hash.
+
+This is especially useful when we want to capture the result of a
+computation and destructure at the same time.  Consider the
+form (function-returning-complex-structure) returning a list of
+two vectors with two items each.  We want to capture this entire
+result and pass it to another computation, but at the same time
+we want to get the second item from each vector.  We can achieve
+it with pattern
+
+  (result &as [_ a] [_ b]) (function-returning-complex-structure)
+
+Note: Clojure programmers may know this feature as the \":as
+binding\".  The difference is that we put the &as at the front
+because we need to support improper list binding."
+  (declare (debug ([&or (&rest [&or (sexp form) sexp])
+                        (vector [&rest [sexp form]])]
+                   body))
+           (indent 1))
+  (if (vectorp varlist)
+      `(let* ,(dash--match (aref varlist 0) (aref varlist 1))
+         ,@body)
+    (let* ((varlist (dash--normalize-let-varlist varlist))
+           (inputs (--map-indexed (list (make-symbol (format "input%d" it-index)) (cadr it)) varlist))
+           (new-varlist (--zip-with (list (car it) (car other))
+                                    varlist inputs)))
+      `(let ,inputs
+         (-let* ,new-varlist ,@body)))))
+
+(defmacro -lambda (match-form &rest body)
+  "Return a lambda which destructures its input as MATCH-FORM and executes BODY.
+
+Note that you have to enclose the MATCH-FORM in a pair of parens,
+such that:
+
+  (-lambda (x) body)
+  (-lambda (x y ...) body)
+
+has the usual semantics of `lambda'.  Furthermore, these get
+translated into normal `lambda', so there is no performance
+penalty.
+
+See `-let' for a description of the destructuring mechanism."
+  (declare (doc-string 2) (indent defun)
+           (debug (&define sexp
+                           [&optional stringp]
+                           [&optional ("interactive" interactive)]
+                           def-body)))
+  (cond
+   ((nlistp match-form)
+    (signal 'wrong-type-argument (list #'listp match-form)))
+   ;; No destructuring, so just return regular `lambda' for speed.
+   ((-all? #'symbolp match-form)
+    `(lambda ,match-form ,@body))
+   ((let ((inputs (--map-indexed
+                   (list it (make-symbol (format "input%d" it-index)))
+                   match-form)))
+      ;; TODO: because inputs to the `lambda' are evaluated only once,
+      ;; `-let*' need not create the extra bindings to ensure that.
+      ;; We should find a way to optimize that.  Not critical however.
+      `(lambda ,(mapcar #'cadr inputs)
+         (-let* ,inputs ,@body))))))
+
+(defmacro -setq (&rest forms)
+  "Bind each MATCH-FORM to the value of its VAL.
+
+MATCH-FORM destructuring is done according to the rules of `-let'.
+
+This macro allows you to bind multiple variables by destructuring
+the value, so for example:
+
+  (-setq (a b) x
+         (&plist :c c) plist)
+
+expands roughly speaking to the following code
+
+  (setq a (car x)
+        b (cadr x)
+        c (plist-get plist :c))
+
+Care is taken to only evaluate each VAL once so that in case of
+multiple assignments it does not cause unexpected side effects.
+
+\(fn [MATCH-FORM VAL]...)"
+  (declare (debug (&rest sexp form))
+           (indent 1))
+  (when (= (mod (length forms) 2) 1)
+    (signal 'wrong-number-of-arguments (list '-setq (1+ (length forms)))))
+  (let* ((forms-and-sources
+          ;; First get all the necessary mappings with all the
+          ;; intermediate bindings.
+          (-map (lambda (x) (dash--match (car x) (cadr x)))
+                (-partition 2 forms)))
+         ;; To preserve the logic of dynamic scoping we must ensure
+         ;; that we `setq' the variables outside of the `let*' form
+         ;; which holds the destructured intermediate values.  For
+         ;; this we generate for each variable a placeholder which is
+         ;; bound to (lexically) the result of the destructuring.
+         ;; Then outside of the helper `let*' form we bind all the
+         ;; original variables to their respective placeholders.
+         ;; TODO: There is a lot of room for possible optimization,
+         ;; for start playing with `special-variable-p' to eliminate
+         ;; unnecessary re-binding.
+         (variables-to-placeholders
+          (-mapcat
+           (lambda (bindings)
+             (-map
+              (lambda (binding)
+                (let ((var (car binding)))
+                  (list var (make-symbol (concat "--dash-binding-" (symbol-name var) "--")))))
+              (--filter (not (string-prefix-p "--" (symbol-name (car it)))) bindings)))
+           forms-and-sources)))
+    `(let ,(-map 'cadr variables-to-placeholders)
+       (let* ,(-flatten-n 1 forms-and-sources)
+         (setq ,@(-flatten (-map 'reverse variables-to-placeholders))))
+       (setq ,@(-flatten variables-to-placeholders)))))
+
+(defmacro -if-let* (vars-vals then &rest else)
+  "If all VALS evaluate to true, bind them to their corresponding
+VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
+of (VAR VAL) pairs.
+
+Note: binding is done according to `-let*'.  VALS are evaluated
+sequentially, and evaluation stops after the first nil VAL is
+encountered."
+  (declare (debug ((&rest (sexp form)) form body))
+           (indent 2))
+  (->> vars-vals
+       (--mapcat (dash--match (car it) (cadr it)))
+       (--reduce-r-from
+        (let ((var (car it))
+              (val (cadr it)))
+          `(let ((,var ,val))
+             (if ,var ,acc ,@else)))
+        then)))
+
+(defmacro -if-let (var-val then &rest else)
+  "If VAL evaluates to non-nil, bind it to VAR and do THEN,
+otherwise do ELSE.
+
+Note: binding is done according to `-let'.
+
+\(fn (VAR VAL) THEN &rest ELSE)"
+  (declare (debug ((sexp form) form body))
+           (indent 2))
+  `(-if-let* (,var-val) ,then ,@else))
+
+(defmacro --if-let (val then &rest else)
+  "If VAL evaluates to non-nil, bind it to symbol `it' and do THEN,
+otherwise do ELSE."
+  (declare (debug (form form body))
+           (indent 2))
+  `(-if-let (it ,val) ,then ,@else))
+
+(defmacro -when-let* (vars-vals &rest body)
+  "If all VALS evaluate to true, bind them to their corresponding
+VARS and execute body. VARS-VALS should be a list of (VAR VAL)
+pairs.
+
+Note: binding is done according to `-let*'.  VALS are evaluated
+sequentially, and evaluation stops after the first nil VAL is
+encountered."
+  (declare (debug ((&rest (sexp form)) body))
+           (indent 1))
+  `(-if-let* ,vars-vals (progn ,@body)))
+
+(defmacro -when-let (var-val &rest body)
+  "If VAL evaluates to non-nil, bind it to VAR and execute body.
+
+Note: binding is done according to `-let'.
+
+\(fn (VAR VAL) &rest BODY)"
+  (declare (debug ((sexp form) body))
+           (indent 1))
+  `(-if-let ,var-val (progn ,@body)))
+
+(defmacro --when-let (val &rest body)
+  "If VAL evaluates to non-nil, bind it to symbol `it' and
+execute body."
+  (declare (debug (form body))
+           (indent 1))
+  `(--if-let ,val (progn ,@body)))
+
+;; TODO: Get rid of this dynamic variable, passing it as an argument
+;; instead?
+(defvar -compare-fn nil
+  "Tests for equality use this function, or `equal' if this is nil.
+
+As a dynamic variable, this should be temporarily bound around
+the relevant operation, rather than permanently modified.  For
+example:
+
+  (let ((-compare-fn #\\='=))
+    (-union \\='(1 2 3) \\='(2 3 4)))")
+
+(defun dash--member-fn ()
+  "Return the flavor of `member' that goes best with `-compare-fn'."
+  (declare (side-effect-free error-free))
+  (let ((cmp -compare-fn))
+    (cond ((memq cmp '(nil equal)) #'member)
+          ((eq cmp #'eq) #'memq)
+          ((eq cmp #'eql) #'memql)
+          ((lambda (elt list)
+             (while (and list (not (funcall cmp elt (car list))))
+               (pop list))
+             list)))))
+
+(defun dash--assoc-fn ()
+  "Return the flavor of `assoc' that goes best with `-compare-fn'."
+  (declare (side-effect-free error-free))
+  (let ((cmp -compare-fn))
+    (cond ((memq cmp '(nil equal)) #'assoc)
+          ((eq cmp #'eq) #'assq)
+          ;; Since Emacs 26, `assoc' accepts a custom `testfn'.
+          ;; Version testing would be simpler here, but feature
+          ;; testing gets more brownie points, I guess.
+          ((condition-case nil
+               (with-no-warnings (assoc nil () #'eql))
+             (wrong-number-of-arguments t))
+           (lambda (key alist)
+             (--first (and (consp it) (funcall cmp (car it) key)) alist)))
+          ((with-no-warnings
+             (lambda (key alist)
+               (assoc key alist cmp)))))))
+
+(defun dash--hash-test-fn ()
+  "Return the hash table test function corresponding to `-compare-fn'.
+Return nil if `-compare-fn' is not a known test function."
+  (declare (side-effect-free error-free))
+  ;; In theory this could also recognize values that are custom
+  ;; `hash-table-test's, but too often the :test name is different
+  ;; from the equality function, so it doesn't seem worthwhile.
+  (car (memq (or -compare-fn #'equal) '(equal eq eql))))
+
+(defvar dash--short-list-length 32
+  "Maximum list length considered short, for optimizations.
+For example, the speedup afforded by hash table lookup may start
+to outweigh its runtime and memory overhead for problem sizes
+greater than this value.  See also the discussion in PR #305.")
+
+(defun -distinct (list)
+  "Return a copy of LIST with all duplicate elements removed.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil.
+
+Alias: `-uniq'."
+  (declare (important-return-value t))
+  (let (test len)
+    (cond ((null list) ())
+          ;; Use a hash table if `-compare-fn' is a known hash table
+          ;; test function and the list is long enough.
+          ((and (setq test (dash--hash-test-fn))
+                (> (setq len (length list)) dash--short-list-length))
+           (let ((ht (make-hash-table :test test :size len)))
+             (--filter (unless (gethash it ht) (puthash it t ht)) list)))
+          ((let ((member (dash--member-fn)) uniq)
+             (--each list (unless (funcall member it uniq) (push it uniq)))
+             (nreverse uniq))))))
+
+(defalias '-uniq #'-distinct)
+
+(defun dash--size+ (size1 size2)
+  "Return the sum of nonnegative fixnums SIZE1 and SIZE2.
+Return `most-positive-fixnum' on overflow.  This ensures the
+result is a valid size, particularly for allocating hash tables,
+even in the presence of bignum support."
+  (declare (side-effect-free t))
+  (if (< size1 (- most-positive-fixnum size2))
+      (+ size1 size2)
+    most-positive-fixnum))
+
+(defun -union (list1 list2)
+  "Return a new list of distinct elements appearing in either LIST1 or LIST2.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil."
+  (declare (important-return-value t))
+  (let ((lists (list list1 list2)) test len union)
+    (cond ((null (or list1 list2)))
+          ;; Use a hash table if `-compare-fn' is a known hash table
+          ;; test function and the lists are long enough.
+          ((and (setq test (dash--hash-test-fn))
+                (> (setq len (dash--size+ (length list1) (length list2)))
+                   dash--short-list-length))
+           (let ((ht (make-hash-table :test test :size len)))
+             (dolist (l lists)
+               (--each l (unless (gethash it ht)
+                           (puthash it t ht)
+                           (push it union))))))
+          ((let ((member (dash--member-fn)))
+             (dolist (l lists)
+               (--each l (unless (funcall member it union) (push it union)))))))
+    (nreverse union)))
+
+(defun -intersection (list1 list2)
+  "Return a new list of distinct elements appearing in both LIST1 and LIST2.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil."
+  (declare (important-return-value t))
+  (let (test len)
+    (cond ((null (and list1 list2)) ())
+          ;; Use a hash table if `-compare-fn' is a known hash table
+          ;; test function and either list is long enough.
+          ((and (setq test (dash--hash-test-fn))
+                (> (setq len (length list2)) dash--short-list-length))
+           (let ((ht (make-hash-table :test test :size len)))
+             (--each list2 (puthash it t ht))
+             ;; Remove visited elements to avoid duplicates.
+             (--filter (when (gethash it ht) (remhash it ht) t) list1)))
+          ((let ((member (dash--member-fn)) intersection)
+             (--each list1 (and (funcall member it list2)
+                                (not (funcall member it intersection))
+                                (push it intersection)))
+             (nreverse intersection))))))
+
+(defun -difference (list1 list2)
+  "Return a new list with the distinct members of LIST1 that are not in LIST2.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil."
+  (declare (important-return-value t))
+  (let (test len1 len2)
+    (cond ((null list1) ())
+          ((null list2) (-distinct list1))
+          ;; Use a hash table if `-compare-fn' is a known hash table
+          ;; test function and the subtrahend is long enough.
+          ((and (setq test (dash--hash-test-fn))
+                (setq len1 (length list1))
+                (setq len2 (length list2))
+                (> (max len1 len2) dash--short-list-length))
+           (let ((ht1 (make-hash-table :test test :size len1))
+                 (ht2 (make-hash-table :test test :size len2)))
+             (--each list2 (puthash it t ht2))
+             ;; Avoid duplicates by tracking visited items in `ht1'.
+             (--filter (unless (or (gethash it ht2) (gethash it ht1))
+                         (puthash it t ht1))
+                       list1)))
+          ((let ((member (dash--member-fn)) difference)
+             (--each list1
+               (unless (or (funcall member it list2)
+                           (funcall member it difference))
+                 (push it difference)))
+             (nreverse difference))))))
+
+(defun -powerset (list)
+  "Return the power set of LIST."
+  (declare (pure t) (side-effect-free t))
+  (if (null list) (list ())
+    (let ((last (-powerset (cdr list))))
+      (nconc (mapcar (lambda (x) (cons (car list) x)) last)
+             last))))
+
+(defun -frequencies (list)
+  "Count the occurrences of each distinct element of LIST.
+
+Return an alist of (ELEMENT . N), where each ELEMENT occurs N
+times in LIST.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil.
+
+See also `-count' and `-group-by'."
+  (declare (important-return-value t))
+  (let (test len freqs)
+    (cond ((null list))
+          ((and (setq test (dash--hash-test-fn))
+                (> (setq len (length list)) dash--short-list-length))
+           (let ((ht (make-hash-table :test test :size len)))
+             ;; Share structure between hash table and returned list.
+             ;; This affords a single pass that preserves the input
+             ;; order, conses less garbage, and is faster than a
+             ;; second traversal (e.g., with `maphash').
+             (--each list
+               (let ((freq (gethash it ht)))
+                 (if freq
+                     (setcdr freq (1+ (cdr freq)))
+                   (push (puthash it (cons it 1) ht) freqs))))))
+          ((let ((assoc (dash--assoc-fn)))
+             (--each list
+               (let ((freq (funcall assoc it freqs)))
+                 (if freq
+                     (setcdr freq (1+ (cdr freq)))
+                   (push (cons it 1) freqs)))))))
+    (nreverse freqs)))
+
+(defun dash--numbers<= (nums)
+  "Return non-nil if NUMS is a list of non-decreasing numbers."
+  (declare (pure t) (side-effect-free t))
+  (or (null nums)
+      (let ((prev (pop nums)))
+        (and (numberp prev)
+             (--every (and (numberp it) (<= prev (setq prev it))) nums)))))
+
+(defun dash--next-lex-perm (array n)
+  "Update ARRAY of N numbers with its next lexicographic permutation.
+Return nil if there is no such successor.  N should be nonzero.
+
+This implements the salient steps of Algorithm L (Lexicographic
+permutation generation) as described in DE Knuth's The Art of
+Computer Programming, Volume 4A / Combinatorial Algorithms,
+Part I, Addison-Wesley, 2011, § 7.2.1.2, p. 319."
+  (setq n (1- n))
+  (let* ((l n)
+         (j (1- n))
+         (al (aref array n))
+         (aj al))
+    ;; L2. [Find j].
+    ;; Decrement j until a[j] < a[j+1].
+    (while (and (<= 0 j)
+                (<= aj (setq aj (aref array j))))
+      (setq j (1- j)))
+    ;; Terminate algorithm if j not found.
+    (when (>= j 0)
+      ;; L3. [Increase a[j]].
+      ;; Decrement l until a[j] < a[l].
+      (while (>= aj al)
+        (setq l (1- l) al (aref array l)))
+      ;; Swap a[j] and a[l].
+      (aset array j al)
+      (aset array l aj)
+      ;; L4. [Reverse a[j+1]...a[n]].
+      (setq l n)
+      (while (< (setq j (1+ j)) l)
+        (setq aj (aref array j))
+        (aset array j (aref array l))
+        (aset array l aj)
+        (setq l (1- l)))
+      array)))
+
+(defun dash--lex-perms (vec &optional original)
+  "Return a list of permutations of VEC in lexicographic order.
+Specifically, return only the successors of VEC in lexicographic
+order.  Each returned permutation is a list.  VEC should comprise
+one or more numbers, and may be destructively modified.
+
+If ORIGINAL is a vector, then VEC is interpreted as a set of
+indices into ORIGINAL.  In this case, the indices are permuted,
+and the resulting index permutations are used to dereference
+elements of ORIGINAL."
+  (let ((len (length vec)) perms)
+    (while vec
+      (push (if original
+                (--map (aref original it) vec)
+              (append vec ()))
+            perms)
+      (setq vec (dash--next-lex-perm vec len)))
+    (nreverse perms)))
+
+(defun dash--uniq-perms (list)
+  "Return a list of permutations of LIST.
+LIST is treated as if all its elements are distinct."
+  (let* ((vec (vconcat list))
+         (idxs (copy-sequence vec)))
+    ;; Just construct a vector of the list's indices and permute that.
+    (dotimes (i (length idxs))
+      (aset idxs i i))
+    (dash--lex-perms idxs vec)))
+
+(defun dash--multi-perms (list freqs)
+  "Return a list of permutations of the multiset LIST.
+FREQS should be an alist describing the frequency of each element
+in LIST, as returned by `-frequencies'."
+  (let (;; Distinct items in `list', aka the cars of `freqs'.
+        (uniq (make-vector (length freqs) nil))
+        ;; Indices into `uniq'.
+        (idxs (make-vector (length list) nil))
+        ;; Current index into `idxs'.
+        (i 0))
+    (--each freqs
+      (aset uniq it-index (car it))
+      ;; Populate `idxs' with as many copies of each `it-index' as
+      ;; there are corresponding duplicates.
+      (dotimes (_ (cdr it))
+        (aset idxs i it-index)
+        (setq i (1+ i))))
+    (dash--lex-perms idxs uniq)))
+
+(defun -permutations (list)
+  "Return the distinct permutations of LIST.
+
+Duplicate elements of LIST are determined by `equal', or by
+`-compare-fn' if that is non-nil."
+  (declare (important-return-value t))
+  (cond ((null list) (list ()))
+        ;; Optimization: a traversal of `list' is faster than the
+        ;; round trip via `dash--uniq-perms' or `dash--multi-perms'.
+        ((dash--numbers<= list)
+         (dash--lex-perms (vconcat list)))
+        ((let ((freqs (-frequencies list)))
+           ;; Is each element distinct?
+           (unless (--every (= (cdr it) 1) freqs)
+             (dash--multi-perms list freqs))))
+        ((dash--uniq-perms list))))
+
+(defun -inits (list)
+  "Return all prefixes of LIST."
+  (declare (pure t) (side-effect-free t))
+  (let ((res (list list)))
+    (setq list (reverse list))
+    (while list
+      (push (reverse (!cdr list)) res))
+    res))
+
+(defun -tails (list)
+  "Return all suffixes of LIST."
+  (declare (pure t) (side-effect-free t))
+  (-reductions-r-from #'cons nil list))
+
+(defun -common-prefix (&rest lists)
+  "Return the longest common prefix of LISTS."
+  (declare (pure t) (side-effect-free t))
+  (--reduce (--take-while (and acc (equal (pop acc) it)) it)
+            lists))
+
+(defun -common-suffix (&rest lists)
+  "Return the longest common suffix of LISTS."
+  (declare (pure t) (side-effect-free t))
+  (nreverse (apply #'-common-prefix (mapcar #'reverse lists))))
+
+(defun -contains? (list element)
+  "Return non-nil if LIST contains ELEMENT.
+
+The test for equality is done with `equal', or with `-compare-fn'
+if that is non-nil.  As with `member', the return value is
+actually the tail of LIST whose car is ELEMENT.
+
+Alias: `-contains-p'."
+  (declare (important-return-value t))
+  (funcall (dash--member-fn) element list))
+
+(defalias '-contains-p #'-contains?)
+
+(defun -same-items? (list1 list2)
+  "Return non-nil if LIST1 and LIST2 have the same distinct elements.
+
+The order of the elements in the lists does not matter.  The
+lists may be of different lengths, i.e., contain duplicate
+elements.  The test for equality is done with `equal', or with
+`-compare-fn' if that is non-nil.
+
+Alias: `-same-items-p'."
+  (declare (important-return-value t))
+  (let (test len1 len2)
+    (cond ((null (or list1 list2)))
+          ((null (and list1 list2)) nil)
+          ;; Use a hash table if `-compare-fn' is a known hash table
+          ;; test function and either list is long enough.
+          ((and (setq test (dash--hash-test-fn))
+                (setq len1 (length list1))
+                (setq len2 (length list2))
+                (> (max len1 len2) dash--short-list-length))
+           (let ((ht1 (make-hash-table :test test :size len1))
+                 (ht2 (make-hash-table :test test :size len2)))
+             (--each list1 (puthash it t ht1))
+             ;; Move visited elements from `ht1' to `ht2'.  This way,
+             ;; if visiting all of `list2' leaves `ht1' empty, then
+             ;; all elements from both lists have been accounted for.
+             (and (--every (cond ((gethash it ht1)
+                                  (remhash it ht1)
+                                  (puthash it t ht2))
+                                 ((gethash it ht2)))
+                           list2)
+                  (zerop (hash-table-count ht1)))))
+          ((let ((member (dash--member-fn)))
+             (and (--all? (funcall member it list2) list1)
+                  (--all? (funcall member it list1) list2)))))))
+
+(defalias '-same-items-p #'-same-items?)
+
+(defun -is-prefix? (prefix list)
+  "Return non-nil if PREFIX is a prefix of LIST.
+
+Alias: `-is-prefix-p'."
+  (declare (pure t) (side-effect-free t))
+  (--each-while list (and (equal (car prefix) it)
+                          (!cdr prefix)))
+  (null prefix))
+
+(defun -is-suffix? (suffix list)
+  "Return non-nil if SUFFIX is a suffix of LIST.
+
+Alias: `-is-suffix-p'."
+  (declare (pure t) (side-effect-free t))
+  (equal suffix (last list (length suffix))))
+
+(defun -is-infix? (infix list)
+  "Return non-nil if INFIX is infix of LIST.
+
+This operation runs in O(n^2) time
+
+Alias: `-is-infix-p'"
+  (declare (pure t) (side-effect-free t))
+  (let (done)
+    (while (and (not done) list)
+      (setq done (-is-prefix? infix list))
+      (!cdr list))
+    done))
+
+(defalias '-is-prefix-p '-is-prefix?)
+(defalias '-is-suffix-p '-is-suffix?)
+(defalias '-is-infix-p '-is-infix?)
+
+(defun -sort (comparator list)
+  "Sort LIST, stably, comparing elements using COMPARATOR.
+Return the sorted list.  LIST is NOT modified by side effects.
+COMPARATOR is called with two elements of LIST, and should return non-nil
+if the first element should sort before the second."
+  (declare (important-return-value t))
+  ;; Not yet worth changing to (sort list :lessp comparator);
+  ;; still seems as fast or slightly faster.
+  (sort (copy-sequence list) comparator))
+
+(defmacro --sort (form list)
+  "Anaphoric form of `-sort'."
+  (declare (debug (def-form form)))
+  `(-sort (lambda (it other) (ignore it other) ,form) ,list))
+
+(defun -list (&optional arg &rest args)
+  "Ensure ARG is a list.
+If ARG is already a list, return it as is (not a copy).
+Otherwise, return a new list with ARG as its only element.
+
+Another supported calling convention is (-list &rest ARGS).
+In this case, if ARG is not a list, a new list with all of
+ARGS as elements is returned.  This use is supported for
+backward compatibility and is otherwise deprecated."
+  (declare (advertised-calling-convention (arg) "2.18.0")
+           (pure t) (side-effect-free error-free))
+  (if (listp arg) arg (cons arg args)))
+
+(defun -repeat (n x)
+  "Return a new list of length N with each element being X.
+Return nil if N is less than 1."
+  (declare (side-effect-free t))
+  (and (>= n 0) (make-list n x)))
+
+(defun -sum (list)
+  "Return the sum of LIST."
+  (declare (pure t) (side-effect-free t))
+  (apply #'+ list))
+
+(defun -running-sum (list)
+  "Return a list with running sums of items in LIST.
+LIST must be non-empty."
+  (declare (pure t) (side-effect-free t))
+  (or list (signal 'wrong-type-argument (list #'consp list)))
+  (-reductions #'+ list))
+
+(defun -product (list)
+  "Return the product of LIST."
+  (declare (pure t) (side-effect-free t))
+  (apply #'* list))
+
+(defun -running-product (list)
+  "Return a list with running products of items in LIST.
+LIST must be non-empty."
+  (declare (pure t) (side-effect-free t))
+  (or list (signal 'wrong-type-argument (list #'consp list)))
+  (-reductions #'* list))
+
+(defun -max (list)
+  "Return the largest value from LIST of numbers or markers."
+  (declare (pure t) (side-effect-free t))
+  (apply #'max list))
+
+(defun -min (list)
+  "Return the smallest value from LIST of numbers or markers."
+  (declare (pure t) (side-effect-free t))
+  (apply #'min list))
+
+(defun -max-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the greatest element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (declare (important-return-value t))
+  (--reduce (if (funcall comparator it acc) it acc) list))
+
+(defun -min-by (comparator list)
+  "Take a comparison function COMPARATOR and a LIST and return
+the least element of the list by the comparison function.
+
+See also combinator `-on' which can transform the values before
+comparing them."
+  (declare (important-return-value t))
+  (--reduce (if (funcall comparator it acc) acc it) list))
+
+(defmacro --max-by (form list)
+  "Anaphoric version of `-max-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  (declare (debug (def-form form)))
+  `(-max-by (lambda (it other) (ignore it other) ,form) ,list))
+
+(defmacro --min-by (form list)
+  "Anaphoric version of `-min-by'.
+
+The items for the comparator form are exposed as \"it\" and \"other\"."
+  (declare (debug (def-form form)))
+  `(-min-by (lambda (it other) (ignore it other) ,form) ,list))
+
+(defun -iota (count &optional start step)
+  "Return a list containing COUNT numbers.
+Starts from START and adds STEP each time.  The default START is
+zero, the default STEP is 1.
+This function takes its name from the corresponding primitive in
+the APL language."
+  (declare (side-effect-free t))
+  (unless (natnump count)
+    (signal 'wrong-type-argument (list #'natnump count)))
+  (or start (setq start 0))
+  (or step (setq step 1))
+  (if (zerop step)
+      (make-list count start)
+    (--iterate (+ it step) start count)))
+
+(defun -fix (fn list)
+  "Compute the (least) fixpoint of FN with initial input LIST.
+
+FN is called at least once, results are compared with `equal'."
+  (declare (important-return-value t))
+  (let ((re (funcall fn list)))
+    (while (not (equal list re))
+      (setq list re)
+      (setq re (funcall fn re)))
+    re))
+
+(defmacro --fix (form list)
+  "Anaphoric form of `-fix'."
+  (declare (debug (def-form form)))
+  `(-fix (lambda (it) (ignore it) ,form) ,list))
+
+(defun -unfold (fun seed)
+  "Build a list from SEED using FUN.
+
+This is \"dual\" operation to `-reduce-r': while -reduce-r
+consumes a list to produce a single value, `-unfold' takes a
+seed value and builds a (potentially infinite!) list.
+
+FUN should return nil to stop the generating process, or a
+cons (A . B), where A will be prepended to the result and B is
+the new seed."
+  (declare (important-return-value t))
+  (let ((last (funcall fun seed)) r)
+    (while last
+      (push (car last) r)
+      (setq last (funcall fun (cdr last))))
+    (nreverse r)))
+
+(defmacro --unfold (form seed)
+  "Anaphoric version of `-unfold'."
+  (declare (debug (def-form form)))
+  `(-unfold (lambda (it) (ignore it) ,form) ,seed))
+
+(defun -cons-pair? (obj)
+  "Return non-nil if OBJ is a true cons pair.
+That is, a cons (A . B) where B is not a list.
+
+Alias: `-cons-pair-p'."
+  (declare (pure t) (side-effect-free error-free))
+  (nlistp (cdr-safe obj)))
+
+(defalias '-cons-pair-p '-cons-pair?)
+
+(defun -cons-to-list (con)
+  "Convert a cons pair to a list with `car' and `cdr' of the pair respectively."
+  (declare (pure t) (side-effect-free t))
+  (list (car con) (cdr con)))
+
+(defun -value-to-list (val)
+  "Convert a value to a list.
+
+If the value is a cons pair, make a list with two elements, `car'
+and `cdr' of the pair respectively.
+
+If the value is anything else, wrap it in a list."
+  (declare (pure t) (side-effect-free t))
+  (if (-cons-pair? val) (-cons-to-list val) (list val)))
+
+(defun -tree-mapreduce-from (fn folder init-value tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce-from' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (declare (important-return-value t))
+  (cond
+   ((null tree) ())
+   ((-cons-pair? tree) (funcall fn tree))
+   ((consp tree)
+    (-reduce-r-from
+     folder init-value
+     (mapcar (lambda (x) (-tree-mapreduce-from fn folder init-value x)) tree)))
+   ((funcall fn tree))))
+
+(defmacro --tree-mapreduce-from (form folder init-value tree)
+  "Anaphoric form of `-tree-mapreduce-from'."
+  (declare (debug (def-form def-form form form)))
+  `(-tree-mapreduce-from (lambda (it) (ignore it) ,form)
+                         (lambda (it acc) (ignore it acc) ,folder)
+                         ,init-value
+                         ,tree))
+
+(defun -tree-mapreduce (fn folder tree)
+  "Apply FN to each element of TREE, and make a list of the results.
+If elements of TREE are lists themselves, apply FN recursively to
+elements of these nested lists.
+
+Then reduce the resulting lists using FOLDER and initial value
+INIT-VALUE. See `-reduce-r-from'.
+
+This is the same as calling `-tree-reduce' after `-tree-map'
+but is twice as fast as it only traverse the structure once."
+  (declare (important-return-value t))
+  (cond
+   ((null tree) ())
+   ((-cons-pair? tree) (funcall fn tree))
+   ((consp tree)
+    (-reduce-r folder (mapcar (lambda (x) (-tree-mapreduce fn folder x)) tree)))
+   ((funcall fn tree))))
+
+(defmacro --tree-mapreduce (form folder tree)
+  "Anaphoric form of `-tree-mapreduce'."
+  (declare (debug (def-form def-form form)))
+  `(-tree-mapreduce (lambda (it) (ignore it) ,form)
+                    (lambda (it acc) (ignore it acc) ,folder)
+                    ,tree))
+
+(defun -tree-map (fn tree)
+  "Apply FN to each element of TREE while preserving the tree structure."
+  (declare (important-return-value t))
+  (cond
+   ((null tree) ())
+   ((-cons-pair? tree) (funcall fn tree))
+   ((consp tree)
+    (mapcar (lambda (x) (-tree-map fn x)) tree))
+   ((funcall fn tree))))
+
+(defmacro --tree-map (form tree)
+  "Anaphoric form of `-tree-map'."
+  (declare (debug (def-form form)))
+  `(-tree-map (lambda (it) (ignore it) ,form) ,tree))
+
+(defun -tree-reduce-from (fn init-value tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to INIT-VALUE and first element of the list,
+then on this result and second element from the list etc.
+
+The initial value is ignored on cons pairs as they always contain
+two elements."
+  (declare (important-return-value t))
+  (cond
+   ((null tree) ())
+   ((-cons-pair? tree) tree)
+   ((consp tree)
+    (-reduce-r-from
+     fn init-value
+     (mapcar (lambda (x) (-tree-reduce-from fn init-value x)) tree)))
+   (tree)))
+
+(defmacro --tree-reduce-from (form init-value tree)
+  "Anaphoric form of `-tree-reduce-from'."
+  (declare (debug (def-form form form)))
+  `(-tree-reduce-from (lambda (it acc) (ignore it acc) ,form)
+                      ,init-value ,tree))
+
+(defun -tree-reduce (fn tree)
+  "Use FN to reduce elements of list TREE.
+If elements of TREE are lists themselves, apply the reduction recursively.
+
+FN is first applied to first element of the list and second
+element, then on this result and third element from the list etc.
+
+See `-reduce-r' for how exactly are lists of zero or one element handled."
+  (declare (important-return-value t))
+  (cond
+   ((null tree) ())
+   ((-cons-pair? tree) tree)
+   ((consp tree)
+    (-reduce-r fn (mapcar (lambda (x) (-tree-reduce fn x)) tree)))
+   (tree)))
+
+(defmacro --tree-reduce (form tree)
+  "Anaphoric form of `-tree-reduce'."
+  (declare (debug (def-form form)))
+  `(-tree-reduce (lambda (it acc) (ignore it acc) ,form) ,tree))
+
+(defun -tree-map-nodes (pred fun tree)
+  "Call FUN on each node of TREE that satisfies PRED.
+
+If PRED returns nil, continue descending down this node.  If PRED
+returns non-nil, apply FUN to this node and do not descend
+further."
+  (cond ((funcall pred tree) (funcall fun tree))
+        ((and (listp tree) (listp (cdr tree)))
+         (-map (lambda (x) (-tree-map-nodes pred fun x)) tree))
+        (tree)))
+
+(defmacro --tree-map-nodes (pred form tree)
+  "Anaphoric form of `-tree-map-nodes'."
+  (declare (debug (def-form def-form form)))
+  `(-tree-map-nodes (lambda (it) (ignore it) ,pred)
+                    (lambda (it) (ignore it) ,form)
+                    ,tree))
+
+(defun -tree-seq (branch children tree)
+  "Return a sequence of the nodes in TREE, in depth-first search order.
+
+BRANCH is a predicate of one argument that returns non-nil if the
+passed argument is a branch, that is, a node that can have children.
+
+CHILDREN is a function of one argument that returns the children
+of the passed branch node.
+
+Non-branch nodes are simply copied."
+  (declare (important-return-value t))
+  (cons tree
+        (and (funcall branch tree)
+             (-mapcat (lambda (x) (-tree-seq branch children x))
+                      (funcall children tree)))))
+
+(defmacro --tree-seq (branch children tree)
+  "Anaphoric form of `-tree-seq'."
+  (declare (debug (def-form def-form form)))
+  `(-tree-seq (lambda (it) (ignore it) ,branch)
+              (lambda (it) (ignore it) ,children)
+              ,tree))
+
+(defun -clone (list)
+  "Create a deep copy of LIST.
+The new list has the same elements and structure but all cons are
+replaced with new ones.  This is useful when you need to clone a
+structure such as plist or alist."
+  (declare (side-effect-free t))
+  (-tree-map #'identity list))
+
+;;; Combinators
+
+(defalias '-partial #'apply-partially)
+
+(defun -rpartial (fn &rest args)
+  "Return a function that is a partial application of FN to ARGS.
+ARGS is a list of the last N arguments to pass to FN.  The result
+is a new function which does the same as FN, except that the last
+N arguments are fixed at the values with which this function was
+called.  This is like `-partial', except the arguments are fixed
+starting from the right rather than the left."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest args-before) (apply fn (append args-before args))))
+
+(defun -juxt (&rest fns)
+  "Return a function that is the juxtaposition of FNS.
+The returned function takes a variable number of ARGS, applies
+each of FNS in turn to ARGS, and returns the list of results."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest args) (mapcar (lambda (x) (apply x args)) fns)))
+
+(defun -compose (&rest fns)
+  "Compose FNS into a single composite function.
+Return a function that takes a variable number of ARGS, applies
+the last function in FNS to ARGS, and returns the result of
+calling each remaining function on the result of the previous
+function, right-to-left.  If no FNS are given, return a variadic
+`identity' function."
+  (declare (pure t) (side-effect-free error-free))
+  (let* ((fns (nreverse fns))
+         (head (car fns))
+         (tail (cdr fns)))
+    (cond (tail
+           (lambda (&rest args)
+             (--reduce-from (funcall it acc) (apply head args) tail)))
+          (fns head)
+          ((lambda (&optional arg &rest _) arg)))))
+
+(defun -applify (fn)
+  "Return a function that applies FN to a single list of args.
+This changes the arity of FN from taking N distinct arguments to
+taking 1 argument which is a list of N arguments."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (args) (apply fn args)))
+
+(defun -on (op trans)
+  "Return a function that calls TRANS on each arg and OP on the results.
+The returned function takes a variable number of arguments, calls
+the function TRANS on each one in turn, and then passes those
+results as the list of arguments to OP, in the same order.
+
+For example, the following pairs of expressions are morally
+equivalent:
+
+  (funcall (-on #\\='+ #\\='1+) 1 2 3) = (+ (1+ 1) (1+ 2) (1+ 3))
+  (funcall (-on #\\='+ #\\='1+))       = (+)"
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest args)
+    ;; This unrolling seems to be a relatively cheap way to keep the
+    ;; overhead of `mapcar' + `apply' in check.
+    (cond ((cddr args)
+           (apply op (mapcar trans args)))
+          ((cdr args)
+           (funcall op (funcall trans (car args)) (funcall trans (cadr args))))
+          (args
+           (funcall op (funcall trans (car args))))
+          ((funcall op)))))
+
+(defun -flip (fn)
+  "Return a function that calls FN with its arguments reversed.
+The returned function takes the same number of arguments as FN.
+
+For example, the following two expressions are morally
+equivalent:
+
+  (funcall (-flip #\\='-) 1 2) = (- 2 1)
+
+See also: `-rotate-args'."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest args) ;; Open-code for speed.
+    (cond ((cddr args) (apply fn (nreverse args)))
+          ((cdr args) (funcall fn (cadr args) (car args)))
+          (args (funcall fn (car args)))
+          ((funcall fn)))))
+
+(defun -rotate-args (n fn)
+  "Return a function that calls FN with args rotated N places to the right.
+The returned function takes the same number of arguments as FN,
+rotates the list of arguments N places to the right (left if N is
+negative) just like `-rotate', and applies FN to the result.
+
+See also: `-flip'."
+  (declare (pure t) (side-effect-free t))
+  (if (zerop n)
+      fn
+    (let ((even (= (% n 2) 0)))
+      (lambda (&rest args)
+        (cond ((cddr args) ;; Open-code for speed.
+               (apply fn (-rotate n args)))
+              ((cdr args)
+               (let ((fst (car args))
+                     (snd (cadr args)))
+                 (funcall fn (if even fst snd) (if even snd fst))))
+              (args
+               (funcall fn (car args)))
+              ((funcall fn)))))))
+
+(defun -const (c)
+  "Return a function that returns C ignoring any additional arguments.
+
+In types: a -> b -> a"
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest _) c))
+
+(defmacro -cut (&rest params)
+  "Take n-ary function and n arguments and specialize some of them.
+Arguments denoted by <> will be left unspecialized.
+
+See SRFI-26 for detailed description."
+  (declare (debug (&optional sexp &rest &or "<>" form)))
+  (let* ((i 0)
+         (args (--keep (when (eq it '<>)
+                         (setq i (1+ i))
+                         (make-symbol (format "D%d" i)))
+                       params)))
+    `(lambda ,args
+       ,(let ((body (--map (if (eq it '<>) (pop args) it) params)))
+          (if (eq (car params) '<>)
+              (cons #'funcall body)
+            body)))))
+
+(defun -not (pred)
+  "Return a predicate that negates the result of PRED.
+The returned predicate passes its arguments to PRED.  If PRED
+returns nil, the result is non-nil; otherwise the result is nil.
+
+See also: `-andfn' and `-orfn'."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (&rest args) (not (apply pred args))))
+
+(defun -orfn (&rest preds)
+  "Return a predicate that returns the first non-nil result of PREDS.
+The returned predicate takes a variable number of arguments,
+passes them to each predicate in PREDS in turn until one of them
+returns non-nil, and returns that non-nil result without calling
+the remaining PREDS.  If all PREDS return nil, or if no PREDS are
+given, the returned predicate returns nil.
+
+See also: `-andfn' and `-not'."
+  (declare (pure t) (side-effect-free error-free))
+  ;; Open-code for speed.
+  (cond ((cdr preds) (lambda (&rest args) (--some (apply it args) preds)))
+        (preds (car preds))
+        (#'ignore)))
+
+(defun -andfn (&rest preds)
+  "Return a predicate that returns non-nil if all PREDS do so.
+The returned predicate P takes a variable number of arguments and
+passes them to each predicate in PREDS in turn.  If any one of
+PREDS returns nil, P also returns nil without calling the
+remaining PREDS.  If all PREDS return non-nil, P returns the last
+such value.  If no PREDS are given, P always returns non-nil.
+
+See also: `-orfn' and `-not'."
+  (declare (pure t) (side-effect-free error-free))
+  ;; Open-code for speed.
+  (cond ((cdr preds) (lambda (&rest args) (--every (apply it args) preds)))
+        (preds (car preds))
+        ;; As a `pure' function, this runtime check may generate
+        ;; backward-incompatible bytecode for `(-andfn)' at compile-time,
+        ;; but I doubt that's a problem in practice (famous last words).
+        ((fboundp 'always) #'always)
+        ((lambda (&rest _) t))))
+
+(defun -iteratefn (fn n)
+  "Return a function FN composed N times with itself.
+
+FN is a unary function.  If you need to use a function of higher
+arity, use `-applify' first to turn it into a unary function.
+
+With n = 0, this acts as identity function.
+
+In types: (a -> a) -> Int -> a -> a.
+
+This function satisfies the following law:
+
+  (funcall (-iteratefn fn n) init) = (-last-item (-iterate fn init (1+ n)))."
+  (declare (pure t) (side-effect-free error-free))
+  (lambda (x) (--dotimes n (setq x (funcall fn x))) x))
+
+(defun -counter (&optional beg end inc)
+  "Return a closure that counts from BEG to END, with increment INC.
+
+The closure will return the next value in the counting sequence
+each time it is called, and nil after END is reached. BEG
+defaults to 0, INC defaults to 1, and if END is nil, the counter
+will increment indefinitely.
+
+The closure accepts any number of arguments, which are discarded."
+  (declare (pure t) (side-effect-free error-free))
+  (let ((inc (or inc 1))
+        (n (or beg 0)))
+    (lambda (&rest _)
+      (when (or (not end) (< n end))
+        (prog1 n
+          (setq n (+ n inc)))))))
+
+(defvar -fixfn-max-iterations 1000
+  "The default maximum number of iterations performed by `-fixfn'
+  unless otherwise specified.")
+
+(defun -fixfn (fn &optional equal-test halt-test)
+  "Return a function that computes the (least) fixpoint of FN.
+
+FN must be a unary function. The returned lambda takes a single
+argument, X, the initial value for the fixpoint iteration. The
+iteration halts when either of the following conditions is satisfied:
+
+ 1. Iteration converges to the fixpoint, with equality being
+    tested using EQUAL-TEST. If EQUAL-TEST is not specified,
+    `equal' is used. For functions over the floating point
+    numbers, it may be necessary to provide an appropriate
+    approximate comparison test.
+
+ 2. HALT-TEST returns a non-nil value. HALT-TEST defaults to a
+    simple counter that returns t after `-fixfn-max-iterations',
+    to guard against infinite iteration. Otherwise, HALT-TEST
+    must be a function that accepts a single argument, the
+    current value of X, and returns non-nil as long as iteration
+    should continue. In this way, a more sophisticated
+    convergence test may be supplied by the caller.
+
+The return value of the lambda is either the fixpoint or, if
+iteration halted before converging, a cons with car `halted' and
+cdr the final output from HALT-TEST.
+
+In types: (a -> a) -> a -> a."
+  (declare (important-return-value t))
+  (let ((eqfn   (or equal-test 'equal))
+        (haltfn (or halt-test
+                    (-not
+                     (-counter 0 -fixfn-max-iterations)))))
+    (lambda (x)
+      (let ((re (funcall fn x))
+            (halt? (funcall haltfn x)))
+        (while (and (not halt?) (not (funcall eqfn x re)))
+          (setq x     re
+                re    (funcall fn re)
+                halt? (funcall haltfn re)))
+        (if halt? (cons 'halted halt?)
+          re)))))
+
+(defun -prodfn (&rest fns)
+  "Return a function that applies each of FNS to each of a list of arguments.
+
+Takes a list of N functions and returns a function that takes a
+list of length N, applying Ith function to Ith element of the
+input list.  Returns a list of length N.
+
+In types (for N=2): ((a -> b), (c -> d)) -> (a, c) -> (b, d)
+
+This function satisfies the following laws:
+
+    (-compose (-prodfn f g ...)
+              (-prodfn f\\=' g\\=' ...))
+  = (-prodfn (-compose f f\\=')
+             (-compose g g\\=')
+             ...)
+
+    (-prodfn f g ...)
+  = (-juxt (-compose f (-partial #\\='nth 0))
+           (-compose g (-partial #\\='nth 1))
+           ...)
+
+    (-compose (-prodfn f g ...)
+              (-juxt f\\=' g\\=' ...))
+  = (-juxt (-compose f f\\=')
+           (-compose g g\\=')
+           ...)
+
+    (-compose (-partial #\\='nth n)
+              (-prod f1 f2 ...))
+  = (-compose fn (-partial #\\='nth n))"
+  (declare (pure t) (side-effect-free t))
+  (lambda (x) (--zip-with (funcall it other) fns x)))
+
+;;; Font lock
+
+(defvar dash--keywords
+  `(;; TODO: Do not fontify the following automatic variables
+    ;; globally; detect and limit to their local anaphoric scope.
+    (,(rx symbol-start (| "acc" "it" "it-index" "other") symbol-end)
+     0 font-lock-variable-name-face)
+    ;; Macros in dev/examples.el.  Based on `lisp-mode-symbol-regexp'.
+    (,(rx ?\( (group (| "defexamples" "def-example-group")) symbol-end
+          (+ (in "\t "))
+          (group (* (| (syntax word) (syntax symbol) (: ?\\ nonl)))))
+     (1 font-lock-keyword-face)
+     (2 font-lock-function-name-face))
+    ;; Symbols in dev/examples.el.
+    ,(rx symbol-start (| "=>" "~>" "!!>") symbol-end)
+    ;; Elisp macro fontification was static prior to Emacs 25.
+    ,@(when (< emacs-major-version 25)
+        (let ((macs '("!cdr"
+                      "!cons"
+                      "-->"
+                      "--all-p"
+                      "--all?"
+                      "--annotate"
+                      "--any"
+                      "--any-p"
+                      "--any?"
+                      "--count"
+                      "--dotimes"
+                      "--doto"
+                      "--drop-while"
+                      "--each"
+                      "--each-indexed"
+                      "--each-r"
+                      "--each-r-while"
+                      "--each-while"
+                      "--every"
+                      "--every-p"
+                      "--every?"
+                      "--filter"
+                      "--find"
+                      "--find-index"
+                      "--find-indices"
+                      "--find-last-index"
+                      "--first"
+                      "--fix"
+                      "--group-by"
+                      "--if-let"
+                      "--iterate"
+                      "--keep"
+                      "--last"
+                      "--map"
+                      "--map-first"
+                      "--map-indexed"
+                      "--map-last"
+                      "--map-when"
+                      "--mapcat"
+                      "--max-by"
+                      "--min-by"
+                      "--none-p"
+                      "--none?"
+                      "--only-some-p"
+                      "--only-some?"
+                      "--partition-after-pred"
+                      "--partition-by"
+                      "--partition-by-header"
+                      "--reduce"
+                      "--reduce-from"
+                      "--reduce-r"
+                      "--reduce-r-from"
+                      "--reductions"
+                      "--reductions-from"
+                      "--reductions-r"
+                      "--reductions-r-from"
+                      "--reject"
+                      "--reject-first"
+                      "--reject-last"
+                      "--remove"
+                      "--remove-first"
+                      "--remove-last"
+                      "--replace-where"
+                      "--select"
+                      "--separate"
+                      "--some"
+                      "--some-p"
+                      "--some?"
+                      "--sort"
+                      "--splice"
+                      "--splice-list"
+                      "--split-when"
+                      "--split-with"
+                      "--take-while"
+                      "--tree-map"
+                      "--tree-map-nodes"
+                      "--tree-mapreduce"
+                      "--tree-mapreduce-from"
+                      "--tree-reduce"
+                      "--tree-reduce-from"
+                      "--tree-seq"
+                      "--unfold"
+                      "--update-at"
+                      "--when-let"
+                      "--zip-with"
+                      "->"
+                      "->>"
+                      "-as->"
+                      "-cut"
+                      "-doto"
+                      "-if-let"
+                      "-if-let*"
+                      "-lambda"
+                      "-let"
+                      "-let*"
+                      "-setq"
+                      "-some-->"
+                      "-some->"
+                      "-some->>"
+                      "-split-on"
+                      "-when-let"
+                      "-when-let*")))
+          `((,(concat "(" (regexp-opt macs 'symbols)) . 1)))))
+  "Font lock keywords for `dash-fontify-mode'.")
+
+(defcustom dash-fontify-mode-lighter nil
+  "Mode line lighter for `dash-fontify-mode'.
+Either a string to display in the mode line when
+`dash-fontify-mode' is on, or nil to display
+nothing (the default)."
+  :package-version '(dash . "2.18.0")
+  :type '(choice (string :tag "Lighter" :value " Dash")
+                 (const :tag "Nothing" nil)))
+
+;;;###autoload
+(define-minor-mode dash-fontify-mode
+  "Toggle fontification of Dash special variables.
+
+Dash-Fontify mode is a buffer-local minor mode intended for Emacs
+Lisp buffers.  Enabling it causes the special variables bound in
+anaphoric Dash macros to be fontified.  These anaphoras include
+`it', `it-index', `acc', and `other'.  In older Emacs versions
+which do not dynamically detect macros, Dash-Fontify mode
+additionally fontifies Dash macro calls.
+
+See also `dash-fontify-mode-lighter' and
+`global-dash-fontify-mode'."
+  :lighter dash-fontify-mode-lighter
+  (if dash-fontify-mode
+      (font-lock-add-keywords nil dash--keywords t)
+    (font-lock-remove-keywords nil dash--keywords))
+  (cond ((fboundp 'font-lock-flush) ;; Added in Emacs 25.
+         (font-lock-flush))
+        ;; `font-lock-fontify-buffer' unconditionally enables
+        ;; `font-lock-mode' and is marked `interactive-only' in later
+        ;; Emacs versions which have `font-lock-flush', so we guard
+        ;; and pacify as needed, respectively.
+        (font-lock-mode
+         (with-no-warnings
+           (font-lock-fontify-buffer)))))
+
+(defun dash--turn-on-fontify-mode ()
+  "Enable `dash-fontify-mode' if in an Emacs Lisp buffer."
+  (when (derived-mode-p #'emacs-lisp-mode)
+    (dash-fontify-mode)))
+
+;;;###autoload
+(define-globalized-minor-mode global-dash-fontify-mode
+  dash-fontify-mode dash--turn-on-fontify-mode)
+
+(defcustom dash-enable-fontlock nil
+  "If non-nil, fontify Dash macro calls and special variables."
+  :set (lambda (sym val)
+         (set-default sym val)
+         (global-dash-fontify-mode (if val 1 0)))
+  :type 'boolean)
+
+(make-obsolete-variable
+ 'dash-enable-fontlock #'global-dash-fontify-mode "2.18.0")
+
+(define-obsolete-function-alias
+  'dash-enable-font-lock #'global-dash-fontify-mode "2.18.0")
+
+;;; Info
+
+(defvar dash--info-doc-spec '("(dash) Index" nil "^ -+ .*: " "\\( \\|$\\)")
+  "The Dash :doc-spec entry for `info-lookup-alist'.
+It is based on that for `emacs-lisp-mode'.")
+
+(defun dash--info-elisp-docs ()
+  "Return the `emacs-lisp-mode' symbol docs from `info-lookup-alist'.
+Specifically, return the cons containing their
+`info-lookup->doc-spec' so that we can modify it."
+  (defvar info-lookup-alist)
+  (nthcdr 3 (assq #'emacs-lisp-mode (cdr (assq 'symbol info-lookup-alist)))))
+
+;;;###autoload
+(defun dash-register-info-lookup ()
+  "Register the Dash Info manual with `info-lookup-symbol'.
+This allows Dash symbols to be looked up with \\[info-lookup-symbol]."
+  (interactive)
+  (require 'info-look)
+  (let ((docs (dash--info-elisp-docs)))
+    (setcar docs (append (car docs) (list dash--info-doc-spec)))
+    (info-lookup-reset)))
+
+(defun dash-unload-function ()
+  "Remove Dash from `info-lookup-alist'.
+Used by `unload-feature', which see."
+  (let ((docs (and (featurep 'info-look)
+                   (dash--info-elisp-docs))))
+    (when (member dash--info-doc-spec (car docs))
+      (setcar docs (remove dash--info-doc-spec (car docs)))
+      (info-lookup-reset)))
+  nil)
+
+(provide 'dash)
+;;; dash.el ends here
diff --git a/emacs/elpa/dash-20240510.1327/dash.elc b/emacs/elpa/dash-20240510.1327/dash.elc
Binary files differ.
diff --git a/emacs/elpa/dash-20240510.1327/dash.info b/emacs/elpa/dash-20240510.1327/dash.info
@@ -0,0 +1,4948 @@
+This is dash.info, produced by makeinfo version 6.7 from dash.texi.
+
+This manual is for Dash version 2.19.1.
+
+   Copyright © 2012–2024 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being “GNU General Public
+     License,” and no Front-Cover Texts or Back-Cover Texts.  A copy of
+     the license is included in the section entitled “GNU Free
+     Documentation License”.
+INFO-DIR-SECTION Emacs
+START-INFO-DIR-ENTRY
+* Dash: (dash.info).    A modern list library for GNU Emacs.
+END-INFO-DIR-ENTRY
+
+
+File: dash.info,  Node: Top,  Next: Installation,  Up: (dir)
+
+Dash
+****
+
+This manual is for Dash version 2.19.1.
+
+   Copyright © 2012–2024 Free Software Foundation, Inc.
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU Free Documentation License,
+     Version 1.3 or any later version published by the Free Software
+     Foundation; with the Invariant Sections being “GNU General Public
+     License,” and no Front-Cover Texts or Back-Cover Texts.  A copy of
+     the license is included in the section entitled “GNU Free
+     Documentation License”.
+
+* Menu:
+
+* Installation::        Installing and configuring Dash.
+* Functions::           Dash API reference.
+* Development::         Contributing to Dash development.
+
+Appendices
+
+* FDL::                 The license for this documentation.
+* GPL::                 Conditions for copying and changing Dash.
+* Index::               Index including functions and macros.
+
+ — The Detailed Node Listing —
+
+Installation
+
+* Using in a package::  Listing Dash as a package dependency.
+* Fontification of special variables::  Font Lock of anaphoric macro variables.
+* Info symbol lookup::  Looking up Dash symbols in this manual.
+
+Functions
+
+* Maps::
+* Sublist selection::
+* List to list::
+* Reductions::
+* Unfolding::
+* Predicates::
+* Partitioning::
+* Indexing::
+* Set operations::
+* Other list operations::
+* Tree operations::
+* Threading macros::
+* Binding::
+* Side effects::
+* Destructive operations::
+* Function combinators::
+
+Development
+
+* Contribute::          How to contribute.
+* Contributors::        List of contributors.
+
+
+File: dash.info,  Node: Installation,  Next: Functions,  Prev: Top,  Up: Top
+
+1 Installation
+**************
+
+Dash is available on GNU ELPA (https://elpa.gnu.org/), GNU-devel ELPA
+(https://elpa.gnu.org/devel/), and MELPA (https://melpa.org/), and can
+be installed with the standard command ‘package-install’ (*note
+(emacs)Package Installation::).
+
+‘M-x package-install <RET> dash <RET>’
+     Install the Dash library.
+
+   Alternatively, you can just dump ‘dash.el’ in your ‘load-path’
+somewhere (*note (emacs)Lisp Libraries::).
+
+* Menu:
+
+* Using in a package::  Listing Dash as a package dependency.
+* Fontification of special variables::  Font Lock of anaphoric macro variables.
+* Info symbol lookup::  Looking up Dash symbols in this manual.
+
+
+File: dash.info,  Node: Using in a package,  Next: Fontification of special variables,  Up: Installation
+
+1.1 Using in a package
+======================
+
+If you use Dash in your own package, be sure to list it as a dependency
+in the library’s headers as follows (*note (elisp)Library Headers::).
+
+     ;; Package-Requires: ((dash "2.19.1"))
+
+
+File: dash.info,  Node: Fontification of special variables,  Next: Info symbol lookup,  Prev: Using in a package,  Up: Installation
+
+1.2 Fontification of special variables
+======================================
+
+The autoloaded minor mode ‘dash-fontify-mode’ is provided for optional
+fontification of anaphoric Dash variables (‘it’, ‘acc’, etc.) in Emacs
+Lisp buffers using search-based Font Lock (*note (emacs)Font Lock::).
+In older Emacs versions which do not dynamically detect macros, the
+minor mode also fontifies calls to Dash macros.
+
+   To automatically enable the minor mode in all Emacs Lisp buffers,
+just call its autoloaded global counterpart ‘global-dash-fontify-mode’,
+either interactively or from your ‘user-init-file’:
+
+     (global-dash-fontify-mode)
+
+
+File: dash.info,  Node: Info symbol lookup,  Prev: Fontification of special variables,  Up: Installation
+
+1.3 Info symbol lookup
+======================
+
+While editing Elisp files, you can use ‘C-h S’ (‘info-lookup-symbol’) to
+look up Elisp symbols in the relevant Info manuals (*note (emacs)Info
+Lookup::).  To enable the same for Dash symbols, use the command
+‘dash-register-info-lookup’.  It can be called directly when needed, or
+automatically from your ‘user-init-file’.  For example:
+
+     (with-eval-after-load 'info-look
+       (dash-register-info-lookup))
+
+
+File: dash.info,  Node: Functions,  Next: Development,  Prev: Installation,  Up: Top
+
+2 Functions
+***********
+
+This chapter contains reference documentation for the Dash API
+(Application Programming Interface).  The names of all public functions
+defined in the library are prefixed with a dash character (‘-’).
+
+   The library also provides anaphoric macro versions of functions where
+that makes sense.  The names of these macros are prefixed with two
+dashes (‘--’) instead of one.
+
+   For instance, while the function ‘-map’ applies a function to each
+element of a list, its anaphoric counterpart ‘--map’ evaluates a form
+with the local variable ‘it’ temporarily bound to the current list
+element instead.
+
+     ;; Normal version.
+     (-map (lambda (n) (* n n)) '(1 2 3 4))
+         ⇒ (1 4 9 16)
+
+     ;; Anaphoric version.
+     (--map (* it it) '(1 2 3 4))
+         ⇒ (1 4 9 16)
+
+   The normal version can, of course, also be written as in the
+following example, which demonstrates the utility of both versions.
+
+     (defun my-square (n)
+       "Return N multiplied by itself."
+       (* n n))
+
+     (-map #'my-square '(1 2 3 4))
+         ⇒ (1 4 9 16)
+
+* Menu:
+
+* Maps::
+* Sublist selection::
+* List to list::
+* Reductions::
+* Unfolding::
+* Predicates::
+* Partitioning::
+* Indexing::
+* Set operations::
+* Other list operations::
+* Tree operations::
+* Threading macros::
+* Binding::
+* Side effects::
+* Destructive operations::
+* Function combinators::
+
+
+File: dash.info,  Node: Maps,  Next: Sublist selection,  Up: Functions
+
+2.1 Maps
+========
+
+Functions in this category take a transforming function, which is then
+applied sequentially to each or selected elements of the input list.
+The results are collected in order and returned as a new list.
+
+ -- Function: -map (fn list)
+     Apply FN to each item in LIST and return the list of results.
+
+     This function’s anaphoric counterpart is ‘--map’.
+
+          (-map (lambda (num) (* num num)) '(1 2 3 4))
+              ⇒ (1 4 9 16)
+          (-map #'1+ '(1 2 3 4))
+              ⇒ (2 3 4 5)
+          (--map (* it it) '(1 2 3 4))
+              ⇒ (1 4 9 16)
+
+ -- Function: -map-when (pred rep list)
+     Use PRED to conditionally apply REP to each item in LIST.  Return a
+     copy of LIST where the items for which PRED returns ‘nil’ are
+     unchanged, and the rest are mapped through the REP function.
+
+     Alias: ‘-replace-where’
+
+     See also: ‘-update-at’ (*note -update-at::)
+
+          (-map-when 'even? 'square '(1 2 3 4))
+              ⇒ (1 4 3 16)
+          (--map-when (> it 2) (* it it) '(1 2 3 4))
+              ⇒ (1 2 9 16)
+          (--map-when (= it 2) 17 '(1 2 3 4))
+              ⇒ (1 17 3 4)
+
+ -- Function: -map-first (pred rep list)
+     Use PRED to determine the first item in LIST to call REP on.
+     Return a copy of LIST where the first item for which PRED returns
+     non-‘nil’ is replaced with the result of calling REP on that item.
+
+     See also: ‘-map-when’ (*note -map-when::), ‘-replace-first’ (*note
+     -replace-first::)
+
+          (-map-first 'even? 'square '(1 2 3 4))
+              ⇒ (1 4 3 4)
+          (--map-first (> it 2) (* it it) '(1 2 3 4))
+              ⇒ (1 2 9 4)
+          (--map-first (= it 2) 17 '(1 2 3 2))
+              ⇒ (1 17 3 2)
+
+ -- Function: -map-last (pred rep list)
+     Use PRED to determine the last item in LIST to call REP on.  Return
+     a copy of LIST where the last item for which PRED returns non-‘nil’
+     is replaced with the result of calling REP on that item.
+
+     See also: ‘-map-when’ (*note -map-when::), ‘-replace-last’ (*note
+     -replace-last::)
+
+          (-map-last 'even? 'square '(1 2 3 4))
+              ⇒ (1 2 3 16)
+          (--map-last (> it 2) (* it it) '(1 2 3 4))
+              ⇒ (1 2 3 16)
+          (--map-last (= it 2) 17 '(1 2 3 2))
+              ⇒ (1 2 3 17)
+
+ -- Function: -map-indexed (fn list)
+     Apply FN to each index and item in LIST and return the list of
+     results.  This is like ‘-map’ (*note -map::), but FN takes two
+     arguments: the index of the current element within LIST, and the
+     element itself.
+
+     This function’s anaphoric counterpart is ‘--map-indexed’.
+
+     For a side-effecting variant, see also ‘-each-indexed’ (*note
+     -each-indexed::).
+
+          (-map-indexed (lambda (index item) (- item index)) '(1 2 3 4))
+              ⇒ (1 1 1 1)
+          (--map-indexed (- it it-index) '(1 2 3 4))
+              ⇒ (1 1 1 1)
+          (-map-indexed #'* '(1 2 3 4))
+              ⇒ (0 2 6 12)
+
+ -- Function: -annotate (fn list)
+     Pair each item in LIST with the result of passing it to FN.
+
+     Return an alist of (RESULT .  ITEM), where each ITEM is the
+     corresponding element of LIST, and RESULT is the value obtained by
+     calling FN on ITEM.
+
+     This function’s anaphoric counterpart is ‘--annotate’.
+
+          (-annotate #'1+ '(1 2 3))
+              ⇒ ((2 . 1) (3 . 2) (4 . 3))
+          (-annotate #'length '((f o o) (bar baz)))
+              ⇒ ((3 f o o) (2 bar baz))
+          (--annotate (> it 1) '(0 1 2 3))
+              ⇒ ((nil . 0) (nil . 1) (t . 2) (t . 3))
+
+ -- Function: -splice (pred fun list)
+     Splice lists generated by FUN in place of items satisfying PRED in
+     LIST.
+
+     Call PRED on each element of LIST.  Whenever the result of PRED is
+     ‘nil’, leave that ‘it’ as-is.  Otherwise, call FUN on the same ‘it’
+     that satisfied PRED.  The result should be a (possibly empty) list
+     of items to splice in place of ‘it’ in LIST.
+
+     This can be useful as an alternative to the ‘,@’ construct in a ‘`’
+     structure, in case you need to splice several lists at marked
+     positions (for example with keywords).
+
+     This function’s anaphoric counterpart is ‘--splice’.
+
+     See also: ‘-splice-list’ (*note -splice-list::), ‘-insert-at’
+     (*note -insert-at::).
+
+          (-splice #'numberp (lambda (n) (list n n)) '(a 1 b 2))
+              ⇒ (a 1 1 b 2 2)
+          (--splice t (list it it) '(1 2 3 4))
+              ⇒ (1 1 2 2 3 3 4 4)
+          (--splice (eq it :magic) '((magical) (code)) '((foo) :magic (bar)))
+              ⇒ ((foo) (magical) (code) (bar))
+
+ -- Function: -splice-list (pred new-list list)
+     Splice NEW-LIST in place of elements matching PRED in LIST.
+
+     See also: ‘-splice’ (*note -splice::), ‘-insert-at’ (*note
+     -insert-at::)
+
+          (-splice-list 'keywordp '(a b c) '(1 :foo 2))
+              ⇒ (1 a b c 2)
+          (-splice-list 'keywordp nil '(1 :foo 2))
+              ⇒ (1 2)
+          (--splice-list (keywordp it) '(a b c) '(1 :foo 2))
+              ⇒ (1 a b c 2)
+
+ -- Function: -mapcat (fn list)
+     Return the concatenation of the result of mapping FN over LIST.
+     Thus function FN should return a list.
+
+          (-mapcat 'list '(1 2 3))
+              ⇒ (1 2 3)
+          (-mapcat (lambda (item) (list 0 item)) '(1 2 3))
+              ⇒ (0 1 0 2 0 3)
+          (--mapcat (list 0 it) '(1 2 3))
+              ⇒ (0 1 0 2 0 3)
+
+ -- Function: -copy (list)
+     Create a shallow copy of LIST.
+
+          (-copy '(1 2 3))
+              ⇒ (1 2 3)
+          (let ((a '(1 2 3))) (eq a (-copy a)))
+              ⇒ nil
+
+
+File: dash.info,  Node: Sublist selection,  Next: List to list,  Prev: Maps,  Up: Functions
+
+2.2 Sublist selection
+=====================
+
+Functions returning a sublist of the original list.
+
+ -- Function: -filter (pred list)
+     Return a new list of the items in LIST for which PRED returns
+     non-‘nil’.
+
+     Alias: ‘-select’.
+
+     This function’s anaphoric counterpart is ‘--filter’.
+
+     For similar operations, see also ‘-keep’ (*note -keep::) and
+     ‘-remove’ (*note -remove::).
+
+          (-filter (lambda (num) (= 0 (% num 2))) '(1 2 3 4))
+              ⇒ (2 4)
+          (-filter #'natnump '(-2 -1 0 1 2))
+              ⇒ (0 1 2)
+          (--filter (= 0 (% it 2)) '(1 2 3 4))
+              ⇒ (2 4)
+
+ -- Function: -remove (pred list)
+     Return a new list of the items in LIST for which PRED returns
+     ‘nil’.
+
+     Alias: ‘-reject’.
+
+     This function’s anaphoric counterpart is ‘--remove’.
+
+     For similar operations, see also ‘-keep’ (*note -keep::) and
+     ‘-filter’ (*note -filter::).
+
+          (-remove (lambda (num) (= 0 (% num 2))) '(1 2 3 4))
+              ⇒ (1 3)
+          (-remove #'natnump '(-2 -1 0 1 2))
+              ⇒ (-2 -1)
+          (--remove (= 0 (% it 2)) '(1 2 3 4))
+              ⇒ (1 3)
+
+ -- Function: -remove-first (pred list)
+     Remove the first item from LIST for which PRED returns non-‘nil’.
+     This is a non-destructive operation, but only the front of LIST
+     leading up to the removed item is a copy; the rest is LIST’s
+     original tail.  If no item is removed, then the result is a
+     complete copy.
+
+     Alias: ‘-reject-first’.
+
+     This function’s anaphoric counterpart is ‘--remove-first’.
+
+     See also ‘-map-first’ (*note -map-first::), ‘-remove-item’ (*note
+     -remove-item::), and ‘-remove-last’ (*note -remove-last::).
+
+          (-remove-first #'natnump '(-2 -1 0 1 2))
+              ⇒ (-2 -1 1 2)
+          (-remove-first #'stringp '(1 2 "first" "second"))
+              ⇒ (1 2 "second")
+          (--remove-first (> it 3) '(1 2 3 4 5 6))
+              ⇒ (1 2 3 5 6)
+
+ -- Function: -remove-last (pred list)
+     Remove the last item from LIST for which PRED returns non-‘nil’.
+     The result is a copy of LIST regardless of whether an element is
+     removed.
+
+     Alias: ‘-reject-last’.
+
+     This function’s anaphoric counterpart is ‘--remove-last’.
+
+     See also ‘-map-last’ (*note -map-last::), ‘-remove-item’ (*note
+     -remove-item::), and ‘-remove-first’ (*note -remove-first::).
+
+          (-remove-last #'natnump '(1 3 5 4 7 8 10 -11))
+              ⇒ (1 3 5 4 7 8 -11)
+          (-remove-last #'stringp '(1 2 "last" "second"))
+              ⇒ (1 2 "last")
+          (--remove-last (> it 3) '(1 2 3 4 5 6 7 8 9 10))
+              ⇒ (1 2 3 4 5 6 7 8 9)
+
+ -- Function: -remove-item (item list)
+     Return a copy of LIST with all occurrences of ITEM removed.  The
+     comparison is done with ‘equal’.
+
+          (-remove-item 3 '(1 2 3 2 3 4 5 3))
+              ⇒ (1 2 2 4 5)
+          (-remove-item 'foo '(foo bar baz foo))
+              ⇒ (bar baz)
+          (-remove-item "bob" '("alice" "bob" "eve" "bob"))
+              ⇒ ("alice" "eve")
+
+ -- Function: -non-nil (list)
+     Return a copy of LIST with all ‘nil’ items removed.
+
+          (-non-nil '(nil 1 nil 2 nil nil 3 4 nil 5 nil))
+              ⇒ (1 2 3 4 5)
+          (-non-nil '((nil)))
+              ⇒ ((nil))
+          (-non-nil ())
+              ⇒ ()
+
+ -- Function: -slice (list from &optional to step)
+     Return copy of LIST, starting from index FROM to index TO.
+
+     FROM or TO may be negative.  These values are then interpreted
+     modulo the length of the list.
+
+     If STEP is a number, only each STEPth item in the resulting section
+     is returned.  Defaults to 1.
+
+          (-slice '(1 2 3 4 5) 1)
+              ⇒ (2 3 4 5)
+          (-slice '(1 2 3 4 5) 0 3)
+              ⇒ (1 2 3)
+          (-slice '(1 2 3 4 5 6 7 8 9) 1 -1 2)
+              ⇒ (2 4 6 8)
+
+ -- Function: -take (n list)
+     Return a copy of the first N items in LIST.  Return a copy of LIST
+     if it contains N items or fewer.  Return ‘nil’ if N is zero or
+     less.
+
+     See also: ‘-take-last’ (*note -take-last::).
+
+          (-take 3 '(1 2 3 4 5))
+              ⇒ (1 2 3)
+          (-take 17 '(1 2 3 4 5))
+              ⇒ (1 2 3 4 5)
+          (-take 0 '(1 2 3 4 5))
+              ⇒ ()
+
+ -- Function: -take-last (n list)
+     Return a copy of the last N items of LIST in order.  Return a copy
+     of LIST if it contains N items or fewer.  Return ‘nil’ if N is zero
+     or less.
+
+     See also: ‘-take’ (*note -take::).
+
+          (-take-last 3 '(1 2 3 4 5))
+              ⇒ (3 4 5)
+          (-take-last 17 '(1 2 3 4 5))
+              ⇒ (1 2 3 4 5)
+          (-take-last 1 '(1 2 3 4 5))
+              ⇒ (5)
+
+ -- Function: -drop (n list)
+     Return the tail (not a copy) of LIST without the first N items.
+     Return ‘nil’ if LIST contains N items or fewer.  Return LIST if N
+     is zero or less.
+
+     For another variant, see also ‘-drop-last’ (*note -drop-last::).
+
+          (-drop 3 '(1 2 3 4 5))
+              ⇒ (4 5)
+          (-drop 17 '(1 2 3 4 5))
+              ⇒ ()
+          (-drop 0 '(1 2 3 4 5))
+              ⇒ (1 2 3 4 5)
+
+ -- Function: -drop-last (n list)
+     Return a copy of LIST without its last N items.  Return a copy of
+     LIST if N is zero or less.  Return ‘nil’ if LIST contains N items
+     or fewer.
+
+     See also: ‘-drop’ (*note -drop::).
+
+          (-drop-last 3 '(1 2 3 4 5))
+              ⇒ (1 2)
+          (-drop-last 17 '(1 2 3 4 5))
+              ⇒ ()
+          (-drop-last 0 '(1 2 3 4 5))
+              ⇒ (1 2 3 4 5)
+
+ -- Function: -take-while (pred list)
+     Take successive items from LIST for which PRED returns non-‘nil’.
+     PRED is a function of one argument.  Return a new list of the
+     successive elements from the start of LIST for which PRED returns
+     non-‘nil’.
+
+     This function’s anaphoric counterpart is ‘--take-while’.
+
+     For another variant, see also ‘-drop-while’ (*note -drop-while::).
+
+          (-take-while #'even? '(1 2 3 4))
+              ⇒ ()
+          (-take-while #'even? '(2 4 5 6))
+              ⇒ (2 4)
+          (--take-while (< it 4) '(1 2 3 4 3 2 1))
+              ⇒ (1 2 3)
+
+ -- Function: -drop-while (pred list)
+     Drop successive items from LIST for which PRED returns non-‘nil’.
+     PRED is a function of one argument.  Return the tail (not a copy)
+     of LIST starting from its first element for which PRED returns
+     ‘nil’.
+
+     This function’s anaphoric counterpart is ‘--drop-while’.
+
+     For another variant, see also ‘-take-while’ (*note -take-while::).
+
+          (-drop-while #'even? '(1 2 3 4))
+              ⇒ (1 2 3 4)
+          (-drop-while #'even? '(2 4 5 6))
+              ⇒ (5 6)
+          (--drop-while (< it 4) '(1 2 3 4 3 2 1))
+              ⇒ (4 3 2 1)
+
+ -- Function: -select-by-indices (indices list)
+     Return a list whose elements are elements from LIST selected as
+     ‘(nth i list)‘ for all i from INDICES.
+
+          (-select-by-indices '(4 10 2 3 6) '("v" "e" "l" "o" "c" "i" "r" "a" "p" "t" "o" "r"))
+              ⇒ ("c" "o" "l" "o" "r")
+          (-select-by-indices '(2 1 0) '("a" "b" "c"))
+              ⇒ ("c" "b" "a")
+          (-select-by-indices '(0 1 2 0 1 3 3 1) '("f" "a" "r" "l"))
+              ⇒ ("f" "a" "r" "f" "a" "l" "l" "a")
+
+ -- Function: -select-columns (columns table)
+     Select COLUMNS from TABLE.
+
+     TABLE is a list of lists where each element represents one row.  It
+     is assumed each row has the same length.
+
+     Each row is transformed such that only the specified COLUMNS are
+     selected.
+
+     See also: ‘-select-column’ (*note -select-column::),
+     ‘-select-by-indices’ (*note -select-by-indices::)
+
+          (-select-columns '(0 2) '((1 2 3) (a b c) (:a :b :c)))
+              ⇒ ((1 3) (a c) (:a :c))
+          (-select-columns '(1) '((1 2 3) (a b c) (:a :b :c)))
+              ⇒ ((2) (b) (:b))
+          (-select-columns nil '((1 2 3) (a b c) (:a :b :c)))
+              ⇒ (nil nil nil)
+
+ -- Function: -select-column (column table)
+     Select COLUMN from TABLE.
+
+     TABLE is a list of lists where each element represents one row.  It
+     is assumed each row has the same length.
+
+     The single selected column is returned as a list.
+
+     See also: ‘-select-columns’ (*note -select-columns::),
+     ‘-select-by-indices’ (*note -select-by-indices::)
+
+          (-select-column 1 '((1 2 3) (a b c) (:a :b :c)))
+              ⇒ (2 b :b)
+
+
+File: dash.info,  Node: List to list,  Next: Reductions,  Prev: Sublist selection,  Up: Functions
+
+2.3 List to list
+================
+
+Functions returning a modified copy of the input list.
+
+ -- Function: -keep (fn list)
+     Return a new list of the non-‘nil’ results of applying FN to each
+     item in LIST.  Like ‘-filter’ (*note -filter::), but returns the
+     non-‘nil’ results of FN instead of the corresponding elements of
+     LIST.
+
+     Its anaphoric counterpart is ‘--keep’.
+
+          (-keep #'cdr '((1 2 3) (4 5) (6)))
+              ⇒ ((2 3) (5))
+          (-keep (lambda (n) (and (> n 3) (* 10 n))) '(1 2 3 4 5 6))
+              ⇒ (40 50 60)
+          (--keep (and (> it 3) (* 10 it)) '(1 2 3 4 5 6))
+              ⇒ (40 50 60)
+
+ -- Function: -concat (&rest sequences)
+     Concatenate all the arguments and make the result a list.  The
+     result is a list whose elements are the elements of all the
+     arguments.  Each argument may be a list, vector or string.
+
+     All arguments except the last argument are copied.  The last
+     argument is just used as the tail of the new list.
+
+          (-concat '(1))
+              ⇒ (1)
+          (-concat '(1) '(2))
+              ⇒ (1 2)
+          (-concat '(1) '(2 3) '(4))
+              ⇒ (1 2 3 4)
+
+ -- Function: -flatten (l)
+     Take a nested list L and return its contents as a single, flat
+     list.
+
+     Note that because ‘nil’ represents a list of zero elements (an
+     empty list), any mention of ‘nil’ in L will disappear after
+     flattening.  If you need to preserve nils, consider ‘-flatten-n’
+     (*note -flatten-n::) or map them to some unique symbol and then map
+     them back.
+
+     Conses of two atoms are considered "terminals", that is, they
+     aren’t flattened further.
+
+     See also: ‘-flatten-n’ (*note -flatten-n::)
+
+          (-flatten '((1)))
+              ⇒ (1)
+          (-flatten '((1 (2 3) (((4 (5)))))))
+              ⇒ (1 2 3 4 5)
+          (-flatten '(1 2 (3 . 4)))
+              ⇒ (1 2 (3 . 4))
+
+ -- Function: -flatten-n (num list)
+     Flatten NUM levels of a nested LIST.
+
+     See also: ‘-flatten’ (*note -flatten::)
+
+          (-flatten-n 1 '((1 2) ((3 4) ((5 6)))))
+              ⇒ (1 2 (3 4) ((5 6)))
+          (-flatten-n 2 '((1 2) ((3 4) ((5 6)))))
+              ⇒ (1 2 3 4 (5 6))
+          (-flatten-n 3 '((1 2) ((3 4) ((5 6)))))
+              ⇒ (1 2 3 4 5 6)
+
+ -- Function: -replace (old new list)
+     Replace all OLD items in LIST with NEW.
+
+     Elements are compared using ‘equal’.
+
+     See also: ‘-replace-at’ (*note -replace-at::)
+
+          (-replace 1 "1" '(1 2 3 4 3 2 1))
+              ⇒ ("1" 2 3 4 3 2 "1")
+          (-replace "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
+              ⇒ ("a" "nice" "bar" "sentence" "about" "bar")
+          (-replace 1 2 nil)
+              ⇒ nil
+
+ -- Function: -replace-first (old new list)
+     Replace the first occurrence of OLD with NEW in LIST.
+
+     Elements are compared using ‘equal’.
+
+     See also: ‘-map-first’ (*note -map-first::)
+
+          (-replace-first 1 "1" '(1 2 3 4 3 2 1))
+              ⇒ ("1" 2 3 4 3 2 1)
+          (-replace-first "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
+              ⇒ ("a" "nice" "bar" "sentence" "about" "foo")
+          (-replace-first 1 2 nil)
+              ⇒ nil
+
+ -- Function: -replace-last (old new list)
+     Replace the last occurrence of OLD with NEW in LIST.
+
+     Elements are compared using ‘equal’.
+
+     See also: ‘-map-last’ (*note -map-last::)
+
+          (-replace-last 1 "1" '(1 2 3 4 3 2 1))
+              ⇒ (1 2 3 4 3 2 "1")
+          (-replace-last "foo" "bar" '("a" "nice" "foo" "sentence" "about" "foo"))
+              ⇒ ("a" "nice" "foo" "sentence" "about" "bar")
+          (-replace-last 1 2 nil)
+              ⇒ nil
+
+ -- Function: -insert-at (n x list)
+     Return a list with X inserted into LIST at position N.
+
+     See also: ‘-splice’ (*note -splice::), ‘-splice-list’ (*note
+     -splice-list::)
+
+          (-insert-at 1 'x '(a b c))
+              ⇒ (a x b c)
+          (-insert-at 12 'x '(a b c))
+              ⇒ (a b c x)
+
+ -- Function: -replace-at (n x list)
+     Return a list with element at Nth position in LIST replaced with X.
+
+     See also: ‘-replace’ (*note -replace::)
+
+          (-replace-at 0 9 '(0 1 2 3 4 5))
+              ⇒ (9 1 2 3 4 5)
+          (-replace-at 1 9 '(0 1 2 3 4 5))
+              ⇒ (0 9 2 3 4 5)
+          (-replace-at 4 9 '(0 1 2 3 4 5))
+              ⇒ (0 1 2 3 9 5)
+
+ -- Function: -update-at (n func list)
+     Use FUNC to update the Nth element of LIST.  Return a copy of LIST
+     where the Nth element is replaced with the result of calling FUNC
+     on it.
+
+     See also: ‘-map-when’ (*note -map-when::)
+
+          (-update-at 0 (lambda (x) (+ x 9)) '(0 1 2 3 4 5))
+              ⇒ (9 1 2 3 4 5)
+          (-update-at 1 (lambda (x) (+ x 8)) '(0 1 2 3 4 5))
+              ⇒ (0 9 2 3 4 5)
+          (--update-at 2 (length it) '("foo" "bar" "baz" "quux"))
+              ⇒ ("foo" "bar" 3 "quux")
+
+ -- Function: -remove-at (n list)
+     Return LIST with its element at index N removed.  That is, remove
+     any element selected as (nth N LIST) from LIST and return the
+     result.
+
+     This is a non-destructive operation: parts of LIST (but not
+     necessarily all of it) are copied as needed to avoid destructively
+     modifying it.
+
+     See also: ‘-remove-at-indices’ (*note -remove-at-indices::),
+     ‘-remove’ (*note -remove::).
+
+          (-remove-at 0 '(a b c))
+              ⇒ (b c)
+          (-remove-at 1 '(a b c))
+              ⇒ (a c)
+          (-remove-at 2 '(a b c))
+              ⇒ (a b)
+
+ -- Function: -remove-at-indices (indices list)
+     Return LIST with its elements at INDICES removed.  That is, for
+     each index I in INDICES, remove any element selected as (nth I
+     LIST) from LIST.
+
+     This is a non-destructive operation: parts of LIST (but not
+     necessarily all of it) are copied as needed to avoid destructively
+     modifying it.
+
+     See also: ‘-remove-at’ (*note -remove-at::), ‘-remove’ (*note
+     -remove::).
+
+          (-remove-at-indices '(0) '(a b c d e))
+              ⇒ (b c d e)
+          (-remove-at-indices '(1 3) '(a b c d e))
+              ⇒ (a c e)
+          (-remove-at-indices '(4 0 2) '(a b c d e))
+              ⇒ (b d)
+
+
+File: dash.info,  Node: Reductions,  Next: Unfolding,  Prev: List to list,  Up: Functions
+
+2.4 Reductions
+==============
+
+Functions reducing lists to a single value (which may also be a list).
+
+ -- Function: -reduce-from (fn init list)
+     Reduce the function FN across LIST, starting with INIT.  Return the
+     result of applying FN to INIT and the first element of LIST, then
+     applying FN to that result and the second element, etc.  If LIST is
+     empty, return INIT without calling FN.
+
+     This function’s anaphoric counterpart is ‘--reduce-from’.
+
+     For other folds, see also ‘-reduce’ (*note -reduce::) and
+     ‘-reduce-r’ (*note -reduce-r::).
+
+          (-reduce-from #'- 10 '(1 2 3))
+              ⇒ 4
+          (-reduce-from #'list 10 '(1 2 3))
+              ⇒ (((10 1) 2) 3)
+          (--reduce-from (concat acc " " it) "START" '("a" "b" "c"))
+              ⇒ "START a b c"
+
+ -- Function: -reduce-r-from (fn init list)
+     Reduce the function FN across LIST in reverse, starting with INIT.
+     Return the result of applying FN to the last element of LIST and
+     INIT, then applying FN to the second-to-last element and the
+     previous result of FN, etc.  That is, the first argument of FN is
+     the current element, and its second argument the accumulated value.
+     If LIST is empty, return INIT without calling FN.
+
+     This function is like ‘-reduce-from’ (*note -reduce-from::) but the
+     operation associates from the right rather than left.  In other
+     words, it starts from the end of LIST and flips the arguments to
+     FN.  Conceptually, it is like replacing the conses in LIST with
+     applications of FN, and its last link with INIT, and evaluating the
+     resulting expression.
+
+     This function’s anaphoric counterpart is ‘--reduce-r-from’.
+
+     For other folds, see also ‘-reduce-r’ (*note -reduce-r::) and
+     ‘-reduce’ (*note -reduce::).
+
+          (-reduce-r-from #'- 10 '(1 2 3))
+              ⇒ -8
+          (-reduce-r-from #'list 10 '(1 2 3))
+              ⇒ (1 (2 (3 10)))
+          (--reduce-r-from (concat it " " acc) "END" '("a" "b" "c"))
+              ⇒ "a b c END"
+
+ -- Function: -reduce (fn list)
+     Reduce the function FN across LIST.  Return the result of applying
+     FN to the first two elements of LIST, then applying FN to that
+     result and the third element, etc.  If LIST contains a single
+     element, return it without calling FN.  If LIST is empty, return
+     the result of calling FN with no arguments.
+
+     This function’s anaphoric counterpart is ‘--reduce’.
+
+     For other folds, see also ‘-reduce-from’ (*note -reduce-from::) and
+     ‘-reduce-r’ (*note -reduce-r::).
+
+          (-reduce #'- '(1 2 3 4))
+              ⇒ -8
+          (-reduce #'list '(1 2 3 4))
+              ⇒ (((1 2) 3) 4)
+          (--reduce (format "%s-%d" acc it) '(1 2 3))
+              ⇒ "1-2-3"
+
+ -- Function: -reduce-r (fn list)
+     Reduce the function FN across LIST in reverse.  Return the result
+     of applying FN to the last two elements of LIST, then applying FN
+     to the third-to-last element and the previous result of FN, etc.
+     That is, the first argument of FN is the current element, and its
+     second argument the accumulated value.  If LIST contains a single
+     element, return it without calling FN.  If LIST is empty, return
+     the result of calling FN with no arguments.
+
+     This function is like ‘-reduce’ (*note -reduce::) but the operation
+     associates from the right rather than left.  In other words, it
+     starts from the end of LIST and flips the arguments to FN.
+     Conceptually, it is like replacing the conses in LIST with
+     applications of FN, ignoring its last link, and evaluating the
+     resulting expression.
+
+     This function’s anaphoric counterpart is ‘--reduce-r’.
+
+     For other folds, see also ‘-reduce-r-from’ (*note -reduce-r-from::)
+     and ‘-reduce’ (*note -reduce::).
+
+          (-reduce-r #'- '(1 2 3 4))
+              ⇒ -2
+          (-reduce-r #'list '(1 2 3 4))
+              ⇒ (1 (2 (3 4)))
+          (--reduce-r (format "%s-%d" acc it) '(1 2 3))
+              ⇒ "3-2-1"
+
+ -- Function: -reductions-from (fn init list)
+     Return a list of FN’s intermediate reductions across LIST.  That
+     is, a list of the intermediate values of the accumulator when
+     ‘-reduce-from’ (*note -reduce-from::) (which see) is called with
+     the same arguments.
+
+     This function’s anaphoric counterpart is ‘--reductions-from’.
+
+     For other folds, see also ‘-reductions’ (*note -reductions::) and
+     ‘-reductions-r’ (*note -reductions-r::).
+
+          (-reductions-from #'max 0 '(2 1 4 3))
+              ⇒ (0 2 2 4 4)
+          (-reductions-from #'* 1 '(1 2 3 4))
+              ⇒ (1 1 2 6 24)
+          (--reductions-from (format "(FN %s %d)" acc it) "INIT" '(1 2 3))
+              ⇒ ("INIT" "(FN INIT 1)" "(FN (FN INIT 1) 2)" "(FN (FN (FN INIT 1) 2) 3)")
+
+ -- Function: -reductions-r-from (fn init list)
+     Return a list of FN’s intermediate reductions across reversed LIST.
+     That is, a list of the intermediate values of the accumulator when
+     ‘-reduce-r-from’ (*note -reduce-r-from::) (which see) is called
+     with the same arguments.
+
+     This function’s anaphoric counterpart is ‘--reductions-r-from’.
+
+     For other folds, see also ‘-reductions’ (*note -reductions::) and
+     ‘-reductions-r’ (*note -reductions-r::).
+
+          (-reductions-r-from #'max 0 '(2 1 4 3))
+              ⇒ (4 4 4 3 0)
+          (-reductions-r-from #'* 1 '(1 2 3 4))
+              ⇒ (24 24 12 4 1)
+          (--reductions-r-from (format "(FN %d %s)" it acc) "INIT" '(1 2 3))
+              ⇒ ("(FN 1 (FN 2 (FN 3 INIT)))" "(FN 2 (FN 3 INIT))" "(FN 3 INIT)" "INIT")
+
+ -- Function: -reductions (fn list)
+     Return a list of FN’s intermediate reductions across LIST.  That
+     is, a list of the intermediate values of the accumulator when
+     ‘-reduce’ (*note -reduce::) (which see) is called with the same
+     arguments.
+
+     This function’s anaphoric counterpart is ‘--reductions’.
+
+     For other folds, see also ‘-reductions’ (*note -reductions::) and
+     ‘-reductions-r’ (*note -reductions-r::).
+
+          (-reductions #'+ '(1 2 3 4))
+              ⇒ (1 3 6 10)
+          (-reductions #'* '(1 2 3 4))
+              ⇒ (1 2 6 24)
+          (--reductions (format "(FN %s %d)" acc it) '(1 2 3))
+              ⇒ (1 "(FN 1 2)" "(FN (FN 1 2) 3)")
+
+ -- Function: -reductions-r (fn list)
+     Return a list of FN’s intermediate reductions across reversed LIST.
+     That is, a list of the intermediate values of the accumulator when
+     ‘-reduce-r’ (*note -reduce-r::) (which see) is called with the same
+     arguments.
+
+     This function’s anaphoric counterpart is ‘--reductions-r’.
+
+     For other folds, see also ‘-reductions-r-from’ (*note
+     -reductions-r-from::) and ‘-reductions’ (*note -reductions::).
+
+          (-reductions-r #'+ '(1 2 3 4))
+              ⇒ (10 9 7 4)
+          (-reductions-r #'* '(1 2 3 4))
+              ⇒ (24 24 12 4)
+          (--reductions-r (format "(FN %d %s)" it acc) '(1 2 3))
+              ⇒ ("(FN 1 (FN 2 3))" "(FN 2 3)" 3)
+
+ -- Function: -count (pred list)
+     Counts the number of items in LIST where (PRED item) is non-‘nil’.
+
+          (-count 'even? '(1 2 3 4 5))
+              ⇒ 2
+          (--count (< it 4) '(1 2 3 4))
+              ⇒ 3
+
+ -- Function: -sum (list)
+     Return the sum of LIST.
+
+          (-sum ())
+              ⇒ 0
+          (-sum '(1))
+              ⇒ 1
+          (-sum '(1 2 3 4))
+              ⇒ 10
+
+ -- Function: -running-sum (list)
+     Return a list with running sums of items in LIST.  LIST must be
+     non-empty.
+
+          (-running-sum '(1 2 3 4))
+              ⇒ (1 3 6 10)
+          (-running-sum '(1))
+              ⇒ (1)
+          (-running-sum ())
+              error→ Wrong type argument: consp, nil
+
+ -- Function: -product (list)
+     Return the product of LIST.
+
+          (-product ())
+              ⇒ 1
+          (-product '(1))
+              ⇒ 1
+          (-product '(1 2 3 4))
+              ⇒ 24
+
+ -- Function: -running-product (list)
+     Return a list with running products of items in LIST.  LIST must be
+     non-empty.
+
+          (-running-product '(1 2 3 4))
+              ⇒ (1 2 6 24)
+          (-running-product '(1))
+              ⇒ (1)
+          (-running-product ())
+              error→ Wrong type argument: consp, nil
+
+ -- Function: -inits (list)
+     Return all prefixes of LIST.
+
+          (-inits '(1 2 3 4))
+              ⇒ (nil (1) (1 2) (1 2 3) (1 2 3 4))
+          (-inits nil)
+              ⇒ (nil)
+          (-inits '(1))
+              ⇒ (nil (1))
+
+ -- Function: -tails (list)
+     Return all suffixes of LIST.
+
+          (-tails '(1 2 3 4))
+              ⇒ ((1 2 3 4) (2 3 4) (3 4) (4) nil)
+          (-tails nil)
+              ⇒ (nil)
+          (-tails '(1))
+              ⇒ ((1) nil)
+
+ -- Function: -common-prefix (&rest lists)
+     Return the longest common prefix of LISTS.
+
+          (-common-prefix '(1))
+              ⇒ (1)
+          (-common-prefix '(1 2) '(3 4) '(1 2))
+              ⇒ ()
+          (-common-prefix '(1 2) '(1 2 3) '(1 2 3 4))
+              ⇒ (1 2)
+
+ -- Function: -common-suffix (&rest lists)
+     Return the longest common suffix of LISTS.
+
+          (-common-suffix '(1))
+              ⇒ (1)
+          (-common-suffix '(1 2) '(3 4) '(1 2))
+              ⇒ ()
+          (-common-suffix '(1 2 3 4) '(2 3 4) '(3 4))
+              ⇒ (3 4)
+
+ -- Function: -min (list)
+     Return the smallest value from LIST of numbers or markers.
+
+          (-min '(0))
+              ⇒ 0
+          (-min '(3 2 1))
+              ⇒ 1
+          (-min '(1 2 3))
+              ⇒ 1
+
+ -- Function: -min-by (comparator list)
+     Take a comparison function COMPARATOR and a LIST and return the
+     least element of the list by the comparison function.
+
+     See also combinator ‘-on’ (*note -on::) which can transform the
+     values before comparing them.
+
+          (-min-by '> '(4 3 6 1))
+              ⇒ 1
+          (--min-by (> (car it) (car other)) '((1 2 3) (2) (3 2)))
+              ⇒ (1 2 3)
+          (--min-by (> (length it) (length other)) '((1 2 3) (2) (3 2)))
+              ⇒ (2)
+
+ -- Function: -max (list)
+     Return the largest value from LIST of numbers or markers.
+
+          (-max '(0))
+              ⇒ 0
+          (-max '(3 2 1))
+              ⇒ 3
+          (-max '(1 2 3))
+              ⇒ 3
+
+ -- Function: -max-by (comparator list)
+     Take a comparison function COMPARATOR and a LIST and return the
+     greatest element of the list by the comparison function.
+
+     See also combinator ‘-on’ (*note -on::) which can transform the
+     values before comparing them.
+
+          (-max-by '> '(4 3 6 1))
+              ⇒ 6
+          (--max-by (> (car it) (car other)) '((1 2 3) (2) (3 2)))
+              ⇒ (3 2)
+          (--max-by (> (length it) (length other)) '((1 2 3) (2) (3 2)))
+              ⇒ (1 2 3)
+
+ -- Function: -frequencies (list)
+     Count the occurrences of each distinct element of LIST.
+
+     Return an alist of (ELEMENT .  N), where each ELEMENT occurs N
+     times in LIST.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.
+
+     See also ‘-count’ (*note -count::) and ‘-group-by’ (*note
+     -group-by::).
+
+          (-frequencies ())
+              ⇒ ()
+          (-frequencies '(1 2 3 1 2 1))
+              ⇒ ((1 . 3) (2 . 2) (3 . 1))
+          (let ((-compare-fn #'string=)) (-frequencies '(a "a")))
+              ⇒ ((a . 2))
+
+
+File: dash.info,  Node: Unfolding,  Next: Predicates,  Prev: Reductions,  Up: Functions
+
+2.5 Unfolding
+=============
+
+Operations dual to reductions, building lists from a seed value rather
+than consuming a list to produce a single value.
+
+ -- Function: -iterate (fun init n)
+     Return a list of iterated applications of FUN to INIT.
+
+     This means a list of the form:
+
+     (INIT (FUN INIT) (FUN (FUN INIT)) ...)
+
+     N is the length of the returned list.
+
+          (-iterate #'1+ 1 10)
+              ⇒ (1 2 3 4 5 6 7 8 9 10)
+          (-iterate (lambda (x) (+ x x)) 2 5)
+              ⇒ (2 4 8 16 32)
+          (--iterate (* it it) 2 5)
+              ⇒ (2 4 16 256 65536)
+
+ -- Function: -unfold (fun seed)
+     Build a list from SEED using FUN.
+
+     This is "dual" operation to ‘-reduce-r’ (*note -reduce-r::): while
+     -reduce-r consumes a list to produce a single value, ‘-unfold’
+     (*note -unfold::) takes a seed value and builds a (potentially
+     infinite!)  list.
+
+     FUN should return ‘nil’ to stop the generating process, or a cons
+     (A .  B), where A will be prepended to the result and B is the new
+     seed.
+
+          (-unfold (lambda (x) (unless (= x 0) (cons x (1- x)))) 10)
+              ⇒ (10 9 8 7 6 5 4 3 2 1)
+          (--unfold (when it (cons it (cdr it))) '(1 2 3 4))
+              ⇒ ((1 2 3 4) (2 3 4) (3 4) (4))
+          (--unfold (when it (cons it (butlast it))) '(1 2 3 4))
+              ⇒ ((1 2 3 4) (1 2 3) (1 2) (1))
+
+ -- Function: -repeat (n x)
+     Return a new list of length N with each element being X.  Return
+     ‘nil’ if N is less than 1.
+
+          (-repeat 3 :a)
+              ⇒ (:a :a :a)
+          (-repeat 1 :a)
+              ⇒ (:a)
+          (-repeat 0 :a)
+              ⇒ ()
+
+ -- Function: -cycle (list)
+     Return an infinite circular copy of LIST.  The returned list cycles
+     through the elements of LIST and repeats from the beginning.
+
+          (-take 5 (-cycle '(1 2 3)))
+              ⇒ (1 2 3 1 2)
+          (-take 7 (-cycle '(1 "and" 3)))
+              ⇒ (1 "and" 3 1 "and" 3 1)
+          (-zip-lists (-cycle '(3)) '(1 2))
+              ⇒ ((3 1) (3 2))
+
+
+File: dash.info,  Node: Predicates,  Next: Partitioning,  Prev: Unfolding,  Up: Functions
+
+2.6 Predicates
+==============
+
+Reductions of one or more lists to a boolean value.
+
+ -- Function: -some (pred list)
+     Return (PRED x) for the first LIST item where (PRED x) is
+     non-‘nil’, else ‘nil’.
+
+     Alias: ‘-any’.
+
+     This function’s anaphoric counterpart is ‘--some’.
+
+          (-some #'stringp '(1 "2" 3))
+              ⇒ t
+          (--some (string-match-p "x" it) '("foo" "axe" "xor"))
+              ⇒ 1
+          (--some (= it-index 3) '(0 1 2))
+              ⇒ nil
+
+ -- Function: -every (pred list)
+     Return non-‘nil’ if PRED returns non-‘nil’ for all items in LIST.
+     If so, return the last such result of PRED.  Otherwise, once an
+     item is reached for which PRED returns ‘nil’, return ‘nil’ without
+     calling PRED on any further LIST elements.
+
+     This function is like ‘-every-p’, but on success returns the last
+     non-‘nil’ result of PRED instead of just ‘t’.
+
+     This function’s anaphoric counterpart is ‘--every’.
+
+          (-every #'numberp '(1 2 3))
+              ⇒ t
+          (--every (string-match-p "x" it) '("axe" "xor"))
+              ⇒ 0
+          (--every (= it it-index) '(0 1 3))
+              ⇒ nil
+
+ -- Function: -any? (pred list)
+     Return ‘t’ if (PRED X) is non-‘nil’ for any X in LIST, else ‘nil’.
+
+     Alias: ‘-any-p’, ‘-some?’, ‘-some-p’
+
+          (-any? #'numberp '(nil 0 t))
+              ⇒ t
+          (-any? #'numberp '(nil t t))
+              ⇒ nil
+          (-any? #'null '(1 3 5))
+              ⇒ nil
+
+ -- Function: -all? (pred list)
+     Return ‘t’ if (PRED X) is non-‘nil’ for all X in LIST, else ‘nil’.
+     In the latter case, stop after the first X for which (PRED X) is
+     ‘nil’, without calling PRED on any subsequent elements of LIST.
+
+     The similar function ‘-every’ (*note -every::) is more widely
+     useful, since it returns the last non-‘nil’ result of PRED instead
+     of just ‘t’ on success.
+
+     Alias: ‘-all-p’, ‘-every-p’, ‘-every?’.
+
+     This function’s anaphoric counterpart is ‘--all?’.
+
+          (-all? #'numberp '(1 2 3))
+              ⇒ t
+          (-all? #'numberp '(2 t 6))
+              ⇒ nil
+          (--all? (= 0 (% it 2)) '(2 4 6))
+              ⇒ t
+
+ -- Function: -none? (pred list)
+     Return ‘t’ if (PRED X) is ‘nil’ for all X in LIST, else ‘nil’.
+
+     Alias: ‘-none-p’
+
+          (-none? 'even? '(1 2 3))
+              ⇒ nil
+          (-none? 'even? '(1 3 5))
+              ⇒ t
+          (--none? (= 0 (% it 2)) '(1 2 3))
+              ⇒ nil
+
+ -- Function: -only-some? (pred list)
+     Return ‘t’ if different LIST items both satisfy and do not satisfy
+     PRED.  That is, if PRED returns both ‘nil’ for at least one item,
+     and non-‘nil’ for at least one other item in LIST.  Return ‘nil’ if
+     all items satisfy the predicate or none of them do.
+
+     Alias: ‘-only-some-p’
+
+          (-only-some? 'even? '(1 2 3))
+              ⇒ t
+          (-only-some? 'even? '(1 3 5))
+              ⇒ nil
+          (-only-some? 'even? '(2 4 6))
+              ⇒ nil
+
+ -- Function: -contains? (list element)
+     Return non-‘nil’ if LIST contains ELEMENT.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.  As with ‘member’, the return value is
+     actually the tail of LIST whose car is ELEMENT.
+
+     Alias: ‘-contains-p’.
+
+          (-contains? '(1 2 3) 1)
+              ⇒ (1 2 3)
+          (-contains? '(1 2 3) 2)
+              ⇒ (2 3)
+          (-contains? '(1 2 3) 4)
+              ⇒ ()
+
+ -- Function: -is-prefix? (prefix list)
+     Return non-‘nil’ if PREFIX is a prefix of LIST.
+
+     Alias: ‘-is-prefix-p’.
+
+          (-is-prefix? '(1 2 3) '(1 2 3 4 5))
+              ⇒ t
+          (-is-prefix? '(1 2 3 4 5) '(1 2 3))
+              ⇒ nil
+          (-is-prefix? '(1 3) '(1 2 3 4 5))
+              ⇒ nil
+
+ -- Function: -is-suffix? (suffix list)
+     Return non-‘nil’ if SUFFIX is a suffix of LIST.
+
+     Alias: ‘-is-suffix-p’.
+
+          (-is-suffix? '(3 4 5) '(1 2 3 4 5))
+              ⇒ t
+          (-is-suffix? '(1 2 3 4 5) '(3 4 5))
+              ⇒ nil
+          (-is-suffix? '(3 5) '(1 2 3 4 5))
+              ⇒ nil
+
+ -- Function: -is-infix? (infix list)
+     Return non-‘nil’ if INFIX is infix of LIST.
+
+     This operation runs in O(n^2) time
+
+     Alias: ‘-is-infix-p’
+
+          (-is-infix? '(1 2 3) '(1 2 3 4 5))
+              ⇒ t
+          (-is-infix? '(2 3 4) '(1 2 3 4 5))
+              ⇒ t
+          (-is-infix? '(3 4 5) '(1 2 3 4 5))
+              ⇒ t
+
+ -- Function: -cons-pair? (obj)
+     Return non-‘nil’ if OBJ is a true cons pair.  That is, a cons (A .
+     B) where B is not a list.
+
+     Alias: ‘-cons-pair-p’.
+
+          (-cons-pair? '(1 . 2))
+              ⇒ t
+          (-cons-pair? '(1 2))
+              ⇒ nil
+          (-cons-pair? '(1))
+              ⇒ nil
+
+
+File: dash.info,  Node: Partitioning,  Next: Indexing,  Prev: Predicates,  Up: Functions
+
+2.7 Partitioning
+================
+
+Functions partitioning the input list into a list of lists.
+
+ -- Function: -split-at (n list)
+     Split LIST into two sublists after the Nth element.  The result is
+     a list of two elements (TAKE DROP) where TAKE is a new list of the
+     first N elements of LIST, and DROP is the remaining elements of
+     LIST (not a copy).  TAKE and DROP are like the results of ‘-take’
+     (*note -take::) and ‘-drop’ (*note -drop::), respectively, but the
+     split is done in a single list traversal.
+
+          (-split-at 3 '(1 2 3 4 5))
+              ⇒ ((1 2 3) (4 5))
+          (-split-at 17 '(1 2 3 4 5))
+              ⇒ ((1 2 3 4 5) nil)
+          (-split-at 0 '(1 2 3 4 5))
+              ⇒ (nil (1 2 3 4 5))
+
+ -- Function: -split-with (pred list)
+     Split LIST into a prefix satisfying PRED, and the rest.  The first
+     sublist is the prefix of LIST with successive elements satisfying
+     PRED, and the second sublist is the remaining elements that do not.
+     The result is like performing
+
+     ((-take-while PRED LIST) (-drop-while PRED LIST))
+
+     but in no more than a single pass through LIST.
+
+          (-split-with 'even? '(1 2 3 4))
+              ⇒ (nil (1 2 3 4))
+          (-split-with 'even? '(2 4 5 6))
+              ⇒ ((2 4) (5 6))
+          (--split-with (< it 4) '(1 2 3 4 3 2 1))
+              ⇒ ((1 2 3) (4 3 2 1))
+
+ -- Macro: -split-on (item list)
+     Split the LIST each time ITEM is found.
+
+     Unlike ‘-partition-by’ (*note -partition-by::), the ITEM is
+     discarded from the results.  Empty lists are also removed from the
+     result.
+
+     Comparison is done by ‘equal’.
+
+     See also ‘-split-when’ (*note -split-when::)
+
+          (-split-on '| '(Nil | Leaf a | Node [Tree a]))
+              ⇒ ((Nil) (Leaf a) (Node [Tree a]))
+          (-split-on :endgroup '("a" "b" :endgroup "c" :endgroup "d" "e"))
+              ⇒ (("a" "b") ("c") ("d" "e"))
+          (-split-on :endgroup '("a" "b" :endgroup :endgroup "d" "e"))
+              ⇒ (("a" "b") ("d" "e"))
+
+ -- Function: -split-when (fn list)
+     Split the LIST on each element where FN returns non-‘nil’.
+
+     Unlike ‘-partition-by’ (*note -partition-by::), the "matched"
+     element is discarded from the results.  Empty lists are also
+     removed from the result.
+
+     This function can be thought of as a generalization of
+     ‘split-string’.
+
+          (-split-when 'even? '(1 2 3 4 5 6))
+              ⇒ ((1) (3) (5))
+          (-split-when 'even? '(1 2 3 4 6 8 9))
+              ⇒ ((1) (3) (9))
+          (--split-when (memq it '(&optional &rest)) '(a b &optional c d &rest args))
+              ⇒ ((a b) (c d) (args))
+
+ -- Function: -separate (pred list)
+     Split LIST into two sublists based on whether items satisfy PRED.
+     The result is like performing
+
+     ((-filter PRED LIST) (-remove PRED LIST))
+
+     but in a single pass through LIST.
+
+          (-separate (lambda (num) (= 0 (% num 2))) '(1 2 3 4 5 6 7))
+              ⇒ ((2 4 6) (1 3 5 7))
+          (--separate (< it 5) '(3 7 5 9 3 2 1 4 6))
+              ⇒ ((3 3 2 1 4) (7 5 9 6))
+          (-separate 'cdr '((1 2) (1) (1 2 3) (4)))
+              ⇒ (((1 2) (1 2 3)) ((1) (4)))
+
+ -- Function: -partition (n list)
+     Return a new list with the items in LIST grouped into N-sized
+     sublists.  If there are not enough items to make the last group
+     N-sized, those items are discarded.
+
+          (-partition 2 '(1 2 3 4 5 6))
+              ⇒ ((1 2) (3 4) (5 6))
+          (-partition 2 '(1 2 3 4 5 6 7))
+              ⇒ ((1 2) (3 4) (5 6))
+          (-partition 3 '(1 2 3 4 5 6 7))
+              ⇒ ((1 2 3) (4 5 6))
+
+ -- Function: -partition-all (n list)
+     Return a new list with the items in LIST grouped into N-sized
+     sublists.  The last group may contain less than N items.
+
+          (-partition-all 2 '(1 2 3 4 5 6))
+              ⇒ ((1 2) (3 4) (5 6))
+          (-partition-all 2 '(1 2 3 4 5 6 7))
+              ⇒ ((1 2) (3 4) (5 6) (7))
+          (-partition-all 3 '(1 2 3 4 5 6 7))
+              ⇒ ((1 2 3) (4 5 6) (7))
+
+ -- Function: -partition-in-steps (n step list)
+     Partition LIST into sublists of length N that are STEP items apart.
+     Like ‘-partition-all-in-steps’ (*note -partition-all-in-steps::),
+     but if there are not enough items to make the last group N-sized,
+     those items are discarded.
+
+          (-partition-in-steps 2 1 '(1 2 3 4))
+              ⇒ ((1 2) (2 3) (3 4))
+          (-partition-in-steps 3 2 '(1 2 3 4))
+              ⇒ ((1 2 3))
+          (-partition-in-steps 3 2 '(1 2 3 4 5))
+              ⇒ ((1 2 3) (3 4 5))
+
+ -- Function: -partition-all-in-steps (n step list)
+     Partition LIST into sublists of length N that are STEP items apart.
+     Adjacent groups may overlap if N exceeds the STEP stride.  Trailing
+     groups may contain less than N items.
+
+          (-partition-all-in-steps 2 1 '(1 2 3 4))
+              ⇒ ((1 2) (2 3) (3 4) (4))
+          (-partition-all-in-steps 3 2 '(1 2 3 4))
+              ⇒ ((1 2 3) (3 4))
+          (-partition-all-in-steps 3 2 '(1 2 3 4 5))
+              ⇒ ((1 2 3) (3 4 5) (5))
+
+ -- Function: -partition-by (fn list)
+     Apply FN to each item in LIST, splitting it each time FN returns a
+     new value.
+
+          (-partition-by 'even? ())
+              ⇒ ()
+          (-partition-by 'even? '(1 1 2 2 2 3 4 6 8))
+              ⇒ ((1 1) (2 2 2) (3) (4 6 8))
+          (--partition-by (< it 3) '(1 2 3 4 3 2 1))
+              ⇒ ((1 2) (3 4 3) (2 1))
+
+ -- Function: -partition-by-header (fn list)
+     Apply FN to the first item in LIST.  That is the header value.
+     Apply FN to each item in LIST, splitting it each time FN returns
+     the header value, but only after seeing at least one other value
+     (the body).
+
+          (--partition-by-header (= it 1) '(1 2 3 1 2 1 2 3 4))
+              ⇒ ((1 2 3) (1 2) (1 2 3 4))
+          (--partition-by-header (> it 0) '(1 2 0 1 0 1 2 3 0))
+              ⇒ ((1 2 0) (1 0) (1 2 3 0))
+          (-partition-by-header 'even? '(2 1 1 1 4 1 3 5 6 6 1))
+              ⇒ ((2 1 1 1) (4 1 3 5) (6 6 1))
+
+ -- Function: -partition-after-pred (pred list)
+     Partition LIST after each element for which PRED returns non-‘nil’.
+
+     This function’s anaphoric counterpart is ‘--partition-after-pred’.
+
+          (-partition-after-pred #'booleanp ())
+              ⇒ ()
+          (-partition-after-pred #'booleanp '(t t))
+              ⇒ ((t) (t))
+          (-partition-after-pred #'booleanp '(0 0 t t 0 t))
+              ⇒ ((0 0 t) (t) (0 t))
+
+ -- Function: -partition-before-pred (pred list)
+     Partition directly before each time PRED is true on an element of
+     LIST.
+
+          (-partition-before-pred #'booleanp ())
+              ⇒ ()
+          (-partition-before-pred #'booleanp '(0 t))
+              ⇒ ((0) (t))
+          (-partition-before-pred #'booleanp '(0 0 t 0 t t))
+              ⇒ ((0 0) (t 0) (t) (t))
+
+ -- Function: -partition-before-item (item list)
+     Partition directly before each time ITEM appears in LIST.
+
+          (-partition-before-item 3 ())
+              ⇒ ()
+          (-partition-before-item 3 '(1))
+              ⇒ ((1))
+          (-partition-before-item 3 '(3))
+              ⇒ ((3))
+
+ -- Function: -partition-after-item (item list)
+     Partition directly after each time ITEM appears in LIST.
+
+          (-partition-after-item 3 ())
+              ⇒ ()
+          (-partition-after-item 3 '(1))
+              ⇒ ((1))
+          (-partition-after-item 3 '(3))
+              ⇒ ((3))
+
+ -- Function: -group-by (fn list)
+     Separate LIST into an alist whose keys are FN applied to the
+     elements of LIST.  Keys are compared by ‘equal’.
+
+          (-group-by 'even? ())
+              ⇒ ()
+          (-group-by 'even? '(1 1 2 2 2 3 4 6 8))
+              ⇒ ((nil 1 1 3) (t 2 2 2 4 6 8))
+          (--group-by (car (split-string it "/")) '("a/b" "c/d" "a/e"))
+              ⇒ (("a" "a/b" "a/e") ("c" "c/d"))
+
+
+File: dash.info,  Node: Indexing,  Next: Set operations,  Prev: Partitioning,  Up: Functions
+
+2.8 Indexing
+============
+
+Functions retrieving or sorting based on list indices and related
+predicates.
+
+ -- Function: -elem-index (elem list)
+     Return the first index of ELEM in LIST.  That is, the index within
+     LIST of the first element that is ‘equal’ to ELEM.  Return ‘nil’ if
+     there is no such element.
+
+     See also: ‘-find-index’ (*note -find-index::).
+
+          (-elem-index 2 '(6 7 8 3 4))
+              ⇒ nil
+          (-elem-index "bar" '("foo" "bar" "baz"))
+              ⇒ 1
+          (-elem-index '(1 2) '((3) (5 6) (1 2) nil))
+              ⇒ 2
+
+ -- Function: -elem-indices (elem list)
+     Return the list of indices at which ELEM appears in LIST.  That is,
+     the indices of all elements of LIST ‘equal’ to ELEM, in the same
+     ascending order as they appear in LIST.
+
+          (-elem-indices 2 '(6 7 8 3 4 1))
+              ⇒ ()
+          (-elem-indices "bar" '("foo" "bar" "baz"))
+              ⇒ (1)
+          (-elem-indices '(1 2) '((3) (1 2) (5 6) (1 2) nil))
+              ⇒ (1 3)
+
+ -- Function: -find-index (pred list)
+     Return the index of the first item satisfying PRED in LIST.  Return
+     ‘nil’ if no such item is found.
+
+     PRED is called with one argument, the current list element, until
+     it returns non-‘nil’, at which point the search terminates.
+
+     This function’s anaphoric counterpart is ‘--find-index’.
+
+     See also: ‘-first’ (*note -first::), ‘-find-last-index’ (*note
+     -find-last-index::).
+
+          (-find-index #'numberp '(a b c))
+              ⇒ nil
+          (-find-index #'natnump '(1 0 -1))
+              ⇒ 0
+          (--find-index (> it 5) '(2 4 1 6 3 3 5 8))
+              ⇒ 3
+
+ -- Function: -find-last-index (pred list)
+     Return the index of the last item satisfying PRED in LIST.  Return
+     ‘nil’ if no such item is found.
+
+     Predicate PRED is called with one argument each time, namely the
+     current list element.
+
+     This function’s anaphoric counterpart is ‘--find-last-index’.
+
+     See also: ‘-last’ (*note -last::), ‘-find-index’ (*note
+     -find-index::).
+
+          (-find-last-index #'numberp '(a b c))
+              ⇒ nil
+          (--find-last-index (> it 5) '(2 7 1 6 3 8 5 2))
+              ⇒ 5
+          (-find-last-index (-partial #'string< 'a) '(c b a))
+              ⇒ 1
+
+ -- Function: -find-indices (pred list)
+     Return the list of indices in LIST satisfying PRED.
+
+     Each element of LIST in turn is passed to PRED.  If the result is
+     non-‘nil’, the index of that element in LIST is included in the
+     result.  The returned indices are in ascending order, i.e., in the
+     same order as they appear in LIST.
+
+     This function’s anaphoric counterpart is ‘--find-indices’.
+
+     See also: ‘-find-index’ (*note -find-index::), ‘-elem-indices’
+     (*note -elem-indices::).
+
+          (-find-indices #'numberp '(a b c))
+              ⇒ ()
+          (-find-indices #'numberp '(8 1 d 2 b c a 3))
+              ⇒ (0 1 3 7)
+          (--find-indices (> it 5) '(2 4 1 6 3 3 5 8))
+              ⇒ (3 7)
+
+ -- Function: -grade-up (comparator list)
+     Grade elements of LIST using COMPARATOR relation.  This yields a
+     permutation vector such that applying this permutation to LIST
+     sorts it in ascending order.
+
+          (-grade-up #'< '(3 1 4 2 1 3 3))
+              ⇒ (1 4 3 0 5 6 2)
+          (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-up #'< l) l))
+              ⇒ (1 1 2 3 3 3 4)
+
+ -- Function: -grade-down (comparator list)
+     Grade elements of LIST using COMPARATOR relation.  This yields a
+     permutation vector such that applying this permutation to LIST
+     sorts it in descending order.
+
+          (-grade-down #'< '(3 1 4 2 1 3 3))
+              ⇒ (2 0 5 6 3 1 4)
+          (let ((l '(3 1 4 2 1 3 3))) (-select-by-indices (-grade-down #'< l) l))
+              ⇒ (4 3 3 3 2 1 1)
+
+
+File: dash.info,  Node: Set operations,  Next: Other list operations,  Prev: Indexing,  Up: Functions
+
+2.9 Set operations
+==================
+
+Operations pretending lists are sets.
+
+ -- Function: -union (list1 list2)
+     Return a new list of distinct elements appearing in either LIST1 or
+     LIST2.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.
+
+          (-union '(1 2 3) '(3 4 5))
+              ⇒ (1 2 3 4 5)
+          (-union '(1 2 2 4) ())
+              ⇒ (1 2 4)
+          (-union '(1 1 2 2) '(4 4 3 2 1))
+              ⇒ (1 2 4 3)
+
+ -- Function: -difference (list1 list2)
+     Return a new list with the distinct members of LIST1 that are not
+     in LIST2.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.
+
+          (-difference () ())
+              ⇒ ()
+          (-difference '(1 2 3) '(4 5 6))
+              ⇒ (1 2 3)
+          (-difference '(1 2 3 4) '(3 4 5 6))
+              ⇒ (1 2)
+
+ -- Function: -intersection (list1 list2)
+     Return a new list of distinct elements appearing in both LIST1 and
+     LIST2.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.
+
+          (-intersection () ())
+              ⇒ ()
+          (-intersection '(1 2 3) '(4 5 6))
+              ⇒ ()
+          (-intersection '(1 2 2 3) '(4 3 3 2))
+              ⇒ (2 3)
+
+ -- Function: -powerset (list)
+     Return the power set of LIST.
+
+          (-powerset ())
+              ⇒ (nil)
+          (-powerset '(x y))
+              ⇒ ((x y) (x) (y) nil)
+          (-powerset '(x y z))
+              ⇒ ((x y z) (x y) (x z) (x) (y z) (y) (z) nil)
+
+ -- Function: -permutations (list)
+     Return the distinct permutations of LIST.
+
+     Duplicate elements of LIST are determined by ‘equal’, or by
+     ‘-compare-fn’ if that is non-‘nil’.
+
+          (-permutations ())
+              ⇒ (nil)
+          (-permutations '(a a b))
+              ⇒ ((a a b) (a b a) (b a a))
+          (-permutations '(a b c))
+              ⇒ ((a b c) (a c b) (b a c) (b c a) (c a b) (c b a))
+
+ -- Function: -distinct (list)
+     Return a copy of LIST with all duplicate elements removed.
+
+     The test for equality is done with ‘equal’, or with ‘-compare-fn’
+     if that is non-‘nil’.
+
+     Alias: ‘-uniq’.
+
+          (-distinct ())
+              ⇒ ()
+          (-distinct '(1 1 2 3 3))
+              ⇒ (1 2 3)
+          (-distinct '(t t t))
+              ⇒ (t)
+
+ -- Function: -same-items? (list1 list2)
+     Return non-‘nil’ if LIST1 and LIST2 have the same distinct
+     elements.
+
+     The order of the elements in the lists does not matter.  The lists
+     may be of different lengths, i.e., contain duplicate elements.  The
+     test for equality is done with ‘equal’, or with ‘-compare-fn’ if
+     that is non-‘nil’.
+
+     Alias: ‘-same-items-p’.
+
+          (-same-items? '(1 2 3) '(1 2 3))
+              ⇒ t
+          (-same-items? '(1 1 2 3) '(3 3 2 1))
+              ⇒ t
+          (-same-items? '(1 2 3) '(1 2 3 4))
+              ⇒ nil
+
+
+File: dash.info,  Node: Other list operations,  Next: Tree operations,  Prev: Set operations,  Up: Functions
+
+2.10 Other list operations
+==========================
+
+Other list functions not fit to be classified elsewhere.
+
+ -- Function: -rotate (n list)
+     Rotate LIST N places to the right (left if N is negative).  The
+     time complexity is O(n).
+
+          (-rotate 3 '(1 2 3 4 5 6 7))
+              ⇒ (5 6 7 1 2 3 4)
+          (-rotate -3 '(1 2 3 4 5 6 7))
+              ⇒ (4 5 6 7 1 2 3)
+          (-rotate 16 '(1 2 3 4 5 6 7))
+              ⇒ (6 7 1 2 3 4 5)
+
+ -- Function: -cons* (&rest args)
+     Make a new list from the elements of ARGS.  The last 2 elements of
+     ARGS are used as the final cons of the result, so if the final
+     element of ARGS is not a list, the result is a dotted list.  With
+     no ARGS, return ‘nil’.
+
+          (-cons* 1 2)
+              ⇒ (1 . 2)
+          (-cons* 1 2 3)
+              ⇒ (1 2 . 3)
+          (-cons* 1)
+              ⇒ 1
+
+ -- Function: -snoc (list elem &rest elements)
+     Append ELEM to the end of the list.
+
+     This is like ‘cons’, but operates on the end of list.
+
+     If any ELEMENTS are given, append them to the list as well.
+
+          (-snoc '(1 2 3) 4)
+              ⇒ (1 2 3 4)
+          (-snoc '(1 2 3) 4 5 6)
+              ⇒ (1 2 3 4 5 6)
+          (-snoc '(1 2 3) '(4 5 6))
+              ⇒ (1 2 3 (4 5 6))
+
+ -- Function: -interpose (sep list)
+     Return a new list of all elements in LIST separated by SEP.
+
+          (-interpose "-" ())
+              ⇒ ()
+          (-interpose "-" '("a"))
+              ⇒ ("a")
+          (-interpose "-" '("a" "b" "c"))
+              ⇒ ("a" "-" "b" "-" "c")
+
+ -- Function: -interleave (&rest lists)
+     Return a new list of the first item in each list, then the second
+     etc.
+
+          (-interleave '(1 2) '("a" "b"))
+              ⇒ (1 "a" 2 "b")
+          (-interleave '(1 2) '("a" "b") '("A" "B"))
+              ⇒ (1 "a" "A" 2 "b" "B")
+          (-interleave '(1 2 3) '("a" "b"))
+              ⇒ (1 "a" 2 "b")
+
+ -- Function: -iota (count &optional start step)
+     Return a list containing COUNT numbers.  Starts from START and adds
+     STEP each time.  The default START is zero, the default STEP is 1.
+     This function takes its name from the corresponding primitive in
+     the APL language.
+
+          (-iota 6)
+              ⇒ (0 1 2 3 4 5)
+          (-iota 4 2.5 -2)
+              ⇒ (2.5 0.5 -1.5 -3.5)
+          (-iota -1)
+              error→ Wrong type argument: natnump, -1
+
+ -- Function: -zip-with (fn list1 list2)
+     Zip LIST1 and LIST2 into a new list using the function FN.  That
+     is, apply FN pairwise taking as first argument the next element of
+     LIST1 and as second argument the next element of LIST2 at the
+     corresponding position.  The result is as long as the shorter list.
+
+     This function’s anaphoric counterpart is ‘--zip-with’.
+
+     For other zips, see also ‘-zip-lists’ (*note -zip-lists::) and
+     ‘-zip-fill’ (*note -zip-fill::).
+
+          (-zip-with #'+ '(1 2 3 4) '(5 6 7))
+              ⇒ (6 8 10)
+          (-zip-with #'cons '(1 2 3) '(4 5 6 7))
+              ⇒ ((1 . 4) (2 . 5) (3 . 6))
+          (--zip-with (format "%s & %s" it other) '(Batman Jekyll) '(Robin Hyde))
+              ⇒ ("Batman & Robin" "Jekyll & Hyde")
+
+ -- Function: -zip-pair (list1 list2)
+     Zip LIST1 and LIST2 together.
+
+     Make a pair with the head of each list, followed by a pair with the
+     second element of each list, and so on.  The number of pairs
+     returned is equal to the length of the shorter input list.
+
+     See also: ‘-zip-lists’ (*note -zip-lists::).
+
+          (-zip-pair '(1 2 3 4) '(5 6 7))
+              ⇒ ((1 . 5) (2 . 6) (3 . 7))
+          (-zip-pair '(1 2 3) '(4 5 6))
+              ⇒ ((1 . 4) (2 . 5) (3 . 6))
+          (-zip-pair '(1 2) '(3))
+              ⇒ ((1 . 3))
+
+ -- Function: -zip-lists (&rest lists)
+     Zip LISTS together.
+
+     Group the head of each list, followed by the second element of each
+     list, and so on.  The number of returned groupings is equal to the
+     length of the shortest input list, and the length of each grouping
+     is equal to the number of input LISTS.
+
+     The return value is always a list of proper lists, in contrast to
+     ‘-zip’ (*note -zip::) which returns a list of dotted pairs when
+     only two input LISTS are provided.
+
+     See also: ‘-zip-pair’ (*note -zip-pair::).
+
+          (-zip-lists '(1 2 3) '(4 5 6))
+              ⇒ ((1 4) (2 5) (3 6))
+          (-zip-lists '(1 2 3) '(4 5 6 7))
+              ⇒ ((1 4) (2 5) (3 6))
+          (-zip-lists '(1 2) '(3 4 5) '(6))
+              ⇒ ((1 3 6))
+
+ -- Function: -zip-lists-fill (fill-value &rest lists)
+     Zip LISTS together, padding shorter lists with FILL-VALUE.  This is
+     like ‘-zip-lists’ (*note -zip-lists::) (which see), except it
+     retains all elements at positions beyond the end of the shortest
+     list.  The number of returned groupings is equal to the length of
+     the longest input list, and the length of each grouping is equal to
+     the number of input LISTS.
+
+          (-zip-lists-fill 0 '(1 2) '(3 4 5) '(6))
+              ⇒ ((1 3 6) (2 4 0) (0 5 0))
+          (-zip-lists-fill 0 '(1 2) '(3 4) '(5 6))
+              ⇒ ((1 3 5) (2 4 6))
+          (-zip-lists-fill 0 '(1 2 3) nil)
+              ⇒ ((1 0) (2 0) (3 0))
+
+ -- Function: -zip (&rest lists)
+     Zip LISTS together.
+
+     Group the head of each list, followed by the second element of each
+     list, and so on.  The number of returned groupings is equal to the
+     length of the shortest input list, and the number of items in each
+     grouping is equal to the number of input LISTS.
+
+     If only two LISTS are provided as arguments, return the groupings
+     as a list of dotted pairs.  Otherwise, return the groupings as a
+     list of proper lists.
+
+     Since the return value changes form depending on the number of
+     arguments, it is generally recommended to use ‘-zip-lists’ (*note
+     -zip-lists::) instead, or ‘-zip-pair’ (*note -zip-pair::) if a list
+     of dotted pairs is desired.
+
+     See also: ‘-unzip’ (*note -unzip::).
+
+          (-zip '(1 2 3 4) '(5 6 7) '(8 9))
+              ⇒ ((1 5 8) (2 6 9))
+          (-zip '(1 2 3) '(4 5 6) '(7 8 9))
+              ⇒ ((1 4 7) (2 5 8) (3 6 9))
+          (-zip '(1 2 3))
+              ⇒ ((1) (2) (3))
+
+ -- Function: -zip-fill (fill-value &rest lists)
+     Zip LISTS together, padding shorter lists with FILL-VALUE.  This is
+     like ‘-zip’ (*note -zip::) (which see), except it retains all
+     elements at positions beyond the end of the shortest list.  The
+     number of returned groupings is equal to the length of the longest
+     input list, and the length of each grouping is equal to the number
+     of input LISTS.
+
+     Since the return value changes form depending on the number of
+     arguments, it is generally recommended to use ‘-zip-lists-fill’
+     (*note -zip-lists-fill::) instead, unless a list of dotted pairs is
+     explicitly desired.
+
+          (-zip-fill 0 '(1 2 3) '(4 5))
+              ⇒ ((1 . 4) (2 . 5) (3 . 0))
+          (-zip-fill 0 () '(1 2 3))
+              ⇒ ((0 . 1) (0 . 2) (0 . 3))
+          (-zip-fill 0 '(1 2) '(3 4) '(5 6))
+              ⇒ ((1 3 5) (2 4 6))
+
+ -- Function: -unzip-lists (lists)
+     Unzip LISTS.
+
+     This works just like ‘-zip-lists’ (*note -zip-lists::) (which see),
+     but takes a list of lists instead of a variable number of
+     arguments, such that
+
+     (-unzip-lists (-zip-lists ARGS...))
+
+     is identity (given that the lists comprising ARGS are of the same
+     length).
+
+          (-unzip-lists (-zip-lists '(1 2) '(3 4) '(5 6)))
+              ⇒ ((1 2) (3 4) (5 6))
+          (-unzip-lists '((1 2 3) (4 5) (6 7) (8 9)))
+              ⇒ ((1 4 6 8) (2 5 7 9))
+          (-unzip-lists '((1 2 3) (4 5 6)))
+              ⇒ ((1 4) (2 5) (3 6))
+
+ -- Function: -unzip (lists)
+     Unzip LISTS.
+
+     This works just like ‘-zip’ (*note -zip::) (which see), but takes a
+     list of lists instead of a variable number of arguments, such that
+
+     (-unzip (-zip L1 L2 L3 ...))
+
+     is identity (given that the lists are of the same length, and that
+     ‘-zip’ (*note -zip::) is not called with two arguments, because of
+     the caveat described in its docstring).
+
+     Note in particular that calling ‘-unzip’ (*note -unzip::) on a list
+     of two lists will return a list of dotted pairs.
+
+     Since the return value changes form depending on the number of
+     LISTS, it is generally recommended to use ‘-unzip-lists’ (*note
+     -unzip-lists::) instead.
+
+          (-unzip (-zip '(1 2) '(3 4) '(5 6)))
+              ⇒ ((1 . 2) (3 . 4) (5 . 6))
+          (-unzip '((1 2 3) (4 5 6)))
+              ⇒ ((1 . 4) (2 . 5) (3 . 6))
+          (-unzip '((1 2 3) (4 5) (6 7) (8 9)))
+              ⇒ ((1 4 6 8) (2 5 7 9))
+
+ -- Function: -pad (fill-value &rest lists)
+     Pad each of LISTS with FILL-VALUE until they all have equal
+     lengths.
+
+     Ensure all LISTS are as long as the longest one by repeatedly
+     appending FILL-VALUE to the shorter lists, and return the resulting
+     LISTS.
+
+          (-pad 0 ())
+              ⇒ (nil)
+          (-pad 0 '(1 2) '(3 4))
+              ⇒ ((1 2) (3 4))
+          (-pad 0 '(1 2) '(3 4 5 6) '(7 8 9))
+              ⇒ ((1 2 0 0) (3 4 5 6) (7 8 9 0))
+
+ -- Function: -table (fn &rest lists)
+     Compute outer product of LISTS using function FN.
+
+     The function FN should have the same arity as the number of
+     supplied lists.
+
+     The outer product is computed by applying fn to all possible
+     combinations created by taking one element from each list in order.
+     The dimension of the result is (length lists).
+
+     See also: ‘-table-flat’ (*note -table-flat::)
+
+          (-table '* '(1 2 3) '(1 2 3))
+              ⇒ ((1 2 3) (2 4 6) (3 6 9))
+          (-table (lambda (a b) (-sum (-zip-with '* a b))) '((1 2) (3 4)) '((1 3) (2 4)))
+              ⇒ ((7 15) (10 22))
+          (apply '-table 'list (-repeat 3 '(1 2)))
+              ⇒ ((((1 1 1) (2 1 1)) ((1 2 1) (2 2 1))) (((1 1 2) (2 1 2)) ((1 2 2) (2 2 2))))
+
+ -- Function: -table-flat (fn &rest lists)
+     Compute flat outer product of LISTS using function FN.
+
+     The function FN should have the same arity as the number of
+     supplied lists.
+
+     The outer product is computed by applying fn to all possible
+     combinations created by taking one element from each list in order.
+     The results are flattened, ignoring the tensor structure of the
+     result.  This is equivalent to calling:
+
+     (-flatten-n (1- (length lists)) (apply ’-table fn lists))
+
+     but the implementation here is much more efficient.
+
+     See also: ‘-flatten-n’ (*note -flatten-n::), ‘-table’ (*note
+     -table::)
+
+          (-table-flat 'list '(1 2 3) '(a b c))
+              ⇒ ((1 a) (2 a) (3 a) (1 b) (2 b) (3 b) (1 c) (2 c) (3 c))
+          (-table-flat '* '(1 2 3) '(1 2 3))
+              ⇒ (1 2 3 2 4 6 3 6 9)
+          (apply '-table-flat 'list (-repeat 3 '(1 2)))
+              ⇒ ((1 1 1) (2 1 1) (1 2 1) (2 2 1) (1 1 2) (2 1 2) (1 2 2) (2 2 2))
+
+ -- Function: -first (pred list)
+     Return the first item in LIST for which PRED returns non-‘nil’.
+     Return ‘nil’ if no such element is found.
+
+     To get the first item in the list no questions asked, use
+     ‘-first-item’ (*note -first-item::).
+
+     Alias: ‘-find’.
+
+     This function’s anaphoric counterpart is ‘--first’.
+
+          (-first #'natnump '(-1 0 1))
+              ⇒ 0
+          (-first #'null '(1 2 3))
+              ⇒ nil
+          (--first (> it 2) '(1 2 3))
+              ⇒ 3
+
+ -- Function: -last (pred list)
+     Return the last x in LIST where (PRED x) is non-‘nil’, else ‘nil’.
+
+          (-last 'even? '(1 2 3 4 5 6 3 3 3))
+              ⇒ 6
+          (-last 'even? '(1 3 7 5 9))
+              ⇒ nil
+          (--last (> (length it) 3) '("a" "looong" "word" "and" "short" "one"))
+              ⇒ "short"
+
+ -- Function: -first-item (list)
+     Return the first item of LIST, or ‘nil’ on an empty list.
+
+     See also: ‘-second-item’ (*note -second-item::), ‘-last-item’
+     (*note -last-item::), etc.
+
+          (-first-item ())
+              ⇒ ()
+          (-first-item '(1 2 3 4 5))
+              ⇒ 1
+          (let ((list (list 1 2 3))) (setf (-first-item list) 5) list)
+              ⇒ (5 2 3)
+
+ -- Function: -second-item (list)
+     Return the second item of LIST, or ‘nil’ if LIST is too short.
+
+     See also: ‘-first-item’ (*note -first-item::), ‘-third-item’ (*note
+     -third-item::), etc.
+
+          (-second-item ())
+              ⇒ ()
+          (-second-item '(1 2 3 4 5))
+              ⇒ 2
+          (let ((list (list 1 2))) (setf (-second-item list) 5) list)
+              ⇒ (1 5)
+
+ -- Function: -third-item (list)
+     Return the third item of LIST, or ‘nil’ if LIST is too short.
+
+     See also: ‘-second-item’ (*note -second-item::), ‘-fourth-item’
+     (*note -fourth-item::), etc.
+
+          (-third-item ())
+              ⇒ ()
+          (-third-item '(1 2))
+              ⇒ ()
+          (-third-item '(1 2 3 4 5))
+              ⇒ 3
+
+ -- Function: -fourth-item (list)
+     Return the fourth item of LIST, or ‘nil’ if LIST is too short.
+
+     See also: ‘-third-item’ (*note -third-item::), ‘-fifth-item’ (*note
+     -fifth-item::), etc.
+
+          (-fourth-item ())
+              ⇒ ()
+          (-fourth-item '(1 2 3))
+              ⇒ ()
+          (-fourth-item '(1 2 3 4 5))
+              ⇒ 4
+
+ -- Function: -fifth-item (list)
+     Return the fifth item of LIST, or ‘nil’ if LIST is too short.
+
+     See also: ‘-fourth-item’ (*note -fourth-item::), ‘-last-item’
+     (*note -last-item::), etc.
+
+          (-fifth-item ())
+              ⇒ ()
+          (-fifth-item '(1 2 3 4))
+              ⇒ ()
+          (-fifth-item '(1 2 3 4 5))
+              ⇒ 5
+
+ -- Function: -last-item (list)
+     Return the last item of LIST, or ‘nil’ on an empty list.
+
+     See also: ‘-first-item’ (*note -first-item::), etc.
+
+          (-last-item ())
+              ⇒ ()
+          (-last-item '(1 2 3 4 5))
+              ⇒ 5
+          (let ((list (list 1 2 3))) (setf (-last-item list) 5) list)
+              ⇒ (1 2 5)
+
+ -- Function: -butlast (list)
+     Return a list of all items in list except for the last.
+
+          (-butlast '(1 2 3))
+              ⇒ (1 2)
+          (-butlast '(1 2))
+              ⇒ (1)
+          (-butlast '(1))
+              ⇒ nil
+
+ -- Function: -sort (comparator list)
+     Sort LIST, stably, comparing elements using COMPARATOR.  Return the
+     sorted list.  LIST is NOT modified by side effects.  COMPARATOR is
+     called with two elements of LIST, and should return non-‘nil’ if
+     the first element should sort before the second.
+
+          (-sort #'< '(3 1 2))
+              ⇒ (1 2 3)
+          (-sort #'> '(3 1 2))
+              ⇒ (3 2 1)
+          (--sort (< it other) '(3 1 2))
+              ⇒ (1 2 3)
+
+ -- Function: -list (arg)
+     Ensure ARG is a list.  If ARG is already a list, return it as is
+     (not a copy).  Otherwise, return a new list with ARG as its only
+     element.
+
+     Another supported calling convention is (-list &rest ARGS).  In
+     this case, if ARG is not a list, a new list with all of ARGS as
+     elements is returned.  This use is supported for backward
+     compatibility and is otherwise deprecated.
+
+          (-list 1)
+              ⇒ (1)
+          (-list ())
+              ⇒ ()
+          (-list '(1 2 3))
+              ⇒ (1 2 3)
+
+ -- Function: -fix (fn list)
+     Compute the (least) fixpoint of FN with initial input LIST.
+
+     FN is called at least once, results are compared with ‘equal’.
+
+          (-fix (lambda (l) (-non-nil (--mapcat (-split-at (/ (length it) 2) it) l))) '((1 2 3)))
+              ⇒ ((1) (2) (3))
+          (let ((l '((starwars scifi) (jedi starwars warrior)))) (--fix (-uniq (--mapcat (cons it (cdr (assq it l))) it)) '(jedi book)))
+              ⇒ (jedi starwars warrior scifi book)
+
+
+File: dash.info,  Node: Tree operations,  Next: Threading macros,  Prev: Other list operations,  Up: Functions
+
+2.11 Tree operations
+====================
+
+Functions pretending lists are trees.
+
+ -- Function: -tree-seq (branch children tree)
+     Return a sequence of the nodes in TREE, in depth-first search
+     order.
+
+     BRANCH is a predicate of one argument that returns non-‘nil’ if the
+     passed argument is a branch, that is, a node that can have
+     children.
+
+     CHILDREN is a function of one argument that returns the children of
+     the passed branch node.
+
+     Non-branch nodes are simply copied.
+
+          (-tree-seq 'listp 'identity '(1 (2 3) 4 (5 (6 7))))
+              ⇒ ((1 (2 3) 4 (5 (6 7))) 1 (2 3) 2 3 4 (5 (6 7)) 5 (6 7) 6 7)
+          (-tree-seq 'listp 'reverse '(1 (2 3) 4 (5 (6 7))))
+              ⇒ ((1 (2 3) 4 (5 (6 7))) (5 (6 7)) (6 7) 7 6 5 4 (2 3) 3 2 1)
+          (--tree-seq (vectorp it) (append it nil) [1 [2 3] 4 [5 [6 7]]])
+              ⇒ ([1 [2 3] 4 [5 [6 7]]] 1 [2 3] 2 3 4 [5 [6 7]] 5 [6 7] 6 7)
+
+ -- Function: -tree-map (fn tree)
+     Apply FN to each element of TREE while preserving the tree
+     structure.
+
+          (-tree-map '1+ '(1 (2 3) (4 (5 6) 7)))
+              ⇒ (2 (3 4) (5 (6 7) 8))
+          (-tree-map '(lambda (x) (cons x (expt 2 x))) '(1 (2 3) 4))
+              ⇒ ((1 . 2) ((2 . 4) (3 . 8)) (4 . 16))
+          (--tree-map (length it) '("<body>" ("<p>" "text" "</p>") "</body>"))
+              ⇒ (6 (3 4 4) 7)
+
+ -- Function: -tree-map-nodes (pred fun tree)
+     Call FUN on each node of TREE that satisfies PRED.
+
+     If PRED returns ‘nil’, continue descending down this node.  If PRED
+     returns non-‘nil’, apply FUN to this node and do not descend
+     further.
+
+          (-tree-map-nodes 'vectorp (lambda (x) (-sum (append x nil))) '(1 [2 3] 4 (5 [6 7] 8)))
+              ⇒ (1 5 4 (5 13 8))
+          (-tree-map-nodes 'keywordp (lambda (x) (symbol-name x)) '(1 :foo 4 ((5 6 :bar) :baz 8)))
+              ⇒ (1 ":foo" 4 ((5 6 ":bar") ":baz" 8))
+          (--tree-map-nodes (eq (car-safe it) 'add-mode) (-concat it (list :mode 'emacs-lisp-mode)) '(with-mode emacs-lisp-mode (foo bar) (add-mode a b) (baz (add-mode c d))))
+              ⇒ (with-mode emacs-lisp-mode (foo bar) (add-mode a b :mode emacs-lisp-mode) (baz (add-mode c d :mode emacs-lisp-mode)))
+
+ -- Function: -tree-reduce (fn tree)
+     Use FN to reduce elements of list TREE.  If elements of TREE are
+     lists themselves, apply the reduction recursively.
+
+     FN is first applied to first element of the list and second
+     element, then on this result and third element from the list etc.
+
+     See ‘-reduce-r’ (*note -reduce-r::) for how exactly are lists of
+     zero or one element handled.
+
+          (-tree-reduce '+ '(1 (2 3) (4 5)))
+              ⇒ 15
+          (-tree-reduce 'concat '("strings" (" on" " various") ((" levels"))))
+              ⇒ "strings on various levels"
+          (--tree-reduce (cond ((stringp it) (concat it " " acc)) (t (let ((sn (symbol-name it))) (concat "<" sn ">" acc "</" sn ">")))) '(body (p "some words") (div "more" (b "bold") "words")))
+              ⇒ "<body><p>some words</p> <div>more <b>bold</b> words</div></body>"
+
+ -- Function: -tree-reduce-from (fn init-value tree)
+     Use FN to reduce elements of list TREE.  If elements of TREE are
+     lists themselves, apply the reduction recursively.
+
+     FN is first applied to INIT-VALUE and first element of the list,
+     then on this result and second element from the list etc.
+
+     The initial value is ignored on cons pairs as they always contain
+     two elements.
+
+          (-tree-reduce-from '+ 1 '(1 (1 1) ((1))))
+              ⇒ 8
+          (--tree-reduce-from (-concat acc (list it)) nil '(1 (2 3 (4 5)) (6 7)))
+              ⇒ ((7 6) ((5 4) 3 2) 1)
+
+ -- Function: -tree-mapreduce (fn folder tree)
+     Apply FN to each element of TREE, and make a list of the results.
+     If elements of TREE are lists themselves, apply FN recursively to
+     elements of these nested lists.
+
+     Then reduce the resulting lists using FOLDER and initial value
+     INIT-VALUE.  See ‘-reduce-r-from’ (*note -reduce-r-from::).
+
+     This is the same as calling ‘-tree-reduce’ (*note -tree-reduce::)
+     after ‘-tree-map’ (*note -tree-map::) but is twice as fast as it
+     only traverse the structure once.
+
+          (-tree-mapreduce 'list 'append '(1 (2 (3 4) (5 6)) (7 (8 9))))
+              ⇒ (1 2 3 4 5 6 7 8 9)
+          (--tree-mapreduce 1 (+ it acc) '(1 (2 (4 9) (2 1)) (7 (4 3))))
+              ⇒ 9
+          (--tree-mapreduce 0 (max acc (1+ it)) '(1 (2 (4 9) (2 1)) (7 (4 3))))
+              ⇒ 3
+
+ -- Function: -tree-mapreduce-from (fn folder init-value tree)
+     Apply FN to each element of TREE, and make a list of the results.
+     If elements of TREE are lists themselves, apply FN recursively to
+     elements of these nested lists.
+
+     Then reduce the resulting lists using FOLDER and initial value
+     INIT-VALUE.  See ‘-reduce-r-from’ (*note -reduce-r-from::).
+
+     This is the same as calling ‘-tree-reduce-from’ (*note
+     -tree-reduce-from::) after ‘-tree-map’ (*note -tree-map::) but is
+     twice as fast as it only traverse the structure once.
+
+          (-tree-mapreduce-from 'identity '* 1 '(1 (2 (3 4) (5 6)) (7 (8 9))))
+              ⇒ 362880
+          (--tree-mapreduce-from (+ it it) (cons it acc) nil '(1 (2 (4 9) (2 1)) (7 (4 3))))
+              ⇒ (2 (4 (8 18) (4 2)) (14 (8 6)))
+          (concat "{" (--tree-mapreduce-from (cond ((-cons-pair? it) (concat (symbol-name (car it)) " -> " (symbol-name (cdr it)))) (t (concat (symbol-name it) " : {"))) (concat it (unless (or (equal acc "}") (equal (substring it (1- (length it))) "{")) ", ") acc) "}" '((elisp-mode (foo (bar . booze)) (baz . qux)) (c-mode (foo . bla) (bum . bam)))))
+              ⇒ "{elisp-mode : {foo : {bar -> booze}, baz -> qux}, c-mode : {foo -> bla, bum -> bam}}"
+
+ -- Function: -clone (list)
+     Create a deep copy of LIST.  The new list has the same elements and
+     structure but all cons are replaced with new ones.  This is useful
+     when you need to clone a structure such as plist or alist.
+
+          (let* ((a (list (list 1))) (b (-clone a))) (setcar (car a) 2) b)
+              ⇒ ((1))
+
+
+File: dash.info,  Node: Threading macros,  Next: Binding,  Prev: Tree operations,  Up: Functions
+
+2.12 Threading macros
+=====================
+
+Macros that conditionally combine sequential forms for brevity or
+readability.
+
+ -- Macro: -> (x &optional form &rest more)
+     Thread the expr through the forms.  Insert X as the second item in
+     the first form, making a list of it if it is not a list already.
+     If there are more forms, insert the first form as the second item
+     in second form, etc.
+
+          (-> '(2 3 5))
+              ⇒ (2 3 5)
+          (-> '(2 3 5) (append '(8 13)))
+              ⇒ (2 3 5 8 13)
+          (-> '(2 3 5) (append '(8 13)) (-slice 1 -1))
+              ⇒ (3 5 8)
+
+ -- Macro: ->> (x &optional form &rest more)
+     Thread the expr through the forms.  Insert X as the last item in
+     the first form, making a list of it if it is not a list already.
+     If there are more forms, insert the first form as the last item in
+     second form, etc.
+
+          (->> '(1 2 3) (-map 'square))
+              ⇒ (1 4 9)
+          (->> '(1 2 3) (-map 'square) (-remove 'even?))
+              ⇒ (1 9)
+          (->> '(1 2 3) (-map 'square) (-reduce '+))
+              ⇒ 14
+
+ -- Macro: --> (x &rest forms)
+     Starting with the value of X, thread each expression through FORMS.
+
+     Insert X at the position signified by the symbol ‘it’ in the first
+     form.  If there are more forms, insert the first form at the
+     position signified by ‘it’ in the second form, etc.
+
+          (--> "def" (concat "abc" it "ghi"))
+              ⇒ "abcdefghi"
+          (--> "def" (concat "abc" it "ghi") (upcase it))
+              ⇒ "ABCDEFGHI"
+          (--> "def" (concat "abc" it "ghi") upcase)
+              ⇒ "ABCDEFGHI"
+
+ -- Macro: -as-> (value variable &rest forms)
+     Starting with VALUE, thread VARIABLE through FORMS.
+
+     In the first form, bind VARIABLE to VALUE.  In the second form,
+     bind VARIABLE to the result of the first form, and so forth.
+
+          (-as-> 3 my-var (1+ my-var) (list my-var) (mapcar (lambda (ele) (* 2 ele)) my-var))
+              ⇒ (8)
+          (-as-> 3 my-var 1+)
+              ⇒ 4
+          (-as-> 3 my-var)
+              ⇒ 3
+
+ -- Macro: -some-> (x &optional form &rest more)
+     When expr is non-‘nil’, thread it through the first form (via ‘->’
+     (*note ->::)), and when that result is non-‘nil’, through the next
+     form, etc.
+
+          (-some-> '(2 3 5))
+              ⇒ (2 3 5)
+          (-some-> 5 square)
+              ⇒ 25
+          (-some-> 5 even? square)
+              ⇒ nil
+
+ -- Macro: -some->> (x &optional form &rest more)
+     When expr is non-‘nil’, thread it through the first form (via ‘->>’
+     (*note ->>::)), and when that result is non-‘nil’, through the next
+     form, etc.
+
+          (-some->> '(1 2 3) (-map 'square))
+              ⇒ (1 4 9)
+          (-some->> '(1 3 5) (-last 'even?) (+ 100))
+              ⇒ nil
+          (-some->> '(2 4 6) (-last 'even?) (+ 100))
+              ⇒ 106
+
+ -- Macro: -some--> (expr &rest forms)
+     Thread EXPR through FORMS via ‘-->’ (*note -->::), while the result
+     is non-‘nil’.  When EXPR evaluates to non-‘nil’, thread the result
+     through the first of FORMS, and when that result is non-‘nil’,
+     thread it through the next form, etc.
+
+          (-some--> "def" (concat "abc" it "ghi"))
+              ⇒ "abcdefghi"
+          (-some--> nil (concat "abc" it "ghi"))
+              ⇒ nil
+          (-some--> '(0 1) (-remove #'natnump it) (append it it) (-map #'1+ it))
+              ⇒ ()
+
+ -- Macro: -doto (init &rest forms)
+     Evaluate INIT and pass it as argument to FORMS with ‘->’ (*note
+     ->::).  The RESULT of evaluating INIT is threaded through each of
+     FORMS individually using ‘->’ (*note ->::), which see.  The return
+     value is RESULT, which FORMS may have modified by side effect.
+
+          (-doto (list 1 2 3) pop pop)
+              ⇒ (3)
+          (-doto (cons 1 2) (setcar 3) (setcdr 4))
+              ⇒ (3 . 4)
+          (gethash 'k (--doto (make-hash-table) (puthash 'k 'v it)))
+              ⇒ v
+
+
+File: dash.info,  Node: Binding,  Next: Side effects,  Prev: Threading macros,  Up: Functions
+
+2.13 Binding
+============
+
+Macros that combine ‘let’ and ‘let*’ with destructuring and flow
+control.
+
+ -- Macro: -when-let ((var val) &rest body)
+     If VAL evaluates to non-‘nil’, bind it to VAR and execute body.
+
+     Note: binding is done according to ‘-let’ (*note -let::).
+
+          (-when-let (match-index (string-match "d" "abcd")) (+ match-index 2))
+              ⇒ 5
+          (-when-let ((&plist :foo foo) (list :foo "foo")) foo)
+              ⇒ "foo"
+          (-when-let ((&plist :foo foo) (list :bar "bar")) foo)
+              ⇒ nil
+
+ -- Macro: -when-let* (vars-vals &rest body)
+     If all VALS evaluate to true, bind them to their corresponding VARS
+     and execute body.  VARS-VALS should be a list of (VAR VAL) pairs.
+
+     Note: binding is done according to ‘-let*’ (*note -let*::).  VALS
+     are evaluated sequentially, and evaluation stops after the first
+     ‘nil’ VAL is encountered.
+
+          (-when-let* ((x 5) (y 3) (z (+ y 4))) (+ x y z))
+              ⇒ 15
+          (-when-let* ((x 5) (y nil) (z 7)) (+ x y z))
+              ⇒ nil
+
+ -- Macro: -if-let ((var val) then &rest else)
+     If VAL evaluates to non-‘nil’, bind it to VAR and do THEN,
+     otherwise do ELSE.
+
+     Note: binding is done according to ‘-let’ (*note -let::).
+
+          (-if-let (match-index (string-match "d" "abc")) (+ match-index 3) 7)
+              ⇒ 7
+          (--if-let (even? 4) it nil)
+              ⇒ t
+
+ -- Macro: -if-let* (vars-vals then &rest else)
+     If all VALS evaluate to true, bind them to their corresponding VARS
+     and do THEN, otherwise do ELSE.  VARS-VALS should be a list of (VAR
+     VAL) pairs.
+
+     Note: binding is done according to ‘-let*’ (*note -let*::).  VALS
+     are evaluated sequentially, and evaluation stops after the first
+     ‘nil’ VAL is encountered.
+
+          (-if-let* ((x 5) (y 3) (z 7)) (+ x y z) "foo")
+              ⇒ 15
+          (-if-let* ((x 5) (y nil) (z 7)) (+ x y z) "foo")
+              ⇒ "foo"
+          (-if-let* (((_ _ x) '(nil nil 7))) x)
+              ⇒ 7
+
+ -- Macro: -let (varlist &rest body)
+     Bind variables according to VARLIST then eval BODY.
+
+     VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+     PATTERN is matched against the SOURCE "structurally".  SOURCE is
+     only evaluated once for each PATTERN.  Each PATTERN is matched
+     recursively, and can therefore contain sub-patterns which are
+     matched against corresponding sub-expressions of SOURCE.
+
+     All the SOURCEs are evalled before any symbols are bound (i.e.  "in
+     parallel").
+
+     If VARLIST only contains one (PATTERN SOURCE) element, you can
+     optionally specify it using a vector and discarding the outer-most
+     parens.  Thus
+
+     (-let ((PATTERN SOURCE)) ...)
+
+     becomes
+
+     (-let [PATTERN SOURCE] ...).
+
+     ‘-let’ (*note -let::) uses a convention of not binding places
+     (symbols) starting with _ whenever it’s possible.  You can use this
+     to skip over entries you don’t care about.  However, this is not
+     *always* possible (as a result of implementation) and these symbols
+     might get bound to undefined values.
+
+     Following is the overview of supported patterns.  Remember that
+     patterns can be matched recursively, so every a, b, aK in the
+     following can be a matching construct and not necessarily a
+     symbol/variable.
+
+     Symbol:
+
+     a - bind the SOURCE to A.  This is just like regular ‘let’.
+
+     Conses and lists:
+
+     (a) - bind ‘car’ of cons/list to A
+
+     (a .  b) - bind car of cons to A and ‘cdr’ to B
+
+     (a b) - bind car of list to A and ‘cadr’ to B
+
+     (a1 a2 a3 ...) - bind 0th car of list to A1, 1st to A2, 2nd to
+     A3...
+
+     (a1 a2 a3 ... aN .  rest) - as above, but bind the Nth cdr to REST.
+
+     Vectors:
+
+     [a] - bind 0th element of a non-list sequence to A (works with
+     vectors, strings, bit arrays...)
+
+     [a1 a2 a3 ...] - bind 0th element of non-list sequence to A0, 1st
+     to A1, 2nd to A2, ...  If the PATTERN is shorter than SOURCE, the
+     values at places not in PATTERN are ignored.  If the PATTERN is
+     longer than SOURCE, an ‘error’ is thrown.
+
+     [a1 a2 a3 ... &rest rest] - as above, but bind the rest of the
+     sequence to REST.  This is conceptually the same as improper list
+     matching (a1 a2 ... aN .  rest)
+
+     Key/value stores:
+
+     (&plist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+     SOURCE plist to aK. If the value is not found, aK is ‘nil’.  Uses
+     ‘plist-get’ to fetch values.
+
+     (&alist key0 a0 ... keyN aN) - bind value mapped by keyK in the
+     SOURCE alist to aK. If the value is not found, aK is ‘nil’.  Uses
+     ‘assoc’ to fetch values.
+
+     (&hash key0 a0 ... keyN aN) - bind value mapped by keyK in the
+     SOURCE hash table to aK. If the value is not found, aK is ‘nil’.
+     Uses ‘gethash’ to fetch values.
+
+     Further, special keyword &keys supports "inline" matching of
+     plist-like key-value pairs, similarly to &keys keyword of
+     ‘cl-defun’.
+
+     (a1 a2 ... aN &keys key1 b1 ... keyN bK)
+
+     This binds N values from the list to a1 ... aN, then interprets the
+     cdr as a plist (see key/value matching above).
+
+     A shorthand notation for kv-destructuring exists which allows the
+     patterns be optionally left out and derived from the key name in
+     the following fashion:
+
+     - a key :foo is converted into ‘foo’ pattern, - a key ’bar is
+     converted into ‘bar’ pattern, - a key "baz" is converted into ‘baz’
+     pattern.
+
+     That is, the entire value under the key is bound to the derived
+     variable without any further destructuring.
+
+     This is possible only when the form following the key is not a
+     valid pattern (i.e.  not a symbol, a cons cell or a vector).
+     Otherwise the matching proceeds as usual and in case of an invalid
+     spec fails with an error.
+
+     Thus the patterns are normalized as follows:
+
+     ;; derive all the missing patterns (&plist :foo ’bar "baz") =>
+     (&plist :foo foo ’bar bar "baz" baz)
+
+     ;; we can specify some but not others (&plist :foo ’bar
+     explicit-bar) => (&plist :foo foo ’bar explicit-bar)
+
+     ;; nothing happens, we store :foo in x (&plist :foo x) => (&plist
+     :foo x)
+
+     ;; nothing happens, we match recursively (&plist :foo (a b c)) =>
+     (&plist :foo (a b c))
+
+     You can name the source using the syntax SYMBOL &as PATTERN.  This
+     syntax works with lists (proper or improper), vectors and all types
+     of maps.
+
+     (list &as a b c) (list 1 2 3)
+
+     binds A to 1, B to 2, C to 3 and LIST to (1 2 3).
+
+     Similarly:
+
+     (bounds &as beg .  end) (cons 1 2)
+
+     binds BEG to 1, END to 2 and BOUNDS to (1 .  2).
+
+     (items &as first .  rest) (list 1 2 3)
+
+     binds FIRST to 1, REST to (2 3) and ITEMS to (1 2 3)
+
+     [vect &as _ b c] [1 2 3]
+
+     binds B to 2, C to 3 and VECT to [1 2 3] (_ avoids binding as
+     usual).
+
+     (plist &as &plist :b b) (list :a 1 :b 2 :c 3)
+
+     binds B to 2 and PLIST to (:a 1 :b 2 :c 3).  Same for &alist and
+     &hash.
+
+     This is especially useful when we want to capture the result of a
+     computation and destructure at the same time.  Consider the form
+     (function-returning-complex-structure) returning a list of two
+     vectors with two items each.  We want to capture this entire result
+     and pass it to another computation, but at the same time we want to
+     get the second item from each vector.  We can achieve it with
+     pattern
+
+     (result &as [_ a] [_ b]) (function-returning-complex-structure)
+
+     Note: Clojure programmers may know this feature as the ":as
+     binding".  The difference is that we put the &as at the front
+     because we need to support improper list binding.
+
+          (-let (([a (b c) d] [1 (2 3) 4])) (list a b c d))
+              ⇒ (1 2 3 4)
+          (-let [(a b c . d) (list 1 2 3 4 5 6)] (list a b c d))
+              ⇒ (1 2 3 (4 5 6))
+          (-let [(&plist :foo foo :bar bar) (list :baz 3 :foo 1 :qux 4 :bar 2)] (list foo bar))
+              ⇒ (1 2)
+
+ -- Macro: -let* (varlist &rest body)
+     Bind variables according to VARLIST then eval BODY.
+
+     VARLIST is a list of lists of the form (PATTERN SOURCE).  Each
+     PATTERN is matched against the SOURCE structurally.  SOURCE is only
+     evaluated once for each PATTERN.
+
+     Each SOURCE can refer to the symbols already bound by this VARLIST.
+     This is useful if you want to destructure SOURCE recursively but
+     also want to name the intermediate structures.
+
+     See ‘-let’ (*note -let::) for the list of all possible patterns.
+
+          (-let* (((a . b) (cons 1 2)) ((c . d) (cons 3 4))) (list a b c d))
+              ⇒ (1 2 3 4)
+          (-let* (((a . b) (cons 1 (cons 2 3))) ((c . d) b)) (list a b c d))
+              ⇒ (1 (2 . 3) 2 3)
+          (-let* (((&alist "foo" foo "bar" bar) (list (cons "foo" 1) (cons "bar" (list 'a 'b 'c)))) ((a b c) bar)) (list foo a b c bar))
+              ⇒ (1 a b c (a b c))
+
+ -- Macro: -lambda (match-form &rest body)
+     Return a lambda which destructures its input as MATCH-FORM and
+     executes BODY.
+
+     Note that you have to enclose the MATCH-FORM in a pair of parens,
+     such that:
+
+     (-lambda (x) body) (-lambda (x y ...) body)
+
+     has the usual semantics of ‘lambda’.  Furthermore, these get
+     translated into normal ‘lambda’, so there is no performance
+     penalty.
+
+     See ‘-let’ (*note -let::) for a description of the destructuring
+     mechanism.
+
+          (-map (-lambda ((x y)) (+ x y)) '((1 2) (3 4) (5 6)))
+              ⇒ (3 7 11)
+          (-map (-lambda ([x y]) (+ x y)) '([1 2] [3 4] [5 6]))
+              ⇒ (3 7 11)
+          (funcall (-lambda ((_ . a) (_ . b)) (-concat a b)) '(1 2 3) '(4 5 6))
+              ⇒ (2 3 5 6)
+
+ -- Macro: -setq ([match-form val] ...)
+     Bind each MATCH-FORM to the value of its VAL.
+
+     MATCH-FORM destructuring is done according to the rules of ‘-let’
+     (*note -let::).
+
+     This macro allows you to bind multiple variables by destructuring
+     the value, so for example:
+
+     (-setq (a b) x (&plist :c c) plist)
+
+     expands roughly speaking to the following code
+
+     (setq a (car x) b (cadr x) c (plist-get plist :c))
+
+     Care is taken to only evaluate each VAL once so that in case of
+     multiple assignments it does not cause unexpected side effects.
+
+          (let (a) (-setq a 1) a)
+              ⇒ 1
+          (let (a b) (-setq (a b) (list 1 2)) (list a b))
+              ⇒ (1 2)
+          (let (c) (-setq (&plist :c c) (list :c "c")) c)
+              ⇒ "c"
+
+
+File: dash.info,  Node: Side effects,  Next: Destructive operations,  Prev: Binding,  Up: Functions
+
+2.14 Side effects
+=================
+
+Functions iterating over lists for side effect only.
+
+ -- Function: -each (list fn)
+     Call FN on each element of LIST.  Return ‘nil’; this function is
+     intended for side effects.
+
+     Its anaphoric counterpart is ‘--each’.
+
+     For access to the current element’s index in LIST, see
+     ‘-each-indexed’ (*note -each-indexed::).
+
+          (let (l) (-each '(1 2 3) (lambda (x) (push x l))) l)
+              ⇒ (3 2 1)
+          (let (l) (--each '(1 2 3) (push it l)) l)
+              ⇒ (3 2 1)
+          (-each '(1 2 3) #'identity)
+              ⇒ nil
+
+ -- Function: -each-while (list pred fn)
+     Call FN on each ITEM in LIST, while (PRED ITEM) is non-‘nil’.  Once
+     an ITEM is reached for which PRED returns ‘nil’, FN is no longer
+     called.  Return ‘nil’; this function is intended for side effects.
+
+     Its anaphoric counterpart is ‘--each-while’.
+
+          (let (l) (-each-while '(2 4 5 6) #'even? (lambda (x) (push x l))) l)
+              ⇒ (4 2)
+          (let (l) (--each-while '(1 2 3 4) (< it 3) (push it l)) l)
+              ⇒ (2 1)
+          (let ((s 0)) (--each-while '(1 3 4 5) (< it 5) (setq s (+ s it))) s)
+              ⇒ 8
+
+ -- Function: -each-indexed (list fn)
+     Call FN on each index and element of LIST.  For each ITEM at INDEX
+     in LIST, call (funcall FN INDEX ITEM).  Return ‘nil’; this function
+     is intended for side effects.
+
+     See also: ‘-map-indexed’ (*note -map-indexed::).
+
+          (let (l) (-each-indexed '(a b c) (lambda (i x) (push (list x i) l))) l)
+              ⇒ ((c 2) (b 1) (a 0))
+          (let (l) (--each-indexed '(a b c) (push (list it it-index) l)) l)
+              ⇒ ((c 2) (b 1) (a 0))
+          (let (l) (--each-indexed () (push it l)) l)
+              ⇒ ()
+
+ -- Function: -each-r (list fn)
+     Call FN on each element of LIST in reversed order.  Return ‘nil’;
+     this function is intended for side effects.
+
+     Its anaphoric counterpart is ‘--each-r’.
+
+          (let (l) (-each-r '(1 2 3) (lambda (x) (push x l))) l)
+              ⇒ (1 2 3)
+          (let (l) (--each-r '(1 2 3) (push it l)) l)
+              ⇒ (1 2 3)
+          (-each-r '(1 2 3) #'identity)
+              ⇒ nil
+
+ -- Function: -each-r-while (list pred fn)
+     Call FN on each ITEM in reversed LIST, while (PRED ITEM) is
+     non-‘nil’.  Once an ITEM is reached for which PRED returns ‘nil’,
+     FN is no longer called.  Return ‘nil’; this function is intended
+     for side effects.
+
+     Its anaphoric counterpart is ‘--each-r-while’.
+
+          (let (l) (-each-r-while '(2 4 5 6) #'even? (lambda (x) (push x l))) l)
+              ⇒ (6)
+          (let (l) (--each-r-while '(1 2 3 4) (>= it 3) (push it l)) l)
+              ⇒ (3 4)
+          (let ((s 0)) (--each-r-while '(1 2 3 5) (> it 1) (setq s (+ s it))) s)
+              ⇒ 10
+
+ -- Function: -dotimes (num fn)
+     Call FN NUM times, presumably for side effects.  FN is called with
+     a single argument on successive integers running from 0, inclusive,
+     to NUM, exclusive.  FN is not called if NUM is less than 1.
+
+     This function’s anaphoric counterpart is ‘--dotimes’.
+
+          (let (s) (-dotimes 3 (lambda (n) (push n s))) s)
+              ⇒ (2 1 0)
+          (let (s) (-dotimes 0 (lambda (n) (push n s))) s)
+              ⇒ ()
+          (let (s) (--dotimes 5 (push it s)) s)
+              ⇒ (4 3 2 1 0)
+
+
+File: dash.info,  Node: Destructive operations,  Next: Function combinators,  Prev: Side effects,  Up: Functions
+
+2.15 Destructive operations
+===========================
+
+Macros that modify variables holding lists.
+
+ -- Macro: !cons (car cdr)
+     Destructive: Set CDR to the cons of CAR and CDR.
+
+          (let (l) (!cons 5 l) l)
+              ⇒ (5)
+          (let ((l '(3))) (!cons 5 l) l)
+              ⇒ (5 3)
+
+ -- Macro: !cdr (list)
+     Destructive: Set LIST to the cdr of LIST.
+
+          (let ((l '(3))) (!cdr l) l)
+              ⇒ ()
+          (let ((l '(3 5))) (!cdr l) l)
+              ⇒ (5)
+
+
+File: dash.info,  Node: Function combinators,  Prev: Destructive operations,  Up: Functions
+
+2.16 Function combinators
+=========================
+
+Functions that manipulate and compose other functions.
+
+ -- Function: -partial (fun &rest args)
+     Return a function that is a partial application of FUN to ARGS.
+     ARGS is a list of the first N arguments to pass to FUN.  The result
+     is a new function which does the same as FUN, except that the first
+     N arguments are fixed at the values with which this function was
+     called.
+
+          (funcall (-partial #'+ 5))
+              ⇒ 5
+          (funcall (-partial #'- 5) 3)
+              ⇒ 2
+          (funcall (-partial #'+ 5 2) 3)
+              ⇒ 10
+
+ -- Function: -rpartial (fn &rest args)
+     Return a function that is a partial application of FN to ARGS.
+     ARGS is a list of the last N arguments to pass to FN.  The result
+     is a new function which does the same as FN, except that the last N
+     arguments are fixed at the values with which this function was
+     called.  This is like ‘-partial’ (*note -partial::), except the
+     arguments are fixed starting from the right rather than the left.
+
+          (funcall (-rpartial #'- 5))
+              ⇒ -5
+          (funcall (-rpartial #'- 5) 8)
+              ⇒ 3
+          (funcall (-rpartial #'- 5 2) 10)
+              ⇒ 3
+
+ -- Function: -juxt (&rest fns)
+     Return a function that is the juxtaposition of FNS.  The returned
+     function takes a variable number of ARGS, applies each of FNS in
+     turn to ARGS, and returns the list of results.
+
+          (funcall (-juxt) 1 2)
+              ⇒ ()
+          (funcall (-juxt #'+ #'- #'* #'/) 7 5)
+              ⇒ (12 2 35 1)
+          (mapcar (-juxt #'number-to-string #'1+) '(1 2))
+              ⇒ (("1" 2) ("2" 3))
+
+ -- Function: -compose (&rest fns)
+     Compose FNS into a single composite function.  Return a function
+     that takes a variable number of ARGS, applies the last function in
+     FNS to ARGS, and returns the result of calling each remaining
+     function on the result of the previous function, right-to-left.  If
+     no FNS are given, return a variadic ‘identity’ function.
+
+          (funcall (-compose #'- #'1+ #'+) 1 2 3)
+              ⇒ -7
+          (funcall (-compose #'identity #'1+) 3)
+              ⇒ 4
+          (mapcar (-compose #'not #'stringp) '(nil ""))
+              ⇒ (t nil)
+
+ -- Function: -applify (fn)
+     Return a function that applies FN to a single list of args.  This
+     changes the arity of FN from taking N distinct arguments to taking
+     1 argument which is a list of N arguments.
+
+          (funcall (-applify #'+) nil)
+              ⇒ 0
+          (mapcar (-applify #'+) '((1 1 1) (1 2 3) (5 5 5)))
+              ⇒ (3 6 15)
+          (funcall (-applify #'<) '(3 6))
+              ⇒ t
+
+ -- Function: -on (op trans)
+     Return a function that calls TRANS on each arg and OP on the
+     results.  The returned function takes a variable number of
+     arguments, calls the function TRANS on each one in turn, and then
+     passes those results as the list of arguments to OP, in the same
+     order.
+
+     For example, the following pairs of expressions are morally
+     equivalent:
+
+     (funcall (-on #’+ #’1+) 1 2 3) = (+ (1+ 1) (1+ 2) (1+ 3)) (funcall
+     (-on #’+ #’1+)) = (+)
+
+          (-sort (-on #'< #'length) '((1 2 3) (1) (1 2)))
+              ⇒ ((1) (1 2) (1 2 3))
+          (funcall (-on #'min #'string-to-number) "22" "2" "1" "12")
+              ⇒ 1
+          (-min-by (-on #'> #'length) '((1 2 3) (4) (1 2)))
+              ⇒ (4)
+
+ -- Function: -flip (fn)
+     Return a function that calls FN with its arguments reversed.  The
+     returned function takes the same number of arguments as FN.
+
+     For example, the following two expressions are morally equivalent:
+
+     (funcall (-flip #’-) 1 2) = (- 2 1)
+
+     See also: ‘-rotate-args’ (*note -rotate-args::).
+
+          (-sort (-flip #'<) '(4 3 6 1))
+              ⇒ (6 4 3 1)
+          (funcall (-flip #'-) 3 2 1 10)
+              ⇒ 4
+          (funcall (-flip #'1+) 1)
+              ⇒ 2
+
+ -- Function: -rotate-args (n fn)
+     Return a function that calls FN with args rotated N places to the
+     right.  The returned function takes the same number of arguments as
+     FN, rotates the list of arguments N places to the right (left if N
+     is negative) just like ‘-rotate’ (*note -rotate::), and applies FN
+     to the result.
+
+     See also: ‘-flip’ (*note -flip::).
+
+          (funcall (-rotate-args -1 #'list) 1 2 3 4)
+              ⇒ (2 3 4 1)
+          (funcall (-rotate-args 1 #'-) 1 10 100)
+              ⇒ 89
+          (funcall (-rotate-args 2 #'list) 3 4 5 1 2)
+              ⇒ (1 2 3 4 5)
+
+ -- Function: -const (c)
+     Return a function that returns C ignoring any additional arguments.
+
+     In types: a -> b -> a
+
+          (funcall (-const 2) 1 3 "foo")
+              ⇒ 2
+          (mapcar (-const 1) '("a" "b" "c" "d"))
+              ⇒ (1 1 1 1)
+          (-sum (mapcar (-const 1) '("a" "b" "c" "d")))
+              ⇒ 4
+
+ -- Macro: -cut (&rest params)
+     Take n-ary function and n arguments and specialize some of them.
+     Arguments denoted by <> will be left unspecialized.
+
+     See SRFI-26 for detailed description.
+
+          (funcall (-cut list 1 <> 3 <> 5) 2 4)
+              ⇒ (1 2 3 4 5)
+          (-map (-cut funcall <> 5) `(1+ 1- ,(lambda (x) (/ 1.0 x))))
+              ⇒ (6 4 0.2)
+          (-map (-cut <> 1 2 3) '(list vector string))
+              ⇒ ((1 2 3) [1 2 3] "\1\2\3")
+
+ -- Function: -not (pred)
+     Return a predicate that negates the result of PRED.  The returned
+     predicate passes its arguments to PRED.  If PRED returns ‘nil’, the
+     result is non-‘nil’; otherwise the result is ‘nil’.
+
+     See also: ‘-andfn’ (*note -andfn::) and ‘-orfn’ (*note -orfn::).
+
+          (funcall (-not #'numberp) "5")
+              ⇒ t
+          (-sort (-not #'<) '(5 2 1 0 6))
+              ⇒ (6 5 2 1 0)
+          (-filter (-not (-partial #'< 4)) '(1 2 3 4 5 6 7 8))
+              ⇒ (1 2 3 4)
+
+ -- Function: -orfn (&rest preds)
+     Return a predicate that returns the first non-‘nil’ result of
+     PREDS.  The returned predicate takes a variable number of
+     arguments, passes them to each predicate in PREDS in turn until one
+     of them returns non-‘nil’, and returns that non-‘nil’ result
+     without calling the remaining PREDS.  If all PREDS return ‘nil’, or
+     if no PREDS are given, the returned predicate returns ‘nil’.
+
+     See also: ‘-andfn’ (*note -andfn::) and ‘-not’ (*note -not::).
+
+          (-filter (-orfn #'natnump #'booleanp) '(1 nil "a" -4 b c t))
+              ⇒ (1 nil t)
+          (funcall (-orfn #'symbolp (-cut string-match-p "x" <>)) "axe")
+              ⇒ 1
+          (funcall (-orfn #'= #'+) 1 1)
+              ⇒ t
+
+ -- Function: -andfn (&rest preds)
+     Return a predicate that returns non-‘nil’ if all PREDS do so.  The
+     returned predicate P takes a variable number of arguments and
+     passes them to each predicate in PREDS in turn.  If any one of
+     PREDS returns ‘nil’, P also returns ‘nil’ without calling the
+     remaining PREDS.  If all PREDS return non-‘nil’, P returns the last
+     such value.  If no PREDS are given, P always returns non-‘nil’.
+
+     See also: ‘-orfn’ (*note -orfn::) and ‘-not’ (*note -not::).
+
+          (-filter (-andfn #'numberp (-cut < <> 5)) '(a 1 b 6 c 2))
+              ⇒ (1 2)
+          (mapcar (-andfn #'numberp #'1+) '(a 1 b 6))
+              ⇒ (nil 2 nil 7)
+          (funcall (-andfn #'= #'+) 1 1)
+              ⇒ 2
+
+ -- Function: -iteratefn (fn n)
+     Return a function FN composed N times with itself.
+
+     FN is a unary function.  If you need to use a function of higher
+     arity, use ‘-applify’ (*note -applify::) first to turn it into a
+     unary function.
+
+     With n = 0, this acts as identity function.
+
+     In types: (a -> a) -> Int -> a -> a.
+
+     This function satisfies the following law:
+
+     (funcall (-iteratefn fn n) init) = (-last-item (-iterate fn init
+     (1+ n))).
+
+          (funcall (-iteratefn (lambda (x) (* x x)) 3) 2)
+              ⇒ 256
+          (funcall (-iteratefn '1+ 3) 1)
+              ⇒ 4
+          (funcall (-iteratefn 'cdr 3) '(1 2 3 4 5))
+              ⇒ (4 5)
+
+ -- Function: -fixfn (fn &optional equal-test halt-test)
+     Return a function that computes the (least) fixpoint of FN.
+
+     FN must be a unary function.  The returned lambda takes a single
+     argument, X, the initial value for the fixpoint iteration.  The
+     iteration halts when either of the following conditions is
+     satisfied:
+
+     1.  Iteration converges to the fixpoint, with equality being tested
+     using EQUAL-TEST.  If EQUAL-TEST is not specified, ‘equal’ is used.
+     For functions over the floating point numbers, it may be necessary
+     to provide an appropriate approximate comparison test.
+
+     2.  HALT-TEST returns a non-‘nil’ value.  HALT-TEST defaults to a
+     simple counter that returns ‘t’ after ‘-fixfn-max-iterations’, to
+     guard against infinite iteration.  Otherwise, HALT-TEST must be a
+     function that accepts a single argument, the current value of X,
+     and returns non-‘nil’ as long as iteration should continue.  In
+     this way, a more sophisticated convergence test may be supplied by
+     the caller.
+
+     The return value of the lambda is either the fixpoint or, if
+     iteration halted before converging, a cons with car ‘halted’ and
+     cdr the final output from HALT-TEST.
+
+     In types: (a -> a) -> a -> a.
+
+          (funcall (-fixfn #'cos #'approx=) 0.7)
+              ⇒ 0.7390851332151607
+          (funcall (-fixfn (lambda (x) (expt (+ x 10) 0.25))) 2.0)
+              ⇒ 1.8555845286409378
+          (funcall (-fixfn #'sin #'approx=) 0.1)
+              ⇒ (halted . t)
+
+ -- Function: -prodfn (&rest fns)
+     Return a function that applies each of FNS to each of a list of
+     arguments.
+
+     Takes a list of N functions and returns a function that takes a
+     list of length N, applying Ith function to Ith element of the input
+     list.  Returns a list of length N.
+
+     In types (for N=2): ((a -> b), (c -> d)) -> (a, c) -> (b, d)
+
+     This function satisfies the following laws:
+
+     (-compose (-prodfn f g ...) (-prodfn f’ g’ ...)) = (-prodfn
+     (-compose f f’) (-compose g g’) ...)
+
+     (-prodfn f g ...) = (-juxt (-compose f (-partial #’nth 0))
+     (-compose g (-partial #’nth 1)) ...)
+
+     (-compose (-prodfn f g ...) (-juxt f’ g’ ...)) = (-juxt (-compose f
+     f’) (-compose g g’) ...)
+
+     (-compose (-partial #’nth n) (-prod f1 f2 ...)) = (-compose fn
+     (-partial #’nth n))
+
+          (funcall (-prodfn #'1+ #'1- #'number-to-string) '(1 2 3))
+              ⇒ (2 1 "3")
+          (-map (-prodfn #'1- #'1+) '((1 2) (3 4) (5 6)))
+              ⇒ ((0 3) (2 5) (4 7))
+          (apply #'+ (funcall (-prodfn #'length #'string-to-number) '((t) "5")))
+              ⇒ 6
+
+
+File: dash.info,  Node: Development,  Next: FDL,  Prev: Functions,  Up: Top
+
+3 Development
+*************
+
+The Dash repository is hosted on GitHub at
+<https://github.com/magnars/dash.el>.
+
+* Menu:
+
+* Contribute::          How to contribute.
+* Contributors::        List of contributors.
+
+
+File: dash.info,  Node: Contribute,  Next: Contributors,  Up: Development
+
+3.1 Contribute
+==============
+
+Yes, please do.  Pure functions in the list manipulation realm only,
+please.  There’s a suite of examples/tests in ‘dev/examples.el’, so
+remember to add tests for your additions, or they may get broken later.
+
+   Run the tests with ‘make check’.  Regenerate the docs with ‘make
+docs’.  Contributors are encouraged to install these commands as a Git
+pre-commit hook, so that the tests are always running and the docs are
+always in sync:
+
+     $ cp dev/pre-commit.sh .git/hooks/pre-commit
+
+   Oh, and don’t edit ‘README.md’ or ‘dash.texi’ directly, as they are
+auto-generated.  Instead, change their respective templates
+‘readme-template.md’ or ‘dash-template.texi’.
+
+   To ensure that Dash can be distributed with GNU ELPA or Emacs, we
+require that all contributors assign copyright to the Free Software
+Foundation.  For more on this, *note (emacs)Copyright Assignment::.
+
+
+File: dash.info,  Node: Contributors,  Prev: Contribute,  Up: Development
+
+3.2 Contributors
+================
+
+   • Matus Goljer (https://github.com/Fuco1) contributed lots of
+     features and functions.
+   • Takafumi Arakaki (https://github.com/tkf) contributed ‘-group-by’.
+   • tali713 (https://github.com/tali713) is the author of ‘-applify’.
+   • Víctor M. Valenzuela (https://github.com/vemv) contributed
+     ‘-repeat’.
+   • Nic Ferrier (https://github.com/nicferrier) contributed ‘-cons*’.
+   • Wilfred Hughes (https://github.com/Wilfred) contributed ‘-slice’,
+     ‘-first-item’, and ‘-last-item’.
+   • Emanuel Evans (https://github.com/shosti) contributed ‘-if-let’,
+     ‘-when-let’, and ‘-insert-at’.
+   • Johan Andersson (https://github.com/rejeep) contributed ‘-sum’,
+     ‘-product’, and ‘-same-items?’.
+   • Christina Whyte (https://github.com/kurisuwhyte) contributed
+     ‘-compose’.
+   • Steve Lamb (https://github.com/steventlamb) contributed ‘-cycle’,
+     ‘-pad’, ‘-annotate’, ‘-zip-fill’, and a variadic version of ‘-zip’.
+   • Fredrik Bergroth (https://github.com/fbergroth) made the ‘-if-let’
+     family use ‘-let’ destructuring and improved the script for
+     generating documentation.
+   • Mark Oteiza (https://github.com/holomorph) contributed ‘-iota’ and
+     the script to create an Info manual.
+   • Vasilij Schneidermann (https://github.com/wasamasa) contributed
+     ‘-some’.
+   • William West (https://github.com/occidens) made ‘-fixfn’ more
+     robust at handling floats.
+   • Cam Saul (https://github.com/camsaul) contributed ‘-some->’,
+     ‘-some->>’, and ‘-some-->’.
+   • Basil L. Contovounesios (https://github.com/basil-conto)
+     contributed ‘-common-prefix’, ‘-common-suffix’, and various other
+     improvements.
+   • Paul Pogonyshev (https://github.com/doublep) contributed ‘-each-r’
+     and ‘-each-r-while’.
+
+   Thanks!
+
+   New contributors are very welcome.  *Note Contribute::.
+
+
+File: dash.info,  Node: FDL,  Next: GPL,  Prev: Development,  Up: Top
+
+Appendix A GNU Free Documentation License
+*****************************************
+
+                     Version 1.3, 3 November 2008
+
+     Copyright © 2000, 2001, 2002, 2007, 2008 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.
+
+  0. PREAMBLE
+
+     The purpose of this License is to make a manual, textbook, or other
+     functional and useful document “free” in the sense of freedom: to
+     assure everyone the effective freedom to copy and redistribute it,
+     with or without modifying it, either commercially or
+     noncommercially.  Secondarily, this License preserves for the
+     author and publisher a way to get credit for their work, while not
+     being considered responsible for modifications made by others.
+
+     This License is a kind of “copyleft”, which means that derivative
+     works of the document must themselves be free in the same sense.
+     It complements the GNU General Public License, which is a copyleft
+     license designed for free software.
+
+     We have designed this License in order to use it for manuals for
+     free software, because free software needs free documentation: a
+     free program should come with manuals providing the same freedoms
+     that the software does.  But this License is not limited to
+     software manuals; it can be used for any textual work, regardless
+     of subject matter or whether it is published as a printed book.  We
+     recommend this License principally for works whose purpose is
+     instruction or reference.
+
+  1. APPLICABILITY AND DEFINITIONS
+
+     This License applies to any manual or other work, in any medium,
+     that contains a notice placed by the copyright holder saying it can
+     be distributed under the terms of this License.  Such a notice
+     grants a world-wide, royalty-free license, unlimited in duration,
+     to use that work under the conditions stated herein.  The
+     “Document”, below, refers to any such manual or work.  Any member
+     of the public is a licensee, and is addressed as “you”.  You accept
+     the license if you copy, modify or distribute the work in a way
+     requiring permission under copyright law.
+
+     A “Modified Version” of the Document means any work containing the
+     Document or a portion of it, either copied verbatim, or with
+     modifications and/or translated into another language.
+
+     A “Secondary Section” is a named appendix or a front-matter section
+     of the Document that deals exclusively with the relationship of the
+     publishers or authors of the Document to the Document’s overall
+     subject (or to related matters) and contains nothing that could
+     fall directly within that overall subject.  (Thus, if the Document
+     is in part a textbook of mathematics, a Secondary Section may not
+     explain any mathematics.)  The relationship could be a matter of
+     historical connection with the subject or with related matters, or
+     of legal, commercial, philosophical, ethical or political position
+     regarding them.
+
+     The “Invariant Sections” are certain Secondary Sections whose
+     titles are designated, as being those of Invariant Sections, in the
+     notice that says that the Document is released under this License.
+     If a section does not fit the above definition of Secondary then it
+     is not allowed to be designated as Invariant.  The Document may
+     contain zero Invariant Sections.  If the Document does not identify
+     any Invariant Sections then there are none.
+
+     The “Cover Texts” are certain short passages of text that are
+     listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+     that says that the Document is released under this License.  A
+     Front-Cover Text may be at most 5 words, and a Back-Cover Text may
+     be at most 25 words.
+
+     A “Transparent” copy of the Document means a machine-readable copy,
+     represented in a format whose specification is available to the
+     general public, that is suitable for revising the document
+     straightforwardly with generic text editors or (for images composed
+     of pixels) generic paint programs or (for drawings) some widely
+     available drawing editor, and that is suitable for input to text
+     formatters or for automatic translation to a variety of formats
+     suitable for input to text formatters.  A copy made in an otherwise
+     Transparent file format whose markup, or absence of markup, has
+     been arranged to thwart or discourage subsequent modification by
+     readers is not Transparent.  An image format is not Transparent if
+     used for any substantial amount of text.  A copy that is not
+     “Transparent” is called “Opaque”.
+
+     Examples of suitable formats for Transparent copies include plain
+     ASCII without markup, Texinfo input format, LaTeX input format,
+     SGML or XML using a publicly available DTD, and standard-conforming
+     simple HTML, PostScript or PDF designed for human modification.
+     Examples of transparent image formats include PNG, XCF and JPG.
+     Opaque formats include proprietary formats that can be read and
+     edited only by proprietary word processors, SGML or XML for which
+     the DTD and/or processing tools are not generally available, and
+     the machine-generated HTML, PostScript or PDF produced by some word
+     processors for output purposes only.
+
+     The “Title Page” means, for a printed book, the title page itself,
+     plus such following pages as are needed to hold, legibly, the
+     material this License requires to appear in the title page.  For
+     works in formats which do not have any title page as such, “Title
+     Page” means the text near the most prominent appearance of the
+     work’s title, preceding the beginning of the body of the text.
+
+     The “publisher” means any person or entity that distributes copies
+     of the Document to the public.
+
+     A section “Entitled XYZ” means a named subunit of the Document
+     whose title either is precisely XYZ or contains XYZ in parentheses
+     following text that translates XYZ in another language.  (Here XYZ
+     stands for a specific section name mentioned below, such as
+     “Acknowledgements”, “Dedications”, “Endorsements”, or “History”.)
+     To “Preserve the Title” of such a section when you modify the
+     Document means that it remains a section “Entitled XYZ” according
+     to this definition.
+
+     The Document may include Warranty Disclaimers next to the notice
+     which states that this License applies to the Document.  These
+     Warranty Disclaimers are considered to be included by reference in
+     this License, but only as regards disclaiming warranties: any other
+     implication that these Warranty Disclaimers may have is void and
+     has no effect on the meaning of this License.
+
+  2. VERBATIM COPYING
+
+     You may copy and distribute the Document in any medium, either
+     commercially or noncommercially, provided that this License, the
+     copyright notices, and the license notice saying this License
+     applies to the Document are reproduced in all copies, and that you
+     add no other conditions whatsoever to those of this License.  You
+     may not use technical measures to obstruct or control the reading
+     or further copying of the copies you make or distribute.  However,
+     you may accept compensation in exchange for copies.  If you
+     distribute a large enough number of copies you must also follow the
+     conditions in section 3.
+
+     You may also lend copies, under the same conditions stated above,
+     and you may publicly display copies.
+
+  3. COPYING IN QUANTITY
+
+     If you publish printed copies (or copies in media that commonly
+     have printed covers) of the Document, numbering more than 100, and
+     the Document’s license notice requires Cover Texts, you must
+     enclose the copies in covers that carry, clearly and legibly, all
+     these Cover Texts: Front-Cover Texts on the front cover, and
+     Back-Cover Texts on the back cover.  Both covers must also clearly
+     and legibly identify you as the publisher of these copies.  The
+     front cover must present the full title with all words of the title
+     equally prominent and visible.  You may add other material on the
+     covers in addition.  Copying with changes limited to the covers, as
+     long as they preserve the title of the Document and satisfy these
+     conditions, can be treated as verbatim copying in other respects.
+
+     If the required texts for either cover are too voluminous to fit
+     legibly, you should put the first ones listed (as many as fit
+     reasonably) on the actual cover, and continue the rest onto
+     adjacent pages.
+
+     If you publish or distribute Opaque copies of the Document
+     numbering more than 100, you must either include a machine-readable
+     Transparent copy along with each Opaque copy, or state in or with
+     each Opaque copy a computer-network location from which the general
+     network-using public has access to download using public-standard
+     network protocols a complete Transparent copy of the Document, free
+     of added material.  If you use the latter option, you must take
+     reasonably prudent steps, when you begin distribution of Opaque
+     copies in quantity, to ensure that this Transparent copy will
+     remain thus accessible at the stated location until at least one
+     year after the last time you distribute an Opaque copy (directly or
+     through your agents or retailers) of that edition to the public.
+
+     It is requested, but not required, that you contact the authors of
+     the Document well before redistributing any large number of copies,
+     to give them a chance to provide you with an updated version of the
+     Document.
+
+  4. MODIFICATIONS
+
+     You may copy and distribute a Modified Version of the Document
+     under the conditions of sections 2 and 3 above, provided that you
+     release the Modified Version under precisely this License, with the
+     Modified Version filling the role of the Document, thus licensing
+     distribution and modification of the Modified Version to whoever
+     possesses a copy of it.  In addition, you must do these things in
+     the Modified Version:
+
+       A. Use in the Title Page (and on the covers, if any) a title
+          distinct from that of the Document, and from those of previous
+          versions (which should, if there were any, be listed in the
+          History section of the Document).  You may use the same title
+          as a previous version if the original publisher of that
+          version gives permission.
+
+       B. List on the Title Page, as authors, one or more persons or
+          entities responsible for authorship of the modifications in
+          the Modified Version, together with at least five of the
+          principal authors of the Document (all of its principal
+          authors, if it has fewer than five), unless they release you
+          from this requirement.
+
+       C. State on the Title page the name of the publisher of the
+          Modified Version, as the publisher.
+
+       D. Preserve all the copyright notices of the Document.
+
+       E. Add an appropriate copyright notice for your modifications
+          adjacent to the other copyright notices.
+
+       F. Include, immediately after the copyright notices, a license
+          notice giving the public permission to use the Modified
+          Version under the terms of this License, in the form shown in
+          the Addendum below.
+
+       G. Preserve in that license notice the full lists of Invariant
+          Sections and required Cover Texts given in the Document’s
+          license notice.
+
+       H. Include an unaltered copy of this License.
+
+       I. Preserve the section Entitled “History”, Preserve its Title,
+          and add to it an item stating at least the title, year, new
+          authors, and publisher of the Modified Version as given on the
+          Title Page.  If there is no section Entitled “History” in the
+          Document, create one stating the title, year, authors, and
+          publisher of the Document as given on its Title Page, then add
+          an item describing the Modified Version as stated in the
+          previous sentence.
+
+       J. Preserve the network location, if any, given in the Document
+          for public access to a Transparent copy of the Document, and
+          likewise the network locations given in the Document for
+          previous versions it was based on.  These may be placed in the
+          “History” section.  You may omit a network location for a work
+          that was published at least four years before the Document
+          itself, or if the original publisher of the version it refers
+          to gives permission.
+
+       K. For any section Entitled “Acknowledgements” or “Dedications”,
+          Preserve the Title of the section, and preserve in the section
+          all the substance and tone of each of the contributor
+          acknowledgements and/or dedications given therein.
+
+       L. Preserve all the Invariant Sections of the Document, unaltered
+          in their text and in their titles.  Section numbers or the
+          equivalent are not considered part of the section titles.
+
+       M. Delete any section Entitled “Endorsements”.  Such a section
+          may not be included in the Modified Version.
+
+       N. Do not retitle any existing section to be Entitled
+          “Endorsements” or to conflict in title with any Invariant
+          Section.
+
+       O. Preserve any Warranty Disclaimers.
+
+     If the Modified Version includes new front-matter sections or
+     appendices that qualify as Secondary Sections and contain no
+     material copied from the Document, you may at your option designate
+     some or all of these sections as invariant.  To do this, add their
+     titles to the list of Invariant Sections in the Modified Version’s
+     license notice.  These titles must be distinct from any other
+     section titles.
+
+     You may add a section Entitled “Endorsements”, provided it contains
+     nothing but endorsements of your Modified Version by various
+     parties—for example, statements of peer review or that the text has
+     been approved by an organization as the authoritative definition of
+     a standard.
+
+     You may add a passage of up to five words as a Front-Cover Text,
+     and a passage of up to 25 words as a Back-Cover Text, to the end of
+     the list of Cover Texts in the Modified Version.  Only one passage
+     of Front-Cover Text and one of Back-Cover Text may be added by (or
+     through arrangements made by) any one entity.  If the Document
+     already includes a cover text for the same cover, previously added
+     by you or by arrangement made by the same entity you are acting on
+     behalf of, you may not add another; but you may replace the old
+     one, on explicit permission from the previous publisher that added
+     the old one.
+
+     The author(s) and publisher(s) of the Document do not by this
+     License give permission to use their names for publicity for or to
+     assert or imply endorsement of any Modified Version.
+
+  5. COMBINING DOCUMENTS
+
+     You may combine the Document with other documents released under
+     this License, under the terms defined in section 4 above for
+     modified versions, provided that you include in the combination all
+     of the Invariant Sections of all of the original documents,
+     unmodified, and list them all as Invariant Sections of your
+     combined work in its license notice, and that you preserve all
+     their Warranty Disclaimers.
+
+     The combined work need only contain one copy of this License, and
+     multiple identical Invariant Sections may be replaced with a single
+     copy.  If there are multiple Invariant Sections with the same name
+     but different contents, make the title of each such section unique
+     by adding at the end of it, in parentheses, the name of the
+     original author or publisher of that section if known, or else a
+     unique number.  Make the same adjustment to the section titles in
+     the list of Invariant Sections in the license notice of the
+     combined work.
+
+     In the combination, you must combine any sections Entitled
+     “History” in the various original documents, forming one section
+     Entitled “History”; likewise combine any sections Entitled
+     “Acknowledgements”, and any sections Entitled “Dedications”.  You
+     must delete all sections Entitled “Endorsements.”
+
+  6. COLLECTIONS OF DOCUMENTS
+
+     You may make a collection consisting of the Document and other
+     documents released under this License, and replace the individual
+     copies of this License in the various documents with a single copy
+     that is included in the collection, provided that you follow the
+     rules of this License for verbatim copying of each of the documents
+     in all other respects.
+
+     You may extract a single document from such a collection, and
+     distribute it individually under this License, provided you insert
+     a copy of this License into the extracted document, and follow this
+     License in all other respects regarding verbatim copying of that
+     document.
+
+  7. AGGREGATION WITH INDEPENDENT WORKS
+
+     A compilation of the Document or its derivatives with other
+     separate and independent documents or works, in or on a volume of a
+     storage or distribution medium, is called an “aggregate” if the
+     copyright resulting from the compilation is not used to limit the
+     legal rights of the compilation’s users beyond what the individual
+     works permit.  When the Document is included in an aggregate, this
+     License does not apply to the other works in the aggregate which
+     are not themselves derivative works of the Document.
+
+     If the Cover Text requirement of section 3 is applicable to these
+     copies of the Document, then if the Document is less than one half
+     of the entire aggregate, the Document’s Cover Texts may be placed
+     on covers that bracket the Document within the aggregate, or the
+     electronic equivalent of covers if the Document is in electronic
+     form.  Otherwise they must appear on printed covers that bracket
+     the whole aggregate.
+
+  8. TRANSLATION
+
+     Translation is considered a kind of modification, so you may
+     distribute translations of the Document under the terms of section
+     4.  Replacing Invariant Sections with translations requires special
+     permission from their copyright holders, but you may include
+     translations of some or all Invariant Sections in addition to the
+     original versions of these Invariant Sections.  You may include a
+     translation of this License, and all the license notices in the
+     Document, and any Warranty Disclaimers, provided that you also
+     include the original English version of this License and the
+     original versions of those notices and disclaimers.  In case of a
+     disagreement between the translation and the original version of
+     this License or a notice or disclaimer, the original version will
+     prevail.
+
+     If a section in the Document is Entitled “Acknowledgements”,
+     “Dedications”, or “History”, the requirement (section 4) to
+     Preserve its Title (section 1) will typically require changing the
+     actual title.
+
+  9. TERMINATION
+
+     You may not copy, modify, sublicense, or distribute the Document
+     except as expressly provided under this License.  Any attempt
+     otherwise to copy, modify, sublicense, or distribute it is void,
+     and will automatically terminate your rights under this License.
+
+     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, receipt of a copy of some or all of the
+     same material does not give you any rights to use it.
+
+  10. FUTURE REVISIONS OF THIS LICENSE
+
+     The Free Software Foundation may publish new, revised versions of
+     the GNU Free Documentation 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.  See
+     <https://www.gnu.org/licenses/>.
+
+     Each version of the License is given a distinguishing version
+     number.  If the Document specifies that a particular numbered
+     version of this License “or any later version” applies to it, you
+     have the option of following the terms and conditions either of
+     that specified version or of any later version that has been
+     published (not as a draft) by the Free Software Foundation.  If the
+     Document does not specify a version number of this License, you may
+     choose any version ever published (not as a draft) by the Free
+     Software Foundation.  If the Document specifies that a proxy can
+     decide which future versions of this License can be used, that
+     proxy’s public statement of acceptance of a version permanently
+     authorizes you to choose that version for the Document.
+
+  11. RELICENSING
+
+     “Massive Multiauthor Collaboration Site” (or “MMC Site”) means any
+     World Wide Web server that publishes copyrightable works and also
+     provides prominent facilities for anybody to edit those works.  A
+     public wiki that anybody can edit is an example of such a server.
+     A “Massive Multiauthor Collaboration” (or “MMC”) contained in the
+     site means any set of copyrightable works thus published on the MMC
+     site.
+
+     “CC-BY-SA” means the Creative Commons Attribution-Share Alike 3.0
+     license published by Creative Commons Corporation, a not-for-profit
+     corporation with a principal place of business in San Francisco,
+     California, as well as future copyleft versions of that license
+     published by that same organization.
+
+     “Incorporate” means to publish or republish a Document, in whole or
+     in part, as part of another Document.
+
+     An MMC is “eligible for relicensing” if it is licensed under this
+     License, and if all works that were first published under this
+     License somewhere other than this MMC, and subsequently
+     incorporated in whole or in part into the MMC, (1) had no cover
+     texts or invariant sections, and (2) were thus incorporated prior
+     to November 1, 2008.
+
+     The operator of an MMC Site may republish an MMC contained in the
+     site under CC-BY-SA on the same site at any time before August 1,
+     2009, provided the MMC is eligible for relicensing.
+
+ADDENDUM: How to use this License for your documents
+====================================================
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+       Copyright (C)  YEAR  YOUR NAME.
+       Permission is granted to copy, distribute and/or modify this document
+       under the terms of the GNU Free Documentation License, Version 1.3
+       or any later version published by the Free Software Foundation;
+       with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
+       Texts.  A copy of the license is included in the section entitled ``GNU
+       Free Documentation License''.
+
+   If you have Invariant Sections, Front-Cover Texts and Back-Cover
+Texts, replace the “with...Texts.” line with this:
+
+         with the Invariant Sections being LIST THEIR TITLES, with
+         the Front-Cover Texts being LIST, and with the Back-Cover Texts
+         being LIST.
+
+   If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+   If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of free
+software license, such as the GNU General Public License, to permit
+their use in free software.
+
+
+File: dash.info,  Node: GPL,  Next: Index,  Prev: FDL,  Up: Top
+
+Appendix B 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>.
+
+
+File: dash.info,  Node: Index,  Prev: GPL,  Up: Top
+
+Index
+*****
+
+
+* Menu:
+
+* !cdr:                                  Destructive operations.
+                                                              (line  16)
+* !cons:                                 Destructive operations.
+                                                              (line   8)
+* -->:                                   Threading macros.    (line  35)
+* ->:                                    Threading macros.    (line   9)
+* ->>:                                   Threading macros.    (line  22)
+* -all?:                                 Predicates.          (line  53)
+* -andfn:                                Function combinators.
+                                                              (line 184)
+* -annotate:                             Maps.                (line  86)
+* -any?:                                 Predicates.          (line  41)
+* -applify:                              Function combinators.
+                                                              (line  63)
+* -as->:                                 Threading macros.    (line  49)
+* -butlast:                              Other list operations.
+                                                              (line 405)
+* -clone:                                Tree operations.     (line 123)
+* -common-prefix:                        Reductions.          (line 242)
+* -common-suffix:                        Reductions.          (line 252)
+* -compose:                              Function combinators.
+                                                              (line  49)
+* -concat:                               List to list.        (line  23)
+* -cons*:                                Other list operations.
+                                                              (line  19)
+* -cons-pair?:                           Predicates.          (line 154)
+* -const:                                Function combinators.
+                                                              (line 128)
+* -contains?:                            Predicates.          (line 100)
+* -copy:                                 Maps.                (line 151)
+* -count:                                Reductions.          (line 172)
+* -cut:                                  Function combinators.
+                                                              (line 140)
+* -cycle:                                Unfolding.           (line  55)
+* -difference:                           Set operations.      (line  22)
+* -distinct:                             Set operations.      (line  73)
+* -dotimes:                              Side effects.        (line  80)
+* -doto:                                 Threading macros.    (line  99)
+* -drop:                                 Sublist selection.   (line 149)
+* -drop-last:                            Sublist selection.   (line 163)
+* -drop-while:                           Sublist selection.   (line 194)
+* -each:                                 Side effects.        (line   8)
+* -each-indexed:                         Side effects.        (line  38)
+* -each-r:                               Side effects.        (line  52)
+* -each-r-while:                         Side effects.        (line  65)
+* -each-while:                           Side effects.        (line  24)
+* -elem-index:                           Indexing.            (line   9)
+* -elem-indices:                         Indexing.            (line  23)
+* -every:                                Predicates.          (line  23)
+* -fifth-item:                           Other list operations.
+                                                              (line 380)
+* -filter:                               Sublist selection.   (line   8)
+* -find-index:                           Indexing.            (line  35)
+* -find-indices:                         Indexing.            (line  73)
+* -find-last-index:                      Indexing.            (line  54)
+* -first:                                Other list operations.
+                                                              (line 300)
+* -first-item:                           Other list operations.
+                                                              (line 328)
+* -fix:                                  Other list operations.
+                                                              (line 445)
+* -fixfn:                                Function combinators.
+                                                              (line 224)
+* -flatten:                              List to list.        (line  38)
+* -flatten-n:                            List to list.        (line  60)
+* -flip:                                 Function combinators.
+                                                              (line  95)
+* -fourth-item:                          Other list operations.
+                                                              (line 367)
+* -frequencies:                          Reductions.          (line 310)
+* -grade-down:                           Indexing.            (line 103)
+* -grade-up:                             Indexing.            (line  93)
+* -group-by:                             Partitioning.        (line 205)
+* -if-let:                               Binding.             (line  34)
+* -if-let*:                              Binding.             (line  45)
+* -inits:                                Reductions.          (line 222)
+* -insert-at:                            List to list.        (line 114)
+* -interleave:                           Other list operations.
+                                                              (line  56)
+* -interpose:                            Other list operations.
+                                                              (line  46)
+* -intersection:                         Set operations.      (line  36)
+* -iota:                                 Other list operations.
+                                                              (line  67)
+* -is-infix?:                            Predicates.          (line 140)
+* -is-prefix?:                           Predicates.          (line 116)
+* -is-suffix?:                           Predicates.          (line 128)
+* -iterate:                              Unfolding.           (line   9)
+* -iteratefn:                            Function combinators.
+                                                              (line 201)
+* -juxt:                                 Function combinators.
+                                                              (line  37)
+* -keep:                                 List to list.        (line   8)
+* -lambda:                               Binding.             (line 247)
+* -last:                                 Other list operations.
+                                                              (line 318)
+* -last-item:                            Other list operations.
+                                                              (line 393)
+* -let:                                  Binding.             (line  61)
+* -let*:                                 Binding.             (line 227)
+* -list:                                 Other list operations.
+                                                              (line 428)
+* -map:                                  Maps.                (line  10)
+* -map-first:                            Maps.                (line  38)
+* -map-indexed:                          Maps.                (line  68)
+* -map-last:                             Maps.                (line  53)
+* -map-when:                             Maps.                (line  22)
+* -mapcat:                               Maps.                (line 140)
+* -max:                                  Reductions.          (line 286)
+* -max-by:                               Reductions.          (line 296)
+* -min:                                  Reductions.          (line 262)
+* -min-by:                               Reductions.          (line 272)
+* -non-nil:                              Sublist selection.   (line  95)
+* -none?:                                Predicates.          (line  73)
+* -not:                                  Function combinators.
+                                                              (line 153)
+* -on:                                   Function combinators.
+                                                              (line  75)
+* -only-some?:                           Predicates.          (line  85)
+* -orfn:                                 Function combinators.
+                                                              (line 167)
+* -pad:                                  Other list operations.
+                                                              (line 241)
+* -partial:                              Function combinators.
+                                                              (line   8)
+* -partition:                            Partitioning.        (line  90)
+* -partition-after-item:                 Partitioning.        (line 195)
+* -partition-after-pred:                 Partitioning.        (line 162)
+* -partition-all:                        Partitioning.        (line 102)
+* -partition-all-in-steps:               Partitioning.        (line 126)
+* -partition-before-item:                Partitioning.        (line 185)
+* -partition-before-pred:                Partitioning.        (line 174)
+* -partition-by:                         Partitioning.        (line 138)
+* -partition-by-header:                  Partitioning.        (line 149)
+* -partition-in-steps:                   Partitioning.        (line 113)
+* -permutations:                         Set operations.      (line  60)
+* -powerset:                             Set operations.      (line  50)
+* -prodfn:                               Function combinators.
+                                                              (line 258)
+* -product:                              Reductions.          (line 201)
+* -reduce:                               Reductions.          (line  53)
+* -reduce-from:                          Reductions.          (line   8)
+* -reduce-r:                             Reductions.          (line  72)
+* -reduce-r-from:                        Reductions.          (line  26)
+* -reductions:                           Reductions.          (line 136)
+* -reductions-from:                      Reductions.          (line 100)
+* -reductions-r:                         Reductions.          (line 154)
+* -reductions-r-from:                    Reductions.          (line 118)
+* -remove:                               Sublist selection.   (line  26)
+* -remove-at:                            List to list.        (line 151)
+* -remove-at-indices:                    List to list.        (line 170)
+* -remove-first:                         Sublist selection.   (line  44)
+* -remove-item:                          Sublist selection.   (line  84)
+* -remove-last:                          Sublist selection.   (line  65)
+* -repeat:                               Unfolding.           (line  44)
+* -replace:                              List to list.        (line  72)
+* -replace-at:                           List to list.        (line 125)
+* -replace-first:                        List to list.        (line  86)
+* -replace-last:                         List to list.        (line 100)
+* -rotate:                               Other list operations.
+                                                              (line   8)
+* -rotate-args:                          Function combinators.
+                                                              (line 112)
+* -rpartial:                             Function combinators.
+                                                              (line  22)
+* -running-product:                      Reductions.          (line 211)
+* -running-sum:                          Reductions.          (line 190)
+* -same-items?:                          Set operations.      (line  88)
+* -second-item:                          Other list operations.
+                                                              (line 341)
+* -select-by-indices:                    Sublist selection.   (line 211)
+* -select-column:                        Sublist selection.   (line 241)
+* -select-columns:                       Sublist selection.   (line 222)
+* -separate:                             Partitioning.        (line  75)
+* -setq:                                 Binding.             (line 270)
+* -slice:                                Sublist selection.   (line 105)
+* -snoc:                                 Other list operations.
+                                                              (line  32)
+* -some:                                 Predicates.          (line   8)
+* -some-->:                              Threading macros.    (line  86)
+* -some->:                               Threading macros.    (line  62)
+* -some->>:                              Threading macros.    (line  74)
+* -sort:                                 Other list operations.
+                                                              (line 415)
+* -splice:                               Maps.                (line 102)
+* -splice-list:                          Maps.                (line 127)
+* -split-at:                             Partitioning.        (line   8)
+* -split-on:                             Partitioning.        (line  40)
+* -split-when:                           Partitioning.        (line  58)
+* -split-with:                           Partitioning.        (line  23)
+* -sum:                                  Reductions.          (line 180)
+* -table:                                Other list operations.
+                                                              (line 256)
+* -table-flat:                           Other list operations.
+                                                              (line 275)
+* -tails:                                Reductions.          (line 232)
+* -take:                                 Sublist selection.   (line 121)
+* -take-last:                            Sublist selection.   (line 135)
+* -take-while:                           Sublist selection.   (line 177)
+* -third-item:                           Other list operations.
+                                                              (line 354)
+* -tree-map:                             Tree operations.     (line  28)
+* -tree-map-nodes:                       Tree operations.     (line  39)
+* -tree-mapreduce:                       Tree operations.     (line  85)
+* -tree-mapreduce-from:                  Tree operations.     (line 104)
+* -tree-reduce:                          Tree operations.     (line  53)
+* -tree-reduce-from:                     Tree operations.     (line  70)
+* -tree-seq:                             Tree operations.     (line   8)
+* -unfold:                               Unfolding.           (line  25)
+* -union:                                Set operations.      (line   8)
+* -unzip:                                Other list operations.
+                                                              (line 215)
+* -unzip-lists:                          Other list operations.
+                                                              (line 196)
+* -update-at:                            List to list.        (line 137)
+* -when-let:                             Binding.             (line   9)
+* -when-let*:                            Binding.             (line  21)
+* -zip:                                  Other list operations.
+                                                              (line 150)
+* -zip-fill:                             Other list operations.
+                                                              (line 176)
+* -zip-lists:                            Other list operations.
+                                                              (line 114)
+* -zip-lists-fill:                       Other list operations.
+                                                              (line 135)
+* -zip-pair:                             Other list operations.
+                                                              (line  98)
+* -zip-with:                             Other list operations.
+                                                              (line  80)
+* dash-fontify-mode:                     Fontification of special variables.
+                                                              (line   6)
+* dash-register-info-lookup:             Info symbol lookup.  (line   6)
+* global-dash-fontify-mode:              Fontification of special variables.
+                                                              (line  12)
+
+
+
+Tag Table:
+Node: Top742
+Node: Installation2397
+Node: Using in a package3159
+Node: Fontification of special variables3504
+Node: Info symbol lookup4294
+Node: Functions4877
+Node: Maps6361
+Ref: -map6658
+Ref: -map-when7031
+Ref: -map-first7605
+Ref: -map-last8200
+Ref: -map-indexed8790
+Ref: -annotate9476
+Ref: -splice10080
+Ref: -splice-list11155
+Ref: -mapcat11614
+Ref: -copy11987
+Node: Sublist selection12175
+Ref: -filter12368
+Ref: -remove12921
+Ref: -remove-first13470
+Ref: -remove-last14318
+Ref: -remove-item15048
+Ref: -non-nil15448
+Ref: -slice15730
+Ref: -take16259
+Ref: -take-last16677
+Ref: -drop17114
+Ref: -drop-last17561
+Ref: -take-while17993
+Ref: -drop-while18620
+Ref: -select-by-indices19253
+Ref: -select-columns19764
+Ref: -select-column20467
+Node: List to list20930
+Ref: -keep21122
+Ref: -concat21698
+Ref: -flatten22226
+Ref: -flatten-n22988
+Ref: -replace23372
+Ref: -replace-first23833
+Ref: -replace-last24328
+Ref: -insert-at24816
+Ref: -replace-at25141
+Ref: -update-at25528
+Ref: -remove-at26069
+Ref: -remove-at-indices26696
+Node: Reductions27386
+Ref: -reduce-from27582
+Ref: -reduce-r-from28306
+Ref: -reduce29569
+Ref: -reduce-r30320
+Ref: -reductions-from31598
+Ref: -reductions-r-from32404
+Ref: -reductions33234
+Ref: -reductions-r33945
+Ref: -count34690
+Ref: -sum34920
+Ref: -running-sum35108
+Ref: -product35429
+Ref: -running-product35637
+Ref: -inits35978
+Ref: -tails36223
+Ref: -common-prefix36468
+Ref: -common-suffix36762
+Ref: -min37056
+Ref: -min-by37282
+Ref: -max37803
+Ref: -max-by38028
+Ref: -frequencies38554
+Node: Unfolding39169
+Ref: -iterate39410
+Ref: -unfold39857
+Ref: -repeat40662
+Ref: -cycle40946
+Node: Predicates41343
+Ref: -some41520
+Ref: -every41949
+Ref: -any?42663
+Ref: -all?43012
+Ref: -none?43754
+Ref: -only-some?44074
+Ref: -contains?44619
+Ref: -is-prefix?45125
+Ref: -is-suffix?45457
+Ref: -is-infix?45789
+Ref: -cons-pair?46149
+Node: Partitioning46480
+Ref: -split-at46668
+Ref: -split-with47332
+Ref: -split-on47972
+Ref: -split-when48643
+Ref: -separate49286
+Ref: -partition49820
+Ref: -partition-all50269
+Ref: -partition-in-steps50694
+Ref: -partition-all-in-steps51240
+Ref: -partition-by51754
+Ref: -partition-by-header52132
+Ref: -partition-after-pred52733
+Ref: -partition-before-pred53186
+Ref: -partition-before-item53571
+Ref: -partition-after-item53878
+Ref: -group-by54180
+Node: Indexing54613
+Ref: -elem-index54815
+Ref: -elem-indices55302
+Ref: -find-index55761
+Ref: -find-last-index56430
+Ref: -find-indices57081
+Ref: -grade-up57843
+Ref: -grade-down58250
+Node: Set operations58664
+Ref: -union58847
+Ref: -difference59277
+Ref: -intersection59705
+Ref: -powerset60134
+Ref: -permutations60411
+Ref: -distinct60849
+Ref: -same-items?61243
+Node: Other list operations61852
+Ref: -rotate62077
+Ref: -cons*62430
+Ref: -snoc62852
+Ref: -interpose63264
+Ref: -interleave63558
+Ref: -iota63924
+Ref: -zip-with64407
+Ref: -zip-pair65215
+Ref: -zip-lists65781
+Ref: -zip-lists-fill66579
+Ref: -zip67289
+Ref: -zip-fill68316
+Ref: -unzip-lists69230
+Ref: -unzip69853
+Ref: -pad70846
+Ref: -table71331
+Ref: -table-flat72117
+Ref: -first73122
+Ref: -last73655
+Ref: -first-item74001
+Ref: -second-item74413
+Ref: -third-item74830
+Ref: -fourth-item75205
+Ref: -fifth-item75583
+Ref: -last-item75958
+Ref: -butlast76319
+Ref: -sort76564
+Ref: -list77058
+Ref: -fix77627
+Node: Tree operations78116
+Ref: -tree-seq78312
+Ref: -tree-map79173
+Ref: -tree-map-nodes79613
+Ref: -tree-reduce80477
+Ref: -tree-reduce-from81359
+Ref: -tree-mapreduce81959
+Ref: -tree-mapreduce-from82818
+Ref: -clone84103
+Node: Threading macros84441
+Ref: ->84666
+Ref: ->>85154
+Ref: -->85657
+Ref: -as->86214
+Ref: -some->86668
+Ref: -some->>87053
+Ref: -some-->87500
+Ref: -doto88067
+Node: Binding88620
+Ref: -when-let88827
+Ref: -when-let*89288
+Ref: -if-let89817
+Ref: -if-let*90183
+Ref: -let90806
+Ref: -let*96896
+Ref: -lambda97833
+Ref: -setq98639
+Node: Side effects99440
+Ref: -each99634
+Ref: -each-while100161
+Ref: -each-indexed100781
+Ref: -each-r101373
+Ref: -each-r-while101815
+Ref: -dotimes102459
+Node: Destructive operations103012
+Ref: !cons103230
+Ref: !cdr103434
+Node: Function combinators103627
+Ref: -partial103831
+Ref: -rpartial104349
+Ref: -juxt104997
+Ref: -compose105449
+Ref: -applify106056
+Ref: -on106486
+Ref: -flip107258
+Ref: -rotate-args107782
+Ref: -const108411
+Ref: -cut108753
+Ref: -not109233
+Ref: -orfn109777
+Ref: -andfn110570
+Ref: -iteratefn111357
+Ref: -fixfn112059
+Ref: -prodfn113633
+Node: Development114784
+Node: Contribute115073
+Node: Contributors116085
+Node: FDL118178
+Node: GPL143498
+Node: Index181247
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs/elpa/dash-20240405.946/dir b/emacs/elpa/dash-20240510.1327/dir
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-pkg.el b/emacs/elpa/doom-modeline-20240425.609/doom-modeline-pkg.el
@@ -1,17 +0,0 @@
-(define-package "doom-modeline" "20240425.609" "A minimal and modern mode-line"
-  '((emacs "25.1")
-    (compat "29.1.4.2")
-    (nerd-icons "0.1.0")
-    (shrink-path "0.3.1"))
-  :commit "150b5bf8da8050e5db1193f827c33b16a5d8dd3f" :authors
-  '(("Vincent Zhang" . "seagle0128@gmail.com"))
-  :maintainers
-  '(("Vincent Zhang" . "seagle0128@gmail.com"))
-  :maintainer
-  '("Vincent Zhang" . "seagle0128@gmail.com")
-  :keywords
-  '("faces" "mode-line")
-  :url "https://github.com/seagle0128/doom-modeline")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-segments.el b/emacs/elpa/doom-modeline-20240425.609/doom-modeline-segments.el
@@ -1,3199 +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 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-minimum-current-width)
-(defvar mlscroll-right-align)
-(defvar mu4e--modeline-item)
-(defvar mu4e-alert-mode-line)
-(defvar mu4e-alert-modeline-formatter)
-(defvar mu4e-modeline-mode)
-(defvar nyan-minimum-window-width)
-(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 poke-line-minimum-window-width)
-(defvar rcirc-activity)
-(defvar sml-modeline-len)
-(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 "ext:eglot")
-(declare-function eglot--major-modes "ext:eglot" t t)
-(declare-function eglot--project-nickname "ext:eglot" t t)
-(declare-function eglot-clear-status "ext:eglot")
-(declare-function eglot-current-server "ext:eglot")
-(declare-function eglot-events-buffer "ext:eglot")
-(declare-function eglot-forget-pending-continuations "ext:eglot")
-(declare-function eglot-managed-p "ext:glot")
-(declare-function eglot-reconnect "ext:eglot")
-(declare-function eglot-shutdown "ext:eglot")
-(declare-function eglot-stderr-buffer "ext:eglot")
-(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 "ext:flymake" t t)
-(declare-function flymake--handle-report "ext:flymake")
-(declare-function flymake--lookup-type-property "ext:flymake")
-(declare-function flymake--state-diags "ext:flymake" t t)
-(declare-function flymake-disabled-backends "ext:flymake")
-(declare-function flymake-goto-next-error "ext:flymake")
-(declare-function flymake-goto-prev-error "ext:flymake")
-(declare-function flymake-reporting-backends "ext:flymake")
-(declare-function flymake-running-backends "ext:flymake")
-(declare-function flymake-show-buffer-diagnostics "ext:flymake")
-(declare-function flymake-show-buffer-diagnostics "ext:flymake")
-(declare-function flymake-start "ext: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 "ext:jsonrpc" t t)
-(declare-function jsonrpc-last-error "ext: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 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 "ext: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 undo-tree-redo-1 "ext:undo-tree")
-(declare-function undo-tree-undo-1 "ext:undo-tree")
-(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 (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 ((mouse-face 'doom-modeline-highlight))
-      (concat
-       (doom-modeline-spc)
-
-       ;; 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 (doom-modeline-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 (doom-modeline-face)
-            'mouse-face mouse-face
-            'help-echo 'mode-line-mule-info-help-echo
-            'local-map mode-line-coding-system-map)))
-
-       (doom-modeline-spc)))))
-
-
-;;
-;; 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."
-  (propertize
-   (concat
-    (doom-modeline-spc)
-    (propertize (format-mode-line
-                 (or (and (boundp 'delighted-modes)
-                          (cadr (assq major-mode delighted-modes)))
-                     mode-name))
-                '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"
-                'mouse-face 'doom-modeline-highlight
-                'local-map mode-line-major-mode-keymap)
-    (when (and doom-modeline-env-version doom-modeline-env--version)
-      (format "%s%s" (doom-modeline-vspc) doom-modeline-env--version))
-    (and (boundp 'text-scale-mode-amount)
-         (/= text-scale-mode-amount 0)
-         (format
-          (if (> text-scale-mode-amount 0)
-              " (%+d)"
-            " (%-d)")
-          text-scale-mode-amount))
-    (doom-modeline-spc))
-   'face (doom-modeline-face 'doom-modeline-buffer-major-mode)))
-
-
-;;
-;; 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 ((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)
-            ,(doom-modeline-spc)
-            (: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)
-            ,(doom-modeline-spc))
-        `((:propertize ("" minor-mode-alist)
-           face ,face
-           mouse-face ,mouse-face
-           help-echo ,help-echo
-           local-map ,mode-line-minor-mode-keymap)
-          ,(doom-modeline-spc))))))
-
-
-;;
-;; 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 (if vc-display-status
-                          (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))
-                        ""))
-                 (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-def-segment vcs
-  "Displays the current branch, colored based on its state."
-  (when doom-modeline--vcs
-    (let-alist doom-modeline--vcs
-      (concat (doom-modeline-spc)
-              (propertize (concat
-                           (doom-modeline-display-icon .icon)
-                           (doom-modeline-vspc)
-                           (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))
-              (doom-modeline-spc)))))
-
-
-;;
-;; 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 ((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)
-                                                  (doom-modeline-vspc)
-                                                  (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
-                                               (doom-modeline-vspc)
-                                               (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)
-                               (doom-modeline-vspc)
-                               (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
-                               (doom-modeline-vspc)
-                               (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
-                               (doom-modeline-vspc)
-                               (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
-                               (doom-modeline-vspc)
-                               (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
-                               (doom-modeline-vspc)
-                               (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 ((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
-                                                (doom-modeline-vspc)
-                                                (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 (if (> .error 0) 'doom-modeline-urgent 'doom-modeline-warning)))
-                                       (concat
-                                        (doom-modeline-check-icon "nf-md-alert_circle_outline" "⚠" "!" face)
-                                        (doom-modeline-vspc)
-                                        (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)
-                                 (doom-modeline-vspc)
-                                 (doom-modeline-check-text (number-to-string .error) 'doom-modeline-urgent)
-                                 (doom-modeline-vspc)
-                                 (doom-modeline-check-icon "nf-md-alert_outline" "⚠" "!" 'doom-modeline-warning)
-                                 (doom-modeline-vspc)
-                                 (doom-modeline-check-text (number-to-string .warning) 'doom-modeline-warning)
-                                 (doom-modeline-vspc)
-                                 (doom-modeline-check-icon "nf-md-information_outline" "🛈" "!" 'doom-modeline-info)
-                                 (doom-modeline-vspc)
-                                 (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 ((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
-     (doom-modeline-spc)
-     (let ((str))
-       (dolist (s (split-string seg " "))
-         (setq str
-               (concat str
-                       (if (string-match-p "^[0-9]+$" s)
-                           (concat (doom-modeline-vspc)
-                                   (doom-modeline-display-text s)
-                                   (doom-modeline-vspc))
-                         (doom-modeline-display-icon s)))))
-       (propertize str
-                   'help-echo (get-text-property 1 'help-echo seg)
-                   'mouse-face 'doom-modeline-highlight
-                   'local-map (get-text-property 1 'local-map seg)))
-     (doom-modeline-spc))))
-
-
-;;
-;; 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 (doom-modeline-spc)
-                 (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)))
-                 (doom-modeline-spc)))
-       '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 for (start . end) in positions
-           collect t into before
-           when (and (>= here start) (<= here end))
-           return (length before)
-           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)
-              (or (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 (doom-modeline-vspc)
-                          '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
-    (concat (doom-modeline-spc)
-            (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)
-            (doom-modeline-spc))))
-
-(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))
-        (lc `(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))))))
-        (mouse-face 'doom-modeline-highlight)
-        (local-map mode-line-column-line-number-mode-map))
-    (concat
-     (doom-modeline-wspc)
-
-     ;; Line and column
-     (propertize (concat (format-mode-line lc)
-                         (and doom-modeline-total-line-number
-                              (format "/%d" (line-number-at-pos (point-max)))))
-                 'face (doom-modeline-face)
-                 'help-echo "Buffer position\n\
-mouse-1: Display Line and Column Mode Menu"
-                 'mouse-face mouse-face
-                 'local-map local-map)
-
-     ;; Position
-     (when visible
-       (cond ((and (bound-and-true-p nyan-mode)
-                   (>= (window-width) nyan-minimum-window-width))
-              (concat
-               (doom-modeline-wspc)
-               (propertize (nyan-create) 'mouse-face mouse-face)))
-             ((and (bound-and-true-p poke-line-mode)
-                   (>= (window-width) poke-line-minimum-window-width))
-              (concat
-               (doom-modeline-wspc)
-               (propertize (poke-line-create) 'mouse-face mouse-face)))
-             ((and (bound-and-true-p mlscroll-mode)
-                   (>= (window-width) mlscroll-minimum-current-width))
-              (concat
-               (doom-modeline-wspc)
-               (let ((mlscroll-right-align nil))
-                 (format-mode-line (mlscroll-mode-line)))))
-             ((and (bound-and-true-p sml-modeline-mode)
-                   (>= (window-width) sml-modeline-len))
-              (concat
-               (doom-modeline-wspc)
-               (propertize (sml-modeline-create) 'mouse-face mouse-face)))
-             (t "")))
-
-     ;; Percent position
-     (when doom-modeline-percent-position
-       (concat
-        (doom-modeline-spc)
-        (propertize (format-mode-line '("" doom-modeline-percent-position "%%"))
-                    'face (doom-modeline-face)
-                    'help-echo "Buffer percentage\n\
-mouse-1: Display Line and Column Mode Menu"
-                    'mouse-face mouse-face
-                    'local-map local-map)))
-
-     (when (or line-number-mode column-number-mode doom-modeline-percent-position)
-       (doom-modeline-spc)))))
-
-;;
-;; 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-normal-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_n_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-note_edit" "🅦")))
-
-(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)
-    (if (doom-modeline--active)
-	    meow--indicator
-	  (propertize (substring-no-properties meow--indicator)
-		          'face
-		          'mode-line-inactive))))
-
-(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."
-  (propertize (cond (current-input-method
-                     (concat (doom-modeline-spc)
-                             current-input-method-title
-                             (doom-modeline-spc)))
-                    ((and (bound-and-true-p evil-local-mode)
-                          (bound-and-true-p evil-input-method))
-                     (concat
-                      (doom-modeline-spc)
-                      (nth 3 (assoc default-input-method input-method-alist))
-                      (doom-modeline-spc)))
-                    (t ""))
-              '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))
-
-
-;;
-;; 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))
-      (concat
-       (doom-modeline-spc)
-       (doom-modeline-display-icon icon)
-       (doom-modeline-spc)))))
-
-
-;;
-;; 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
-        (pcase-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)))
-                     (icon (doom-modeline-lsp-icon "EGLOT" face)))
-          (propertize icon
-                      'help-echo (cond
-                                  (last-error
-                                   (format "EGLOT\nAn error occured: %s
-mouse-3: Clear this status" (plist-get last-error :message)))
-                                  ((and pending (cl-plusp pending))
-                                   (format "EGLOT\n%d outstanding requests" pending))
-                                  (nick (format "EGLOT Connected (%s/%s)
-C-mouse-1: Go to server errors
-mouse-1: Go to server events
-mouse-2: Quit server
-mouse-3: Reconnect to server" nick (eglot--major-modes server)))
-                                  (t "EGLOT Disconnected
-mouse-1: Start server"))
-                      'mouse-face 'doom-modeline-highlight
-                      'local-map (let ((map (make-sparse-keymap)))
-                                   (cond (last-error
-                                          (define-key map [mode-line mouse-3]
-                                            #'eglot-clear-status))
-                                         ((and pending (cl-plusp pending))
-                                          (define-key map [mode-line mouse-3]
-                                            #'eglot-forget-pending-continuations))
-                                         (nick
-                                          (define-key map [mode-line C-mouse-1]
-                                            #'eglot-stderr-buffer)
-                                          (define-key map [mode-line mouse-1]
-                                            #'eglot-events-buffer)
-                                          (define-key map [mode-line mouse-2]
-                                            #'eglot-shutdown)
-                                          (define-key map [mode-line mouse-3]
-                                            #'eglot-reconnect))
-                                         (t (define-key map [mode-line mouse-1]
-                                              #'eglot)))
-                                   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
-    (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))))
-      (when icon
-        (concat
-         (doom-modeline-spc)
-         (doom-modeline-display-icon icon)
-         (doom-modeline-spc))))))
-
-(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))
-    (concat
-     (doom-modeline-spc)
-     (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))
-     (doom-modeline-spc))))
-
-
-;;
-;; 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 ((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
-              (doom-modeline-spc)
-              (propertize
-               (concat
-                icon
-                (doom-modeline-vspc)
-                (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")))
-              (doom-modeline-spc)))
-            ((bound-and-true-p mu4e-modeline-mode)
-             (concat
-              (doom-modeline-spc)
-              icon
-              (doom-modeline-vspc)
-              (propertize (mu4e--modeline-string)
-                          'face 'doom-modeline-notification)
-              (doom-modeline-spc)))))))
-
-(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))
-    (concat
-     (doom-modeline-spc)
-     (propertize
-      (concat
-       (doom-modeline-icon 'mdicon "nf-md-email" "📧" "#"
-                           :face 'doom-modeline-notification)
-       (doom-modeline-vspc)
-       (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)))
-     (doom-modeline-spc))))
-
-
-;;
-;; IRC notifications
-;;
-
-(defun doom-modeline--shorten-irc (name)
-  "Wrapper for `tracking-shorten' and `erc-track-shorten-function' with NAME.
-
-One key difference is that when `tracking-shorten' and
-`erc-track-shorten-function' returns nil we will instead return the original
-value of name. This is necessary in cases where the user has stylized the name
-to be an icon and we don't want to remove that so we just return the original."
-  (or (and (boundp '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 (boundp '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
-      (doom-modeline--shorten-irc (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)))
-      (when (> number 0)
-        (concat
-         (doom-modeline-spc)
-         (doom-modeline--tracking-buffers buffers)
-         (doom-modeline-spc))))))
-
-(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)))
-      (when (> number 0)
-        (concat
-         (doom-modeline-spc)
-
-         (propertize (concat
-                      (doom-modeline-icon 'mdicon "nf-md-message_processing" "🗊" "#"
-                                          :face 'doom-modeline-notification)
-                      (doom-modeline-vspc)
-                      ;; 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 (doom-modeline-spc)
-                   (doom-modeline--tracking-buffers buffers)))
-
-         (doom-modeline-spc))))))
-
-(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))
-    (concat (doom-modeline-spc)
-            (concat
-             (car doom-modeline--battery-status)
-             (doom-modeline-vspc)
-             (cdr doom-modeline--battery-status))
-            (doom-modeline-spc))))
-
-(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)
-    (concat
-     (doom-modeline-spc)
-     (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)))
-        (doom-modeline-spc)))
-     (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))
-     (doom-modeline-spc))))
-
-(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)
-    (concat
-     (doom-modeline-spc)
-     (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)))
-     (doom-modeline-spc))))
-
-;;
-;; 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:"))
-           (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
-                   (doom-modeline-spc)
-                   ctx
-                   (when (and doom-modeline-k8s-show-namespace ns) (format "(%s)" ns))
-                   (doom-modeline-spc))
-                  '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-20240425.609/doom-modeline-segments.elc b/emacs/elpa/doom-modeline-20240425.609/doom-modeline-segments.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline.el b/emacs/elpa/doom-modeline-20240425.609/doom-modeline.el
@@ -1,262 +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
-;; Version: 4.2.0
-;; Package-Requires: ((emacs "25.1") (compat "29.1.4.2") (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-20240425.609/doom-modeline-autoloads.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-autoloads.el
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-core.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-core.el
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-core.elc b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-core.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-env.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-env.el
diff --git a/emacs/elpa/doom-modeline-20240425.609/doom-modeline-env.elc b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-env.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240510.144/doom-modeline-pkg.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-pkg.el
@@ -0,0 +1,17 @@
+(define-package "doom-modeline" "20240510.144" "A minimal and modern mode-line"
+  '((emacs "25.1")
+    (compat "29.1.4.5")
+    (nerd-icons "0.1.0")
+    (shrink-path "0.3.1"))
+  :commit "65d0bd83eb7c393092e032c24b882f3ba19b4899" :authors
+  '(("Vincent Zhang" . "seagle0128@gmail.com"))
+  :maintainers
+  '(("Vincent Zhang" . "seagle0128@gmail.com"))
+  :maintainer
+  '("Vincent Zhang" . "seagle0128@gmail.com")
+  :keywords
+  '("faces" "mode-line")
+  :url "https://github.com/seagle0128/doom-modeline")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/doom-modeline-20240510.144/doom-modeline-segments.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-segments.el
@@ -0,0 +1,3218 @@
+;;; 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 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-minimum-current-width)
+(defvar mlscroll-right-align)
+(defvar mu4e--modeline-item)
+(defvar mu4e-alert-mode-line)
+(defvar mu4e-alert-modeline-formatter)
+(defvar mu4e-modeline-mode)
+(defvar nyan-minimum-window-width)
+(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 poke-line-minimum-window-width)
+(defvar rcirc-activity)
+(defvar sml-modeline-len)
+(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 "ext:eglot")
+(declare-function eglot--major-modes "ext:eglot" t t)
+(declare-function eglot--project-nickname "ext:eglot" t t)
+(declare-function eglot-clear-status "ext:eglot")
+(declare-function eglot-current-server "ext:eglot")
+(declare-function eglot-events-buffer "ext:eglot")
+(declare-function eglot-forget-pending-continuations "ext:eglot")
+(declare-function eglot-managed-p "ext:glot")
+(declare-function eglot-reconnect "ext:eglot")
+(declare-function eglot-shutdown "ext:eglot")
+(declare-function eglot-stderr-buffer "ext:eglot")
+(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 "ext:flymake" t t)
+(declare-function flymake--handle-report "ext:flymake")
+(declare-function flymake--lookup-type-property "ext:flymake")
+(declare-function flymake--state-diags "ext:flymake" t t)
+(declare-function flymake-disabled-backends "ext:flymake")
+(declare-function flymake-goto-next-error "ext:flymake")
+(declare-function flymake-goto-prev-error "ext:flymake")
+(declare-function flymake-reporting-backends "ext:flymake")
+(declare-function flymake-running-backends "ext:flymake")
+(declare-function flymake-show-buffer-diagnostics "ext:flymake")
+(declare-function flymake-show-buffer-diagnostics "ext:flymake")
+(declare-function flymake-start "ext: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 "ext:jsonrpc" t t)
+(declare-function jsonrpc-last-error "ext: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 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 "ext: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 undo-tree-redo-1 "ext:undo-tree")
+(declare-function undo-tree-undo-1 "ext:undo-tree")
+(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 (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 (if vc-display-status
+                          (substring vc-mode (+ (if (eq backend 'Hg) 2 3) 2))
+                        ""))
+                 (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-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 (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)))))
+                          (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 1 'help-echo seg)
+                   'mouse-face 'doom-modeline-highlight
+                   'local-map (get-text-property 1 '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 for (start . end) in positions
+           collect t into before
+           when (and (>= here start) (<= here end))
+           return (length before)
+           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
+         ,(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
+         ((and (bound-and-true-p nyan-mode)
+               (>= (window-width) nyan-minimum-window-width))
+          (concat sep (nyan-create) sep))
+         ((and (bound-and-true-p poke-line-mode)
+               (>= (window-width) poke-line-minimum-window-width))
+          (concat sep (poke-line-create) sep))
+         ((and (bound-and-true-p mlscroll-mode)
+               (>= (window-width) mlscroll-minimum-current-width))
+          (concat
+           sep
+           (let ((mlscroll-right-align nil))
+             (format-mode-line (mlscroll-mode-line)))
+           sep))
+         ((and (bound-and-true-p sml-modeline-mode)
+               (>= (window-width) sml-modeline-len))
+          (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-normal-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_n_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)
+    (if (doom-modeline--active)
+	    meow--indicator
+	  (propertize (substring-no-properties meow--indicator)
+		          'face
+		          'mode-line-inactive))))
+
+(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
+        (pcase-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)))
+                     (icon (doom-modeline-lsp-icon "EGLOT" face)))
+          (propertize icon
+                      'help-echo (cond
+                                  (last-error
+                                   (format "EGLOT\nAn error occured: %s
+mouse-3: Clear this status" (plist-get last-error :message)))
+                                  ((and pending (cl-plusp pending))
+                                   (format "EGLOT\n%d outstanding requests" pending))
+                                  (nick (format "EGLOT Connected (%s/%s)
+C-mouse-1: Go to server errors
+mouse-1: Go to server events
+mouse-2: Quit server
+mouse-3: Reconnect to server" nick (eglot--major-modes server)))
+                                  (t "EGLOT Disconnected
+mouse-1: Start server"))
+                      'mouse-face 'doom-modeline-highlight
+                      'local-map (let ((map (make-sparse-keymap)))
+                                   (cond (last-error
+                                          (define-key map [mode-line mouse-3]
+                                            #'eglot-clear-status))
+                                         ((and pending (cl-plusp pending))
+                                          (define-key map [mode-line mouse-3]
+                                            #'eglot-forget-pending-continuations))
+                                         (nick
+                                          (define-key map [mode-line C-mouse-1]
+                                            #'eglot-stderr-buffer)
+                                          (define-key map [mode-line mouse-1]
+                                            #'eglot-events-buffer)
+                                          (define-key map [mode-line mouse-2]
+                                            #'eglot-shutdown)
+                                          (define-key map [mode-line mouse-3]
+                                            #'eglot-reconnect))
+                                         (t (define-key map [mode-line mouse-1]
+                                              #'eglot)))
+                                   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)
+  "Wrapper for `tracking-shorten' and `erc-track-shorten-function' with NAME.
+
+One key difference is that when `tracking-shorten' and
+`erc-track-shorten-function' returns nil we will instead return the original
+value of name. This is necessary in cases where the user has stylized the name
+to be an icon and we don't want to remove that so we just return the original."
+  (or (and (boundp '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 (boundp '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
+      (doom-modeline--shorten-irc (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-20240510.144/doom-modeline-segments.elc b/emacs/elpa/doom-modeline-20240510.144/doom-modeline-segments.elc
Binary files differ.
diff --git a/emacs/elpa/doom-modeline-20240510.144/doom-modeline.el b/emacs/elpa/doom-modeline-20240510.144/doom-modeline.el
@@ -0,0 +1,262 @@
+;;; 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
+;; Version: 4.2.0
+;; 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-20240425.609/doom-modeline.elc b/emacs/elpa/doom-modeline-20240510.144/doom-modeline.elc
Binary files differ.
diff --git a/emacs/elpa/git-commit-20240415.1544/git-commit-pkg.el b/emacs/elpa/git-commit-20240415.1544/git-commit-pkg.el
@@ -1,18 +0,0 @@
-(define-package "git-commit" "20240415.1544" "Edit Git commit messages."
-  '((emacs "25.1")
-    (compat "29.1.4.4")
-    (transient "20231204")
-    (with-editor "20230917"))
-  :commit "68075aff58e7ae5c852b9eabb69df454267deeaf" :authors
-  '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
-    ("Sebastian Wiesner" . "lunaryorn@gmail.com")
-    ("Florian Ragwitz" . "rafl@debian.org")
-    ("Marius Vollmer" . "marius.vollmer@gmail.com"))
-  :maintainer
-  '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
-  :keywords
-  '("git" "tools" "vc")
-  :url "https://github.com/magit/magit")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/git-commit-20240415.1544/git-commit.el b/emacs/elpa/git-commit-20240415.1544/git-commit.el
@@ -1,1290 +0,0 @@
-;;; git-commit.el --- Edit Git commit messages  -*- lexical-binding:t; coding:utf-8 -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-;;     Sebastian Wiesner <lunaryorn@gmail.com>
-;;     Florian Ragwitz <rafl@debian.org>
-;;     Marius Vollmer <marius.vollmer@gmail.com>
-;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
-
-;; Homepage: https://github.com/magit/magit
-;; Keywords: git tools vc
-
-;; Package-Version: 3.3.0.50-git
-;; Package-Requires: (
-;;     (emacs "25.1")
-;;     (compat "29.1.4.4")
-;;     (seq "2.24")
-;;     (transient "0.5.0")
-;;     (with-editor "3.3.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:
-
-;; This package assists the user in writing good Git commit messages.
-
-;; While Git allows for the message to be provided on the command
-;; line, it is preferable to tell Git to create the commit without
-;; actually passing it a message.  Git then invokes the `$GIT_EDITOR'
-;; (or if that is undefined `$EDITOR') asking the user to provide the
-;; message by editing the file ".git/COMMIT_EDITMSG" (or another file
-;; in that directory, e.g., ".git/MERGE_MSG" for merge commits).
-
-;; When `global-git-commit-mode' is enabled, which it is by default,
-;; then opening such a file causes the features described below, to
-;; be enabled in that buffer.  Normally this would be done using a
-;; major-mode but to allow the use of any major-mode, as the user sees
-;; fit, it is done here by running a setup function, which among other
-;; things turns on the preferred major-mode, by default `text-mode'.
-
-;; Git waits for the `$EDITOR' to finish and then either creates the
-;; commit using the contents of the file as commit message, or, if the
-;; editor process exited with a non-zero exit status, aborts without
-;; creating a commit.  Unfortunately Emacsclient (which is what Emacs
-;; users should be using as `$EDITOR' or at least as `$GIT_EDITOR')
-;; does not differentiate between "successfully" editing a file and
-;; aborting; not out of the box that is.
-
-;; By making use of the `with-editor' package this package provides
-;; both ways of finish an editing session.  In either case the file
-;; is saved, but Emacseditor's exit code differs.
-;;
-;;   C-c C-c  Finish the editing session successfully by returning
-;;            with exit code 0.  Git then creates the commit using
-;;            the message it finds in the file.
-;;
-;;   C-c C-k  Aborts the edit editing session by returning with exit
-;;            code 1.  Git then aborts the commit.
-
-;; Aborting the commit does not cause the message to be lost, but
-;; relying solely on the file not being tampered with is risky.  This
-;; package additionally stores all aborted messages for the duration
-;; of the current session (i.e., until you close Emacs).  To get back
-;; an aborted message use M-p and M-n while editing a message.
-;;
-;;   M-p      Replace the buffer contents with the previous message
-;;            from the message ring.  Of course only after storing
-;;            the current content there too.
-;;
-;;   M-n      Replace the buffer contents with the next message from
-;;            the message ring, after storing the current content.
-
-;; Support for inserting Git trailers (as described in the manpage
-;; git-interpret-trailers(1)) is available.
-;;
-;;   C-c C-i  Insert a trailer selected from a transient menu.
-
-;; When Git requests a commit message from the user, it does so by
-;; having her edit a file which initially contains some comments,
-;; instructing her what to do, and providing useful information, such
-;; as which files were modified.  These comments, even when left
-;; intact by the user, do not become part of the commit message.  This
-;; package ensures these comments are propertizes as such and further
-;; prettifies them by using different faces for various parts, such as
-;; files.
-
-;; Finally this package highlights style errors, like lines that are
-;; too long, or when the second line is not empty.  It may even nag
-;; you when you attempt to finish the commit without having fixed
-;; these issues.  The style checks and many other settings can easily
-;; be configured:
-;;
-;;   M-x customize-group RET git-commit RET
-
-;;; Code:
-
-(require 'compat)
-(require 'subr-x)
-
-(when (and (featurep' seq)
-           (not (fboundp 'seq-keep)))
-  (unload-feature 'seq 'force))
-(require 'seq)
-
-(require 'log-edit)
-(require 'ring)
-(require 'server)
-(require 'transient)
-(require 'with-editor)
-
-;; For historic reasons Magit isn't a hard dependency.
-(require 'magit-base nil t)
-(require 'magit-git nil t)
-(declare-function magit-completing-read "magit-base"
-                  ( prompt collection &optional predicate require-match
-                    initial-input hist def fallback))
-(declare-function magit-expand-git-file-name "magit-git" (filename))
-(declare-function magit-git-lines "magit-git" (&rest args))
-(declare-function magit-hook-custom-get "magit-base" (symbol))
-(declare-function magit-list-local-branch-names "magit-git" ())
-
-(defvar diff-default-read-only)
-(defvar flyspell-generic-check-word-predicate)
-(defvar font-lock-beg)
-(defvar font-lock-end)
-(defvar recentf-exclude)
-
-(define-obsolete-variable-alias
-  'git-commit-known-pseudo-headers
-  'git-commit-trailers
-  "git-commit 4.0.0")
-
-;;; Options
-;;;; Variables
-
-(defgroup git-commit nil
-  "Edit Git commit messages."
-  :prefix "git-commit-"
-  :link '(info-link "(magit)Editing Commit Messages")
-  :group 'tools)
-
-(define-minor-mode global-git-commit-mode
-  "Edit Git commit messages.
-
-This global mode arranges for `git-commit-setup' to be called
-when a Git commit message file is opened.  That usually happens
-when Git uses the Emacsclient as $GIT_EDITOR to have the user
-provide such a commit message.
-
-Loading the library `git-commit' by default enables this mode,
-but the library is not automatically loaded because doing that
-would pull in many dependencies and increase startup time too
-much.  You can either rely on `magit' loading this library or
-you can load it explicitly.  Autoloading is not an alternative
-because in this case autoloading would immediately trigger
-full loading."
-  :group 'git-commit
-  :type 'boolean
-  :global t
-  :init-value t
-  :initialize
-  (lambda (symbol exp)
-    (custom-initialize-default symbol exp)
-    (when global-git-commit-mode
-      (add-hook 'find-file-hook #'git-commit-setup-check-buffer)
-      (remove-hook 'after-change-major-mode-hook
-                   #'git-commit-setup-font-lock-in-buffer)))
-  (cond
-   (global-git-commit-mode
-    (add-hook 'find-file-hook #'git-commit-setup-check-buffer)
-    (add-hook 'after-change-major-mode-hook
-              #'git-commit-setup-font-lock-in-buffer))
-   (t
-    (remove-hook 'find-file-hook #'git-commit-setup-check-buffer)
-    (remove-hook 'after-change-major-mode-hook
-                 #'git-commit-setup-font-lock-in-buffer))))
-
-(defcustom git-commit-major-mode #'text-mode
-  "Major mode used to edit Git commit messages.
-
-The major mode configured here is turned on by the minor mode
-`git-commit-mode'."
-  :group 'git-commit
-  :type '(choice (function-item text-mode)
-                 (function-item markdown-mode)
-                 (function-item org-mode)
-                 (function-item fundamental-mode)
-                 (function-item git-commit-elisp-text-mode)
-                 (function :tag "Another mode")
-                 (const :tag "No major mode")))
-;;;###autoload(put 'git-commit-major-mode 'safe-local-variable
-;;;###autoload     (lambda (val)
-;;;###autoload       (memq val '(text-mode
-;;;###autoload                   markdown-mode
-;;;###autoload                   org-mode
-;;;###autoload                   fundamental-mode
-;;;###autoload                   git-commit-elisp-text-mode))))
-
-(defcustom git-commit-setup-hook
-  '(git-commit-save-message
-    git-commit-setup-changelog-support
-    git-commit-turn-on-auto-fill
-    git-commit-propertize-diff
-    bug-reference-mode)
-  "Hook run at the end of `git-commit-setup'."
-  :group 'git-commit
-  :type 'hook
-  :get (and (featurep 'magit-base) #'magit-hook-custom-get)
-  :options '(git-commit-save-message
-             git-commit-setup-changelog-support
-             magit-generate-changelog
-             git-commit-turn-on-auto-fill
-             git-commit-turn-on-orglink
-             git-commit-turn-on-flyspell
-             git-commit-propertize-diff
-             bug-reference-mode))
-
-(defcustom git-commit-post-finish-hook nil
-  "Hook run after the user finished writing a commit message.
-
-\\<with-editor-mode-map>\
-This hook is only run after pressing \\[with-editor-finish] 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
-that takes Git longer than `git-commit-post-finish-hook-timeout'
-seconds, 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'."
-  :group 'git-commit
-  :type 'hook
-  :get (and (featurep 'magit-base) #'magit-hook-custom-get))
-
-(defcustom git-commit-post-finish-hook-timeout 1
-  "Time in seconds to wait for git to create a commit.
-
-The hook `git-commit-post-finish-hook' (which see) is run only
-after git is done creating a commit.  If it takes longer than
-`git-commit-post-finish-hook-timeout' seconds to create the
-commit, then the hook is not run at all."
-  :group 'git-commit
-  :safe 'numberp
-  :type 'number)
-
-(defcustom git-commit-finish-query-functions
-  '(git-commit-check-style-conventions)
-  "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."
-  :options '(git-commit-check-style-conventions)
-  :type 'hook
-  :group 'git-commit)
-
-(defcustom git-commit-style-convention-checks '(non-empty-second-line)
-  "List of checks performed by `git-commit-check-style-conventions'.
-
-Valid members are `non-empty-second-line' and `overlong-summary-line'.
-That function is a member of `git-commit-finish-query-functions'."
-  :options '(non-empty-second-line overlong-summary-line)
-  :type '(list :convert-widget custom-hook-convert-widget)
-  :group 'git-commit)
-
-(defcustom git-commit-summary-max-length 68
-  "Column beyond which characters in the summary lines are highlighted.
-
-The highlighting indicates that the summary is getting too long
-by some standards.  It does in no way imply that going over the
-limit a few characters or in some cases even many characters is
-anything that deserves shaming.  It's just a friendly reminder
-that if you can make the summary shorter, then you might want
-to consider doing so."
-  :group 'git-commit
-  :safe 'numberp
-  :type 'number)
-
-(defcustom git-commit-trailers
-  '("Acked-by"
-    "Modified-by"
-    "Reviewed-by"
-    "Signed-off-by"
-    "Tested-by"
-    "Cc"
-    "Reported-by"
-    "Suggested-by"
-    "Co-authored-by"
-    "Co-developed-by")
-  "A list of Git trailers to be highlighted.
-
-See also manpage git-interpret-trailer(1).  This package does
-not use that Git command, but the initial description still
-serves as a good introduction."
-  :group 'git-commit
-  :safe (lambda (val) (and (listp val) (seq-every-p #'stringp val)))
-  :type '(repeat string))
-
-(defcustom git-commit-use-local-message-ring nil
-  "Whether to use a local message ring instead of the global one.
-
-This can be set globally, in which case every repository gets its
-own commit message ring, or locally for a single repository.  If
-Magit isn't available, then setting this to a non-nil value has
-no effect."
-  :group 'git-commit
-  :safe 'booleanp
-  :type 'boolean)
-
-(defcustom git-commit-cd-to-toplevel nil
-  "Whether to set `default-directory' to the worktree in message buffer.
-
-Editing a commit message is done by visiting a file located in the git
-directory, usually \"COMMIT_EDITMSG\".  As is done when visiting any
-file, the local value of `default-directory' is set to the directory
-that contains the file.
-
-If this option is non-nil, then the local `default-directory' is changed
-to the working tree from which the commit command was invoked.  You may
-wish to do that, to make it easier to open a file that is located in the
-working tree, directly from the commit message buffer.
-
-If the git variable `safe.bareRepository' is set to \"explicit\", then
-you have to enable this, to be able to commit at all.  See issue #5100.
-
-This option only has an effect if the commit was initiated from Magit."
-  :group 'git-commit
-  :type 'boolean)
-
-;;;; Faces
-
-(defgroup git-commit-faces nil
-  "Faces used for highlighting Git commit messages."
-  :prefix "git-commit-"
-  :group 'git-commit
-  :group 'faces)
-
-(defface git-commit-summary
-  '((t :inherit font-lock-type-face))
-  "Face used for the summary in commit messages."
-  :group 'git-commit-faces)
-
-(defface git-commit-overlong-summary
-  '((t :inherit font-lock-warning-face))
-  "Face used for the tail of overlong commit message summaries."
-  :group 'git-commit-faces)
-
-(defface git-commit-nonempty-second-line
-  '((t :inherit font-lock-warning-face))
-  "Face used for non-whitespace on the second line of commit messages."
-  :group 'git-commit-faces)
-
-(defface git-commit-keyword
-  '((t :inherit font-lock-string-face))
-  "Face used for keywords in commit messages.
-In this context a \"keyword\" is text surrounded by brackets."
-  :group 'git-commit-faces)
-
-(defface git-commit-trailer-token
-  '((t :inherit font-lock-keyword-face))
-  "Face used for Git trailer tokens in commit messages."
-  :group 'git-commit-faces)
-
-(defface git-commit-trailer-value
-  '((t :inherit font-lock-string-face))
-  "Face used for Git trailer values in commit messages."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-branch-local
-  (if (featurep 'magit)
-      '((t :inherit magit-branch-local))
-    '((t :inherit font-lock-variable-name-face)))
-  "Face used for names of local branches in commit message comments."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-branch-remote
-  (if (featurep 'magit)
-      '((t :inherit magit-branch-remote))
-    '((t :inherit font-lock-variable-name-face)))
-  "Face used for names of remote branches in commit message comments.
-This is only used if Magit is available."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-detached
-  '((t :inherit git-commit-comment-branch-local))
-  "Face used for detached `HEAD' in commit message comments."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-heading
-  '((t :inherit git-commit-trailer-token))
-  "Face used for headings in commit message comments."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-file
-  '((t :inherit git-commit-trailer-value))
-  "Face used for file names in commit message comments."
-  :group 'git-commit-faces)
-
-(defface git-commit-comment-action
-  '((t :inherit bold))
-  "Face used for actions in commit message comments."
-  :group 'git-commit-faces)
-
-;;; Keymap
-
-(defvar-keymap git-commit-redundant-bindings
-  :doc "Bindings made redundant by `git-commit-insert-trailer'.
-This keymap is used as the parent of `git-commit-mode-map',
-to avoid upsetting muscle-memory.  If you would rather avoid
-the redundant bindings, then set this to nil, before loading
-`git-commit'."
-  "C-c C-a" #'git-commit-ack
-  "C-c M-i" #'git-commit-suggested
-  "C-c C-m" #'git-commit-modified
-  "C-c C-o" #'git-commit-cc
-  "C-c C-p" #'git-commit-reported
-  "C-c C-r" #'git-commit-review
-  "C-c C-s" #'git-commit-signoff
-  "C-c C-t" #'git-commit-test)
-
-(defvar-keymap git-commit-mode-map
-  :doc "Keymap used by `git-commit-mode'."
-  :parent git-commit-redundant-bindings
-  "M-p"     #'git-commit-prev-message
-  "M-n"     #'git-commit-next-message
-  "C-c M-p" #'git-commit-search-message-backward
-  "C-c M-n" #'git-commit-search-message-forward
-  "C-c C-i" #'git-commit-insert-trailer
-  "C-c M-s" #'git-commit-save-message)
-
-;;; Menu
-
-(require 'easymenu)
-(easy-menu-define git-commit-mode-menu git-commit-mode-map
-  "Git Commit Mode Menu"
-  '("Commit"
-    ["Previous" git-commit-prev-message t]
-    ["Next" git-commit-next-message t]
-    "-"
-    ["Ack" git-commit-ack t
-     :help "Insert an 'Acked-by' trailer"]
-    ["Modified-by" git-commit-modified t
-     :help "Insert a 'Modified-by' trailer"]
-    ["Reviewed-by" git-commit-review t
-     :help "Insert a 'Reviewed-by' trailer"]
-    ["Sign-Off" git-commit-signoff t
-     :help "Insert a 'Signed-off-by' trailer"]
-    ["Tested-by" git-commit-test t
-     :help "Insert a 'Tested-by' trailer"]
-    "-"
-    ["CC" git-commit-cc t
-     :help "Insert a 'Cc' trailer"]
-    ["Reported" git-commit-reported t
-     :help "Insert a 'Reported-by' trailer"]
-    ["Suggested" git-commit-suggested t
-     :help "Insert a 'Suggested-by' trailer"]
-    ["Co-authored-by" git-commit-co-authored t
-     :help "Insert a 'Co-authored-by' trailer"]
-    ["Co-developed-by" git-commit-co-developed t
-     :help "Insert a 'Co-developed-by' trailer"]
-    "-"
-    ["Save" git-commit-save-message t]
-    ["Cancel" with-editor-cancel t]
-    ["Commit" with-editor-finish t]))
-
-;;; Hooks
-
-(defconst git-commit-filename-regexp "/\\(\
-\\(\\(COMMIT\\|NOTES\\|PULLREQ\\|MERGEREQ\\|TAG\\)_EDIT\\|MERGE_\\|\\)MSG\
-\\|\\(BRANCH\\|EDIT\\)_DESCRIPTION\\)\\'")
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude git-commit-filename-regexp))
-
-(add-to-list 'with-editor-file-name-history-exclude git-commit-filename-regexp)
-
-(defun git-commit-setup-font-lock-in-buffer ()
-  (when (and buffer-file-name
-             (string-match-p git-commit-filename-regexp buffer-file-name))
-    (git-commit-setup-font-lock)))
-
-(defun git-commit-setup-check-buffer ()
-  (when (and buffer-file-name
-             (string-match-p git-commit-filename-regexp buffer-file-name))
-    (git-commit-setup)))
-
-(defvar git-commit-mode)
-
-(defun git-commit-file-not-found ()
-  ;; cygwin git will pass a cygwin path (/cygdrive/c/foo/.git/...),
-  ;; try to handle this in window-nt Emacs.
-  (when-let
-      ((file (and (or (string-match-p git-commit-filename-regexp
-                                      buffer-file-name)
-                      (and (boundp 'git-rebase-filename-regexp)
-                           (string-match-p git-rebase-filename-regexp
-                                           buffer-file-name)))
-                  (not (file-accessible-directory-p
-                        (file-name-directory buffer-file-name)))
-                  (if (require 'magit-git nil t)
-                      ;; Emacs prepends a "c:".
-                      (magit-expand-git-file-name
-                       (substring buffer-file-name 2))
-                    ;; Fallback if we can't load `magit-git'.
-                    (and (string-match
-                          "\\`[a-z]:/\\(cygdrive/\\)?\\([a-z]\\)/\\(.*\\)"
-                          buffer-file-name)
-                         (concat (match-string 2 buffer-file-name) ":/"
-                                 (match-string 3 buffer-file-name)))))))
-    (when (file-accessible-directory-p (file-name-directory file))
-      (let ((inhibit-read-only t))
-        (insert-file-contents file t)
-        t))))
-
-(when (eq system-type 'windows-nt)
-  (add-hook 'find-file-not-found-functions #'git-commit-file-not-found))
-
-(defconst git-commit-default-usage-message "\
-Type \\[with-editor-finish] to finish, \
-\\[with-editor-cancel] to cancel, and \
-\\[git-commit-prev-message] and \\[git-commit-next-message] \
-to recover older messages")
-
-(defvar git-commit-usage-message git-commit-default-usage-message
-  "Message displayed when editing a commit message.
-When this is nil, then `with-editor-usage-message' is displayed
-instead.  One of these messages has to be displayed; otherwise
-the user gets to see the message displayed by `server-execute'.
-That message is misleading and because we cannot prevent it from
-being displayed, we have to immediately show another message to
-prevent the user from seeing it.")
-
-(defvar git-commit-header-line-format nil
-  "If non-nil, header line format used by `git-commit-mode'.
-Used as the local value of `header-line-format', in buffer using
-`git-commit-mode'.  If it is a string, then it is passed through
-`substitute-command-keys' first.  A useful setting may be:
-  (setq git-commit-header-line-format git-commit-default-usage-message)
-  (setq git-commit-usage-message nil) ; show a shorter message")
-
-(defun git-commit-setup ()
-  (let ((gitdir default-directory)
-        (cd nil))
-    (when (and (fboundp 'magit-toplevel)
-               (boundp 'magit--separated-gitdirs))
-      ;; `magit-toplevel' is autoloaded and defined in magit-git.el.  That
-      ;; library declares this function without loading magit-process.el,
-      ;; which defines it.
-      (require 'magit-process nil t)
-      (when git-commit-cd-to-toplevel
-        (setq cd (or (car (rassoc default-directory magit--separated-gitdirs))
-                     (magit-toplevel)))))
-    ;; Pretend that git-commit-mode is a major-mode,
-    ;; so that directory-local settings can be used.
-    (let ((default-directory
-           (or (and (not (file-exists-p
-                          (expand-file-name ".dir-locals.el" gitdir)))
-                    ;; When $GIT_DIR/.dir-locals.el doesn't exist,
-                    ;; fallback to $GIT_WORK_TREE/.dir-locals.el,
-                    ;; because the maintainer can use the latter
-                    ;; to enforce conventions, while s/he has no
-                    ;; control over the former.
-                    (fboundp 'magit-toplevel)
-                    (or cd (magit-toplevel)))
-               gitdir)))
-      (let ((buffer-file-name nil)         ; trick hack-dir-local-variables
-            (major-mode 'git-commit-mode)) ; trick dir-locals-collect-variables
-        (hack-dir-local-variables)
-        (hack-local-variables-apply)))
-    (when cd
-      (setq default-directory cd)))
-  (when git-commit-major-mode
-    (let ((auto-mode-alist
-           ;; `set-auto-mode--apply-alist' removes the remote part from
-           ;; the file-name before looking it up in `auto-mode-alist'.
-           ;; For our temporary entry to be found, we have to modify the
-           ;; file-name the same way.
-           (list (cons (concat "\\`"
-                               (regexp-quote
-                                (or (file-remote-p buffer-file-name 'localname)
-                                    buffer-file-name))
-                               "\\'")
-                       git-commit-major-mode)))
-          ;; The major-mode hook might want to consult these minor
-          ;; modes, while the minor-mode hooks might want to consider
-          ;; the major mode.
-          (git-commit-mode t)
-          (with-editor-mode t))
-      (normal-mode t)))
-  ;; Below we instead explicitly show a message.
-  (setq with-editor-show-usage nil)
-  (unless with-editor-mode
-    ;; Maybe already enabled when using `shell-command' or an Emacs shell.
-    (with-editor-mode 1))
-  (add-hook 'with-editor-finish-query-functions
-            #'git-commit-finish-query-functions nil t)
-  (add-hook 'with-editor-pre-finish-hook
-            #'git-commit-save-message nil t)
-  (add-hook 'with-editor-pre-cancel-hook
-            #'git-commit-save-message nil t)
-  (when (fboundp 'magit-commit--reset-command)
-    (add-hook 'with-editor-post-finish-hook #'magit-commit--reset-command)
-    (add-hook 'with-editor-post-cancel-hook #'magit-commit--reset-command))
-  (when (and (fboundp 'magit-rev-parse)
-             (not (memq last-command
-                        '(magit-sequencer-continue
-                          magit-sequencer-skip
-                          magit-am-continue
-                          magit-am-skip
-                          magit-rebase-continue
-                          magit-rebase-skip))))
-    (add-hook 'with-editor-post-finish-hook
-              (apply-partially #'git-commit-run-post-finish-hook
-                               (magit-rev-parse "HEAD"))
-              nil t)
-    (when (fboundp 'magit-wip-maybe-add-commit-hook)
-      (magit-wip-maybe-add-commit-hook)))
-  (setq with-editor-cancel-message
-        #'git-commit-cancel-message)
-  (git-commit-mode 1)
-  (git-commit-setup-font-lock)
-  (git-commit-prepare-message-ring)
-  (when (boundp 'save-place)
-    (setq save-place nil))
-  (save-excursion
-    (goto-char (point-min))
-    (when (looking-at "\\`\\(\\'\\|\n[^\n]\\)")
-      (open-line 1)))
-  (with-demoted-errors "Error running git-commit-setup-hook: %S"
-    (run-hooks 'git-commit-setup-hook))
-  (when git-commit-usage-message
-    (setq with-editor-usage-message git-commit-usage-message))
-  (with-editor-usage-message)
-  (when-let ((format git-commit-header-line-format))
-    (setq header-line-format
-          (if (stringp format) (substitute-command-keys format) format)))
-  (set-buffer-modified-p nil))
-
-(defun git-commit-run-post-finish-hook (previous)
-  (when (and git-commit-post-finish-hook
-             (require 'magit nil t)
-             (fboundp 'magit-rev-parse))
-    (cl-block nil
-      (let ((break (time-add (current-time)
-                             (seconds-to-time
-                              git-commit-post-finish-hook-timeout))))
-        (while (equal (magit-rev-parse "HEAD") previous)
-          (if (time-less-p (current-time) break)
-              (sit-for 0.01)
-            (message "No commit created after 1 second.  Not running %s."
-                     'git-commit-post-finish-hook)
-            (cl-return))))
-      (run-hooks 'git-commit-post-finish-hook))))
-
-(define-minor-mode git-commit-mode
-  "Auxiliary minor mode used when editing Git commit messages.
-This mode is only responsible for setting up some key bindings.
-Don't use it directly, instead enable `global-git-commit-mode'."
-  :lighter "")
-
-(put 'git-commit-mode 'permanent-local t)
-
-(defun git-commit-setup-changelog-support ()
-  "Treat ChangeLog entries as unindented paragraphs."
-  (when (fboundp 'log-indent-fill-entry) ; New in Emacs 27.
-    (setq-local fill-paragraph-function #'log-indent-fill-entry))
-  (setq-local fill-indent-according-to-mode t)
-  (setq-local paragraph-start (concat paragraph-start "\\|\\*\\|(")))
-
-(defun git-commit-turn-on-auto-fill ()
-  "Unconditionally turn on Auto Fill mode."
-  (setq-local comment-auto-fill-only-comments nil)
-  (turn-on-auto-fill))
-
-(defun git-commit-turn-on-orglink ()
-  "Turn on Orglink mode if it is available.
-If `git-commit-major-mode' is `org-mode', then silently forgo
-turning on `orglink-mode'."
-  (when (and (not (derived-mode-p 'org-mode))
-             (boundp 'orglink-match-anywhere)
-             (fboundp 'orglink-mode))
-    (setq-local orglink-match-anywhere t)
-    (orglink-mode 1)))
-
-(defun git-commit-turn-on-flyspell ()
-  "Unconditionally turn on Flyspell mode.
-Also check text that is already in the buffer, while avoiding to check
-most text that Git will strip from the final message, such as the last
-comment and anything below the cut line (\"--- >8 ---\")."
-  (require 'flyspell)
-  (turn-on-flyspell)
-  (setq flyspell-generic-check-word-predicate
-        #'git-commit-flyspell-verify)
-  (let ((end nil)
-        ;; The "cut line" is defined in "git/wt-status.c".  It appears
-        ;; in the commit message when `commit.verbose' is set to true.
-        (cut-line-regex (format "^%s -\\{8,\\} >8 -\\{8,\\}$" comment-start))
-        (comment-start-regex (format "^\\(%s\\|$\\)" comment-start)))
-    (save-excursion
-      (goto-char (or (re-search-forward cut-line-regex nil t)
-                     (point-max)))
-      (while (and (not (bobp)) (looking-at comment-start-regex))
-        (forward-line -1))
-      (unless (looking-at comment-start-regex)
-        (forward-line))
-      (setq end (point)))
-    (flyspell-region (point-min) end)))
-
-(defun git-commit-flyspell-verify ()
-  (not (= (char-after (line-beginning-position))
-          (aref comment-start 0))))
-
-(defun git-commit-finish-query-functions (force)
-  (run-hook-with-args-until-failure
-   'git-commit-finish-query-functions force))
-
-(defun git-commit-check-style-conventions (force)
-  "Check for violations of certain basic style conventions.
-
-For each violation ask the user if she wants to proceed anyway.
-Option `git-commit-style-convention-checks' controls which
-conventions are checked."
-  (or force
-      (save-excursion
-        (goto-char (point-min))
-        (re-search-forward (git-commit-summary-regexp) nil t)
-        (if (equal (match-string 1) "")
-            t ; Just try; we don't know whether --allow-empty-message was used.
-          (and (or (not (memq 'overlong-summary-line
-                              git-commit-style-convention-checks))
-                   (equal (match-string 2) "")
-                   (y-or-n-p "Summary line is too long.  Commit anyway? "))
-               (or (not (memq 'non-empty-second-line
-                              git-commit-style-convention-checks))
-                   (not (match-string 3))
-                   (y-or-n-p "Second line is not empty.  Commit anyway? ")))))))
-
-(defun git-commit-cancel-message ()
-  (message
-   (concat "Commit canceled"
-           (and (memq 'git-commit-save-message with-editor-pre-cancel-hook)
-                ".  Message saved to `log-edit-comment-ring'"))))
-
-;;; History
-
-(defun git-commit-prev-message (arg)
-  "Cycle backward through message history, after saving current message.
-With a numeric prefix ARG, go back ARG comments."
-  (interactive "*p")
-  (let ((len (ring-length log-edit-comment-ring)))
-    (if (<= len 0)
-        (progn (message "Empty comment ring") (ding))
-      ;; Unlike `log-edit-previous-comment' we save the current
-      ;; non-empty and newly written comment, because otherwise
-      ;; it would be irreversibly lost.
-      (when-let ((message (git-commit-buffer-message)))
-        (unless (ring-member log-edit-comment-ring message)
-          (ring-insert log-edit-comment-ring message)
-          (cl-incf arg)
-          (setq len (ring-length log-edit-comment-ring))))
-      ;; Delete the message but not the instructions at the end.
-      (save-restriction
-        (goto-char (point-min))
-        (narrow-to-region
-         (point)
-         (if (re-search-forward (concat "^" comment-start) nil t)
-             (max 1 (- (point) 2))
-           (point-max)))
-        (delete-region (point-min) (point)))
-      (setq log-edit-comment-ring-index (log-edit-new-comment-index arg len))
-      (message "Comment %d" (1+ log-edit-comment-ring-index))
-      (insert (ring-ref log-edit-comment-ring log-edit-comment-ring-index)))))
-
-(defun git-commit-next-message (arg)
-  "Cycle forward through message history, after saving current message.
-With a numeric prefix ARG, go forward ARG comments."
-  (interactive "*p")
-  (git-commit-prev-message (- arg)))
-
-(defun git-commit-search-message-backward (string)
-  "Search backward through message history for a match for STRING.
-Save current message first."
-  (interactive
-   ;; Avoid `format-prompt' because it isn't available until Emacs 28.
-   (list (read-string (format "Comment substring (default %s): "
-                              log-edit-last-comment-match)
-                      nil nil log-edit-last-comment-match)))
-  (cl-letf (((symbol-function #'log-edit-previous-comment)
-             (symbol-function #'git-commit-prev-message)))
-    (log-edit-comment-search-backward string)))
-
-(defun git-commit-search-message-forward (string)
-  "Search forward through message history for a match for STRING.
-Save current message first."
-  (interactive
-   ;; Avoid `format-prompt' because it isn't available until Emacs 28.
-   (list (read-string (format "Comment substring (default %s): "
-                              log-edit-last-comment-match)
-                      nil nil log-edit-last-comment-match)))
-  (cl-letf (((symbol-function #'log-edit-previous-comment)
-             (symbol-function #'git-commit-prev-message)))
-    (log-edit-comment-search-forward string)))
-
-(defun git-commit-save-message ()
-  "Save current message to `log-edit-comment-ring'."
-  (interactive)
-  (if-let ((message (git-commit-buffer-message)))
-      (progn
-        (when-let ((index (ring-member log-edit-comment-ring message)))
-          (ring-remove log-edit-comment-ring index))
-        (ring-insert log-edit-comment-ring message)
-        (when (and git-commit-use-local-message-ring
-                   (fboundp 'magit-repository-local-set))
-          (magit-repository-local-set 'log-edit-comment-ring
-                                      log-edit-comment-ring))
-        (message "Message saved"))
-    (message "Only whitespace and/or comments; message not saved")))
-
-(defun git-commit-prepare-message-ring ()
-  (make-local-variable 'log-edit-comment-ring-index)
-  (when (and git-commit-use-local-message-ring
-             (fboundp 'magit-repository-local-get))
-    (setq-local log-edit-comment-ring
-                (magit-repository-local-get
-                 'log-edit-comment-ring
-                 (make-ring log-edit-maximum-comment-ring-size)))))
-
-(defun git-commit-buffer-message ()
-  (let ((flush (concat "^" comment-start))
-        (str (buffer-substring-no-properties (point-min) (point-max))))
-    (with-temp-buffer
-      (insert str)
-      (goto-char (point-min))
-      (when (re-search-forward (concat flush " -+ >8 -+$") nil t)
-        (delete-region (line-beginning-position) (point-max)))
-      (goto-char (point-min))
-      (flush-lines flush)
-      (goto-char (point-max))
-      (unless (eq (char-before) ?\n)
-        (insert ?\n))
-      (setq str (buffer-string)))
-    (and (not (string-match "\\`[ \t\n\r]*\\'" str))
-         (progn
-           (when (string-match "\\`\n\\{2,\\}" str)
-             (setq str (replace-match "\n" t t str)))
-           (when (string-match "\n\\{2,\\}\\'" str)
-             (setq str (replace-match "\n" t t str)))
-           str))))
-
-;;; Utilities
-
-(defsubst git-commit-executable ()
-  (if (fboundp 'magit-git-executable)
-      (magit-git-executable)
-    "git"))
-
-;;; Trailers
-
-(transient-define-prefix git-commit-insert-trailer ()
-  "Insert a commit message trailer.
-
-See also manpage git-interpret-trailer(1).  This command does
-not use that Git command, but the initial description still
-serves as a good introduction."
-  [[:description (lambda ()
-                   (cond (prefix-arg
-                          "Insert ... by someone ")
-                         ("Insert ... by yourself")))
-    ("a"   "Ack"          git-commit-ack)
-    ("m"   "Modified"     git-commit-modified)
-    ("r"   "Reviewed"     git-commit-review)
-    ("s"   "Signed-off"   git-commit-signoff)
-    ("t"   "Tested"       git-commit-test)]
-   ["Insert ... by someone"
-    ("C-c" "Cc"           git-commit-cc)
-    ("C-r" "Reported"     git-commit-reported)
-    ("C-i" "Suggested"    git-commit-suggested)
-    ("C-a" "Co-authored"  git-commit-co-authored)
-    ("C-d" "Co-developed" git-commit-co-developed)]])
-
-(defun git-commit-ack (name mail)
-  "Insert a trailer acknowledging that you have looked at the commit."
-  (interactive (git-commit-get-ident "Acked-by"))
-  (git-commit--insert-ident-trailer "Acked-by" name mail))
-
-(defun git-commit-modified (name mail)
-  "Insert a trailer to signal that you have modified the commit."
-  (interactive (git-commit-get-ident "Modified-by"))
-  (git-commit--insert-ident-trailer "Modified-by" name mail))
-
-(defun git-commit-review (name mail)
-  "Insert a trailer acknowledging that you have reviewed the commit.
-With a prefix argument, prompt for another person who performed a
-review."
-  (interactive (git-commit-get-ident "Reviewed-by"))
-  (git-commit--insert-ident-trailer "Reviewed-by" name mail))
-
-(defun git-commit-signoff (name mail)
-  "Insert a trailer to sign off the commit.
-With a prefix argument, prompt for another person who signed off."
-  (interactive (git-commit-get-ident "Signed-off-by"))
-  (git-commit--insert-ident-trailer "Signed-off-by" name mail))
-
-(defun git-commit-test (name mail)
-  "Insert a trailer acknowledging that you have tested the commit.
-With a prefix argument, prompt for another person who tested."
-  (interactive (git-commit-get-ident "Tested-by"))
-  (git-commit--insert-ident-trailer "Tested-by" name mail))
-
-(defun git-commit-cc (name mail)
-  "Insert a trailer mentioning someone who might be interested."
-  (interactive (git-commit-read-ident "Cc"))
-  (git-commit--insert-ident-trailer "Cc" name mail))
-
-(defun git-commit-reported (name mail)
-  "Insert a trailer mentioning the person who reported the issue."
-  (interactive (git-commit-read-ident "Reported-by"))
-  (git-commit--insert-ident-trailer "Reported-by" name mail))
-
-(defun git-commit-suggested (name mail)
-  "Insert a trailer mentioning the person who suggested the change."
-  (interactive (git-commit-read-ident "Suggested-by"))
-  (git-commit--insert-ident-trailer "Suggested-by" name mail))
-
-(defun git-commit-co-authored (name mail)
-  "Insert a trailer mentioning the person who co-authored the commit."
-  (interactive (git-commit-read-ident "Co-authored-by"))
-  (git-commit--insert-ident-trailer "Co-authored-by" name mail))
-
-(defun git-commit-co-developed (name mail)
-  "Insert a trailer mentioning the person who co-developed the commit."
-  (interactive (git-commit-read-ident "Co-developed-by"))
-  (git-commit--insert-ident-trailer "Co-developed-by" name mail))
-
-(defun git-commit-get-ident (&optional prompt)
-  "Return name and email of the user or read another name and email.
-If PROMPT and `current-prefix-arg' are both non-nil, read name
-and email using `git-commit-read-ident' (which see), otherwise
-return name and email of the current user (you)."
-  (if (and prompt current-prefix-arg)
-      (git-commit-read-ident prompt)
-    (list (or (getenv "GIT_AUTHOR_NAME")
-              (getenv "GIT_COMMITTER_NAME")
-              (with-demoted-errors "Error running 'git config user.name': %S"
-                (car (process-lines
-                      (git-commit-executable) "config" "user.name")))
-              user-full-name
-              (read-string "Name: "))
-          (or (getenv "GIT_AUTHOR_EMAIL")
-              (getenv "GIT_COMMITTER_EMAIL")
-              (getenv "EMAIL")
-              (with-demoted-errors "Error running 'git config user.email': %S"
-                (car (process-lines
-                      (git-commit-executable) "config" "user.email")))
-              (read-string "Email: ")))))
-
-(defalias 'git-commit-self-ident #'git-commit-get-ident)
-
-(defvar git-commit-read-ident-history nil)
-
-(defun git-commit-read-ident (prompt)
-  "Read a name and email, prompting with PROMPT, and return them.
-If Magit is available, read them using a single prompt, offering
-past commit authors as completion candidates.  The input must
-have the form \"NAME <EMAIL>\"."
-  (if (require 'magit-git nil t)
-      (let ((str (magit-completing-read
-                  prompt
-                  (sort (delete-dups
-                         (magit-git-lines "log" "-n9999" "--format=%aN <%ae>"))
-                        #'string<)
-                  nil nil nil 'git-commit-read-ident-history)))
-        (save-match-data
-          (if (string-match "\\`\\([^<]+\\) *<\\([^>]+\\)>\\'" str)
-              (list (save-match-data (string-trim (match-string 1 str)))
-                    (string-trim (match-string 2 str)))
-            (user-error "Invalid input"))))
-    (list (read-string "Name: ")
-          (read-string "Email: "))))
-
-(defun git-commit--insert-ident-trailer (trailer name email)
-  (git-commit--insert-trailer trailer (format "%s <%s>" name email)))
-
-(defun git-commit--insert-trailer (trailer value)
-  (save-excursion
-    (let ((string (format "%s: %s" trailer value))
-          (leading-comment-end nil))
-      ;; Make sure we skip forward past any leading comments.
-      (goto-char (point-min))
-      (while (looking-at comment-start)
-        (forward-line))
-      (setq leading-comment-end (point))
-      (goto-char (point-max))
-      (cond
-       ;; Look backwards for existing trailers.
-       ((re-search-backward (git-commit--trailer-regexp) nil t)
-        (end-of-line)
-        (insert ?\n string)
-        (unless (= (char-after) ?\n)
-          (insert ?\n)))
-       ;; Or place the new trailer right before the first non-leading
-       ;; comments.
-       (t
-        (while (re-search-backward (concat "^" comment-start)
-                                   leading-comment-end t))
-        (unless (looking-back "\n\n" nil)
-          (insert ?\n))
-        (insert string ?\n))))
-    (unless (or (eobp) (= (char-after) ?\n))
-      (insert ?\n))))
-
-;;; Font-Lock
-
-(defvar-local git-commit-need-summary-line t
-  "Whether the text should have a heading that is separated from the body.
-
-For commit messages that is a convention that should not
-be violated.  For notes it is up to the user.  If you do
-not want to insist on an empty second line here, then use
-something like:
-
-  (add-hook \\='git-commit-setup-hook
-            (lambda ()
-              (when (equal (file-name-nondirectory (buffer-file-name))
-                           \"NOTES_EDITMSG\")
-                (setq git-commit-need-summary-line nil))))")
-
-(defun git-commit--trailer-regexp ()
-  (format
-   "^\\(?:\\(%s:\\)\\( .*\\)\\|\\([-a-zA-Z]+\\): \\([^<\n]+? <[^>\n]+>\\)\\)"
-   (regexp-opt git-commit-trailers)))
-
-(defun git-commit-summary-regexp ()
-  (if git-commit-need-summary-line
-      (concat
-       ;; Leading empty lines and comments
-       (format "\\`\\(?:^\\(?:\\s-*\\|%s.*\\)\n\\)*" comment-start)
-       ;; Summary line
-       (format "\\(.\\{0,%d\\}\\)\\(.*\\)" git-commit-summary-max-length)
-       ;; Non-empty non-comment second line
-       (format "\\(?:\n%s\\|\n\\(.+\\)\\)?" comment-start))
-    "\\(EASTER\\) \\(EGG\\)"))
-
-(defun git-commit-extend-region-summary-line ()
-  "Identify the multiline summary-regexp construct.
-Added to `font-lock-extend-region-functions'."
-  (save-excursion
-    (save-match-data
-      (goto-char (point-min))
-      (when (looking-at (git-commit-summary-regexp))
-        (let ((summary-beg (match-beginning 0))
-              (summary-end (match-end 0)))
-          (when (or (< summary-beg font-lock-beg summary-end)
-                    (< summary-beg font-lock-end summary-end))
-            (setq font-lock-beg (min font-lock-beg summary-beg))
-            (setq font-lock-end (max font-lock-end summary-end))))))))
-
-(defvar-local git-commit--branch-name-regexp nil)
-
-(defconst git-commit-comment-headings
-  '("Changes to be committed:"
-    "Untracked files:"
-    "Changed but not updated:"
-    "Changes not staged for commit:"
-    "Unmerged paths:"
-    "Author:"
-    "Date:")
-  "Also fontified outside of comments in `git-commit-font-lock-keywords-2'.")
-
-(defconst git-commit-font-lock-keywords-1
-  '(;; Trailers
-    (eval . `(,(git-commit--trailer-regexp)
-              (1 'git-commit-trailer-token)
-              (2 'git-commit-trailer-value)
-              (3 'git-commit-trailer-token)
-              (4 'git-commit-trailer-value)))
-    ;; Summary
-    (eval . `(,(git-commit-summary-regexp)
-              (1 'git-commit-summary)))
-    ;; - Keyword [aka "text in brackets"] (overrides summary)
-    ("\\[[^][]+?\\]"
-     (0 'git-commit-keyword t))
-    ;; - Non-empty second line (overrides summary and note)
-    (eval . `(,(git-commit-summary-regexp)
-              (2 'git-commit-overlong-summary t t)
-              (3 'git-commit-nonempty-second-line t t)))))
-
-(defconst git-commit-font-lock-keywords-2
-  `(,@git-commit-font-lock-keywords-1
-    ;; Comments
-    (eval . `(,(format "^%s.*" comment-start)
-              (0 'font-lock-comment-face append)))
-    (eval . `(,(format "^%s On branch \\(.*\\)" comment-start)
-              (1 'git-commit-comment-branch-local t)))
-    (eval . `(,(format "^%s \\(HEAD\\) detached at" comment-start)
-              (1 'git-commit-comment-detached t)))
-    (eval . `(,(format "^%s %s" comment-start
-                       (regexp-opt git-commit-comment-headings t))
-              (1 'git-commit-comment-heading t)))
-    (eval . `(,(format "^%s\t\\(?:\\([^:\n]+\\):\\s-+\\)?\\(.*\\)" comment-start)
-              (1 'git-commit-comment-action t t)
-              (2 'git-commit-comment-file t)))
-    ;; "commit HASH"
-    (eval . '("^commit [[:alnum:]]+$"
-              (0 'git-commit-trailer-value)))
-    ;; `git-commit-comment-headings' (but not in commented lines)
-    (eval . `(,(format "\\(?:^%s[[:blank:]]+.+$\\)"
-                       (regexp-opt git-commit-comment-headings))
-              (0 'git-commit-trailer-value)))))
-
-(defconst git-commit-font-lock-keywords-3
-  `(,@git-commit-font-lock-keywords-2
-    ;; More comments
-    (eval
-     ;; Your branch is ahead of 'master' by 3 commits.
-     ;; Your branch is behind 'master' by 2 commits, and can be fast-forwarded.
-     . `(,(format
-           "^%s Your branch is \\(?:ahead\\|behind\\) of '%s' by \\([0-9]*\\)"
-           comment-start git-commit--branch-name-regexp)
-         (1 'git-commit-comment-branch-local t)
-         (2 'git-commit-comment-branch-remote t)
-         (3 'bold t)))
-    (eval
-     ;; Your branch is up to date with 'master'.
-     ;; Your branch and 'master' have diverged,
-     . `(,(format
-           "^%s Your branch \\(?:is up[- ]to[- ]date with\\|and\\) '%s'"
-           comment-start git-commit--branch-name-regexp)
-         (1 'git-commit-comment-branch-local t)
-         (2 'git-commit-comment-branch-remote t)))
-    (eval
-     ;; and have 1 and 2 different commits each, respectively.
-     . `(,(format
-           "^%s and have \\([0-9]*\\) and \\([0-9]*\\) commits each"
-           comment-start)
-         (1 'bold t)
-         (2 'bold t)))))
-
-(defvar git-commit-font-lock-keywords git-commit-font-lock-keywords-3
-  "Font-Lock keywords for Git-Commit mode.")
-
-(defun git-commit-setup-font-lock ()
-  (with-demoted-errors "Error running git-commit-setup-font-lock: %S"
-    (let ((table (make-syntax-table (syntax-table))))
-      (when comment-start
-        (modify-syntax-entry (string-to-char comment-start) "." table))
-      (modify-syntax-entry ?#  "." table)
-      (modify-syntax-entry ?\" "." table)
-      (modify-syntax-entry ?\' "." table)
-      (modify-syntax-entry ?`  "." table)
-      (set-syntax-table table))
-    (setq-local comment-start
-                (or (with-temp-buffer
-                      (and (zerop
-                            (call-process
-                             (git-commit-executable) nil (list t nil) nil
-                             "config" "core.commentchar"))
-                           (not (bobp))
-                           (progn
-                             (goto-char (point-min))
-                             (buffer-substring (point) (line-end-position)))))
-                    "#"))
-    (setq-local comment-start-skip (format "^%s+[\s\t]*" comment-start))
-    (setq-local comment-end "")
-    (setq-local comment-end-skip "\n")
-    (setq-local comment-use-syntax nil)
-    (when (and (derived-mode-p 'markdown-mode)
-               (fboundp 'markdown-fill-paragraph))
-      (setq-local fill-paragraph-function
-                  (lambda (&optional justify)
-                    (and (not (= (char-after (line-beginning-position))
-                                 (aref comment-start 0)))
-                         (markdown-fill-paragraph justify)))))
-    (setq-local git-commit--branch-name-regexp
-                (if (and (featurep 'magit-git)
-                         ;; When using cygwin git, we may end up in a
-                         ;; non-existing directory, which would cause
-                         ;; any git calls to signal an error.
-                         (file-accessible-directory-p default-directory))
-                    (progn
-                      ;; Make sure the below functions are available.
-                      (require 'magit)
-                      ;; Font-Lock wants every submatch to succeed, so
-                      ;; also match the empty string.  Avoid listing
-                      ;; remote branches and using `regexp-quote',
-                      ;; because in repositories have thousands of
-                      ;; branches that would be very slow.  See #4353.
-                      (format "\\(\\(?:%s\\)\\|\\)\\([^']+\\)"
-                              (mapconcat #'identity
-                                         (magit-list-local-branch-names)
-                                         "\\|")))
-                  "\\([^']*\\)"))
-    (setq-local font-lock-multiline t)
-    (add-hook 'font-lock-extend-region-functions
-              #'git-commit-extend-region-summary-line
-              t t)
-    (font-lock-add-keywords nil git-commit-font-lock-keywords)))
-
-(defun git-commit-propertize-diff ()
-  (require 'diff-mode)
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward "^diff --git" nil t)
-      (beginning-of-line)
-      (let ((buffer (current-buffer)))
-        (insert
-         (with-temp-buffer
-           (insert
-            (with-current-buffer buffer
-              (prog1 (buffer-substring-no-properties (point) (point-max))
-                (delete-region (point) (point-max)))))
-           (let ((diff-default-read-only nil))
-             (diff-mode))
-           (let (font-lock-verbose font-lock-support-mode)
-             (if (fboundp 'font-lock-ensure)
-                 (font-lock-ensure)
-               (with-no-warnings
-                 (font-lock-fontify-buffer))))
-           (let (next (pos (point-min)))
-             (while (setq next (next-single-property-change pos 'face))
-               (put-text-property pos next 'font-lock-face
-                                  (get-text-property pos 'face))
-               (setq pos next))
-             (put-text-property pos (point-max) 'font-lock-face
-                                (get-text-property pos 'face)))
-           (buffer-string)))))))
-
-;;; Elisp Text Mode
-
-(define-derived-mode git-commit-elisp-text-mode text-mode "ElText"
-  "Major mode for editing commit messages of elisp projects.
-This is intended for use as `git-commit-major-mode' for projects
-that expect `symbols' to look like this.  I.e., like they look in
-Elisp doc-strings, including this one.  Unlike in doc-strings,
-\"strings\" also look different than the other text."
-  (setq font-lock-defaults '(git-commit-elisp-text-mode-keywords)))
-
-(defvar git-commit-elisp-text-mode-keywords
-  `((,(concat "[`‘]\\(" lisp-mode-symbol-regexp "\\)['’]")
-     (1 font-lock-constant-face prepend))
-    ("\"[^\"]*\"" (0 font-lock-string-face prepend))))
-
-;;; _
-
-(define-obsolete-function-alias
-  'git-commit-insert-pseudo-header
-  'git-commit-insert-trailer
-  "git-commit 4.0.0")
-(define-obsolete-function-alias
-  'git-commit-insert-header
-  'git-commit--insert-ident-trailer
-  "git-commit 4.0.0")
-(define-obsolete-face-alias
- 'git-commit-pseudo-header
- 'git-commit-trailer-value
- "git-commit 4.0.0")
-(define-obsolete-face-alias
- 'git-commit-known-pseudo-header
- 'git-commit-trailer-token
- "git-commit 4.0.0")
-
-(provide 'git-commit)
-;;; git-commit.el ends here
diff --git a/emacs/elpa/git-commit-20240415.1544/git-commit.elc b/emacs/elpa/git-commit-20240415.1544/git-commit.elc
Binary files differ.
diff --git a/emacs/elpa/git-commit-20240415.1544/git-commit-autoloads.el b/emacs/elpa/git-commit-20240520.1135/git-commit-autoloads.el
diff --git a/emacs/elpa/git-commit-20240520.1135/git-commit-pkg.el b/emacs/elpa/git-commit-20240520.1135/git-commit-pkg.el
@@ -0,0 +1,18 @@
+(define-package "git-commit" "20240520.1135" "Edit Git commit messages."
+  '((emacs "26.1")
+    (compat "29.1.4.5")
+    (transient "20240421")
+    (with-editor "20240415"))
+  :commit "22fd8f8594202a0679ccc2f7d02bca44d48b8039" :authors
+  '(("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
+    ("Sebastian Wiesner" . "lunaryorn@gmail.com")
+    ("Florian Ragwitz" . "rafl@debian.org")
+    ("Marius Vollmer" . "marius.vollmer@gmail.com"))
+  :maintainer
+  '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
+  :keywords
+  '("git" "tools" "vc")
+  :url "https://github.com/magit/magit")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/git-commit-20240520.1135/git-commit.el b/emacs/elpa/git-commit-20240520.1135/git-commit.el
@@ -0,0 +1,1312 @@
+;;; git-commit.el --- Edit Git commit messages  -*- lexical-binding:t; coding:utf-8 -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+;;     Sebastian Wiesner <lunaryorn@gmail.com>
+;;     Florian Ragwitz <rafl@debian.org>
+;;     Marius Vollmer <marius.vollmer@gmail.com>
+;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev>
+
+;; Homepage: https://github.com/magit/magit
+;; Keywords: git tools vc
+
+;; Package-Version: 3.3.0.50-git
+;; Package-Requires: (
+;;     (emacs "26.1")
+;;     (compat "29.1.4.5")
+;;     (seq "2.24")
+;;     (transient "0.6.0")
+;;     (with-editor "3.3.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:
+
+;; This package assists the user in writing good Git commit messages.
+
+;; While Git allows for the message to be provided on the command
+;; line, it is preferable to tell Git to create the commit without
+;; actually passing it a message.  Git then invokes the `$GIT_EDITOR'
+;; (or if that is undefined `$EDITOR') asking the user to provide the
+;; message by editing the file ".git/COMMIT_EDITMSG" (or another file
+;; in that directory, e.g., ".git/MERGE_MSG" for merge commits).
+
+;; When `global-git-commit-mode' is enabled, which it is by default,
+;; then opening such a file causes the features described below, to
+;; be enabled in that buffer.  Normally this would be done using a
+;; major-mode but to allow the use of any major-mode, as the user sees
+;; fit, it is done here by running a setup function, which among other
+;; things turns on the preferred major-mode, by default `text-mode'.
+
+;; Git waits for the `$EDITOR' to finish and then either creates the
+;; commit using the contents of the file as commit message, or, if the
+;; editor process exited with a non-zero exit status, aborts without
+;; creating a commit.  Unfortunately Emacsclient (which is what Emacs
+;; users should be using as `$EDITOR' or at least as `$GIT_EDITOR')
+;; does not differentiate between "successfully" editing a file and
+;; aborting; not out of the box that is.
+
+;; By making use of the `with-editor' package this package provides
+;; both ways of finish an editing session.  In either case the file
+;; is saved, but Emacseditor's exit code differs.
+;;
+;;   C-c C-c  Finish the editing session successfully by returning
+;;            with exit code 0.  Git then creates the commit using
+;;            the message it finds in the file.
+;;
+;;   C-c C-k  Aborts the edit editing session by returning with exit
+;;            code 1.  Git then aborts the commit.
+
+;; Aborting the commit does not cause the message to be lost, but
+;; relying solely on the file not being tampered with is risky.  This
+;; package additionally stores all aborted messages for the duration
+;; of the current session (i.e., until you close Emacs).  To get back
+;; an aborted message use M-p and M-n while editing a message.
+;;
+;;   M-p      Replace the buffer contents with the previous message
+;;            from the message ring.  Of course only after storing
+;;            the current content there too.
+;;
+;;   M-n      Replace the buffer contents with the next message from
+;;            the message ring, after storing the current content.
+
+;; Support for inserting Git trailers (as described in the manpage
+;; git-interpret-trailers(1)) is available.
+;;
+;;   C-c C-i  Insert a trailer selected from a transient menu.
+
+;; When Git requests a commit message from the user, it does so by
+;; having her edit a file which initially contains some comments,
+;; instructing her what to do, and providing useful information, such
+;; as which files were modified.  These comments, even when left
+;; intact by the user, do not become part of the commit message.  This
+;; package ensures these comments are propertizes as such and further
+;; prettifies them by using different faces for various parts, such as
+;; files.
+
+;; Finally this package highlights style errors, like lines that are
+;; too long, or when the second line is not empty.  It may even nag
+;; you when you attempt to finish the commit without having fixed
+;; these issues.  The style checks and many other settings can easily
+;; be configured:
+;;
+;;   M-x customize-group RET git-commit RET
+
+;;; Code:
+
+(require 'compat)
+(require 'subr-x)
+
+(when (and (featurep 'seq)
+           (not (fboundp 'seq-keep)))
+  (unload-feature 'seq 'force))
+(require 'seq)
+
+(require 'log-edit)
+(require 'ring)
+(require 'server)
+(require 'transient)
+(require 'with-editor)
+
+;; For historic reasons Magit isn't a hard dependency.
+(require 'magit-base nil t)
+(require 'magit-git nil t)
+(declare-function magit-completing-read "magit-base"
+                  ( prompt collection &optional predicate require-match
+                    initial-input hist def fallback))
+(declare-function magit-expand-git-file-name "magit-git" (filename))
+(declare-function magit-git-lines "magit-git" (&rest args))
+(declare-function magit-hook-custom-get "magit-base" (symbol))
+(declare-function magit-list-local-branch-names "magit-git" ())
+
+(defvar diff-default-read-only)
+(defvar flyspell-generic-check-word-predicate)
+(defvar font-lock-beg)
+(defvar font-lock-end)
+(defvar recentf-exclude)
+
+(defvar git-commit-need-summary-line)
+
+(define-obsolete-variable-alias
+  'git-commit-known-pseudo-headers
+  'git-commit-trailers
+  "git-commit 4.0.0")
+
+;;; Options
+;;;; Variables
+
+(defgroup git-commit nil
+  "Edit Git commit messages."
+  :prefix "git-commit-"
+  :link '(info-link "(magit)Editing Commit Messages")
+  :group 'tools)
+
+(define-minor-mode global-git-commit-mode
+  "Edit Git commit messages.
+
+This global mode arranges for `git-commit-setup' to be called
+when a Git commit message file is opened.  That usually happens
+when Git uses the Emacsclient as $GIT_EDITOR to have the user
+provide such a commit message.
+
+Loading the library `git-commit' by default enables this mode,
+but the library is not automatically loaded because doing that
+would pull in many dependencies and increase startup time too
+much.  You can either rely on `magit' loading this library or
+you can load it explicitly.  Autoloading is not an alternative
+because in this case autoloading would immediately trigger
+full loading."
+  :group 'git-commit
+  :type 'boolean
+  :global t
+  :init-value t
+  :initialize
+  (lambda (symbol exp)
+    (custom-initialize-default symbol exp)
+    (when global-git-commit-mode
+      (add-hook 'find-file-hook #'git-commit-setup-check-buffer)
+      (remove-hook 'after-change-major-mode-hook
+                   #'git-commit-setup-font-lock-in-buffer)))
+  (cond
+   (global-git-commit-mode
+    (add-hook 'find-file-hook #'git-commit-setup-check-buffer)
+    (add-hook 'after-change-major-mode-hook
+              #'git-commit-setup-font-lock-in-buffer))
+   (t
+    (remove-hook 'find-file-hook #'git-commit-setup-check-buffer)
+    (remove-hook 'after-change-major-mode-hook
+                 #'git-commit-setup-font-lock-in-buffer))))
+
+(defcustom git-commit-major-mode #'text-mode
+  "Major mode used to edit Git commit messages.
+
+The major mode configured here is turned on by the minor mode
+`git-commit-mode'."
+  :group 'git-commit
+  :type '(choice (function-item text-mode)
+                 (function-item markdown-mode)
+                 (function-item org-mode)
+                 (function-item fundamental-mode)
+                 (function-item git-commit-elisp-text-mode)
+                 (function :tag "Another mode")
+                 (const :tag "No major mode")))
+;;;###autoload(put 'git-commit-major-mode 'safe-local-variable
+;;;###autoload     (lambda (val)
+;;;###autoload       (memq val '(text-mode
+;;;###autoload                   markdown-mode
+;;;###autoload                   org-mode
+;;;###autoload                   fundamental-mode
+;;;###autoload                   git-commit-elisp-text-mode))))
+
+(defvaralias 'git-commit-mode-hook 'git-commit-setup-hook
+  "This variable is an alias for `git-commit-setup-hook' (which see).
+Also note that `git-commit-mode' (which see) is not a major-mode.")
+
+(defcustom git-commit-setup-hook
+  '(git-commit-ensure-comment-gap
+    git-commit-save-message
+    git-commit-setup-changelog-support
+    git-commit-turn-on-auto-fill
+    git-commit-propertize-diff
+    bug-reference-mode)
+  "Hook run at the end of `git-commit-setup'."
+  :group 'git-commit
+  :type 'hook
+  :get (and (featurep 'magit-base) #'magit-hook-custom-get)
+  :options '(git-commit-ensure-comment-gap
+             git-commit-save-message
+             git-commit-setup-changelog-support
+             magit-generate-changelog
+             git-commit-turn-on-auto-fill
+             git-commit-turn-on-orglink
+             git-commit-turn-on-flyspell
+             git-commit-propertize-diff
+             bug-reference-mode))
+
+(defcustom git-commit-post-finish-hook nil
+  "Hook run after the user finished writing a commit message.
+
+\\<with-editor-mode-map>\
+This hook is only run after pressing \\[with-editor-finish] 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
+that takes Git longer than `git-commit-post-finish-hook-timeout'
+seconds, 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'."
+  :group 'git-commit
+  :type 'hook
+  :get (and (featurep 'magit-base) #'magit-hook-custom-get))
+
+(defcustom git-commit-post-finish-hook-timeout 1
+  "Time in seconds to wait for git to create a commit.
+
+The hook `git-commit-post-finish-hook' (which see) is run only
+after git is done creating a commit.  If it takes longer than
+`git-commit-post-finish-hook-timeout' seconds to create the
+commit, then the hook is not run at all."
+  :group 'git-commit
+  :safe 'numberp
+  :type 'number)
+
+(defcustom git-commit-finish-query-functions
+  '(git-commit-check-style-conventions)
+  "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."
+  :options '(git-commit-check-style-conventions)
+  :type 'hook
+  :group 'git-commit)
+
+(defcustom git-commit-style-convention-checks '(non-empty-second-line)
+  "List of checks performed by `git-commit-check-style-conventions'.
+
+Valid members are `non-empty-second-line' and `overlong-summary-line'.
+That function is a member of `git-commit-finish-query-functions'."
+  :options '(non-empty-second-line overlong-summary-line)
+  :type '(list :convert-widget custom-hook-convert-widget)
+  :group 'git-commit)
+
+(defcustom git-commit-summary-max-length 68
+  "Column beyond which characters in the summary lines are highlighted.
+
+The highlighting indicates that the summary is getting too long
+by some standards.  It does in no way imply that going over the
+limit a few characters or in some cases even many characters is
+anything that deserves shaming.  It's just a friendly reminder
+that if you can make the summary shorter, then you might want
+to consider doing so."
+  :group 'git-commit
+  :safe 'numberp
+  :type 'number)
+
+(defcustom git-commit-trailers
+  '("Acked-by"
+    "Modified-by"
+    "Reviewed-by"
+    "Signed-off-by"
+    "Tested-by"
+    "Cc"
+    "Reported-by"
+    "Suggested-by"
+    "Co-authored-by"
+    "Co-developed-by")
+  "A list of Git trailers to be highlighted.
+
+See also manpage git-interpret-trailer(1).  This package does
+not use that Git command, but the initial description still
+serves as a good introduction."
+  :group 'git-commit
+  :safe (lambda (val) (and (listp val) (seq-every-p #'stringp val)))
+  :type '(repeat string))
+
+(defcustom git-commit-use-local-message-ring nil
+  "Whether to use a local message ring instead of the global one.
+
+This can be set globally, in which case every repository gets its
+own commit message ring, or locally for a single repository.  If
+Magit isn't available, then setting this to a non-nil value has
+no effect."
+  :group 'git-commit
+  :safe 'booleanp
+  :type 'boolean)
+
+(defcustom git-commit-cd-to-toplevel nil
+  "Whether to set `default-directory' to the worktree in message buffer.
+
+Editing a commit message is done by visiting a file located in the git
+directory, usually \"COMMIT_EDITMSG\".  As is done when visiting any
+file, the local value of `default-directory' is set to the directory
+that contains the file.
+
+If this option is non-nil, then the local `default-directory' is changed
+to the working tree from which the commit command was invoked.  You may
+wish to do that, to make it easier to open a file that is located in the
+working tree, directly from the commit message buffer.
+
+If the git variable `safe.bareRepository' is set to \"explicit\", then
+you have to enable this, to be able to commit at all.  See issue #5100.
+
+This option only has an effect if the commit was initiated from Magit."
+  :group 'git-commit
+  :type 'boolean)
+
+;;;; Faces
+
+(defgroup git-commit-faces nil
+  "Faces used for highlighting Git commit messages."
+  :prefix "git-commit-"
+  :group 'git-commit
+  :group 'faces)
+
+(defface git-commit-summary
+  '((t :inherit font-lock-type-face))
+  "Face used for the summary in commit messages."
+  :group 'git-commit-faces)
+
+(defface git-commit-overlong-summary
+  '((t :inherit font-lock-warning-face))
+  "Face used for the tail of overlong commit message summaries."
+  :group 'git-commit-faces)
+
+(defface git-commit-nonempty-second-line
+  '((t :inherit font-lock-warning-face))
+  "Face used for non-whitespace on the second line of commit messages."
+  :group 'git-commit-faces)
+
+(defface git-commit-keyword
+  '((t :inherit font-lock-string-face))
+  "Face used for keywords in commit messages.
+In this context a \"keyword\" is text surrounded by brackets."
+  :group 'git-commit-faces)
+
+(defface git-commit-trailer-token
+  '((t :inherit font-lock-keyword-face))
+  "Face used for Git trailer tokens in commit messages."
+  :group 'git-commit-faces)
+
+(defface git-commit-trailer-value
+  '((t :inherit font-lock-string-face))
+  "Face used for Git trailer values in commit messages."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-branch-local
+  (if (featurep 'magit)
+      '((t :inherit magit-branch-local))
+    '((t :inherit font-lock-variable-name-face)))
+  "Face used for names of local branches in commit message comments."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-branch-remote
+  (if (featurep 'magit)
+      '((t :inherit magit-branch-remote))
+    '((t :inherit font-lock-variable-name-face)))
+  "Face used for names of remote branches in commit message comments.
+This is only used if Magit is available."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-detached
+  '((t :inherit git-commit-comment-branch-local))
+  "Face used for detached `HEAD' in commit message comments."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-heading
+  '((t :inherit git-commit-trailer-token))
+  "Face used for headings in commit message comments."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-file
+  '((t :inherit git-commit-trailer-value))
+  "Face used for file names in commit message comments."
+  :group 'git-commit-faces)
+
+(defface git-commit-comment-action
+  '((t :inherit bold))
+  "Face used for actions in commit message comments."
+  :group 'git-commit-faces)
+
+;;; Keymap
+
+(defvar-keymap git-commit-redundant-bindings
+  :doc "Bindings made redundant by `git-commit-insert-trailer'.
+This keymap is used as the parent of `git-commit-mode-map',
+to avoid upsetting muscle-memory.  If you would rather avoid
+the redundant bindings, then set this to nil, before loading
+`git-commit'."
+  "C-c C-a" #'git-commit-ack
+  "C-c M-i" #'git-commit-suggested
+  "C-c C-m" #'git-commit-modified
+  "C-c C-o" #'git-commit-cc
+  "C-c C-p" #'git-commit-reported
+  "C-c C-r" #'git-commit-review
+  "C-c C-s" #'git-commit-signoff
+  "C-c C-t" #'git-commit-test)
+
+(defvar-keymap git-commit-mode-map
+  :doc "Keymap used by `git-commit-mode'."
+  :parent git-commit-redundant-bindings
+  "M-p"     #'git-commit-prev-message
+  "M-n"     #'git-commit-next-message
+  "C-c M-p" #'git-commit-search-message-backward
+  "C-c M-n" #'git-commit-search-message-forward
+  "C-c C-i" #'git-commit-insert-trailer
+  "C-c M-s" #'git-commit-save-message)
+
+;;; Menu
+
+(require 'easymenu)
+(easy-menu-define git-commit-mode-menu git-commit-mode-map
+  "Git Commit Mode Menu"
+  '("Commit"
+    ["Previous" git-commit-prev-message t]
+    ["Next" git-commit-next-message t]
+    "-"
+    ["Ack" git-commit-ack t
+     :help "Insert an 'Acked-by' trailer"]
+    ["Modified-by" git-commit-modified t
+     :help "Insert a 'Modified-by' trailer"]
+    ["Reviewed-by" git-commit-review t
+     :help "Insert a 'Reviewed-by' trailer"]
+    ["Sign-Off" git-commit-signoff t
+     :help "Insert a 'Signed-off-by' trailer"]
+    ["Tested-by" git-commit-test t
+     :help "Insert a 'Tested-by' trailer"]
+    "-"
+    ["CC" git-commit-cc t
+     :help "Insert a 'Cc' trailer"]
+    ["Reported" git-commit-reported t
+     :help "Insert a 'Reported-by' trailer"]
+    ["Suggested" git-commit-suggested t
+     :help "Insert a 'Suggested-by' trailer"]
+    ["Co-authored-by" git-commit-co-authored t
+     :help "Insert a 'Co-authored-by' trailer"]
+    ["Co-developed-by" git-commit-co-developed t
+     :help "Insert a 'Co-developed-by' trailer"]
+    "-"
+    ["Save" git-commit-save-message t]
+    ["Cancel" with-editor-cancel t]
+    ["Commit" with-editor-finish t]))
+
+;;; Hooks
+
+(defconst git-commit-filename-regexp "/\\(\
+\\(\\(COMMIT\\|NOTES\\|PULLREQ\\|MERGEREQ\\|TAG\\)_EDIT\\|MERGE_\\|\\)MSG\
+\\|\\(BRANCH\\|EDIT\\)_DESCRIPTION\\)\\'")
+
+(with-eval-after-load 'recentf
+  (add-to-list 'recentf-exclude git-commit-filename-regexp))
+
+(add-to-list 'with-editor-file-name-history-exclude git-commit-filename-regexp)
+
+(defun git-commit-setup-font-lock-in-buffer ()
+  (when (and buffer-file-name
+             (string-match-p git-commit-filename-regexp buffer-file-name))
+    (git-commit-setup-font-lock)))
+
+(defun git-commit-setup-check-buffer ()
+  (when (and buffer-file-name
+             (string-match-p git-commit-filename-regexp buffer-file-name))
+    (git-commit-setup)))
+
+(defvar git-commit-mode)
+
+(defun git-commit-file-not-found ()
+  ;; cygwin git will pass a cygwin path (/cygdrive/c/foo/.git/...),
+  ;; try to handle this in window-nt Emacs.
+  (when-let
+      ((file (and (or (string-match-p git-commit-filename-regexp
+                                      buffer-file-name)
+                      (and (boundp 'git-rebase-filename-regexp)
+                           (string-match-p git-rebase-filename-regexp
+                                           buffer-file-name)))
+                  (not (file-accessible-directory-p
+                        (file-name-directory buffer-file-name)))
+                  (if (require 'magit-git nil t)
+                      ;; Emacs prepends a "c:".
+                      (magit-expand-git-file-name
+                       (substring buffer-file-name 2))
+                    ;; Fallback if we can't load `magit-git'.
+                    (and (string-match
+                          "\\`[a-z]:/\\(cygdrive/\\)?\\([a-z]\\)/\\(.*\\)"
+                          buffer-file-name)
+                         (concat (match-string 2 buffer-file-name) ":/"
+                                 (match-string 3 buffer-file-name)))))))
+    (when (file-accessible-directory-p (file-name-directory file))
+      (let ((inhibit-read-only t))
+        (insert-file-contents file t)
+        t))))
+
+(when (eq system-type 'windows-nt)
+  (add-hook 'find-file-not-found-functions #'git-commit-file-not-found))
+
+(defconst git-commit-default-usage-message "\
+Type \\[with-editor-finish] to finish, \
+\\[with-editor-cancel] to cancel, and \
+\\[git-commit-prev-message] and \\[git-commit-next-message] \
+to recover older messages")
+
+(defvar git-commit-usage-message git-commit-default-usage-message
+  "Message displayed when editing a commit message.
+When this is nil, then `with-editor-usage-message' is displayed
+instead.  One of these messages has to be displayed; otherwise
+the user gets to see the message displayed by `server-execute'.
+That message is misleading and because we cannot prevent it from
+being displayed, we have to immediately show another message to
+prevent the user from seeing it.")
+
+(defvar git-commit-header-line-format nil
+  "If non-nil, header line format used by `git-commit-mode'.
+Used as the local value of `header-line-format', in buffer using
+`git-commit-mode'.  If it is a string, then it is passed through
+`substitute-command-keys' first.  A useful setting may be:
+  (setq git-commit-header-line-format git-commit-default-usage-message)
+  (setq git-commit-usage-message nil) ; show a shorter message")
+
+(defun git-commit-setup ()
+  (let ((gitdir default-directory)
+        (cd nil))
+    (when (and (fboundp 'magit-toplevel)
+               (boundp 'magit--separated-gitdirs))
+      ;; `magit-toplevel' is autoloaded and defined in magit-git.el.  That
+      ;; library declares this function without loading magit-process.el,
+      ;; which defines it.
+      (require 'magit-process nil t)
+      (when git-commit-cd-to-toplevel
+        (setq cd (or (car (rassoc default-directory magit--separated-gitdirs))
+                     (magit-toplevel)))))
+    ;; Pretend that git-commit-mode is a major-mode,
+    ;; so that directory-local settings can be used.
+    (let ((default-directory
+           (or (and (not (file-exists-p
+                          (expand-file-name ".dir-locals.el" gitdir)))
+                    ;; When $GIT_DIR/.dir-locals.el doesn't exist,
+                    ;; fallback to $GIT_WORK_TREE/.dir-locals.el,
+                    ;; because the maintainer can use the latter
+                    ;; to enforce conventions, while s/he has no
+                    ;; control over the former.
+                    (fboundp 'magit-toplevel)
+                    (or cd (magit-toplevel)))
+               gitdir)))
+      (let ((buffer-file-name nil)         ; trick hack-dir-local-variables
+            (major-mode 'git-commit-mode)) ; trick dir-locals-collect-variables
+        (hack-dir-local-variables)
+        (hack-local-variables-apply)))
+    (when cd
+      (setq default-directory cd)))
+  (when git-commit-major-mode
+    (let ((auto-mode-alist
+           ;; `set-auto-mode--apply-alist' removes the remote part from
+           ;; the file-name before looking it up in `auto-mode-alist'.
+           ;; For our temporary entry to be found, we have to modify the
+           ;; file-name the same way.
+           (list (cons (concat "\\`"
+                               (regexp-quote
+                                (or (file-remote-p buffer-file-name 'localname)
+                                    buffer-file-name))
+                               "\\'")
+                       git-commit-major-mode)))
+          ;; The major-mode hook might want to consult these minor
+          ;; modes, while the minor-mode hooks might want to consider
+          ;; the major mode.
+          (git-commit-mode t)
+          (with-editor-mode t))
+      (normal-mode t)))
+  ;; Below we instead explicitly show a message.
+  (setq with-editor-show-usage nil)
+  (unless with-editor-mode
+    ;; Maybe already enabled when using `shell-command' or an Emacs shell.
+    (with-editor-mode 1))
+  (add-hook 'with-editor-finish-query-functions
+            #'git-commit-finish-query-functions nil t)
+  (add-hook 'with-editor-pre-finish-hook
+            #'git-commit-save-message nil t)
+  (add-hook 'with-editor-pre-cancel-hook
+            #'git-commit-save-message nil t)
+  (when (fboundp 'magit-commit--reset-command)
+    (add-hook 'with-editor-post-finish-hook #'magit-commit--reset-command)
+    (add-hook 'with-editor-post-cancel-hook #'magit-commit--reset-command))
+  (when (and (fboundp 'magit-rev-parse)
+             (not (memq last-command
+                        '(magit-sequencer-continue
+                          magit-sequencer-skip
+                          magit-am-continue
+                          magit-am-skip
+                          magit-rebase-continue
+                          magit-rebase-skip))))
+    (add-hook 'with-editor-post-finish-hook
+              (apply-partially #'git-commit-run-post-finish-hook
+                               (magit-rev-parse "HEAD"))
+              nil t)
+    (when (fboundp 'magit-wip-maybe-add-commit-hook)
+      (magit-wip-maybe-add-commit-hook)))
+  (setq with-editor-cancel-message
+        #'git-commit-cancel-message)
+  (git-commit-setup-font-lock)
+  (git-commit-prepare-message-ring)
+  (when (boundp 'save-place)
+    (setq save-place nil))
+  (let ((git-commit-mode-hook nil))
+    (git-commit-mode 1))
+  (with-demoted-errors "Error running git-commit-setup-hook: %S"
+    (run-hooks 'git-commit-setup-hook))
+  (set-buffer-modified-p nil)
+  (when-let ((format git-commit-header-line-format))
+    (setq header-line-format
+          (if (stringp format) (substitute-command-keys format) format)))
+  (when git-commit-usage-message
+    (setq with-editor-usage-message git-commit-usage-message))
+  (with-editor-usage-message))
+
+(defun git-commit-run-post-finish-hook (previous)
+  (when (and git-commit-post-finish-hook
+             (require 'magit nil t)
+             (fboundp 'magit-rev-parse))
+    (cl-block nil
+      (let ((break (time-add (current-time)
+                             (seconds-to-time
+                              git-commit-post-finish-hook-timeout))))
+        (while (equal (magit-rev-parse "HEAD") previous)
+          (if (time-less-p (current-time) break)
+              (sit-for 0.01)
+            (message "No commit created after 1 second.  Not running %s."
+                     'git-commit-post-finish-hook)
+            (cl-return))))
+      (run-hooks 'git-commit-post-finish-hook))))
+
+(define-minor-mode git-commit-mode
+  "Auxiliary minor mode used when editing Git commit messages.
+This mode is only responsible for setting up some key bindings.
+Don't use it directly; instead enable `global-git-commit-mode'.
+Variable `git-commit-major-mode' controls which major-mode is
+used."
+  :lighter "")
+
+(put 'git-commit-mode 'permanent-local t)
+
+(defun git-commit-ensure-comment-gap ()
+  "Separate initial empty line from initial comment.
+If the buffer begins with an empty line followed by a comment, insert
+an additional newline inbetween, so that once the users start typing,
+the input isn't tacked to the comment."
+  (save-excursion
+    (goto-char (point-min))
+    (when (looking-at (format "\\`\n%s" comment-start))
+      (open-line 1))))
+
+(defun git-commit-setup-changelog-support ()
+  "Treat ChangeLog entries as unindented paragraphs."
+  (when (fboundp 'log-indent-fill-entry) ; New in Emacs 27.
+    (setq-local fill-paragraph-function #'log-indent-fill-entry))
+  (setq-local fill-indent-according-to-mode t)
+  (setq-local paragraph-start (concat paragraph-start "\\|\\*\\|(")))
+
+(defun git-commit-turn-on-auto-fill ()
+  "Unconditionally turn on Auto Fill mode.
+Ensure auto filling happens everywhere, except in the summary line."
+  (turn-on-auto-fill)
+  (setq-local comment-auto-fill-only-comments nil)
+  (when git-commit-need-summary-line
+    (setq-local auto-fill-function #'git-commit-auto-fill-except-summary)))
+
+(defun git-commit-auto-fill-except-summary ()
+  (unless (eq (line-beginning-position) 1)
+    (do-auto-fill)))
+
+(defun git-commit-turn-on-orglink ()
+  "Turn on Orglink mode if it is available.
+If `git-commit-major-mode' is `org-mode', then silently forgo
+turning on `orglink-mode'."
+  (when (and (not (derived-mode-p 'org-mode))
+             (boundp 'orglink-match-anywhere)
+             (fboundp 'orglink-mode))
+    (setq-local orglink-match-anywhere t)
+    (orglink-mode 1)))
+
+(defun git-commit-turn-on-flyspell ()
+  "Unconditionally turn on Flyspell mode.
+Also check text that is already in the buffer, while avoiding to check
+most text that Git will strip from the final message, such as the last
+comment and anything below the cut line (\"--- >8 ---\")."
+  (require 'flyspell)
+  (turn-on-flyspell)
+  (setq flyspell-generic-check-word-predicate
+        #'git-commit-flyspell-verify)
+  (let ((end nil)
+        ;; The "cut line" is defined in "git/wt-status.c".  It appears
+        ;; in the commit message when `commit.verbose' is set to true.
+        (cut-line-regex (format "^%s -\\{8,\\} >8 -\\{8,\\}$" comment-start))
+        (comment-start-regex (format "^\\(%s\\|$\\)" comment-start)))
+    (save-excursion
+      (goto-char (or (re-search-forward cut-line-regex nil t)
+                     (point-max)))
+      (while (and (not (bobp)) (looking-at comment-start-regex))
+        (forward-line -1))
+      (unless (looking-at comment-start-regex)
+        (forward-line))
+      (setq end (point)))
+    (flyspell-region (point-min) end)))
+
+(defun git-commit-flyspell-verify ()
+  (not (= (char-after (line-beginning-position))
+          (aref comment-start 0))))
+
+(defun git-commit-finish-query-functions (force)
+  (run-hook-with-args-until-failure
+   'git-commit-finish-query-functions force))
+
+(defun git-commit-check-style-conventions (force)
+  "Check for violations of certain basic style conventions.
+
+For each violation ask the user if she wants to proceed anyway.
+Option `git-commit-style-convention-checks' controls which
+conventions are checked."
+  (or force
+      (save-excursion
+        (goto-char (point-min))
+        (re-search-forward (git-commit-summary-regexp) nil t)
+        (if (equal (match-string 1) "")
+            t ; Just try; we don't know whether --allow-empty-message was used.
+          (and (or (not (memq 'overlong-summary-line
+                              git-commit-style-convention-checks))
+                   (equal (match-string 2) "")
+                   (y-or-n-p "Summary line is too long.  Commit anyway? "))
+               (or (not (memq 'non-empty-second-line
+                              git-commit-style-convention-checks))
+                   (not (match-string 3))
+                   (y-or-n-p "Second line is not empty.  Commit anyway? ")))))))
+
+(defun git-commit-cancel-message ()
+  (message
+   (concat "Commit canceled"
+           (and (memq 'git-commit-save-message with-editor-pre-cancel-hook)
+                ".  Message saved to `log-edit-comment-ring'"))))
+
+;;; History
+
+(defun git-commit-prev-message (arg)
+  "Cycle backward through message history, after saving current message.
+With a numeric prefix ARG, go back ARG comments."
+  (interactive "*p")
+  (let ((len (ring-length log-edit-comment-ring)))
+    (if (<= len 0)
+        (progn (message "Empty comment ring") (ding))
+      ;; Unlike `log-edit-previous-comment' we save the current
+      ;; non-empty and newly written comment, because otherwise
+      ;; it would be irreversibly lost.
+      (when-let ((message (git-commit-buffer-message)))
+        (unless (ring-member log-edit-comment-ring message)
+          (ring-insert log-edit-comment-ring message)
+          (cl-incf arg)
+          (setq len (ring-length log-edit-comment-ring))))
+      ;; Delete the message but not the instructions at the end.
+      (save-restriction
+        (goto-char (point-min))
+        (narrow-to-region
+         (point)
+         (if (re-search-forward (concat "^" comment-start) nil t)
+             (max 1 (- (point) 2))
+           (point-max)))
+        (delete-region (point-min) (point)))
+      (setq log-edit-comment-ring-index (log-edit-new-comment-index arg len))
+      (message "Comment %d" (1+ log-edit-comment-ring-index))
+      (insert (ring-ref log-edit-comment-ring log-edit-comment-ring-index)))))
+
+(defun git-commit-next-message (arg)
+  "Cycle forward through message history, after saving current message.
+With a numeric prefix ARG, go forward ARG comments."
+  (interactive "*p")
+  (git-commit-prev-message (- arg)))
+
+(defun git-commit-search-message-backward (string)
+  "Search backward through message history for a match for STRING.
+Save current message first."
+  (interactive
+   (list (read-string (format-prompt "Comment substring"
+                                     log-edit-last-comment-match)
+                      nil nil log-edit-last-comment-match)))
+  (cl-letf (((symbol-function #'log-edit-previous-comment)
+             (symbol-function #'git-commit-prev-message)))
+    (log-edit-comment-search-backward string)))
+
+(defun git-commit-search-message-forward (string)
+  "Search forward through message history for a match for STRING.
+Save current message first."
+  (interactive
+   (list (read-string (format-prompt "Comment substring"
+                                     log-edit-last-comment-match)
+                      nil nil log-edit-last-comment-match)))
+  (cl-letf (((symbol-function #'log-edit-previous-comment)
+             (symbol-function #'git-commit-prev-message)))
+    (log-edit-comment-search-forward string)))
+
+(defun git-commit-save-message ()
+  "Save current message to `log-edit-comment-ring'."
+  (interactive)
+  (if-let ((message (git-commit-buffer-message)))
+      (progn
+        (when-let ((index (ring-member log-edit-comment-ring message)))
+          (ring-remove log-edit-comment-ring index))
+        (ring-insert log-edit-comment-ring message)
+        (when (and git-commit-use-local-message-ring
+                   (fboundp 'magit-repository-local-set))
+          (magit-repository-local-set 'log-edit-comment-ring
+                                      log-edit-comment-ring))
+        (message "Message saved"))
+    (message "Only whitespace and/or comments; message not saved")))
+
+(defun git-commit-prepare-message-ring ()
+  (make-local-variable 'log-edit-comment-ring-index)
+  (when (and git-commit-use-local-message-ring
+             (fboundp 'magit-repository-local-get))
+    (setq-local log-edit-comment-ring
+                (magit-repository-local-get
+                 'log-edit-comment-ring
+                 (make-ring log-edit-maximum-comment-ring-size)))))
+
+(defun git-commit-buffer-message ()
+  (let ((flush (concat "^" comment-start))
+        (str (buffer-substring-no-properties (point-min) (point-max))))
+    (with-temp-buffer
+      (insert str)
+      (goto-char (point-min))
+      (when (re-search-forward (concat flush " -+ >8 -+$") nil t)
+        (delete-region (line-beginning-position) (point-max)))
+      (goto-char (point-min))
+      (flush-lines flush)
+      (goto-char (point-max))
+      (unless (eq (char-before) ?\n)
+        (insert ?\n))
+      (setq str (buffer-string)))
+    (and (not (string-match "\\`[ \t\n\r]*\\'" str))
+         (progn
+           (when (string-match "\\`\n\\{2,\\}" str)
+             (setq str (replace-match "\n" t t str)))
+           (when (string-match "\n\\{2,\\}\\'" str)
+             (setq str (replace-match "\n" t t str)))
+           str))))
+
+;;; Utilities
+
+(defsubst git-commit-executable ()
+  (if (fboundp 'magit-git-executable)
+      (magit-git-executable)
+    "git"))
+
+;;; Trailers
+
+(transient-define-prefix git-commit-insert-trailer ()
+  "Insert a commit message trailer.
+
+See also manpage git-interpret-trailer(1).  This command does
+not use that Git command, but the initial description still
+serves as a good introduction."
+  [[:description (lambda ()
+                   (cond (prefix-arg
+                          "Insert ... by someone ")
+                         ("Insert ... by yourself")))
+    ("a"   "Ack"          git-commit-ack)
+    ("m"   "Modified"     git-commit-modified)
+    ("r"   "Reviewed"     git-commit-review)
+    ("s"   "Signed-off"   git-commit-signoff)
+    ("t"   "Tested"       git-commit-test)]
+   ["Insert ... by someone"
+    ("C-c" "Cc"           git-commit-cc)
+    ("C-r" "Reported"     git-commit-reported)
+    ("C-i" "Suggested"    git-commit-suggested)
+    ("C-a" "Co-authored"  git-commit-co-authored)
+    ("C-d" "Co-developed" git-commit-co-developed)]])
+
+(defun git-commit-ack (name mail)
+  "Insert a trailer acknowledging that you have looked at the commit."
+  (interactive (git-commit-get-ident "Acked-by"))
+  (git-commit--insert-ident-trailer "Acked-by" name mail))
+
+(defun git-commit-modified (name mail)
+  "Insert a trailer to signal that you have modified the commit."
+  (interactive (git-commit-get-ident "Modified-by"))
+  (git-commit--insert-ident-trailer "Modified-by" name mail))
+
+(defun git-commit-review (name mail)
+  "Insert a trailer acknowledging that you have reviewed the commit.
+With a prefix argument, prompt for another person who performed a
+review."
+  (interactive (git-commit-get-ident "Reviewed-by"))
+  (git-commit--insert-ident-trailer "Reviewed-by" name mail))
+
+(defun git-commit-signoff (name mail)
+  "Insert a trailer to sign off the commit.
+With a prefix argument, prompt for another person who signed off."
+  (interactive (git-commit-get-ident "Signed-off-by"))
+  (git-commit--insert-ident-trailer "Signed-off-by" name mail))
+
+(defun git-commit-test (name mail)
+  "Insert a trailer acknowledging that you have tested the commit.
+With a prefix argument, prompt for another person who tested."
+  (interactive (git-commit-get-ident "Tested-by"))
+  (git-commit--insert-ident-trailer "Tested-by" name mail))
+
+(defun git-commit-cc (name mail)
+  "Insert a trailer mentioning someone who might be interested."
+  (interactive (git-commit-read-ident "Cc"))
+  (git-commit--insert-ident-trailer "Cc" name mail))
+
+(defun git-commit-reported (name mail)
+  "Insert a trailer mentioning the person who reported the issue."
+  (interactive (git-commit-read-ident "Reported-by"))
+  (git-commit--insert-ident-trailer "Reported-by" name mail))
+
+(defun git-commit-suggested (name mail)
+  "Insert a trailer mentioning the person who suggested the change."
+  (interactive (git-commit-read-ident "Suggested-by"))
+  (git-commit--insert-ident-trailer "Suggested-by" name mail))
+
+(defun git-commit-co-authored (name mail)
+  "Insert a trailer mentioning the person who co-authored the commit."
+  (interactive (git-commit-read-ident "Co-authored-by"))
+  (git-commit--insert-ident-trailer "Co-authored-by" name mail))
+
+(defun git-commit-co-developed (name mail)
+  "Insert a trailer mentioning the person who co-developed the commit."
+  (interactive (git-commit-read-ident "Co-developed-by"))
+  (git-commit--insert-ident-trailer "Co-developed-by" name mail))
+
+(defun git-commit-get-ident (&optional prompt)
+  "Return name and email of the user or read another name and email.
+If PROMPT and `current-prefix-arg' are both non-nil, read name
+and email using `git-commit-read-ident' (which see), otherwise
+return name and email of the current user (you)."
+  (if (and prompt current-prefix-arg)
+      (git-commit-read-ident prompt)
+    (list (or (getenv "GIT_AUTHOR_NAME")
+              (getenv "GIT_COMMITTER_NAME")
+              (with-demoted-errors "Error running 'git config user.name': %S"
+                (car (process-lines
+                      (git-commit-executable) "config" "user.name")))
+              user-full-name
+              (read-string "Name: "))
+          (or (getenv "GIT_AUTHOR_EMAIL")
+              (getenv "GIT_COMMITTER_EMAIL")
+              (getenv "EMAIL")
+              (with-demoted-errors "Error running 'git config user.email': %S"
+                (car (process-lines
+                      (git-commit-executable) "config" "user.email")))
+              (read-string "Email: ")))))
+
+(defalias 'git-commit-self-ident #'git-commit-get-ident)
+
+(defvar git-commit-read-ident-history nil)
+
+(defun git-commit-read-ident (prompt)
+  "Read a name and email, prompting with PROMPT, and return them.
+If Magit is available, read them using a single prompt, offering
+past commit authors as completion candidates.  The input must
+have the form \"NAME <EMAIL>\"."
+  (if (require 'magit-git nil t)
+      (let ((str (magit-completing-read
+                  prompt
+                  (sort (delete-dups
+                         (magit-git-lines "log" "-n9999" "--format=%aN <%ae>"))
+                        #'string<)
+                  nil nil nil 'git-commit-read-ident-history)))
+        (save-match-data
+          (if (string-match "\\`\\([^<]+\\) *<\\([^>]+\\)>\\'" str)
+              (list (save-match-data (string-trim (match-string 1 str)))
+                    (string-trim (match-string 2 str)))
+            (user-error "Invalid input"))))
+    (list (read-string "Name: ")
+          (read-string "Email: "))))
+
+(defun git-commit--insert-ident-trailer (trailer name email)
+  (git-commit--insert-trailer trailer (format "%s <%s>" name email)))
+
+(defun git-commit--insert-trailer (trailer value)
+  (save-excursion
+    (let ((string (format "%s: %s" trailer value))
+          (leading-comment-end nil))
+      ;; Make sure we skip forward past any leading comments.
+      (goto-char (point-min))
+      (while (looking-at comment-start)
+        (forward-line))
+      (setq leading-comment-end (point))
+      (goto-char (point-max))
+      (cond
+       ;; Look backwards for existing trailers.
+       ((re-search-backward (git-commit--trailer-regexp) nil t)
+        (end-of-line)
+        (insert ?\n string)
+        (unless (= (char-after) ?\n)
+          (insert ?\n)))
+       ;; Or place the new trailer right before the first non-leading
+       ;; comments.
+       (t
+        (while (re-search-backward (concat "^" comment-start)
+                                   leading-comment-end t))
+        (unless (looking-back "\n\n" nil)
+          (insert ?\n))
+        (insert string ?\n))))
+    (unless (or (eobp) (= (char-after) ?\n))
+      (insert ?\n))))
+
+;;; Font-Lock
+
+(defvar-local git-commit-need-summary-line t
+  "Whether the text should have a heading that is separated from the body.
+
+For commit messages that is a convention that should not
+be violated.  For notes it is up to the user.  If you do
+not want to insist on an empty second line here, then use
+something like:
+
+  (add-hook \\='git-commit-setup-hook
+            (lambda ()
+              (when (equal (file-name-nondirectory (buffer-file-name))
+                           \"NOTES_EDITMSG\")
+                (setq git-commit-need-summary-line nil))))")
+
+(defun git-commit--trailer-regexp ()
+  (format
+   "^\\(?:\\(%s:\\)\\( .*\\)\\|\\([-a-zA-Z]+\\): \\([^<\n]+? <[^>\n]+>\\)\\)"
+   (regexp-opt git-commit-trailers)))
+
+(defun git-commit-summary-regexp ()
+  (if git-commit-need-summary-line
+      (concat
+       ;; Leading empty lines and comments
+       (format "\\`\\(?:^\\(?:\\s-*\\|%s.*\\)\n\\)*" comment-start)
+       ;; Summary line
+       (format "\\(.\\{0,%d\\}\\)\\(.*\\)" git-commit-summary-max-length)
+       ;; Non-empty non-comment second line
+       (format "\\(?:\n%s\\|\n\\(.+\\)\\)?" comment-start))
+    "\\(EASTER\\) \\(EGG\\)"))
+
+(defun git-commit-extend-region-summary-line ()
+  "Identify the multiline summary-regexp construct.
+Added to `font-lock-extend-region-functions'."
+  (save-excursion
+    (save-match-data
+      (goto-char (point-min))
+      (when (looking-at (git-commit-summary-regexp))
+        (let ((summary-beg (match-beginning 0))
+              (summary-end (match-end 0)))
+          (when (or (< summary-beg font-lock-beg summary-end)
+                    (< summary-beg font-lock-end summary-end))
+            (setq font-lock-beg (min font-lock-beg summary-beg))
+            (setq font-lock-end (max font-lock-end summary-end))))))))
+
+(defvar-local git-commit--branch-name-regexp nil)
+
+(defconst git-commit-comment-headings
+  '("Changes to be committed:"
+    "Untracked files:"
+    "Changed but not updated:"
+    "Changes not staged for commit:"
+    "Unmerged paths:"
+    "Author:"
+    "Date:")
+  "Also fontified outside of comments in `git-commit-font-lock-keywords-2'.")
+
+(defconst git-commit-font-lock-keywords-1
+  '(;; Trailers
+    (eval . `(,(git-commit--trailer-regexp)
+              (1 'git-commit-trailer-token)
+              (2 'git-commit-trailer-value)
+              (3 'git-commit-trailer-token)
+              (4 'git-commit-trailer-value)))
+    ;; Summary
+    (eval . `(,(git-commit-summary-regexp)
+              (1 'git-commit-summary)))
+    ;; - Keyword [aka "text in brackets"] (overrides summary)
+    ("\\[[^][]+?\\]"
+     (0 'git-commit-keyword t))
+    ;; - Non-empty second line (overrides summary and note)
+    (eval . `(,(git-commit-summary-regexp)
+              (2 'git-commit-overlong-summary t t)
+              (3 'git-commit-nonempty-second-line t t)))))
+
+(defconst git-commit-font-lock-keywords-2
+  `(,@git-commit-font-lock-keywords-1
+    ;; Comments
+    (eval . `(,(format "^%s.*" comment-start)
+              (0 'font-lock-comment-face append)))
+    (eval . `(,(format "^%s On branch \\(.*\\)" comment-start)
+              (1 'git-commit-comment-branch-local t)))
+    (eval . `(,(format "^%s \\(HEAD\\) detached at" comment-start)
+              (1 'git-commit-comment-detached t)))
+    (eval . `(,(format "^%s %s" comment-start
+                       (regexp-opt git-commit-comment-headings t))
+              (1 'git-commit-comment-heading t)))
+    (eval . `(,(format "^%s\t\\(?:\\([^:\n]+\\):\\s-+\\)?\\(.*\\)" comment-start)
+              (1 'git-commit-comment-action t t)
+              (2 'git-commit-comment-file t)))
+    ;; "commit HASH"
+    (eval . '("^commit [[:alnum:]]+$"
+              (0 'git-commit-trailer-value)))
+    ;; `git-commit-comment-headings' (but not in commented lines)
+    (eval . `(,(format "\\(?:^%s[[:blank:]]+.+$\\)"
+                       (regexp-opt git-commit-comment-headings))
+              (0 'git-commit-trailer-value)))))
+
+(defconst git-commit-font-lock-keywords-3
+  `(,@git-commit-font-lock-keywords-2
+    ;; More comments
+    (eval
+     ;; Your branch is ahead of 'master' by 3 commits.
+     ;; Your branch is behind 'master' by 2 commits, and can be fast-forwarded.
+     . `(,(format
+           "^%s Your branch is \\(?:ahead\\|behind\\) of '%s' by \\([0-9]*\\)"
+           comment-start git-commit--branch-name-regexp)
+         (1 'git-commit-comment-branch-local t)
+         (2 'git-commit-comment-branch-remote t)
+         (3 'bold t)))
+    (eval
+     ;; Your branch is up to date with 'master'.
+     ;; Your branch and 'master' have diverged,
+     . `(,(format
+           "^%s Your branch \\(?:is up[- ]to[- ]date with\\|and\\) '%s'"
+           comment-start git-commit--branch-name-regexp)
+         (1 'git-commit-comment-branch-local t)
+         (2 'git-commit-comment-branch-remote t)))
+    (eval
+     ;; and have 1 and 2 different commits each, respectively.
+     . `(,(format
+           "^%s and have \\([0-9]*\\) and \\([0-9]*\\) commits each"
+           comment-start)
+         (1 'bold t)
+         (2 'bold t)))))
+
+(defvar git-commit-font-lock-keywords git-commit-font-lock-keywords-3
+  "Font-Lock keywords for Git-Commit mode.")
+
+(defun git-commit-setup-font-lock ()
+  (with-demoted-errors "Error running git-commit-setup-font-lock: %S"
+    (let ((table (make-syntax-table (syntax-table))))
+      (when comment-start
+        (modify-syntax-entry (string-to-char comment-start) "." table))
+      (modify-syntax-entry ?#  "." table)
+      (modify-syntax-entry ?\" "." table)
+      (modify-syntax-entry ?\' "." table)
+      (modify-syntax-entry ?`  "." table)
+      (set-syntax-table table))
+    (setq-local comment-start
+                (or (with-temp-buffer
+                      (and (zerop
+                            (call-process
+                             (git-commit-executable) nil (list t nil) nil
+                             "config" "core.commentchar"))
+                           (not (bobp))
+                           (progn
+                             (goto-char (point-min))
+                             (buffer-substring (point) (line-end-position)))))
+                    "#"))
+    (setq-local comment-start-skip (format "^%s+[\s\t]*" comment-start))
+    (setq-local comment-end "")
+    (setq-local comment-end-skip "\n")
+    (setq-local comment-use-syntax nil)
+    (when (and (derived-mode-p 'markdown-mode)
+               (fboundp 'markdown-fill-paragraph))
+      (setq-local fill-paragraph-function
+                  (lambda (&optional justify)
+                    (and (not (= (char-after (line-beginning-position))
+                                 (aref comment-start 0)))
+                         (markdown-fill-paragraph justify)))))
+    (setq-local git-commit--branch-name-regexp
+                (if (and (featurep 'magit-git)
+                         ;; When using cygwin git, we may end up in a
+                         ;; non-existing directory, which would cause
+                         ;; any git calls to signal an error.
+                         (file-accessible-directory-p default-directory))
+                    (progn
+                      ;; Make sure the below functions are available.
+                      (require 'magit)
+                      ;; Font-Lock wants every submatch to succeed, so
+                      ;; also match the empty string.  Avoid listing
+                      ;; remote branches and using `regexp-quote',
+                      ;; because in repositories have thousands of
+                      ;; branches that would be very slow.  See #4353.
+                      (format "\\(\\(?:%s\\)\\|\\)\\([^']+\\)"
+                              (mapconcat #'identity
+                                         (magit-list-local-branch-names)
+                                         "\\|")))
+                  "\\([^']*\\)"))
+    (setq-local font-lock-multiline t)
+    (add-hook 'font-lock-extend-region-functions
+              #'git-commit-extend-region-summary-line
+              t t)
+    (font-lock-add-keywords nil git-commit-font-lock-keywords)))
+
+(defun git-commit-propertize-diff ()
+  (require 'diff-mode)
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "^diff --git" nil t)
+      (beginning-of-line)
+      (let ((buffer (current-buffer)))
+        (insert
+         (with-temp-buffer
+           (insert
+            (with-current-buffer buffer
+              (prog1 (buffer-substring-no-properties (point) (point-max))
+                (delete-region (point) (point-max)))))
+           (let ((diff-default-read-only nil))
+             (diff-mode))
+           (let (font-lock-verbose font-lock-support-mode)
+             (if (fboundp 'font-lock-ensure)
+                 (font-lock-ensure)
+               (with-no-warnings
+                 (font-lock-fontify-buffer))))
+           (let ((pos (point-min)))
+             (while-let ((next (next-single-property-change pos 'face)))
+               (put-text-property pos next 'font-lock-face
+                                  (get-text-property pos 'face))
+               (setq pos next))
+             (put-text-property pos (point-max) 'font-lock-face
+                                (get-text-property pos 'face)))
+           (buffer-string)))))))
+
+;;; Elisp Text Mode
+
+(define-derived-mode git-commit-elisp-text-mode text-mode "ElText"
+  "Major mode for editing commit messages of elisp projects.
+This is intended for use as `git-commit-major-mode' for projects
+that expect `symbols' to look like this.  I.e., like they look in
+Elisp doc-strings, including this one.  Unlike in doc-strings,
+\"strings\" also look different than the other text."
+  (setq font-lock-defaults '(git-commit-elisp-text-mode-keywords)))
+
+(defvar git-commit-elisp-text-mode-keywords
+  `((,(concat "[`‘]\\(" lisp-mode-symbol-regexp "\\)['’]")
+     (1 font-lock-constant-face prepend))
+    ("\"[^\"]*\"" (0 font-lock-string-face prepend))))
+
+;;; _
+
+(define-obsolete-function-alias
+  'git-commit-insert-pseudo-header
+  'git-commit-insert-trailer
+  "git-commit 4.0.0")
+(define-obsolete-function-alias
+  'git-commit-insert-header
+  'git-commit--insert-ident-trailer
+  "git-commit 4.0.0")
+(define-obsolete-face-alias
+ 'git-commit-pseudo-header
+ 'git-commit-trailer-value
+ "git-commit 4.0.0")
+(define-obsolete-face-alias
+ 'git-commit-known-pseudo-header
+ 'git-commit-trailer-token
+ "git-commit 4.0.0")
+
+(provide 'git-commit)
+;;; git-commit.el ends here
diff --git a/emacs/elpa/git-commit-20240520.1135/git-commit.elc b/emacs/elpa/git-commit-20240520.1135/git-commit.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mode-autoloads.el b/emacs/elpa/lsp-mode-20240427.2141/lsp-mode-autoloads.el
@@ -1,964 +0,0 @@
-;;; lsp-mode-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
-;; Generated by the `loaddefs-generate' function.
-
-;; This file is part of GNU Emacs.
-
-;;; Code:
-
-(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
-
-
-
-;;; Generated autoloads from lsp-actionscript.el
-
-(register-definition-prefixes "lsp-actionscript" '("lsp-actionscript-"))
-
-
-;;; Generated autoloads from lsp-ada.el
-
-(register-definition-prefixes "lsp-ada" '("lsp-ada-"))
-
-
-;;; Generated autoloads from lsp-angular.el
-
-(register-definition-prefixes "lsp-angular" '("lsp-client"))
-
-
-;;; Generated autoloads from lsp-ansible.el
-
-(register-definition-prefixes "lsp-ansible" '("lsp-ansible-"))
-
-
-;;; Generated autoloads from lsp-asm.el
-
-(register-definition-prefixes "lsp-asm" '("lsp-asm-"))
-
-
-;;; Generated autoloads from lsp-astro.el
-
-(register-definition-prefixes "lsp-astro" '("lsp-astro--get-initialization-options"))
-
-
-;;; Generated autoloads from lsp-autotools.el
-
-(register-definition-prefixes "lsp-autotools" '("lsp-autotools-"))
-
-
-;;; Generated autoloads from lsp-awk.el
-
-(register-definition-prefixes "lsp-awk" '("lsp-awk-executable"))
-
-
-;;; Generated autoloads from lsp-bash.el
-
-(register-definition-prefixes "lsp-bash" '("lsp-bash-"))
-
-
-;;; Generated autoloads from lsp-beancount.el
-
-(register-definition-prefixes "lsp-beancount" '("lsp-beancount-"))
-
-
-;;; Generated autoloads from lsp-bufls.el
-
-(register-definition-prefixes "lsp-bufls" '("lsp-bufls-"))
-
-
-;;; Generated autoloads from lsp-camel.el
-
-(register-definition-prefixes "lsp-camel" '("lsp-camel-"))
-
-
-;;; Generated autoloads from lsp-clangd.el
-
-(autoload 'lsp-cpp-flycheck-clang-tidy-error-explainer "lsp-clangd" "\
-Explain a clang-tidy ERROR by scraping documentation from llvm.org.
-
-(fn ERROR)")
-(register-definition-prefixes "lsp-clangd" '("lsp-c"))
-
-
-;;; Generated autoloads from lsp-clojure.el
-
-(autoload 'lsp-clojure-show-test-tree "lsp-clojure" "\
-Show a test tree and focus on it if IGNORE-FOCUS? is nil.
-
-(fn IGNORE-FOCUS?)" t)
-(autoload 'lsp-clojure-show-project-tree "lsp-clojure" "\
-Show a project tree with source-paths and dependencies.
-Focus on it if IGNORE-FOCUS? is nil.
-
-(fn IGNORE-FOCUS?)" t)
-(register-definition-prefixes "lsp-clojure" '("lsp-clojure-"))
-
-
-;;; Generated autoloads from lsp-cmake.el
-
-(register-definition-prefixes "lsp-cmake" '("lsp-cmake-"))
-
-
-;;; Generated autoloads from lsp-cobol.el
-
-(add-hook 'cobol-mode-hook #'lsp-cobol-start-ls)
-(autoload 'lsp-cobol-start-ls "lsp-cobol" "\
-Start the COBOL language service." t)
-(register-definition-prefixes "lsp-cobol" '("lsp-cobol-"))
-
-
-;;; Generated autoloads from lsp-completion.el
-
-(define-obsolete-variable-alias 'lsp-prefer-capf 'lsp-completion-provider "\
-lsp-mode 7.0.1")
-(define-obsolete-variable-alias 'lsp-enable-completion-at-point 'lsp-completion-enable "\
-lsp-mode 7.0.1")
-(autoload 'lsp-completion-at-point "lsp-completion" "\
-Get lsp completions.")
-(autoload 'lsp-completion--enable "lsp-completion" "\
-Enable LSP completion support.")
-(autoload 'lsp-completion-mode "lsp-completion" "\
-Toggle LSP completion support.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Completion mode' mode.  If the prefix argument is positive,
-enable the mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-completion-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(add-hook 'lsp-configure-hook (lambda nil (when (and lsp-auto-configure lsp-completion-enable) (lsp-completion--enable))))
-(register-definition-prefixes "lsp-completion" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-credo.el
-
-(register-definition-prefixes "lsp-credo" '("lsp-credo-"))
-
-
-;;; Generated autoloads from lsp-crystal.el
-
-(register-definition-prefixes "lsp-crystal" '("lsp-clients-crystal-executable"))
-
-
-;;; Generated autoloads from lsp-csharp.el
-
-(register-definition-prefixes "lsp-csharp" '("lsp-csharp-"))
-
-
-;;; Generated autoloads from lsp-css.el
-
-(register-definition-prefixes "lsp-css" '("lsp-css-"))
-
-
-;;; Generated autoloads from lsp-cucumber.el
-
-(register-definition-prefixes "lsp-cucumber" '("lsp-cucumber-"))
-
-
-;;; Generated autoloads from lsp-cypher.el
-
-(register-definition-prefixes "lsp-cypher" '("lsp-client--cypher-ls-server-command"))
-
-
-;;; Generated autoloads from lsp-diagnostics.el
-
-(define-obsolete-variable-alias 'lsp-diagnostic-package 'lsp-diagnostics-provider "\
-lsp-mode 7.0.1")
-(define-obsolete-variable-alias 'lsp-flycheck-default-level 'lsp-diagnostics-flycheck-default-level "\
-lsp-mode 7.0.1")
-(autoload 'lsp-diagnostics-lsp-checker-if-needed "lsp-diagnostics")
-(autoload 'lsp-diagnostics--enable "lsp-diagnostics" "\
-Enable LSP checker support.")
-(autoload 'lsp-diagnostics-mode "lsp-diagnostics" "\
-Toggle LSP diagnostics integration.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Diagnostics mode' mode.  If the prefix argument is positive,
-enable the mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-diagnostics-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(add-hook 'lsp-configure-hook (lambda nil (when lsp-auto-configure (lsp-diagnostics--enable))))
-(register-definition-prefixes "lsp-diagnostics" '("lsp-diagnostics-"))
-
-
-;;; Generated autoloads from lsp-dired.el
-
-(defvar lsp-dired-mode nil "\
-Non-nil if Lsp-Dired mode is enabled.
-See the `lsp-dired-mode' command
-for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `lsp-dired-mode'.")
-(custom-autoload 'lsp-dired-mode "lsp-dired" nil)
-(autoload 'lsp-dired-mode "lsp-dired" "\
-Display `lsp-mode' icons for each file in a dired buffer.
-
-This is a global minor mode.  If called interactively, toggle the
-`Lsp-Dired mode' mode.  If the prefix argument is positive,
-enable the mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `(default-value \\='lsp-dired-mode)'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(register-definition-prefixes "lsp-dired" '("lsp-dired-"))
-
-
-;;; Generated autoloads from lsp-dockerfile.el
-
-(register-definition-prefixes "lsp-dockerfile" '("lsp-dockerfile-language-server-command"))
-
-
-;;; Generated autoloads from lsp-dot.el
-
-(register-definition-prefixes "lsp-dot" '("lsp-dot--dot-ls-server-command"))
-
-
-;;; Generated autoloads from lsp-elixir.el
-
-(register-definition-prefixes "lsp-elixir" '("lsp-elixir-"))
-
-
-;;; Generated autoloads from lsp-elm.el
-
-(register-definition-prefixes "lsp-elm" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-emmet.el
-
-(register-definition-prefixes "lsp-emmet" '("lsp-emmet-ls-command"))
-
-
-;;; Generated autoloads from lsp-erlang.el
-
-(register-definition-prefixes "lsp-erlang" '("lsp-erlang-"))
-
-
-;;; Generated autoloads from lsp-eslint.el
-
-(register-definition-prefixes "lsp-eslint" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-fortran.el
-
-(register-definition-prefixes "lsp-fortran" '("lsp-clients-"))
-
-
-;;; Generated autoloads from lsp-fsharp.el
-
-(autoload 'lsp-fsharp--workspace-load "lsp-fsharp" "\
-Load all of the provided PROJECTS.
-
-(fn PROJECTS)")
-(register-definition-prefixes "lsp-fsharp" '("lsp-fsharp-"))
-
-
-;;; Generated autoloads from lsp-gdscript.el
-
-(register-definition-prefixes "lsp-gdscript" '("lsp-gdscript-"))
-
-
-;;; Generated autoloads from lsp-gleam.el
-
-(register-definition-prefixes "lsp-gleam" '("lsp-gleam-executable"))
-
-
-;;; Generated autoloads from lsp-glsl.el
-
-(register-definition-prefixes "lsp-glsl" '("lsp-glsl-executable"))
-
-
-;;; Generated autoloads from lsp-go.el
-
-(register-definition-prefixes "lsp-go" '("lsp-go-"))
-
-
-;;; Generated autoloads from lsp-golangci-lint.el
-
-(register-definition-prefixes "lsp-golangci-lint" '("lsp-golangci-lint-"))
-
-
-;;; Generated autoloads from lsp-graphql.el
-
-(register-definition-prefixes "lsp-graphql" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-groovy.el
-
-(register-definition-prefixes "lsp-groovy" '("lsp-groovy-"))
-
-
-;;; Generated autoloads from lsp-hack.el
-
-(register-definition-prefixes "lsp-hack" '("lsp-clients-hack-command"))
-
-
-;;; Generated autoloads from lsp-haxe.el
-
-(register-definition-prefixes "lsp-haxe" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-headerline.el
-
-(autoload 'lsp-headerline-breadcrumb-mode "lsp-headerline" "\
-Toggle breadcrumb on headerline.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Headerline-Breadcrumb mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-headerline-breadcrumb-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(autoload 'lsp-breadcrumb-go-to-symbol "lsp-headerline" "\
-Go to the symbol on breadcrumb at SYMBOL-POSITION.
-
-(fn SYMBOL-POSITION)" t)
-(autoload 'lsp-breadcrumb-narrow-to-symbol "lsp-headerline" "\
-Narrow to the symbol range on breadcrumb at SYMBOL-POSITION.
-
-(fn SYMBOL-POSITION)" t)
-(register-definition-prefixes "lsp-headerline" '("lsp-headerline-"))
-
-
-;;; Generated autoloads from lsp-html.el
-
-(register-definition-prefixes "lsp-html" '("lsp-html-"))
-
-
-;;; Generated autoloads from lsp-hy.el
-
-(register-definition-prefixes "lsp-hy" '("lsp-clients-hy-server-executable"))
-
-
-;;; Generated autoloads from lsp-icons.el
-
-(register-definition-prefixes "lsp-icons" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-ido.el
-
-(autoload 'lsp-ido-workspace-symbol "lsp-ido" "\
-`ido' for lsp workspace/symbol.
-When called with prefix ARG the default selection will be symbol at point.
-
-(fn ARG)" t)
-(register-definition-prefixes "lsp-ido" '("lsp-ido-"))
-
-
-;;; Generated autoloads from lsp-idris.el
-
-(register-definition-prefixes "lsp-idris" '("lsp-idris2-lsp-"))
-
-
-;;; Generated autoloads from lsp-iedit.el
-
-(autoload 'lsp-iedit-highlights "lsp-iedit" "\
-Start an `iedit' operation on the documentHighlights at point.
-This can be used as a primitive `lsp-rename' replacement if the
-language server doesn't support renaming.
-
-See also `lsp-enable-symbol-highlighting'." t)
-(autoload 'lsp-iedit-linked-ranges "lsp-iedit" "\
-Start an `iedit' for `textDocument/linkedEditingRange'" t)
-(autoload 'lsp-evil-multiedit-highlights "lsp-iedit" "\
-Start an `evil-multiedit' operation on the documentHighlights at point.
-This can be used as a primitive `lsp-rename' replacement if the
-language server doesn't support renaming.
-
-See also `lsp-enable-symbol-highlighting'." t)
-(autoload 'lsp-evil-multiedit-linked-ranges "lsp-iedit" "\
-Start an `evil-multiedit' for `textDocument/linkedEditingRange'" t)
-(autoload 'lsp-evil-state-highlights "lsp-iedit" "\
-Start `iedit-mode'. for `textDocument/documentHighlight'" t)
-(autoload 'lsp-evil-state-linked-ranges "lsp-iedit" "\
-Start `iedit-mode'. for `textDocument/linkedEditingRange'" t)
-(register-definition-prefixes "lsp-iedit" '("lsp-iedit--on-ranges"))
-
-
-;;; Generated autoloads from lsp-javascript.el
-
-(register-definition-prefixes "lsp-javascript" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-jq.el
-
-(register-definition-prefixes "lsp-jq" '("lsp-clients-jq-server-executable"))
-
-
-;;; Generated autoloads from lsp-json.el
-
-(register-definition-prefixes "lsp-json" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-jsonnet.el
-
-(register-definition-prefixes "lsp-jsonnet" '("lsp-clients-jsonnet-server-executable"))
-
-
-;;; Generated autoloads from lsp-kotlin.el
-
-(register-definition-prefixes "lsp-kotlin" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-lens.el
-
-(autoload 'lsp-lens--enable "lsp-lens" "\
-Enable lens mode.")
-(autoload 'lsp-lens-show "lsp-lens" "\
-Display lenses in the buffer." t)
-(autoload 'lsp-lens-hide "lsp-lens" "\
-Delete all lenses." t)
-(autoload 'lsp-lens-mode "lsp-lens" "\
-Toggle code-lens overlays.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Lens mode' mode.  If the prefix argument is positive, enable
-the mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-lens-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(autoload 'lsp-avy-lens "lsp-lens" "\
-Click lsp lens using `avy' package." t)
-(register-definition-prefixes "lsp-lens" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-lisp.el
-
-(autoload 'lsp-lisp-alive-start-ls "lsp-lisp" "\
-Start the alive-lsp." t)
-(register-definition-prefixes "lsp-lisp" '("lsp-lisp-a"))
-
-
-;;; Generated autoloads from lsp-lua.el
-
-(register-definition-prefixes "lsp-lua" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-magik.el
-
-(register-definition-prefixes "lsp-magik" '("lsp-magik-"))
-
-
-;;; Generated autoloads from lsp-markdown.el
-
-(register-definition-prefixes "lsp-markdown" '("lsp-markdown-"))
-
-
-;;; Generated autoloads from lsp-marksman.el
-
-(register-definition-prefixes "lsp-marksman" '("lsp-marksman-"))
-
-
-;;; Generated autoloads from lsp-mdx.el
-
-(register-definition-prefixes "lsp-mdx" '("lsp-mdx-server-command"))
-
-
-;;; Generated autoloads from lsp-mint.el
-
-(register-definition-prefixes "lsp-mint" '("lsp-clients-mint-executable"))
-
-
-;;; Generated autoloads from lsp-mode.el
-
-(put 'lsp-enable-file-watchers 'safe-local-variable #'booleanp)
-(put 'lsp-file-watch-ignored-directories 'safe-local-variable 'lsp--string-listp)
-(put 'lsp-file-watch-ignored-files 'safe-local-variable 'lsp--string-listp)
-(put 'lsp-file-watch-threshold 'safe-local-variable (lambda (i) (or (numberp i) (not i))))
-(autoload 'lsp--string-listp "lsp-mode" "\
-Return t if all elements of SEQUENCE are strings, else nil.
-
-(fn SEQUENCE)")
-(autoload 'lsp-load-vscode-workspace "lsp-mode" "\
-Load vscode workspace from FILE
-
-(fn FILE)" t)
-(autoload 'lsp-save-vscode-workspace "lsp-mode" "\
-Save vscode workspace to FILE
-
-(fn FILE)" t)
-(autoload 'lsp-install-server "lsp-mode" "\
-Interactively install or re-install server.
-When prefix UPDATE? is t force installation even if the server is present.
-
-(fn UPDATE? &optional SERVER-ID)" t)
-(autoload 'lsp-uninstall-server "lsp-mode" "\
-Delete a LSP server from `lsp-server-install-dir'.
-
-(fn DIR)" t)
-(autoload 'lsp-uninstall-servers "lsp-mode" "\
-Uninstall all installed servers." t)
-(autoload 'lsp-update-server "lsp-mode" "\
-Interactively update (reinstall) a server.
-
-(fn &optional SERVER-ID)" t)
-(autoload 'lsp-update-servers "lsp-mode" "\
-Update (reinstall) all installed servers." t)
-(autoload 'lsp-ensure-server "lsp-mode" "\
-Ensure server SERVER-ID
-
-(fn SERVER-ID)")
-(autoload 'lsp "lsp-mode" "\
-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.
-
-(fn &optional ARG)" t)
-(autoload 'lsp-deferred "lsp-mode" "\
-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.")
-(autoload 'lsp-start-plain "lsp-mode" "\
-Start `lsp-mode' using minimal configuration using the latest `melpa' version
-of the packages.
-
-In case the major-mode that you are using for " t)
-(register-definition-prefixes "lsp-mode" '("defcustom-lsp" "lsp-" "make-lsp-client" "when-lsp-workspace" "with-lsp-workspace"))
-
-
-;;; Generated autoloads from lsp-modeline.el
-
-(define-obsolete-variable-alias 'lsp-diagnostics-modeline-scope 'lsp-modeline-diagnostics-scope "\
-lsp-mode 7.0.1")
-(autoload 'lsp-modeline-code-actions-mode "lsp-modeline" "\
-Toggle code actions on modeline.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Modeline-Code-Actions mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-modeline-code-actions-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(define-obsolete-function-alias 'lsp-diagnostics-modeline-mode 'lsp-modeline-diagnostics-mode "lsp-mode 7.0.1")
-(autoload 'lsp-modeline-diagnostics-mode "lsp-modeline" "\
-Toggle diagnostics modeline.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Modeline-Diagnostics mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-modeline-diagnostics-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(autoload 'lsp-modeline-workspace-status-mode "lsp-modeline" "\
-Toggle workspace status on modeline.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Modeline-Workspace-Status mode' mode.  If the prefix
-argument is positive, enable the mode, and if it is zero or
-negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-modeline-workspace-status-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(register-definition-prefixes "lsp-modeline" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-mojo.el
-
-(register-definition-prefixes "lsp-mojo" '("lsp-mojo-executable"))
-
-
-;;; Generated autoloads from lsp-move.el
-
-(register-definition-prefixes "lsp-move" '("lsp-clients-"))
-
-
-;;; Generated autoloads from lsp-nginx.el
-
-(register-definition-prefixes "lsp-nginx" '("lsp-nginx-"))
-
-
-;;; Generated autoloads from lsp-nim.el
-
-(register-definition-prefixes "lsp-nim" '("lsp-nim-l"))
-
-
-;;; Generated autoloads from lsp-nix.el
-
-(register-definition-prefixes "lsp-nix" '("lsp-nix-"))
-
-
-;;; Generated autoloads from lsp-nushell.el
-
-(register-definition-prefixes "lsp-nushell" '("lsp-nushell-language-server-command"))
-
-
-;;; Generated autoloads from lsp-ocaml.el
-
-(register-definition-prefixes "lsp-ocaml" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-openscad.el
-
-(register-definition-prefixes "lsp-openscad" '("lsp-openscad-"))
-
-
-;;; Generated autoloads from lsp-perl.el
-
-(register-definition-prefixes "lsp-perl" '("lsp-perl-"))
-
-
-;;; Generated autoloads from lsp-perlnavigator.el
-
-(register-definition-prefixes "lsp-perlnavigator" '("lsp-perlnavigator-"))
-
-
-;;; Generated autoloads from lsp-php.el
-
-(register-definition-prefixes "lsp-php" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-pls.el
-
-(register-definition-prefixes "lsp-pls" '("lsp-pls-"))
-
-
-;;; Generated autoloads from lsp-prolog.el
-
-(register-definition-prefixes "lsp-prolog" '("lsp-prolog-server-command"))
-
-
-;;; Generated autoloads from lsp-protocol.el
-
-(register-definition-prefixes "lsp-protocol" '("dash-expand:&RangeToPoint" "lsp"))
-
-
-;;; Generated autoloads from lsp-purescript.el
-
-(register-definition-prefixes "lsp-purescript" '("lsp-purescript-"))
-
-
-;;; Generated autoloads from lsp-pwsh.el
-
-(register-definition-prefixes "lsp-pwsh" '("lsp-pwsh-"))
-
-
-;;; Generated autoloads from lsp-pyls.el
-
-(register-definition-prefixes "lsp-pyls" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-pylsp.el
-
-(register-definition-prefixes "lsp-pylsp" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-qml.el
-
-(register-definition-prefixes "lsp-qml" '("lsp-qml-server-command"))
-
-
-;;; Generated autoloads from lsp-r.el
-
-(register-definition-prefixes "lsp-r" '("lsp-clients-r-server-command"))
-
-
-;;; Generated autoloads from lsp-racket.el
-
-(register-definition-prefixes "lsp-racket" '("lsp-racket-lang"))
-
-
-;;; Generated autoloads from lsp-remark.el
-
-(register-definition-prefixes "lsp-remark" '("lsp-remark-server-command"))
-
-
-;;; Generated autoloads from lsp-rf.el
-
-(register-definition-prefixes "lsp-rf" '("expand-start-command" "lsp-rf-language-server-" "parse-rf-language-server-"))
-
-
-;;; Generated autoloads from lsp-rpm-spec.el
-
-(register-definition-prefixes "lsp-rpm-spec" '("lsp-rpm-spec-"))
-
-
-;;; Generated autoloads from lsp-rubocop.el
-
-(register-definition-prefixes "lsp-rubocop" '("lsp-rubocop-"))
-
-
-;;; Generated autoloads from lsp-ruby-lsp.el
-
-(register-definition-prefixes "lsp-ruby-lsp" '("lsp-ruby-lsp-"))
-
-
-;;; Generated autoloads from lsp-ruby-syntax-tree.el
-
-(register-definition-prefixes "lsp-ruby-syntax-tree" '("lsp-ruby-syntax-tree-"))
-
-
-;;; Generated autoloads from lsp-ruff-lsp.el
-
-(register-definition-prefixes "lsp-ruff-lsp" '("lsp-ruff-lsp-"))
-
-
-;;; Generated autoloads from lsp-rust.el
-
-(register-definition-prefixes "lsp-rust" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-semantic-tokens.el
-
-(defvar-local semantic-token-modifier-cache (make-hash-table) "\
-A cache of modifier values to the selected fonts.
-This allows whole-bitmap lookup instead of checking each bit. The
-expectation is that usage of modifiers will tend to cluster, so
-we will not have the full range of possible usages, hence a
-tractable hash map.
-
-This is set as buffer-local. It should probably be shared in a
-given workspace/language-server combination.
-
-This cache should be flushed every time any modifier
-configuration changes.")
-(autoload 'lsp--semantic-tokens-initialize-buffer "lsp-semantic-tokens" "\
-Initialize the buffer for semantic tokens.
-IS-RANGE-PROVIDER is non-nil when server supports range requests.")
-(autoload 'lsp--semantic-tokens-initialize-workspace "lsp-semantic-tokens" "\
-Initialize semantic tokens for WORKSPACE.
-
-(fn WORKSPACE)")
-(autoload 'lsp-semantic-tokens--warn-about-deprecated-setting "lsp-semantic-tokens" "\
-Warn about deprecated semantic highlighting variable.")
-(autoload 'lsp-semantic-tokens--enable "lsp-semantic-tokens" "\
-Enable semantic tokens mode.")
-(autoload 'lsp-semantic-tokens-mode "lsp-semantic-tokens" "\
-Toggle semantic-tokens support.
-
-This is a minor mode.  If called interactively, toggle the
-`Lsp-Semantic-Tokens mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `lsp-semantic-tokens-mode'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(register-definition-prefixes "lsp-semantic-tokens" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-semgrep.el
-
-(register-definition-prefixes "lsp-semgrep" '("lsp-semgrep-" "semgrep-"))
-
-
-;;; Generated autoloads from lsp-sml.el
-
-(register-definition-prefixes "lsp-sml" '("lsp-sml-millet-"))
-
-
-;;; Generated autoloads from lsp-solargraph.el
-
-(register-definition-prefixes "lsp-solargraph" '("lsp-solargraph-"))
-
-
-;;; Generated autoloads from lsp-solidity.el
-
-(register-definition-prefixes "lsp-solidity" '("lsp-client--solidity-"))
-
-
-;;; Generated autoloads from lsp-sorbet.el
-
-(register-definition-prefixes "lsp-sorbet" '("lsp-sorbet-"))
-
-
-;;; Generated autoloads from lsp-sqls.el
-
-(register-definition-prefixes "lsp-sqls" '("lsp-sql"))
-
-
-;;; Generated autoloads from lsp-steep.el
-
-(register-definition-prefixes "lsp-steep" '("lsp-steep-"))
-
-
-;;; Generated autoloads from lsp-svelte.el
-
-(register-definition-prefixes "lsp-svelte" '("lsp-svelte-plugin-"))
-
-
-;;; Generated autoloads from lsp-terraform.el
-
-(register-definition-prefixes "lsp-terraform" '("construct-tf-package" "lsp-t"))
-
-
-;;; Generated autoloads from lsp-tex.el
-
-(register-definition-prefixes "lsp-tex" '("lsp-"))
-
-
-;;; Generated autoloads from lsp-toml.el
-
-(register-definition-prefixes "lsp-toml" '("lsp-toml-"))
-
-
-;;; Generated autoloads from lsp-trunk.el
-
-(register-definition-prefixes "lsp-trunk" '("lsp-trunk-"))
-
-
-;;; Generated autoloads from lsp-ttcn3.el
-
-(register-definition-prefixes "lsp-ttcn3" '("lsp-ttcn3-lsp-server-command"))
-
-
-;;; Generated autoloads from lsp-typeprof.el
-
-(register-definition-prefixes "lsp-typeprof" '("lsp-typeprof-"))
-
-
-;;; Generated autoloads from lsp-v.el
-
-(register-definition-prefixes "lsp-v" '("lsp-v-vls-executable"))
-
-
-;;; Generated autoloads from lsp-vala.el
-
-(register-definition-prefixes "lsp-vala" '("lsp-clients-vala-ls-executable"))
-
-
-;;; Generated autoloads from lsp-verilog.el
-
-(register-definition-prefixes "lsp-verilog" '("lsp-clients-"))
-
-
-;;; Generated autoloads from lsp-vetur.el
-
-(register-definition-prefixes "lsp-vetur" '("lsp-vetur-"))
-
-
-;;; Generated autoloads from lsp-vhdl.el
-
-(register-definition-prefixes "lsp-vhdl" '("ghdl-ls-bin-name" "hdl-checker-bin-name" "lsp-vhdl-" "vhdl-"))
-
-
-;;; Generated autoloads from lsp-vimscript.el
-
-(register-definition-prefixes "lsp-vimscript" '("lsp-clients-vim-"))
-
-
-;;; Generated autoloads from lsp-volar.el
-
-(register-definition-prefixes "lsp-volar" '("lsp-volar-"))
-
-
-;;; Generated autoloads from lsp-wgsl.el
-
-(register-definition-prefixes "lsp-wgsl" '("lsp-wgsl-"))
-
-
-;;; Generated autoloads from lsp-xml.el
-
-(register-definition-prefixes "lsp-xml" '("lsp-xml-"))
-
-
-;;; Generated autoloads from lsp-yaml.el
-
-(register-definition-prefixes "lsp-yaml" '("lsp-yaml-"))
-
-
-;;; Generated autoloads from lsp-yang.el
-
-(register-definition-prefixes "lsp-yang" '("lsp-yang-"))
-
-
-;;; Generated autoloads from lsp-zig.el
-
-(register-definition-prefixes "lsp-zig" '("lsp-z"))
-
-;;; End of scraped data
-
-(provide 'lsp-mode-autoloads)
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; no-native-compile: t
-;; coding: utf-8-emacs-unix
-;; End:
-
-;;; lsp-mode-autoloads.el ends here
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mode-pkg.el b/emacs/elpa/lsp-mode-20240427.2141/lsp-mode-pkg.el
@@ -1,21 +0,0 @@
-(define-package "lsp-mode" "20240427.2141" "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"))
-  :commit "32bf5aa458f2bafb318a34bed64cb3f681aa0b51" :authors
-  '(("Vibhav Pant, Fangrui Song, Ivan Yonchovski"))
-  :maintainers
-  '(("Vibhav Pant, Fangrui Song, Ivan Yonchovski"))
-  :maintainer
-  '("Vibhav Pant, Fangrui Song, Ivan Yonchovski")
-  :keywords
-  '("languages")
-  :url "https://github.com/emacs-lsp/lsp-mode")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mode.el b/emacs/elpa/lsp-mode-20240427.2141/lsp-mode.el
@@ -1,9792 +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"))
-;; Version: 9.0.1
-
-;; 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-elixir lsp-elm lsp-emmet lsp-erlang lsp-eslint lsp-fortran 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-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-rubocop lsp-ruby-lsp
-     lsp-ruby-syntax-tree lsp-ruff-lsp lsp-rust lsp-semgrep lsp-shader
-     lsp-solargraph lsp-solidity lsp-sonarlint lsp-sorbet lsp-sourcekit 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")
-    ("\\.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")
-    (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")
-    (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")
-    (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")
-    (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")
-    (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")
-    (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")
-    (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)
-    ("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 "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))
-
-  ;; 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--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))))
-
-(lsp-defun lsp--on-diagnostics-update-stats (workspace
-                                             (&PublishDiagnosticsParams :uri :diagnostics))
-  (let ((path (lsp--fix-path-casing (lsp--uri-to-path uri)))
-        (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))))
-
-(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)))
-                      (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 (featurep 'projectile) (condition-case nil
-                                    (projectile-project-root)
-                                  (error nil)))
-   (when (featurep 'project)
-     (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)
-      (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"))
-  (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)
-
-  (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))))))
-             (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-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))
-        (setq lsp--signature-last-index nil
-              lsp--signature-last nil)
-        ;; cleanup diagnostics
-        (when lsp-diagnostic-clean-after-change
-          (lsp-foreach-workspace
-           (-let [diagnostics (lsp--workspace-diagnostics lsp--cur-workspace)]
-             (remhash (lsp--fix-path-casing (buffer-file-name)) diagnostics))))))))
-
-
-
-;; 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)
-  (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 (or line filename)
-               (xref-make-file-location
-                filename
-                (lsp-translate-line (1+ start-line))
-                (lsp-translate-column 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 (Location)
-                    (LocationLink)))
-           (append locations nil))
-          ((or (Location)
-               (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--capability :hoverProvider))
-        (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
-       ((MarkedString :value :language)
-        (lsp--render-string value language))
-       ((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?) (lsp--execute-command command?))))
-
-(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
-          (let ((start-point (lsp--position-to-point start))
-                (end-point (lsp--position-to-point end)))
-            (when (and (> (1+ start-line) start-window)
-                       (< (1+ end-line) end-window)
-                       (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
-       ((DocumentSymbol :name :children? :selection-range (Range :start))
-        (cons (cons (concat path name)
-                    (lsp--position-to-point start))
-              (lsp--xref-elements-index children? (concat path name " / "))))
-       ((SymbolInformation :name :location (Location :range (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)
-
-(defvar lsp--flushing-delayed-changes nil)
-
-(defun lsp--send-no-wait (message proc)
-  "Send MESSAGE to PROC without waiting for further output."
-
-  (unless lsp--flushing-delayed-changes
-    (let ((lsp--flushing-delayed-changes t))
-      (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 ((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)))
-    (cl-remf args :lsp-path)
-    `(progn
-       (lsp-register-custom-settings
-        (quote ((,path ,symbol ,(equal ''boolean (plist-get args :type))))))
-
-       (defcustom ,symbol ,standard ,doc
-         :set (lambda (sym val)
-                (lsp--set-custom-property sym val ,path))
-         ,@args))))
-
-(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-20240427.2141/lsp-mode.elc b/emacs/elpa/lsp-mode-20240427.2141/lsp-mode.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rust.el b/emacs/elpa/lsp-mode-20240427.2141/lsp-rust.el
@@ -1,1770 +0,0 @@
-;;; lsp-rust.el --- Rust Client settings             -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2019  Ivan Yonchovski
-
-;; Author: Ivan Yonchovski <yyoncho@gmail.com>
-;; 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-rust client
-
-;;; Code:
-
-(require 'lsp-mode)
-(require 'ht)
-(require 'dash)
-(require 'lsp-semantic-tokens)
-
-(defgroup lsp-rust nil
-  "LSP support for Rust, using Rust Language Server or rust-analyzer."
-  :group 'lsp-mode
-  :link '(url-link "https://github.com/rust-lang/rls")
-  :package-version '(lsp-mode . "6.1"))
-
-(defgroup lsp-rust-rls nil
-  "LSP support for Rust, using Rust Language Server."
-  :group 'lsp-mode
-  :link '(url-link "https://github.com/rust-lang/rls")
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defgroup lsp-rust-analyzer nil
-  "LSP support for Rust, using rust-analyzer."
-  :group 'lsp-mode
-  :link '(url-link "https://github.com/rust-lang/rust-analyzer")
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defgroup lsp-rust-analyzer-semantic-tokens nil
-  "LSP semantic tokens support for rust-analyzer."
-  :group 'lsp-rust-analyzer
-  :link '(url-link "https://github.com/rust-lang/rust-analyzer")
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-server 'rust-analyzer
-  "Choose LSP server."
-  :type '(choice (const :tag "rls" rls)
-                 (const :tag "rust-analyzer" rust-analyzer))
-  :group 'lsp-rust
-  :package-version '(lsp-mode . "6.2"))
-
-;; RLS
-
-(defcustom lsp-rust-rls-server-command '("rls")
-  "Command to start RLS."
-  :type '(repeat string)
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-library-directories
-  '("~/.cargo/registry/src" "~/.rustup/toolchains")
-  "List of directories which will be considered to be libraries."
-  :risky t
-  :type '(repeat string)
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-sysroot nil
-  "If non-nil, use the given path as the sysroot for all rustc invocations
-instead of trying to detect the sysroot automatically."
-  :type '(choice
-          (const :tag "None" nil)
-          (string :tag "Sysroot"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-target nil
-  "If non-nil, use the given target triple for all rustc invocations."
-  :type '(choice
-          (const :tag "None" nil)
-          (string :tag "Target"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-rustflags nil
-  "Flags added to RUSTFLAGS."
-  :type '(choice
-          (const :tag "None" nil)
-          (string :tag "Flags"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-clear-env-rust-log t
-  "Clear the RUST_LOG environment variable before running rustc or cargo."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-build-lib nil
-  "If non-nil, checks the project as if you passed the `--lib' argument to
-cargo.
-
-Mutually exclusive with, and preferred over, `lsp-rust-build-bin'. (Unstable)"
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-build-bin nil
-  "If non-nil, checks the project as if you passed `-- bin <build_bin>'
-argument to cargo.
-
-Mutually exclusive with `lsp-rust-build-lib'. (Unstable)"
-  :type '(choice
-          (const :tag "None" nil)
-          (string :tag "Binary"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-cfg-test nil
-  "If non-nil, checks the project as if you were running `cargo test' rather
-than cargo build.
-
-I.e., compiles (but does not run) test code."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-unstable-features nil
-  "Enable unstable features."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-wait-to-build nil
-  "Time in milliseconds between receiving a change notification
-and starting build. If not specified, automatically inferred by
-the latest build duration."
-  :type '(choice
-          (const :tag "Auto" nil)
-          (number :tag "Time"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-show-warnings t
-  "Show warnings."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-crate-blocklist  [
-                                      "cocoa"
-                                      "gleam"
-                                      "glium"
-                                      "idna"
-                                      "libc"
-                                      "openssl"
-                                      "rustc_serialize"
-                                      "serde"
-                                      "serde_json"
-                                      "typenum"
-                                      "unicode_normalization"
-                                      "unicode_segmentation"
-                                      "winapi"
-                                      ]
-  "A list of Cargo crates to blocklist."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-build-on-save nil
-  "Only index the project when a file is saved and not on change."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-features []
-  "List of features to activate.
-Set this to `\"all\"` to pass `--all-features` to cargo."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-all-features nil
-  "Enable all Cargo features."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-no-default-features nil
-  "Do not enable default Cargo features."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-racer-completion t
-  "Enables code completion using racer."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-clippy-preference "opt-in"
-  "Controls eagerness of clippy diagnostics when available.
-Valid values are (case-insensitive):
- - \"off\": Disable clippy lints.
- - \"opt-in\": Clippy lints are shown when crates specify `#![warn(clippy)]'.
- - \"on\": Clippy lints enabled for all crates in workspace.
-
-You need to install clippy via rustup if you haven't already."
-  :type '(choice
-          (const "on")
-          (const "opt-in")
-          (const "off"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-jobs nil
-  "Number of Cargo jobs to be run in parallel."
-  :type '(choice
-          (const :tag "Auto" nil)
-          (number :tag "Jobs"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-all-targets t
-  "Checks the project as if you were running cargo check --all-targets.
-I.e., check all targets and integration tests too."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-target-dir nil
-  "When specified, it places the generated analysis files at the
-specified target directory. By default it is placed target/rls
-directory."
-  :type '(choice
-          (const :tag "Default" nil)
-          (string :tag "Directory"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-rustfmt-path nil
-  "When specified, RLS will use the Rustfmt pointed at the path
-instead of the bundled one"
-  :type '(choice
-          (const :tag "Bundled" nil)
-          (string :tag "Path"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-build-command nil
-  "EXPERIMENTAL (requires `rust.unstable_features')
-If set, executes a given program responsible for rebuilding save-analysis to be
-loaded by the RLS. The program given should output a list of resulting .json
-files on stdout.
-
-Implies `rust.build_on_save': true."
-  :type '(choice
-          (const :tag "None" nil)
-          (string :tag "Command"))
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-full-docs nil
-  "Instructs cargo to enable full documentation extraction during
-save-analysis while building the crate."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(defcustom lsp-rust-show-hover-context t
-  "Show additional context in hover tooltips when available. This
-is often the type local variable declaration."
-  :type 'boolean
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "6.1"))
-
-(lsp-register-custom-settings
- '(("rust.show_hover_context" lsp-rust-show-hover-context t)
-   ("rust.full_docs" lsp-rust-full-docs t)
-   ("rust.build_command" lsp-rust-build-command)
-   ("rust.rustfmt_path" lsp-rust-rustfmt-path)
-   ("rust.target_dir" lsp-rust-target-dir)
-   ("rust.all_targets" lsp-rust-all-targets t)
-   ("rust.jobs" lsp-rust-jobs)
-   ("rust.clippy_preference" lsp-rust-clippy-preference)
-   ("rust.racer_completion" lsp-rust-racer-completion t)
-   ("rust.no_default_features" lsp-rust-no-default-features t)
-   ("rust.all_features" lsp-rust-all-features t)
-   ("rust.features" lsp-rust-features)
-   ("rust.build_on_save" lsp-rust-build-on-save t)
-   ("rust.crate_blocklist" lsp-rust-crate-blocklist)
-   ("rust.show_warnings" lsp-rust-show-warnings t)
-   ("rust.wait_to_build" lsp-rust-wait-to-build)
-   ("rust.unstable_features" lsp-rust-unstable-features t)
-   ("rust.cfg_test" lsp-rust-cfg-test t)
-   ("rust.build_bin" lsp-rust-build-bin)
-   ("rust.build_lib" lsp-rust-build-lib t)
-   ("rust.clear_env_rust_log" lsp-rust-clear-env-rust-log t)
-   ("rust.rustflags" lsp-rust-rustflags)
-   ("rust.target" lsp-rust-target)
-   ("rust.sysroot" lsp-rust-sysroot)))
-
-(defun lsp-clients--rust-window-progress (workspace params)
-  "Progress report handling.
-PARAMS progress report notification data."
-  (-let [(&v1:ProgressParams :done? :message? :title) params]
-    (if (or done? (s-blank-str? message?))
-        (lsp-workspace-status nil workspace)
-      (lsp-workspace-status (format "%s - %s" title (or message? "")) workspace))))
-
-(lsp-defun lsp-rust--rls-run ((&Command :arguments? params))
-  (-let* (((&rls:Cmd :env :binary :args :cwd) (lsp-seq-first params))
-          (default-directory (or cwd (lsp-workspace-root) default-directory) ))
-    (compile
-     (format "%s %s %s"
-             (s-join " " (ht-amap (format "%s=%s" key value) env))
-             binary
-             (s-join " " args)))))
-
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection (lambda () lsp-rust-rls-server-command))
-                  :activation-fn (lsp-activate-on "rust")
-                  :priority (if (eq lsp-rust-server 'rls) 1 -1)
-                  :initialization-options '((omitInitBuild . t)
-                                            (cmdRun . t))
-                  :notification-handlers (ht ("window/progress" 'lsp-clients--rust-window-progress))
-                  :action-handlers (ht ("rls.run" 'lsp-rust--rls-run))
-                  :library-folders-fn (lambda (_workspace) lsp-rust-library-directories)
-                  :initialized-fn (lambda (workspace)
-                                    (with-lsp-workspace workspace
-                                      (lsp--set-configuration
-                                       (lsp-configuration-section "rust"))))
-                  :server-id 'rls))
-
-
-;; rust-analyzer
-(defcustom lsp-rust-analyzer-server-command '("rust-analyzer")
-  "Command to start rust-analyzer."
-  :type '(repeat string)
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2"))
-
-(defcustom lsp-rust-analyzer-library-directories
-  '("~/.cargo/registry/src" "~/.rustup/toolchains")
-  "List of directories which will be considered to be libraries."
-  :risky t
-  :type '(repeat string)
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-server-format-inlay-hints t
-  "Whether to ask rust-analyzer to format inlay hints itself.  If
-active, the various inlay format settings are not used."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-hide-closure-initialization nil
-  "Whether to hide inlay type hints for `let` statements that initialize
-to a closure. Only applies to closures with blocks, same as
-`#rust-analyzer.inlayHints.closureReturnTypeHints.enable#`."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-highlight-breakpoints t
-  "Enables highlighting of related references while the cursor is on
-`break`, `loop`, `while`, or `for` keywords."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-highlight-closure-captures t
-  "Enables highlighting of all captures of a closure while the
-cursor is on the `|` or move keyword of a closure."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-highlight-exit-points t
-  "Enables highlighting of all exit points while the cursor is on
-any `return`, `?`, `fn`, or return type arrow (`->`)."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-highlight-references t
-  "Enables highlighting of related references while the cursor is on
-any identifier."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-highlight-yield-points t
-  "Enables highlighting of all break points for a loop or block
-context while the cursor is on any `async` or `await` keywords."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-closure-return-type-hints "never"
-  "Whether to show inlay type hints for return types of closures."
-  :type '(choice
-          (const "never")
-          (const "always")
-          (const "with_block"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-discriminants-hints "never"
-  "Whether to show enum variant discriminant hints."
-  :type '(choice
-          (const "never")
-          (const "always")
-          (const "fieldless"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-expression-adjustment-hints "never"
-  "Whether to show inlay hints for type adjustments.."
-  :type '(choice
-          (const "never")
-          (const "always")
-          (const "reborrow"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-expression-adjustment-hints-mode "prefix"
-  "Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc)."
-  :type '(choice
-          (const "prefix")
-          (const "postfix")
-          (const "prefer_prefix")
-          (const "prefer_postfix"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-expression-adjustment-hide-unsafe nil
-  "Whether to hide inlay hints for type adjustments outside of
-`unsafe` blocks."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-implicit-drops nil
-  "Whether to show implicit drop hints."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-
-(defcustom lsp-rust-analyzer-closure-capture-hints nil
-  "Whether to show inlay hints for closure captures."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-closure-style "impl_fn"
-  "Closure notation in type and chaining inlay hints."
-  :type 'string
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-hide-named-constructor nil
-  "Whether to hide inlay type hints for constructors."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-max-inlay-hint-length nil
-  "Max inlay hint length."
-  :type 'integer
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-display-chaining-hints nil
-  "Whether to show inlay type hints for method chains.  These
-hints will be formatted with the type hint formatting options, if
-the mode is not configured to ask the server to format them."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-display-lifetime-elision-hints-enable "never"
-  "Whether to show elided lifetime inlay hints."
-  :type '(choice
-          (const "never")
-          (const "always")
-          (const "skip_trivial"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names nil
-  "When showing elided lifetime inlay hints, whether to use
-parameter names or numeric placeholder names for the lifetimes."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-display-closure-return-type-hints nil
-  "Whether to show closure return type inlay hints for closures
-with block bodies."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-display-parameter-hints nil
-  "Whether to show function parameter name inlay hints at the call site."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-display-reborrow-hints "never"
-  "Whether to show inlay type hints for compiler inserted reborrows."
-  :type '(choice
-          (const "always")
-          (const "never")
-          (const "mutable"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-binding-mode-hints nil
-  "Whether to show inlay type hints for binding modes."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-closing-brace-hints t
-  "Whether to show inlay hints after a closing `}` to indicate what item it
-belongs to."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-closing-brace-hints-min-lines 25
-  "Minimum number of lines required before the `}` until the hint is shown
-\(set to 0 or 1 to always show them)."
-  :type 'integer
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lru-capacity nil
-  "Number of syntax trees rust-analyzer keeps in memory."
-  :type 'integer
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-cargo-target nil
-  "Compilation target (target triple)."
-  :type '(choice
-          (string :tag "Target")
-          (const :tag "None" nil))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-cargo-watch-enable t
-  "Enable Cargo watch."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-cargo-watch-command "check"
-  "Cargo watch command."
-  :type 'string
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-cargo-watch-args []
-  "Extra arguments for `cargo check`."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-cargo-override-command []
-  "Advanced option, fully override the command rust-analyzer uses for checking.
-The command should include `--message=format=json` or similar option."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-check-all-targets t
-  "Enables --all-targets for `cargo check`."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.2"))
-
-(defcustom lsp-rust-analyzer-checkonsave-features []
-  "List of features to activate.
-Set this to `\"all\"` to pass `--all-features` to cargo."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-rust-analyzer
-  :package-version '(lsp-mode . "8.0.2"))
-
-(defcustom lsp-rust-analyzer-cargo-unset-test []
-  "force rust-analyzer to unset `#[cfg(test)]` for the specified crates."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-use-client-watching t
-  "Use client watching"
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-exclude-globs []
-  "Exclude globs"
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-exclude-dirs []
-  "These directories will be ignored by rust-analyzer."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-macro-expansion-method 'lsp-rust-analyzer-macro-expansion-default
-  "Use a different function if you want formatted macro expansion results and
-syntax highlighting."
-  :type 'function
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.2.2"))
-
-(defcustom lsp-rust-analyzer-diagnostics-enable t
-  "Whether to show native rust-analyzer diagnostics."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-diagnostics-enable-experimental nil
-  "Whether to show native rust-analyzer diagnostics that are still experimental
-\(might have more false positives than usual)."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-diagnostics-disabled []
-  "List of native rust-analyzer diagnostics to disable."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-diagnostics-warnings-as-hint []
-  "List of warnings that should be displayed with hint severity."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-diagnostics-warnings-as-info []
-  "List of warnings that should be displayed with info severity."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(define-obsolete-variable-alias
-  'lsp-rust-analyzer-cargo-load-out-dirs-from-check
-  'lsp-rust-analyzer-cargo-run-build-scripts
-  "8.0.0")
-
-(defcustom lsp-rust-analyzer-cargo-run-build-scripts t
-  "Whether to run build scripts (`build.rs`) for more precise code analysis."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-rustfmt-extra-args []
-  "Additional arguments to rustfmt."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-rustfmt-override-command []
-  "Advanced option, fully override the command rust-analyzer uses
-for formatting."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-rustfmt-rangeformatting-enable nil
-  "Enables the use of rustfmt's unstable range formatting command for the
-`textDocument/rangeFormatting` request. The rustfmt option is unstable and only
-available on a nightly build."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-completion-add-call-parenthesis t
-  "Whether to add parenthesis when completing functions."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-completion-add-call-argument-snippets t
-  "Whether to add argument snippets when completing functions."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-completion-postfix-enable t
-  "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-call-info-full t
-  "Whether to show function name and docs in parameter hints."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-proc-macro-enable t
-  "Enable Proc macro support.
-Implies `lsp-rust-analyzer-cargo-run-build-scripts'"
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "6.3.2"))
-
-(defcustom lsp-rust-analyzer-import-prefix "plain"
-  "The path structure for newly inserted paths to use.
-Valid values are:
- - \"plain\": Insert import paths relative to the current module, using up to
-one `super' prefix if the parent module contains the requested item.
- - \"by_self\": Prefix all import paths with `self' if they don't begin with
-`self', `super', `crate' or a crate name.
- - \"by_crate\": Force import paths to be absolute by always starting
-them with `crate' or the crate name they refer to."
-  :type '(choice
-          (const "plain")
-          (const "by_self")
-          (const "by_crate"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-import-granularity "crate"
-  "How imports should be grouped into use statements."
-  :type '(choice
-          (const "crate" :doc "Merge imports from the same crate into a single use statement. This kind of nesting is only supported in Rust versions later than 1.24.")
-          (const "module" :doc "Merge imports from the same module into a single use statement.")
-          (const "item" :doc "Don’t merge imports at all, creating one import per item.")
-          (const "preserve" :doc "Do not change the granularity of any imports. For auto-import this has the same effect as `\"item\"'"))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-cargo-auto-reload t
-  "Automatically refresh project info via `cargo metadata' on `Cargo.toml' changes."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-use-rustc-wrapper-for-build-scripts t
-  "Use `RUSTC_WRAPPER=rust-analyzer' when running build scripts to avoid
-compiling unnecessary things."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-completion-auto-import-enable t
-  "Toggles the additional completions that automatically add imports when
-completed. `lsp-completion-enable-additional-text-edit' must be non-nil
- for this feature to be fully enabled."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-completion-auto-self-enable t
-  "Toggles the additional completions that automatically show method calls
-and field accesses with self prefixed to them when inside a method."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-import-enforce-granularity nil
-  "Whether to enforce the import granularity setting for all files.
- If set to nil rust-analyzer will try to keep import styles consistent per file."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-imports-merge-glob t
-  "Whether to allow import insertion to merge new imports into single path
-glob imports like `use std::fmt::*;`."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-import-group t
-  "Group inserted imports by the following order:
-https://rust-analyzer.github.io/manual.html#auto-import.
- Groups are separated by newlines."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-highlighting-strings t
-  "Use semantic tokens for strings."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-rustc-source nil
-  "Path to the Cargo.toml of the rust compiler workspace."
-  :type '(choice
-          (file :tag "Path")
-          (const :tag "None" nil))
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-linked-projects []
-  "Disable project auto-discovery in favor of explicitly specified set of
-projects. Elements must be paths pointing to `Cargo.toml`, `rust-project.json`,
-or JSON objects in `rust-project.json` format."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-experimental-proc-attr-macros t
-  "Whether to enable experimental support for expanding proc macro attributes."
-  :type 'boolean
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-cargo-extra-args []
-  "Extra arguments that are passed to every cargo invocation."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-cargo-extra-env []
-  "Extra environment variables that will be set when running cargo, rustc or
-other commands within the workspace.  Useful for setting RUSTFLAGS."
-  :type 'lsp-string-vector
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defconst lsp-rust-notification-handlers
-  '(("rust-analyzer/publishDecorations" . (lambda (_w _p)))))
-
-(defconst lsp-rust-action-handlers
-  '())
-
-(define-derived-mode lsp-rust-analyzer-syntax-tree-mode special-mode "Rust-Analyzer-Syntax-Tree"
-  "Mode for the rust-analyzer syntax tree buffer.")
-
-(defun lsp-rust-analyzer-syntax-tree ()
-  "Display syntax tree for current buffer."
-  (interactive)
-  (-let* ((root (lsp-workspace-root default-directory))
-          (params (lsp-make-rust-analyzer-syntax-tree-params
-                   :text-document (lsp--text-document-identifier)
-                   :range? (if (use-region-p)
-                               (lsp--region-to-range (region-beginning) (region-end))
-                             (lsp--region-to-range (point-min) (point-max)))))
-          (results (lsp-send-request (lsp-make-request
-                                      "rust-analyzer/syntaxTree"
-                                      params))))
-    (let ((buf (get-buffer-create (format "*rust-analyzer syntax tree %s*" root)))
-          (inhibit-read-only t))
-      (with-current-buffer buf
-        (lsp-rust-analyzer-syntax-tree-mode)
-        (erase-buffer)
-        (insert results)
-        (goto-char (point-min)))
-      (pop-to-buffer buf))))
-
-(define-derived-mode lsp-rust-analyzer-status-mode special-mode "Rust-Analyzer-Status"
-  "Mode for the rust-analyzer status buffer.")
-
-(defun lsp-rust-analyzer-status ()
-  "Displays status information for rust-analyzer."
-  (interactive)
-  (-let* ((root (lsp-workspace-root default-directory))
-          (params (lsp-make-rust-analyzer-analyzer-status-params
-                   :text-document (lsp--text-document-identifier)))
-          (results (lsp-send-request (lsp-make-request
-                                      "rust-analyzer/analyzerStatus"
-                                      params))))
-    (let ((buf (get-buffer-create (format "*rust-analyzer status %s*" root)))
-          (inhibit-read-only t))
-      (with-current-buffer buf
-        (lsp-rust-analyzer-status-mode)
-        (erase-buffer)
-        (insert results)
-        (pop-to-buffer buf)))))
-
-(defun lsp-rust-analyzer-view-item-tree ()
-  "Show item tree of rust file."
-  (interactive)
-  (-let* ((params (lsp-make-rust-analyzer-view-item-tree
-                   :text-document (lsp--text-document-identifier)))
-          (results (lsp-send-request (lsp-make-request
-                                      "rust-analyzer/viewItemTree"
-                                      params))))
-    (let ((buf (get-buffer-create "*rust-analyzer item tree*"))
-          (inhibit-read-only t))
-      (with-current-buffer buf
-        (special-mode)
-        (erase-buffer)
-        (insert (lsp--render-string results "rust"))
-        (pop-to-buffer buf)))))
-
-(defun lsp-rust-analyzer-view-hir ()
-  "View Hir of function at point."
-  (interactive)
-  (-let* ((params (lsp-make-rust-analyzer-expand-macro-params
-                   :text-document (lsp--text-document-identifier)
-                   :position (lsp--cur-position)))
-          (results (lsp-send-request (lsp-make-request
-                                      "rust-analyzer/viewHir"
-                                      params))))
-    (let ((buf (get-buffer-create "*rust-analyzer hir*"))
-          (inhibit-read-only t))
-      (with-current-buffer buf
-        (special-mode)
-        (erase-buffer)
-        (insert results)
-        (pop-to-buffer buf)))))
-
-(defun lsp-rust-analyzer-join-lines ()
-  "Join selected lines into one, smartly fixing up whitespace and trailing commas."
-  (interactive)
-  (let* ((params (lsp-make-rust-analyzer-join-lines-params
-                  :text-document (lsp--text-document-identifier)
-                  :ranges (vector (if (use-region-p)
-                                      (lsp--region-to-range (region-beginning) (region-end))
-                                    (lsp--region-to-range (point) (point))))))
-         (result (lsp-send-request (lsp-make-request "experimental/joinLines" params))))
-    (lsp--apply-text-edits result 'code-action)))
-
-(defun lsp-rust-analyzer-reload-workspace ()
-  "Reload workspace, picking up changes from Cargo.toml"
-  (interactive)
-  (lsp--cur-workspace-check)
-  (lsp-send-request (lsp-make-request "rust-analyzer/reloadWorkspace")))
-
-(defcustom lsp-rust-analyzer-download-url
-  (let* ((x86 (string-prefix-p "x86_64" system-configuration))
-         (arch (if x86 "x86_64" "aarch64")))
-    (format "https://github.com/rust-lang/rust-analyzer/releases/latest/download/%s"
-            (pcase system-type
-              ('gnu/linux (format "rust-analyzer-%s-unknown-linux-gnu.gz" arch))
-              ('darwin (format "rust-analyzer-%s-apple-darwin.gz" arch))
-              ('windows-nt (format "rust-analyzer-%s-pc-windows-msvc.zip" arch)))))
-  "Automatic download url for Rust Analyzer"
-  :type 'string
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-rust-analyzer-store-path (f-join lsp-server-install-dir "rust"
-                                                (pcase system-type
-                                                  ('windows-nt "rust-analyzer.exe")
-                                                  (_ "rust-analyzer")))
-  "The path to the file in which `rust-analyzer' will be stored."
-  :type 'file
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-(lsp-dependency
- 'rust-analyzer
- `(:download :url lsp-rust-analyzer-download-url
-             :decompress ,(pcase system-type ('windows-nt :zip) (_ :gzip))
-             :store-path lsp-rust-analyzer-store-path
-             :set-executable? t)
- `(:system ,(file-name-nondirectory lsp-rust-analyzer-store-path)))
-
-(lsp-defun lsp-rust--analyzer-run-single ((&Command :arguments?))
-  (lsp-rust-analyzer-run (lsp-seq-first arguments?)))
-
-(lsp-defun lsp-rust--analyzer-show-references
-  ((&Command :title :arguments? [_uri _filepos references]))
-  (lsp-show-xrefs (lsp--locations-to-xref-items references) nil
-                  (s-contains-p "reference" title)))
-
-(declare-function dap-debug "ext:dap-mode" (template) t)
-
-(lsp-defun lsp-rust--analyzer-debug-lens ((&Command :arguments? [args]))
-  (lsp-rust-analyzer-debug args))
-
-;; Semantic tokens
-
-;; Modifier faces
-(defface lsp-rust-analyzer-documentation-modifier-face
-  '((t nil))
-  "The face modification to use for documentation items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-declaration-modifier-face
-  '((t nil))
-  "The face modification to use for declaration items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-definition-modifier-face
-  '((t nil))
-  "The face modification to use for definition items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-static-modifier-face
-  '((t nil))
-  "The face modification to use for static items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-abstract-modifier-face
-  '((t nil))
-  "The face modification to use for abstract items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-deprecated-modifier-face
-  '((t nil))
-  "The face modification to use for deprecated items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-readonly-modifier-face
-  '((t nil))
-  "The face modification to use for readonly items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-default-library-modifier-face
-  '((t nil))
-  "The face modification to use for default-library items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-async-modifier-face
-  '((t nil))
-  "The face modification to use for async items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-attribute-modifier-face
-  '((t nil))
-  "The face modification to use for attribute items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-callable-modifier-face
-  '((t nil))
-  "The face modification to use for callable items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-constant-modifier-face
-  '((t nil))
-  "The face modification to use for constant items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-consuming-modifier-face
-  '((t nil))
-  "The face modification to use for consuming items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-control-flow-modifier-face
-  '((t nil))
-  "The face modification to use for control-flow items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-crate-root-modifier-face
-  '((t nil))
-  "The face modification to use for crate-root items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-injected-modifier-face
-  '((t nil))
-  "The face modification to use for injected items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-intra-doc-link-modifier-face
-  '((t nil))
-  "The face modification to use for intra-doc-link items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-library-modifier-face
-  '((t nil))
-  "The face modification to use for library items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-mutable-modifier-face
-  '((t :underline t))
-  "The face modification to use for mutable items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-public-modifier-face
-  '((t nil))
-  "The face modification to use for public items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-reference-modifier-face
-  '((t :bold t))
-  "The face modification to use for reference items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-trait-modifier-face
-  '((t nil))
-  "The face modification to use for trait items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-(defface lsp-rust-analyzer-unsafe-modifier-face
-  '((t nil))
-  "The face modification to use for unsafe items."
-  :group 'lsp-rust-analyzer-semantic-tokens)
-
-
-;; ---------------------------------------------------------------------
-;; Semantic token modifier face customization
-
-(defcustom lsp-rust-analyzer-documentation-modifier 'lsp-rust-analyzer-documentation-modifier-face
-  "Face for semantic token modifier for `documentation' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-declaration-modifier 'lsp-rust-analyzer-declaration-modifier-face
-  "Face for semantic token modifier for `declaration' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-definition-modifier 'lsp-rust-analyzer-definition-modifier-face
-  "Face for semantic token modifier for `definition' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-static-modifier 'lsp-rust-analyzer-static-modifier-face
-  "Face for semantic token modifier for `static' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-abstract-modifier 'lsp-rust-analyzer-abstract-modifier-face
-  "Face for semantic token modifier for `abstract' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-deprecated-modifier 'lsp-rust-analyzer-deprecated-modifier-face
-  "Face for semantic token modifier for `deprecated' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-readonly-modifier 'lsp-rust-analyzer-readonly-modifier-face
-  "Face for semantic token modifier for `readonly' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-default-library-modifier 'lsp-rust-analyzer-default-library-modifier-face
-  "Face for semantic token modifier for `default' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-async-modifier 'lsp-rust-analyzer-async-modifier-face
-  "Face for semantic token modifier for `async' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-attribute-modifier 'lsp-rust-analyzer-attribute-modifier-face
-  "Face for semantic token modifier for `attribute' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-callable-modifier 'lsp-rust-analyzer-callable-modifier-face
-  "Face for semantic token modifier for `callable' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-constant-modifier 'lsp-rust-analyzer-constant-modifier-face
-  "Face for semantic token modifier for `constant' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-consuming-modifier 'lsp-rust-analyzer-consuming-modifier-face
-  "Face for semantic token modifier for `consuming' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-control-flow-modifier 'lsp-rust-analyzer-control-flow-modifier-face
-  "Face for semantic token modifier for `control_flow' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-crate-root-modifier 'lsp-rust-analyzer-crate-root-modifier-face
-  "Face for semantic token modifier for `crate_root' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-injected-modifier 'lsp-rust-analyzer-injected-modifier-face
-  "Face for semantic token modifier for `injected' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-intra-doc-link-modifier 'lsp-rust-analyzer-intra-doc-link-modifier-face
-  "Face for semantic token modifier for `intra_doc_link' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-library-modifier 'lsp-rust-analyzer-library-modifier-face
-  "Face for semantic token modifier for `library' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-mutable-modifier 'lsp-rust-analyzer-mutable-modifier-face
-  "Face for semantic token modifier for `mutable' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-public-modifier 'lsp-rust-analyzer-public-modifier-face
-  "Face for semantic token modifier for `public' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-reference-modifier 'lsp-rust-analyzer-reference-modifier-face
-  "Face for semantic token modifier for `reference' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-trait-modifier 'lsp-rust-analyzer-trait-modifier-face
-  "Face for semantic token modifier for `trait' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-unsafe-modifier 'lsp-rust-analyzer-unsafe-modifier-face
-  "Face for semantic token modifier for `unsafe' attribute."
-  :type 'face
-  :group 'lsp-rust-analyzer-semantic-tokens
-  :package-version '(lsp-mode . "9.0.0"))
-
-;; ---------------------------------------------------------------------
-
-(defun lsp-rust-analyzer--semantic-modifiers ()
-  "Mapping between rust-analyzer keywords and fonts to apply.
-The keywords are sent in the initialize response, in the semantic
-tokens legend."
-  `(("documentation"   . ,lsp-rust-analyzer-documentation-modifier)
-    ("declaration"     . ,lsp-rust-analyzer-declaration-modifier)
-    ("definition"      . ,lsp-rust-analyzer-definition-modifier)
-    ("static"          . ,lsp-rust-analyzer-static-modifier)
-    ("abstract"        . ,lsp-rust-analyzer-abstract-modifier)
-    ("deprecated"      . ,lsp-rust-analyzer-deprecated-modifier)
-    ("readonly"        . ,lsp-rust-analyzer-readonly-modifier)
-    ("default_library" . ,lsp-rust-analyzer-default-library-modifier)
-    ("async"           . ,lsp-rust-analyzer-async-modifier)
-    ("attribute"       . ,lsp-rust-analyzer-attribute-modifier)
-    ("callable"        . ,lsp-rust-analyzer-callable-modifier)
-    ("constant"        . ,lsp-rust-analyzer-constant-modifier)
-    ("consuming"       . ,lsp-rust-analyzer-consuming-modifier)
-    ("control_flow"    . ,lsp-rust-analyzer-control-flow-modifier)
-    ("crate_root"      . ,lsp-rust-analyzer-crate-root-modifier)
-    ("injected"        . ,lsp-rust-analyzer-injected-modifier)
-    ("intra_doc_link"  . ,lsp-rust-analyzer-intra-doc-link-modifier)
-    ("library"         . ,lsp-rust-analyzer-library-modifier)
-    ("mutable"         . ,lsp-rust-analyzer-mutable-modifier)
-    ("public"          . ,lsp-rust-analyzer-public-modifier)
-    ("reference"       . ,lsp-rust-analyzer-reference-modifier)
-    ("trait"           . ,lsp-rust-analyzer-trait-modifier)
-    ("unsafe"          . ,lsp-rust-analyzer-unsafe-modifier)))
-
-(defun lsp-rust-switch-server (&optional lsp-server)
-  "Switch priorities of lsp servers, unless LSP-SERVER is already active."
-  (interactive)
-  (let ((current-server (if (> (lsp--client-priority (gethash 'rls lsp-clients)) 0)
-                            'rls
-                          'rust-analyzer)))
-    (unless (eq lsp-server current-server)
-      (dolist (server '(rls rust-analyzer))
-        (when (natnump (setf (lsp--client-priority (gethash server lsp-clients))
-                             (* (lsp--client-priority (gethash server lsp-clients)) -1)))
-          (message (format "Switched to server %s." server)))))))
-
-;;
-;;; Inlay hints
-
-(defcustom lsp-rust-analyzer-debug-lens-extra-dap-args
-  '(:MIMode "gdb" :miDebuggerPath "gdb" :stopAtEntry t :externalConsole :json-false)
-  "Extra arguments to pass to DAP template when debugging a test from code lens.
-
-As a rule of the thumb, do not add extra keys to this plist unless you exactly
-what you are doing, it might break the \"Debug test\" lens otherwise.
-
-See dap-mode documentation and cpptools documentation for the extra variables
-meaning."
-  :type 'plist
-  :group 'lsp-rust-analyzer
-  :package-version '(lsp-mode . "8.0.0"))
-
-;;
-;;; Lenses
-
-(defgroup lsp-rust-analyzer-lens nil
-  "LSP lens support for Rust when using rust-analyzer.
-
-Lenses are (depending on your configuration) clickable links to
-the right of function definitions and the like. These display
-some useful information in their own right and/or perform a
-shortcut action when clicked such as displaying uses of that
-function or running an individual test.
-"
-  :prefix "lsp-rust-analyzer-lens-"
-  :group 'lsp-rust-analyzer
-  :link '(url-link "https://emacs-lsp.github.io/lsp-mode/")
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-debug-enable t
-  "Enable or disable the Debug lens."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-enable t
-  "Master-enable of lenses in Rust files."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-;; This customisation "works" in that it works as described, but the default is fine and changing it
-;; from the default will either stop lenses working or do nothing.
-;;
-;; If this is ever uncommented to re-enable the option, don't forget to also uncomment it in defun
-;; lsp-rust-analyzer--make-init-options too or it'll not do anything.
-
-;; (defcustom lsp-rust-analyzer-lens-force-custom-commands t
-;;   "Internal config: use custom client-side commands even when the
-;; client doesn't set the corresponding capability."
-;;   :type 'boolean
-;;   :group 'lsp-rust-analyzer-lens
-;;   :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-implementations-enable t
-  "Enable or disable the Implementations lens.
-
-The Implementations lens shows `NN implementations' to the right
-of the first line of an enum, struct, or union declaration. This
-is the count of impl blocks, including derived traits. Clicking
-on it gives a list of the impls of that type.
-"
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-;; The valid range of values for this is documented in the rust-lang/rust-analyzer repository at the
-;; path "editors/code/package.json"; the TL:DR is that it's "above_name" or "above_whole_item".
-;; However, setting it to "above_whole_item" causes lenses to disappear in Emacs. I suspect this
-;; feature has only ever been tested in some other IDE and it's broken in Emacs. So I've disabled it
-;; for now.
-;;
-;; If this is ever uncommented to re-enable the option, don't forget to also uncomment it in defun
-;; lsp-rust-analyzer--make-init-options too or it'll not do anything.
-
-;; (defcustom lsp-rust-analyzer-lens-location "above_name"
-;;   "Where to render annotations."
-;;    :type '(choice
-;;            (const :tag "Above name" "above_name")
-;;            (const :tag "Above whole item" "above_whole_item")
-;;    :group 'lsp-rust-analyzer-lens
-;;    :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-references-adt-enable nil
-  "Enable or disable the References lens on enums, structs, and traits.
-
-The References lens shows `NN references` to the right of the
-first line of each enum, struct, or union declaration. This is
-the count of uses of that type. Clicking on it gives a list of
-where that type is used."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-references-enum-variant-enable nil
-  "Enable or disable the References lens on enum variants.
-
-The References lens shows `NN references` to the right of the
-first (or only) line of each enum variant. This is the count of
-uses of that enum variant. Clicking on it gives a list of where
-that enum variant is used."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-references-method-enable nil
-  "Enable or disable the References lens on functions.
-
-The References lens shows `NN references` to the right of the
-first line of each function declaration. This is the count of
-uses of that function. Clicking on it gives a list of where that
-function is used."
-
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-references-trait-enable nil
-  "Enable or disable the References lens on traits.
-
-The References lens shows `NN references` to the right of the
-first line of each trait declaration. This is a count of uses of
-that trait. Clicking on it gives a list of where that trait is
-used.
-
-There is some overlap with the Implementations lens which slows
-all of the trait's impl blocks, but this also shows other uses
-such as imports and dyn traits."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defcustom lsp-rust-analyzer-lens-run-enable t
-  "Enable or disable the Run lens."
-  :type 'boolean
-  :group 'lsp-rust-analyzer-lens
-  :package-version '(lsp-mode . "9.0.0"))
-
-(defun lsp-rust-analyzer-initialized? ()
-  (when-let ((workspace (lsp-find-workspace 'rust-analyzer (buffer-file-name))))
-    (eq 'initialized (lsp--workspace-status workspace))))
-
-(defun lsp-rust-analyzer-expand-macro ()
-  "Expands the macro call at point recursively."
-  (interactive)
-  (-if-let* ((params (lsp-make-rust-analyzer-expand-macro-params
-                      :text-document (lsp--text-document-identifier)
-                      :position (lsp--cur-position)))
-             (response (lsp-request
-                        "rust-analyzer/expandMacro"
-                        params))
-             ((&rust-analyzer:ExpandedMacro :expansion) response))
-      (funcall lsp-rust-analyzer-macro-expansion-method expansion)
-    (lsp--error "No macro found at point, or it could not be expanded.")))
-
-(defun lsp-rust-analyzer-macro-expansion-default (result)
-  "Default method for displaying macro expansion."
-  (let* ((root (lsp-workspace-root default-directory))
-         (buf (get-buffer-create (get-buffer-create (format "*rust-analyzer macro expansion %s*" root)))))
-    (with-current-buffer buf
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (insert (lsp--render-string result "rust"))
-        (special-mode)))
-    (pop-to-buffer buf)))
-
-;;
-;;; Runnables
-
-(defvar lsp-rust-analyzer--last-runnable nil
-  "Record the last runnable.")
-
-(defun lsp-rust-analyzer--runnables ()
-  "Return list of runnables."
-  (lsp-send-request (lsp-make-request
-                     "experimental/runnables"
-                     (lsp-make-rust-analyzer-runnables-params
-                      :text-document (lsp--text-document-identifier)
-                      :position? (lsp--cur-position)))))
-
-(defun lsp-rust-analyzer--select-runnable ()
-  "Select runnable."
-  (lsp--completing-read
-   "Select runnable:"
-   (if lsp-rust-analyzer--last-runnable
-       (cons lsp-rust-analyzer--last-runnable
-             (-remove (-lambda ((&rust-analyzer:Runnable :label))
-                        (equal label (lsp-get lsp-rust-analyzer--last-runnable :label)))
-                      (lsp-rust-analyzer--runnables)))
-     (lsp-rust-analyzer--runnables))
-   (-lambda ((&rust-analyzer:Runnable :label)) label)))
-
-(defun lsp-rust-analyzer--common-runner (runnable)
-  "Execute a given RUNNABLE.
-
-Extract the arguments, prepare the minor mode (cargo-process-mode if possible)
-and run a compilation"
-  (-let* (((&rust-analyzer:Runnable :kind :label :args) runnable)
-          ((&rust-analyzer:RunnableArgs :cargo-args :executable-args :workspace-root? :expect-test?) args)
-          (default-directory (or workspace-root? default-directory)))
-    (if (not (string-equal kind "cargo"))
-        (lsp--error "'%s' runnable is not supported" kind)
-      (compilation-start
-       (string-join (append (when expect-test? '("env" "UPDATE_EXPECT=1"))
-                            (list "cargo") cargo-args
-                            (when executable-args '("--")) executable-args '()) " ")
-
-       ;; cargo-process-mode is nice, but try to work without it...
-       (if (functionp 'cargo-process-mode) 'cargo-process-mode nil)
-       (lambda (_) (concat "*" label "*"))))))
-
-(defun lsp-rust-analyzer-run (runnable)
-  "Select and run a RUNNABLE action."
-  (interactive (list (lsp-rust-analyzer--select-runnable)))
-  (when (lsp-rust-analyzer--common-runner runnable)
-    (setq lsp-rust-analyzer--last-runnable runnable)))
-
-(defun lsp-rust-analyzer-debug (runnable)
-  "Select and debug a RUNNABLE action."
-  (interactive (list (lsp-rust-analyzer--select-runnable)))
-  (unless (featurep 'dap-cpptools)
-    (user-error "You must require `dap-cpptools'"))
-  (-let (((&rust-analyzer:Runnable
-           :args (&rust-analyzer:RunnableArgs :cargo-args :workspace-root? :executable-args)
-           :label) runnable))
-    (pcase (aref cargo-args 0)
-      ("run" (aset cargo-args 0 "build"))
-      ("test" (when (-contains? (append cargo-args ()) "--no-run")
-                (cl-callf append cargo-args (list "--no-run")))))
-    (->> (append (list (executable-find "cargo"))
-                 cargo-args
-                 (list "--message-format=json"))
-         (s-join " ")
-         (shell-command-to-string)
-         (s-lines)
-         (-keep (lambda (s)
-                  (condition-case nil
-                      (-let* ((json-object-type 'plist)
-                              ((msg &as &plist :reason :executable) (json-read-from-string s)))
-                        (when (and executable (string= "compiler-artifact" reason))
-                          executable))
-                    (error))))
-         (funcall
-          (lambda (artifact-spec)
-            (pcase artifact-spec
-              (`() (user-error "No compilation artifacts or obtaining the runnable artifacts failed"))
-              (`(,spec) spec)
-              (_ (user-error "Multiple compilation artifacts are not supported")))))
-         (list :type "cppdbg"
-               :request "launch"
-               :name label
-               :args executable-args
-               :cwd workspace-root?
-               :sourceLanguages ["rust"]
-               :program)
-         (append lsp-rust-analyzer-debug-lens-extra-dap-args)
-         (dap-debug))))
-
-(defun lsp-rust-analyzer-rerun (&optional runnable)
-  (interactive (list (or lsp-rust-analyzer--last-runnable
-                         (lsp-rust-analyzer--select-runnable))))
-  (lsp-rust-analyzer-run (or runnable lsp-rust-analyzer--last-runnable)))
-
-;; goto parent module
-(cl-defun lsp-rust-find-parent-module (&key display-action)
-  "Find parent module of current module."
-  (interactive)
-  (lsp-find-locations "experimental/parentModule" nil :display-action display-action))
-
-(defun lsp-rust-analyzer-open-cargo-toml (&optional new-window)
-  "Open the closest Cargo.toml from the current file.
-
-Rust-Analyzer LSP protocol documented here and added in November 2020
-https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-cargotoml
-
-If NEW-WINDOW (interactively the prefix argument) is non-nil,
-open in a new window."
-  (interactive "P")
-  (-if-let (workspace (lsp-find-workspace 'rust-analyzer (buffer-file-name)))
-      (-if-let* ((response (with-lsp-workspace workspace
-                             (lsp-send-request (lsp-make-request
-                                                "experimental/openCargoToml"
-                                                (lsp-make-rust-analyzer-open-cargo-toml-params
-                                                 :text-document (lsp--text-document-identifier))))))
-                 ((&Location :uri :range) response))
-          (funcall (if new-window #'find-file-other-window #'find-file)
-                   (lsp--uri-to-path uri))
-        (lsp--warn "Couldn't find a Cargo.toml file or your version of rust-analyzer doesn't support this extension"))
-    (lsp--error "OpenCargoToml is an extension available only with rust-analyzer")))
-
-(defun lsp-rust-analyzer-open-external-docs ()
-  "Open a URL for documentation related to the current TextDocumentPosition.
-
-Rust-Analyzer LSP protocol documented here
-https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-external-documentation"
-  (interactive)
-  (-if-let* ((params (lsp-make-rust-analyzer-open-external-docs-params
-                      :text-document (lsp--text-document-identifier)
-                      :position (lsp--cur-position)))
-             (url (lsp-request "experimental/externalDocs" params)))
-      (browse-url url)
-    (lsp--warn "Couldn't find documentation URL or your version of rust-analyzer doesn't support this extension")))
-
-(defun lsp-rust-analyzer--related-tests ()
-  "Get runnable test items related to the current TextDocumentPosition.
-Calls a rust-analyzer LSP extension endpoint that returns a wrapper over
-Runnable[]."
-  (lsp-send-request (lsp-make-request
-                     "rust-analyzer/relatedTests"
-                     (lsp--text-document-position-params))))
-
-(defun lsp-rust-analyzer--select-related-test ()
-  "Call the endpoint and ask for user selection.
-
-Cannot reuse `lsp-rust-analyzer--select-runnable' because the runnables endpoint
-responds with Runnable[], while relatedTests responds with TestInfo[],
-which is a wrapper over runnable. Also, this method doesn't set
-the `lsp-rust-analyzer--last-runnable' variable."
-  (-if-let* ((resp (lsp-rust-analyzer--related-tests))
-             (runnables (seq-map
-                         #'lsp:rust-analyzer-related-tests-runnable
-                         resp)))
-      (lsp--completing-read
-       "Select test: "
-       runnables
-       #'lsp:rust-analyzer-runnable-label)))
-
-(defun lsp-rust-analyzer-related-tests (runnable)
-  "Execute a RUNNABLE test related to the current document position.
-
-Rust-Analyzer LSP protocol extension
-https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#related-tests"
-  (interactive (list (lsp-rust-analyzer--select-related-test)))
-  (if runnable
-      (lsp-rust-analyzer--common-runner runnable)
-    (lsp--info "There are no tests related to the symbol at point")))
-
-(defun lsp-rust-analyzer-move-item (direction)
-  "Move item under cursor or selection in some DIRECTION"
-  (let* ((params (lsp-make-rust-analyzer-move-item-params
-                  :text-document (lsp--text-document-identifier)
-                  :range (if (use-region-p)
-                             (lsp--region-to-range (region-beginning) (region-end))
-                           (lsp--region-to-range (point) (point)))
-                  :direction direction))
-         (edits (lsp-request "experimental/moveItem" params)))
-    (lsp--apply-text-edits edits 'code-action)))
-
-(defun lsp-rust-analyzer-move-item-up ()
-  "Move item under cursor or selection up"
-  (interactive)
-  (lsp-rust-analyzer-move-item "Up"))
-
-(defun lsp-rust-analyzer-move-item-down ()
-  "Move item under cursor or selection down"
-  (interactive)
-  (lsp-rust-analyzer-move-item "Down"))
-
-(defun lsp-rust-analyzer--make-init-options ()
-  "Init options for rust-analyzer"
-  `(:diagnostics
-    ( :enable ,(lsp-json-bool lsp-rust-analyzer-diagnostics-enable)
-      :enableExperimental ,(lsp-json-bool lsp-rust-analyzer-diagnostics-enable-experimental)
-      :disabled ,lsp-rust-analyzer-diagnostics-disabled
-      :warningsAsHint ,lsp-rust-analyzer-diagnostics-warnings-as-hint
-      :warningsAsInfo ,lsp-rust-analyzer-diagnostics-warnings-as-info)
-    :imports ( :granularity ( :enforce ,(lsp-json-bool lsp-rust-analyzer-import-enforce-granularity)
-                              :group ,lsp-rust-analyzer-import-granularity)
-               :group ,(lsp-json-bool lsp-rust-analyzer-import-group)
-               :merge (:glob ,(lsp-json-bool lsp-rust-analyzer-imports-merge-glob))
-               :prefix ,lsp-rust-analyzer-import-prefix)
-    :lruCapacity ,lsp-rust-analyzer-lru-capacity
-    :checkOnSave ( :enable ,(lsp-json-bool lsp-rust-analyzer-cargo-watch-enable)
-                   :command ,lsp-rust-analyzer-cargo-watch-command
-                   :extraArgs ,lsp-rust-analyzer-cargo-watch-args
-                   :allTargets ,(lsp-json-bool lsp-rust-analyzer-check-all-targets)
-                   :features ,lsp-rust-analyzer-checkonsave-features
-                   :overrideCommand ,lsp-rust-analyzer-cargo-override-command)
-    :highlightRelated ( :breakPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-breakpoints))
-                        :closureCaptures (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-closure-captures))
-                        :exitPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-exit-points))
-                        :references (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-references))
-                        :yieldPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-yield-points)))
-    :files ( :exclude ,lsp-rust-analyzer-exclude-globs
-             :watcher ,(if lsp-rust-analyzer-use-client-watching "client" "notify")
-             :excludeDirs ,lsp-rust-analyzer-exclude-dirs)
-    :cargo ( :allFeatures ,(lsp-json-bool lsp-rust-all-features)
-             :noDefaultFeatures ,(lsp-json-bool lsp-rust-no-default-features)
-             :features ,lsp-rust-features
-             :extraArgs ,lsp-rust-analyzer-cargo-extra-args
-             :extraEnv ,lsp-rust-analyzer-cargo-extra-env
-             :target ,lsp-rust-analyzer-cargo-target
-             :runBuildScripts ,(lsp-json-bool lsp-rust-analyzer-cargo-run-build-scripts)
-             ;; Obsolete, but used by old Rust-Analyzer versions
-             :loadOutDirsFromCheck ,(lsp-json-bool lsp-rust-analyzer-cargo-run-build-scripts)
-             :autoreload ,(lsp-json-bool lsp-rust-analyzer-cargo-auto-reload)
-             :useRustcWrapperForBuildScripts ,(lsp-json-bool lsp-rust-analyzer-use-rustc-wrapper-for-build-scripts)
-             :unsetTest ,lsp-rust-analyzer-cargo-unset-test)
-    :rustfmt ( :extraArgs ,lsp-rust-analyzer-rustfmt-extra-args
-               :overrideCommand ,lsp-rust-analyzer-rustfmt-override-command
-               :rangeFormatting (:enable ,(lsp-json-bool lsp-rust-analyzer-rustfmt-rangeformatting-enable)))
-    :lens ( :debug (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-debug-enable))
-            :enable ,(lsp-json-bool lsp-rust-analyzer-lens-enable)
-            ;; :forceCustomCommands ,(lsp-json-bool lsp-rust-analyzer-lens-force-custom-commands)
-            :implementations (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-implementations-enable))
-            ;; :location ,lsp-rust-analyzer-lens-location
-            :references ( :adt (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-adt-enable))
-                          :enumVariant (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-enum-variant-enable))
-                          :method (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-method-enable))
-                          :trait (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-trait-enable)))
-            :run (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-run-enable)))
-
-    :inlayHints ( :bindingModeHints (:enable ,(lsp-json-bool lsp-rust-analyzer-binding-mode-hints))
-                  :chainingHints (:enable ,(lsp-json-bool lsp-rust-analyzer-display-chaining-hints))
-                  :closingBraceHints ( :enable ,(lsp-json-bool lsp-rust-analyzer-closing-brace-hints)
-                                       :minLines ,lsp-rust-analyzer-closing-brace-hints-min-lines)
-                  :closureCaptureHints (:enable ,(lsp-json-bool lsp-rust-analyzer-closure-capture-hints))
-                  :closureReturnTypeHints (:enable ,lsp-rust-analyzer-closure-return-type-hints)
-                  :closureStyle ,lsp-rust-analyzer-closure-style
-                  :discriminantHints (:enable ,lsp-rust-analyzer-discriminants-hints)
-
-                  :expressionAdjustmentHints ( :enable ,lsp-rust-analyzer-expression-adjustment-hints
-                                               :hideOutsideUnsafe ,(lsp-json-bool lsp-rust-analyzer-expression-adjustment-hide-unsafe)
-                                               :mode ,lsp-rust-analyzer-expression-adjustment-hints-mode)
-                  :implicitDrops (:enable ,(lsp-json-bool lsp-rust-analyzer-implicit-drops))
-                  :lifetimeElisionHints ( :enable ,lsp-rust-analyzer-display-lifetime-elision-hints-enable
-                                          :useParameterNames ,(lsp-json-bool lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names))
-                  :maxLength ,lsp-rust-analyzer-max-inlay-hint-length
-                  :parameterHints (:enable ,(lsp-json-bool lsp-rust-analyzer-display-parameter-hints))
-                  :reborrowHints (:enable ,lsp-rust-analyzer-display-reborrow-hints)
-                  :renderColons ,(lsp-json-bool lsp-rust-analyzer-server-format-inlay-hints)
-                  :typeHints ( :enable ,(lsp-json-bool lsp-inlay-hint-enable)
-                               :hideClosureInitialization ,(lsp-json-bool lsp-rust-analyzer-hide-closure-initialization)
-                               :hideNamedConstructor ,(lsp-json-bool lsp-rust-analyzer-hide-named-constructor)))
-    :completion ( :addCallParenthesis ,(lsp-json-bool lsp-rust-analyzer-completion-add-call-parenthesis)
-                  :addCallArgumentSnippets ,(lsp-json-bool lsp-rust-analyzer-completion-add-call-argument-snippets)
-                  :postfix (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-postfix-enable))
-                  :autoimport (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-auto-import-enable))
-                  :autoself (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-auto-self-enable)))
-    :callInfo (:full ,(lsp-json-bool lsp-rust-analyzer-call-info-full))
-    :procMacro (:enable ,(lsp-json-bool lsp-rust-analyzer-proc-macro-enable))
-    :rustcSource ,lsp-rust-analyzer-rustc-source
-    :linkedProjects ,lsp-rust-analyzer-linked-projects
-    :highlighting (:strings ,(lsp-json-bool lsp-rust-analyzer-highlighting-strings))
-    :experimental (:procAttrMacros ,(lsp-json-bool lsp-rust-analyzer-experimental-proc-attr-macros))))
-
-(lsp-register-client
- (make-lsp-client
-  :new-connection (lsp-stdio-connection
-                   (lambda ()
-                     `(,(or (executable-find
-                             (cl-first lsp-rust-analyzer-server-command))
-                            (lsp-package-path 'rust-analyzer)
-                            "rust-analyzer")
-                       ,@(cl-rest lsp-rust-analyzer-server-command))))
-  :activation-fn (lsp-activate-on "rust")
-  :priority (if (eq lsp-rust-server 'rust-analyzer) 1 -1)
-  :initialization-options 'lsp-rust-analyzer--make-init-options
-  :notification-handlers (ht<-alist lsp-rust-notification-handlers)
-  :action-handlers (ht ("rust-analyzer.runSingle" #'lsp-rust--analyzer-run-single)
-                       ("rust-analyzer.debugSingle" #'lsp-rust--analyzer-debug-lens)
-                       ("rust-analyzer.showReferences" #'lsp-rust--analyzer-show-references)
-                       ("rust-analyzer.triggerParameterHints" #'lsp--action-trigger-parameter-hints))
-  :library-folders-fn (lambda (_workspace) lsp-rust-analyzer-library-directories)
-  :semantic-tokens-faces-overrides `( :discard-default-modifiers t
-                                      :modifiers ,(lsp-rust-analyzer--semantic-modifiers))
-  :server-id 'rust-analyzer
-  :custom-capabilities `((experimental . ((snippetTextEdit . ,(and lsp-enable-snippet (fboundp 'yas-minor-mode))))))
-  :download-server-fn (lambda (_client callback error-callback _update?)
-                        (lsp-package-ensure 'rust-analyzer callback error-callback))))
-
-(lsp-consistency-check lsp-rust)
-
-(provide 'lsp-rust)
-;;; lsp-rust.el ends here
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rust.elc b/emacs/elpa/lsp-mode-20240427.2141/lsp-rust.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.el b/emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.el
@@ -1,192 +0,0 @@
-;;; lsp-sqls.el --- SQL Client settings -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2020 Shunya Ishii
-
-;; Author: Shunya Ishii
-;; Keywords: sql lsp
-
-;; 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 client for SQL
-
-;;; Code:
-
-(require 'lsp-mode)
-
-(defgroup lsp-sqls nil
-  "LSP support for SQL, using sqls."
-  :group 'lsp-mode
-  :link '(url-link "https://github.com/lighttiger2505/sqls")
-  :package-version `(lsp-mode . "7.0"))
-
-(defcustom lsp-sqls-server "sqls"
-  "Path to the `sqls` binary."
-  :group 'lsp-sqls
-  :risky t
-  :type 'file
-  :package-version `(lsp-mode . "7.0"))
-
-(defcustom lsp-sqls-workspace-config-path "workspace"
-  "If non-nil then setup workspace configuration with json file path."
-  :group 'lsp-sqls
-  :risky t
-  :type '(choice (const "workspace")
-                 (const "root"))
-  :package-version `(lsp-mode . "7.0"))
-
-(defun lsp-sqls--make-launch-cmd ()
-  (-let [base `(,lsp-sqls-server)]
-    ;; we can add some options to command. (e.g. "-config")
-    base))
-
-
-(defcustom lsp-sqls-timeout 0.5
-  "Timeout to use for `sqls' requests."
-  :type 'number
-  :package-version '(lsp-mode . "8.0.0"))
-
-(defcustom lsp-sqls-connections nil
-  "The connections to the SQL server(s)."
-  :type '(repeat (alist :key-type (choice
-                                   (const :tag "Driver" driver)
-                                   (const :tag "Connection String" dataSourceName))
-                        :value-type string)))
-
-(defun lsp-sqls-setup-workspace-configuration ()
-  "Setup workspace configuration using json file.
-Depending on `lsp-sqls-workspace-config-path'."
-
-  (if lsp-sqls-connections
-      (lsp--set-configuration `(:sqls (:connections ,(apply #'vector lsp-sqls-connections))))
-    (when-let ((config-json-path (cond
-                                  ((equal lsp-sqls-workspace-config-path "workspace")
-                                   ".sqls/config.json")
-                                  ((equal lsp-sqls-workspace-config-path "root")
-                                   (-> (lsp-workspace-root)
-                                       (f-join ".sqls/config.json"))))))
-      (when (file-exists-p config-json-path)
-        (lsp--set-configuration (lsp--read-json-file config-json-path))))))
-
-(defun lsp-sqls--show-results (result)
-  (with-current-buffer (get-buffer-create "*sqls results*")
-    (with-help-window (buffer-name)
-      (erase-buffer)
-      (insert result))))
-
-(defun lsp-sql-execute-query (&optional command start end)
-  "Execute COMMAND on buffer text against current database.
-Buffer text is between START and END.  If START and END are nil,
-use the current region if set, otherwise the entire buffer."
-  (interactive)
-  (lsp-sqls--show-results
-   (lsp-request
-    "workspace/executeCommand"
-    (list :command "executeQuery"
-          :arguments (or
-                      (when command
-                        (lsp:command-arguments? command))
-                      (vector (lsp--buffer-uri)))
-          :timeout lsp-sqls-timeout
-          :range (list
-                  :start (lsp--point-to-position
-                          (cond
-                           (start start)
-                           ((use-region-p) (region-beginning))
-                            (t (point-min))))
-                  :end (lsp--point-to-position
-                        (cond
-                         (end end)
-                         ((use-region-p) (region-end))
-                         (t (point-max)))))))))
-
-(defun lsp-sql-execute-paragraph (&optional command)
-  "Execute COMMAND on paragraph against current database."
-  (interactive)
-  (let ((start (save-excursion (backward-paragraph) (point)))
-        (end (save-excursion (forward-paragraph) (point))))
-    (lsp-sql-execute-query command start end)))
-
-(defun lsp-sql-show-databases (&optional _command)
-  "Show databases."
-  (interactive)
-  (lsp-sqls--show-results
-   (lsp-request
-    "workspace/executeCommand"
-    (list :command "showDatabases" :timeout lsp-sqls-timeout))))
-
-(defun lsp-sql-show-schemas (&optional _command)
-  "Show schemas."
-  (interactive)
-  (lsp-sqls--show-results
-   (lsp-request
-    "workspace/executeCommand"
-    (list :command "showSchemas" :timeout lsp-sqls-timeout))))
-
-(defun lsp-sql-show-connections (&optional _command)
-  "Show connections."
-  (interactive)
-  (lsp-sqls--show-results
-   (lsp-request
-    "workspace/executeCommand"
-    (list :command "showConnections" :timeout lsp-sqls-timeout))))
-
-(defun lsp-sql-switch-database (&optional _command)
-  "Switch database."
-  (interactive)
-  (lsp-workspace-command-execute
-   "switchDatabase"
-   (vector (completing-read
-            "Select database: "
-            (s-lines (lsp-workspace-command-execute "showDatabases"))
-            nil
-            t))))
-
-(defun lsp-sql-switch-connection (&optional _command)
-  "Switch connection."
-  (interactive)
-  (lsp-workspace-command-execute
-   "switchConnections"
-   (vector (cl-first
-            (s-match "\\([[:digit:]]*\\)"
-                     (completing-read
-                      "Select connection: "
-                      (s-lines (lsp-workspace-command-execute  "showConnections"))
-                      nil
-                      t))))))
-
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection #'lsp-sqls--make-launch-cmd)
-                  :major-modes '(sql-mode)
-                  :priority -1
-                  :action-handlers (ht ("executeParagraph" #'lsp-sql-execute-paragraph)
-                                       ("executeQuery" #'lsp-sql-execute-query)
-                                       ("showDatabases" #'lsp-sql-show-databases)
-                                       ("showSchemas" #'lsp-sql-show-schemas)
-                                       ("showConnections" #'lsp-sql-show-connections)
-                                       ("switchDatabase" #'lsp-sql-switch-database)
-                                       ("switchConnections" #'lsp-sql-switch-connection))
-                  :server-id 'sqls
-                  :initialized-fn (lambda (workspace)
-                                    (-> workspace
-                                        (lsp--workspace-server-capabilities)
-                                        (lsp:set-server-capabilities-execute-command-provider? t))
-                                    (with-lsp-workspace workspace
-                                      (lsp-sqls-setup-workspace-configuration)))))
-
-(lsp-consistency-check lsp-sqls)
-
-(provide 'lsp-sqls)
-;;; lsp-sqls.el ends here
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.elc b/emacs/elpa/lsp-mode-20240427.2141/lsp-sqls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-actionscript.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-actionscript.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-actionscript.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-actionscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ada.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ada.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ada.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ada.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-angular.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-angular.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-angular.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-angular.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ansible.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ansible.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ansible.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ansible.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-asm.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-asm.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-asm.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-asm.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-astro.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-astro.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-astro.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-astro.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-autotools.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-autotools.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-autotools.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-autotools.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-awk.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-awk.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-awk.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-awk.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-bash.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-bash.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-bash.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-bash.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-beancount.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-beancount.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-beancount.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-beancount.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-bufls.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-bufls.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-bufls.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-bufls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-camel.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-camel.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-camel.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-camel.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-clangd.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-clangd.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-clangd.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-clangd.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-clojure.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-clojure.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-clojure.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-clojure.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cmake.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-cmake.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cmake.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-cmake.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cobol.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-cobol.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cobol.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-cobol.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-completion.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-completion.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-completion.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-completion.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-credo.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-credo.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-credo.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-credo.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-crystal.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-crystal.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-crystal.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-crystal.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-csharp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-csharp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-csharp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-csharp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-css.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-css.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-css.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-css.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cucumber.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-cucumber.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cucumber.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-cucumber.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cypher.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-cypher.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-cypher.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-cypher.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-d.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-d.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-d.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-d.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dhall.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-dhall.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dhall.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-dhall.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-diagnostics.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-diagnostics.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-diagnostics.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-diagnostics.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dired.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-dired.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dired.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-dired.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dockerfile.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-dockerfile.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dockerfile.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-dockerfile.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dot.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-dot.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-dot.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-dot.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-elixir.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-elixir.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-elixir.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-elixir.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-elm.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-elm.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-elm.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-elm.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-emmet.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-emmet.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-emmet.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-emmet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-erlang.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-erlang.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-erlang.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-erlang.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-eslint.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-eslint.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-eslint.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-eslint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-fortran.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-fortran.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-fortran.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-fortran.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-fsharp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-fsharp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-fsharp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-fsharp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-gdscript.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-gdscript.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-gdscript.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-gdscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-gleam.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-gleam.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-gleam.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-gleam.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-glsl.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-glsl.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-glsl.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-glsl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-go.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-go.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-go.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-go.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-golangci-lint.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-golangci-lint.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-golangci-lint.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-golangci-lint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-graphql.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-graphql.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-graphql.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-graphql.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-groovy.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-groovy.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-groovy.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-groovy.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-hack.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-hack.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-hack.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-hack.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-haxe.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-haxe.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-haxe.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-haxe.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-headerline.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-headerline.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-headerline.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-headerline.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-html.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-html.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-html.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-html.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-hy.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-hy.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-hy.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-hy.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-icons.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-icons.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-icons.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-icons.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ido.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ido.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ido.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ido.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-idris.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-idris.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-idris.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-idris.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-iedit.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-iedit.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-iedit.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-iedit.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-javascript.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-javascript.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-javascript.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-javascript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-jq.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-jq.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-jq.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-jq.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-json.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-json.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-json.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-json.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-jsonnet.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-jsonnet.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-jsonnet.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-jsonnet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-kotlin.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-kotlin.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-kotlin.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-kotlin.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lens.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-lens.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lens.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-lens.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lisp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-lisp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lisp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-lisp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lua.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-lua.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-lua.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-lua.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-magik.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-magik.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-magik.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-magik.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-markdown.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-markdown.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-markdown.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-markdown.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-marksman.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-marksman.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-marksman.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-marksman.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mdx.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mdx.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mdx.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-mdx.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-meson.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-meson.el
@@ -0,0 +1,126 @@
+;;; lsp-meson.el --- lsp client for meson -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024 emacs-lsp maintainers
+
+;; Author: emacs-lsp maintainers
+;; Keywords: lsp, meson
+
+;; 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 client for Meson language.
+;;
+;;; Code:
+
+(require 'lsp-mode)
+
+(defgroup lsp-meson nil
+  "LSP support for Meson."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/JCWasmx86/mesonlsp"))
+
+(defcustom lsp-meson-server-executable '("mesonlsp")
+  "The meson language server executable to use."
+  :group 'lsp-meson
+  :risky t
+  :type '(repeat string))
+
+(defcustom lsp-meson-ignore-subproject-diagnostics nil
+  "Ignore diagnostics from subprojects."
+  :type '(choice
+          (const :tag "Off" nil)
+          (const :tag "All subprojects" t)
+          (lsp-repeatable-vector :tag "Specific subprojects" string))
+  :group 'lsp-meson)
+
+(defcustom lsp-meson-no-auto-downloads nil
+  "Never automatically download subprojects/wraps."
+  :type '(boolean)
+  :group 'lsp-meson)
+
+(defcustom lsp-meson-disable-inlay-hints nil
+  "Disable inlay hints."
+  :type '(boolean)
+  :group 'lsp-meson)
+
+(defgroup lsp-meson-linting nil
+  "Linting settings for mesonlsp."
+  :group 'lsp-meson)
+
+(defcustom lsp-meson-disable-name-linting nil
+  "Disable checking whether variable names are snake_case."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-all-id-lints nil
+  "Disable linting for unknown string literals relating to compiler/machine IDs."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-compiler-id-linting nil
+  "Disable lints for unknown IDs compared against `compiler.get_id()'."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-compiler-argument-id-linting nil
+  "Disable lints for unknown IDs compared against `compiler.get_argument_syntax()'."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-linker-id-linting nil
+  "Disable lints for unknown IDs compared against `compiler.get_linker_id()'."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-cpu-family-linting nil
+  "Disable lints for unknown IDs compared against `X_machine.cpu_family()'."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defcustom lsp-meson-disable-os-family-linting nil
+  "Disable lints for unknown IDs compared against `X_machine.system()'."
+  :type '(boolean)
+  :group 'lsp-meson-linting)
+
+(defun lsp-meson--make-init-options ()
+  "Init options for mesonlsp."
+  `(:others (:ignoreDiagnosticsFromSubprojects
+             ,(if (vectorp lsp-meson-ignore-subproject-diagnostics)
+                  lsp-meson-ignore-subproject-diagnostics
+                (lsp-json-bool lsp-meson-ignore-subproject-diagnostics))
+             :neverDownloadAutomatically ,(lsp-json-bool lsp-meson-no-auto-downloads)
+             :disableInlayHints ,(lsp-json-bool lsp-meson-disable-inlay-hints))
+    :linting (:disableNameLinting ,(lsp-json-bool lsp-meson-disable-name-linting)
+              :disableAllIdLinting ,(lsp-json-bool lsp-meson-disable-all-id-lints)
+              :disableCompilerIdLinting ,(lsp-json-bool lsp-meson-disable-compiler-id-linting)
+              :disableCompilerArgumentIdLinting ,(lsp-json-bool lsp-meson-disable-compiler-argument-id-linting)
+              :disableLinkerIdLinting ,(lsp-json-bool lsp-meson-disable-linker-id-linting)
+              :disableCpuFamilyLinting ,(lsp-json-bool lsp-meson-disable-cpu-family-linting)
+              :disableOsFamilyLinting ,(lsp-json-bool lsp-meson-disable-os-family-linting))))
+
+(lsp-register-client
+ (make-lsp-client
+  :new-connection (lsp-stdio-connection (lambda () (append lsp-meson-server-executable '("--lsp"))))
+  :activation-fn (lsp-activate-on "meson")
+  :multi-root nil
+  :priority -1
+  :major-modes '(meson-mode)
+  :initialization-options #'lsp-meson--make-init-options
+  :server-id 'mesonlsp))
+
+(lsp-consistency-check lsp-meson)
+
+(provide 'lsp-meson)
+;;; lsp-meson.el ends here
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-meson.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-meson.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mint.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mint.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mint.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-mint.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-mode-autoloads.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mode-autoloads.el
@@ -0,0 +1,974 @@
+;;; lsp-mode-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
+;; Generated by the `loaddefs-generate' function.
+
+;; This file is part of GNU Emacs.
+
+;;; Code:
+
+(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
+
+
+
+;;; Generated autoloads from lsp-actionscript.el
+
+(register-definition-prefixes "lsp-actionscript" '("lsp-actionscript-"))
+
+
+;;; Generated autoloads from lsp-ada.el
+
+(register-definition-prefixes "lsp-ada" '("lsp-ada-"))
+
+
+;;; Generated autoloads from lsp-angular.el
+
+(register-definition-prefixes "lsp-angular" '("lsp-client"))
+
+
+;;; Generated autoloads from lsp-ansible.el
+
+(register-definition-prefixes "lsp-ansible" '("lsp-ansible-"))
+
+
+;;; Generated autoloads from lsp-asm.el
+
+(register-definition-prefixes "lsp-asm" '("lsp-asm-"))
+
+
+;;; Generated autoloads from lsp-astro.el
+
+(register-definition-prefixes "lsp-astro" '("lsp-astro--get-initialization-options"))
+
+
+;;; Generated autoloads from lsp-autotools.el
+
+(register-definition-prefixes "lsp-autotools" '("lsp-autotools-"))
+
+
+;;; Generated autoloads from lsp-awk.el
+
+(register-definition-prefixes "lsp-awk" '("lsp-awk-executable"))
+
+
+;;; Generated autoloads from lsp-bash.el
+
+(register-definition-prefixes "lsp-bash" '("lsp-bash-"))
+
+
+;;; Generated autoloads from lsp-beancount.el
+
+(register-definition-prefixes "lsp-beancount" '("lsp-beancount-"))
+
+
+;;; Generated autoloads from lsp-bufls.el
+
+(register-definition-prefixes "lsp-bufls" '("lsp-bufls-"))
+
+
+;;; Generated autoloads from lsp-camel.el
+
+(register-definition-prefixes "lsp-camel" '("lsp-camel-"))
+
+
+;;; Generated autoloads from lsp-clangd.el
+
+(autoload 'lsp-cpp-flycheck-clang-tidy-error-explainer "lsp-clangd" "\
+Explain a clang-tidy ERROR by scraping documentation from llvm.org.
+
+(fn ERROR)")
+(register-definition-prefixes "lsp-clangd" '("lsp-c"))
+
+
+;;; Generated autoloads from lsp-clojure.el
+
+(autoload 'lsp-clojure-show-test-tree "lsp-clojure" "\
+Show a test tree and focus on it if IGNORE-FOCUS? is nil.
+
+(fn IGNORE-FOCUS?)" t)
+(autoload 'lsp-clojure-show-project-tree "lsp-clojure" "\
+Show a project tree with source-paths and dependencies.
+Focus on it if IGNORE-FOCUS? is nil.
+
+(fn IGNORE-FOCUS?)" t)
+(register-definition-prefixes "lsp-clojure" '("lsp-clojure-"))
+
+
+;;; Generated autoloads from lsp-cmake.el
+
+(register-definition-prefixes "lsp-cmake" '("lsp-cmake-"))
+
+
+;;; Generated autoloads from lsp-cobol.el
+
+(add-hook 'cobol-mode-hook #'lsp-cobol-start-ls)
+(autoload 'lsp-cobol-start-ls "lsp-cobol" "\
+Start the COBOL language service." t)
+(register-definition-prefixes "lsp-cobol" '("lsp-cobol-"))
+
+
+;;; Generated autoloads from lsp-completion.el
+
+(define-obsolete-variable-alias 'lsp-prefer-capf 'lsp-completion-provider "\
+lsp-mode 7.0.1")
+(define-obsolete-variable-alias 'lsp-enable-completion-at-point 'lsp-completion-enable "\
+lsp-mode 7.0.1")
+(autoload 'lsp-completion-at-point "lsp-completion" "\
+Get lsp completions.")
+(autoload 'lsp-completion--enable "lsp-completion" "\
+Enable LSP completion support.")
+(autoload 'lsp-completion-mode "lsp-completion" "\
+Toggle LSP completion support.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Completion mode' mode.  If the prefix argument is positive,
+enable the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-completion-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(add-hook 'lsp-configure-hook (lambda nil (when (and lsp-auto-configure lsp-completion-enable) (lsp-completion--enable))))
+(register-definition-prefixes "lsp-completion" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-credo.el
+
+(register-definition-prefixes "lsp-credo" '("lsp-credo-"))
+
+
+;;; Generated autoloads from lsp-crystal.el
+
+(register-definition-prefixes "lsp-crystal" '("lsp-clients-crystal-executable"))
+
+
+;;; Generated autoloads from lsp-csharp.el
+
+(register-definition-prefixes "lsp-csharp" '("lsp-csharp-"))
+
+
+;;; Generated autoloads from lsp-css.el
+
+(register-definition-prefixes "lsp-css" '("lsp-css-"))
+
+
+;;; Generated autoloads from lsp-cucumber.el
+
+(register-definition-prefixes "lsp-cucumber" '("lsp-cucumber-"))
+
+
+;;; Generated autoloads from lsp-cypher.el
+
+(register-definition-prefixes "lsp-cypher" '("lsp-client--cypher-ls-server-command"))
+
+
+;;; Generated autoloads from lsp-diagnostics.el
+
+(define-obsolete-variable-alias 'lsp-diagnostic-package 'lsp-diagnostics-provider "\
+lsp-mode 7.0.1")
+(define-obsolete-variable-alias 'lsp-flycheck-default-level 'lsp-diagnostics-flycheck-default-level "\
+lsp-mode 7.0.1")
+(autoload 'lsp-diagnostics-lsp-checker-if-needed "lsp-diagnostics")
+(autoload 'lsp-diagnostics--enable "lsp-diagnostics" "\
+Enable LSP checker support.")
+(autoload 'lsp-diagnostics-mode "lsp-diagnostics" "\
+Toggle LSP diagnostics integration.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Diagnostics mode' mode.  If the prefix argument is positive,
+enable the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-diagnostics-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(add-hook 'lsp-configure-hook (lambda nil (when lsp-auto-configure (lsp-diagnostics--enable))))
+(register-definition-prefixes "lsp-diagnostics" '("lsp-diagnostics-"))
+
+
+;;; Generated autoloads from lsp-dired.el
+
+(defvar lsp-dired-mode nil "\
+Non-nil if Lsp-Dired mode is enabled.
+See the `lsp-dired-mode' command
+for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `lsp-dired-mode'.")
+(custom-autoload 'lsp-dired-mode "lsp-dired" nil)
+(autoload 'lsp-dired-mode "lsp-dired" "\
+Display `lsp-mode' icons for each file in a dired buffer.
+
+This is a global minor mode.  If called interactively, toggle the
+`Lsp-Dired mode' mode.  If the prefix argument is positive,
+enable the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `(default-value \\='lsp-dired-mode)'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(register-definition-prefixes "lsp-dired" '("lsp-dired-"))
+
+
+;;; Generated autoloads from lsp-dockerfile.el
+
+(register-definition-prefixes "lsp-dockerfile" '("lsp-dockerfile-language-server-command"))
+
+
+;;; Generated autoloads from lsp-dot.el
+
+(register-definition-prefixes "lsp-dot" '("lsp-dot--dot-ls-server-command"))
+
+
+;;; Generated autoloads from lsp-elixir.el
+
+(register-definition-prefixes "lsp-elixir" '("lsp-elixir-"))
+
+
+;;; Generated autoloads from lsp-elm.el
+
+(register-definition-prefixes "lsp-elm" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-emmet.el
+
+(register-definition-prefixes "lsp-emmet" '("lsp-emmet-ls-command"))
+
+
+;;; Generated autoloads from lsp-erlang.el
+
+(register-definition-prefixes "lsp-erlang" '("lsp-erlang-"))
+
+
+;;; Generated autoloads from lsp-eslint.el
+
+(register-definition-prefixes "lsp-eslint" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-fortran.el
+
+(register-definition-prefixes "lsp-fortran" '("lsp-clients-"))
+
+
+;;; Generated autoloads from lsp-fsharp.el
+
+(autoload 'lsp-fsharp--workspace-load "lsp-fsharp" "\
+Load all of the provided PROJECTS.
+
+(fn PROJECTS)")
+(register-definition-prefixes "lsp-fsharp" '("lsp-fsharp-"))
+
+
+;;; Generated autoloads from lsp-gdscript.el
+
+(register-definition-prefixes "lsp-gdscript" '("lsp-gdscript-"))
+
+
+;;; Generated autoloads from lsp-gleam.el
+
+(register-definition-prefixes "lsp-gleam" '("lsp-gleam-executable"))
+
+
+;;; Generated autoloads from lsp-glsl.el
+
+(register-definition-prefixes "lsp-glsl" '("lsp-glsl-executable"))
+
+
+;;; Generated autoloads from lsp-go.el
+
+(register-definition-prefixes "lsp-go" '("lsp-go-"))
+
+
+;;; Generated autoloads from lsp-golangci-lint.el
+
+(register-definition-prefixes "lsp-golangci-lint" '("lsp-golangci-lint-"))
+
+
+;;; Generated autoloads from lsp-graphql.el
+
+(register-definition-prefixes "lsp-graphql" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-groovy.el
+
+(register-definition-prefixes "lsp-groovy" '("lsp-groovy-"))
+
+
+;;; Generated autoloads from lsp-hack.el
+
+(register-definition-prefixes "lsp-hack" '("lsp-clients-hack-command"))
+
+
+;;; Generated autoloads from lsp-haxe.el
+
+(register-definition-prefixes "lsp-haxe" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-headerline.el
+
+(autoload 'lsp-headerline-breadcrumb-mode "lsp-headerline" "\
+Toggle breadcrumb on headerline.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Headerline-Breadcrumb mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-headerline-breadcrumb-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(autoload 'lsp-breadcrumb-go-to-symbol "lsp-headerline" "\
+Go to the symbol on breadcrumb at SYMBOL-POSITION.
+
+(fn SYMBOL-POSITION)" t)
+(autoload 'lsp-breadcrumb-narrow-to-symbol "lsp-headerline" "\
+Narrow to the symbol range on breadcrumb at SYMBOL-POSITION.
+
+(fn SYMBOL-POSITION)" t)
+(register-definition-prefixes "lsp-headerline" '("lsp-headerline-"))
+
+
+;;; Generated autoloads from lsp-html.el
+
+(register-definition-prefixes "lsp-html" '("lsp-html-"))
+
+
+;;; Generated autoloads from lsp-hy.el
+
+(register-definition-prefixes "lsp-hy" '("lsp-clients-hy-server-executable"))
+
+
+;;; Generated autoloads from lsp-icons.el
+
+(register-definition-prefixes "lsp-icons" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-ido.el
+
+(autoload 'lsp-ido-workspace-symbol "lsp-ido" "\
+`ido' for lsp workspace/symbol.
+When called with prefix ARG the default selection will be symbol at point.
+
+(fn ARG)" t)
+(register-definition-prefixes "lsp-ido" '("lsp-ido-"))
+
+
+;;; Generated autoloads from lsp-idris.el
+
+(register-definition-prefixes "lsp-idris" '("lsp-idris2-lsp-"))
+
+
+;;; Generated autoloads from lsp-iedit.el
+
+(autoload 'lsp-iedit-highlights "lsp-iedit" "\
+Start an `iedit' operation on the documentHighlights at point.
+This can be used as a primitive `lsp-rename' replacement if the
+language server doesn't support renaming.
+
+See also `lsp-enable-symbol-highlighting'." t)
+(autoload 'lsp-iedit-linked-ranges "lsp-iedit" "\
+Start an `iedit' for `textDocument/linkedEditingRange'" t)
+(autoload 'lsp-evil-multiedit-highlights "lsp-iedit" "\
+Start an `evil-multiedit' operation on the documentHighlights at point.
+This can be used as a primitive `lsp-rename' replacement if the
+language server doesn't support renaming.
+
+See also `lsp-enable-symbol-highlighting'." t)
+(autoload 'lsp-evil-multiedit-linked-ranges "lsp-iedit" "\
+Start an `evil-multiedit' for `textDocument/linkedEditingRange'" t)
+(autoload 'lsp-evil-state-highlights "lsp-iedit" "\
+Start `iedit-mode'. for `textDocument/documentHighlight'" t)
+(autoload 'lsp-evil-state-linked-ranges "lsp-iedit" "\
+Start `iedit-mode'. for `textDocument/linkedEditingRange'" t)
+(register-definition-prefixes "lsp-iedit" '("lsp-iedit--on-ranges"))
+
+
+;;; Generated autoloads from lsp-javascript.el
+
+(register-definition-prefixes "lsp-javascript" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-jq.el
+
+(register-definition-prefixes "lsp-jq" '("lsp-clients-jq-server-executable"))
+
+
+;;; Generated autoloads from lsp-json.el
+
+(register-definition-prefixes "lsp-json" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-jsonnet.el
+
+(register-definition-prefixes "lsp-jsonnet" '("lsp-clients-jsonnet-server-executable"))
+
+
+;;; Generated autoloads from lsp-kotlin.el
+
+(register-definition-prefixes "lsp-kotlin" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-lens.el
+
+(autoload 'lsp-lens--enable "lsp-lens" "\
+Enable lens mode.")
+(autoload 'lsp-lens-show "lsp-lens" "\
+Display lenses in the buffer." t)
+(autoload 'lsp-lens-hide "lsp-lens" "\
+Delete all lenses." t)
+(autoload 'lsp-lens-mode "lsp-lens" "\
+Toggle code-lens overlays.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Lens mode' mode.  If the prefix argument is positive, enable
+the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-lens-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(autoload 'lsp-avy-lens "lsp-lens" "\
+Click lsp lens using `avy' package." t)
+(register-definition-prefixes "lsp-lens" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-lisp.el
+
+(autoload 'lsp-lisp-alive-start-ls "lsp-lisp" "\
+Start the alive-lsp." t)
+(register-definition-prefixes "lsp-lisp" '("lsp-lisp-a"))
+
+
+;;; Generated autoloads from lsp-lua.el
+
+(register-definition-prefixes "lsp-lua" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-magik.el
+
+(register-definition-prefixes "lsp-magik" '("lsp-magik-"))
+
+
+;;; Generated autoloads from lsp-markdown.el
+
+(register-definition-prefixes "lsp-markdown" '("lsp-markdown-"))
+
+
+;;; Generated autoloads from lsp-marksman.el
+
+(register-definition-prefixes "lsp-marksman" '("lsp-marksman-"))
+
+
+;;; Generated autoloads from lsp-mdx.el
+
+(register-definition-prefixes "lsp-mdx" '("lsp-mdx-server-command"))
+
+
+;;; Generated autoloads from lsp-meson.el
+
+(register-definition-prefixes "lsp-meson" '("lsp-meson-"))
+
+
+;;; Generated autoloads from lsp-mint.el
+
+(register-definition-prefixes "lsp-mint" '("lsp-clients-mint-executable"))
+
+
+;;; Generated autoloads from lsp-mode.el
+
+(put 'lsp-enable-file-watchers 'safe-local-variable #'booleanp)
+(put 'lsp-file-watch-ignored-directories 'safe-local-variable 'lsp--string-listp)
+(put 'lsp-file-watch-ignored-files 'safe-local-variable 'lsp--string-listp)
+(put 'lsp-file-watch-threshold 'safe-local-variable (lambda (i) (or (numberp i) (not i))))
+(autoload 'lsp--string-listp "lsp-mode" "\
+Return t if all elements of SEQUENCE are strings, else nil.
+
+(fn SEQUENCE)")
+(autoload 'lsp-load-vscode-workspace "lsp-mode" "\
+Load vscode workspace from FILE
+
+(fn FILE)" t)
+(autoload 'lsp-save-vscode-workspace "lsp-mode" "\
+Save vscode workspace to FILE
+
+(fn FILE)" t)
+(autoload 'lsp-install-server "lsp-mode" "\
+Interactively install or re-install server.
+When prefix UPDATE? is t force installation even if the server is present.
+
+(fn UPDATE? &optional SERVER-ID)" t)
+(autoload 'lsp-uninstall-server "lsp-mode" "\
+Delete a LSP server from `lsp-server-install-dir'.
+
+(fn DIR)" t)
+(autoload 'lsp-uninstall-servers "lsp-mode" "\
+Uninstall all installed servers." t)
+(autoload 'lsp-update-server "lsp-mode" "\
+Interactively update (reinstall) a server.
+
+(fn &optional SERVER-ID)" t)
+(autoload 'lsp-update-servers "lsp-mode" "\
+Update (reinstall) all installed servers." t)
+(autoload 'lsp-ensure-server "lsp-mode" "\
+Ensure server SERVER-ID
+
+(fn SERVER-ID)")
+(autoload 'lsp "lsp-mode" "\
+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.
+
+(fn &optional ARG)" t)
+(autoload 'lsp-deferred "lsp-mode" "\
+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.")
+(autoload 'lsp-start-plain "lsp-mode" "\
+Start `lsp-mode' using minimal configuration using the latest `melpa' version
+of the packages.
+
+In case the major-mode that you are using for " t)
+(register-definition-prefixes "lsp-mode" '("defcustom-lsp" "lsp-" "make-lsp-client" "when-lsp-workspace" "with-lsp-workspace"))
+
+
+;;; Generated autoloads from lsp-modeline.el
+
+(define-obsolete-variable-alias 'lsp-diagnostics-modeline-scope 'lsp-modeline-diagnostics-scope "\
+lsp-mode 7.0.1")
+(autoload 'lsp-modeline-code-actions-mode "lsp-modeline" "\
+Toggle code actions on modeline.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Modeline-Code-Actions mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-modeline-code-actions-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(define-obsolete-function-alias 'lsp-diagnostics-modeline-mode 'lsp-modeline-diagnostics-mode "lsp-mode 7.0.1")
+(autoload 'lsp-modeline-diagnostics-mode "lsp-modeline" "\
+Toggle diagnostics modeline.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Modeline-Diagnostics mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-modeline-diagnostics-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(autoload 'lsp-modeline-workspace-status-mode "lsp-modeline" "\
+Toggle workspace status on modeline.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Modeline-Workspace-Status mode' mode.  If the prefix
+argument is positive, enable the mode, and if it is zero or
+negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-modeline-workspace-status-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(register-definition-prefixes "lsp-modeline" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-mojo.el
+
+(register-definition-prefixes "lsp-mojo" '("lsp-mojo-executable"))
+
+
+;;; Generated autoloads from lsp-move.el
+
+(register-definition-prefixes "lsp-move" '("lsp-clients-"))
+
+
+;;; Generated autoloads from lsp-nginx.el
+
+(register-definition-prefixes "lsp-nginx" '("lsp-nginx-"))
+
+
+;;; Generated autoloads from lsp-nim.el
+
+(register-definition-prefixes "lsp-nim" '("lsp-nim-l"))
+
+
+;;; Generated autoloads from lsp-nix.el
+
+(register-definition-prefixes "lsp-nix" '("lsp-nix-"))
+
+
+;;; Generated autoloads from lsp-nushell.el
+
+(register-definition-prefixes "lsp-nushell" '("lsp-nushell-language-server-command"))
+
+
+;;; Generated autoloads from lsp-ocaml.el
+
+(register-definition-prefixes "lsp-ocaml" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-openscad.el
+
+(register-definition-prefixes "lsp-openscad" '("lsp-openscad-"))
+
+
+;;; Generated autoloads from lsp-perl.el
+
+(register-definition-prefixes "lsp-perl" '("lsp-perl-"))
+
+
+;;; Generated autoloads from lsp-perlnavigator.el
+
+(register-definition-prefixes "lsp-perlnavigator" '("lsp-perlnavigator-"))
+
+
+;;; Generated autoloads from lsp-php.el
+
+(register-definition-prefixes "lsp-php" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-pls.el
+
+(register-definition-prefixes "lsp-pls" '("lsp-pls-"))
+
+
+;;; Generated autoloads from lsp-prolog.el
+
+(register-definition-prefixes "lsp-prolog" '("lsp-prolog-server-command"))
+
+
+;;; Generated autoloads from lsp-protocol.el
+
+(register-definition-prefixes "lsp-protocol" '("dash-expand:&RangeToPoint" "lsp"))
+
+
+;;; Generated autoloads from lsp-purescript.el
+
+(register-definition-prefixes "lsp-purescript" '("lsp-purescript-"))
+
+
+;;; Generated autoloads from lsp-pwsh.el
+
+(register-definition-prefixes "lsp-pwsh" '("lsp-pwsh-"))
+
+
+;;; Generated autoloads from lsp-pyls.el
+
+(register-definition-prefixes "lsp-pyls" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-pylsp.el
+
+(register-definition-prefixes "lsp-pylsp" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-qml.el
+
+(register-definition-prefixes "lsp-qml" '("lsp-qml-server-command"))
+
+
+;;; Generated autoloads from lsp-r.el
+
+(register-definition-prefixes "lsp-r" '("lsp-clients-r-server-command"))
+
+
+;;; Generated autoloads from lsp-racket.el
+
+(register-definition-prefixes "lsp-racket" '("lsp-racket-lang"))
+
+
+;;; Generated autoloads from lsp-remark.el
+
+(register-definition-prefixes "lsp-remark" '("lsp-remark-server-command"))
+
+
+;;; Generated autoloads from lsp-rf.el
+
+(register-definition-prefixes "lsp-rf" '("expand-start-command" "lsp-rf-language-server-" "parse-rf-language-server-"))
+
+
+;;; Generated autoloads from lsp-rpm-spec.el
+
+(register-definition-prefixes "lsp-rpm-spec" '("lsp-rpm-spec-"))
+
+
+;;; Generated autoloads from lsp-rubocop.el
+
+(register-definition-prefixes "lsp-rubocop" '("lsp-rubocop-"))
+
+
+;;; Generated autoloads from lsp-ruby-lsp.el
+
+(register-definition-prefixes "lsp-ruby-lsp" '("lsp-ruby-lsp-"))
+
+
+;;; Generated autoloads from lsp-ruby-syntax-tree.el
+
+(register-definition-prefixes "lsp-ruby-syntax-tree" '("lsp-ruby-syntax-tree-"))
+
+
+;;; Generated autoloads from lsp-ruff-lsp.el
+
+(register-definition-prefixes "lsp-ruff-lsp" '("lsp-ruff-lsp-"))
+
+
+;;; Generated autoloads from lsp-rust.el
+
+(register-definition-prefixes "lsp-rust" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-semantic-tokens.el
+
+(defvar-local semantic-token-modifier-cache (make-hash-table) "\
+A cache of modifier values to the selected fonts.
+This allows whole-bitmap lookup instead of checking each bit. The
+expectation is that usage of modifiers will tend to cluster, so
+we will not have the full range of possible usages, hence a
+tractable hash map.
+
+This is set as buffer-local. It should probably be shared in a
+given workspace/language-server combination.
+
+This cache should be flushed every time any modifier
+configuration changes.")
+(autoload 'lsp--semantic-tokens-initialize-buffer "lsp-semantic-tokens" "\
+Initialize the buffer for semantic tokens.
+IS-RANGE-PROVIDER is non-nil when server supports range requests.")
+(autoload 'lsp--semantic-tokens-initialize-workspace "lsp-semantic-tokens" "\
+Initialize semantic tokens for WORKSPACE.
+
+(fn WORKSPACE)")
+(autoload 'lsp-semantic-tokens--warn-about-deprecated-setting "lsp-semantic-tokens" "\
+Warn about deprecated semantic highlighting variable.")
+(autoload 'lsp-semantic-tokens--enable "lsp-semantic-tokens" "\
+Enable semantic tokens mode.")
+(autoload 'lsp-semantic-tokens-mode "lsp-semantic-tokens" "\
+Toggle semantic-tokens support.
+
+This is a minor mode.  If called interactively, toggle the
+`Lsp-Semantic-Tokens mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `lsp-semantic-tokens-mode'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(register-definition-prefixes "lsp-semantic-tokens" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-semgrep.el
+
+(register-definition-prefixes "lsp-semgrep" '("lsp-semgrep-" "semgrep-"))
+
+
+;;; Generated autoloads from lsp-sml.el
+
+(register-definition-prefixes "lsp-sml" '("lsp-sml-millet-"))
+
+
+;;; Generated autoloads from lsp-solargraph.el
+
+(register-definition-prefixes "lsp-solargraph" '("lsp-solargraph-"))
+
+
+;;; Generated autoloads from lsp-solidity.el
+
+(register-definition-prefixes "lsp-solidity" '("lsp-client--solidity-"))
+
+
+;;; Generated autoloads from lsp-sorbet.el
+
+(register-definition-prefixes "lsp-sorbet" '("lsp-sorbet-"))
+
+
+;;; Generated autoloads from lsp-sql.el
+
+(register-definition-prefixes "lsp-sql" '("lsp-sql-"))
+
+
+;;; Generated autoloads from lsp-sqls.el
+
+(register-definition-prefixes "lsp-sqls" '("lsp-sql"))
+
+
+;;; Generated autoloads from lsp-steep.el
+
+(register-definition-prefixes "lsp-steep" '("lsp-steep-"))
+
+
+;;; Generated autoloads from lsp-svelte.el
+
+(register-definition-prefixes "lsp-svelte" '("lsp-svelte-plugin-"))
+
+
+;;; Generated autoloads from lsp-terraform.el
+
+(register-definition-prefixes "lsp-terraform" '("construct-tf-package" "lsp-t"))
+
+
+;;; Generated autoloads from lsp-tex.el
+
+(register-definition-prefixes "lsp-tex" '("lsp-"))
+
+
+;;; Generated autoloads from lsp-toml.el
+
+(register-definition-prefixes "lsp-toml" '("lsp-toml-"))
+
+
+;;; Generated autoloads from lsp-trunk.el
+
+(register-definition-prefixes "lsp-trunk" '("lsp-trunk-"))
+
+
+;;; Generated autoloads from lsp-ttcn3.el
+
+(register-definition-prefixes "lsp-ttcn3" '("lsp-ttcn3-lsp-server-command"))
+
+
+;;; Generated autoloads from lsp-typeprof.el
+
+(register-definition-prefixes "lsp-typeprof" '("lsp-typeprof-"))
+
+
+;;; Generated autoloads from lsp-v.el
+
+(register-definition-prefixes "lsp-v" '("lsp-v-vls-executable"))
+
+
+;;; Generated autoloads from lsp-vala.el
+
+(register-definition-prefixes "lsp-vala" '("lsp-clients-vala-ls-executable"))
+
+
+;;; Generated autoloads from lsp-verilog.el
+
+(register-definition-prefixes "lsp-verilog" '("lsp-clients-"))
+
+
+;;; Generated autoloads from lsp-vetur.el
+
+(register-definition-prefixes "lsp-vetur" '("lsp-vetur-"))
+
+
+;;; Generated autoloads from lsp-vhdl.el
+
+(register-definition-prefixes "lsp-vhdl" '("ghdl-ls-bin-name" "hdl-checker-bin-name" "lsp-vhdl-" "vhdl-"))
+
+
+;;; Generated autoloads from lsp-vimscript.el
+
+(register-definition-prefixes "lsp-vimscript" '("lsp-clients-vim-"))
+
+
+;;; Generated autoloads from lsp-volar.el
+
+(register-definition-prefixes "lsp-volar" '("lsp-volar-"))
+
+
+;;; Generated autoloads from lsp-wgsl.el
+
+(register-definition-prefixes "lsp-wgsl" '("lsp-wgsl-"))
+
+
+;;; Generated autoloads from lsp-xml.el
+
+(register-definition-prefixes "lsp-xml" '("lsp-xml-"))
+
+
+;;; Generated autoloads from lsp-yaml.el
+
+(register-definition-prefixes "lsp-yaml" '("lsp-yaml-"))
+
+
+;;; Generated autoloads from lsp-yang.el
+
+(register-definition-prefixes "lsp-yang" '("lsp-yang-"))
+
+
+;;; Generated autoloads from lsp-zig.el
+
+(register-definition-prefixes "lsp-zig" '("lsp-z"))
+
+;;; End of scraped data
+
+(provide 'lsp-mode-autoloads)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; no-native-compile: t
+;; coding: utf-8-emacs-unix
+;; End:
+
+;;; lsp-mode-autoloads.el ends here
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-mode-pkg.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mode-pkg.el
@@ -0,0 +1,21 @@
+(define-package "lsp-mode" "20240514.1430" "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"))
+  :commit "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a" :authors
+  '(("Vibhav Pant, Fangrui Song, Ivan Yonchovski"))
+  :maintainers
+  '(("Vibhav Pant, Fangrui Song, Ivan Yonchovski"))
+  :maintainer
+  '("Vibhav Pant, Fangrui Song, Ivan Yonchovski")
+  :keywords
+  '("languages")
+  :url "https://github.com/emacs-lsp/lsp-mode")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-mode.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mode.el
@@ -0,0 +1,9794 @@
+;;; 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"))
+;; Version: 9.0.1
+
+;; 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-elixir lsp-elm lsp-emmet lsp-erlang lsp-eslint lsp-fortran 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-rubocop lsp-ruby-lsp
+     lsp-ruby-syntax-tree lsp-ruff-lsp 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")
+    ("\\.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")
+    (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")
+    (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")
+    (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")
+    (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")
+    (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)
+    ("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 "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))
+
+  ;; 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--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))))
+
+(lsp-defun lsp--on-diagnostics-update-stats (workspace
+                                             (&PublishDiagnosticsParams :uri :diagnostics))
+  (let ((path (lsp--fix-path-casing (lsp--uri-to-path uri)))
+        (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))))
+
+(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)))
+                      (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 (featurep 'projectile) (condition-case nil
+                                    (projectile-project-root)
+                                  (error nil)))
+   (when (featurep 'project)
+     (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)
+      (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)
+
+  (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))))))
+             (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-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))
+        (setq lsp--signature-last-index nil
+              lsp--signature-last nil)
+        ;; cleanup diagnostics
+        (when lsp-diagnostic-clean-after-change
+          (lsp-foreach-workspace
+           (-let [diagnostics (lsp--workspace-diagnostics lsp--cur-workspace)]
+             (remhash (lsp--fix-path-casing (buffer-file-name)) diagnostics))))))))
+
+
+
+;; 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)
+  (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 (or line filename)
+               (xref-make-file-location
+                filename
+                (lsp-translate-line (1+ start-line))
+                (lsp-translate-column 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 (Location)
+                    (LocationLink)))
+           (append locations nil))
+          ((or (Location)
+               (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
+       ((MarkedString :value :language)
+        (lsp--render-string value language))
+       ((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?) (lsp--execute-command command?))))
+
+(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
+          (let ((start-point (lsp--position-to-point start))
+                (end-point (lsp--position-to-point end)))
+            (when (and (> (1+ start-line) start-window)
+                       (< (1+ end-line) end-window)
+                       (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
+       ((DocumentSymbol :name :children? :selection-range (Range :start))
+        (cons (cons (concat path name)
+                    (lsp--position-to-point start))
+              (lsp--xref-elements-index children? (concat path name " / "))))
+       ((SymbolInformation :name :location (Location :range (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)
+
+(defvar lsp--flushing-delayed-changes nil)
+
+(defun lsp--send-no-wait (message proc)
+  "Send MESSAGE to PROC without waiting for further output."
+
+  (unless lsp--flushing-delayed-changes
+    (let ((lsp--flushing-delayed-changes t))
+      (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 ((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)))
+    (cl-remf args :lsp-path)
+    `(progn
+       (lsp-register-custom-settings
+        (quote ((,path ,symbol ,(equal ''boolean (plist-get args :type))))))
+
+       (defcustom ,symbol ,standard ,doc
+         :set (lambda (sym val)
+                (lsp--set-custom-property sym val ,path))
+         ,@args))))
+
+(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-20240514.1430/lsp-mode.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-mode.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-modeline.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-modeline.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-modeline.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-modeline.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mojo.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-mojo.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-mojo.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-mojo.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-move.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-move.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-move.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-move.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nginx.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-nginx.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nginx.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-nginx.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nim.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-nim.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nim.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-nim.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nix.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-nix.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nix.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-nix.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nushell.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-nushell.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-nushell.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-nushell.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ocaml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ocaml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ocaml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ocaml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-openscad.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-openscad.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-openscad.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-openscad.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-perl.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-perl.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-perl.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-perl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-perlnavigator.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-perlnavigator.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-perlnavigator.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-perlnavigator.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-php.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-php.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-php.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-php.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pls.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-pls.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pls.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-pls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-prolog.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-prolog.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-prolog.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-prolog.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-protocol.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-protocol.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-protocol.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-protocol.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-purescript.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-purescript.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-purescript.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-purescript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pwsh.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-pwsh.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pwsh.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-pwsh.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pyls.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-pyls.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pyls.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-pyls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pylsp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-pylsp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-pylsp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-pylsp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-qml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-qml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-qml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-qml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-r.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-r.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-r.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-r.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-racket.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-racket.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-racket.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-racket.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-remark.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-remark.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-remark.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-remark.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rf.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-rf.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rf.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-rf.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rpm-spec.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-rpm-spec.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rpm-spec.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-rpm-spec.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rubocop.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-rubocop.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-rubocop.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-rubocop.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-lsp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-lsp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-lsp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-lsp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-syntax-tree.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-syntax-tree.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruby-syntax-tree.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruby-syntax-tree.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruff-lsp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruff-lsp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ruff-lsp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ruff-lsp.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-rust.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-rust.el
@@ -0,0 +1,1770 @@
+;;; lsp-rust.el --- Rust Client settings             -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2019  Ivan Yonchovski
+
+;; Author: Ivan Yonchovski <yyoncho@gmail.com>
+;; 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-rust client
+
+;;; Code:
+
+(require 'lsp-mode)
+(require 'ht)
+(require 'dash)
+(require 'lsp-semantic-tokens)
+
+(defgroup lsp-rust nil
+  "LSP support for Rust, using Rust Language Server or rust-analyzer."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/rust-lang/rls")
+  :package-version '(lsp-mode . "6.1"))
+
+(defgroup lsp-rust-rls nil
+  "LSP support for Rust, using Rust Language Server."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/rust-lang/rls")
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defgroup lsp-rust-analyzer nil
+  "LSP support for Rust, using rust-analyzer."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/rust-lang/rust-analyzer")
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defgroup lsp-rust-analyzer-semantic-tokens nil
+  "LSP semantic tokens support for rust-analyzer."
+  :group 'lsp-rust-analyzer
+  :link '(url-link "https://github.com/rust-lang/rust-analyzer")
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-server 'rust-analyzer
+  "Choose LSP server."
+  :type '(choice (const :tag "rls" rls)
+                 (const :tag "rust-analyzer" rust-analyzer))
+  :group 'lsp-rust
+  :package-version '(lsp-mode . "6.2"))
+
+;; RLS
+
+(defcustom lsp-rust-rls-server-command '("rls")
+  "Command to start RLS."
+  :type '(repeat string)
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-library-directories
+  '("~/.cargo/registry/src" "~/.rustup/toolchains")
+  "List of directories which will be considered to be libraries."
+  :risky t
+  :type '(repeat string)
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-sysroot nil
+  "If non-nil, use the given path as the sysroot for all rustc invocations
+instead of trying to detect the sysroot automatically."
+  :type '(choice
+          (const :tag "None" nil)
+          (string :tag "Sysroot"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-target nil
+  "If non-nil, use the given target triple for all rustc invocations."
+  :type '(choice
+          (const :tag "None" nil)
+          (string :tag "Target"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-rustflags nil
+  "Flags added to RUSTFLAGS."
+  :type '(choice
+          (const :tag "None" nil)
+          (string :tag "Flags"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-clear-env-rust-log t
+  "Clear the RUST_LOG environment variable before running rustc or cargo."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-build-lib nil
+  "If non-nil, checks the project as if you passed the `--lib' argument to
+cargo.
+
+Mutually exclusive with, and preferred over, `lsp-rust-build-bin'. (Unstable)"
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-build-bin nil
+  "If non-nil, checks the project as if you passed `-- bin <build_bin>'
+argument to cargo.
+
+Mutually exclusive with `lsp-rust-build-lib'. (Unstable)"
+  :type '(choice
+          (const :tag "None" nil)
+          (string :tag "Binary"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-cfg-test nil
+  "If non-nil, checks the project as if you were running `cargo test' rather
+than cargo build.
+
+I.e., compiles (but does not run) test code."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-unstable-features nil
+  "Enable unstable features."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-wait-to-build nil
+  "Time in milliseconds between receiving a change notification
+and starting build. If not specified, automatically inferred by
+the latest build duration."
+  :type '(choice
+          (const :tag "Auto" nil)
+          (number :tag "Time"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-show-warnings t
+  "Show warnings."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-crate-blocklist  [
+                                      "cocoa"
+                                      "gleam"
+                                      "glium"
+                                      "idna"
+                                      "libc"
+                                      "openssl"
+                                      "rustc_serialize"
+                                      "serde"
+                                      "serde_json"
+                                      "typenum"
+                                      "unicode_normalization"
+                                      "unicode_segmentation"
+                                      "winapi"
+                                      ]
+  "A list of Cargo crates to blocklist."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-build-on-save nil
+  "Only index the project when a file is saved and not on change."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-features []
+  "List of features to activate.
+Set this to `\"all\"` to pass `--all-features` to cargo."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-all-features nil
+  "Enable all Cargo features."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-no-default-features nil
+  "Do not enable default Cargo features."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-racer-completion t
+  "Enables code completion using racer."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-clippy-preference "opt-in"
+  "Controls eagerness of clippy diagnostics when available.
+Valid values are (case-insensitive):
+ - \"off\": Disable clippy lints.
+ - \"opt-in\": Clippy lints are shown when crates specify `#![warn(clippy)]'.
+ - \"on\": Clippy lints enabled for all crates in workspace.
+
+You need to install clippy via rustup if you haven't already."
+  :type '(choice
+          (const "on")
+          (const "opt-in")
+          (const "off"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-jobs nil
+  "Number of Cargo jobs to be run in parallel."
+  :type '(choice
+          (const :tag "Auto" nil)
+          (number :tag "Jobs"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-all-targets t
+  "Checks the project as if you were running cargo check --all-targets.
+I.e., check all targets and integration tests too."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-target-dir nil
+  "When specified, it places the generated analysis files at the
+specified target directory. By default it is placed target/rls
+directory."
+  :type '(choice
+          (const :tag "Default" nil)
+          (string :tag "Directory"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-rustfmt-path nil
+  "When specified, RLS will use the Rustfmt pointed at the path
+instead of the bundled one"
+  :type '(choice
+          (const :tag "Bundled" nil)
+          (string :tag "Path"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-build-command nil
+  "EXPERIMENTAL (requires `rust.unstable_features')
+If set, executes a given program responsible for rebuilding save-analysis to be
+loaded by the RLS. The program given should output a list of resulting .json
+files on stdout.
+
+Implies `rust.build_on_save': true."
+  :type '(choice
+          (const :tag "None" nil)
+          (string :tag "Command"))
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-full-docs nil
+  "Instructs cargo to enable full documentation extraction during
+save-analysis while building the crate."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(defcustom lsp-rust-show-hover-context t
+  "Show additional context in hover tooltips when available. This
+is often the type local variable declaration."
+  :type 'boolean
+  :group 'lsp-rust-rls
+  :package-version '(lsp-mode . "6.1"))
+
+(lsp-register-custom-settings
+ '(("rust.show_hover_context" lsp-rust-show-hover-context t)
+   ("rust.full_docs" lsp-rust-full-docs t)
+   ("rust.build_command" lsp-rust-build-command)
+   ("rust.rustfmt_path" lsp-rust-rustfmt-path)
+   ("rust.target_dir" lsp-rust-target-dir)
+   ("rust.all_targets" lsp-rust-all-targets t)
+   ("rust.jobs" lsp-rust-jobs)
+   ("rust.clippy_preference" lsp-rust-clippy-preference)
+   ("rust.racer_completion" lsp-rust-racer-completion t)
+   ("rust.no_default_features" lsp-rust-no-default-features t)
+   ("rust.all_features" lsp-rust-all-features t)
+   ("rust.features" lsp-rust-features)
+   ("rust.build_on_save" lsp-rust-build-on-save t)
+   ("rust.crate_blocklist" lsp-rust-crate-blocklist)
+   ("rust.show_warnings" lsp-rust-show-warnings t)
+   ("rust.wait_to_build" lsp-rust-wait-to-build)
+   ("rust.unstable_features" lsp-rust-unstable-features t)
+   ("rust.cfg_test" lsp-rust-cfg-test t)
+   ("rust.build_bin" lsp-rust-build-bin)
+   ("rust.build_lib" lsp-rust-build-lib t)
+   ("rust.clear_env_rust_log" lsp-rust-clear-env-rust-log t)
+   ("rust.rustflags" lsp-rust-rustflags)
+   ("rust.target" lsp-rust-target)
+   ("rust.sysroot" lsp-rust-sysroot)))
+
+(defun lsp-clients--rust-window-progress (workspace params)
+  "Progress report handling.
+PARAMS progress report notification data."
+  (-let [(&v1:ProgressParams :done? :message? :title) params]
+    (if (or done? (s-blank-str? message?))
+        (lsp-workspace-status nil workspace)
+      (lsp-workspace-status (format "%s - %s" title (or message? "")) workspace))))
+
+(lsp-defun lsp-rust--rls-run ((&Command :arguments? params))
+  (-let* (((&rls:Cmd :env :binary :args :cwd) (lsp-seq-first params))
+          (default-directory (or cwd (lsp-workspace-root) default-directory) ))
+    (compile
+     (format "%s %s %s"
+             (s-join " " (ht-amap (format "%s=%s" key value) env))
+             binary
+             (s-join " " args)))))
+
+(lsp-register-client
+ (make-lsp-client :new-connection (lsp-stdio-connection (lambda () lsp-rust-rls-server-command))
+                  :activation-fn (lsp-activate-on "rust")
+                  :priority (if (eq lsp-rust-server 'rls) 1 -1)
+                  :initialization-options '((omitInitBuild . t)
+                                            (cmdRun . t))
+                  :notification-handlers (ht ("window/progress" 'lsp-clients--rust-window-progress))
+                  :action-handlers (ht ("rls.run" 'lsp-rust--rls-run))
+                  :library-folders-fn (lambda (_workspace) lsp-rust-library-directories)
+                  :initialized-fn (lambda (workspace)
+                                    (with-lsp-workspace workspace
+                                      (lsp--set-configuration
+                                       (lsp-configuration-section "rust"))))
+                  :server-id 'rls))
+
+
+;; rust-analyzer
+(defcustom lsp-rust-analyzer-server-command '("rust-analyzer")
+  "Command to start rust-analyzer."
+  :type '(repeat string)
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2"))
+
+(defcustom lsp-rust-analyzer-library-directories
+  '("~/.cargo/registry/src" "~/.rustup/toolchains")
+  "List of directories which will be considered to be libraries."
+  :risky t
+  :type '(repeat string)
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-server-format-inlay-hints t
+  "Whether to ask rust-analyzer to format inlay hints itself.  If
+active, the various inlay format settings are not used."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-hide-closure-initialization nil
+  "Whether to hide inlay type hints for `let` statements that initialize
+to a closure. Only applies to closures with blocks, same as
+`#rust-analyzer.inlayHints.closureReturnTypeHints.enable#`."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-highlight-breakpoints t
+  "Enables highlighting of related references while the cursor is on
+`break`, `loop`, `while`, or `for` keywords."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-highlight-closure-captures t
+  "Enables highlighting of all captures of a closure while the
+cursor is on the `|` or move keyword of a closure."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-highlight-exit-points t
+  "Enables highlighting of all exit points while the cursor is on
+any `return`, `?`, `fn`, or return type arrow (`->`)."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-highlight-references t
+  "Enables highlighting of related references while the cursor is on
+any identifier."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-highlight-yield-points t
+  "Enables highlighting of all break points for a loop or block
+context while the cursor is on any `async` or `await` keywords."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-closure-return-type-hints "never"
+  "Whether to show inlay type hints for return types of closures."
+  :type '(choice
+          (const "never")
+          (const "always")
+          (const "with_block"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-discriminants-hints "never"
+  "Whether to show enum variant discriminant hints."
+  :type '(choice
+          (const "never")
+          (const "always")
+          (const "fieldless"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-expression-adjustment-hints "never"
+  "Whether to show inlay hints for type adjustments.."
+  :type '(choice
+          (const "never")
+          (const "always")
+          (const "reborrow"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-expression-adjustment-hints-mode "prefix"
+  "Whether to show inlay hints as postfix ops (`.*` instead of `*`, etc)."
+  :type '(choice
+          (const "prefix")
+          (const "postfix")
+          (const "prefer_prefix")
+          (const "prefer_postfix"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-expression-adjustment-hide-unsafe nil
+  "Whether to hide inlay hints for type adjustments outside of
+`unsafe` blocks."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-implicit-drops nil
+  "Whether to show implicit drop hints."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+
+(defcustom lsp-rust-analyzer-closure-capture-hints nil
+  "Whether to show inlay hints for closure captures."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-closure-style "impl_fn"
+  "Closure notation in type and chaining inlay hints."
+  :type 'string
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-hide-named-constructor nil
+  "Whether to hide inlay type hints for constructors."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-max-inlay-hint-length nil
+  "Max inlay hint length."
+  :type 'integer
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-display-chaining-hints nil
+  "Whether to show inlay type hints for method chains.  These
+hints will be formatted with the type hint formatting options, if
+the mode is not configured to ask the server to format them."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-display-lifetime-elision-hints-enable "never"
+  "Whether to show elided lifetime inlay hints."
+  :type '(choice
+          (const "never")
+          (const "always")
+          (const "skip_trivial"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names nil
+  "When showing elided lifetime inlay hints, whether to use
+parameter names or numeric placeholder names for the lifetimes."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-display-closure-return-type-hints nil
+  "Whether to show closure return type inlay hints for closures
+with block bodies."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-display-parameter-hints nil
+  "Whether to show function parameter name inlay hints at the call site."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-display-reborrow-hints "never"
+  "Whether to show inlay type hints for compiler inserted reborrows."
+  :type '(choice
+          (const "always")
+          (const "never")
+          (const "mutable"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-binding-mode-hints nil
+  "Whether to show inlay type hints for binding modes."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-closing-brace-hints t
+  "Whether to show inlay hints after a closing `}` to indicate what item it
+belongs to."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-closing-brace-hints-min-lines 25
+  "Minimum number of lines required before the `}` until the hint is shown
+\(set to 0 or 1 to always show them)."
+  :type 'integer
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lru-capacity nil
+  "Number of syntax trees rust-analyzer keeps in memory."
+  :type 'integer
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-cargo-target nil
+  "Compilation target (target triple)."
+  :type '(choice
+          (string :tag "Target")
+          (const :tag "None" nil))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-cargo-watch-enable t
+  "Enable Cargo watch."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-cargo-watch-command "check"
+  "Cargo watch command."
+  :type 'string
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-cargo-watch-args []
+  "Extra arguments for `cargo check`."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-cargo-override-command []
+  "Advanced option, fully override the command rust-analyzer uses for checking.
+The command should include `--message=format=json` or similar option."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-check-all-targets t
+  "Enables --all-targets for `cargo check`."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.2"))
+
+(defcustom lsp-rust-analyzer-checkonsave-features []
+  "List of features to activate.
+Set this to `\"all\"` to pass `--all-features` to cargo."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-rust-analyzer
+  :package-version '(lsp-mode . "8.0.2"))
+
+(defcustom lsp-rust-analyzer-cargo-unset-test []
+  "force rust-analyzer to unset `#[cfg(test)]` for the specified crates."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-use-client-watching t
+  "Use client watching"
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-exclude-globs []
+  "Exclude globs"
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-exclude-dirs []
+  "These directories will be ignored by rust-analyzer."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-macro-expansion-method 'lsp-rust-analyzer-macro-expansion-default
+  "Use a different function if you want formatted macro expansion results and
+syntax highlighting."
+  :type 'function
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.2.2"))
+
+(defcustom lsp-rust-analyzer-diagnostics-enable t
+  "Whether to show native rust-analyzer diagnostics."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-diagnostics-enable-experimental nil
+  "Whether to show native rust-analyzer diagnostics that are still experimental
+\(might have more false positives than usual)."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-diagnostics-disabled []
+  "List of native rust-analyzer diagnostics to disable."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-diagnostics-warnings-as-hint []
+  "List of warnings that should be displayed with hint severity."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-diagnostics-warnings-as-info []
+  "List of warnings that should be displayed with info severity."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(define-obsolete-variable-alias
+  'lsp-rust-analyzer-cargo-load-out-dirs-from-check
+  'lsp-rust-analyzer-cargo-run-build-scripts
+  "8.0.0")
+
+(defcustom lsp-rust-analyzer-cargo-run-build-scripts t
+  "Whether to run build scripts (`build.rs`) for more precise code analysis."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-rustfmt-extra-args []
+  "Additional arguments to rustfmt."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-rustfmt-override-command []
+  "Advanced option, fully override the command rust-analyzer uses
+for formatting."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-rustfmt-rangeformatting-enable nil
+  "Enables the use of rustfmt's unstable range formatting command for the
+`textDocument/rangeFormatting` request. The rustfmt option is unstable and only
+available on a nightly build."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-completion-add-call-parenthesis t
+  "Whether to add parenthesis when completing functions."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-completion-add-call-argument-snippets t
+  "Whether to add argument snippets when completing functions."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-completion-postfix-enable t
+  "Whether to show postfix snippets like `dbg`, `if`, `not`, etc."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-call-info-full t
+  "Whether to show function name and docs in parameter hints."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-proc-macro-enable t
+  "Enable Proc macro support.
+Implies `lsp-rust-analyzer-cargo-run-build-scripts'"
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "6.3.2"))
+
+(defcustom lsp-rust-analyzer-import-prefix "plain"
+  "The path structure for newly inserted paths to use.
+Valid values are:
+ - \"plain\": Insert import paths relative to the current module, using up to
+one `super' prefix if the parent module contains the requested item.
+ - \"by_self\": Prefix all import paths with `self' if they don't begin with
+`self', `super', `crate' or a crate name.
+ - \"by_crate\": Force import paths to be absolute by always starting
+them with `crate' or the crate name they refer to."
+  :type '(choice
+          (const "plain")
+          (const "by_self")
+          (const "by_crate"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-import-granularity "crate"
+  "How imports should be grouped into use statements."
+  :type '(choice
+          (const "crate" :doc "Merge imports from the same crate into a single use statement. This kind of nesting is only supported in Rust versions later than 1.24.")
+          (const "module" :doc "Merge imports from the same module into a single use statement.")
+          (const "item" :doc "Don’t merge imports at all, creating one import per item.")
+          (const "preserve" :doc "Do not change the granularity of any imports. For auto-import this has the same effect as `\"item\"'"))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-cargo-auto-reload t
+  "Automatically refresh project info via `cargo metadata' on `Cargo.toml' changes."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-use-rustc-wrapper-for-build-scripts t
+  "Use `RUSTC_WRAPPER=rust-analyzer' when running build scripts to avoid
+compiling unnecessary things."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-completion-auto-import-enable t
+  "Toggles the additional completions that automatically add imports when
+completed. `lsp-completion-enable-additional-text-edit' must be non-nil
+ for this feature to be fully enabled."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-completion-auto-self-enable t
+  "Toggles the additional completions that automatically show method calls
+and field accesses with self prefixed to them when inside a method."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-import-enforce-granularity nil
+  "Whether to enforce the import granularity setting for all files.
+ If set to nil rust-analyzer will try to keep import styles consistent per file."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-imports-merge-glob t
+  "Whether to allow import insertion to merge new imports into single path
+glob imports like `use std::fmt::*;`."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-import-group t
+  "Group inserted imports by the following order:
+https://rust-analyzer.github.io/manual.html#auto-import.
+ Groups are separated by newlines."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-highlighting-strings t
+  "Use semantic tokens for strings."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-rustc-source nil
+  "Path to the Cargo.toml of the rust compiler workspace."
+  :type '(choice
+          (file :tag "Path")
+          (const :tag "None" nil))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-linked-projects []
+  "Disable project auto-discovery in favor of explicitly specified set of
+projects. Elements must be paths pointing to `Cargo.toml`, `rust-project.json`,
+or JSON objects in `rust-project.json` format."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-experimental-proc-attr-macros t
+  "Whether to enable experimental support for expanding proc macro attributes."
+  :type 'boolean
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-cargo-extra-args []
+  "Extra arguments that are passed to every cargo invocation."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-cargo-extra-env []
+  "Extra environment variables that will be set when running cargo, rustc or
+other commands within the workspace.  Useful for setting RUSTFLAGS."
+  :type 'lsp-string-vector
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defconst lsp-rust-notification-handlers
+  '(("rust-analyzer/publishDecorations" . (lambda (_w _p)))))
+
+(defconst lsp-rust-action-handlers
+  '())
+
+(define-derived-mode lsp-rust-analyzer-syntax-tree-mode special-mode "Rust-Analyzer-Syntax-Tree"
+  "Mode for the rust-analyzer syntax tree buffer.")
+
+(defun lsp-rust-analyzer-syntax-tree ()
+  "Display syntax tree for current buffer."
+  (interactive)
+  (-let* ((root (lsp-workspace-root default-directory))
+          (params (lsp-make-rust-analyzer-syntax-tree-params
+                   :text-document (lsp--text-document-identifier)
+                   :range? (if (use-region-p)
+                               (lsp--region-to-range (region-beginning) (region-end))
+                             (lsp--region-to-range (point-min) (point-max)))))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/syntaxTree"
+                                      params))))
+    (let ((buf (get-buffer-create (format "*rust-analyzer syntax tree %s*" root)))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (lsp-rust-analyzer-syntax-tree-mode)
+        (erase-buffer)
+        (insert results)
+        (goto-char (point-min)))
+      (pop-to-buffer buf))))
+
+(define-derived-mode lsp-rust-analyzer-status-mode special-mode "Rust-Analyzer-Status"
+  "Mode for the rust-analyzer status buffer.")
+
+(defun lsp-rust-analyzer-status ()
+  "Displays status information for rust-analyzer."
+  (interactive)
+  (-let* ((root (lsp-workspace-root default-directory))
+          (params (lsp-make-rust-analyzer-analyzer-status-params
+                   :text-document (lsp--text-document-identifier)))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/analyzerStatus"
+                                      params))))
+    (let ((buf (get-buffer-create (format "*rust-analyzer status %s*" root)))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (lsp-rust-analyzer-status-mode)
+        (erase-buffer)
+        (insert results)
+        (pop-to-buffer buf)))))
+
+(defun lsp-rust-analyzer-view-item-tree ()
+  "Show item tree of rust file."
+  (interactive)
+  (-let* ((params (lsp-make-rust-analyzer-view-item-tree
+                   :text-document (lsp--text-document-identifier)))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/viewItemTree"
+                                      params))))
+    (let ((buf (get-buffer-create "*rust-analyzer item tree*"))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (special-mode)
+        (erase-buffer)
+        (insert (lsp--render-string results "rust"))
+        (pop-to-buffer buf)))))
+
+(defun lsp-rust-analyzer-view-hir ()
+  "View Hir of function at point."
+  (interactive)
+  (-let* ((params (lsp-make-rust-analyzer-expand-macro-params
+                   :text-document (lsp--text-document-identifier)
+                   :position (lsp--cur-position)))
+          (results (lsp-send-request (lsp-make-request
+                                      "rust-analyzer/viewHir"
+                                      params))))
+    (let ((buf (get-buffer-create "*rust-analyzer hir*"))
+          (inhibit-read-only t))
+      (with-current-buffer buf
+        (special-mode)
+        (erase-buffer)
+        (insert results)
+        (pop-to-buffer buf)))))
+
+(defun lsp-rust-analyzer-join-lines ()
+  "Join selected lines into one, smartly fixing up whitespace and trailing commas."
+  (interactive)
+  (let* ((params (lsp-make-rust-analyzer-join-lines-params
+                  :text-document (lsp--text-document-identifier)
+                  :ranges (vector (if (use-region-p)
+                                      (lsp--region-to-range (region-beginning) (region-end))
+                                    (lsp--region-to-range (point) (point))))))
+         (result (lsp-send-request (lsp-make-request "experimental/joinLines" params))))
+    (lsp--apply-text-edits result 'code-action)))
+
+(defun lsp-rust-analyzer-reload-workspace ()
+  "Reload workspace, picking up changes from Cargo.toml"
+  (interactive)
+  (lsp--cur-workspace-check)
+  (lsp-send-request (lsp-make-request "rust-analyzer/reloadWorkspace")))
+
+(defcustom lsp-rust-analyzer-download-url
+  (let* ((x86 (string-prefix-p "x86_64" system-configuration))
+         (arch (if x86 "x86_64" "aarch64")))
+    (format "https://github.com/rust-lang/rust-analyzer/releases/latest/download/%s"
+            (pcase system-type
+              ('gnu/linux (format "rust-analyzer-%s-unknown-linux-gnu.gz" arch))
+              ('darwin (format "rust-analyzer-%s-apple-darwin.gz" arch))
+              ('windows-nt (format "rust-analyzer-%s-pc-windows-msvc.zip" arch)))))
+  "Automatic download url for Rust Analyzer"
+  :type 'string
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-rust-analyzer-store-path (f-join lsp-server-install-dir "rust"
+                                                (pcase system-type
+                                                  ('windows-nt "rust-analyzer.exe")
+                                                  (_ "rust-analyzer")))
+  "The path to the file in which `rust-analyzer' will be stored."
+  :type 'file
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+(lsp-dependency
+ 'rust-analyzer
+ `(:download :url lsp-rust-analyzer-download-url
+             :decompress ,(pcase system-type ('windows-nt :zip) (_ :gzip))
+             :store-path lsp-rust-analyzer-store-path
+             :set-executable? t)
+ `(:system ,(file-name-nondirectory lsp-rust-analyzer-store-path)))
+
+(lsp-defun lsp-rust--analyzer-run-single ((&Command :arguments?))
+  (lsp-rust-analyzer-run (lsp-seq-first arguments?)))
+
+(lsp-defun lsp-rust--analyzer-show-references
+  ((&Command :title :arguments? [_uri _filepos references]))
+  (lsp-show-xrefs (lsp--locations-to-xref-items references) nil
+                  (s-contains-p "reference" title)))
+
+(declare-function dap-debug "ext:dap-mode" (template) t)
+
+(lsp-defun lsp-rust--analyzer-debug-lens ((&Command :arguments? [args]))
+  (lsp-rust-analyzer-debug args))
+
+;; Semantic tokens
+
+;; Modifier faces
+(defface lsp-rust-analyzer-documentation-modifier-face
+  '((t nil))
+  "The face modification to use for documentation items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-declaration-modifier-face
+  '((t nil))
+  "The face modification to use for declaration items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-definition-modifier-face
+  '((t nil))
+  "The face modification to use for definition items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-static-modifier-face
+  '((t nil))
+  "The face modification to use for static items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-abstract-modifier-face
+  '((t nil))
+  "The face modification to use for abstract items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-deprecated-modifier-face
+  '((t nil))
+  "The face modification to use for deprecated items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-readonly-modifier-face
+  '((t nil))
+  "The face modification to use for readonly items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-default-library-modifier-face
+  '((t nil))
+  "The face modification to use for default-library items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-async-modifier-face
+  '((t nil))
+  "The face modification to use for async items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-attribute-modifier-face
+  '((t nil))
+  "The face modification to use for attribute items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-callable-modifier-face
+  '((t nil))
+  "The face modification to use for callable items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-constant-modifier-face
+  '((t nil))
+  "The face modification to use for constant items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-consuming-modifier-face
+  '((t nil))
+  "The face modification to use for consuming items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-control-flow-modifier-face
+  '((t nil))
+  "The face modification to use for control-flow items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-crate-root-modifier-face
+  '((t nil))
+  "The face modification to use for crate-root items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-injected-modifier-face
+  '((t nil))
+  "The face modification to use for injected items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-intra-doc-link-modifier-face
+  '((t nil))
+  "The face modification to use for intra-doc-link items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-library-modifier-face
+  '((t nil))
+  "The face modification to use for library items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-mutable-modifier-face
+  '((t :underline t))
+  "The face modification to use for mutable items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-public-modifier-face
+  '((t nil))
+  "The face modification to use for public items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-reference-modifier-face
+  '((t :bold t))
+  "The face modification to use for reference items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-trait-modifier-face
+  '((t nil))
+  "The face modification to use for trait items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+(defface lsp-rust-analyzer-unsafe-modifier-face
+  '((t nil))
+  "The face modification to use for unsafe items."
+  :group 'lsp-rust-analyzer-semantic-tokens)
+
+
+;; ---------------------------------------------------------------------
+;; Semantic token modifier face customization
+
+(defcustom lsp-rust-analyzer-documentation-modifier 'lsp-rust-analyzer-documentation-modifier-face
+  "Face for semantic token modifier for `documentation' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-declaration-modifier 'lsp-rust-analyzer-declaration-modifier-face
+  "Face for semantic token modifier for `declaration' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-definition-modifier 'lsp-rust-analyzer-definition-modifier-face
+  "Face for semantic token modifier for `definition' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-static-modifier 'lsp-rust-analyzer-static-modifier-face
+  "Face for semantic token modifier for `static' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-abstract-modifier 'lsp-rust-analyzer-abstract-modifier-face
+  "Face for semantic token modifier for `abstract' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-deprecated-modifier 'lsp-rust-analyzer-deprecated-modifier-face
+  "Face for semantic token modifier for `deprecated' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-readonly-modifier 'lsp-rust-analyzer-readonly-modifier-face
+  "Face for semantic token modifier for `readonly' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-default-library-modifier 'lsp-rust-analyzer-default-library-modifier-face
+  "Face for semantic token modifier for `default' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-async-modifier 'lsp-rust-analyzer-async-modifier-face
+  "Face for semantic token modifier for `async' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-attribute-modifier 'lsp-rust-analyzer-attribute-modifier-face
+  "Face for semantic token modifier for `attribute' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-callable-modifier 'lsp-rust-analyzer-callable-modifier-face
+  "Face for semantic token modifier for `callable' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-constant-modifier 'lsp-rust-analyzer-constant-modifier-face
+  "Face for semantic token modifier for `constant' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-consuming-modifier 'lsp-rust-analyzer-consuming-modifier-face
+  "Face for semantic token modifier for `consuming' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-control-flow-modifier 'lsp-rust-analyzer-control-flow-modifier-face
+  "Face for semantic token modifier for `control_flow' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-crate-root-modifier 'lsp-rust-analyzer-crate-root-modifier-face
+  "Face for semantic token modifier for `crate_root' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-injected-modifier 'lsp-rust-analyzer-injected-modifier-face
+  "Face for semantic token modifier for `injected' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-intra-doc-link-modifier 'lsp-rust-analyzer-intra-doc-link-modifier-face
+  "Face for semantic token modifier for `intra_doc_link' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-library-modifier 'lsp-rust-analyzer-library-modifier-face
+  "Face for semantic token modifier for `library' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-mutable-modifier 'lsp-rust-analyzer-mutable-modifier-face
+  "Face for semantic token modifier for `mutable' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-public-modifier 'lsp-rust-analyzer-public-modifier-face
+  "Face for semantic token modifier for `public' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-reference-modifier 'lsp-rust-analyzer-reference-modifier-face
+  "Face for semantic token modifier for `reference' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-trait-modifier 'lsp-rust-analyzer-trait-modifier-face
+  "Face for semantic token modifier for `trait' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-unsafe-modifier 'lsp-rust-analyzer-unsafe-modifier-face
+  "Face for semantic token modifier for `unsafe' attribute."
+  :type 'face
+  :group 'lsp-rust-analyzer-semantic-tokens
+  :package-version '(lsp-mode . "9.0.0"))
+
+;; ---------------------------------------------------------------------
+
+(defun lsp-rust-analyzer--semantic-modifiers ()
+  "Mapping between rust-analyzer keywords and fonts to apply.
+The keywords are sent in the initialize response, in the semantic
+tokens legend."
+  `(("documentation"   . ,lsp-rust-analyzer-documentation-modifier)
+    ("declaration"     . ,lsp-rust-analyzer-declaration-modifier)
+    ("definition"      . ,lsp-rust-analyzer-definition-modifier)
+    ("static"          . ,lsp-rust-analyzer-static-modifier)
+    ("abstract"        . ,lsp-rust-analyzer-abstract-modifier)
+    ("deprecated"      . ,lsp-rust-analyzer-deprecated-modifier)
+    ("readonly"        . ,lsp-rust-analyzer-readonly-modifier)
+    ("default_library" . ,lsp-rust-analyzer-default-library-modifier)
+    ("async"           . ,lsp-rust-analyzer-async-modifier)
+    ("attribute"       . ,lsp-rust-analyzer-attribute-modifier)
+    ("callable"        . ,lsp-rust-analyzer-callable-modifier)
+    ("constant"        . ,lsp-rust-analyzer-constant-modifier)
+    ("consuming"       . ,lsp-rust-analyzer-consuming-modifier)
+    ("control_flow"    . ,lsp-rust-analyzer-control-flow-modifier)
+    ("crate_root"      . ,lsp-rust-analyzer-crate-root-modifier)
+    ("injected"        . ,lsp-rust-analyzer-injected-modifier)
+    ("intra_doc_link"  . ,lsp-rust-analyzer-intra-doc-link-modifier)
+    ("library"         . ,lsp-rust-analyzer-library-modifier)
+    ("mutable"         . ,lsp-rust-analyzer-mutable-modifier)
+    ("public"          . ,lsp-rust-analyzer-public-modifier)
+    ("reference"       . ,lsp-rust-analyzer-reference-modifier)
+    ("trait"           . ,lsp-rust-analyzer-trait-modifier)
+    ("unsafe"          . ,lsp-rust-analyzer-unsafe-modifier)))
+
+(defun lsp-rust-switch-server (&optional lsp-server)
+  "Switch priorities of lsp servers, unless LSP-SERVER is already active."
+  (interactive)
+  (let ((current-server (if (> (lsp--client-priority (gethash 'rls lsp-clients)) 0)
+                            'rls
+                          'rust-analyzer)))
+    (unless (eq lsp-server current-server)
+      (dolist (server '(rls rust-analyzer))
+        (when (natnump (setf (lsp--client-priority (gethash server lsp-clients))
+                             (* (lsp--client-priority (gethash server lsp-clients)) -1)))
+          (message (format "Switched to server %s." server)))))))
+
+;;
+;;; Inlay hints
+
+(defcustom lsp-rust-analyzer-debug-lens-extra-dap-args
+  '(:MIMode "gdb" :miDebuggerPath "gdb" :stopAtEntry t :externalConsole :json-false)
+  "Extra arguments to pass to DAP template when debugging a test from code lens.
+
+As a rule of the thumb, do not add extra keys to this plist unless you exactly
+what you are doing, it might break the \"Debug test\" lens otherwise.
+
+See dap-mode documentation and cpptools documentation for the extra variables
+meaning."
+  :type 'plist
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
+;;
+;;; Lenses
+
+(defgroup lsp-rust-analyzer-lens nil
+  "LSP lens support for Rust when using rust-analyzer.
+
+Lenses are (depending on your configuration) clickable links to
+the right of function definitions and the like. These display
+some useful information in their own right and/or perform a
+shortcut action when clicked such as displaying uses of that
+function or running an individual test.
+"
+  :prefix "lsp-rust-analyzer-lens-"
+  :group 'lsp-rust-analyzer
+  :link '(url-link "https://emacs-lsp.github.io/lsp-mode/")
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-debug-enable t
+  "Enable or disable the Debug lens."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-enable t
+  "Master-enable of lenses in Rust files."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+;; This customisation "works" in that it works as described, but the default is fine and changing it
+;; from the default will either stop lenses working or do nothing.
+;;
+;; If this is ever uncommented to re-enable the option, don't forget to also uncomment it in defun
+;; lsp-rust-analyzer--make-init-options too or it'll not do anything.
+
+;; (defcustom lsp-rust-analyzer-lens-force-custom-commands t
+;;   "Internal config: use custom client-side commands even when the
+;; client doesn't set the corresponding capability."
+;;   :type 'boolean
+;;   :group 'lsp-rust-analyzer-lens
+;;   :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-implementations-enable t
+  "Enable or disable the Implementations lens.
+
+The Implementations lens shows `NN implementations' to the right
+of the first line of an enum, struct, or union declaration. This
+is the count of impl blocks, including derived traits. Clicking
+on it gives a list of the impls of that type.
+"
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+;; The valid range of values for this is documented in the rust-lang/rust-analyzer repository at the
+;; path "editors/code/package.json"; the TL:DR is that it's "above_name" or "above_whole_item".
+;; However, setting it to "above_whole_item" causes lenses to disappear in Emacs. I suspect this
+;; feature has only ever been tested in some other IDE and it's broken in Emacs. So I've disabled it
+;; for now.
+;;
+;; If this is ever uncommented to re-enable the option, don't forget to also uncomment it in defun
+;; lsp-rust-analyzer--make-init-options too or it'll not do anything.
+
+;; (defcustom lsp-rust-analyzer-lens-location "above_name"
+;;   "Where to render annotations."
+;;    :type '(choice
+;;            (const :tag "Above name" "above_name")
+;;            (const :tag "Above whole item" "above_whole_item")
+;;    :group 'lsp-rust-analyzer-lens
+;;    :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-references-adt-enable nil
+  "Enable or disable the References lens on enums, structs, and traits.
+
+The References lens shows `NN references` to the right of the
+first line of each enum, struct, or union declaration. This is
+the count of uses of that type. Clicking on it gives a list of
+where that type is used."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-references-enum-variant-enable nil
+  "Enable or disable the References lens on enum variants.
+
+The References lens shows `NN references` to the right of the
+first (or only) line of each enum variant. This is the count of
+uses of that enum variant. Clicking on it gives a list of where
+that enum variant is used."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-references-method-enable nil
+  "Enable or disable the References lens on functions.
+
+The References lens shows `NN references` to the right of the
+first line of each function declaration. This is the count of
+uses of that function. Clicking on it gives a list of where that
+function is used."
+
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-references-trait-enable nil
+  "Enable or disable the References lens on traits.
+
+The References lens shows `NN references` to the right of the
+first line of each trait declaration. This is a count of uses of
+that trait. Clicking on it gives a list of where that trait is
+used.
+
+There is some overlap with the Implementations lens which slows
+all of the trait's impl blocks, but this also shows other uses
+such as imports and dyn traits."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defcustom lsp-rust-analyzer-lens-run-enable t
+  "Enable or disable the Run lens."
+  :type 'boolean
+  :group 'lsp-rust-analyzer-lens
+  :package-version '(lsp-mode . "9.0.0"))
+
+(defun lsp-rust-analyzer-initialized? ()
+  (when-let ((workspace (lsp-find-workspace 'rust-analyzer (buffer-file-name))))
+    (eq 'initialized (lsp--workspace-status workspace))))
+
+(defun lsp-rust-analyzer-expand-macro ()
+  "Expands the macro call at point recursively."
+  (interactive)
+  (-if-let* ((params (lsp-make-rust-analyzer-expand-macro-params
+                      :text-document (lsp--text-document-identifier)
+                      :position (lsp--cur-position)))
+             (response (lsp-request
+                        "rust-analyzer/expandMacro"
+                        params))
+             ((&rust-analyzer:ExpandedMacro :expansion) response))
+      (funcall lsp-rust-analyzer-macro-expansion-method expansion)
+    (lsp--error "No macro found at point, or it could not be expanded.")))
+
+(defun lsp-rust-analyzer-macro-expansion-default (result)
+  "Default method for displaying macro expansion."
+  (let* ((root (lsp-workspace-root default-directory))
+         (buf (get-buffer-create (get-buffer-create (format "*rust-analyzer macro expansion %s*" root)))))
+    (with-current-buffer buf
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (insert (lsp--render-string result "rust"))
+        (special-mode)))
+    (pop-to-buffer buf)))
+
+;;
+;;; Runnables
+
+(defvar lsp-rust-analyzer--last-runnable nil
+  "Record the last runnable.")
+
+(defun lsp-rust-analyzer--runnables ()
+  "Return list of runnables."
+  (lsp-send-request (lsp-make-request
+                     "experimental/runnables"
+                     (lsp-make-rust-analyzer-runnables-params
+                      :text-document (lsp--text-document-identifier)
+                      :position? (lsp--cur-position)))))
+
+(defun lsp-rust-analyzer--select-runnable ()
+  "Select runnable."
+  (lsp--completing-read
+   "Select runnable:"
+   (if lsp-rust-analyzer--last-runnable
+       (cons lsp-rust-analyzer--last-runnable
+             (-remove (-lambda ((&rust-analyzer:Runnable :label))
+                        (equal label (lsp-get lsp-rust-analyzer--last-runnable :label)))
+                      (lsp-rust-analyzer--runnables)))
+     (lsp-rust-analyzer--runnables))
+   (-lambda ((&rust-analyzer:Runnable :label)) label)))
+
+(defun lsp-rust-analyzer--common-runner (runnable)
+  "Execute a given RUNNABLE.
+
+Extract the arguments, prepare the minor mode (cargo-process-mode if possible)
+and run a compilation"
+  (-let* (((&rust-analyzer:Runnable :kind :label :args) runnable)
+          ((&rust-analyzer:RunnableArgs :cargo-args :executable-args :workspace-root? :expect-test?) args)
+          (default-directory (or workspace-root? default-directory)))
+    (if (not (string-equal kind "cargo"))
+        (lsp--error "'%s' runnable is not supported" kind)
+      (compilation-start
+       (string-join (append (when expect-test? '("env" "UPDATE_EXPECT=1"))
+                            (list "cargo") cargo-args
+                            (when executable-args '("--")) executable-args '()) " ")
+
+       ;; cargo-process-mode is nice, but try to work without it...
+       (if (functionp 'cargo-process-mode) 'cargo-process-mode nil)
+       (lambda (_) (concat "*" label "*"))))))
+
+(defun lsp-rust-analyzer-run (runnable)
+  "Select and run a RUNNABLE action."
+  (interactive (list (lsp-rust-analyzer--select-runnable)))
+  (when (lsp-rust-analyzer--common-runner runnable)
+    (setq lsp-rust-analyzer--last-runnable runnable)))
+
+(defun lsp-rust-analyzer-debug (runnable)
+  "Select and debug a RUNNABLE action."
+  (interactive (list (lsp-rust-analyzer--select-runnable)))
+  (unless (or (featurep 'dap-cpptools) (featurep 'dap-gdb))
+    (user-error "You must require `dap-cpptools' or 'dap-gdb'"))
+  (-let (((&rust-analyzer:Runnable
+           :args (&rust-analyzer:RunnableArgs :cargo-args :workspace-root? :executable-args)
+           :label) runnable))
+    (pcase (aref cargo-args 0)
+      ("run" (aset cargo-args 0 "build"))
+      ("test" (when (-contains? (append cargo-args ()) "--no-run")
+                (cl-callf append cargo-args (list "--no-run")))))
+    (->> (append (list (executable-find "cargo"))
+                 cargo-args
+                 (list "--message-format=json"))
+         (s-join " ")
+         (shell-command-to-string)
+         (s-lines)
+         (-keep (lambda (s)
+                  (condition-case nil
+                      (-let* ((json-object-type 'plist)
+                              ((msg &as &plist :reason :executable) (json-read-from-string s)))
+                        (when (and executable (string= "compiler-artifact" reason))
+                          executable))
+                    (error))))
+         (funcall
+          (lambda (artifact-spec)
+            (pcase artifact-spec
+              (`() (user-error "No compilation artifacts or obtaining the runnable artifacts failed"))
+              (`(,spec) spec)
+              (_ (user-error "Multiple compilation artifacts are not supported")))))
+         (list :type (if (featurep 'dap-gdb) "gdb" "cppdbg")
+               :request "launch"
+               :name label
+               :args executable-args
+               :cwd workspace-root?
+               :sourceLanguages ["rust"]
+               :program)
+         (append lsp-rust-analyzer-debug-lens-extra-dap-args)
+         (dap-debug))))
+
+(defun lsp-rust-analyzer-rerun (&optional runnable)
+  (interactive (list (or lsp-rust-analyzer--last-runnable
+                         (lsp-rust-analyzer--select-runnable))))
+  (lsp-rust-analyzer-run (or runnable lsp-rust-analyzer--last-runnable)))
+
+;; goto parent module
+(cl-defun lsp-rust-find-parent-module (&key display-action)
+  "Find parent module of current module."
+  (interactive)
+  (lsp-find-locations "experimental/parentModule" nil :display-action display-action))
+
+(defun lsp-rust-analyzer-open-cargo-toml (&optional new-window)
+  "Open the closest Cargo.toml from the current file.
+
+Rust-Analyzer LSP protocol documented here and added in November 2020
+https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-cargotoml
+
+If NEW-WINDOW (interactively the prefix argument) is non-nil,
+open in a new window."
+  (interactive "P")
+  (-if-let (workspace (lsp-find-workspace 'rust-analyzer (buffer-file-name)))
+      (-if-let* ((response (with-lsp-workspace workspace
+                             (lsp-send-request (lsp-make-request
+                                                "experimental/openCargoToml"
+                                                (lsp-make-rust-analyzer-open-cargo-toml-params
+                                                 :text-document (lsp--text-document-identifier))))))
+                 ((&Location :uri :range) response))
+          (funcall (if new-window #'find-file-other-window #'find-file)
+                   (lsp--uri-to-path uri))
+        (lsp--warn "Couldn't find a Cargo.toml file or your version of rust-analyzer doesn't support this extension"))
+    (lsp--error "OpenCargoToml is an extension available only with rust-analyzer")))
+
+(defun lsp-rust-analyzer-open-external-docs ()
+  "Open a URL for documentation related to the current TextDocumentPosition.
+
+Rust-Analyzer LSP protocol documented here
+https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#open-external-documentation"
+  (interactive)
+  (-if-let* ((params (lsp-make-rust-analyzer-open-external-docs-params
+                      :text-document (lsp--text-document-identifier)
+                      :position (lsp--cur-position)))
+             (url (lsp-request "experimental/externalDocs" params)))
+      (browse-url url)
+    (lsp--warn "Couldn't find documentation URL or your version of rust-analyzer doesn't support this extension")))
+
+(defun lsp-rust-analyzer--related-tests ()
+  "Get runnable test items related to the current TextDocumentPosition.
+Calls a rust-analyzer LSP extension endpoint that returns a wrapper over
+Runnable[]."
+  (lsp-send-request (lsp-make-request
+                     "rust-analyzer/relatedTests"
+                     (lsp--text-document-position-params))))
+
+(defun lsp-rust-analyzer--select-related-test ()
+  "Call the endpoint and ask for user selection.
+
+Cannot reuse `lsp-rust-analyzer--select-runnable' because the runnables endpoint
+responds with Runnable[], while relatedTests responds with TestInfo[],
+which is a wrapper over runnable. Also, this method doesn't set
+the `lsp-rust-analyzer--last-runnable' variable."
+  (-if-let* ((resp (lsp-rust-analyzer--related-tests))
+             (runnables (seq-map
+                         #'lsp:rust-analyzer-related-tests-runnable
+                         resp)))
+      (lsp--completing-read
+       "Select test: "
+       runnables
+       #'lsp:rust-analyzer-runnable-label)))
+
+(defun lsp-rust-analyzer-related-tests (runnable)
+  "Execute a RUNNABLE test related to the current document position.
+
+Rust-Analyzer LSP protocol extension
+https://github.com/rust-lang/rust-analyzer/blob/master/docs/dev/lsp-extensions.md#related-tests"
+  (interactive (list (lsp-rust-analyzer--select-related-test)))
+  (if runnable
+      (lsp-rust-analyzer--common-runner runnable)
+    (lsp--info "There are no tests related to the symbol at point")))
+
+(defun lsp-rust-analyzer-move-item (direction)
+  "Move item under cursor or selection in some DIRECTION"
+  (let* ((params (lsp-make-rust-analyzer-move-item-params
+                  :text-document (lsp--text-document-identifier)
+                  :range (if (use-region-p)
+                             (lsp--region-to-range (region-beginning) (region-end))
+                           (lsp--region-to-range (point) (point)))
+                  :direction direction))
+         (edits (lsp-request "experimental/moveItem" params)))
+    (lsp--apply-text-edits edits 'code-action)))
+
+(defun lsp-rust-analyzer-move-item-up ()
+  "Move item under cursor or selection up"
+  (interactive)
+  (lsp-rust-analyzer-move-item "Up"))
+
+(defun lsp-rust-analyzer-move-item-down ()
+  "Move item under cursor or selection down"
+  (interactive)
+  (lsp-rust-analyzer-move-item "Down"))
+
+(defun lsp-rust-analyzer--make-init-options ()
+  "Init options for rust-analyzer"
+  `(:diagnostics
+    ( :enable ,(lsp-json-bool lsp-rust-analyzer-diagnostics-enable)
+      :enableExperimental ,(lsp-json-bool lsp-rust-analyzer-diagnostics-enable-experimental)
+      :disabled ,lsp-rust-analyzer-diagnostics-disabled
+      :warningsAsHint ,lsp-rust-analyzer-diagnostics-warnings-as-hint
+      :warningsAsInfo ,lsp-rust-analyzer-diagnostics-warnings-as-info)
+    :imports ( :granularity ( :enforce ,(lsp-json-bool lsp-rust-analyzer-import-enforce-granularity)
+                              :group ,lsp-rust-analyzer-import-granularity)
+               :group ,(lsp-json-bool lsp-rust-analyzer-import-group)
+               :merge (:glob ,(lsp-json-bool lsp-rust-analyzer-imports-merge-glob))
+               :prefix ,lsp-rust-analyzer-import-prefix)
+    :lruCapacity ,lsp-rust-analyzer-lru-capacity
+    :checkOnSave ( :enable ,(lsp-json-bool lsp-rust-analyzer-cargo-watch-enable)
+                   :command ,lsp-rust-analyzer-cargo-watch-command
+                   :extraArgs ,lsp-rust-analyzer-cargo-watch-args
+                   :allTargets ,(lsp-json-bool lsp-rust-analyzer-check-all-targets)
+                   :features ,lsp-rust-analyzer-checkonsave-features
+                   :overrideCommand ,lsp-rust-analyzer-cargo-override-command)
+    :highlightRelated ( :breakPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-breakpoints))
+                        :closureCaptures (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-closure-captures))
+                        :exitPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-exit-points))
+                        :references (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-references))
+                        :yieldPoints (:enable ,(lsp-json-bool lsp-rust-analyzer-highlight-yield-points)))
+    :files ( :exclude ,lsp-rust-analyzer-exclude-globs
+             :watcher ,(if lsp-rust-analyzer-use-client-watching "client" "notify")
+             :excludeDirs ,lsp-rust-analyzer-exclude-dirs)
+    :cargo ( :allFeatures ,(lsp-json-bool lsp-rust-all-features)
+             :noDefaultFeatures ,(lsp-json-bool lsp-rust-no-default-features)
+             :features ,lsp-rust-features
+             :extraArgs ,lsp-rust-analyzer-cargo-extra-args
+             :extraEnv ,lsp-rust-analyzer-cargo-extra-env
+             :target ,lsp-rust-analyzer-cargo-target
+             :runBuildScripts ,(lsp-json-bool lsp-rust-analyzer-cargo-run-build-scripts)
+             ;; Obsolete, but used by old Rust-Analyzer versions
+             :loadOutDirsFromCheck ,(lsp-json-bool lsp-rust-analyzer-cargo-run-build-scripts)
+             :autoreload ,(lsp-json-bool lsp-rust-analyzer-cargo-auto-reload)
+             :useRustcWrapperForBuildScripts ,(lsp-json-bool lsp-rust-analyzer-use-rustc-wrapper-for-build-scripts)
+             :unsetTest ,lsp-rust-analyzer-cargo-unset-test)
+    :rustfmt ( :extraArgs ,lsp-rust-analyzer-rustfmt-extra-args
+               :overrideCommand ,lsp-rust-analyzer-rustfmt-override-command
+               :rangeFormatting (:enable ,(lsp-json-bool lsp-rust-analyzer-rustfmt-rangeformatting-enable)))
+    :lens ( :debug (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-debug-enable))
+            :enable ,(lsp-json-bool lsp-rust-analyzer-lens-enable)
+            ;; :forceCustomCommands ,(lsp-json-bool lsp-rust-analyzer-lens-force-custom-commands)
+            :implementations (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-implementations-enable))
+            ;; :location ,lsp-rust-analyzer-lens-location
+            :references ( :adt (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-adt-enable))
+                          :enumVariant (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-enum-variant-enable))
+                          :method (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-method-enable))
+                          :trait (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-references-trait-enable)))
+            :run (:enable ,(lsp-json-bool lsp-rust-analyzer-lens-run-enable)))
+
+    :inlayHints ( :bindingModeHints (:enable ,(lsp-json-bool lsp-rust-analyzer-binding-mode-hints))
+                  :chainingHints (:enable ,(lsp-json-bool lsp-rust-analyzer-display-chaining-hints))
+                  :closingBraceHints ( :enable ,(lsp-json-bool lsp-rust-analyzer-closing-brace-hints)
+                                       :minLines ,lsp-rust-analyzer-closing-brace-hints-min-lines)
+                  :closureCaptureHints (:enable ,(lsp-json-bool lsp-rust-analyzer-closure-capture-hints))
+                  :closureReturnTypeHints (:enable ,lsp-rust-analyzer-closure-return-type-hints)
+                  :closureStyle ,lsp-rust-analyzer-closure-style
+                  :discriminantHints (:enable ,lsp-rust-analyzer-discriminants-hints)
+
+                  :expressionAdjustmentHints ( :enable ,lsp-rust-analyzer-expression-adjustment-hints
+                                               :hideOutsideUnsafe ,(lsp-json-bool lsp-rust-analyzer-expression-adjustment-hide-unsafe)
+                                               :mode ,lsp-rust-analyzer-expression-adjustment-hints-mode)
+                  :implicitDrops (:enable ,(lsp-json-bool lsp-rust-analyzer-implicit-drops))
+                  :lifetimeElisionHints ( :enable ,lsp-rust-analyzer-display-lifetime-elision-hints-enable
+                                          :useParameterNames ,(lsp-json-bool lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names))
+                  :maxLength ,lsp-rust-analyzer-max-inlay-hint-length
+                  :parameterHints (:enable ,(lsp-json-bool lsp-rust-analyzer-display-parameter-hints))
+                  :reborrowHints (:enable ,lsp-rust-analyzer-display-reborrow-hints)
+                  :renderColons ,(lsp-json-bool lsp-rust-analyzer-server-format-inlay-hints)
+                  :typeHints ( :enable ,(lsp-json-bool lsp-inlay-hint-enable)
+                               :hideClosureInitialization ,(lsp-json-bool lsp-rust-analyzer-hide-closure-initialization)
+                               :hideNamedConstructor ,(lsp-json-bool lsp-rust-analyzer-hide-named-constructor)))
+    :completion ( :addCallParenthesis ,(lsp-json-bool lsp-rust-analyzer-completion-add-call-parenthesis)
+                  :addCallArgumentSnippets ,(lsp-json-bool lsp-rust-analyzer-completion-add-call-argument-snippets)
+                  :postfix (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-postfix-enable))
+                  :autoimport (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-auto-import-enable))
+                  :autoself (:enable ,(lsp-json-bool lsp-rust-analyzer-completion-auto-self-enable)))
+    :callInfo (:full ,(lsp-json-bool lsp-rust-analyzer-call-info-full))
+    :procMacro (:enable ,(lsp-json-bool lsp-rust-analyzer-proc-macro-enable))
+    :rustcSource ,lsp-rust-analyzer-rustc-source
+    :linkedProjects ,lsp-rust-analyzer-linked-projects
+    :highlighting (:strings ,(lsp-json-bool lsp-rust-analyzer-highlighting-strings))
+    :experimental (:procAttrMacros ,(lsp-json-bool lsp-rust-analyzer-experimental-proc-attr-macros))))
+
+(lsp-register-client
+ (make-lsp-client
+  :new-connection (lsp-stdio-connection
+                   (lambda ()
+                     `(,(or (executable-find
+                             (cl-first lsp-rust-analyzer-server-command))
+                            (lsp-package-path 'rust-analyzer)
+                            "rust-analyzer")
+                       ,@(cl-rest lsp-rust-analyzer-server-command))))
+  :activation-fn (lsp-activate-on "rust")
+  :priority (if (eq lsp-rust-server 'rust-analyzer) 1 -1)
+  :initialization-options 'lsp-rust-analyzer--make-init-options
+  :notification-handlers (ht<-alist lsp-rust-notification-handlers)
+  :action-handlers (ht ("rust-analyzer.runSingle" #'lsp-rust--analyzer-run-single)
+                       ("rust-analyzer.debugSingle" #'lsp-rust--analyzer-debug-lens)
+                       ("rust-analyzer.showReferences" #'lsp-rust--analyzer-show-references)
+                       ("rust-analyzer.triggerParameterHints" #'lsp--action-trigger-parameter-hints))
+  :library-folders-fn (lambda (_workspace) lsp-rust-analyzer-library-directories)
+  :semantic-tokens-faces-overrides `( :discard-default-modifiers t
+                                      :modifiers ,(lsp-rust-analyzer--semantic-modifiers))
+  :server-id 'rust-analyzer
+  :custom-capabilities `((experimental . ((snippetTextEdit . ,(and lsp-enable-snippet (fboundp 'yas-minor-mode))))))
+  :download-server-fn (lambda (_client callback error-callback _update?)
+                        (lsp-package-ensure 'rust-analyzer callback error-callback))))
+
+(lsp-consistency-check lsp-rust)
+
+(provide 'lsp-rust)
+;;; lsp-rust.el ends here
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-rust.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-rust.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-semantic-tokens.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-semantic-tokens.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-semantic-tokens.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-semantic-tokens.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-semgrep.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-semgrep.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-semgrep.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-semgrep.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-sml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-sml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-solargraph.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-solargraph.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-solargraph.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-solargraph.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-solidity.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-solidity.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-solidity.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-solidity.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sorbet.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-sorbet.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-sorbet.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-sorbet.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-sql.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-sql.el
@@ -0,0 +1,65 @@
+;;; lsp-sql.el --- SQL Client settings.  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2024  Shen, Jen-Chieh
+
+;; 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:
+;;
+;; LSP client for SQL.
+;;
+
+;;; Code:
+
+(require 'lsp-mode)
+
+(defgroup lsp-sql nil
+  "LSP support for SQL, using sql-language-server."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/joe-re/sql-language-server")
+  :package-version `(lsp-mode . "9.0.1"))
+
+(defcustom lsp-sql-server-path nil
+  "Path points for SQL language server.
+
+This is only for development use."
+  :type 'string
+  :group 'lsp-sql)
+
+(defun lsp-sql--server-command ()
+  "Generate startup command for SQL language server."
+  (list (or lsp-sql-server-path
+            (lsp-package-path 'sql-ls))
+        "up" "--method" "stdio"))
+
+(lsp-dependency 'sql-ls
+                '(:system "sql-ls")
+                '(:npm :package "sql-language-server"
+                       :path "sql-language-server"))
+
+(lsp-register-client
+ (make-lsp-client
+  :new-connection (lsp-stdio-connection #'lsp-sql--server-command)
+  :major-modes '(sql-mode)
+  :priority -1
+  :server-id 'sql-ls
+  :download-server-fn (lambda (_client callback error-callback _update?)
+                        (lsp-package-ensure 'sql-ls callback error-callback))))
+
+(lsp-consistency-check lsp-sql)
+
+(provide 'lsp-sql)
+;;; lsp-sql.el ends here
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-sql.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-sql.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.el
@@ -0,0 +1,192 @@
+;;; lsp-sqls.el --- SQL Client settings -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2020 Shunya Ishii
+
+;; Author: Shunya Ishii
+;; Keywords: sql lsp
+
+;; 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 client for SQL
+
+;;; Code:
+
+(require 'lsp-mode)
+
+(defgroup lsp-sqls nil
+  "LSP support for SQL, using sqls."
+  :group 'lsp-mode
+  :link '(url-link "https://github.com/lighttiger2505/sqls")
+  :package-version `(lsp-mode . "7.0"))
+
+(defcustom lsp-sqls-server "sqls"
+  "Path to the `sqls` binary."
+  :group 'lsp-sqls
+  :risky t
+  :type 'file
+  :package-version `(lsp-mode . "7.0"))
+
+(defcustom lsp-sqls-workspace-config-path "workspace"
+  "If non-nil then setup workspace configuration with json file path."
+  :group 'lsp-sqls
+  :risky t
+  :type '(choice (const "workspace")
+                 (const "root"))
+  :package-version `(lsp-mode . "7.0"))
+
+(defun lsp-sqls--make-launch-cmd ()
+  (-let [base `(,lsp-sqls-server)]
+    ;; we can add some options to command. (e.g. "-config")
+    base))
+
+
+(defcustom lsp-sqls-timeout 0.5
+  "Timeout to use for `sqls' requests."
+  :type 'number
+  :package-version '(lsp-mode . "8.0.0"))
+
+(defcustom lsp-sqls-connections nil
+  "The connections to the SQL server(s)."
+  :type '(repeat (alist :key-type (choice
+                                   (const :tag "Driver" driver)
+                                   (const :tag "Connection String" dataSourceName))
+                        :value-type string)))
+
+(defun lsp-sqls-setup-workspace-configuration ()
+  "Setup workspace configuration using json file.
+Depending on `lsp-sqls-workspace-config-path'."
+
+  (if lsp-sqls-connections
+      (lsp--set-configuration `(:sqls (:connections ,(apply #'vector lsp-sqls-connections))))
+    (when-let ((config-json-path (cond
+                                  ((equal lsp-sqls-workspace-config-path "workspace")
+                                   ".sqls/config.json")
+                                  ((equal lsp-sqls-workspace-config-path "root")
+                                   (-> (lsp-workspace-root)
+                                       (f-join ".sqls/config.json"))))))
+      (when (file-exists-p config-json-path)
+        (lsp--set-configuration (lsp--read-json-file config-json-path))))))
+
+(defun lsp-sqls--show-results (result)
+  (with-current-buffer (get-buffer-create "*sqls results*")
+    (with-help-window (buffer-name)
+      (erase-buffer)
+      (insert result))))
+
+(defun lsp-sql-execute-query (&optional command start end)
+  "Execute COMMAND on buffer text against current database.
+Buffer text is between START and END.  If START and END are nil,
+use the current region if set, otherwise the entire buffer."
+  (interactive)
+  (lsp-sqls--show-results
+   (lsp-request
+    "workspace/executeCommand"
+    (list :command "executeQuery"
+          :arguments (or
+                      (when command
+                        (lsp:command-arguments? command))
+                      (vector (lsp--buffer-uri)))
+          :timeout lsp-sqls-timeout
+          :range (list
+                  :start (lsp--point-to-position
+                          (cond
+                           (start start)
+                           ((use-region-p) (region-beginning))
+                            (t (point-min))))
+                  :end (lsp--point-to-position
+                        (cond
+                         (end end)
+                         ((use-region-p) (region-end))
+                         (t (point-max)))))))))
+
+(defun lsp-sql-execute-paragraph (&optional command)
+  "Execute COMMAND on paragraph against current database."
+  (interactive)
+  (let ((start (save-excursion (backward-paragraph) (point)))
+        (end (save-excursion (forward-paragraph) (point))))
+    (lsp-sql-execute-query command start end)))
+
+(defun lsp-sql-show-databases (&optional _command)
+  "Show databases."
+  (interactive)
+  (lsp-sqls--show-results
+   (lsp-request
+    "workspace/executeCommand"
+    (list :command "showDatabases" :timeout lsp-sqls-timeout))))
+
+(defun lsp-sql-show-schemas (&optional _command)
+  "Show schemas."
+  (interactive)
+  (lsp-sqls--show-results
+   (lsp-request
+    "workspace/executeCommand"
+    (list :command "showSchemas" :timeout lsp-sqls-timeout))))
+
+(defun lsp-sql-show-connections (&optional _command)
+  "Show connections."
+  (interactive)
+  (lsp-sqls--show-results
+   (lsp-request
+    "workspace/executeCommand"
+    (list :command "showConnections" :timeout lsp-sqls-timeout))))
+
+(defun lsp-sql-switch-database (&optional _command)
+  "Switch database."
+  (interactive)
+  (lsp-workspace-command-execute
+   "switchDatabase"
+   (vector (completing-read
+            "Select database: "
+            (s-lines (lsp-workspace-command-execute "showDatabases"))
+            nil
+            t))))
+
+(defun lsp-sql-switch-connection (&optional _command)
+  "Switch connection."
+  (interactive)
+  (lsp-workspace-command-execute
+   "switchConnections"
+   (vector (cl-first
+            (s-match "\\([[:digit:]]*\\)"
+                     (completing-read
+                      "Select connection: "
+                      (s-lines (lsp-workspace-command-execute  "showConnections"))
+                      nil
+                      t))))))
+
+(lsp-register-client
+ (make-lsp-client :new-connection (lsp-stdio-connection #'lsp-sqls--make-launch-cmd)
+                  :major-modes '(sql-mode)
+                  :priority -2
+                  :action-handlers (ht ("executeParagraph" #'lsp-sql-execute-paragraph)
+                                       ("executeQuery" #'lsp-sql-execute-query)
+                                       ("showDatabases" #'lsp-sql-show-databases)
+                                       ("showSchemas" #'lsp-sql-show-schemas)
+                                       ("showConnections" #'lsp-sql-show-connections)
+                                       ("switchDatabase" #'lsp-sql-switch-database)
+                                       ("switchConnections" #'lsp-sql-switch-connection))
+                  :server-id 'sqls
+                  :initialized-fn (lambda (workspace)
+                                    (-> workspace
+                                        (lsp--workspace-server-capabilities)
+                                        (lsp:set-server-capabilities-execute-command-provider? t))
+                                    (with-lsp-workspace workspace
+                                      (lsp-sqls-setup-workspace-configuration)))))
+
+(lsp-consistency-check lsp-sqls)
+
+(provide 'lsp-sqls)
+;;; lsp-sqls.el ends here
diff --git a/emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-sqls.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-steep.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-steep.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-steep.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-steep.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-svelte.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-svelte.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-svelte.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-svelte.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-terraform.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-terraform.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-terraform.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-terraform.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-tex.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-tex.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-tex.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-tex.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-tilt.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-tilt.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-tilt.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-tilt.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-toml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-toml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-toml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-toml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-trunk.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-trunk.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-trunk.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-trunk.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ttcn3.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-ttcn3.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-ttcn3.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-ttcn3.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-typeprof.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-typeprof.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-typeprof.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-typeprof.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-v.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-v.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-v.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-v.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vala.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-vala.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vala.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-vala.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-verilog.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-verilog.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-verilog.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-verilog.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vetur.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-vetur.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vetur.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-vetur.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vhdl.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-vhdl.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vhdl.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-vhdl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vimscript.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-vimscript.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-vimscript.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-vimscript.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-volar.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-volar.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-volar.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-volar.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-wgsl.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-wgsl.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-wgsl.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-wgsl.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-xml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-xml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-xml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-xml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-yaml.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-yaml.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-yaml.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-yaml.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-yang.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-yang.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-yang.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-yang.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-zig.el b/emacs/elpa/lsp-mode-20240514.1430/lsp-zig.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp-zig.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp-zig.elc
Binary files differ.
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp.el b/emacs/elpa/lsp-mode-20240514.1430/lsp.el
diff --git a/emacs/elpa/lsp-mode-20240427.2141/lsp.elc b/emacs/elpa/lsp-mode-20240514.1430/lsp.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/git-rebase.el b/emacs/elpa/magit-20240426.2118/git-rebase.el
@@ -1,871 +0,0 @@
-;;; git-rebase.el --- Edit Git rebase files  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2008-2024 The Magit Project Contributors
-
-;; Author: Phil Jackson <phil@shellarchive.co.uk>
-;; 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 package assists the user in editing the list of commits to be
-;; rewritten during an interactive rebase.
-
-;; When the user initiates an interactive rebase, e.g., using "r e" in
-;; a Magit buffer or on the command line using "git rebase -i REV",
-;; Git invokes the `$GIT_SEQUENCE_EDITOR' (or if that is undefined
-;; `$GIT_EDITOR' or even `$EDITOR') letting the user rearrange, drop,
-;; reword, edit, and squash commits.
-
-;; This package provides the major-mode `git-rebase-mode' which makes
-;; doing so much more fun, by making the buffer more colorful and
-;; providing the following commands:
-;;
-;;   C-c C-c  Tell Git to make it happen.
-;;   C-c C-k  Tell Git that you changed your mind, i.e., abort.
-;;
-;;   p        Move point to previous line.
-;;   n        Move point to next line.
-;;
-;;   M-p      Move the commit at point up.
-;;   M-n      Move the commit at point down.
-;;
-;;   k        Drop the commit at point.
-;;   c        Don't drop the commit at point.
-;;   r        Change the message of the commit at point.
-;;   e        Edit the commit at point.
-;;   s        Squash the commit at point, into the one above.
-;;   f        Like "s" but don't also edit the commit message.
-;;   b        Break for editing at this point in the sequence.
-;;   x        Add a script to be run with the commit at point
-;;            being checked out.
-;;   z        Add noop action at point.
-;;
-;;   SPC      Show the commit at point in another buffer.
-;;   RET      Show the commit at point in another buffer and
-;;            select its window.
-;;   C-/      Undo last change.
-;;
-;;   Commands for --rebase-merges:
-;;   l        Associate label with current HEAD in sequence.
-;;   MM       Merge specified revisions into HEAD.
-;;   Mt       Toggle whether the merge will invoke an editor
-;;            before committing.
-;;   t        Reset HEAD to the specified label.
-
-;; You should probably also read the `git-rebase' manpage.
-
-;;; Code:
-
-(require 'magit)
-
-(require 'easymenu)
-(require 'server)
-(require 'with-editor)
-
-(defvar recentf-exclude)
-
-;;; Options
-;;;; Variables
-
-(defgroup git-rebase nil
-  "Edit Git rebase sequences."
-  :link '(info-link "(magit)Editing Rebase Sequences")
-  :group 'tools)
-
-(defcustom git-rebase-auto-advance t
-  "Whether to move to next line after changing a line."
-  :group 'git-rebase
-  :type 'boolean)
-
-(defcustom git-rebase-show-instructions t
-  "Whether to show usage instructions inside the rebase buffer."
-  :group 'git-rebase
-  :type 'boolean)
-
-(defcustom git-rebase-confirm-cancel t
-  "Whether confirmation is required to cancel."
-  :group 'git-rebase
-  :type 'boolean)
-
-;;;; Faces
-
-(defgroup git-rebase-faces nil
-  "Faces used by Git-Rebase mode."
-  :group 'faces
-  :group 'git-rebase)
-
-(defface git-rebase-hash '((t :inherit magit-hash))
-  "Face for commit hashes."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-label '((t :inherit magit-refname))
-  "Face for labels in label, merge, and reset lines."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-description '((t nil))
-  "Face for commit descriptions."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-action
-  '((t :inherit font-lock-keyword-face))
-  "Face for action keywords."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-killed-action
-  '((t :inherit font-lock-comment-face :strike-through t))
-  "Face for commented commit action lines."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-comment-hash
-  '((t :inherit git-rebase-hash :weight bold))
-  "Face for commit hashes in commit message comments."
-  :group 'git-rebase-faces)
-
-(defface git-rebase-comment-heading
-  '((t :inherit font-lock-keyword-face))
-  "Face for headings in rebase message comments."
-  :group 'git-rebase-faces)
-
-;;; Keymaps
-
-(defvar-keymap git-rebase-mode-map
-  :doc "Keymap for Git-Rebase mode."
-  :parent special-mode-map
-  "C-m" #'git-rebase-show-commit
-  "p"   #'git-rebase-backward-line
-  "n"   #'forward-line
-  "M-p" #'git-rebase-move-line-up
-  "M-n" #'git-rebase-move-line-down
-  "c"   #'git-rebase-pick
-  "k"   #'git-rebase-kill-line
-  "C-k" #'git-rebase-kill-line
-  "b"   #'git-rebase-break
-  "e"   #'git-rebase-edit
-  "l"   #'git-rebase-label
-  "M M" #'git-rebase-merge
-  "M t" #'git-rebase-merge-toggle-editmsg
-  "m"   #'git-rebase-edit
-  "f"   #'git-rebase-fixup
-  "q"   #'undefined
-  "r"   #'git-rebase-reword
-  "w"   #'git-rebase-reword
-  "s"   #'git-rebase-squash
-  "t"   #'git-rebase-reset
-  "u"   #'git-rebase-update-ref
-  "x"   #'git-rebase-exec
-  "y"   #'git-rebase-insert
-  "z"   #'git-rebase-noop
-  "SPC" #'git-rebase-show-or-scroll-up
-  "DEL" #'git-rebase-show-or-scroll-down
-  "C-x C-t"        #'git-rebase-move-line-up
-  "M-<up>"         #'git-rebase-move-line-up
-  "M-<down>"       #'git-rebase-move-line-down
-  "<remap> <undo>" #'git-rebase-undo)
-(put 'git-rebase-reword       :advertised-binding (kbd "r"))
-(put 'git-rebase-move-line-up :advertised-binding (kbd "M-p"))
-(put 'git-rebase-kill-line    :advertised-binding (kbd "k"))
-
-(easy-menu-define git-rebase-mode-menu git-rebase-mode-map
-  "Git-Rebase mode menu"
-  '("Rebase"
-    ["Pick" git-rebase-pick t]
-    ["Reword" git-rebase-reword t]
-    ["Edit" git-rebase-edit t]
-    ["Squash" git-rebase-squash t]
-    ["Fixup" git-rebase-fixup t]
-    ["Kill" git-rebase-kill-line t]
-    ["Noop" git-rebase-noop t]
-    ["Execute" git-rebase-exec t]
-    ["Move Down" git-rebase-move-line-down t]
-    ["Move Up" git-rebase-move-line-up t]
-    "---"
-    ["Cancel" with-editor-cancel t]
-    ["Finish" with-editor-finish t]))
-
-(defvar git-rebase-command-descriptions
-  '((with-editor-finish           . "tell Git to make it happen")
-    (with-editor-cancel           . "tell Git that you changed your mind, i.e., abort")
-    (git-rebase-backward-line     . "move point to previous line")
-    (forward-line                 . "move point to next line")
-    (git-rebase-move-line-up      . "move the commit at point up")
-    (git-rebase-move-line-down    . "move the commit at point down")
-    (git-rebase-show-or-scroll-up . "show the commit at point in another buffer")
-    (git-rebase-show-commit
-     . "show the commit at point in another buffer and select its window")
-    (undo                         . "undo last change")
-    (git-rebase-kill-line         . "drop the commit at point")
-    (git-rebase-insert            . "insert a line for an arbitrary commit")
-    (git-rebase-noop              . "add noop action at point")))
-
-;;; Commands
-
-(defun git-rebase-pick ()
-  "Use commit on current line.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action "pick"))
-
-(defun git-rebase-reword ()
-  "Edit message of commit on current line.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action "reword"))
-
-(defun git-rebase-edit ()
-  "Stop at the commit on the current line.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action "edit"))
-
-(defun git-rebase-squash ()
-  "Meld commit on current line into previous commit, edit message.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action "squash"))
-
-(defun git-rebase-fixup ()
-  "Meld commit on current line into previous commit, discard its message.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action "fixup"))
-
-(defvar-local git-rebase-comment-re nil)
-
-(defvar git-rebase-short-options
-  '((?b . "break")
-    (?e . "edit")
-    (?f . "fixup")
-    (?l . "label")
-    (?m . "merge")
-    (?p . "pick")
-    (?r . "reword")
-    (?s . "squash")
-    (?t . "reset")
-    (?u . "update-ref")
-    (?x . "exec"))
-  "Alist mapping single key of an action to the full name.")
-
-(defclass git-rebase-action ()
-  (;; action-type: commit, exec, bare, label, merge
-   (action-type    :initarg :action-type    :initform nil)
-   ;; Examples for each action type:
-   ;; | action | action options | target  | trailer |
-   ;; |--------+----------------+---------+---------|
-   ;; | pick   |                | hash    | subject |
-   ;; | exec   |                | command |         |
-   ;; | noop   |                |         |         |
-   ;; | reset  |                | name    | subject |
-   ;; | merge  | -C hash        | name    | subject |
-   (action         :initarg :action         :initform nil)
-   (action-options :initarg :action-options :initform nil)
-   (target         :initarg :target         :initform nil)
-   (trailer        :initarg :trailer        :initform nil)
-   (comment-p      :initarg :comment-p      :initform nil)))
-
-(defvar git-rebase-line-regexps
-  `((commit . ,(concat
-                (regexp-opt '("e" "edit"
-                              "f" "fixup"
-                              "p" "pick"
-                              "r" "reword"
-                              "s" "squash")
-                            "\\(?1:")
-                " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
-    (exec . "\\(?1:x\\|exec\\) \\(?3:.*\\)")
-    (bare . ,(concat (regexp-opt '("b" "break" "noop") "\\(?1:")
-                     " *$"))
-    (label . ,(concat (regexp-opt '("l" "label"
-                                    "t" "reset"
-                                    "u" "update-ref")
-                                  "\\(?1:")
-                      " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
-    (merge . ,(concat "\\(?1:m\\|merge\\) "
-                      "\\(?:\\(?2:-[cC] [^ \n]+\\) \\)?"
-                      "\\(?3:[^ \n]+\\)"
-                      " ?\\(?4:.*\\)"))))
-
-;;;###autoload
-(defun git-rebase-current-line ()
-  "Parse current line into a `git-rebase-action' instance.
-If the current line isn't recognized as a rebase line, an
-instance with all nil values is returned."
-  (save-excursion
-    (goto-char (line-beginning-position))
-    (if-let ((re-start (concat "^\\(?5:" (regexp-quote comment-start)
-                               "\\)? *"))
-             (type (seq-some (lambda (arg)
-                               (let ((case-fold-search nil))
-                                 (and (looking-at (concat re-start (cdr arg)))
-                                      (car arg))))
-                             git-rebase-line-regexps)))
-        (git-rebase-action
-         :action-type    type
-         :action         (and-let* ((action (match-string-no-properties 1)))
-                           (or (cdr (assoc action git-rebase-short-options))
-                               action))
-         :action-options (match-string-no-properties 2)
-         :target         (match-string-no-properties 3)
-         :trailer        (match-string-no-properties 4)
-         :comment-p      (and (match-string 5) t))
-      ;; Use default empty class rather than nil to ease handling.
-      (git-rebase-action))))
-
-(defun git-rebase-set-action (action)
-  "Set action of commit line to ACTION.
-If the region is active, operate on all lines that it touches.
-Otherwise, operate on the current line.  As a special case, an
-ACTION of nil comments the rebase line, regardless of its action
-type."
-  (pcase (git-rebase-region-bounds t)
-    (`(,beg ,end)
-     (let ((end-marker (copy-marker end))
-           (pt-below-p (and mark-active (< (mark) (point)))))
-       (set-marker-insertion-type end-marker t)
-       (goto-char beg)
-       (while (< (point) end-marker)
-         (with-slots (action-type target trailer comment-p)
-             (git-rebase-current-line)
-           (cond
-            ((and action (eq action-type 'commit))
-             (let ((inhibit-read-only t))
-               (magit-delete-line)
-               (insert (concat action " " target " " trailer "\n"))))
-            ((and action-type (not (or action comment-p)))
-             (let ((inhibit-read-only t))
-               (insert comment-start " "))
-             (forward-line))
-            (t
-             ;; In the case of --rebase-merges, commit lines may have
-             ;; other lines with other action types, empty lines, and
-             ;; "Branch" comments interspersed.  Move along.
-             (forward-line)))))
-       (goto-char
-        (if git-rebase-auto-advance
-            end-marker
-          (if pt-below-p (1- end-marker) beg)))
-       (goto-char (line-beginning-position))))
-    (_ (ding))))
-
-(defun git-rebase-line-p (&optional pos)
-  (save-excursion
-    (when pos (goto-char pos))
-    (and (oref (git-rebase-current-line) action-type)
-         t)))
-
-(defun git-rebase-region-bounds (&optional fallback)
-  "Return region bounds if both ends touch rebase lines.
-Each bound is extended to include the entire line touched by the
-point or mark.  If the region isn't active and FALLBACK is
-non-nil, return the beginning and end of the current rebase line,
-if any."
-  (cond
-   ((use-region-p)
-    (let ((beg (save-excursion (goto-char (region-beginning))
-                               (line-beginning-position)))
-          (end (save-excursion (goto-char (region-end))
-                               (line-end-position))))
-      (when (and (git-rebase-line-p beg)
-                 (git-rebase-line-p end))
-        (list beg (1+ end)))))
-   ((and fallback (git-rebase-line-p))
-    (list (line-beginning-position)
-          (1+ (line-end-position))))))
-
-(defun git-rebase-move-line-down (n)
-  "Move the current commit (or command) N lines down.
-If N is negative, move the commit up instead.  With an active
-region, move all the lines that the region touches, not just the
-current line."
-  (interactive "p")
-  (pcase-let* ((`(,beg ,end)
-                (or (git-rebase-region-bounds)
-                    (list (line-beginning-position)
-                          (1+ (line-end-position)))))
-               (pt-offset (- (point) beg))
-               (mark-offset (and mark-active (- (mark) beg))))
-    (save-restriction
-      (narrow-to-region
-       (point-min)
-       (1-
-        (if git-rebase-show-instructions
-            (save-excursion
-              (goto-char (point-min))
-              (while (or (git-rebase-line-p)
-                         ;; The output for --rebase-merges has empty
-                         ;; lines and "Branch" comments interspersed.
-                         (looking-at-p "^$")
-                         (looking-at-p (concat git-rebase-comment-re
-                                               " Branch")))
-                (forward-line))
-              (line-beginning-position))
-          (point-max))))
-      (if (or (and (< n 0) (= beg (point-min)))
-              (and (> n 0) (= end (point-max)))
-              (> end (point-max)))
-          (ding)
-        (goto-char (if (< n 0) beg end))
-        (forward-line n)
-        (atomic-change-group
-          (let ((inhibit-read-only t))
-            (insert (delete-and-extract-region beg end)))
-          (let ((new-beg (- (point) (- end beg))))
-            (when (use-region-p)
-              (setq deactivate-mark nil)
-              (set-mark (+ new-beg mark-offset)))
-            (goto-char (+ new-beg pt-offset))))))))
-
-(defun git-rebase-move-line-up (n)
-  "Move the current commit (or command) N lines up.
-If N is negative, move the commit down instead.  With an active
-region, move all the lines that the region touches, not just the
-current line."
-  (interactive "p")
-  (git-rebase-move-line-down (- n)))
-
-(defun git-rebase-highlight-region (start end window rol)
-  (let ((inhibit-read-only t)
-        (deactivate-mark nil)
-        (bounds (git-rebase-region-bounds)))
-    (mapc #'delete-overlay magit-section-highlight-overlays)
-    (when bounds
-      (magit-section-make-overlay (car bounds) (cadr bounds)
-                                  'magit-section-heading-selection))
-    (if (and bounds (not magit-section-keep-region-overlay))
-        (funcall (default-value 'redisplay-unhighlight-region-function) rol)
-      (funcall (default-value 'redisplay-highlight-region-function)
-               start end window rol))))
-
-(defun git-rebase-unhighlight-region (rol)
-  (mapc #'delete-overlay magit-section-highlight-overlays)
-  (funcall (default-value 'redisplay-unhighlight-region-function) rol))
-
-(defun git-rebase-kill-line ()
-  "Kill the current action line.
-If the region is active, act on all lines touched by the region."
-  (interactive)
-  (git-rebase-set-action nil))
-
-(defun git-rebase-insert (rev)
-  "Read an arbitrary commit and insert it below current line."
-  (interactive (list (magit-read-branch-or-commit "Insert revision")))
-  (forward-line)
-  (if-let ((info (magit-rev-format "%h %s" rev)))
-      (let ((inhibit-read-only t))
-        (insert "pick " info ?\n))
-    (user-error "Unknown revision")))
-
-(defun git-rebase-set-noncommit-action (action value-fn arg)
-  (goto-char (line-beginning-position))
-  (pcase-let* ((inhibit-read-only t)
-               (`(,initial ,trailer ,comment-p)
-                (and (not arg)
-                     (with-slots ((ln-action action)
-                                  target trailer comment-p)
-                         (git-rebase-current-line)
-                       (and (equal ln-action action)
-                            (list target trailer comment-p)))))
-               (value (funcall value-fn initial)))
-    (pcase (list value initial comment-p)
-      (`("" nil ,_)
-       (ding))
-      (`(""  ,_ ,_)
-       (magit-delete-line))
-      (_
-       (if initial
-           (magit-delete-line)
-         (forward-line))
-       (insert (concat action " " value
-                       (and (equal value initial)
-                            trailer
-                            (concat " " trailer))
-                       "\n"))
-       (unless git-rebase-auto-advance
-         (forward-line -1))))))
-
-(defun git-rebase-exec (arg)
-  "Insert a shell command to be run after the current 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."
-  (interactive "P")
-  (git-rebase-set-noncommit-action
-   "exec"
-   (lambda (initial) (read-shell-command "Execute: " initial))
-   arg))
-
-(defun git-rebase-label (arg)
-  "Add a label after the current commit.
-If there already is a label on the current line, then edit that
-instead.  With a prefix argument, insert a new label even when
-there is already a label on the current line.  With empty input,
-remove the label on the current line, if any."
-  (interactive "P")
-  (git-rebase-set-noncommit-action
-   "label"
-   (lambda (initial)
-     (read-from-minibuffer
-      "Label: " initial magit-minibuffer-local-ns-map))
-   arg))
-
-(defun git-rebase-buffer-labels ()
-  (let (labels)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward "^\\(?:l\\|label\\) \\([^ \n]+\\)" nil t)
-        (push (match-string-no-properties 1) labels)))
-    (nreverse labels)))
-
-(defun git-rebase-reset (arg)
-  "Reset the current HEAD to a label.
-If there already is a reset command on the current line, then
-edit that instead.  With a prefix argument, insert a new reset
-line even when point is already on a reset line.  With empty
-input, remove the reset command on the current line, if any."
-  (interactive "P")
-  (git-rebase-set-noncommit-action
-   "reset"
-   (lambda (initial)
-     (or (magit-completing-read "Label" (git-rebase-buffer-labels)
-                                nil t initial)
-         ""))
-   arg))
-
-(defun git-rebase-update-ref (arg)
-  "Insert an update-ref action after the current line.
-If there is already an update-ref action on the current line,
-then edit that instead.  With a prefix argument, insert a new
-action even when there is already one on the current line.  With
-empty input, remove the action on the current line, if any."
-  (interactive "P")
-  (git-rebase-set-noncommit-action
-   "update-ref"
-   (lambda (initial)
-     (or (magit-completing-read "Ref" (magit-list-refs) nil nil initial)
-         ""))
-   arg))
-
-(defun git-rebase-merge (arg)
-  "Add a merge command after the current commit.
-If there is already a merge command on the current line, then
-replace that command instead.  With a prefix argument, insert a
-new merge command even when there is already one on the current
-line.  With empty input, remove the merge command on the current
-line, if any."
-  (interactive "P")
-  (git-rebase-set-noncommit-action
-   "merge"
-   (lambda (_)
-     (or (magit-completing-read "Merge" (git-rebase-buffer-labels))
-         ""))
-   arg))
-
-(defun git-rebase-merge-toggle-editmsg ()
-  "Toggle whether an editor is invoked when performing the merge at point.
-When a merge command uses a lower-case -c, the message for the
-specified commit will be opened in an editor before creating the
-commit.  For an upper-case -C, the message will be used as is."
-  (interactive)
-  (with-slots (action-type target action-options trailer)
-      (git-rebase-current-line)
-    (if (eq action-type 'merge)
-        (let ((inhibit-read-only t))
-          (magit-delete-line)
-          (insert
-           (format "merge %s %s %s\n"
-                   (replace-regexp-in-string
-                    "-[cC]" (lambda (c)
-                              (if (equal c "-c") "-C" "-c"))
-                    action-options t t)
-                   target
-                   trailer)))
-      (ding))))
-
-(defun git-rebase-set-bare-action (action arg)
-  (goto-char (line-beginning-position))
-  (with-slots ((ln-action action) comment-p)
-      (git-rebase-current-line)
-    (let ((same-action-p (equal action ln-action))
-          (inhibit-read-only t))
-      (when (or arg
-                (not ln-action)
-                (not same-action-p)
-                (and same-action-p comment-p))
-        (unless (or arg (not same-action-p))
-          (magit-delete-line))
-        (insert action ?\n)
-        (unless git-rebase-auto-advance
-          (forward-line -1))))))
-
-(defun git-rebase-noop (&optional arg)
-  "Add noop action at point.
-
-If the current line already contains a noop action, leave it
-unchanged.  If there is a commented noop action present, remove
-the comment.  Otherwise add a new noop action.  With a prefix
-argument insert a new noop action regardless of what is already
-present on the current line.
-
-A noop action can be used to make git perform a rebase even if
-no commits are selected.  Without the noop action present, git
-would see an empty file and therefore do nothing."
-  (interactive "P")
-  (git-rebase-set-bare-action "noop" arg))
-
-(defun git-rebase-break (&optional arg)
-  "Add break action at point.
-
-If there is a commented break action present, remove the comment.
-If the current line already contains a break action, add another
-break action only if a prefix argument is given.
-
-A break action can be used to interrupt the rebase at the
-specified point.  It is particularly useful for pausing before
-the first commit in the sequence.  For other cases, the
-equivalent behavior can be achieved with `git-rebase-edit'."
-  (interactive "P")
-  (git-rebase-set-bare-action "break" arg))
-
-(defun git-rebase-undo (&optional arg)
-  "Undo some previous changes.
-Like `undo' but works in read-only buffers."
-  (interactive "P")
-  (let ((inhibit-read-only t))
-    (undo arg)))
-
-(defun git-rebase--show-commit (&optional scroll)
-  (let ((magit--disable-save-buffers t))
-    (save-excursion
-      (goto-char (line-beginning-position))
-      (if-let ((rev (with-slots (action-type target)
-                        (git-rebase-current-line)
-                      (and (eq action-type 'commit)
-                           target))))
-          (pcase scroll
-            ('up   (magit-diff-show-or-scroll-up))
-            ('down (magit-diff-show-or-scroll-down))
-            (_     (apply #'magit-show-commit rev
-                          (magit-diff-arguments 'magit-revision-mode))))
-        (ding)))))
-
-(defun git-rebase-show-commit ()
-  "Show the commit on the current line if any."
-  (interactive)
-  (git-rebase--show-commit))
-
-(defun git-rebase-show-or-scroll-up ()
-  "Update the commit buffer for commit on current line.
-
-Either show the commit at point in the appropriate buffer, or if
-that buffer is already being displayed in the current frame and
-contains information about that commit, then instead scroll the
-buffer up."
-  (interactive)
-  (git-rebase--show-commit 'up))
-
-(defun git-rebase-show-or-scroll-down ()
-  "Update the commit buffer for commit on current line.
-
-Either show the commit at point in the appropriate buffer, or if
-that buffer is already being displayed in the current frame and
-contains information about that commit, then instead scroll the
-buffer down."
-  (interactive)
-  (git-rebase--show-commit 'down))
-
-(defun git-rebase-backward-line (&optional n)
-  "Move N lines backward (forward if N is negative).
-Like `forward-line' but go into the opposite direction."
-  (interactive "p")
-  (forward-line (- (or n 1))))
-
-;;; Mode
-
-;;;###autoload
-(define-derived-mode git-rebase-mode special-mode "Git Rebase"
-  "Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run \"git rebase -i\" or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running \"man git-rebase\" at the command line) for details."
-  :group 'git-rebase
-  (setq comment-start (or (magit-get "core.commentChar") "#"))
-  (setq git-rebase-comment-re (concat "^" (regexp-quote comment-start)))
-  (setq font-lock-defaults (list (git-rebase-mode-font-lock-keywords) t t))
-  (unless git-rebase-show-instructions
-    (let ((inhibit-read-only t))
-      (flush-lines git-rebase-comment-re)))
-  (unless with-editor-mode
-    ;; Maybe already enabled when using `shell-command' or an Emacs shell.
-    (with-editor-mode 1))
-  (when git-rebase-confirm-cancel
-    (add-hook 'with-editor-cancel-query-functions
-              #'git-rebase-cancel-confirm nil t))
-  (setq-local redisplay-highlight-region-function #'git-rebase-highlight-region)
-  (setq-local redisplay-unhighlight-region-function #'git-rebase-unhighlight-region)
-  (add-hook 'with-editor-pre-cancel-hook  #'git-rebase-autostash-save  nil t)
-  (add-hook 'with-editor-post-cancel-hook #'git-rebase-autostash-apply nil t)
-  (setq imenu-prev-index-position-function
-        #'magit-imenu--rebase-prev-index-position-function)
-  (setq imenu-extract-index-name-function
-        #'magit-imenu--rebase-extract-index-name-function)
-  (when (boundp 'save-place)
-    (setq save-place nil)))
-
-(defun git-rebase-cancel-confirm (force)
-  (or (not (buffer-modified-p))
-      force
-      (magit-confirm 'abort-rebase "Abort this rebase" nil 'noabort)))
-
-(defun git-rebase-autostash-save ()
-  (when-let ((rev (magit-file-line
-                   (expand-file-name "rebase-merge/autostash" (magit-gitdir)))))
-    (push (cons 'stash rev) with-editor-cancel-alist)))
-
-(defun git-rebase-autostash-apply ()
-  (when-let ((rev (cdr (assq 'stash with-editor-cancel-alist))))
-    (magit-stash-apply rev)))
-
-(defun git-rebase-match-comment-line (limit)
-  (re-search-forward (concat git-rebase-comment-re ".*") limit t))
-
-(defun git-rebase-mode-font-lock-keywords ()
-  "Font lock keywords for Git-Rebase mode."
-  `((,(concat "^" (cdr (assq 'commit git-rebase-line-regexps)))
-     (1 'git-rebase-action)
-     (3 'git-rebase-hash)
-     (4 'git-rebase-description))
-    (,(concat "^" (cdr (assq 'exec git-rebase-line-regexps)))
-     (1 'git-rebase-action)
-     (3 'git-rebase-description))
-    (,(concat "^" (cdr (assq 'bare git-rebase-line-regexps)))
-     (1 'git-rebase-action))
-    (,(concat "^" (cdr (assq 'label git-rebase-line-regexps)))
-     (1 'git-rebase-action)
-     (3 'git-rebase-label)
-     (4 'font-lock-comment-face))
-    ("^\\(m\\(?:erge\\)?\\) -[Cc] \\([^ \n]+\\) \\([^ \n]+\\)\\( #.*\\)?"
-     (1 'git-rebase-action)
-     (2 'git-rebase-hash)
-     (3 'git-rebase-label)
-     (4 'font-lock-comment-face))
-    ("^\\(m\\(?:erge\\)?\\) \\([^ \n]+\\)"
-     (1 'git-rebase-action)
-     (2 'git-rebase-label))
-    (,(concat git-rebase-comment-re " *"
-              (cdr (assq 'commit git-rebase-line-regexps)))
-     0 'git-rebase-killed-action t)
-    (git-rebase-match-comment-line 0 'font-lock-comment-face)
-    ("\\[[^[]*\\]"
-     0 'magit-keyword t)
-    ("\\(?:fixup!\\|squash!\\)"
-     0 'magit-keyword-squash t)
-    (,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
-     (1 'git-rebase-comment-hash t)
-     (2 'git-rebase-comment-hash t))
-    (,(format "^%s \\(Commands:\\)" comment-start)
-     (1 'git-rebase-comment-heading t))
-    (,(format "^%s Branch \\(.*\\)" comment-start)
-     (1 'git-rebase-label t))))
-
-(defun git-rebase-mode-show-keybindings ()
-  "Modify the \"Commands:\" section of the comment Git generates
-at the bottom of the file so that in place of the one-letter
-abbreviation for the command, it shows the command's keybinding.
-By default, this is the same except for the \"pick\" command."
-  (let ((inhibit-read-only t))
-    (save-excursion
-      (goto-char (point-min))
-      (when (and git-rebase-show-instructions
-                 (re-search-forward
-                  (concat git-rebase-comment-re "\\s-+p, pick")
-                  nil t))
-        (goto-char (line-beginning-position))
-        (pcase-dolist (`(,cmd . ,desc) git-rebase-command-descriptions)
-          (insert (format (propertize "%s %s %s\n"
-                                      'font-lock-face 'font-lock-comment-face)
-                          comment-start
-                          (string-pad
-                           (substitute-command-keys (format "\\[%s]" cmd)) 8)
-                          desc)))
-        (while (re-search-forward
-                (concat git-rebase-comment-re "\\(?:"
-                        "\\( \\.?     *\\)\\|"
-                        "\\( +\\)\\([^\n,],\\) \\([^\n ]+\\) \\)")
-                nil t)
-          (if (match-string 1)
-              (replace-match (make-string 10 ?\s) t t nil 1)
-            (let ((cmd (intern (concat "git-rebase-" (match-string 4)))))
-              (if (not (fboundp cmd))
-                  (delete-region (line-beginning-position)
-                                 (1+ (line-end-position)))
-                (add-text-properties (line-beginning-position)
-                                     (1+ (line-end-position))
-                                     '(font-lock-face font-lock-comment-face))
-                (replace-match " " t t nil 2)
-                (replace-match
-                 (string-pad
-                  (save-match-data
-                    (substitute-command-keys (format "\\[%s]" cmd)))
-                  8)
-                 t t nil 3)))))))))
-
-(add-hook 'git-rebase-mode-hook #'git-rebase-mode-show-keybindings t)
-
-(defun git-rebase-mode-disable-before-save-hook ()
-  (setq-local before-save-hook nil))
-
-(add-hook 'git-rebase-mode-hook #'git-rebase-mode-disable-before-save-hook)
-
-;;;###autoload
-(defconst git-rebase-filename-regexp "/git-rebase-todo\\'")
-;;;###autoload
-(add-to-list 'auto-mode-alist
-             (cons git-rebase-filename-regexp #'git-rebase-mode))
-
-(add-to-list 'with-editor-server-window-alist
-             (cons git-rebase-filename-regexp #'switch-to-buffer))
-
-(with-eval-after-load 'recentf
-  (add-to-list 'recentf-exclude git-rebase-filename-regexp))
-
-(add-to-list 'with-editor-file-name-history-exclude git-rebase-filename-regexp)
-
-;;; Imenu Support
-
-(defun magit-imenu--rebase-prev-index-position-function ()
-  "Move point to previous commit in git-rebase buffer.
-Used as a value for `imenu-prev-index-position-function'."
-  (catch 'found
-    (while (not (bobp))
-      (git-rebase-backward-line)
-      (when (git-rebase-line-p)
-        (throw 'found t)))))
-
-(defun magit-imenu--rebase-extract-index-name-function ()
-  "Return imenu name for line at point.
-Point should be at the beginning of the line.  This function
-is used as a value for `imenu-extract-index-name-function'."
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-;;; _
-(provide 'git-rebase)
-;;; git-rebase.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-apply.el b/emacs/elpa/magit-20240426.2118/magit-apply.el
@@ -1,861 +0,0 @@
-;;; magit-apply.el --- Apply Git diffs  -*- 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 commands for applying Git diffs or parts
-;; of such a diff.  The supported "apply variants" are apply, stage,
-;; unstage, discard, and reverse - more than Git itself knows about,
-;; at least at the porcelain level.
-
-;;; Code:
-
-(require 'magit-core)
-(require 'magit-diff)
-(require 'magit-wip)
-
-(require 'transient) ; See #3732.
-
-;; For `magit-apply'
-(declare-function magit-am "magit-sequence" () t)
-(declare-function magit-patch-apply "magit-patch" () t)
-;; For `magit-discard-files'
-(declare-function magit-checkout-stage "magit-merge" (file arg))
-(declare-function magit-checkout-read-stage "magit-merge" (file))
-(defvar auto-revert-verbose)
-;; For `magit-stage-untracked'
-(declare-function magit-submodule-add-1 "magit-submodule"
-                  (url &optional path name args))
-(declare-function magit-submodule-read-name-for-path "magit-submodule"
-                  (path &optional prefer-short))
-(defvar borg-user-emacs-directory)
-
-(cl-eval-when (compile load)
-  (when (< emacs-major-version 26)
-    (defalias 'smerge-keep-upper 'smerge-keep-mine)
-    (defalias 'smerge-keep-lower 'smerge-keep-other)))
-
-;;; Options
-
-(defcustom magit-delete-by-moving-to-trash t
-  "Whether Magit uses the system's trash can.
-
-You should absolutely not disable this and also remove `discard'
-from `magit-no-confirm'.  You shouldn't do that even if you have
-all of the Magit-Wip modes enabled, because those modes do not
-track any files that are not tracked in the proper branch."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-essentials
-  :type 'boolean)
-
-(defcustom magit-unstage-committed t
-  "Whether unstaging a committed change reverts it instead.
-
-A committed change cannot be unstaged, because staging and
-unstaging are actions that are concerned with the differences
-between the index and the working tree, not with committed
-changes.
-
-If this option is non-nil (the default), then typing \"u\"
-\(`magit-unstage') on a committed change, causes it to be
-reversed in the index but not the working tree.  For more
-information see command `magit-reverse-in-index'."
-  :package-version '(magit . "2.4.1")
-  :group 'magit-commands
-  :type 'boolean)
-
-(defcustom magit-reverse-atomically nil
-  "Whether to reverse changes atomically.
-
-If some changes can be reversed while others cannot, then nothing
-is reversed if the value of this option is non-nil.  But when it
-is nil, then the changes that can be reversed are reversed and
-for the other changes diff files are created that contain the
-rejected reversals."
-  :package-version '(magit . "2.7.0")
-  :group 'magit-commands
-  :type 'boolean)
-
-(defcustom magit-post-stage-hook nil
-  "Hook run after staging changes.
-This hook is run by `magit-refresh' if `this-command'
-is a member of `magit-post-stage-hook-commands'."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-commands
-  :type 'hook)
-
-(defcustom magit-post-unstage-hook nil
-  "Hook run after unstaging changes.
-This hook is run by `magit-refresh' if `this-command'
-is a member of `magit-post-unstage-hook-commands'."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-commands
-  :type 'hook)
-
-;;; Commands
-;;;; Apply
-
-(defun magit-apply (&rest args)
-  "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."
-  (interactive (and current-prefix-arg (list "--3way")))
-  (when-let ((s (magit-apply--get-selection)))
-    (pcase (list (magit-diff-type) (magit-diff-scope))
-      (`(,(or 'unstaged 'staged) ,_)
-       (user-error "Change is already in the working tree"))
-      (`(untracked ,(or 'file 'files))
-       (call-interactively #'magit-am))
-      (`(,_ region) (magit-apply-region s args))
-      (`(,_   hunk) (magit-apply-hunk   s args))
-      (`(,_  hunks) (magit-apply-hunks  s args))
-      (`(rebase-sequence file)
-       (call-interactively #'magit-patch-apply))
-      (`(,_   file) (magit-apply-diff   s args))
-      (`(,_  files) (magit-apply-diffs  s args)))))
-
-(defun magit-apply--section-content (section)
-  (buffer-substring-no-properties (if (magit-hunk-section-p section)
-                                      (oref section start)
-                                    (oref section content))
-                                  (oref section end)))
-
-(defun magit-apply-diffs (sections &rest args)
-  (setq sections (magit-apply--get-diffs sections))
-  (magit-apply-patch sections args
-                     (mapconcat
-                      (lambda (s)
-                        (concat (magit-diff-file-header s)
-                                (magit-apply--section-content s)))
-                      sections "")))
-
-(defun magit-apply-diff (section &rest args)
-  (setq section (car (magit-apply--get-diffs (list section))))
-  (magit-apply-patch section args
-                     (concat (magit-diff-file-header section)
-                             (magit-apply--section-content section))))
-
-(defun magit-apply--adjust-hunk-new-starts (hunks)
-  "Adjust new line numbers in headers of HUNKS for partial application.
-HUNKS should be a list of ordered, contiguous hunks to be applied
-from a file.  For example, if there is a sequence of hunks with
-the headers
-
-  @@ -2,6 +2,7 @@
-  @@ -10,6 +11,7 @@
-  @@ -18,6 +20,7 @@
-
-and only the second and third are to be applied, they would be
-adjusted as \"@@ -10,6 +10,7 @@\" and \"@@ -18,6 +19,7 @@\"."
-  (let* ((first-hunk (car hunks))
-         (offset (if (string-match diff-hunk-header-re-unified first-hunk)
-                     (- (string-to-number (match-string 3 first-hunk))
-                        (string-to-number (match-string 1 first-hunk)))
-                   (error "Header hunks have to be applied individually"))))
-    (if (= offset 0)
-        hunks
-      (mapcar (lambda (hunk)
-                (if (string-match diff-hunk-header-re-unified hunk)
-                    (replace-match (number-to-string
-                                    (- (string-to-number (match-string 3 hunk))
-                                       offset))
-                                   t t hunk 3)
-                  (error "Hunk does not have expected header")))
-              hunks))))
-
-(defun magit-apply--adjust-hunk-new-start (hunk)
-  (car (magit-apply--adjust-hunk-new-starts (list hunk))))
-
-(defun magit-apply-hunks (hunks &rest args)
-  (let ((file (oref (car hunks) parent)))
-    (when (magit-diff--combined-p file)
-      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
-    (magit-apply-patch
-     file args
-     (concat (oref file header)
-             (mapconcat #'identity
-                        (magit-apply--adjust-hunk-new-starts
-                         (mapcar #'magit-apply--section-content hunks))
-                        "")))))
-
-(defun magit-apply-hunk (hunk &rest args)
-  (let ((file (oref hunk parent)))
-    (when (magit-diff--combined-p file)
-      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
-    (let* ((header (car (oref hunk value)))
-           (header (and (symbolp header) header))
-           (content (magit-apply--section-content hunk)))
-      (magit-apply-patch
-       file args
-       (concat (magit-diff-file-header hunk (not (eq header 'rename)))
-               (if header
-                   content
-                 (magit-apply--adjust-hunk-new-start content)))))))
-
-(defun magit-apply-region (hunk &rest args)
-  (let ((file (oref hunk parent)))
-    (when (magit-diff--combined-p file)
-      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
-    (magit-apply-patch
-     file args
-     (concat (magit-diff-file-header hunk)
-             (magit-apply--adjust-hunk-new-start
-              (magit-diff-hunk-region-patch hunk args))))))
-
-(defun magit-apply-patch (section:s args patch)
-  (let* ((files (if (atom section:s)
-                    (list (oref section:s value))
-                  (--map (oref it value) section:s)))
-         (command (symbol-name this-command))
-         (command (if (and command (string-match "^magit-\\([^-]+\\)" command))
-                      (match-string 1 command)
-                    "apply"))
-         (ignore-context (magit-diff-ignore-any-space-p)))
-    (unless (magit-diff-context-p)
-      (user-error "Not enough context to apply patch.  Increase the context"))
-    (when (and magit-wip-before-change-mode (not magit-inhibit-refresh))
-      (magit-wip-commit-before-change files (concat " before " command)))
-    (with-temp-buffer
-      (insert patch)
-      (magit-run-git-with-input
-       "apply" args "-p0"
-       (and ignore-context "-C0")
-       "--ignore-space-change" "-"))
-    (unless magit-inhibit-refresh
-      (when magit-wip-after-apply-mode
-        (magit-wip-commit-after-apply files (concat " after " command)))
-      (magit-refresh))))
-
-(defun magit-apply--get-selection ()
-  (or (magit-region-sections '(hunk file module) t)
-      (let ((section (magit-current-section)))
-        (pcase (oref section type)
-          ((or 'hunk 'file 'module) section)
-          ((or 'staged 'unstaged 'untracked
-               'stashed-index 'stashed-worktree 'stashed-untracked)
-           (oref section children))
-          (_ (user-error "Cannot apply this, it's not a change"))))))
-
-(defun magit-apply--get-diffs (sections)
-  (magit-section-case
-    ([file diffstat]
-     (--map (or (magit-get-section
-                 (append `((file . ,(oref it value)))
-                         (magit-section-ident magit-root-section)))
-                (error "Cannot get required diff headers"))
-            sections))
-    (t sections)))
-
-(defun magit-apply--ignore-whitespace-p (selection type scope)
-  "Return t if it is necessary and possible to ignore whitespace.
-It is necessary to do so when the diff ignores whitespace changes
-and whole files are being applied.  It is possible when no binary
-files are involved.  If it is both necessary and impossible, then
-return nil, possibly causing whitespace changes to be applied."
-  (and (memq type  '(unstaged staged))
-       (memq scope '(file files list))
-       (cl-find-if (lambda (arg)
-                     (member arg '("--ignore-space-at-eol"
-                                   "--ignore-space-change"
-                                   "--ignore-all-space"
-                                   "--ignore-blank-lines")))
-                   magit-buffer-diff-args)
-       (not (cl-find-if (lambda (section)
-                          (oref section binary))
-                        (ensure-list selection)))))
-
-;;;; Stage
-
-(defun magit-stage (&optional intent)
-  "Add the change at point to the staging area.
-With a prefix argument, INTENT, and an untracked file (or files)
-at point, stage the file but not its content."
-  (interactive "P")
-  (if-let ((s (and (derived-mode-p 'magit-mode)
-                   (magit-apply--get-selection)))
-           (type (magit-diff-type))
-           (scope (magit-diff-scope)))
-      (pcase (list type scope
-                   (magit-apply--ignore-whitespace-p s type scope))
-        (`(untracked     ,_  ,_) (magit-stage-untracked intent))
-        (`(unstaged  region  ,_) (magit-apply-region s "--cached"))
-        (`(unstaged    hunk  ,_) (magit-apply-hunk   s "--cached"))
-        (`(unstaged   hunks  ,_) (magit-apply-hunks  s "--cached"))
-        ('(unstaged    file   t) (magit-apply-diff   s "--cached"))
-        ('(unstaged   files   t) (magit-apply-diffs  s "--cached"))
-        ('(unstaged    list   t) (magit-apply-diffs  s "--cached"))
-        ('(unstaged    file nil) (magit-stage-1 "-u" (list (oref s value))))
-        ('(unstaged   files nil) (magit-stage-1 "-u" (magit-region-values nil t)))
-        ('(unstaged    list nil) (magit-stage-modified))
-        (`(staged        ,_  ,_) (user-error "Already staged"))
-        (`(committed     ,_  ,_) (user-error "Cannot stage committed changes"))
-        (`(undefined     ,_  ,_) (user-error "Cannot stage this change")))
-    (call-interactively #'magit-stage-file)))
-
-;;;###autoload
-(defun magit-stage-buffer-file ()
-  "Stage all changes to the file being visited in the current buffer."
-  (interactive)
-  (unless buffer-file-name
-    (user-error "Not visiting a file"))
-  (magit-with-toplevel
-    (magit-stage-1 (and (magit-file-ignored-p buffer-file-name)
-                        (if (y-or-n-p "Visited file is ignored; stage anyway?")
-                            "--force"
-                          (user-error "Abort")))
-                   (list (magit-file-relative-name)))))
-
-;;;###autoload
-(defun magit-stage-file (files &optional force)
-  "Read one or more files and stage all changes in those files.
-With prefix argument FORCE, offer ignored files for completion."
-  (interactive
-   (let* ((choices (if current-prefix-arg
-                       (magit-ignored-files)
-                     (nconc (magit-unstaged-files)
-                            (magit-untracked-files))))
-          (default (or (magit-section-value-if 'file)
-                       (magit-file-relative-name)))
-          (default (car (member default choices))))
-     (list (magit-completing-read-multiple
-            (if current-prefix-arg "Stage ignored file,s: " "Stage file,s: ")
-            choices nil t nil nil default)
-           current-prefix-arg)))
-  (magit-with-toplevel
-    ;; For backward compatibility, and because of
-    ;; the function's name, don't require a list.
-    (magit-stage-1 (and force "--force")
-                   (if (listp files) files (list files)))))
-
-;;;###autoload
-(defun magit-stage-modified (&optional all)
-  "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."
-  (interactive "P")
-  (when (magit-anything-staged-p)
-    (magit-confirm 'stage-all-changes))
-  (magit-with-toplevel
-    (magit-stage-1 (if all "--all" "-u") magit-buffer-diff-files)))
-
-(defun magit-stage-1 (arg &optional files)
-  (magit-wip-commit-before-change files " before stage")
-  (magit-run-git "add" arg (if files (cons "--" files) "."))
-  (when magit-auto-revert-mode
-    (mapc #'magit-turn-on-auto-revert-mode-if-desired files))
-  (magit-wip-commit-after-apply files " after stage"))
-
-(defun magit-stage-untracked (&optional intent)
-  (let* ((section (magit-current-section))
-         (files (pcase (magit-diff-scope)
-                  ('file  (list (oref section value)))
-                  ('files (magit-region-values nil t))
-                  ('list  (magit-untracked-files))))
-         plain repos)
-    (dolist (file files)
-      (if (and (not (file-symlink-p file))
-               (magit-git-repo-p file t))
-          (push file repos)
-        (push file plain)))
-    (magit-wip-commit-before-change files " before stage")
-    (when plain
-      (magit-run-git "add" (and intent "--intent-to-add")
-                     "--" plain)
-      (when magit-auto-revert-mode
-        (mapc #'magit-turn-on-auto-revert-mode-if-desired plain)))
-    (dolist (repo repos)
-      (save-excursion
-        (goto-char (oref (magit-get-section
-                          `((file . ,repo) (untracked) (status)))
-                         start))
-        (when (and (fboundp 'borg-assimilate)
-                   (fboundp 'borg--maybe-absorb-gitdir)
-                   (fboundp 'borg--sort-submodule-sections))
-          (let* ((topdir (magit-toplevel))
-                 (url (let ((default-directory
-                             (file-name-as-directory (expand-file-name repo))))
-                        (or (magit-get "remote" (magit-get-some-remote) "url")
-                            (concat (file-name-as-directory ".") repo))))
-                 (package
-                  (and (equal borg-user-emacs-directory topdir)
-                       (file-name-nondirectory (directory-file-name repo)))))
-            (if (and package
-                     (y-or-n-p (format "Also assimilate `%s' drone?" package)))
-                (borg-assimilate package url)
-              (magit-submodule-add-1
-               url repo (magit-submodule-read-name-for-path repo package))
-              (when package
-                (borg--sort-submodule-sections
-                 (expand-file-name ".gitmodules" topdir))
-                (let ((default-directory borg-user-emacs-directory))
-                  (borg--maybe-absorb-gitdir package))))))))
-    (magit-wip-commit-after-apply files " after stage")))
-
-(defvar magit-post-stage-hook-commands
-  '(magit-stage
-    magit-stage-buffer-file
-    magit-stage-file
-    magit-stage-modified))
-
-(defun magit-run-post-stage-hook ()
-  (when (memq this-command magit-post-stage-hook-commands)
-    (magit-run-hook-with-benchmark 'magit-post-stage-hook)))
-
-;;;; Unstage
-
-(defun magit-unstage ()
-  "Remove the change at point from the staging area."
-  (interactive)
-  (when-let ((s (magit-apply--get-selection))
-             (type (magit-diff-type))
-             (scope (magit-diff-scope)))
-    (pcase (list type scope
-                 (magit-apply--ignore-whitespace-p s type scope))
-      (`(untracked     ,_  ,_) (user-error "Cannot unstage untracked changes"))
-      (`(unstaged    file  ,_) (magit-unstage-intent (list (oref s value))))
-      (`(unstaged   files  ,_) (magit-unstage-intent (magit-region-values nil t)))
-      (`(unstaged      ,_  ,_) (user-error "Already unstaged"))
-      (`(staged    region  ,_) (magit-apply-region s "--reverse" "--cached"))
-      (`(staged      hunk  ,_) (magit-apply-hunk   s "--reverse" "--cached"))
-      (`(staged     hunks  ,_) (magit-apply-hunks  s "--reverse" "--cached"))
-      ('(staged      file   t) (magit-apply-diff   s "--reverse" "--cached"))
-      ('(staged     files   t) (magit-apply-diffs  s "--reverse" "--cached"))
-      ('(staged      list   t) (magit-apply-diffs  s "--reverse" "--cached"))
-      ('(staged      file nil) (magit-unstage-1 (list (oref s value))))
-      ('(staged     files nil) (magit-unstage-1 (magit-region-values nil t)))
-      ('(staged      list nil) (magit-unstage-all))
-      (`(committed     ,_  ,_) (if magit-unstage-committed
-                                   (magit-reverse-in-index)
-                                 (user-error "Cannot unstage committed changes")))
-      (`(undefined     ,_  ,_) (user-error "Cannot unstage this change")))))
-
-;;;###autoload
-(defun magit-unstage-buffer-file ()
-  "Unstage all changes to the file being visited in the current buffer."
-  (interactive)
-  (unless buffer-file-name
-    (user-error "Not visiting a file"))
-  (magit-with-toplevel
-    (magit-unstage-1 (list (magit-file-relative-name)))))
-
-;;;###autoload
-(defun magit-unstage-file (files)
-  "Read one or more files and unstage all changes to those files."
-  (interactive
-   (let* ((choices (magit-staged-files))
-          (default (or (magit-section-value-if 'file)
-                       (magit-file-relative-name)))
-          (default (car (member default choices))))
-     (list (magit-completing-read-multiple "Unstage file,s: " choices
-                                           nil t nil nil default))))
-  (magit-with-toplevel
-    ;; For backward compatibility, and because of
-    ;; the function's name, don't require a list.
-    (magit-unstage-1 (if (listp files) files (list files)))))
-
-(defun magit-unstage-1 (files)
-  (magit-wip-commit-before-change files " before unstage")
-  (if (magit-no-commit-p)
-      (magit-run-git "rm" "--cached" "--" files)
-    (magit-run-git "reset" "HEAD" "--" files))
-  (magit-wip-commit-after-apply files " after unstage"))
-
-(defun magit-unstage-intent (files)
-  (if-let ((staged (magit-staged-files))
-           (intent (--filter (member it staged) files)))
-      (magit-unstage-1 intent)
-    (user-error "Already unstaged")))
-
-;;;###autoload
-(defun magit-unstage-all ()
-  "Remove all changes from the staging area."
-  (interactive)
-  (unless (magit-anything-staged-p)
-    (user-error "Nothing to unstage"))
-  (when (or (magit-anything-unstaged-p)
-            (magit-untracked-files))
-    (magit-confirm 'unstage-all-changes))
-  (magit-wip-commit-before-change nil " before unstage")
-  (magit-run-git "reset" "HEAD" "--" magit-buffer-diff-files)
-  (magit-wip-commit-after-apply nil " after unstage"))
-
-(defvar magit-post-unstage-hook-commands
-  '(magit-unstage
-    magit-unstage-buffer-file
-    magit-unstage-file
-    magit-unstage-all))
-
-(defun magit-run-post-unstage-hook ()
-  (when (memq this-command magit-post-unstage-hook-commands)
-    (magit-run-hook-with-benchmark 'magit-post-unstage-hook)))
-
-;;;; Discard
-
-(defun magit-discard ()
-  "Remove the change at point.
-
-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."
-  (interactive)
-  (when-let ((s (magit-apply--get-selection)))
-    (pcase (list (magit-diff-type) (magit-diff-scope))
-      (`(committed ,_) (user-error "Cannot discard committed changes"))
-      (`(undefined ,_) (user-error "Cannot discard this change"))
-      (`(,_    region) (magit-discard-region s))
-      (`(,_      hunk) (magit-discard-hunk   s))
-      (`(,_     hunks) (magit-discard-hunks  s))
-      (`(,_      file) (magit-discard-file   s))
-      (`(,_     files) (magit-discard-files  s))
-      (`(,_      list) (magit-discard-files  s)))))
-
-(defun magit-discard-region (section)
-  (magit-confirm 'discard "Discard region")
-  (magit-discard-apply section 'magit-apply-region))
-
-(defun magit-discard-hunk (section)
-  (magit-confirm 'discard "Discard hunk")
-  (let ((file (magit-section-parent-value section)))
-    (pcase (cddr (car (magit-file-status file)))
-      ('(?U ?U) (magit-smerge-keep-current))
-      (_ (magit-discard-apply section #'magit-apply-hunk)))))
-
-(defun magit-discard-apply (section apply)
-  (if (eq (magit-diff-type section) 'unstaged)
-      (funcall apply section "--reverse")
-    (if (magit-anything-unstaged-p
-         nil (if (magit-file-section-p section)
-                 (oref section value)
-               (magit-section-parent-value section)))
-        (progn (let ((magit-inhibit-refresh t))
-                 (funcall apply section "--reverse" "--cached")
-                 (funcall apply section "--reverse" "--reject"))
-               (magit-refresh))
-      (funcall apply section "--reverse" "--index"))))
-
-(defun magit-discard-hunks (sections)
-  (magit-confirm 'discard (format "Discard %s hunks from %s"
-                                  (length sections)
-                                  (magit-section-parent-value (car sections))))
-  (magit-discard-apply-n sections #'magit-apply-hunks))
-
-(defun magit-discard-apply-n (sections apply)
-  (let ((section (car sections)))
-    (if (eq (magit-diff-type section) 'unstaged)
-        (funcall apply sections "--reverse")
-      (if (magit-anything-unstaged-p
-           nil (if (magit-file-section-p section)
-                   (oref section value)
-                 (magit-section-parent-value section)))
-          (progn (let ((magit-inhibit-refresh t))
-                   (funcall apply sections "--reverse" "--cached")
-                   (funcall apply sections "--reverse" "--reject"))
-                 (magit-refresh))
-        (funcall apply sections "--reverse" "--index")))))
-
-(defun magit-discard-file (section)
-  (magit-discard-files (list section)))
-
-(defun magit-discard-files (sections)
-  (let ((auto-revert-verbose nil)
-        (type (magit-diff-type (car sections)))
-        (status (magit-file-status))
-        files delete resurrect rename discard discard-new resolve)
-    (dolist (section sections)
-      (let ((file (oref section value)))
-        (push file files)
-        (pcase (cons (pcase type
-                       (`staged ?X)
-                       (`unstaged ?Y)
-                       (`untracked ?Z))
-                     (cddr (assoc file status)))
-          ('(?Z) (dolist (f (magit-untracked-files nil file))
-                   (push f delete)))
-          ((or '(?Z ?? ??) '(?Z ?! ?!)) (push file delete))
-          ('(?Z ?D ? )                  (push file delete))
-          (`(,_ ?D ?D)                  (push file resolve))
-          ((or `(,_ ?U ,_) `(,_ ,_ ?U)) (push file resolve))
-          (`(,_ ?A ?A)                  (push file resolve))
-          (`(?X ?M ,(or ?  ?M ?D)) (push section discard))
-          (`(?Y ,_         ?M    ) (push section discard))
-          ('(?X ?A         ?M    ) (push file discard-new))
-          ('(?X ?C         ?M    ) (push file discard-new))
-          (`(?X ?A ,(or ?     ?D)) (push file delete))
-          (`(?X ?C ,(or ?     ?D)) (push file delete))
-          (`(?X ?D ,(or ?  ?M   )) (push file resurrect))
-          (`(?Y ,_            ?D ) (push file resurrect))
-          (`(?X ?R ,(or ?  ?M ?D)) (push file rename)))))
-    (unwind-protect
-        (let ((magit-inhibit-refresh t))
-          (magit-wip-commit-before-change files " before discard")
-          (when resolve
-            (magit-discard-files--resolve (nreverse resolve)))
-          (when resurrect
-            (magit-discard-files--resurrect (nreverse resurrect)))
-          (when delete
-            (magit-discard-files--delete (nreverse delete) status))
-          (when rename
-            (magit-discard-files--rename (nreverse rename) status))
-          (when (or discard discard-new)
-            (magit-discard-files--discard (nreverse discard)
-                                          (nreverse discard-new)))
-          (magit-wip-commit-after-apply files " after discard"))
-      (magit-refresh))))
-
-(defun magit-discard-files--resolve (files)
-  (if-let ((arg (and (cdr files)
-                     (magit-read-char-case
-                         (format "For these %d files\n%s\ncheckout:\n"
-                                 (length files)
-                                 (mapconcat (lambda (file)
-                                              (concat "  " file))
-                                            files "\n"))
-                         t
-                       (?o "[o]ur stage"   "--ours")
-                       (?t "[t]heir stage" "--theirs")
-                       (?c "[c]onflict"    "--merge")
-                       (?i "decide [i]ndividually" nil)))))
-      (dolist (file files)
-        (magit-checkout-stage file arg))
-    (dolist (file files)
-      (magit-checkout-stage file (magit-checkout-read-stage file)))))
-
-(defun magit-discard-files--resurrect (files)
-  (magit-confirm-files 'resurrect files)
-  (if (eq (magit-diff-type) 'staged)
-      (magit-call-git "reset"  "--" files)
-    (magit-call-git "checkout" "--" files)))
-
-(defun magit-discard-files--delete (files status)
-  (magit-confirm-files (if magit-delete-by-moving-to-trash 'trash 'delete)
-                       files)
-  (let ((delete-by-moving-to-trash magit-delete-by-moving-to-trash))
-    (dolist (file files)
-      (when (string-match-p "\\`\\\\?~" file)
-        (error "Refusing to delete %S, too dangerous" file))
-      (pcase (nth 3 (assoc file status))
-        ((guard (memq (magit-diff-type) '(unstaged untracked)))
-         (dired-delete-file file dired-recursive-deletes
-                            magit-delete-by-moving-to-trash)
-         (dired-clean-up-after-deletion file))
-        (?\s (delete-file file t)
-             (magit-call-git "rm" "--cached" "--" file))
-        (?M  (let ((temp (magit-git-string "checkout-index" "--temp" file)))
-               (string-match
-                (format "\\(.+?\\)\t%s" (regexp-quote file)) temp)
-               (rename-file (match-string 1 temp)
-                            (setq temp (concat file ".~{index}~")))
-               (delete-file temp t))
-             (magit-call-git "rm" "--cached" "--force" "--" file))
-        (?D  (magit-call-git "checkout" "--" file)
-             (delete-file file t)
-             (magit-call-git "rm" "--cached" "--force" "--" file))))))
-
-(defun magit-discard-files--rename (files status)
-  (magit-confirm 'rename "Undo rename %s" "Undo %d renames" nil
-    (mapcar (lambda (file)
-              (setq file (assoc file status))
-              (format "%s -> %s" (cadr file) (car file)))
-            files))
-  (dolist (file files)
-    (let ((orig (cadr (assoc file status))))
-      (if (file-exists-p file)
-          (progn
-            (when-let ((path (file-name-directory orig)))
-              (make-directory path t))
-            (magit-call-git "mv" file orig))
-        (magit-call-git "rm" "--cached" "--" file)
-        (magit-call-git "reset" "--" orig)))))
-
-(defun magit-discard-files--discard (sections new-files)
-  (let ((files (--map (oref it value) sections)))
-    (magit-confirm-files 'discard (append files new-files)
-                         (format "Discard %s changes in" (magit-diff-type)))
-    (if (eq (magit-diff-type (car sections)) 'unstaged)
-        (magit-call-git "checkout" "--" files)
-      (when new-files
-        (magit-call-git "add"   "--" new-files)
-        (magit-call-git "reset" "--" new-files))
-      (let ((binaries (magit-binary-files "--cached")))
-        (when binaries
-          (setq sections
-                (--remove (member (oref it value) binaries)
-                          sections)))
-        (cond ((length= sections 1)
-               (magit-discard-apply (car sections) 'magit-apply-diff))
-              (sections
-               (magit-discard-apply-n sections #'magit-apply-diffs)))
-        (when binaries
-          (let ((modified (magit-unstaged-files t)))
-            (setq binaries (--separate (member it modified) binaries)))
-          (when (cadr binaries)
-            (magit-call-git "reset" "--" (cadr binaries)))
-          (when (car binaries)
-            (user-error
-             (concat
-              "Cannot discard staged changes to binary files, "
-              "which also have unstaged changes.  Unstage instead."))))))))
-
-;;;; Reverse
-
-(defun magit-reverse (&rest args)
-  "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."
-  (interactive (and current-prefix-arg (list "--3way")))
-  (when-let ((s (magit-apply--get-selection)))
-    (pcase (list (magit-diff-type) (magit-diff-scope))
-      (`(untracked ,_) (user-error "Cannot reverse untracked changes"))
-      (`(unstaged  ,_) (user-error "Cannot reverse unstaged changes"))
-      (`(,_    region) (magit-reverse-region s args))
-      (`(,_      hunk) (magit-reverse-hunk   s args))
-      (`(,_     hunks) (magit-reverse-hunks  s args))
-      (`(,_      file) (magit-reverse-file   s args))
-      (`(,_     files) (magit-reverse-files  s args))
-      (`(,_      list) (magit-reverse-files  s args)))))
-
-(defun magit-reverse-region (section args)
-  (magit-confirm 'reverse "Reverse region")
-  (magit-reverse-apply section #'magit-apply-region args))
-
-(defun magit-reverse-hunk (section args)
-  (magit-confirm 'reverse "Reverse hunk")
-  (magit-reverse-apply section #'magit-apply-hunk args))
-
-(defun magit-reverse-hunks (sections args)
-  (magit-confirm 'reverse
-    (format "Reverse %s hunks from %s"
-            (length sections)
-            (magit-section-parent-value (car sections))))
-  (magit-reverse-apply sections #'magit-apply-hunks args))
-
-(defun magit-reverse-file (section args)
-  (magit-reverse-files (list section) args))
-
-(defun magit-reverse-files (sections args)
-  (pcase-let ((`(,binaries ,sections)
-               (let ((bs (magit-binary-files
-                          (cond ((derived-mode-p 'magit-revision-mode)
-                                 magit-buffer-range)
-                                ((derived-mode-p 'magit-diff-mode)
-                                 magit-buffer-range)
-                                (t
-                                 "--cached")))))
-                 (--separate (member (oref it value) bs)
-                             sections))))
-    (magit-confirm-files 'reverse (--map (oref it value) sections))
-    (cond ((length= sections 1)
-           (magit-reverse-apply (car sections) #'magit-apply-diff args))
-          (sections
-           (magit-reverse-apply sections #'magit-apply-diffs args)))
-    (when binaries
-      (user-error "Cannot reverse binary files"))))
-
-(defun magit-reverse-apply (section:s apply args)
-  (funcall apply section:s "--reverse" args
-           (and (not magit-reverse-atomically)
-                (not (member "--3way" args))
-                "--reject")))
-
-(defun magit-reverse-in-index (&rest args)
-  "Reverse the change at point in the index but not the working tree.
-
-Use this command to extract 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:
-
-0. Optionally make sure that there are no uncommitted changes.
-1. Visit the `HEAD' commit and navigate to the change that should
-   not have been included in that commit.
-2. Type \"u\" (`magit-unstage') to reverse it in the index.
-   This assumes that `magit-unstage-committed-changes' is non-nil.
-3. Type \"c e\" to extend `HEAD' with the staged changes,
-   including those that were already staged before.
-4. Optionally stage the remaining changes using \"s\" or \"S\"
-   and then type \"c c\" to create a new commit."
-  (interactive)
-  (magit-reverse (cons "--cached" args)))
-
-;;; Smerge Support
-
-(defun magit-smerge-keep-current ()
-  "Keep the current version of the conflict at point."
-  (interactive)
-  (magit-call-smerge #'smerge-keep-current))
-
-(defun magit-smerge-keep-upper ()
-  "Keep the upper/our version of the conflict at point."
-  (interactive)
-  (magit-call-smerge #'smerge-keep-upper))
-
-(defun magit-smerge-keep-base ()
-  "Keep the base version of the conflict at point."
-  (interactive)
-  (magit-call-smerge #'smerge-keep-base))
-
-(defun magit-smerge-keep-lower ()
-  "Keep the lower/their version of the conflict at point."
-  (interactive)
-  (magit-call-smerge #'smerge-keep-lower))
-
-(defun magit-smerge-keep-all ()
-  "Keep all versions of the conflict at point."
-  (interactive)
-  (magit-call-smerge #'smerge-keep-all))
-
-(defun magit-call-smerge (fn)
-  (pcase-let* ((file (magit-file-at-point t t))
-               (keep (get-file-buffer file))
-               (`(,buf ,pos)
-                (let ((magit-diff-visit-jump-to-change nil))
-                  (magit-diff-visit-file--noselect file))))
-    (with-current-buffer buf
-      (save-excursion
-        (save-restriction
-          (unless (<= (point-min) pos (point-max))
-            (widen))
-          (goto-char pos)
-          (condition-case nil
-              (smerge-match-conflict)
-            (error
-             (if (eq fn #'smerge-keep-current)
-                 (when (eq this-command #'magit-discard)
-                   (re-search-forward smerge-begin-re nil t)
-                   (setq fn
-                         (magit-read-char-case "Keep side: " t
-                           (?o "[o]urs/upper"   #'smerge-keep-upper)
-                           (?b "[b]ase"         #'smerge-keep-base)
-                           (?t "[t]heirs/lower" #'smerge-keep-lower))))
-               (re-search-forward smerge-begin-re nil t))))
-          (funcall fn)))
-      (when (and keep (magit-anything-unmerged-p file))
-        (smerge-start-session))
-      (save-buffer))
-    (unless keep
-      (kill-buffer buf))
-    (magit-refresh)))
-
-;;; _
-(provide 'magit-apply)
-;;; magit-apply.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-apply.elc b/emacs/elpa/magit-20240426.2118/magit-apply.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-autoloads.el b/emacs/elpa/magit-20240426.2118/magit-autoloads.el
@@ -1,2253 +0,0 @@
-;;; magit-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
-;; Generated by the `loaddefs-generate' function.
-
-;; This file is part of GNU Emacs.
-
-;;; Code:
-
-(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
-
-
-
-;;; Generated autoloads from git-rebase.el
-
-(autoload 'git-rebase-current-line "git-rebase" "\
-Parse current line into a `git-rebase-action' instance.
-If the current line isn't recognized as a rebase line, an
-instance with all nil values is returned.")
-(autoload 'git-rebase-mode "git-rebase" "\
-Major mode for editing of a Git rebase file.
-
-Rebase files are generated when you run \"git rebase -i\" or run
-`magit-interactive-rebase'.  They describe how Git should perform
-the rebase.  See the documentation for git-rebase (e.g., by
-running \"man git-rebase\" at the command line) for details.
-
-(fn)" t)
-(defconst git-rebase-filename-regexp "/git-rebase-todo\\'")
-(add-to-list 'auto-mode-alist (cons git-rebase-filename-regexp #'git-rebase-mode))
-(register-definition-prefixes "git-rebase" '("git-rebase-" "magit-imenu--rebase-"))
-
-
-;;; Generated autoloads from magit.el
-
-(defvar 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.")
-(custom-autoload 'magit-define-global-key-bindings "magit" t)
-(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))))) (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))
- (autoload 'magit-dispatch "magit" nil t)
- (autoload 'magit-run "magit" nil t)
-(autoload 'magit-git-command "magit" "\
-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'.
-
-(fn COMMAND)" t)
-(autoload 'magit-git-command-topdir "magit" "\
-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.
-
-(fn COMMAND)" t)
-(autoload 'magit-shell-command "magit" "\
-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'.
-
-(fn COMMAND)" t)
-(autoload 'magit-shell-command-topdir "magit" "\
-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.
-
-(fn COMMAND)" t)
-(autoload 'magit-version "magit" "\
-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.
-
-(fn &optional PRINT-DEST)" t)
-(register-definition-prefixes "magit" '("magit-"))
-
-
-;;; Generated autoloads from magit-apply.el
-
-(autoload 'magit-stage-buffer-file "magit-apply" "\
-Stage all changes to the file being visited in the current buffer." t)
-(autoload 'magit-stage-file "magit-apply" "\
-Read one or more files and stage all changes in those files.
-With prefix argument FORCE, offer ignored files for completion.
-
-(fn FILES &optional FORCE)" t)
-(autoload 'magit-stage-modified "magit-apply" "\
-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.
-
-(fn &optional ALL)" t)
-(autoload 'magit-unstage-buffer-file "magit-apply" "\
-Unstage all changes to the file being visited in the current buffer." t)
-(autoload 'magit-unstage-file "magit-apply" "\
-Read one or more files and unstage all changes to those files.
-
-(fn FILES)" t)
-(autoload 'magit-unstage-all "magit-apply" "\
-Remove all changes from the staging area." t)
-(register-definition-prefixes "magit-apply" '("magit-"))
-
-
-;;; Generated autoloads from magit-autorevert.el
-
-(put 'magit-auto-revert-mode 'globalized-minor-mode t)
-(defvar magit-auto-revert-mode (not (or global-auto-revert-mode noninteractive)) "\
-Non-nil if Magit-Auto-Revert mode is enabled.
-See the `magit-auto-revert-mode' command
-for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `magit-auto-revert-mode'.")
-(custom-autoload 'magit-auto-revert-mode "magit-autorevert" nil)
-(autoload 'magit-auto-revert-mode "magit-autorevert" "\
-Toggle Auto-Revert mode in all buffers.
-With prefix ARG, enable Magit-Auto-Revert mode if ARG is positive; otherwise,
-disable it.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.
-Enable the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-Auto-Revert mode is enabled in all buffers where
-`magit-turn-on-auto-revert-mode-if-desired' would do it.
-
-See `auto-revert-mode' for more information on Auto-Revert mode.
-
-(fn &optional ARG)" t)
-(register-definition-prefixes "magit-autorevert" '("auto-revert-buffer" "magit-"))
-
-
-;;; Generated autoloads from magit-base.el
-
-(autoload 'magit-emacs-Q-command "magit-base" "\
-Show a shell command that runs an uncustomized Emacs with only Magit loaded.
-See info node `(magit)Debugging Tools' for more information." t)
-(autoload 'Info-follow-nearest-node--magit-gitman "magit-base" "\
-
-
-(fn FN &optional FORK)")
-(advice-add 'Info-follow-nearest-node :around #'Info-follow-nearest-node--magit-gitman)
-(advice-add 'org-man-export :around #'org-man-export--magit-gitman)
-(autoload 'org-man-export--magit-gitman "magit-base" "\
-
-
-(fn FN LINK DESCRIPTION FORMAT)")
-(register-definition-prefixes "magit-base" '("magit-"))
-
-
-;;; Generated autoloads from magit-bisect.el
-
- (autoload 'magit-bisect "magit-bisect" nil t)
-(autoload 'magit-bisect-start "magit-bisect" "\
-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 and a known bad commit.  To move the session forward use the
-other actions from the bisect transient command (\\<magit-status-mode-map>\\[magit-bisect]).
-
-(fn BAD GOOD ARGS)" t)
-(autoload 'magit-bisect-reset "magit-bisect" "\
-After bisecting, cleanup bisection state and return to original `HEAD'." t)
-(autoload 'magit-bisect-good "magit-bisect" "\
-While bisecting, mark the current commit as good.
-Use this after you have asserted that the commit does not contain
-the bug in question." t)
-(autoload 'magit-bisect-bad "magit-bisect" "\
-While bisecting, mark the current commit as bad.
-Use this after you have asserted that the commit does contain the
-bug in question." t)
-(autoload 'magit-bisect-mark "magit-bisect" "\
-While bisecting, mark the current commit with a bisect term.
-During a bisect using alternate terms, commits can still be
-marked with `magit-bisect-good' and `magit-bisect-bad', as those
-commands map to the correct term (\"good\" to --term-old's value
-and \"bad\" to --term-new's).  However, in some cases, it can be
-difficult to keep that mapping straight in your head; this
-command provides an interface that exposes the underlying terms." t)
-(autoload 'magit-bisect-skip "magit-bisect" "\
-While bisecting, 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." t)
-(autoload 'magit-bisect-run "magit-bisect" "\
-Bisect automatically by running commands after each step.
-
-Unlike `git bisect run' this can be used before bisecting has
-begun.  In that case it behaves like `git bisect start; git
-bisect run'.
-
-(fn CMDLINE &optional BAD GOOD ARGS)" t)
-(register-definition-prefixes "magit-bisect" '("magit-"))
-
-
-;;; Generated autoloads from magit-blame.el
-
- (autoload 'magit-blame-echo "magit-blame" nil t)
- (autoload 'magit-blame-addition "magit-blame" nil t)
- (autoload 'magit-blame-removal "magit-blame" nil t)
- (autoload 'magit-blame-reverse "magit-blame" nil t)
- (autoload 'magit-blame "magit-blame" nil t)
-(register-definition-prefixes "magit-blame" '("magit-"))
-
-
-;;; Generated autoloads from magit-branch.el
-
- (autoload 'magit-branch "magit" nil t)
-(autoload 'magit-checkout "magit-branch" "\
-Checkout REVISION, updating the index and the working tree.
-If 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.
-
-(git checkout REVISION).
-
-(fn REVISION &optional ARGS)" t)
-(function-put 'magit-checkout 'interactive-only 'magit--checkout)
-(autoload 'magit-branch-create "magit-branch" "\
-Create BRANCH at branch or revision START-POINT.
-
-(fn BRANCH START-POINT)" t)
-(function-put 'magit-branch-create 'interactive-only 'magit-call-git)
-(autoload 'magit-branch-and-checkout "magit-branch" "\
-Create and checkout BRANCH at branch or revision START-POINT.
-
-(fn BRANCH START-POINT &optional ARGS)" t)
-(function-put 'magit-branch-and-checkout 'interactive-only 'magit-call-git)
-(autoload 'magit-branch-or-checkout "magit-branch" "\
-Hybrid between `magit-checkout' and `magit-branch-and-checkout'.
-
-Ask the user for an existing branch or revision.  If the user
-input actually can be resolved as a branch or revision, then
-check that out, just like `magit-checkout' would.
-
-Otherwise create and checkout a new branch using the input as
-its name.  Before doing so read the starting-point for the new
-branch.  This is similar to what `magit-branch-and-checkout'
-does.
-
-(fn ARG &optional START-POINT)" t)
-(function-put 'magit-branch-or-checkout 'interactive-only 'magit-call-git)
-(autoload 'magit-branch-checkout "magit-branch" "\
-Checkout an existing or new local branch.
-
-Read a branch name from the user offering all local branches and
-a subset of remote branches as candidates.  Omit remote branches
-for which a local branch by the same name exists from the list
-of candidates.  The user can also enter a completely new branch
-name.
-
-- If the user selects an existing local branch, then check that
-  out.
-
-- If the user selects a remote branch, then create and checkout
-  a new local branch with the same name.  Configure the selected
-  remote branch as push target.
-
-- If the user enters a new branch name, then create and check
-  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 START-POINT or something else depends on the
-value of `magit-branch-adjust-remote-upstream-alist', just like
-when using `magit-branch-and-checkout'.
-
-(fn BRANCH &optional START-POINT)" t)
-(function-put 'magit-branch-checkout 'interactive-only 'magit-call-git)
-(autoload 'magit-branch-orphan "magit-branch" "\
-Create and checkout an orphan BRANCH with contents from revision START-POINT.
-
-(fn BRANCH START-POINT)" t)
-(autoload 'magit-branch-spinout "magit-branch" "\
-Create new branch from the unpushed commits.
-Like `magit-branch-spinoff' but remain on the current branch.
-If there are any uncommitted changes, then behave exactly like
-`magit-branch-spinoff'.
-
-(fn BRANCH &optional FROM)" t)
-(autoload 'magit-branch-spinoff "magit-branch" "\
-Create new branch from the unpushed commits.
-
-Create and checkout 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
-began 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.
-
-(fn BRANCH &optional FROM)" t)
-(autoload 'magit-branch-reset "magit-branch" "\
-Reset a branch to the tip of another branch or any other commit.
-
-When the branch being reset is the current branch, then do a
-hard reset.  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 also set the target branch as the upstream of the branch
-that is being reset.
-
-(fn BRANCH TO &optional SET-UPSTREAM)" t)
-(autoload 'magit-branch-delete "magit-branch" "\
-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.
-
-(fn BRANCHES &optional FORCE)" t)
-(autoload 'magit-branch-rename "magit-branch" "\
-Rename the branch named OLD to NEW.
-
-With a prefix argument FORCE, rename even if a branch named NEW
-already exists.
-
-If `branch.OLD.pushRemote' is set, then unset it.  Depending on
-the value of `magit-branch-rename-push-target' (which see) maybe
-set `branch.NEW.pushRemote' and maybe rename the push-target on
-the remote.
-
-(fn OLD NEW &optional FORCE)" t)
-(autoload 'magit-branch-shelve "magit-branch" "\
-Shelve a BRANCH.
-Rename \"refs/heads/BRANCH\" to \"refs/shelved/BRANCH\",
-and also rename the respective reflog file.
-
-(fn BRANCH)" t)
-(autoload 'magit-branch-unshelve "magit-branch" "\
-Unshelve a BRANCH
-Rename \"refs/shelved/BRANCH\" to \"refs/heads/BRANCH\",
-and also rename the respective reflog file.
-
-(fn BRANCH)" t)
- (autoload 'magit-branch-configure "magit-branch" nil t)
-(register-definition-prefixes "magit-branch" '("magit-"))
-
-
-;;; Generated autoloads from magit-bundle.el
-
- (autoload 'magit-bundle "magit-bundle" nil t)
- (autoload 'magit-bundle-import "magit-bundle" nil t)
-(autoload 'magit-bundle-create-tracked "magit-bundle" "\
-Create and track a new bundle.
-
-(fn FILE TAG BRANCH REFS ARGS)" t)
-(autoload 'magit-bundle-update-tracked "magit-bundle" "\
-Update a bundle that is being tracked using TAG.
-
-(fn TAG)" t)
-(autoload 'magit-bundle-verify "magit-bundle" "\
-Check whether FILE is valid and applies to the current repository.
-
-(fn FILE)" t)
-(autoload 'magit-bundle-list-heads "magit-bundle" "\
-List the refs in FILE.
-
-(fn FILE)" t)
-(register-definition-prefixes "magit-bundle" '("magit-"))
-
-
-;;; Generated autoloads from magit-clone.el
-
- (autoload 'magit-clone "magit-clone" nil t)
-(autoload 'magit-clone-regular "magit-clone" "\
-Create a clone of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-
-(fn REPOSITORY DIRECTORY ARGS)" t)
-(autoload 'magit-clone-shallow "magit-clone" "\
-Create a shallow clone of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-With a prefix argument read the DEPTH of the clone;
-otherwise use 1.
-
-(fn REPOSITORY DIRECTORY ARGS DEPTH)" t)
-(autoload 'magit-clone-shallow-since "magit-clone" "\
-Create a shallow clone of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-Exclude commits before DATE, which is read from the
-user.
-
-(fn REPOSITORY DIRECTORY ARGS DATE)" t)
-(autoload 'magit-clone-shallow-exclude "magit-clone" "\
-Create a shallow clone of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-Exclude commits reachable from EXCLUDE, which is a
-branch or tag read from the user.
-
-(fn REPOSITORY DIRECTORY ARGS EXCLUDE)" t)
-(autoload 'magit-clone-bare "magit-clone" "\
-Create a bare clone of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-
-(fn REPOSITORY DIRECTORY ARGS)" t)
-(autoload 'magit-clone-mirror "magit-clone" "\
-Create a mirror of REPOSITORY in DIRECTORY.
-Then show the status buffer for the new repository.
-
-(fn REPOSITORY DIRECTORY ARGS)" t)
-(autoload 'magit-clone-sparse "magit-clone" "\
-Clone REPOSITORY into DIRECTORY and create a sparse checkout.
-
-(fn REPOSITORY DIRECTORY ARGS)" t)
-(register-definition-prefixes "magit-clone" '("magit-"))
-
-
-;;; Generated autoloads from magit-commit.el
-
- (autoload 'magit-commit "magit-commit" nil t)
-(autoload 'magit-commit-create "magit-commit" "\
-Create a new commit on `HEAD'.
-With a prefix argument, amend to the commit at `HEAD' instead.
-
-(git commit [--amend] ARGS)
-
-(fn &optional ARGS)" t)
-(autoload 'magit-commit-amend "magit-commit" "\
-Amend the last commit.
-
-(git commit --amend ARGS)
-
-(fn &optional ARGS)" t)
-(autoload 'magit-commit-extend "magit-commit" "\
-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.
-
-(git commit --amend --no-edit)
-
-(fn &optional ARGS OVERRIDE-DATE)" t)
-(autoload 'magit-commit-reword "magit-commit" "\
-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.
-
-(git commit --amend --only)
-
-(fn &optional ARGS OVERRIDE-DATE)" t)
-(autoload 'magit-commit-fixup "magit-commit" "\
-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'.
-
-(fn &optional COMMIT ARGS)" t)
-(autoload 'magit-commit-squash "magit-commit" "\
-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'.
-
-If you want to immediately add a message to the squash commit,
-then use `magit-commit-augment' instead of this command.
-
-(fn &optional COMMIT ARGS)" t)
-(autoload 'magit-commit-augment "magit-commit" "\
-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'.
-
-(fn &optional COMMIT ARGS)" t)
-(autoload 'magit-commit-instant-fixup "magit-commit" "\
-Create a fixup commit targeting COMMIT and instantly rebase.
-
-(fn &optional COMMIT ARGS)" t)
-(autoload 'magit-commit-instant-squash "magit-commit" "\
-Create a squash commit targeting COMMIT and instantly rebase.
-
-(fn &optional COMMIT ARGS)" t)
-(autoload 'magit-commit-reshelve "magit-commit" "\
-Change the committer date and possibly the author date of `HEAD'.
-
-The current time is used as the initial minibuffer input and the
-original author or committer date is available as the previous
-history element.
-
-Both the author and the committer dates are changed, unless one
-of the following is true, in which case only the committer date
-is updated:
-- You are not the author of the commit that is being reshelved.
-- The command was invoked with a prefix argument.
-- Non-interactively if UPDATE-AUTHOR is nil.
-
-(fn DATE UPDATE-AUTHOR &optional ARGS)" t)
-(autoload 'magit-commit-absorb-modules "magit-commit" "\
-Spread modified modules across recent commits.
-
-(fn PHASE COMMIT)" t)
- (autoload 'magit-commit-absorb "magit-commit" nil t)
- (autoload 'magit-commit-autofixup "magit-commit" nil t)
-(register-definition-prefixes "magit-commit" '("magit-"))
-
-
-;;; Generated autoloads from magit-diff.el
-
- (autoload 'magit-diff "magit-diff" nil t)
- (autoload 'magit-diff-refresh "magit-diff" nil t)
-(autoload 'magit-diff-dwim "magit-diff" "\
-Show changes for the thing at point.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-diff-range "magit-diff" "\
-Show differences between two commits.
-
-REV-OR-RANGE should be a range or a single revision.  If it is a
-revision, then show changes in the working tree relative to that
-revision.  If it is a range, but one side is omitted, then show
-changes relative to `HEAD'.
-
-If the region is active, use the revisions on the first and last
-line of the region as the two sides of the range.  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).
-
-(fn REV-OR-RANGE &optional ARGS FILES)" t)
-(autoload 'magit-diff-working-tree "magit-diff" "\
-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.
-
-(fn &optional REV ARGS FILES)" t)
-(autoload 'magit-diff-staged "magit-diff" "\
-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.
-
-(fn &optional REV ARGS FILES)" t)
-(autoload 'magit-diff-unstaged "magit-diff" "\
-Show changes between the working tree and the index.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-diff-unmerged "magit-diff" "\
-Show changes that are being merged.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-diff-while-committing "magit-diff" "\
-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." t)
-(autoload 'magit-diff-buffer-file "magit-diff" "\
-Show diff for the blob or file visited in the current buffer.
-
-When the buffer visits a blob, then show the respective commit.
-When the buffer visits a file, then show the differences between
-`HEAD' and the working tree.  In both cases limit the diff to
-the file or blob." t)
-(autoload 'magit-diff-paths "magit-diff" "\
-Show changes between any two files on disk.
-
-(fn A B)" t)
-(autoload 'magit-show-commit "magit-diff" "\
-Visit the revision at point in another buffer.
-If there is no revision at point or with a prefix argument prompt
-for a revision.
-
-(fn REV &optional ARGS FILES MODULE)" t)
-(register-definition-prefixes "magit-diff" '("magit-"))
-
-
-;;; Generated autoloads from magit-ediff.el
-
- (autoload 'magit-ediff "magit-ediff" nil)
-(autoload 'magit-ediff-resolve-all "magit-ediff" "\
-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 prompt for a file.
-
-See info node `(magit) Ediffing' for more information about this
-and alternative commands.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-resolve-rest "magit-ediff" "\
-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 prompt for a file.
-
-See info node `(magit) Ediffing' for more information about this
-and alternative commands.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-stage "magit-ediff" "\
-Stage and unstage changes to FILE using Ediff.
-FILE has to be relative to the top directory of the repository.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-compare "magit-ediff" "\
-Compare REVA:FILEA with REVB:FILEB using Ediff.
-
-FILEA and FILEB have to be relative to the top directory of the
-repository.  If REVA or REVB is nil, then this stands for the
-working tree state.
-
-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).
-
-(fn REVA REVB FILEA FILEB)" t)
-(autoload 'magit-ediff-dwim "magit-ediff" "\
-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 or 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." t)
-(autoload 'magit-ediff-show-staged "magit-ediff" "\
-Show staged changes using Ediff.
-
-This only allows looking at the changes; to stage, unstage,
-and discard changes using Ediff, use `magit-ediff-stage'.
-
-FILE must be relative to the top directory of the repository.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-show-unstaged "magit-ediff" "\
-Show unstaged changes using Ediff.
-
-This only allows looking at the changes; to stage, unstage,
-and discard changes using Ediff, use `magit-ediff-stage'.
-
-FILE must be relative to the top directory of the repository.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-show-working-tree "magit-ediff" "\
-Show changes between `HEAD' and working tree using Ediff.
-FILE must be relative to the top directory of the repository.
-
-(fn FILE)" t)
-(autoload 'magit-ediff-show-commit "magit-ediff" "\
-Show changes introduced by COMMIT using Ediff.
-
-(fn COMMIT)" t)
-(autoload 'magit-ediff-show-stash "magit-ediff" "\
-Show changes introduced by STASH using Ediff.
-`magit-ediff-show-stash-with-index' controls whether a
-three-buffer Ediff is used in order to distinguish changes in the
-stash that were staged.
-
-(fn STASH)" t)
-(register-definition-prefixes "magit-ediff" '("magit-ediff-"))
-
-
-;;; Generated autoloads from magit-extras.el
-
- (autoload 'magit-git-mergetool "magit-extras" nil t)
-(autoload 'magit-run-git-gui-blame "magit-extras" "\
-Run `git gui blame' on the given FILENAME and COMMIT.
-Interactively run it for the current file and the `HEAD', with a
-prefix or when the current file cannot be determined let the user
-choose.  When the current buffer is visiting FILENAME instruct
-blame to center around the line point is on.
-
-(fn COMMIT FILENAME &optional LINENUM)" t)
-(autoload 'magit-run-git-gui "magit-extras" "\
-Run `git gui' for the current git repository." t)
-(autoload 'magit-run-gitk "magit-extras" "\
-Run `gitk' in the current repository." t)
-(autoload 'magit-run-gitk-branches "magit-extras" "\
-Run `gitk --branches' in the current repository." t)
-(autoload 'magit-run-gitk-all "magit-extras" "\
-Run `gitk --all' in the current repository." t)
-(autoload 'ido-enter-magit-status "magit-extras" "\
-Drop into `magit-status' from file switching.
-
-This command does not work in Emacs 26.1.
-See https://github.com/magit/magit/issues/3634
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707.
-
-To make this command available use something like:
-
-  (add-hook \\='ido-setup-hook
-            (lambda ()
-              (keymap-set ido-completion-map
-                          \"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:
-
-  (keymap-set ido-common-completion-map
-              \"C-x g\" \\='ido-enter-magit-status)" t)
-(autoload 'magit-project-status "magit-extras" "\
-Run `magit-status' in the current project's root." t)
-(autoload 'magit-dired-jump "magit-extras" "\
-Visit file at point using Dired.
-With a prefix argument, visit in another window.  If there
-is no file at point, then instead visit `default-directory'.
-
-(fn &optional OTHER-WINDOW)" t)
-(autoload 'magit-dired-log "magit-extras" "\
-Show log for all marked files, or the current file.
-
-(fn &optional FOLLOW)" t)
-(autoload 'magit-dired-am-apply-patches "magit-extras" "\
-In Dired, apply the marked (or next ARG) files as patches.
-If inside a repository, then apply in that.  Otherwise prompt
-for a repository.
-
-(fn REPO &optional ARG)" t)
-(autoload 'magit-do-async-shell-command "magit-extras" "\
-Open FILE with `dired-do-async-shell-command'.
-Interactively, open the file at point.
-
-(fn FILE)" t)
-(autoload 'magit-previous-line "magit-extras" "\
-Like `previous-line' but with Magit-specific shift-selection.
-
-Magit's selection mechanism is based on the region but selects an
-area that is larger than the region.  This causes `previous-line'
-when invoked while holding the shift key to move up one line and
-thereby select two lines.  When invoked inside a hunk body this
-command does not move point on the first invocation and thereby
-it only selects a single line.  Which inconsistency you prefer
-is a matter of preference.
-
-(fn &optional ARG TRY-VSCROLL)" t)
-(function-put 'magit-previous-line 'interactive-only '"use `forward-line' with negative argument instead.")
-(autoload 'magit-next-line "magit-extras" "\
-Like `next-line' but with Magit-specific shift-selection.
-
-Magit's selection mechanism is based on the region but selects
-an area that is larger than the region.  This causes `next-line'
-when invoked while holding the shift key to move down one line
-and thereby select two lines.  When invoked inside a hunk body
-this command does not move point on the first invocation and
-thereby it only selects a single line.  Which inconsistency you
-prefer is a matter of preference.
-
-(fn &optional ARG TRY-VSCROLL)" t)
-(function-put 'magit-next-line 'interactive-only 'forward-line)
-(autoload 'magit-clean "magit-extras" "\
-Remove untracked files from the working tree.
-With a prefix argument also remove ignored files,
-with two prefix arguments remove ignored files only.
-
-(git clean -f -d [-x|-X])
-
-(fn &optional ARG)" t)
-(autoload 'magit-generate-changelog "magit-extras" "\
-Insert ChangeLog entries into the current buffer.
-
-The entries are generated from the diff being committed.
-If prefix argument, AMENDING, is non-nil, include changes
-in HEAD as well as staged changes in the diff to check.
-
-(fn &optional AMENDING)" t)
-(autoload 'magit-add-change-log-entry "magit-extras" "\
-Find change log file and add date entry and item for current change.
-This differs from `add-change-log-entry' (which see) in that
-it acts on the current hunk in a Magit buffer instead of on
-a position in a file-visiting buffer.
-
-(fn &optional WHOAMI FILE-NAME OTHER-WINDOW)" t)
-(autoload 'magit-add-change-log-entry-other-window "magit-extras" "\
-Find change log file in other window and add entry and item.
-This differs from `add-change-log-entry-other-window' (which see)
-in that it acts on the current hunk in a Magit buffer instead of
-on a position in a file-visiting buffer.
-
-(fn &optional WHOAMI FILE-NAME)" t)
-(autoload 'magit-edit-line-commit "magit-extras" "\
-Edit the commit that added the current line.
-
-With a prefix argument edit the commit 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.
-
-(fn &optional TYPE)" t)
-(autoload 'magit-diff-edit-hunk-commit "magit-extras" "\
-From a hunk, edit the respective commit and visit the file.
-
-First visit 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 invoke `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.
-
-(fn FILE)" t)
-(autoload 'magit-reshelve-since "magit-extras" "\
-Change the author and committer dates of the commits since REV.
-
-Ask the user for the first reachable commit whose dates should
-be changed.  Then read the new date for that commit.  The initial
-minibuffer input and the previous history element offer good
-values.  The next commit will be created one minute later and so
-on.
-
-This command is only intended for interactive use and should only
-be used on highly rearranged and unpublished history.
-
-If KEYID is non-nil, then use that to sign all reshelved commits.
-Interactively use the value of the \"--gpg-sign\" option in the
-list returned by `magit-rebase-arguments'.
-
-(fn REV KEYID)" t)
-(autoload 'magit-pop-revision-stack "magit-extras" "\
-Insert a representation of a revision into the current buffer.
-
-Pop a revision from the `magit-revision-stack' and insert 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, instead read 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.
-
-(fn REV TOPLEVEL)" t)
-(autoload 'magit-copy-section-value "magit-extras" "\
-Save the value of the current section for later use.
-
-Save the section value to the `kill-ring', and, provided that
-the current section is a commit, branch, or tag section, push
-the (referenced) revision to the `magit-revision-stack' for use
-with `magit-pop-revision-stack'.
-
-When `magit-copy-revision-abbreviated' is non-nil, save the
-abbreviated revision to the `kill-ring' and the
-`magit-revision-stack'.
-
-When the current section is a branch or a tag, and a prefix
-argument is used, then save the revision at its tip to the
-`kill-ring' instead of the reference name.
-
-When the region is active, then save 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 strip the diff marker column and keep only either
-the added or removed lines, depending on the sign of the prefix
-argument.
-
-(fn ARG)" t)
-(autoload 'magit-copy-buffer-revision "magit-extras" "\
-Save the revision of the current buffer for later use.
-
-Save the revision shown in the current buffer to the `kill-ring'
-and push it to the `magit-revision-stack'.
-
-This command 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.
-
-In such buffers it is often more useful to save the value of
-the current section instead, using `magit-copy-section-value'.
-
-When the region is active, then save that to the `kill-ring',
-like `kill-ring-save' would, instead of behaving as described
-above.
-
-When `magit-copy-revision-abbreviated' is non-nil, save the
-abbreviated revision to the `kill-ring' and the
-`magit-revision-stack'." t)
-(autoload 'magit-display-repository-buffer "magit-extras" "\
-Display a Magit buffer belonging to the current Git repository.
-The buffer is displayed using `magit-display-buffer', which see.
-
-(fn BUFFER)" t)
-(autoload 'magit-switch-to-repository-buffer "magit-extras" "\
-Switch to a Magit buffer belonging to the current Git repository.
-
-(fn BUFFER)" t)
-(autoload 'magit-switch-to-repository-buffer-other-window "magit-extras" "\
-Switch to a Magit buffer belonging to the current Git repository.
-
-(fn BUFFER)" t)
-(autoload 'magit-switch-to-repository-buffer-other-frame "magit-extras" "\
-Switch to a Magit buffer belonging to the current Git repository.
-
-(fn BUFFER)" t)
-(autoload 'magit-abort-dwim "magit-extras" "\
-Abort current operation.
-Depending on the context, this will abort a merge, a rebase, a
-patch application, a cherry-pick, a revert, or a bisect." t)
-(register-definition-prefixes "magit-extras" '("magit-"))
-
-
-;;; Generated autoloads from magit-fetch.el
-
- (autoload 'magit-fetch "magit-fetch" nil t)
- (autoload 'magit-fetch-from-pushremote "magit-fetch" nil t)
- (autoload 'magit-fetch-from-upstream "magit-fetch" nil t)
-(autoload 'magit-fetch-other "magit-fetch" "\
-Fetch from another repository.
-
-(fn REMOTE ARGS)" t)
-(autoload 'magit-fetch-branch "magit-fetch" "\
-Fetch a BRANCH from a REMOTE.
-
-(fn REMOTE BRANCH ARGS)" t)
-(autoload 'magit-fetch-refspec "magit-fetch" "\
-Fetch a REFSPEC from a REMOTE.
-
-(fn REMOTE REFSPEC ARGS)" t)
-(autoload 'magit-fetch-all "magit-fetch" "\
-Fetch from all remotes.
-
-(fn ARGS)" t)
-(autoload 'magit-fetch-all-prune "magit-fetch" "\
-Fetch from all remotes, and prune.
-Prune remote tracking branches for branches that have been
-removed on the respective remote." t)
-(autoload 'magit-fetch-all-no-prune "magit-fetch" "\
-Fetch from all remotes." t)
- (autoload 'magit-fetch-modules "magit-fetch" nil t)
-(register-definition-prefixes "magit-fetch" '("magit-"))
-
-
-;;; Generated autoloads from magit-files.el
-
-(autoload 'magit-find-file "magit-files" "\
-View FILE from REV.
-Switch to a buffer visiting blob REV:FILE, creating one if none
-already exists.  If prior to calling this command the current
-buffer and/or cursor position is about the same file, then go
-to the line and column corresponding to that location.
-
-(fn REV FILE)" t)
-(autoload 'magit-find-file-other-window "magit-files" "\
-View FILE from REV, in another window.
-Switch to a buffer visiting blob REV:FILE, creating one if none
-already exists.  If prior to calling this command the current
-buffer and/or cursor position is about the same file, then go to
-the line and column corresponding to that location.
-
-(fn REV FILE)" t)
-(autoload 'magit-find-file-other-frame "magit-files" "\
-View FILE from REV, in another frame.
-Switch to a buffer visiting blob REV:FILE, creating one if none
-already exists.  If prior to calling this command the current
-buffer and/or cursor position is about the same file, then go to
-the line and column corresponding to that location.
-
-(fn REV FILE)" t)
- (autoload 'magit-file-dispatch "magit" nil t)
-(autoload 'magit-blob-visit-file "magit-files" "\
-View the file from the worktree corresponding to the current blob.
-When visiting a blob or the version from the index, then go to
-the same location in the respective file in the working tree." t)
-(autoload 'magit-file-checkout "magit-files" "\
-Checkout FILE from REV.
-
-(fn REV FILE)" t)
-(register-definition-prefixes "magit-files" '("magit-"))
-
-
-;;; Generated autoloads from magit-git.el
-
-(register-definition-prefixes "magit-git" '("magit-"))
-
-
-;;; Generated autoloads from magit-gitignore.el
-
- (autoload 'magit-gitignore "magit-gitignore" nil t)
-(autoload 'magit-gitignore-in-topdir "magit-gitignore" "\
-Add the Git ignore RULE to the top-level \".gitignore\" file.
-Since this file is tracked, it is shared with other clones of the
-repository.  Also stage the file.
-
-(fn RULE)" t)
-(autoload 'magit-gitignore-in-subdir "magit-gitignore" "\
-Add the Git ignore RULE to a \".gitignore\" file in DIRECTORY.
-Prompt the user for a directory and add the rule to the
-\".gitignore\" file in that directory.  Since such files are
-tracked, they are shared with other clones of the repository.
-Also stage the file.
-
-(fn RULE DIRECTORY)" t)
-(autoload 'magit-gitignore-in-gitdir "magit-gitignore" "\
-Add the Git ignore RULE to \"$GIT_DIR/info/exclude\".
-Rules in that file only affects this clone of the repository.
-
-(fn RULE)" t)
-(autoload 'magit-gitignore-on-system "magit-gitignore" "\
-Add the Git ignore RULE to the file specified by `core.excludesFile'.
-Rules that are defined in that file affect all local repositories.
-
-(fn RULE)" t)
-(autoload 'magit-skip-worktree "magit-gitignore" "\
-Call \"git update-index --skip-worktree -- FILE\".
-
-(fn FILE)" t)
-(autoload 'magit-no-skip-worktree "magit-gitignore" "\
-Call \"git update-index --no-skip-worktree -- FILE\".
-
-(fn FILE)" t)
-(autoload 'magit-assume-unchanged "magit-gitignore" "\
-Call \"git update-index --assume-unchanged -- FILE\".
-
-(fn FILE)" t)
-(autoload 'magit-no-assume-unchanged "magit-gitignore" "\
-Call \"git update-index --no-assume-unchanged -- FILE\".
-
-(fn FILE)" t)
-(register-definition-prefixes "magit-gitignore" '("magit-"))
-
-
-;;; Generated autoloads from magit-log.el
-
- (autoload 'magit-log "magit-log" nil t)
- (autoload 'magit-log-refresh "magit-log" nil t)
-(autoload 'magit-log-current "magit-log" "\
-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.
-
-(fn REVS &optional ARGS FILES)" t)
-(autoload 'magit-log-head "magit-log" "\
-Show log for `HEAD'.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-log-related "magit-log" "\
-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.
-
-(fn REVS &optional ARGS FILES)" t)
-(autoload 'magit-log-other "magit-log" "\
-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 and tags, and a
-representation of the commit at point, are available as
-completion candidates.
-
-(fn REVS &optional ARGS FILES)" t)
-(autoload 'magit-log-branches "magit-log" "\
-Show log for all local branches and `HEAD'.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-log-matching-branches "magit-log" "\
-Show log for all branches matching PATTERN and `HEAD'.
-
-(fn PATTERN &optional ARGS FILES)" t)
-(autoload 'magit-log-matching-tags "magit-log" "\
-Show log for all tags matching PATTERN and `HEAD'.
-
-(fn PATTERN &optional ARGS FILES)" t)
-(autoload 'magit-log-all-branches "magit-log" "\
-Show log for all local and remote branches and `HEAD'.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-log-all "magit-log" "\
-Show log for all references and `HEAD'.
-
-(fn &optional ARGS FILES)" t)
-(autoload 'magit-log-buffer-file "magit-log" "\
-Show log for the blob or file visited in the current buffer.
-With a prefix argument or when `--follow' is an active log
-argument, then follow renames.  When the region is active,
-restrict the log to the lines that the region touches.
-
-(fn &optional FOLLOW BEG END)" t)
-(autoload 'magit-log-trace-definition "magit-log" "\
-Show log for the definition at point.
-
-(fn FILE FN REV)" t)
-(autoload 'magit-log-merged "magit-log" "\
-Show log for the merge of COMMIT into BRANCH.
-
-More precisely, find merge commit M that brought COMMIT into
-BRANCH, and show the log of the range \"M^1..M\". If COMMIT is
-directly on BRANCH, then show approximately
-`magit-log-merged-commit-count' surrounding commits instead.
-
-This command requires git-when-merged, which is available from
-https://github.com/mhagger/git-when-merged.
-
-(fn COMMIT BRANCH &optional ARGS FILES)" t)
-(autoload 'magit-log-move-to-parent "magit-log" "\
-Move to the Nth parent of the current commit.
-
-(fn &optional N)" t)
- (autoload 'magit-shortlog "magit-log" nil t)
-(autoload 'magit-shortlog-since "magit-log" "\
-Show a history summary for commits since REV.
-
-(fn REV ARGS)" t)
-(autoload 'magit-shortlog-range "magit-log" "\
-Show a history summary for commit or range REV-OR-RANGE.
-
-(fn REV-OR-RANGE ARGS)" t)
-(autoload 'magit-cherry "magit-log" "\
-Show commits in a branch that are not merged in the upstream branch.
-
-(fn HEAD UPSTREAM)" t)
-(register-definition-prefixes "magit-log" '("magit-"))
-
-
-;;; Generated autoloads from magit-margin.el
-
-(register-definition-prefixes "magit-margin" '("magit-"))
-
-
-;;; Generated autoloads from magit-merge.el
-
- (autoload 'magit-merge "magit" nil t)
-(autoload 'magit-merge-plain "magit-merge" "\
-Merge commit REV into the current branch; using default message.
-
-Unless there are conflicts or a prefix argument is used create a
-merge commit using a generic commit message and without letting
-the user inspect the result.  With a prefix argument pretend the
-merge failed to give the user the opportunity to inspect the
-merge.
-
-(git merge --no-edit|--no-commit [ARGS] REV)
-
-(fn REV &optional ARGS NOCOMMIT)" t)
-(autoload 'magit-merge-editmsg "magit-merge" "\
-Merge commit REV into the current branch; and edit message.
-Perform the merge and prepare a commit message but let the user
-edit it.
-
-(git merge --edit --no-ff [ARGS] REV)
-
-(fn REV &optional ARGS)" t)
-(autoload 'magit-merge-nocommit "magit-merge" "\
-Merge commit REV into the current branch; pretending it failed.
-Pretend the merge failed to give the user the opportunity to
-inspect the merge and change the commit message.
-
-(git merge --no-commit --no-ff [ARGS] REV)
-
-(fn REV &optional ARGS)" t)
-(autoload 'magit-merge-into "magit-merge" "\
-Merge the current branch into BRANCH and remove the former.
-
-Before merging, force push the source branch to its push-remote,
-provided the respective remote branch already exists, ensuring
-that the respective pull-request (if any) won't get stuck on some
-obsolete version of the commits that are being merged.  Finally
-if `forge-branch-pullreq' was used to create the merged branch,
-then also remove the respective remote branch.
-
-(fn BRANCH &optional ARGS)" t)
-(autoload 'magit-merge-absorb "magit-merge" "\
-Merge BRANCH into the current branch and remove the former.
-
-Before merging, force push the source branch to its push-remote,
-provided the respective remote branch already exists, ensuring
-that the respective pull-request (if any) won't get stuck on some
-obsolete version of the commits that are being merged.  Finally
-if `forge-branch-pullreq' was used to create the merged branch,
-then also remove the respective remote branch.
-
-(fn BRANCH &optional ARGS)" t)
-(autoload 'magit-merge-squash "magit-merge" "\
-Squash commit REV into the current branch; don't create a commit.
-
-(git merge --squash REV)
-
-(fn REV)" t)
-(autoload 'magit-merge-preview "magit-merge" "\
-Preview result of merging REV into the current branch.
-
-(fn REV)" t)
-(autoload 'magit-merge-abort "magit-merge" "\
-Abort the current merge operation.
-
-(git merge --abort)" t)
-(register-definition-prefixes "magit-merge" '("magit-"))
-
-
-;;; Generated autoloads from magit-mode.el
-
-(autoload 'magit-info "magit-mode" "\
-Visit the Magit manual." t)
-(register-definition-prefixes "magit-mode" '("magit-"))
-
-
-;;; Generated autoloads from magit-notes.el
-
- (autoload 'magit-notes "magit" nil t)
-(register-definition-prefixes "magit-notes" '("magit-notes-"))
-
-
-;;; Generated autoloads from magit-patch.el
-
- (autoload 'magit-patch "magit-patch" nil t)
- (autoload 'magit-patch-create "magit-patch" nil t)
- (autoload 'magit-patch-apply "magit-patch" nil t)
-(autoload 'magit-patch-save "magit-patch" "\
-Write current diff into patch FILE.
-
-What arguments are used to create the patch depends on the value
-of `magit-patch-save-arguments' and whether a prefix argument is
-used.
-
-If the value is the symbol `buffer', then use the same arguments
-as the buffer.  With a prefix argument use no arguments.
-
-If the value is a list beginning with the symbol `exclude', then
-use the same arguments as the buffer except for those matched by
-entries in the cdr of the list.  The comparison is done using
-`string-prefix-p'.  With a prefix argument use the same arguments
-as the buffer.
-
-If the value is a list of strings (including the empty list),
-then use those arguments.  With a prefix argument use the same
-arguments as the buffer.
-
-Of course the arguments that are required to actually show the
-same differences as those shown in the buffer are always used.
-
-(fn FILE &optional ARG)" t)
-(autoload 'magit-request-pull "magit-patch" "\
-Request upstream to pull from your public repository.
-
-URL is the url of your publicly accessible repository.
-START is a commit that already is in the upstream repository.
-END is the last commit, usually a branch name, which upstream
-is asked to pull.  START has to be reachable from that commit.
-
-(fn URL START END)" t)
-(register-definition-prefixes "magit-patch" '("magit-"))
-
-
-;;; Generated autoloads from magit-process.el
-
-(register-definition-prefixes "magit-process" '("magit-" "tramp-sh-handle-"))
-
-
-;;; Generated autoloads from magit-pull.el
-
- (autoload 'magit-pull "magit-pull" nil t)
- (autoload 'magit-pull-from-pushremote "magit-pull" nil t)
- (autoload 'magit-pull-from-upstream "magit-pull" nil t)
-(autoload 'magit-pull-branch "magit-pull" "\
-Pull from a branch read in the minibuffer.
-
-(fn SOURCE ARGS)" t)
-(register-definition-prefixes "magit-pull" '("magit-pull-"))
-
-
-;;; Generated autoloads from magit-push.el
-
- (autoload 'magit-push "magit-push" nil t)
- (autoload 'magit-push-current-to-pushremote "magit-push" nil t)
- (autoload 'magit-push-current-to-upstream "magit-push" nil t)
-(autoload 'magit-push-current "magit-push" "\
-Push the current branch to a branch read in the minibuffer.
-
-(fn TARGET ARGS)" t)
-(autoload 'magit-push-other "magit-push" "\
-Push an arbitrary branch or commit somewhere.
-Both the source and the target are read in the minibuffer.
-
-(fn SOURCE TARGET ARGS)" t)
-(autoload 'magit-push-refspecs "magit-push" "\
-Push one or multiple REFSPECS to a REMOTE.
-Both the REMOTE and the REFSPECS 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.
-
-(fn REMOTE REFSPECS ARGS)" t)
-(autoload 'magit-push-matching "magit-push" "\
-Push all matching branches to another repository.
-If multiple remotes exist, then read one from the user.
-If just one exists, use that without requiring confirmation.
-
-(fn REMOTE &optional ARGS)" t)
-(autoload 'magit-push-tags "magit-push" "\
-Push 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.
-
-(fn REMOTE &optional ARGS)" t)
-(autoload 'magit-push-tag "magit-push" "\
-Push a tag to another repository.
-
-(fn TAG REMOTE &optional ARGS)" t)
-(autoload 'magit-push-notes-ref "magit-push" "\
-Push a notes ref to another repository.
-
-(fn REF REMOTE &optional ARGS)" t)
- (autoload 'magit-push-implicitly "magit-push" nil t)
- (autoload 'magit-push-to-remote "magit-push" nil t)
-(register-definition-prefixes "magit-push" '("magit-"))
-
-
-;;; Generated autoloads from magit-reflog.el
-
-(autoload 'magit-reflog-current "magit-reflog" "\
-Display the reflog of the current branch.
-If `HEAD' is detached, then show the reflog for that instead." t)
-(autoload 'magit-reflog-other "magit-reflog" "\
-Display the reflog of a branch or another ref.
-
-(fn REF)" t)
-(autoload 'magit-reflog-head "magit-reflog" "\
-Display the `HEAD' reflog." t)
-(register-definition-prefixes "magit-reflog" '("magit-reflog-"))
-
-
-;;; Generated autoloads from magit-refs.el
-
- (autoload 'magit-show-refs "magit-refs" nil t)
-(autoload 'magit-show-refs-head "magit-refs" "\
-List and compare references in a dedicated buffer.
-Compared with `HEAD'.
-
-(fn &optional ARGS)" t)
-(autoload 'magit-show-refs-current "magit-refs" "\
-List and compare references in a dedicated buffer.
-Compare with the current branch or `HEAD' if it is detached.
-
-(fn &optional ARGS)" t)
-(autoload 'magit-show-refs-other "magit-refs" "\
-List and compare references in a dedicated buffer.
-Compared with a branch read from the user.
-
-(fn &optional REF ARGS)" t)
-(register-definition-prefixes "magit-refs" '("magit-"))
-
-
-;;; Generated autoloads from magit-remote.el
-
- (autoload 'magit-remote "magit-remote" nil t)
-(autoload 'magit-remote-add "magit-remote" "\
-Add a remote named REMOTE and fetch it.
-
-(fn REMOTE URL &optional ARGS)" t)
-(autoload 'magit-remote-rename "magit-remote" "\
-Rename the remote named OLD to NEW.
-
-(fn OLD NEW)" t)
-(autoload 'magit-remote-remove "magit-remote" "\
-Delete the remote named REMOTE.
-
-(fn REMOTE)" t)
-(autoload 'magit-remote-prune "magit-remote" "\
-Remove stale remote-tracking branches for REMOTE.
-
-(fn REMOTE)" t)
-(autoload 'magit-remote-prune-refspecs "magit-remote" "\
-Remove stale refspecs for REMOTE.
-
-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 offer to either delete the
-remote or to replace the stale refspecs with the default refspec.
-
-Also remove the remote-tracking branches that were created due to
-the now stale refspecs.  Other stale branches are not removed.
-
-(fn REMOTE)" t)
-(autoload 'magit-remote-set-head "magit-remote" "\
-Set the local representation of REMOTE's default branch.
-Query REMOTE and set the symbolic-ref refs/remotes/<remote>/HEAD
-accordingly.  With a prefix argument query for the branch to be
-used, which allows you to select an incorrect value if you fancy
-doing that.
-
-(fn REMOTE &optional BRANCH)" t)
-(autoload 'magit-remote-unset-head "magit-remote" "\
-Unset the local representation of REMOTE's default branch.
-Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\".
-
-(fn REMOTE)" t)
- (autoload 'magit-update-default-branch "magit-remote" nil t)
-(autoload 'magit-remote-unshallow "magit-remote" "\
-Convert a shallow remote into a full one.
-If only a single refspec is set and it does not contain a
-wildcard, then also offer to replace it with the standard
-refspec.
-
-(fn REMOTE)" t)
- (autoload 'magit-remote-configure "magit-remote" nil t)
-(register-definition-prefixes "magit-remote" '("magit-"))
-
-
-;;; Generated autoloads from magit-repos.el
-
-(autoload 'magit-list-repositories "magit-repos" "\
-Display a list of repositories.
-
-Use the option `magit-repository-directories' to control which
-repositories are displayed." t)
-(register-definition-prefixes "magit-repos" '("magit-"))
-
-
-;;; Generated autoloads from magit-reset.el
-
- (autoload 'magit-reset "magit" nil t)
-(autoload 'magit-reset-mixed "magit-reset" "\
-Reset the `HEAD' and index to COMMIT, but not the working tree.
-
-(git reset --mixed COMMIT)
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-soft "magit-reset" "\
-Reset the `HEAD' to COMMIT, but not the index and working tree.
-
-(git reset --soft REVISION)
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-hard "magit-reset" "\
-Reset the `HEAD', index, and working tree to COMMIT.
-
-(git reset --hard REVISION)
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-keep "magit-reset" "\
-Reset the `HEAD' and index to COMMIT, while keeping uncommitted changes.
-
-(git reset --keep REVISION)
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-index "magit-reset" "\
-Reset the index to COMMIT.
-Keep the `HEAD' and working tree as-is, so if COMMIT refers to the
-head this effectively unstages all changes.
-
-(git reset COMMIT .)
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-worktree "magit-reset" "\
-Reset the worktree to COMMIT.
-Keep the `HEAD' and index as-is.
-
-(fn COMMIT)" t)
-(autoload 'magit-reset-quickly "magit-reset" "\
-Reset the `HEAD' and index to COMMIT, and possibly the working tree.
-With a prefix argument reset the working tree otherwise don't.
-
-(git reset --mixed|--hard COMMIT)
-
-(fn COMMIT &optional HARD)" t)
-(register-definition-prefixes "magit-reset" '("magit-reset-"))
-
-
-;;; Generated autoloads from magit-sequence.el
-
-(autoload 'magit-sequencer-continue "magit-sequence" "\
-Resume the current cherry-pick or revert sequence." t)
-(autoload 'magit-sequencer-skip "magit-sequence" "\
-Skip the stopped at commit during a cherry-pick or revert sequence." t)
-(autoload 'magit-sequencer-abort "magit-sequence" "\
-Abort the current cherry-pick or revert sequence.
-This discards all changes made since the sequence started." t)
- (autoload 'magit-cherry-pick "magit-sequence" nil t)
-(autoload 'magit-cherry-copy "magit-sequence" "\
-Copy COMMITS from another branch onto the current branch.
-Prompt for a commit, defaulting to the commit at point.  If
-the region selects multiple commits, then pick all of them,
-without prompting.
-
-(fn COMMITS &optional ARGS)" t)
-(autoload 'magit-cherry-apply "magit-sequence" "\
-Apply the changes in COMMITS but do not commit them.
-Prompt for a commit, defaulting to the commit at point.  If
-the region selects multiple commits, then apply all of them,
-without prompting.
-
-(fn COMMITS &optional ARGS)" t)
-(autoload 'magit-cherry-harvest "magit-sequence" "\
-Move COMMITS from another BRANCH onto the current branch.
-Remove the COMMITS from BRANCH and stay on the current branch.
-If a conflict occurs, then you have to fix that and finish the
-process manually.
-
-(fn COMMITS BRANCH &optional ARGS)" t)
-(autoload 'magit-cherry-donate "magit-sequence" "\
-Move COMMITS from the current branch onto another existing BRANCH.
-Remove COMMITS from the current branch and stay on that branch.
-If a conflict occurs, then you have to fix that and finish the
-process manually.  `HEAD' is allowed to be detached initially.
-
-(fn COMMITS BRANCH &optional ARGS)" t)
-(autoload 'magit-cherry-spinout "magit-sequence" "\
-Move COMMITS from the current branch onto a new BRANCH.
-Remove COMMITS from the current branch and stay on that branch.
-If a conflict occurs, then you have to fix that and finish the
-process manually.
-
-(fn COMMITS BRANCH START-POINT &optional ARGS)" t)
-(autoload 'magit-cherry-spinoff "magit-sequence" "\
-Move COMMITS from the current branch onto a new BRANCH.
-Remove COMMITS from the current branch and checkout BRANCH.
-If a conflict occurs, then you have to fix that and finish
-the process manually.
-
-(fn COMMITS BRANCH START-POINT &optional ARGS)" t)
- (autoload 'magit-revert "magit-sequence" nil t)
-(autoload 'magit-revert-and-commit "magit-sequence" "\
-Revert 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.
-
-(fn COMMIT &optional ARGS)" t)
-(autoload 'magit-revert-no-commit "magit-sequence" "\
-Revert COMMIT by applying it in reverse to the worktree.
-Prompt for a commit, defaulting to the commit at point.  If
-the region selects multiple commits, then revert all of them,
-without prompting.
-
-(fn COMMIT &optional ARGS)" t)
- (autoload 'magit-am "magit-sequence" nil t)
-(autoload 'magit-am-apply-patches "magit-sequence" "\
-Apply the patches FILES.
-
-(fn &optional FILES ARGS)" t)
-(autoload 'magit-am-apply-maildir "magit-sequence" "\
-Apply the patches from MAILDIR.
-
-(fn &optional MAILDIR ARGS)" t)
-(autoload 'magit-am-continue "magit-sequence" "\
-Resume the current patch applying sequence." t)
-(autoload 'magit-am-skip "magit-sequence" "\
-Skip the stopped at patch during a patch applying sequence." t)
-(autoload 'magit-am-abort "magit-sequence" "\
-Abort the current patch applying sequence.
-This discards all changes made since the sequence started." t)
- (autoload 'magit-rebase "magit-sequence" nil t)
- (autoload 'magit-rebase-onto-pushremote "magit-sequence" nil t)
- (autoload 'magit-rebase-onto-upstream "magit-sequence" nil t)
-(autoload 'magit-rebase-branch "magit-sequence" "\
-Rebase 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.
-
-(fn TARGET ARGS)" t)
-(autoload 'magit-rebase-subset "magit-sequence" "\
-Rebase a subset of the current branch's history onto a new base.
-Rebase commits from START to `HEAD' onto NEWBASE.
-START has to be selected from a list of recent commits.
-
-(fn NEWBASE START ARGS)" t)
-(autoload 'magit-rebase-interactive "magit-sequence" "\
-Start an interactive rebase sequence.
-
-(fn COMMIT ARGS)" t)
-(autoload 'magit-rebase-autosquash "magit-sequence" "\
-Combine squash and fixup commits with their intended targets.
-
-(fn ARGS)" t)
-(autoload 'magit-rebase-edit-commit "magit-sequence" "\
-Edit a single older commit using rebase.
-
-(fn COMMIT ARGS)" t)
-(autoload 'magit-rebase-reword-commit "magit-sequence" "\
-Reword a single older commit using rebase.
-
-(fn COMMIT ARGS)" t)
-(autoload 'magit-rebase-remove-commit "magit-sequence" "\
-Remove a single older commit using rebase.
-
-(fn COMMIT ARGS)" t)
-(autoload 'magit-rebase-continue "magit-sequence" "\
-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.
-
-(fn &optional NOEDIT)" t)
-(autoload 'magit-rebase-skip "magit-sequence" "\
-Skip the current commit and restart the current rebase operation." t)
-(autoload 'magit-rebase-edit "magit-sequence" "\
-Edit the todo list of the current rebase operation." t)
-(autoload 'magit-rebase-abort "magit-sequence" "\
-Abort the current rebase operation, restoring the original branch." t)
-(register-definition-prefixes "magit-sequence" '("magit-"))
-
-
-;;; Generated autoloads from magit-sparse-checkout.el
-
- (autoload 'magit-sparse-checkout "magit-sparse-checkout" nil t)
-(autoload 'magit-sparse-checkout-enable "magit-sparse-checkout" "\
-Convert the working tree to a sparse checkout.
-
-(fn &optional ARGS)" t)
-(autoload 'magit-sparse-checkout-set "magit-sparse-checkout" "\
-Restrict working tree to DIRECTORIES.
-To extend rather than override the currently configured
-directories, call `magit-sparse-checkout-add' instead.
-
-(fn DIRECTORIES)" t)
-(autoload 'magit-sparse-checkout-add "magit-sparse-checkout" "\
-Add DIRECTORIES to the working tree.
-To override rather than extend the currently configured
-directories, call `magit-sparse-checkout-set' instead.
-
-(fn DIRECTORIES)" t)
-(autoload 'magit-sparse-checkout-reapply "magit-sparse-checkout" "\
-Reapply the sparse checkout rules to the working tree.
-Some operations such as merging or rebasing may need to check out
-files that aren't included in the sparse checkout.  Call this
-command to reset to the sparse checkout state." t)
-(autoload 'magit-sparse-checkout-disable "magit-sparse-checkout" "\
-Convert sparse checkout to full checkout.
-Note that disabling the sparse checkout does not clear the
-configured directories.  Call `magit-sparse-checkout-enable' to
-restore the previous sparse checkout." t)
-(register-definition-prefixes "magit-sparse-checkout" '("magit-sparse-checkout-"))
-
-
-;;; Generated autoloads from magit-stash.el
-
- (autoload 'magit-stash "magit-stash" nil t)
-(autoload 'magit-stash-both "magit-stash" "\
-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'.
-
-(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
-(autoload 'magit-stash-index "magit-stash" "\
-Create a stash of the index only.
-Unstaged and untracked changes are not stashed.  The stashed
-changes are applied in reverse to both the index and the
-worktree.  This command can fail when the worktree is not clean.
-Applying the resulting stash has the inverse effect.
-
-(fn MESSAGE)" t)
-(autoload 'magit-stash-worktree "magit-stash" "\
-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'.
-
-(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
-(autoload 'magit-stash-keep-index "magit-stash" "\
-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'.
-
-(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
-(autoload 'magit-snapshot-both "magit-stash" "\
-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'.
-
-(fn &optional INCLUDE-UNTRACKED)" t)
-(autoload 'magit-snapshot-index "magit-stash" "\
-Create a snapshot of the index only.
-Unstaged and untracked changes are not stashed." t)
-(autoload 'magit-snapshot-worktree "magit-stash" "\
-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'.
-
-(fn &optional INCLUDE-UNTRACKED)" t)
- (autoload 'magit-stash-push "magit-stash" nil t)
-(autoload 'magit-stash-apply "magit-stash" "\
-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\".
-
-(fn STASH)" t)
-(autoload 'magit-stash-pop "magit-stash" "\
-Apply a stash to the working tree, on success remove it 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\".
-
-(fn STASH)" t)
-(autoload 'magit-stash-drop "magit-stash" "\
-Remove a stash from the stash list.
-When the region is active offer to drop all contained stashes.
-
-(fn STASH)" t)
-(autoload 'magit-stash-clear "magit-stash" "\
-Remove all stashes saved in REF's reflog by deleting REF.
-
-(fn REF)" t)
-(autoload 'magit-stash-branch "magit-stash" "\
-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.  If the stash applies cleanly, then drop it.
-
-(fn STASH BRANCH)" t)
-(autoload 'magit-stash-branch-here "magit-stash" "\
-Create and checkout a new BRANCH from an existing STASH.
-Use the current branch or `HEAD' as the starting-point of BRANCH.
-Then apply STASH, dropping it if it applies cleanly.
-
-(fn STASH BRANCH)" t)
-(autoload 'magit-stash-format-patch "magit-stash" "\
-Create a patch from STASH
-
-(fn STASH)" t)
-(autoload 'magit-stash-list "magit-stash" "\
-List all stashes in a buffer." t)
-(autoload 'magit-stash-show "magit-stash" "\
-Show all diffs of a stash in a buffer.
-
-(fn STASH &optional ARGS FILES)" t)
-(register-definition-prefixes "magit-stash" '("magit-"))
-
-
-;;; Generated autoloads from magit-status.el
-
-(autoload 'magit-init "magit-status" "\
-Initialize a Git repository, then show its status.
-
-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.
-
-Non-interactively DIRECTORY is (re-)initialized unconditionally.
-
-(fn DIRECTORY)" t)
-(autoload 'magit-status "magit-status" "\
-Show the status of the current Git repository in a buffer.
-
-If the current directory isn't located within a Git repository,
-then prompt for an existing repository or an arbitrary directory,
-depending on option `magit-repository-directories', and show the
-status of the selected repository instead.
-
-* If that option specifies any existing repositories, then offer
-  those for completion and show the status buffer for the
-  selected one.
-
-* Otherwise read an arbitrary directory using regular file-name
-  completion.  If the selected directory is the top-level of an
-  existing working tree, then show the status buffer for that.
-
-* Otherwise offer to initialize the selected directory as a new
-  repository.  After creating the repository show its status
-  buffer.
-
-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) read an arbitrary directory and act on
-  it as described above.  The same could be accomplished using
-  the command `magit-init'.
-
-* With a single prefix argument read an existing repository, or
-  if none can be found based on `magit-repository-directories',
-  then fall back to the same behavior as with two prefix
-  arguments.
-
-(fn &optional DIRECTORY CACHE)" t)
-(defalias 'magit #'magit-status "\
-Begin using Magit.
-
-This alias for `magit-status' exists for better discoverability.
-
-Instead of invoking this alias for `magit-status' using
-\"M-x magit RET\", you should bind a key to `magit-status'
-and read the info node `(magit)Getting Started', which
-also contains other useful hints.")
-(autoload 'magit-status-here "magit-status" "\
-Like `magit-status' but with non-nil `magit-status-goto-file-position'." t)
-(autoload 'magit-status-quick "magit-status" "\
-Show the status of the current Git repository, maybe without refreshing.
-
-If the status buffer of the current Git repository exists but
-isn't being displayed in the selected frame, then display it
-without refreshing it.
-
-If the status buffer is being displayed in the selected frame,
-then also refresh it.
-
-Prefix arguments have the same meaning as for `magit-status',
-and additionally cause the buffer to be refresh.
-
-To use this function instead of `magit-status', add this to your
-init file: (global-set-key (kbd \"C-x g\") \\='magit-status-quick)." t)
-(autoload 'magit-status-setup-buffer "magit-status" "\
-
-
-(fn &optional DIRECTORY)")
-(register-definition-prefixes "magit-status" '("magit-"))
-
-
-;;; Generated autoloads from magit-submodule.el
-
- (autoload 'magit-submodule "magit-submodule" nil t)
- (autoload 'magit-submodule-add "magit-submodule" nil t)
-(autoload 'magit-submodule-read-name-for-path "magit-submodule" "\
-
-
-(fn PATH &optional PREFER-SHORT)")
- (autoload 'magit-submodule-register "magit-submodule" nil t)
- (autoload 'magit-submodule-populate "magit-submodule" nil t)
- (autoload 'magit-submodule-update "magit-submodule" nil t)
- (autoload 'magit-submodule-synchronize "magit-submodule" nil t)
- (autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
-(autoload 'magit-submodule-remove "magit-submodule" "\
-Unregister MODULES and remove their working directories.
-
-For safety reasons, do not remove the gitdirs and if a module has
-uncommitted changes, then do not remove it at all.  If a module's
-gitdir is located inside the working directory, then move it into
-the gitdir of the superproject first.
-
-With the \"--force\" argument offer to remove dirty working
-directories and with a prefix argument offer to delete gitdirs.
-Both actions are very dangerous and have to be confirmed.  There
-are additional safety precautions in place, so you might be able
-to recover from making a mistake here, but don't count on it.
-
-(fn MODULES ARGS TRASH-GITDIRS)" t)
-(autoload 'magit-insert-modules "magit-submodule" "\
-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.")
-(autoload 'magit-insert-modules-overview "magit-submodule" "\
-Insert sections for all modules.
-For each section insert the path and the output of `git describe --tags',
-or, failing that, the abbreviated HEAD commit hash.")
-(autoload 'magit-insert-modules-unpulled-from-upstream "magit-submodule" "\
-Insert sections for modules that haven't been pulled from the upstream.
-These sections can be expanded to show the respective commits.")
-(autoload 'magit-insert-modules-unpulled-from-pushremote "magit-submodule" "\
-Insert sections for modules that haven't been pulled from the push-remote.
-These sections can be expanded to show the respective commits.")
-(autoload 'magit-insert-modules-unpushed-to-upstream "magit-submodule" "\
-Insert sections for modules that haven't been pushed to the upstream.
-These sections can be expanded to show the respective commits.")
-(autoload 'magit-insert-modules-unpushed-to-pushremote "magit-submodule" "\
-Insert sections for modules that haven't been pushed to the push-remote.
-These sections can be expanded to show the respective commits.")
-(autoload 'magit-list-submodules "magit-submodule" "\
-Display a list of the current repository's populated submodules." t)
-(register-definition-prefixes "magit-submodule" '("magit-"))
-
-
-;;; Generated autoloads from magit-subtree.el
-
- (autoload 'magit-subtree "magit-subtree" nil t)
- (autoload 'magit-subtree-import "magit-subtree" nil t)
- (autoload 'magit-subtree-export "magit-subtree" nil t)
-(autoload 'magit-subtree-add "magit-subtree" "\
-Add REF from REPOSITORY as a new subtree at PREFIX.
-
-(fn PREFIX REPOSITORY REF ARGS)" t)
-(autoload 'magit-subtree-add-commit "magit-subtree" "\
-Add COMMIT as a new subtree at PREFIX.
-
-(fn PREFIX COMMIT ARGS)" t)
-(autoload 'magit-subtree-merge "magit-subtree" "\
-Merge COMMIT into the PREFIX subtree.
-
-(fn PREFIX COMMIT ARGS)" t)
-(autoload 'magit-subtree-pull "magit-subtree" "\
-Pull REF from REPOSITORY into the PREFIX subtree.
-
-(fn PREFIX REPOSITORY REF ARGS)" t)
-(autoload 'magit-subtree-push "magit-subtree" "\
-Extract the history of the subtree PREFIX and push it to REF on REPOSITORY.
-
-(fn PREFIX REPOSITORY REF ARGS)" t)
-(autoload 'magit-subtree-split "magit-subtree" "\
-Extract the history of the subtree PREFIX.
-
-(fn PREFIX COMMIT ARGS)" t)
-(register-definition-prefixes "magit-subtree" '("magit-"))
-
-
-;;; Generated autoloads from magit-tag.el
-
- (autoload 'magit-tag "magit" nil t)
-(autoload 'magit-tag-create "magit-tag" "\
-Create a new tag with the given NAME at REV.
-With a prefix argument annotate the tag.
-
-(git tag [--annotate] NAME REV)
-
-(fn NAME REV &optional ARGS)" t)
-(autoload 'magit-tag-delete "magit-tag" "\
-Delete one or more tags.
-If the region marks multiple tags (and nothing else), then offer
-to delete those, otherwise prompt for a single tag to be deleted,
-defaulting to the tag at point.
-
-(git tag -d TAGS)
-
-(fn TAGS)" t)
-(autoload 'magit-tag-prune "magit-tag" "\
-Offer to delete tags missing locally from REMOTE, and vice versa.
-
-(fn TAGS REMOTE-TAGS REMOTE)" t)
-(autoload 'magit-tag-release "magit-tag" "\
-Create a release tag for `HEAD'.
-
-Assume that release tags match `magit-release-tag-regexp'.
-
-If `HEAD's message matches `magit-release-commit-regexp', then
-base the tag on the version string specified by that.  Otherwise
-prompt 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 `--annotate' is enabled, then prompt for the message of the
-new tag.  Base the proposed tag message on the message of the
-highest tag, provided that that contains the corresponding
-version string and substituting the new version string for that.
-Otherwise propose 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\".
-
-(fn TAG MSG &optional ARGS)" t)
-(register-definition-prefixes "magit-tag" '("magit-"))
-
-
-;;; Generated autoloads from magit-transient.el
-
-(register-definition-prefixes "magit-transient" '("magit-"))
-
-
-;;; Generated autoloads from magit-wip.el
-
-(defvar magit-wip-mode nil "\
-Non-nil if Magit-Wip mode is enabled.
-See the `magit-wip-mode' command
-for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `magit-wip-mode'.")
-(custom-autoload 'magit-wip-mode "magit-wip" nil)
-(autoload 'magit-wip-mode "magit-wip" "\
-Save uncommitted changes to work-in-progress refs.
-
-Whenever appropriate (i.e., when dataloss would be a possibility
-otherwise) this mode causes uncommitted changes to be committed
-to dedicated work-in-progress refs.
-
-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.
-
-This is a global minor mode.  If called interactively, toggle the
-`Magit-Wip mode' mode.  If the prefix argument is positive,
-enable the mode, and if it is zero or negative, disable the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `(default-value \\='magit-wip-mode)'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(put 'magit-wip-after-save-mode 'globalized-minor-mode t)
-(defvar magit-wip-after-save-mode nil "\
-Non-nil if Magit-Wip-After-Save mode is enabled.
-See the `magit-wip-after-save-mode' command
-for a description of this minor mode.
-Setting this variable directly does not take effect;
-either customize it (see the info node `Easy Customization')
-or call the function `magit-wip-after-save-mode'.")
-(custom-autoload 'magit-wip-after-save-mode "magit-wip" nil)
-(autoload 'magit-wip-after-save-mode "magit-wip" "\
-Toggle Magit-Wip-After-Save-Local mode in all buffers.
-With prefix ARG, enable Magit-Wip-After-Save mode if ARG is positive; otherwise,
-disable it.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.
-Enable the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-Magit-Wip-After-Save-Local mode is enabled in all buffers where
-`magit-wip-after-save-local-mode-turn-on' would do it.
-
-See `magit-wip-after-save-local-mode' for more information on
-Magit-Wip-After-Save-Local mode.
-
-(fn &optional ARG)" t)
-(defvar magit-wip-after-apply-mode nil "\
-Non-nil if Magit-Wip-After-Apply mode is enabled.
-See the `magit-wip-after-apply-mode' command
-for a description of this minor mode.")
-(custom-autoload 'magit-wip-after-apply-mode "magit-wip" nil)
-(autoload 'magit-wip-after-apply-mode "magit-wip" "\
-Commit to work-in-progress refs.
-
-After applying a change using any \"apply variant\"
-command (apply, stage, unstage, discard, and reverse) commit the
-affected files to the current wip refs.  For each branch there
-may be two wip refs; one contains snapshots of the files as found
-in the worktree and the other contains snapshots of the entries
-in the index.
-
-This is a global minor mode.  If called interactively, toggle the
-`Magit-Wip-After-Apply mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `(default-value \\='magit-wip-after-apply-mode)'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(defvar magit-wip-before-change-mode nil "\
-Non-nil if Magit-Wip-Before-Change mode is enabled.
-See the `magit-wip-before-change-mode' command
-for a description of this minor mode.")
-(custom-autoload 'magit-wip-before-change-mode "magit-wip" nil)
-(autoload 'magit-wip-before-change-mode "magit-wip" "\
-Commit to work-in-progress refs before certain destructive changes.
-
-Before invoking a revert command or an \"apply variant\"
-command (apply, stage, unstage, discard, and reverse) commit the
-affected tracked files to the current wip refs.  For each branch
-there may be two wip refs; one contains snapshots of the files
-as found in the worktree and the other contains snapshots of the
-entries in the index.
-
-Only changes to files which could potentially be affected by the
-command which is about to be called are committed.
-
-This is a global minor mode.  If called interactively, toggle the
-`Magit-Wip-Before-Change mode' mode.  If the prefix argument is
-positive, enable the mode, and if it is zero or negative, disable
-the mode.
-
-If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
-the mode if ARG is nil, omitted, or is a positive number.
-Disable the mode if ARG is a negative number.
-
-To check whether the minor mode is enabled in the current buffer,
-evaluate `(default-value \\='magit-wip-before-change-mode)'.
-
-The mode's hook is called both when the mode is enabled and when
-it is disabled.
-
-(fn &optional ARG)" t)
-(autoload 'magit-wip-commit-initial-backup "magit-wip" "\
-Before saving, commit current file to a worktree wip ref.
-
-The user has to add this function to `before-save-hook'.
-
-Commit the current state of the visited file before saving the
-current buffer to that file.  This backs up the same version of
-the file as `backup-buffer' would, but stores the backup in the
-worktree wip ref, which is also used by the various Magit Wip
-modes, instead of in a backup file as `backup-buffer' would.
-
-This function ignores the variables that affect `backup-buffer'
-and can be used along-side that function, which is recommended
-because this function only backs up files that are tracked in
-a Git repository.")
-(register-definition-prefixes "magit-wip" '("magit-"))
-
-
-;;; Generated autoloads from magit-worktree.el
-
- (autoload 'magit-worktree "magit-worktree" nil t)
-(autoload 'magit-worktree-checkout "magit-worktree" "\
-Checkout BRANCH in a new worktree at PATH.
-
-(fn PATH BRANCH)" t)
-(autoload 'magit-worktree-branch "magit-worktree" "\
-Create a new BRANCH and check it out in a new worktree at PATH.
-
-(fn PATH BRANCH START-POINT &optional FORCE)" t)
-(autoload 'magit-worktree-move "magit-worktree" "\
-Move WORKTREE to PATH.
-
-(fn WORKTREE PATH)" t)
-(register-definition-prefixes "magit-worktree" '("magit-"))
-
-;;; End of scraped data
-
-(provide 'magit-autoloads)
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; no-native-compile: t
-;; coding: utf-8-emacs-unix
-;; End:
-
-;;; magit-autoloads.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-base.el b/emacs/elpa/magit-20240426.2118/magit-base.el
@@ -1,1280 +0,0 @@
-;;; magit-base.el --- Early birds  -*- 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>
-
-;; 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/>.
-
-;; This file contains code taken from GNU Emacs, which is
-;; Copyright (C) 1976-2023 Free Software Foundation, Inc.
-
-;;; Commentary:
-
-;; This library defines utility functions, options and other things that
-;; have to be available early on because they are used by several other
-;; libraries, which cannot depend on one another, because that would lead
-;; to circular dependencies.
-
-;;; Code:
-
-(defconst magit--minimal-git "2.2.0")
-(defconst magit--minimal-emacs "25.1")
-
-(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 already
-;; have required `seq', before `package' had a chance to put the more
-;; recent version earlier on the `load-path'.
-(when (and (featurep' seq)
-           (not (fboundp 'seq-keep)))
-  (unload-feature 'seq 'force))
-(require 'seq)
-
-(require 'crm)
-
-(require 'magit-section)
-
-(eval-when-compile (require 'info))
-(declare-function Info-get-token "info" (pos start all &optional errorstring))
-
-(eval-when-compile (require 'vc-git))
-(declare-function vc-git--run-command-string "vc-git" (file &rest args))
-
-(eval-when-compile (require 'which-func))
-(declare-function which-function "which-func" ())
-
-;;; Options
-
-(defcustom magit-completing-read-function #'magit-builtin-completing-read
-  "Function to be called when requesting input from the user.
-
-If you have enabled `ivy-mode' or `helm-mode', then you don't
-have to customize this option; `magit-builtin-completing-read'
-will work just fine.  However, if you use Ido completion, then
-you do have to use `magit-ido-completing-read', because Ido is
-less well behaved than the former, more modern alternatives.
-
-If you would like to use Ivy or Helm completion with Magit but
-not enable the respective modes globally, then customize this
-option to use `ivy-completing-read' or
-`helm--completing-read-default'.  If you choose to use
-`ivy-completing-read', note that the items may always be shown in
-alphabetical order, depending on your version of Ivy."
-  :group 'magit-essentials
-  :type '(radio (function-item magit-builtin-completing-read)
-                (function-item magit-ido-completing-read)
-                (function-item ivy-completing-read)
-                (function-item helm--completing-read-default)
-                (function :tag "Other function")))
-
-(defcustom magit-dwim-selection
-  '((magit-stash-apply        nil t)
-    (magit-ediff-resolve-all  nil t)
-    (magit-ediff-resolve-rest nil t)
-    (magit-stash-branch       nil t)
-    (magit-stash-branch-here  nil t)
-    (magit-stash-format-patch nil t)
-    (magit-stash-drop         nil ask)
-    (magit-stash-pop          nil ask))
-  "When not to offer alternatives and ask for confirmation.
-
-Many commands by default ask the user to select from a list of
-possible candidates.  They do so even when there is a thing at
-point that they can act on, which is then offered as the default.
-
-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."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-commands
-  :type '(repeat
-          (list (symbol :tag "Command") ; It might not be fboundp yet.
-                (choice (const  :tag "for all prompts" nil)
-                        (regexp :tag "for prompts matching regexp"))
-                (choice (const  :tag "offer other choices" nil)
-                        (const  :tag "require confirmation" ask)
-                        (const  :tag "use default without confirmation" t)))))
-
-(defconst magit--confirm-actions
-  '((const discard)
-    (const reverse)
-    (const stage-all-changes)
-    (const unstage-all-changes)
-    (const delete)
-    (const trash)
-    (const resurrect)
-    (const untrack)
-    (const rename)
-    (const reset-bisect)
-    (const abort-cherry-pick)
-    (const abort-revert)
-    (const abort-rebase)
-    (const abort-merge)
-    (const merge-dirty)
-    (const delete-unmerged-branch)
-    (const delete-branch-on-remote)
-    (const delete-pr-remote)
-    (const drop-stashes)
-    (const set-and-push)
-    (const amend-published)
-    (const rebase-published)
-    (const edit-published)
-    (const remove-modules)
-    (const remove-dirty-modules)
-    (const trash-module-gitdirs)
-    (const stash-apply-3way)
-    (const kill-process)
-    (const safe-with-wip)))
-
-(defcustom magit-no-confirm '(set-and-push)
-  "A list of symbols for actions Magit should not confirm, or t.
-
-Many potentially dangerous commands by default 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 has already been carried out by the
-  user.
-
-  `abort-revert' Aborting a revert throws away all conflict
-  resolutions which has 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 has 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-branch-on-remote' Deleting a \"remote branch\" may mean
-  deleting the (local) \"remote-tracking\" branch only, or also
-  removing it from the remote itself.  The latter often makes more
-  sense because otherwise simply fetching from the remote would
-  restore the remote-tracking branch, but doing that can be
-  surprising and hard to recover from, so we ask.
-
-  `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 popup 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.
-
-Removing modules:
-
-  `remove-modules' When you remove the working directory of a
-  module that does not contain uncommitted changes, then that is
-  safer than doing so when there are uncommitted changes and/or
-  when you also remove the gitdir.  Still, you don't want to do
-  that by accident.
-
-  `remove-dirty-modules' When you remove the working directory of
-  a module that contains uncommitted changes, then those changes
-  are gone for good.  It is better to go to the module, inspect
-  these changes and only if appropriate discard them manually.
-
-  `trash-module-gitdirs' When you remove the gitdir of a module,
-  then all unpushed changes are gone for good.  It is very easy
-  to forget that you have some unfinished work on an unpublished
-  feature branch or even in a stash.
-
-  Actually there are some safety precautions in place, that might
-  help you out if you make an unwise choice here, but don't count
-  on it.  In case of emergency, stay calm and check the stash and
-  the `trash-directory' for traces of lost work.
-
-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 these actions
-  can fairly easily be undone: `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."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-essentials
-  :group 'magit-commands
-  :type `(choice (const :tag "Always require confirmation" nil)
-                 (const :tag "Never require confirmation" t)
-                 (set   :tag "Require confirmation except for"
-                        ;; `remove-dirty-modules' and
-                        ;; `trash-module-gitdirs' intentionally
-                        ;; omitted.
-                        ,@magit--confirm-actions)))
-
-(defcustom magit-slow-confirm '(drop-stashes)
-  "Whether to ask user \"y or n\" or \"yes or no\" questions.
-
-When this is nil, then `y-or-n-p' is used when the user has to
-confirm a potentially destructive action.  When this is t, then
-`yes-or-no-p' is used instead.  If this is a list of symbols
-identifying actions, then `yes-or-no-p' is used for those,
-`y-or-no-p' for all others.  The list of actions is the same as
-for `magit-no-confirm' (which see)."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-miscellaneous
-  :type `(choice (const :tag "Always ask \"yes or no\" questions" t)
-                 (const :tag "Always ask \"y or n\" questions" nil)
-                 (set   :tag "Ask \"yes or no\" questions only for"
-                        ,@magit--confirm-actions)))
-
-(defcustom magit-no-message nil
-  "A list of messages Magit should not display.
-
-Magit displays most echo area messages using `message', but a few
-are displayed using `magit-message' instead, which takes the same
-arguments as the former, FORMAT-STRING and ARGS.  `magit-message'
-forgoes printing a message if any member of this list is a prefix
-of the respective FORMAT-STRING.
-
-If Magit prints a message which causes you grief, then please
-first investigate whether there is another option which can be
-used to suppress it.  If that is not the case, then ask the Magit
-maintainers to start using `magit-message' instead of `message'
-in that case.  We are not proactively replacing all uses of
-`message' with `magit-message', just in case someone *might* find
-some of these messages useless.
-
-Messages which can currently be suppressed using this option are:
-* \"Turning on magit-auto-revert-mode...\""
-  :package-version '(magit . "2.8.0")
-  :group 'magit-miscellaneous
-  :type '(repeat string))
-
-(defcustom magit-verbose-messages nil
-  "Whether to make certain prompts and messages more verbose.
-
-Occasionally a user suggests that a certain prompt or message
-should be more verbose, but I would prefer to keep it as-is
-because I don't think that the fact that that one user did not
-understand the existing prompt/message means that a large number
-of users would have the same difficulty, and that making it more
-verbose would actually do a disservice to users who understand
-the shorter prompt well enough.
-
-Going forward I will start offering both messages when I feel the
-suggested longer message is reasonable enough, and the value of
-this option decides which will be used.  Note that changing the
-value of this option affects all such messages and that I do not
-intend to add an option per prompt."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-miscellaneous
-  :type 'boolean)
-
-(defcustom magit-ellipsis
-  '((margin (?… . ">"))
-    (t      (?… . "...")))
-  "Characters or strings used to abbreviate text in some buffers.
-
-Each element has the form (WHERE (FANCY . UNIVERSAL)).
-
-FANCY is a single character or nil whereas UNIVERSAL is a string
-of any length.  The ellipsis produced by `magit--ellipsis' will
-be FANCY if it's a non-nil character that can be displayed with
-the available fonts, otherwise UNIVERSAL will be used.  FANCY is
-meant to be a rich character like a horizontal ellipsis symbol or
-an emoji whereas UNIVERSAL something simpler available in a less
-rich environment like the CLI.  WHERE determines the use-case for
-the ellipsis definition.  Currently the only acceptable values
-for WHERE are `margin' or t (representing the default).
-
-Whether collapsed sections are indicated using ellipsis is
-controlled by `magit-section-visibility-indicator'."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-miscellaneous
-  :type '(repeat (list (symbol :tag "Where")
-                       (cons (choice :tag "Fancy" character (const nil))
-                             (string :tag "Universal")))))
-
-(defcustom magit-update-other-window-delay 0.2
-  "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."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-miscellaneous
-  :type 'number)
-
-(defcustom magit-view-git-manual-method 'info
-  "How links to Git documentation are followed from Magit's Info manuals.
-
-`info'  Follow the link to the node in the `gitman' Info manual
-        as usual.  Unfortunately that manual is not installed by
-        default on some platforms, and when it is then the nodes
-        look worse than the actual manpages.
-
-`man'   View the respective man-page using the `man' package.
-
-`woman' View the respective man-page using the `woman' package."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-miscellaneous
-  :type '(choice (const :tag "view info manual" info)
-                 (const :tag "view manpage using `man'" man)
-                 (const :tag "view manpage using `woman'" woman)))
-
-;;; Section Classes
-
-(defclass magit-commit-section (magit-section) ())
-
-(setf (alist-get 'commit magit--section-type-alist) 'magit-commit-section)
-
-(defclass magit-diff-section (magit-section) () :abstract t)
-
-(defclass magit-file-section (magit-diff-section)
-  ((keymap :initform 'magit-file-section-map)
-   (source :initform nil)
-   (header :initform nil)
-   (binary :initform nil)))
-
-(defclass magit-module-section (magit-file-section)
-  ((keymap :initform 'magit-module-section-map)
-   (range  :initform nil)))
-
-(defclass magit-hunk-section (magit-diff-section)
-  ((keymap      :initform 'magit-hunk-section-map)
-   (refined     :initform nil)
-   (combined    :initform nil)
-   (from-range  :initform nil)
-   (from-ranges :initform nil)
-   (to-range    :initform nil)
-   (about       :initform nil)))
-
-(setf (alist-get 'file   magit--section-type-alist) 'magit-file-section)
-(setf (alist-get 'module magit--section-type-alist) 'magit-module-section)
-(setf (alist-get 'hunk   magit--section-type-alist) 'magit-hunk-section)
-
-(defclass magit-log-section (magit-section) () :abstract t)
-(defclass magit-unpulled-section (magit-log-section) ())
-(defclass magit-unpushed-section (magit-log-section) ())
-(defclass magit-unmerged-section (magit-log-section) ())
-
-(setf (alist-get 'unpulled magit--section-type-alist) 'magit-unpulled-section)
-(setf (alist-get 'unpushed magit--section-type-alist) 'magit-unpushed-section)
-(setf (alist-get 'unmerged magit--section-type-alist) 'magit-unmerged-section)
-
-;;; User Input
-
-(defvar helm-completion-in-region-default-sort-fn)
-(defvar helm-crm-default-separator)
-(defvar ivy-sort-functions-alist)
-(defvar ivy-sort-matches-functions-alist)
-(defvar vertico-sort-function)
-
-(defvar magit-completing-read--silent-default nil)
-
-(defun magit-completing-read ( prompt collection &optional
-                               predicate require-match initial-input
-                               hist def fallback)
-  "Read a choice in the minibuffer, or use the default choice.
-
-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 instead 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 use the default without the user even having to
-confirm that, then `magit-completing-read--silent-default' is set
-to t, otherwise nil.
-
-If it does read a value in the minibuffer, then this function
-acts similarly 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 user exits without a
-  choice, `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.
-
-- \": \" is appended to PROMPT.
-
-- PROMPT is modified to end with \" (default DEF|FALLBACK): \"
-  provided that DEF or FALLBACK is non-nil, that neither
-  `ivy-mode' nor `helm-mode' is enabled, and that
-  `magit-completing-read-function' is set to its default value of
-  `magit-builtin-completing-read'."
-  (setq magit-completing-read--silent-default nil)
-  (if-let ((dwim (and def
-                      (nth 2 (seq-find (pcase-lambda (`(,cmd ,re ,_))
-                                         (and (eq this-command cmd)
-                                              (or (not re)
-                                                  (string-match-p re prompt))))
-                                       magit-dwim-selection)))))
-      (if (eq dwim 'ask)
-          (if (y-or-n-p (format "%s %s? " prompt def))
-              def
-            (user-error "Abort"))
-        (setq magit-completing-read--silent-default t)
-        def)
-    (unless def
-      (setq def fallback))
-    (let ((command this-command)
-          (reply (funcall magit-completing-read-function
-                          (concat prompt ": ")
-                          (if (and (not (functionp collection))
-                                   def
-                                   (not (member def collection)))
-                              (cons def collection)
-                            collection)
-                          predicate
-                          require-match initial-input hist def)))
-      (setq this-command command)
-      ;; Note: Avoid `string=' to support `helm-comp-read-use-marked'.
-      (if (equal reply "")
-          (if require-match
-              (user-error "Nothing selected")
-            nil)
-        reply))))
-
-(defun magit--completion-table (collection)
-  (lambda (string pred action)
-    (if (eq action 'metadata)
-        '(metadata (display-sort-function . identity))
-      (complete-with-action action collection string pred))))
-
-(defun magit-builtin-completing-read
-    (prompt choices &optional predicate require-match initial-input hist def)
-  "Magit wrapper for standard `completing-read' function."
-  (unless (or (bound-and-true-p helm-mode)
-              (bound-and-true-p ivy-mode)
-              (bound-and-true-p vertico-mode)
-              (bound-and-true-p selectrum-mode))
-    (setq prompt (magit-prompt-with-default prompt def)))
-  (unless (or (bound-and-true-p helm-mode)
-              (bound-and-true-p ivy-mode))
-    (setq choices (magit--completion-table choices)))
-  (cl-letf (((symbol-function #'completion-pcm--all-completions)))
-    (when (< emacs-major-version 26)
-      (fset 'completion-pcm--all-completions
-            'magit-completion-pcm--all-completions))
-    (let ((ivy-sort-functions-alist nil)
-          (vertico-sort-function nil))
-      (completing-read prompt choices
-                       predicate require-match
-                       initial-input hist def))))
-
-(define-obsolete-function-alias 'magit-completing-read-multiple*
-  'magit-completing-read-multiple "Magit-Section 4.0.0")
-
-(defun magit-completing-read-multiple
-    ( prompt table &optional predicate require-match initial-input
-      hist def inherit-input-method
-      no-split)
-  "Read multiple strings in the minibuffer, with completion.
-Like `completing-read-multiple' but don't mess with order of
-TABLE and take an additional argument NO-SPLIT, which causes
-the user input to be returned as a single unmodified string.
-Also work around various incompatible features of various
-third-party completion frameworks."
-  (cl-letf*
-      (;; To implement NO-SPLIT we have to manipulate the respective
-       ;; `split-string' invocation.  We cannot simply advice it to
-       ;; return the input string because `SELECTRUM' would choke on
-       ;; that string.  Use a variable to pass along the raw user
-       ;; input string. aa5f098ab
-       (input nil)
-       (split-string (symbol-function #'split-string))
-       ((symbol-function #'split-string)
-        (lambda (string &optional separators omit-nulls trim)
-          (when (and no-split
-                     (equal separators crm-separator)
-                     (equal omit-nulls t))
-            (setq input string))
-          (funcall split-string string separators omit-nulls trim)))
-       ;; In Emacs 25 this function has a bug, so we use a copy of the
-       ;; version from Emacs 26. bef9c7aa3
-       ((symbol-function #'completion-pcm--all-completions)
-        (if (< emacs-major-version 26)
-            'magit-completion-pcm--all-completions
-          (symbol-function #'completion-pcm--all-completions)))
-       ;; Prevent `BUILT-IN' completion from messing up our existing
-       ;; order of the completion candidates. aa5f098ab
-       (table (magit--completion-table table))
-       ;; Prevent `IVY' from messing up our existing order. c7af78726
-       (ivy-sort-matches-functions-alist nil)
-       ;; Prevent `HELM' from messing up our existing order.  6fcf994bd
-       (helm-completion-in-region-default-sort-fn nil)
-       ;; Prevent `HELM' from automatically appending the separator,
-       ;; which is counterproductive when NO-SPLIT is non-nil and/or
-       ;; when reading commit ranges. 798aff564
-       (helm-crm-default-separator
-        (if no-split nil (bound-and-true-p helm-crm-default-separator)))
-       ;; And now, the moment we have all been waiting for...
-       (values (completing-read-multiple
-                prompt table predicate require-match initial-input
-                hist def inherit-input-method)))
-    (if no-split input values)))
-
-(defun magit-ido-completing-read
-    (prompt choices &optional predicate require-match initial-input hist def)
-  "Ido-based `completing-read' almost-replacement.
-
-Unfortunately `ido-completing-read' is not suitable as a
-drop-in replacement for `completing-read', instead we use
-`ido-completing-read+' from the third-party package by the
-same name."
-  (if (and (require 'ido-completing-read+ nil t)
-           (fboundp 'ido-completing-read+))
-      (ido-completing-read+ prompt choices predicate require-match
-                            initial-input hist
-                            (or def (and require-match (car choices))))
-    (display-warning 'magit "ido-completing-read+ is not installed
-
-To use Ido completion with Magit you need to install the
-third-party `ido-completing-read+' packages.  Falling
-back to built-in `completing-read' for now." :error)
-    (magit-builtin-completing-read prompt choices predicate require-match
-                                   initial-input hist def)))
-
-(defun magit-prompt-with-default (prompt def)
-  (if (and def (length> prompt 2)
-           (string-equal ": " (substring prompt -2)))
-      (format "%s (default %s): " (substring prompt 0 -2) def)
-    prompt))
-
-(defvar-keymap magit-minibuffer-local-ns-map
-  :parent minibuffer-local-map
-  "SPC" #'magit-whitespace-disallowed
-  "TAB" #'magit-whitespace-disallowed)
-
-(defun magit-whitespace-disallowed ()
-  "Beep to tell the user that whitespace is not allowed."
-  (interactive)
-  (ding)
-  (message "Whitespace isn't allowed here")
-  (setq defining-kbd-macro nil)
-  (force-mode-line-update))
-
-(defun magit-read-string ( prompt &optional initial-input history default-value
-                           inherit-input-method no-whitespace)
-  "Read a string from the minibuffer, prompting with string PROMPT.
-
-This is similar to `read-string', but
-* empty input is only allowed if DEFAULT-VALUE is non-nil in
-  which case that is returned,
-* whitespace is not allowed and leading and trailing whitespace is
-  removed automatically if NO-WHITESPACE is non-nil,
-* \": \" is appended to PROMPT, and
-* an invalid DEFAULT-VALUE is silently ignored."
-  (when default-value
-    (when (consp default-value)
-      (setq default-value (car default-value)))
-    (unless (stringp default-value)
-      (setq default-value nil)))
-  (let* ((minibuffer-completion-table nil)
-         (val (read-from-minibuffer
-               (magit-prompt-with-default (concat prompt ": ") default-value)
-               initial-input (and no-whitespace magit-minibuffer-local-ns-map)
-               nil history default-value inherit-input-method))
-         (trim (lambda (regexp string)
-                 (save-match-data
-                   (if (string-match regexp string)
-                       (replace-match "" t t string)
-                     string)))))
-    (when (and (string= val "") default-value)
-      (setq val default-value))
-    (when no-whitespace
-      (setq val (funcall trim "\\`\\(?:[ \t\n\r]+\\)"
-                         (funcall trim "\\(?:[ \t\n\r]+\\)\\'" val))))
-    (cond ((string= val "")
-           (user-error "Need non-empty input"))
-          ((and no-whitespace (string-match-p "[\s\t\n]" val))
-           (user-error "Input contains whitespace"))
-          (t val))))
-
-(defun magit-read-string-ns ( prompt &optional initial-input history
-                              default-value inherit-input-method)
-  "Call `magit-read-string' with non-nil NO-WHITESPACE."
-  (magit-read-string prompt initial-input history default-value
-                     inherit-input-method t))
-
-(defmacro magit-read-char-case (prompt verbose &rest clauses)
-  (declare (indent 2)
-           (debug (form form &rest (characterp form body))))
-  `(prog1 (pcase (read-char-choice
-                  (let ((parts (nconc (list ,@(mapcar #'cadr clauses))
-                                      ,(and verbose '(list "[C-g] to abort")))))
-                    (concat ,prompt
-                            (mapconcat #'identity (butlast parts) ", ")
-                            ", or "  (car (last parts)) " "))
-                  ',(mapcar #'car clauses))
-            ,@(--map `(,(car it) ,@(cddr it)) clauses))
-     (message "")))
-
-(defun magit-y-or-n-p (prompt &optional action)
-  "Ask user a \"y or n\" or a \"yes or no\" question using PROMPT.
-Which kind of question is used depends on whether
-ACTION is a member of option `magit-slow-confirm'."
-  (if (or (eq magit-slow-confirm t)
-          (and action (member action magit-slow-confirm)))
-      (yes-or-no-p prompt)
-    (y-or-n-p prompt)))
-
-(defvar magit--no-confirm-alist
-  '((safe-with-wip magit-wip-before-change-mode
-                   discard reverse stage-all-changes unstage-all-changes)))
-
-(cl-defun magit-confirm ( action &optional prompt prompt-n noabort
-                          (items nil sitems) prompt-suffix)
-  (declare (indent defun))
-  (setq prompt-n (format (concat (or prompt-n prompt) "? ") (length items)))
-  (setq prompt   (format (concat (or prompt (magit-confirm-make-prompt action))
-                                 "? ")
-                         (car items)))
-  (when prompt-suffix
-    (setq prompt (concat prompt prompt-suffix)))
-  (or (cond ((and (not (eq action t))
-                  (or (eq magit-no-confirm t)
-                      (memq action magit-no-confirm)
-                      (cl-member-if (pcase-lambda (`(,key ,var . ,sub))
-                                      (and (memq key magit-no-confirm)
-                                           (memq action sub)
-                                           (or (not var)
-                                               (and (boundp var)
-                                                    (symbol-value var)))))
-                                    magit--no-confirm-alist)))
-             (or (not sitems) items))
-            ((not sitems)
-             (magit-y-or-n-p prompt action))
-            ((length= items 1)
-             (and (magit-y-or-n-p prompt action) items))
-            ((length> items 1)
-             (and (magit-y-or-n-p (concat (mapconcat #'identity items "\n")
-                                          "\n\n" prompt-n)
-                                  action)
-                  items)))
-      (if noabort nil (user-error "Abort"))))
-
-(defun magit-confirm-files (action files &optional prompt prompt-suffix noabort)
-  (when files
-    (unless prompt
-      (setq prompt (magit-confirm-make-prompt action)))
-    (magit-confirm action
-      (concat prompt " \"%s\"")
-      (concat prompt " %d files")
-      noabort files prompt-suffix)))
-
-(defun magit-confirm-make-prompt (action)
-  (let ((prompt (symbol-name action)))
-    (string-replace "-" " "
-                    (concat (upcase (substring prompt 0 1))
-                            (substring prompt 1)))))
-
-(defun magit-read-number-string (prompt &optional default _history)
-  "Like `read-number' but return value is a string.
-DEFAULT may be a number or a numeric string."
-  (number-to-string
-   (read-number prompt (if (stringp default)
-                           (string-to-number default)
-                         default))))
-
-;;; Debug Utilities
-
-;;;###autoload
-(defun magit-emacs-Q-command ()
-  "Show a shell command that runs an uncustomized Emacs with only Magit loaded.
-See info node `(magit)Debugging Tools' for more information."
-  (interactive)
-  (let ((cmd (mapconcat
-              #'shell-quote-argument
-              `(,(concat invocation-directory invocation-name)
-                "-Q" "--eval" "(setq debug-on-error t)"
-                ,@(cl-mapcan
-                   (lambda (dir) (list "-L" dir))
-                   (delete-dups
-                    (cl-mapcan
-                     (lambda (lib)
-                       (let ((path (locate-library lib)))
-                         (cond
-                          (path
-                           (list (file-name-directory path)))
-                          ((not (equal lib "libgit"))
-                           (error "Cannot find mandatory dependency %s" lib)))))
-                     '(;; Like `LOAD_PATH' in `default.mk'.
-                       "compat"
-                       "dash"
-                       "libgit"
-                       "transient"
-                       "with-editor"
-                       ;; Obviously `magit' itself is needed too.
-                       "magit"
-                       ;; While these are part of the Magit repository,
-                       ;; they are distributed as separate packages.
-                       "magit-section"
-                       "git-commit"
-                       ))))
-                ;; Avoid Emacs bug#16406 by using full path.
-                "-l" ,(file-name-sans-extension (locate-library "magit")))
-              " ")))
-    (message "Uncustomized Magit command saved to kill-ring, %s"
-             "please run it in a terminal.")
-    (kill-new cmd)))
-
-;;; Text Utilities
-
-(defmacro magit-bind-match-strings (varlist string &rest body)
-  "Bind variables to submatches according to VARLIST then evaluate BODY.
-Bind the symbols in VARLIST to submatches of the current match
-data, starting with 1 and incrementing by 1 for each symbol.  If
-the last match was against a string, then that has to be provided
-as STRING."
-  (declare (indent 2) (debug (listp form body)))
-  (let ((s (cl-gensym "string"))
-        (i 0))
-    `(let ((,s ,string))
-       (let ,(save-match-data
-               (cl-mapcan (lambda (sym)
-                            (cl-incf i)
-                            (and (not (eq (aref (symbol-name sym) 0) ?_))
-                                 (list (list sym (list 'match-string i s)))))
-                          varlist))
-         ,@body))))
-
-(defun magit-delete-line ()
-  "Delete the rest of the current line."
-  (delete-region (point) (1+ (line-end-position))))
-
-(defun magit-delete-match (&optional num)
-  "Delete text matched by last search.
-If optional NUM is specified, only delete that subexpression."
-  (delete-region (match-beginning (or num 0))
-                 (match-end (or num 0))))
-
-(defun magit-file-line (file)
-  "Return the first line of FILE as a string."
-  (when (file-regular-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (buffer-substring-no-properties (point-min)
-                                      (line-end-position)))))
-
-(defun magit-file-lines (file &optional keep-empty-lines)
-  "Return a list of strings containing one element per line in FILE.
-Unless optional argument KEEP-EMPTY-LINES is t, trim all empty lines."
-  (when (file-regular-p file)
-    (with-temp-buffer
-      (insert-file-contents file)
-      (split-string (buffer-string) "\n" (not keep-empty-lines)))))
-
-(defun magit-set-header-line-format (string)
-  "Set `header-line-format' in the current buffer based on STRING.
-Pad the left side of STRING so that it aligns with the text area."
-  (setq header-line-format
-        (concat (propertize " " 'display '(space :align-to 0))
-                string)))
-
-(defun magit--format-spec (format specification)
-  "Like `format-spec' but preserve text properties in SPECIFICATION."
-  (with-temp-buffer
-    (insert format)
-    (goto-char (point-min))
-    (while (search-forward "%" nil t)
-      (cond
-       ;; Quoted percent sign.
-       ((eq (char-after) ?%)
-        (delete-char 1))
-       ;; Valid format spec.
-       ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
-        (let* ((num (match-string 1))
-               (spec (string-to-char (match-string 2)))
-               (val (assq spec specification)))
-          (unless val
-            (error "Invalid format character: `%%%c'" spec))
-          (setq val (cdr val))
-          ;; Pad result to desired length.
-          (let ((text (format (concat "%" num "s") val)))
-            ;; Insert first, to preserve text properties.
-            (if (next-property-change 0 (concat " " text))
-                ;; If the inserted text has properties, then preserve those.
-                (insert text)
-              ;; Otherwise preserve FORMAT's properties, like `format-spec'.
-              (insert-and-inherit text))
-            ;; Delete the specifier body.
-            (delete-region (+ (match-beginning 0) (length text))
-                           (+ (match-end 0) (length text)))
-            ;; Delete the percent sign.
-            (delete-region (1- (match-beginning 0)) (match-beginning 0)))))
-       ;; Signal an error on bogus format strings.
-       (t
-        (error "Invalid format string"))))
-    (buffer-string)))
-
-;;; Missing from Emacs
-
-(defun magit-kill-this-buffer ()
-  "Kill the current buffer."
-  (interactive)
-  (kill-buffer (current-buffer)))
-
-(defun magit--buffer-string (&optional min max trim)
-  "Like `buffer-substring-no-properties' but the arguments are optional.
-
-This combines the benefits of `buffer-string', `buffer-substring'
-and `buffer-substring-no-properties' into one function that is
-not as painful to use as the latter.  I.e., you can write
-  (magit--buffer-string)
-instead of
-  (buffer-substring-no-properties (point-min)
-                                  (point-max))
-
-Optional MIN defaults to the value of `point-min'.
-Optional MAX defaults to the value of `point-max'.
-
-If optional TRIM is non-nil, then all leading and trailing
-whitespace is remove.  If it is the newline character, then
-one trailing newline is added."
-  ;; Lets write that one last time and be done with it:
-  (let ((str (buffer-substring-no-properties (or min (point-min))
-                                             (or max (point-max)))))
-    (if trim
-        (concat (string-trim str)
-                (and (eq trim ?\n) "\n"))
-      str)))
-
-(defun magit--version> (v1 v2)
-  "Return t if version V1 is higher (younger) than V2.
-This function should be named `version>' and be part of Emacs."
-  (version-list-< (version-to-list v2) (version-to-list v1)))
-
-(defun magit--version>= (v1 v2)
-  "Return t if version V1 is higher (younger) than or equal to V2.
-This function should be named `version>=' and be part of Emacs."
-  (version-list-<= (version-to-list v2) (version-to-list v1)))
-
-;;; Kludges for Emacs Bugs
-
-(when (< emacs-major-version 27)
-  ;; Work around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.
-  ;; Fixed by cb55ccae8be946f1562d74718086a4c8c8308ee5 in Emacs 27.1.
-  (with-eval-after-load 'vc-git
-    (defun vc-git-conflicted-files (directory)
-      "Return the list of files with conflicts in DIRECTORY."
-      (let* ((status
-              (vc-git--run-command-string directory "diff-files"
-                                          "--name-status"))
-             (lines (when status (split-string status "\n" 'omit-nulls)))
-             files)
-        (dolist (line lines files)
-          (when (string-match "\\([ MADRCU?!]\\)[ \t]+\\(.+\\)" line)
-            (let ((state (match-string 1 line))
-                  (file (match-string 2 line)))
-              (when (equal state "U")
-                (push (expand-file-name file directory) files)))))))))
-
-(when (< emacs-major-version 27)
-  (defun vc-git--call@bug21559 (fn buffer command &rest args)
-    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
-    (let ((process-environment process-environment))
-      (when revert-buffer-in-progress-p
-        (push "GIT_OPTIONAL_LOCKS=0" process-environment))
-      (apply fn buffer command args)))
-  (advice-add 'vc-git--call :around 'vc-git--call@bug21559)
-
-  (defun vc-git-command@bug21559
-      (fn buffer okstatus file-or-list &rest flags)
-    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
-    (let ((process-environment process-environment))
-      (when revert-buffer-in-progress-p
-        (push "GIT_OPTIONAL_LOCKS=0" process-environment))
-      (apply fn buffer okstatus file-or-list flags)))
-  (advice-add 'vc-git-command :around 'vc-git-command@bug21559)
-
-  (defun auto-revert-handler@bug21559 (fn)
-    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
-    (let ((revert-buffer-in-progress-p t))
-      (funcall fn)))
-  (advice-add 'auto-revert-handler :around 'auto-revert-handler@bug21559)
-  )
-
-(when (< emacs-major-version 26)
-  ;; In Emacs 25 `completion-pcm--all-completions' reverses the
-  ;; completion list.  This is the version from Emacs 26, which
-  ;; fixes that issue.  bug#24676
-  (defun magit-completion-pcm--all-completions (prefix pattern table pred)
-    (if (completion-pcm--pattern-trivial-p pattern)
-        (all-completions (concat prefix (car pattern)) table pred)
-      (let* ((regex (completion-pcm--pattern->regex pattern))
-             (case-fold-search completion-ignore-case)
-             (completion-regexp-list (cons regex completion-regexp-list))
-             (compl (all-completions
-                     (concat prefix
-                             (if (stringp (car pattern)) (car pattern) ""))
-                     table pred)))
-        (if (not (functionp table))
-            compl
-          (let ((poss ()))
-            (dolist (c compl)
-              (when (string-match-p regex c) (push c poss)))
-            (nreverse poss)))))))
-
-(defun magit-which-function ()
-  "Return current function name based on point.
-
-This is a simple wrapper around `which-function', that resets
-Imenu's potentially outdated and therefore unreliable cache by
-setting `imenu--index-alist' to nil before calling that function."
-  (setq imenu--index-alist nil)
-  (which-function))
-
-;;; Kludges for Custom
-
-(defun magit-custom-initialize-reset (symbol exp)
-  "Initialize SYMBOL based on EXP.
-Set the value of the variable SYMBOL, using `set-default'
-\(unlike `custom-initialize-reset', which uses the `:set'
-function if any).  The value is either the symbol's current
-value (as obtained using the `:get' function), if any, or
-the value in the symbol's `saved-value' property if any, or
-\(last of all) the value of EXP."
-  (set-default-toplevel-value
-   symbol
-   (condition-case nil
-       (let ((def (default-toplevel-value symbol))
-             (getter (get symbol 'custom-get)))
-         (if getter (funcall getter symbol) def))
-     (error
-      (eval (let ((sv (get symbol 'saved-value)))
-              (if sv (car sv) exp)))))))
-
-(defun magit-hook-custom-get (symbol)
-  (if (symbol-file symbol 'defvar)
-      (default-toplevel-value symbol)
-    ;;
-    ;; Called by `custom-initialize-reset' on behalf of `symbol's
-    ;; `defcustom', which is being evaluated for the first time to
-    ;; set the initial value, but there's already a default value,
-    ;; which most likely was established by one or more `add-hook'
-    ;; calls.
-    ;;
-    ;; We combine the `standard-value' and the current value, while
-    ;; preserving the order established by `:options', and return
-    ;; the result of that to be used as the "initial" default value.
-    ;;
-    (let ((standard (eval (car (get symbol 'standard-value))))
-          (current (default-toplevel-value symbol))
-          (value nil))
-      (dolist (fn (get symbol 'custom-options))
-        (when (or (memq fn standard)
-                  (memq fn current))
-          (push fn value)))
-      (dolist (fn current)
-        (unless (memq fn value)
-          (push fn value)))
-      (nreverse value))))
-
-;;; Kludges for Info Manuals
-
-;;;###autoload
-(defun Info-follow-nearest-node--magit-gitman (fn &optional fork)
-  (let ((node (Info-get-token
-               (point) "\\*note[ \n\t]+"
-               "\\*note[ \n\t]+\\([^:]*\\):\\(:\\|[ \n\t]*(\\)?")))
-    (if (and node (string-match "^(gitman)\\(.+\\)" node))
-        (pcase magit-view-git-manual-method
-          ('info  (funcall fn fork))
-          ('man   (require 'man)
-                  (man (match-string 1 node)))
-          ('woman (require 'woman)
-                  (woman (match-string 1 node)))
-          (_
-           (user-error "Invalid value for `magit-view-git-manual-method'")))
-      (funcall fn fork))))
-
-;;;###autoload
-(advice-add 'Info-follow-nearest-node :around
-            #'Info-follow-nearest-node--magit-gitman)
-
-;; When making changes here, then also adjust the copy in docs/Makefile.
-;;;###autoload
-(advice-add 'org-man-export :around #'org-man-export--magit-gitman)
-;;;###autoload
-(defun org-man-export--magit-gitman (fn link description format)
-  (if (and (eq format 'texinfo)
-           (string-prefix-p "git" link))
-      (string-replace "%s" link "
-@ifinfo
-@ref{%s,,,gitman,}.
-@end ifinfo
-@ifhtml
-@html
-the <a href=\"http://git-scm.com/docs/%s\">%s(1)</a> manpage.
-@end html
-@end ifhtml
-@iftex
-the %s(1) manpage.
-@end iftex
-")
-    (funcall fn link description format)))
-
-;;; Kludges for Package Managers
-
-(defun magit--straight-chase-links (filename)
-  "Chase links in FILENAME until a name that is not a link.
-
-This is the same as `file-chase-links', except that it also
-handles fake symlinks that are created by the package manager
-straight.el on Windows.
-
-See <https://github.com/raxod502/straight.el/issues/520>."
-  (when (and (bound-and-true-p straight-symlink-emulation-mode)
-             (fboundp 'straight-chase-emulated-symlink))
-    (when-let ((target (straight-chase-emulated-symlink filename)))
-      (unless (eq target 'broken)
-        (setq filename target))))
-  (file-chase-links filename))
-
-;;; Kludges for older Emacs versions
-
-(if (fboundp 'with-connection-local-variables)
-    (defalias 'magit--with-connection-local-variables
-      #'with-connection-local-variables)
-  (defmacro magit--with-connection-local-variables (&rest body)
-    "Abridged `with-connection-local-variables' for pre Emacs 27 compatibility.
-Bind shell file name and switch for remote execution.
-`with-connection-local-variables' isn't available until Emacs 27.
-This kludge provides the minimal functionality required by
-Magit."
-    `(if (file-remote-p default-directory)
-         (pcase-let ((`(,shell-file-name ,shell-command-switch)
-                      (with-no-warnings ; about unknown tramp functions
-                        (require 'tramp)
-                        (let ((vec (tramp-dissect-file-name
-                                    default-directory)))
-                          (list (tramp-get-method-parameter
-                                 vec 'tramp-remote-shell)
-                                (mapconcat #'identity
-                                           (tramp-get-method-parameter
-                                            vec 'tramp-remote-shell-args)
-                                           " "))))))
-           ,@body)
-       ,@body)))
-
-(put 'magit--with-connection-local-variables 'lisp-indent-function 'defun)
-
-;;; Miscellaneous
-
-(defun magit-message (format-string &rest args)
-  "Display a message at the bottom of the screen, or not.
-Like `message', except that if the users configured option
-`magit-no-message' to prevent the message corresponding to
-FORMAT-STRING to be displayed, then don't."
-  (unless (--first (string-prefix-p it format-string) magit-no-message)
-    (apply #'message format-string args)))
-
-(defun magit-msg (format-string &rest args)
-  "Display a message at the bottom of the screen, but don't log it.
-Like `message', except that `message-log-max' is bound to nil."
-  (let ((message-log-max nil))
-    (apply #'message format-string args)))
-
-(defmacro magit--with-temp-position (buf pos &rest body)
-  (declare (indent 2))
-  `(with-current-buffer ,buf
-     (save-excursion
-       (save-restriction
-         (widen)
-         (goto-char (or ,pos 1))
-         ,@body))))
-
-(defun magit--ellipsis (&optional where)
-  "Build an ellipsis always as string, depending on WHERE."
-  (if (stringp magit-ellipsis)
-      magit-ellipsis
-    (if-let ((pair (car (or
-                         (alist-get (or where t) magit-ellipsis)
-                         (alist-get t magit-ellipsis)))))
-        (pcase-let ((`(,fancy . ,universal) pair))
-          (let ((ellipsis (if (and fancy (char-displayable-p fancy))
-                              fancy
-                            universal)))
-            (if (characterp ellipsis)
-                (char-to-string ellipsis)
-              ellipsis)))
-      (user-error "Variable magit-ellipsis is invalid"))))
-
-(defun magit--ext-regexp-quote (str)
-  "Like `reqexp-quote', but for Extended Regular Expressions."
-  (let ((special (string-to-list "[*.\\?+^$({"))
-        (quoted nil))
-    (mapc (lambda (c)
-            (when (memq c special)
-              (push ?\\ quoted))
-            (push c quoted))
-          str)
-    (concat (nreverse quoted))))
-
-;;; _
-(provide 'magit-base)
-;;; magit-base.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-base.elc b/emacs/elpa/magit-20240426.2118/magit-base.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-bisect.elc b/emacs/elpa/magit-20240426.2118/magit-bisect.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-blame.el b/emacs/elpa/magit-20240426.2118/magit-blame.el
@@ -1,988 +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)
-                   (t (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))
-      (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 to 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-20240426.2118/magit-diff.el b/emacs/elpa/magit-20240426.2118/magit-diff.el
@@ -1,3587 +0,0 @@
-;;; magit-diff.el --- Inspect Git diffs  -*- 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 support for looking at Git diffs and
-;; commits.
-
-;;; Code:
-
-(require 'magit-core)
-(require 'git-commit)
-
-(eval-when-compile (require 'ansi-color))
-(require 'diff-mode)
-(require 'image)
-(require 'smerge-mode)
-
-;; For `magit-diff-popup'
-(declare-function magit-stash-show "magit-stash" (stash &optional args files))
-;; For `magit-diff-visit-file'
-(declare-function magit-find-file-noselect "magit-files" (rev file))
-(declare-function magit-status-setup-buffer "magit-status" (&optional directory))
-;; For `magit-diff-while-committing'
-(declare-function magit-commit-diff-1 "magit-commit" ())
-(declare-function magit-commit-message-buffer "magit-commit" ())
-;; For `magit-insert-revision-gravatar'
-(defvar gravatar-size)
-;; For `magit-show-commit' and `magit-diff-show-or-scroll'
-(declare-function magit-current-blame-chunk "magit-blame" (&optional type noerror))
-(declare-function magit-blame-mode "magit-blame" (&optional arg))
-(defvar magit-blame-mode)
-;; For `magit-diff-show-or-scroll'
-(declare-function git-rebase-current-line "git-rebase" ())
-;; For `magit-diff-unmerged'
-(declare-function magit-merge-in-progress-p "magit-merge" ())
-(declare-function magit--merge-range "magit-merge" (&optional head))
-;; For `magit-diff--dwim'
-(declare-function forge--pullreq-range "forge-pullreq"
-                  (pullreq &optional endpoints))
-(declare-function forge--pullreq-ref "forge-pullreq" (pullreq))
-;; For `magit-diff-wash-diff'
-(declare-function ansi-color-apply-on-region "ansi-color")
-;; For `magit-diff-wash-submodule'
-(declare-function magit-log-wash-log "magit-log" (style args))
-;; For keymaps and menus
-(declare-function magit-apply "magit-apply" (&rest args))
-(declare-function magit-stage "magit-apply" (&optional indent))
-(declare-function magit-unstage "magit-apply" ())
-(declare-function magit-discard "magit-apply" ())
-(declare-function magit-reverse "magit-apply" (&rest args))
-(declare-function magit-file-rename "magit-files" (file newname))
-(declare-function magit-file-untrack "magit-files" (files &optional force))
-(declare-function magit-commit-add-log "magit-commit" ())
-(declare-function magit-diff-trace-definition "magit-log" ())
-(declare-function magit-patch-save "magit-patch" (files &optional arg))
-(declare-function magit-do-async-shell-command "magit-extras" (file))
-(declare-function magit-add-change-log-entry "magit-extras"
-                  (&optional whoami file-name other-window))
-(declare-function magit-add-change-log-entry-other-window "magit-extras"
-                  (&optional whoami file-name))
-(declare-function magit-diff-edit-hunk-commit "magit-extras" (file))
-(declare-function magit-smerge-keep-current "magit-apply" ())
-(declare-function magit-smerge-keep-upper "magit-apply" ())
-(declare-function magit-smerge-keep-base "magit-apply" ())
-(declare-function magit-smerge-keep-lower "magit-apply" ())
-
-(eval-when-compile
-  (cl-pushnew 'orig-rev eieio--known-slot-names)
-  (cl-pushnew 'action-type eieio--known-slot-names)
-  (cl-pushnew 'target eieio--known-slot-names))
-
-;;; Options
-;;;; Diff Mode
-
-(defgroup magit-diff nil
-  "Inspect and manipulate Git diffs."
-  :link '(info-link "(magit)Diffing")
-  :group 'magit-commands
-  :group 'magit-modes)
-
-(defcustom magit-diff-mode-hook nil
-  "Hook run after entering Magit-Diff mode."
-  :group 'magit-diff
-  :type 'hook)
-
-(defcustom magit-diff-sections-hook
-  '(magit-insert-diff
-    magit-insert-xref-buttons)
-  "Hook run to insert sections into a `magit-diff-mode' buffer."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-diff
-  :type 'hook)
-
-(defcustom magit-diff-expansion-threshold 60
-  "After how many seconds not to expand anymore diffs.
-
-Except in status buffers, diffs usually start out fully expanded.
-Because that can take a long time, all diffs that haven't been
-fontified during a refresh before the threshold defined here are
-instead displayed with their bodies collapsed.
-
-Note that this can cause sections that were previously expanded
-to be collapsed.  So you should not pick a very low value here.
-
-The hook function `magit-diff-expansion-threshold' has to be a
-member of `magit-section-set-visibility-hook' for this option
-to have any effect."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-diff
-  :type 'float)
-
-(defcustom magit-diff-highlight-hunk-body t
-  "Whether to highlight bodies of selected hunk sections.
-This only has an effect if `magit-diff-highlight' is a
-member of `magit-section-highlight-hook', which see."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-(defcustom magit-diff-highlight-hunk-region-functions
-  '(magit-diff-highlight-hunk-region-dim-outside
-    magit-diff-highlight-hunk-region-using-overlays)
-  "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.
-The underline variant was implemented because Eli said that is
-how we should do it.  However the overlay variant actually works
-better.  Also see https://github.com/magit/magit/issues/2758.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :set-after '(magit-diff-show-lines-boundaries)
-  :group 'magit-diff
-  :type 'hook
-  :options '(magit-diff-highlight-hunk-region-dim-outside
-             magit-diff-highlight-hunk-region-using-underline
-             magit-diff-highlight-hunk-region-using-overlays
-             magit-diff-highlight-hunk-region-using-face))
-
-(defcustom magit-diff-unmarked-lines-keep-foreground t
-  "Whether `magit-diff-highlight-hunk-region-dim-outside' preserves foreground.
-When this is set to nil, then that function only adjusts the
-foreground color but added and removed lines outside the region
-keep their distinct foreground colors."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-(defcustom magit-diff-refine-hunk nil
-  "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."
-  :group 'magit-diff
-  :safe (lambda (val) (memq val '(nil t all)))
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Current" t)
-                 (const :tag "All" all)))
-
-(defcustom magit-diff-refine-ignore-whitespace smerge-refine-ignore-whitespace
-  "Whether to ignore whitespace changes in word-granularity differences."
-  :package-version '(magit . "3.0.0")
-  :set-after '(smerge-refine-ignore-whitespace)
-  :group 'magit-diff
-  :safe 'booleanp
-  :type 'boolean)
-
-(put 'magit-diff-refine-hunk 'permanent-local t)
-
-(defcustom magit-diff-adjust-tab-width nil
-  "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."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-diff
-  :type '(choice (const   :tag "Never" nil)
-                 (const   :tag "If file-visiting buffer exists" t)
-                 (integer :tag "If file isn't larger than N bytes")
-                 (const   :tag "Always" always)))
-
-(defcustom magit-diff-paint-whitespace t
-  "Specify where to highlight whitespace errors.
-
-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
-for `uncommitted'.
-
-The option `magit-diff-paint-whitespace-lines' controls for
-what lines (added/remove/context) errors are highlighted.
-
-The options `magit-diff-highlight-trailing' and
-`magit-diff-highlight-indentation' control what kind of
-whitespace errors are highlighted."
-  :group 'magit-diff
-  :safe (lambda (val) (memq val '(t nil uncommitted status)))
-  :type '(choice (const :tag "In all diffs" t)
-                 (const :tag "Only in uncommitted changes" uncommitted)
-                 (const :tag "Never" nil)))
-
-(defcustom magit-diff-paint-whitespace-lines t
-  "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."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-diff
-  :safe (lambda (val) (memq val '(t both all)))
-  :type '(choice (const :tag "in added lines" t)
-                 (const :tag "in added and removed lines" both)
-                 (const :tag "in added, removed and context lines" all)))
-
-(defcustom magit-diff-highlight-trailing t
-  "Whether to highlight whitespace at the end of a line in diffs.
-Used only when `magit-diff-paint-whitespace' is non-nil."
-  :group 'magit-diff
-  :safe 'booleanp
-  :type 'boolean)
-
-(defcustom magit-diff-highlight-indentation nil
-  "Highlight the \"wrong\" indentation style.
-Used only when `magit-diff-paint-whitespace' is 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."
-  :group 'magit-diff
-  :type `(repeat (cons (string :tag "Directory regexp")
-                       (choice (const :tag "Tabs" tabs)
-                               (integer :tag "Spaces" :value ,tab-width)
-                               (const :tag "Neither" nil)))))
-
-(defcustom magit-diff-hide-trailing-cr-characters
-  (and (memq system-type '(ms-dos windows-nt)) t)
-  "Whether to hide ^M characters at the end of a line in diffs."
-  :package-version '(magit . "2.6.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-(defcustom magit-diff-highlight-keywords t
-  "Whether to highlight bracketed keywords in commit messages."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-(defcustom magit-diff-extra-stat-arguments nil
-  "Additional arguments to be used alongside `--stat'.
-
-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'.  See the git-diff(1) manpage."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-diff
-  :type '(radio (function-item magit-diff-use-window-width-as-stat-width)
-                function
-                (list string)
-                (const :tag "None" nil)))
-
-;;;; File Diff
-
-(defcustom magit-diff-buffer-file-locked t
-  "Whether `magit-diff-buffer-file' uses a dedicated buffer."
-  :package-version '(magit . "2.7.0")
-  :group 'magit-commands
-  :group 'magit-diff
-  :type 'boolean)
-
-;;;; Revision Mode
-
-(defgroup magit-revision nil
-  "Inspect and manipulate Git commits."
-  :link '(info-link "(magit)Revision Buffer")
-  :group 'magit-modes)
-
-(defcustom magit-revision-mode-hook
-  '(bug-reference-mode
-    goto-address-mode)
-  "Hook run after entering Magit-Revision mode."
-  :group 'magit-revision
-  :type 'hook
-  :options '(bug-reference-mode
-             goto-address-mode))
-
-(defcustom magit-revision-sections-hook
-  '(magit-insert-revision-tag
-    magit-insert-revision-headers
-    magit-insert-revision-message
-    magit-insert-revision-notes
-    magit-insert-revision-diff
-    magit-insert-xref-buttons)
-  "Hook run to insert sections into a `magit-revision-mode' buffer."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-revision
-  :type 'hook)
-
-(defcustom magit-revision-headers-format "\
-Author:     %aN <%aE>
-AuthorDate: %ad
-Commit:     %cN <%cE>
-CommitDate: %cd
-"
-  "Format string used to insert headers in revision buffers.
-
-All headers in revision buffers are inserted by the section
-inserter `magit-insert-revision-headers'.  Some of the headers
-are created by calling `git show --format=FORMAT' where FORMAT
-is the format specified here.  Other headers are hard coded or
-subject to option `magit-revision-insert-related-refs'."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-revision
-  :type 'string)
-
-(defcustom magit-revision-insert-related-refs t
-  "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.
-
-See user option `magit-revision-insert-related-refs-display-alist'
-to hide specific sets of related branches."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-revision
-  :type '(choice (const :tag "don't" nil)
-                 (const :tag "local only" t)
-                 (const :tag "all related" all)
-                 (const :tag "all containing, local merged" mixed)))
-
-(defcustom magit-revision-insert-related-refs-display-alist nil
-  "How `magit-insert-revision-headers' displays related branch types.
-
-This is an alist, with recognised keys being the symbols
-`parents', `merged', `contained', `follows', and `precedes';
-and the supported values for each key being:
-
-`nil'   Hide these related branches.
-`t'     Show these related branches.
-
-Keys which are not present in the alist have an implicit value `t'
-\(so the default alist value of nil means all related branch types
-will be shown.)
-
-The types to be shown are additionally subject to user option
-`magit-revision-insert-related-refs'."
-  :package-version '(magit . "3.3.1")
-  :group 'magit-revision
-  :type '(alist :key-type (symbol :tag "Type of related branch")
-                :value-type (boolean :tag "Display"))
-  :options (mapcar (lambda (sym)
-                     `(,sym (choice (const :tag "Hide" nil)
-                                    (const :tag "Show" t))))
-                   '(parents merged contained follows precedes)))
-
-(defcustom magit-revision-use-hash-sections 'quicker
-  "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\"."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-revision
-  :type '(choice (const :tag "Use sections, quickest" quickest)
-                 (const :tag "Use sections, quicker" quicker)
-                 (const :tag "Use sections, quick" quick)
-                 (const :tag "Use sections, slow" slow)
-                 (const :tag "Don't use sections" nil)))
-
-(defcustom magit-revision-show-gravatars nil
-  "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-header-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."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-revision
-  :type '(choice
-          (const :tag "Don't show gravatars" nil)
-          (const :tag "Show gravatars" t)
-          (const :tag "Show author gravatar" author)
-          (const :tag "Show committer gravatar" committer)
-          (cons  :tag "Show gravatars using custom regexps"
-                 (choice (const  :tag "No author image" nil)
-                         (regexp :tag "Author regexp"    "^Author:     "))
-                 (choice (const  :tag "No committer image" nil)
-                         (regexp :tag "Committer regexp" "^Commit:     ")))))
-
-(defcustom magit-revision-use-gravatar-kludge nil
-  "Whether to work around a bug which affects display of gravatars.
-
-Gravatar images are spliced into two halves which are then
-displayed on separate lines.  On macOS the splicing has a bug in
-some Emacs builds, which causes the top and bottom halves to be
-interchanged.  Enabling this option works around this issue by
-interchanging the halves once more, which cancels out the effect
-of the bug.
-
-See https://github.com/magit/magit/issues/2265
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7847.
-
-Starting with Emacs 26.1 this kludge should not be required for
-any build."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-revision
-  :type 'boolean)
-
-(defcustom magit-revision-fill-summary-line nil
-  "Whether to fill excessively long summary lines.
-
-If this is an integer, then the summary line is filled if it is
-longer than either the limit specified here or `window-width'.
-
-You may want to only set this locally in \".dir-locals-2.el\" for
-repositories known to contain bad commit messages.
-
-The body of the message is left alone because (a) most people who
-write excessively long summary lines usually don't add a body and
-\(b) even people who have the decency to wrap their lines may have
-a good reason to include a long line in the body sometimes."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-revision
-  :type '(choice (const   :tag "Don't fill" nil)
-                 (integer :tag "Fill if longer than")))
-
-(defcustom magit-revision-filter-files-on-follow nil
-  "Whether to honor file filter if log arguments include --follow.
-
-When a commit is displayed from a log buffer, the resulting
-revision buffer usually shares the log's file arguments,
-restricting the diff to those files.  However, there's a
-complication when the log arguments include --follow: if the log
-follows a file across a rename event, keeping the file
-restriction would mean showing an empty diff in revision buffers
-for commits before the rename event.
-
-When this option is nil, the revision buffer ignores the log's
-filter if the log arguments include --follow.  If non-nil, the
-log's file filter is always honored."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-revision
-  :type 'boolean)
-
-;;;; Visit Commands
-
-(defcustom magit-diff-visit-previous-blob t
-  "Whether `magit-diff-visit-file' may visit the previous blob.
-
-When this is t 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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-(defcustom magit-diff-visit-avoid-head-blob nil
-  "Whether `magit-diff-visit-file' avoids visiting a blob from `HEAD'.
-
-By default `magit-diff-visit-file' always visits the blob that
-added the current line, while `magit-diff-visit-worktree-file'
-visits the respective file in the working tree.  For the `HEAD'
-commit, the former command used to visit the worktree file too,
-but that made it impossible to visit a blob from `HEAD'.
-
-When point is on a removed line and that change has not been
-committed yet, then `magit-diff-visit-file' now visits the last
-blob that still had that line, which is a blob from `HEAD'.
-Previously this function used to visit the worktree file not
-only for added lines but also for such removed lines.
-
-If you prefer the old behaviors, then set this to t."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-diff
-  :type 'boolean)
-
-;;; Faces
-
-(defface magit-diff-file-heading
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-       :weight bold))
-  "Face for diff file headings."
-  :group 'magit-faces)
-
-(defface magit-diff-file-heading-highlight
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
-       :inherit magit-section-highlight))
-  "Face for current diff file headings."
-  :group 'magit-faces)
-
-(defface magit-diff-file-heading-selection
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-file-heading-highlight
-     :foreground "salmon4")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-file-heading-highlight
-     :foreground "LightSalmon3"))
-  "Face for selected diff file headings."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-heading
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey90"
-     :foreground "grey20")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey25"
-     :foreground "grey95"))
-  "Face for diff hunk headings."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-heading-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey80"
-     :foreground "grey20")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey35"
-     :foreground "grey95"))
-  "Face for current diff hunk headings."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-heading-selection
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-hunk-heading-highlight
-     :foreground "salmon4")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-hunk-heading-highlight
-     :foreground "LightSalmon3"))
-  "Face for selected diff hunk headings."
-  :group 'magit-faces)
-
-(defface magit-diff-hunk-region
-  `((t :inherit bold
-       ,@(and (>= emacs-major-version 27)
-              (list :extend (ignore-errors (face-attribute 'region :extend))))))
-  "Face used by `magit-diff-highlight-hunk-region-using-face'.
-
-This face is overlaid over text that uses other hunk faces,
-and those normally set the foreground and background colors.
-The `:foreground' and especially the `:background' properties
-should be avoided here.  Setting the latter would cause the
-loss of information.  Good properties to set here are `:weight'
-and `:slant'."
-  :group 'magit-faces)
-
-(defface magit-diff-revision-summary
-  '((t :inherit magit-diff-hunk-heading))
-  "Face for commit message summaries."
-  :group 'magit-faces)
-
-(defface magit-diff-revision-summary-highlight
-  '((t :inherit magit-diff-hunk-heading-highlight))
-  "Face for highlighted commit message summaries."
-  :group 'magit-faces)
-
-(defface magit-diff-lines-heading
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-hunk-heading-highlight
-     :background "LightSalmon3")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :inherit magit-diff-hunk-heading-highlight
-     :foreground "grey80"
-     :background "salmon4"))
-  "Face for diff hunk heading when lines are marked."
-  :group 'magit-faces)
-
-(defface magit-diff-lines-boundary
-  `((t ,@(and (>= emacs-major-version 27) '(:extend t)) ; !important
-       :inherit magit-diff-lines-heading))
-  "Face for boundary of marked lines in diff hunk."
-  :group 'magit-faces)
-
-(defface magit-diff-conflict-heading
-  '((t :inherit magit-diff-hunk-heading))
-  "Face for conflict markers."
-  :group 'magit-faces)
-
-(defface magit-diff-added
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#ddffdd"
-     :foreground "#22aa22")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#335533"
-     :foreground "#ddffdd"))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-removed
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#ffdddd"
-     :foreground "#aa2222")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#553333"
-     :foreground "#ffdddd"))
-  "Face for lines in a diff that have been removed."
-  :group 'magit-faces)
-
-(defface magit-diff-our
-  '((t :inherit magit-diff-removed))
-  "Face for lines in a diff for our side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-base
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#ffffcc"
-     :foreground "#aaaa11")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#555522"
-     :foreground "#ffffcc"))
-  "Face for lines in a diff for the base side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-their
-  '((t :inherit magit-diff-added))
-  "Face for lines in a diff for their side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-context
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "grey50")
-    (((class color) (background  dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :foreground "grey70"))
-  "Face for lines in a diff that are unchanged."
-  :group 'magit-faces)
-
-(defface magit-diff-added-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#cceecc"
-     :foreground "#22aa22")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#336633"
-     :foreground "#cceecc"))
-  "Face for lines in a diff that have been added."
-  :group 'magit-faces)
-
-(defface magit-diff-removed-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#eecccc"
-     :foreground "#aa2222")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#663333"
-     :foreground "#eecccc"))
-  "Face for lines in a diff that have been removed."
-  :group 'magit-faces)
-
-(defface magit-diff-our-highlight
-  '((t :inherit magit-diff-removed-highlight))
-  "Face for lines in a diff for our side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-base-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#eeeebb"
-     :foreground "#aaaa11")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "#666622"
-     :foreground "#eeeebb"))
-  "Face for lines in a diff for the base side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-their-highlight
-  '((t :inherit magit-diff-added-highlight))
-  "Face for lines in a diff for their side in a conflict."
-  :group 'magit-faces)
-
-(defface magit-diff-context-highlight
-  `((((class color) (background light))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey95"
-     :foreground "grey50")
-    (((class color) (background dark))
-     ,@(and (>= emacs-major-version 27) '(:extend t))
-     :background "grey20"
-     :foreground "grey70"))
-  "Face for lines in the current context in a diff."
-  :group 'magit-faces)
-
-(defface magit-diff-whitespace-warning
-  '((t :inherit trailing-whitespace))
-  "Face for highlighting whitespace errors added lines."
-  :group 'magit-faces)
-
-(defface magit-diffstat-added
-  '((((class color) (background light)) :foreground "#22aa22")
-    (((class color) (background  dark)) :foreground "#448844"))
-  "Face for plus sign in diffstat."
-  :group 'magit-faces)
-
-(defface magit-diffstat-removed
-  '((((class color) (background light)) :foreground "#aa2222")
-    (((class color) (background  dark)) :foreground "#aa4444"))
-  "Face for minus sign in diffstat."
-  :group 'magit-faces)
-
-;;; Arguments
-;;;; Prefix Classes
-
-(defclass magit-diff-prefix (transient-prefix)
-  ((history-key :initform 'magit-diff)
-   (major-mode  :initform 'magit-diff-mode)))
-
-(defclass magit-diff-refresh-prefix (magit-diff-prefix)
-  ((history-key :initform 'magit-diff)
-   (major-mode  :initform nil)))
-
-;;;; Prefix Methods
-
-(cl-defmethod transient-init-value ((obj magit-diff-prefix))
-  (pcase-let ((`(,args ,files)
-               (magit-diff--get-value 'magit-diff-mode
-                                      magit-prefix-use-buffer-arguments)))
-    (unless (eq transient-current-command 'magit-dispatch)
-      (when-let ((file (magit-file-relative-name)))
-        (setq files (list file))))
-    (oset obj value (if files `(("--" ,@files) ,args) args))))
-
-(cl-defmethod transient-init-value ((obj magit-diff-refresh-prefix))
-  (oset obj value (if magit-buffer-diff-files
-                      `(("--" ,@magit-buffer-diff-files)
-                        ,magit-buffer-diff-args)
-                    magit-buffer-diff-args)))
-
-(cl-defmethod transient-set-value ((obj magit-diff-prefix))
-  (magit-diff--set-value obj))
-
-(cl-defmethod transient-save-value ((obj magit-diff-prefix))
-  (magit-diff--set-value obj 'save))
-
-;;;; Argument Access
-
-(defun magit-diff-arguments (&optional mode)
-  "Return the current diff arguments."
-  (if (memq transient-current-command '(magit-diff magit-diff-refresh))
-      (magit--transient-args-and-files)
-    (magit-diff--get-value (or mode 'magit-diff-mode))))
-
-(defun magit-diff--get-value (mode &optional use-buffer-args)
-  (unless use-buffer-args
-    (setq use-buffer-args magit-direct-use-buffer-arguments))
-  (let (args files)
-    (cond
-     ((and (memq use-buffer-args '(always selected current))
-           (eq major-mode mode))
-      (setq args  magit-buffer-diff-args)
-      (setq files magit-buffer-diff-files))
-     ((and (memq use-buffer-args '(always selected))
-           (when-let ((buffer (magit-get-mode-buffer
-                               mode nil
-                               (eq use-buffer-args 'selected))))
-             (setq args  (buffer-local-value 'magit-buffer-diff-args buffer))
-             (setq files (buffer-local-value 'magit-buffer-diff-files buffer))
-             t)))
-     ((plist-member (symbol-plist mode) 'magit-diff-current-arguments)
-      (setq args (get mode 'magit-diff-current-arguments)))
-     ((when-let ((elt (assq (intern (format "magit-diff:%s" mode))
-                            transient-values)))
-        (setq args (cdr elt))
-        t))
-     (t
-      (setq args (get mode 'magit-diff-default-arguments))))
-    (list args files)))
-
-(defun magit-diff--set-value (obj &optional save)
-  (pcase-let* ((obj  (oref obj prototype))
-               (mode (or (oref obj major-mode) major-mode))
-               (key  (intern (format "magit-diff:%s" mode)))
-               (`(,args ,files) (magit--transient-args-and-files)))
-    (put mode 'magit-diff-current-arguments args)
-    (when save
-      (setf (alist-get key transient-values) args)
-      (transient-save-values))
-    (transient--history-push obj)
-    (setq magit-buffer-diff-args args)
-    (setq magit-buffer-diff-files files)
-    (magit-refresh)))
-
-;;; Commands
-;;;; Prefix Commands
-
-;;;###autoload (autoload 'magit-diff "magit-diff" nil t)
-(transient-define-prefix magit-diff ()
-  "Show changes between different versions."
-  :man-page "git-diff"
-  :class 'magit-diff-prefix
-  ["Limit arguments"
-   (magit:--)
-   (magit-diff:--ignore-submodules)
-   ("-b" "Ignore whitespace changes"      ("-b" "--ignore-space-change"))
-   ("-w" "Ignore all whitespace"          ("-w" "--ignore-all-space"))
-   (5 "-D" "Omit preimage for deletes"    ("-D" "--irreversible-delete"))]
-  ["Context arguments"
-   (magit-diff:-U)
-   ("-W" "Show surrounding functions"     ("-W" "--function-context"))]
-  ["Tune arguments"
-   (magit-diff:--diff-algorithm)
-   (magit-diff:--diff-merges)
-   (magit-diff:-M)
-   (magit-diff:-C)
-   (5 "-R" "Reverse sides"                "-R")
-   (5 magit-diff:--color-moved)
-   (5 magit-diff:--color-moved-ws)
-   ("-x" "Disallow external diff drivers" "--no-ext-diff")
-   ("-s" "Show stats"                     "--stat")
-   ("=g" "Show signature"                 "--show-signature")]
-  ["Actions"
-   [("d" "Dwim"          magit-diff-dwim)
-    ("r" "Diff range"    magit-diff-range)
-    ("p" "Diff paths"    magit-diff-paths)]
-   [("u" "Diff unstaged" magit-diff-unstaged)
-    ("s" "Diff staged"   magit-diff-staged)
-    ("w" "Diff worktree" magit-diff-working-tree)]
-   [("c" "Show commit"   magit-show-commit)
-    ("t" "Show stash"    magit-stash-show)]])
-
-;;;###autoload (autoload 'magit-diff-refresh "magit-diff" nil t)
-(transient-define-prefix magit-diff-refresh ()
-  "Change the arguments used for the diff(s) in the current buffer."
-  :man-page "git-diff"
-  :class 'magit-diff-refresh-prefix
-  ["Limit arguments"
-   (magit:--)
-   (magit-diff:--ignore-submodules)
-   ("-b" "Ignore whitespace changes"      ("-b" "--ignore-space-change"))
-   ("-w" "Ignore all whitespace"          ("-w" "--ignore-all-space"))
-   (5 "-D" "Omit preimage for deletes"    ("-D" "--irreversible-delete"))]
-  ["Context arguments"
-   (magit-diff:-U)
-   ("-W" "Show surrounding functions"     ("-W" "--function-context"))]
-  ["Tune arguments"
-   (magit-diff:--diff-algorithm)
-   (magit-diff:--diff-merges)
-   (magit-diff:-M)
-   (magit-diff:-C)
-   (5 "-R" "Reverse sides"                "-R"
-      :if-derived magit-diff-mode)
-   (5 magit-diff:--color-moved)
-   (5 magit-diff:--color-moved-ws)
-   ("-x" "Disallow external diff drivers" "--no-ext-diff")
-   ("-s" "Show stats"                     "--stat"
-    :if-derived magit-diff-mode)
-   ("=g" "Show signature"                 "--show-signature"
-    :if-derived magit-diff-mode)]
-  [["Refresh"
-    ("g" "buffer"                   magit-diff-refresh)
-    ("s" "buffer and set defaults"  transient-set-and-exit)
-    ("w" "buffer and save defaults" transient-save-and-exit)]
-   ["Toggle"
-    ("t" "hunk refinement"          magit-diff-toggle-refine-hunk)
-    ("F" "file filter"              magit-diff-toggle-file-filter)
-    ("b" "buffer lock"              magit-toggle-buffer-lock
-     :if-mode (magit-diff-mode magit-revision-mode magit-stash-mode))]
-   [:if-mode magit-diff-mode
-    :description "Do"
-    ("r" "switch range type"        magit-diff-switch-range-type)
-    ("f" "flip revisions"           magit-diff-flip-revs)]]
-  (interactive)
-  (when (derived-mode-p 'magit-merge-preview-mode)
-    (user-error "Cannot use %s in %s" this-command major-mode))
-  (if (not (eq transient-current-command 'magit-diff-refresh))
-      (transient-setup 'magit-diff-refresh)
-    (pcase-let ((`(,args ,files) (magit-diff-arguments)))
-      (setq magit-buffer-diff-args args)
-      (setq magit-buffer-diff-files files))
-    (magit-refresh)))
-
-;;;; Infix Commands
-
-(transient-define-argument magit:-- ()
-  :description "Limit to files"
-  :class 'transient-files
-  :key "--"
-  :argument "--"
-  :prompt "Limit to file,s: "
-  :reader #'magit-read-files
-  :multi-value t)
-
-(defun magit-read-files (prompt initial-input history &optional list-fn)
-  (magit-with-toplevel
-    (magit-completing-read-multiple prompt
-                                    (funcall (or list-fn #'magit-list-files))
-                                    nil nil
-                                    (or initial-input (magit-file-at-point))
-                                    history)))
-
-(transient-define-argument magit-diff:-U ()
-  :description "Context lines"
-  :class 'transient-option
-  :argument "-U"
-  :reader #'transient-read-number-N0)
-
-(transient-define-argument magit-diff:-M ()
-  :description "Detect renames"
-  :class 'transient-option
-  :argument "-M"
-  :allow-empty t
-  :reader #'transient-read-number-N+)
-
-(transient-define-argument magit-diff:-C ()
-  :description "Detect copies"
-  :class 'transient-option
-  :argument "-C"
-  :allow-empty t
-  :reader #'transient-read-number-N+)
-
-(transient-define-argument magit-diff:--diff-algorithm ()
-  :description "Diff algorithm"
-  :class 'transient-option
-  :key "-A"
-  :argument "--diff-algorithm="
-  :reader #'magit-diff-select-algorithm
-  :always-read t)
-
-(defun magit-diff-select-algorithm (&rest _ignore)
-  (magit-read-char-case nil t
-    (?u "[u]nspecified" nil)
-    (?d "[d]efault"     "default")
-    (?m "[m]inimal"     "minimal")
-    (?p "[p]atience"    "patience")
-    (?h "[h]istogram"   "histogram")))
-
-(transient-define-argument magit-diff:--diff-merges ()
-  :description "Diff merges"
-  :class 'transient-option
-  :key "-X"
-  :argument "--diff-merges="
-  :reader #'magit-diff-select-merges
-  :always-read t)
-
-(defun magit-diff-select-merges (&rest _ignore)
-  (magit-read-char-case nil t
-    (?u "[u]nspecified"    nil)
-    (?o "[o]ff"            "off")
-    (?f "[f]irst-parent"   "first-parent")
-    (?c "[c]ombined"       "combined")
-    (?d "[d]ense-combined" "dense-combined")))
-
-(transient-define-argument magit-diff:--ignore-submodules ()
-  :description "Ignore submodules"
-  :class 'transient-option
-  :key "-i"
-  :argument "--ignore-submodules="
-  :reader #'magit-diff-select-ignore-submodules)
-
-(defun magit-diff-select-ignore-submodules (&rest _ignored)
-  (magit-read-char-case "Ignore submodules " t
-    (?u "[u]ntracked" "untracked")
-    (?d "[d]irty"     "dirty")
-    (?a "[a]ll"       "all")))
-
-(transient-define-argument magit-diff:--color-moved ()
-  :description "Color moved lines"
-  :class 'transient-option
-  :key "-m"
-  :argument "--color-moved="
-  :reader #'magit-diff-select-color-moved-mode)
-
-(defun magit-diff-select-color-moved-mode (&rest _ignore)
-  (magit-read-char-case "Color moved " t
-    (?d "[d]efault" "default")
-    (?p "[p]lain"   "plain")
-    (?b "[b]locks"  "blocks")
-    (?z "[z]ebra"   "zebra")
-    (?Z "[Z] dimmed-zebra" "dimmed-zebra")))
-
-(transient-define-argument magit-diff:--color-moved-ws ()
-  :description "Whitespace treatment for --color-moved"
-  :class 'transient-option
-  :key "=w"
-  :argument "--color-moved-ws="
-  :reader #'magit-diff-select-color-moved-ws-mode)
-
-(defun magit-diff-select-color-moved-ws-mode (&rest _ignore)
-  (magit-read-char-case "Ignore whitespace " t
-    (?i "[i]ndentation"  "allow-indentation-change")
-    (?e "[e]nd of line"  "ignore-space-at-eol")
-    (?s "[s]pace change" "ignore-space-change")
-    (?a "[a]ll space"    "ignore-all-space")
-    (?n "[n]o"           "no")))
-
-;;;; Setup Commands
-
-;;;###autoload
-(defun magit-diff-dwim (&optional args files)
-  "Show changes for the thing at point."
-  (interactive (magit-diff-arguments))
-  (let ((default-directory default-directory)
-        (section (magit-current-section)))
-    (cond
-     ((magit-section-match 'module section)
-      (setq default-directory
-            (expand-file-name
-             (file-name-as-directory (oref section value))))
-      (magit-diff-range (oref section range)))
-     (t
-      (when (magit-section-match 'module-commit section)
-        (setq args nil)
-        (setq files nil)
-        (setq default-directory
-              (expand-file-name
-               (file-name-as-directory (magit-section-parent-value section)))))
-      (pcase (magit-diff--dwim)
-        ('unmerged (magit-diff-unmerged args files))
-        ('unstaged (magit-diff-unstaged args files))
-        ('staged
-         (let ((file (magit-file-at-point)))
-           (if (and file (equal (cddr (car (magit-file-status file))) '(?D ?U)))
-               ;; File was deleted by us and modified by them.  Show the latter.
-               (magit-diff-unmerged args (list file))
-             (magit-diff-staged nil args files))))
-        (`(stash . ,value) (magit-stash-show value args))
-        (`(commit . ,value)
-         (magit-diff-range (format "%s^..%s" value value) args files))
-        ((and range (pred stringp))
-         (magit-diff-range range args files))
-        (_ (call-interactively #'magit-diff-range)))))))
-
-(defun magit-diff--dwim ()
-  "Return information for performing DWIM diff.
-
-The information can be in three forms:
-1. TYPE
-   A symbol describing a type of diff where no additional information
-   is needed to generate the diff.  Currently, this includes `staged',
-   `unstaged' and `unmerged'.
-2. (TYPE . VALUE)
-   Like #1 but the diff requires additional information, which is
-   given by VALUE.  Currently, this includes `commit' and `stash',
-   where VALUE is the given commit or stash, respectively.
-3. RANGE
-   A string indicating a diff range.
-
-If no DWIM context is found, nil is returned."
-  (cond
-   ((and-let* ((commits (magit-region-values '(commit branch) t)))
-      (progn ; work around debbugs#31840
-        (deactivate-mark)
-        (concat (car (last commits)) ".." (car commits)))))
-   (magit-buffer-refname
-    (cons 'commit magit-buffer-refname))
-   ((derived-mode-p 'magit-stash-mode)
-    (cons 'commit
-          (magit-section-case
-            (commit (oref it value))
-            (file (thread-first it
-                    (oref parent)
-                    (oref value)))
-            (hunk (thread-first it
-                    (oref parent)
-                    (oref parent)
-                    (oref value))))))
-   ((derived-mode-p 'magit-revision-mode)
-    (cons 'commit magit-buffer-revision))
-   ((derived-mode-p 'magit-diff-mode)
-    magit-buffer-range)
-   (t
-    (magit-section-case
-      ([* unstaged] 'unstaged)
-      ([* staged] 'staged)
-      (unmerged 'unmerged)
-      (unpushed (magit-diff--range-to-endpoints (oref it value)))
-      (unpulled (magit-diff--range-to-endpoints (oref it value)))
-      (branch (let ((current (magit-get-current-branch))
-                    (atpoint (oref it value)))
-                (if (equal atpoint current)
-                    (if-let ((upstream (magit-get-upstream-branch)))
-                        (format "%s...%s" upstream current)
-                      (if (magit-anything-modified-p)
-                          current
-                        (cons 'commit current)))
-                  (format "%s...%s"
-                          (or current "HEAD")
-                          atpoint))))
-      (commit (cons 'commit (oref it value)))
-      ([file commit] (cons 'commit (oref (oref it parent) value)))
-      ([hunk file commit]
-       (cons 'commit (oref (oref (oref it parent) parent) value)))
-      (stash (cons 'stash (oref it value)))
-      (pullreq (forge--pullreq-range (oref it value) t))))))
-
-(defun magit-diff--range-to-endpoints (range)
-  (cond ((string-match "\\.\\.\\." range) (replace-match ".."  nil nil range))
-        ((string-match "\\.\\."    range) (replace-match "..." nil nil range))
-        (t range)))
-
-(defun magit-diff--region-range (&optional interactive mbase)
-  (and-let* ((commits (magit-region-values '(commit branch) t))
-             (revA (car (last commits)))
-             (revB (car commits)))
-    (progn ; work around debbugs#31840
-      (when interactive
-        (deactivate-mark))
-      (if mbase
-          (let ((base (magit-git-string "merge-base" revA revB)))
-            (cond
-             ((string= (magit-rev-parse revA) base)
-              (format "%s..%s" revA revB))
-             ((string= (magit-rev-parse revB) base)
-              (format "%s..%s" revB revA))
-             (interactive
-              (let ((main (magit-completing-read "View changes along"
-                                                 (list revA revB)
-                                                 nil t nil nil revB)))
-                (format "%s...%s"
-                        (if (string= main revB) revA revB) main)))
-             (t "%s...%s" revA revB)))
-        (format "%s..%s" revA revB)))))
-
-(defun magit-diff-read-range-or-commit (prompt &optional secondary-default mbase)
-  "Read range or revision with special diff range treatment.
-If MBASE is non-nil, prompt for which rev to place at the end of
-a \"revA...revB\" range.  Otherwise, always construct
-\"revA..revB\" range."
-  (or (magit-diff--region-range t mbase)
-      (magit-read-range prompt
-                        (or (pcase (magit-diff--dwim)
-                              (`(commit . ,value)
-                               (format "%s^..%s" value value))
-                              ((and range (pred stringp))
-                               range))
-                            secondary-default
-                            (magit-get-current-branch)))))
-
-;;;###autoload
-(defun magit-diff-range (rev-or-range &optional args files)
-  "Show differences between two commits.
-
-REV-OR-RANGE should be a range or a single revision.  If it is a
-revision, then show changes in the working tree relative to that
-revision.  If it is a range, but one side is omitted, then show
-changes relative to `HEAD'.
-
-If the region is active, use the revisions on the first and last
-line of the region as the two sides of the range.  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)."
-  (interactive (cons (magit-diff-read-range-or-commit "Diff for range"
-                                                      nil current-prefix-arg)
-                     (magit-diff-arguments)))
-  (magit-diff-setup-buffer rev-or-range nil args files 'committed))
-
-;;;###autoload
-(defun magit-diff-working-tree (&optional rev args files)
-  "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."
-  (interactive
-   (cons (and current-prefix-arg
-              (magit-read-branch-or-commit "Diff working tree and commit"))
-         (magit-diff-arguments)))
-  (magit-diff-setup-buffer (or rev "HEAD") nil args files 'unstaged))
-
-;;;###autoload
-(defun magit-diff-staged (&optional rev args files)
-  "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."
-  (interactive
-   (cons (and current-prefix-arg
-              (magit-read-branch-or-commit "Diff index and commit"))
-         (magit-diff-arguments)))
-  (magit-diff-setup-buffer rev "--cached" args files 'staged))
-
-;;;###autoload
-(defun magit-diff-unstaged (&optional args files)
-  "Show changes between the working tree and the index."
-  (interactive (magit-diff-arguments))
-  (magit-diff-setup-buffer nil nil args files 'unstaged))
-
-;;;###autoload
-(defun magit-diff-unmerged (&optional args files)
-  "Show changes that are being merged."
-  (interactive (magit-diff-arguments))
-  (unless (magit-merge-in-progress-p)
-    (user-error "No merge is in progress"))
-  (magit-diff-setup-buffer (magit--merge-range) nil args files 'committed))
-
-;;;###autoload
-(defun 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."
-  (interactive)
-  (unless (magit-commit-message-buffer)
-    (user-error "No commit in progress"))
-  (magit-commit-diff-1))
-
-(keymap-set git-commit-mode-map "C-c C-d" #'magit-diff-while-committing)
-
-;;;###autoload
-(defun magit-diff-buffer-file ()
-  "Show diff for the blob or file visited in the current buffer.
-
-When the buffer visits a blob, then show the respective commit.
-When the buffer visits a file, then show the differences between
-`HEAD' and the working tree.  In both cases limit the diff to
-the file or blob."
-  (interactive)
-  (require 'magit)
-  (if-let ((file (magit-file-relative-name)))
-      (if magit-buffer-refname
-          (magit-show-commit magit-buffer-refname
-                             (car (magit-show-commit--arguments))
-                             (list file))
-        (save-buffer)
-        (let ((line (line-number-at-pos))
-              (col (current-column)))
-          (with-current-buffer
-              (magit-diff-setup-buffer (or (magit-get-current-branch) "HEAD")
-                                       nil
-                                       (car (magit-diff-arguments))
-                                       (list file)
-                                       'unstaged
-                                       magit-diff-buffer-file-locked)
-            (magit-diff--goto-position file line col))))
-    (user-error "Buffer isn't visiting a file")))
-
-;;;###autoload
-(defun magit-diff-paths (a b)
-  "Show changes between any two files on disk."
-  (interactive (list (read-file-name "First file: " nil nil t)
-                     (read-file-name "Second file: " nil nil t)))
-  (magit-diff-setup-buffer nil "--no-index" nil
-                           (list (magit-convert-filename-for-git
-                                  (expand-file-name a))
-                                 (magit-convert-filename-for-git
-                                  (expand-file-name b)))
-                           'undefined))
-
-(defun magit-show-commit--arguments ()
-  (pcase-let ((`(,args ,diff-files)
-               (magit-diff-arguments 'magit-revision-mode)))
-    (list args (if (derived-mode-p 'magit-log-mode)
-                   (and (or magit-revision-filter-files-on-follow
-                            (not (member "--follow" magit-buffer-log-args)))
-                        magit-buffer-log-files)
-                 diff-files))))
-
-;;;###autoload
-(defun magit-show-commit (rev &optional args files module)
-  "Visit the revision at point in another buffer.
-If there is no revision at point or with a prefix argument prompt
-for a revision."
-  (interactive
-   (pcase-let* ((mcommit (magit-section-value-if 'module-commit))
-                (atpoint (or mcommit
-                             (magit-thing-at-point 'git-revision t)
-                             (magit-branch-or-commit-at-point)))
-                (`(,args ,files) (magit-show-commit--arguments)))
-     (list (or (and (not current-prefix-arg) atpoint)
-               (magit-read-branch-or-commit "Show commit" atpoint))
-           args
-           files
-           (and mcommit
-                (magit-section-parent-value (magit-current-section))))))
-  (require 'magit)
-  (let* ((file (magit-file-relative-name))
-         (ln (and file (line-number-at-pos))))
-    (magit-with-toplevel
-      (when module
-        (setq default-directory
-              (expand-file-name (file-name-as-directory module))))
-      (unless (magit-commit-p rev)
-        (user-error "%s is not a commit" rev))
-      (when file
-        (save-buffer))
-      (let ((buf (magit-revision-setup-buffer rev args files)))
-        (when file
-          (let ((line (magit-diff-visit--offset file (list "-R" rev) ln))
-                (col (current-column)))
-            (with-current-buffer buf
-              (magit-diff--goto-position file line col))))))))
-
-(defun magit-diff--locate-hunk (file line &optional parent)
-  (and-let* ((diff (cl-find-if (lambda (section)
-                                 (and (cl-typep section 'magit-file-section)
-                                      (equal (oref section value) file)))
-                               (oref (or parent magit-root-section) children))))
-    (let ((hunk nil)
-          (hunks (oref diff children)))
-      (cl-block nil
-        (while (setq hunk (pop hunks))
-          (when-let ((range (oref hunk to-range)))
-            (pcase-let* ((`(,beg ,len) range)
-                         (end (+ beg len)))
-              (cond ((>  beg line)     (cl-return (list diff nil)))
-                    ((<= beg line end) (cl-return (list hunk t)))
-                    ((null hunks)      (cl-return (list hunk nil)))))))))))
-
-(defun magit-diff--goto-position (file line column &optional parent)
-  (when-let ((pos (magit-diff--locate-hunk file line parent)))
-    (pcase-let ((`(,section ,exact) pos))
-      (cond ((cl-typep section 'magit-file-section)
-             (goto-char (oref section start)))
-            (exact
-             (goto-char (oref section content))
-             (let ((pos (car (oref section to-range))))
-               (while (or (< pos line)
-                          (= (char-after) ?-))
-                 (unless (= (char-after) ?-)
-                   (cl-incf pos))
-                 (forward-line)))
-             (forward-char (1+ column)))
-            (t
-             (goto-char (oref section start))
-             (setq section (oref section parent))))
-      (while section
-        (when (oref section hidden)
-          (magit-section-show section))
-        (setq section (oref section parent))))
-    (magit-section-update-highlight)
-    t))
-
-;;;; Setting Commands
-
-(defun magit-diff-switch-range-type ()
-  "Convert diff range type.
-Change \"revA..revB\" to \"revA...revB\", or vice versa."
-  (interactive)
-  (if (and magit-buffer-range
-           (derived-mode-p 'magit-diff-mode)
-           (string-match magit-range-re magit-buffer-range))
-      (setq magit-buffer-range
-            (replace-match (if (string= (match-string 2 magit-buffer-range) "..")
-                               "..."
-                             "..")
-                           t t magit-buffer-range 2))
-    (user-error "No range to change"))
-  (magit-refresh))
-
-(defun magit-diff-flip-revs ()
-  "Swap revisions in diff range.
-Change \"revA..revB\" to \"revB..revA\"."
-  (interactive)
-  (if (and magit-buffer-range
-           (derived-mode-p 'magit-diff-mode)
-           (string-match magit-range-re magit-buffer-range))
-      (progn
-        (setq magit-buffer-range
-              (concat (match-string 3 magit-buffer-range)
-                      (match-string 2 magit-buffer-range)
-                      (match-string 1 magit-buffer-range)))
-        (magit-refresh))
-    (user-error "No range to swap")))
-
-(defun magit-diff-toggle-file-filter ()
-  "Toggle the file restriction of the current buffer's diffs.
-If the current buffer's mode is derived from `magit-log-mode',
-toggle the file restriction in the repository's revision buffer
-instead."
-  (interactive)
-  (cl-flet ((toggle ()
-              (if (or magit-buffer-diff-files
-                      magit-buffer-diff-files-suspended)
-                  (cl-rotatef magit-buffer-diff-files
-                              magit-buffer-diff-files-suspended)
-                (setq magit-buffer-diff-files
-                      (transient-infix-read 'magit:--)))
-              (magit-refresh)))
-    (cond
-     ((derived-mode-p 'magit-log-mode
-                      'magit-cherry-mode
-                      'magit-reflog-mode)
-      (if-let ((buffer (magit-get-mode-buffer 'magit-revision-mode)))
-          (with-current-buffer buffer (toggle))
-        (message "No revision buffer")))
-     ((local-variable-p 'magit-buffer-diff-files)
-      (toggle))
-     (t
-      (user-error "Cannot toggle file filter in this buffer")))))
-
-(defun magit-diff-less-context (&optional count)
-  "Decrease the context for diff hunks by COUNT lines."
-  (interactive "p")
-  (magit-diff-set-context (lambda (cur) (max 0 (- (or cur 0) count)))))
-
-(defun magit-diff-more-context (&optional count)
-  "Increase the context for diff hunks by COUNT lines."
-  (interactive "p")
-  (magit-diff-set-context (lambda (cur) (+ (or cur 0) count))))
-
-(defun magit-diff-default-context ()
-  "Reset context for diff hunks to the default height."
-  (interactive)
-  (magit-diff-set-context #'ignore))
-
-(defun magit-diff-set-context (fn)
-  (when (derived-mode-p 'magit-merge-preview-mode)
-    (user-error "Cannot use %s in %s" this-command major-mode))
-  (let* ((def (if-let ((context (magit-get "diff.context")))
-                  (string-to-number context)
-                3))
-         (val magit-buffer-diff-args)
-         (arg (--first (string-match "^-U\\([0-9]+\\)?$" it) val))
-         (num (if-let ((str (and arg (match-string 1 arg))))
-                  (string-to-number str)
-                def))
-         (val (delete arg val))
-         (num (funcall fn num))
-         (arg (and num (not (= num def)) (format "-U%d" num)))
-         (val (if arg (cons arg val) val)))
-    (setq magit-buffer-diff-args val))
-  (magit-refresh))
-
-(defun magit-diff-context-p ()
-  (if-let ((arg (--first (string-match "^-U\\([0-9]+\\)$" it)
-                         magit-buffer-diff-args)))
-      (not (equal arg "-U0"))
-    t))
-
-(defun magit-diff-ignore-any-space-p ()
-  (--any-p (member it magit-buffer-diff-args)
-           '("--ignore-cr-at-eol"
-             "--ignore-space-at-eol"
-             "--ignore-space-change" "-b"
-             "--ignore-all-space" "-w"
-             "--ignore-blank-space")))
-
-(defun magit-diff-toggle-refine-hunk (&optional style)
-  "Turn diff-hunk refining on or off.
-
-If hunk refining is currently on, then hunk refining is turned off.
-If hunk refining is off, then hunk refining is turned on, in
-`selected' mode (only the currently selected hunk is refined).
-
-With a prefix argument, the \"third choice\" is used instead:
-If hunk refining is currently on, then refining is kept on, but
-the refining mode (`selected' or `all') is switched.
-If hunk refining is off, then hunk refining is turned on, in
-`all' mode (all hunks refined).
-
-Customize variable `magit-diff-refine-hunk' to change the default mode."
-  (interactive "P")
-  (setq-local magit-diff-refine-hunk
-              (if style
-                  (if (eq magit-diff-refine-hunk 'all) t 'all)
-                (not magit-diff-refine-hunk)))
-  (magit-diff-update-hunk-refinement))
-
-;;;; Visit Commands
-;;;;; Dwim Variants
-
-(defun magit-diff-visit-file (file &optional other-window)
-  "From a diff visit the appropriate version of FILE.
-
-Display the buffer in the selected window.  With a prefix
-argument OTHER-WINDOW display the buffer in another window
-instead.
-
-Visit 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., stage 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 also go to the line that corresponds
-to the line that point is on in the diff.
-
-Note that this command only works if point is inside a diff.
-In other cases `magit-find-file' (which see) has to be used."
-  (interactive (list (magit-diff--file-at-point t t) current-prefix-arg))
-  (magit-diff-visit-file--internal file nil
-                                   (if other-window
-                                       #'switch-to-buffer-other-window
-                                     #'pop-to-buffer-same-window)))
-
-(defun magit-diff-visit-file-other-window (file)
-  "From a diff visit the appropriate version of FILE in another window.
-Like `magit-diff-visit-file' but use
-`switch-to-buffer-other-window'."
-  (interactive (list (magit-diff--file-at-point t t)))
-  (magit-diff-visit-file--internal file nil #'switch-to-buffer-other-window))
-
-(defun magit-diff-visit-file-other-frame (file)
-  "From a diff visit the appropriate version of FILE in another frame.
-Like `magit-diff-visit-file' but use
-`switch-to-buffer-other-frame'."
-  (interactive (list (magit-diff--file-at-point t t)))
-  (magit-diff-visit-file--internal file nil #'switch-to-buffer-other-frame))
-
-;;;;; Worktree Variants
-
-(defun magit-diff-visit-worktree-file (file &optional other-window)
-  "From a diff visit the worktree version of FILE.
-
-Display the buffer in the selected window.  With a prefix
-argument OTHER-WINDOW display the buffer in another window
-instead.
-
-Visit 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' always visits the \"real\" file in
-the working tree, i.e the \"current version\" of the file.
-
-In the file-visiting buffer also go 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."
-  (interactive (list (magit-file-at-point t t) current-prefix-arg))
-  (magit-diff-visit-file--internal file t
-                                   (if other-window
-                                       #'switch-to-buffer-other-window
-                                     #'pop-to-buffer-same-window)))
-
-(defun magit-diff-visit-worktree-file-other-window (file)
-  "From a diff visit the worktree version of FILE in another window.
-Like `magit-diff-visit-worktree-file' but use
-`switch-to-buffer-other-window'."
-  (interactive (list (magit-file-at-point t t)))
-  (magit-diff-visit-file--internal file t #'switch-to-buffer-other-window))
-
-(defun magit-diff-visit-worktree-file-other-frame (file)
-  "From a diff visit the worktree version of FILE in another frame.
-Like `magit-diff-visit-worktree-file' but use
-`switch-to-buffer-other-frame'."
-  (interactive (list (magit-file-at-point t t)))
-  (magit-diff-visit-file--internal file t #'switch-to-buffer-other-frame))
-
-;;;;; Internal
-
-(defun magit-diff-visit-file--internal (file force-worktree fn)
-  "From a diff visit the appropriate version of FILE.
-If FORCE-WORKTREE is non-nil, then visit the worktree version of
-the file, even if the diff is about a committed change.  Use FN
-to display the buffer in some window."
-  (if (file-accessible-directory-p file)
-      (magit-diff-visit-directory file force-worktree)
-    (pcase-let ((`(,buf ,pos)
-                 (magit-diff-visit-file--noselect file force-worktree)))
-      (funcall fn buf)
-      (magit-diff-visit-file--setup buf pos)
-      buf)))
-
-(defun magit-diff-visit-directory (directory &optional other-window)
-  "Visit DIRECTORY in some window.
-Display the buffer in the selected window unless OTHER-WINDOW is
-non-nil.  If DIRECTORY is the top-level directory of the current
-repository, then visit the containing directory using Dired and
-in the Dired buffer put point on DIRECTORY.  Otherwise display
-the Magit-Status buffer for DIRECTORY."
-  (if (equal (magit-toplevel directory)
-             (magit-toplevel))
-      (dired-jump other-window (concat directory "/."))
-    (let ((display-buffer-overriding-action
-           (if other-window
-               '(nil (inhibit-same-window . t))
-             '(display-buffer-same-window))))
-      (magit-status-setup-buffer directory))))
-
-(defun magit-diff-visit-file--setup (buf pos)
-  (if-let ((win (get-buffer-window buf 'visible)))
-      (with-selected-window win
-        (when pos
-          (unless (<= (point-min) pos (point-max))
-            (widen))
-          (goto-char pos))
-        (when (and buffer-file-name
-                   (magit-anything-unmerged-p buffer-file-name))
-          (smerge-start-session))
-        (run-hooks 'magit-diff-visit-file-hook))
-    (error "File buffer is not visible")))
-
-(defun magit-diff-visit-file--noselect (&optional file goto-worktree)
-  (unless file
-    (setq file (magit-diff--file-at-point t t)))
-  (let* ((hunk (magit-diff-visit--hunk))
-         (goto-from (and hunk
-                         (magit-diff-visit--goto-from-p hunk goto-worktree)))
-         (line (and hunk (magit-diff-hunk-line   hunk goto-from)))
-         (col  (and hunk (magit-diff-hunk-column hunk goto-from)))
-         (spec (magit-diff--dwim))
-         (rev  (if goto-from
-                   (magit-diff-visit--range-from spec)
-                 (magit-diff-visit--range-to spec)))
-         (buf  (if (or goto-worktree
-                       (and (not (stringp rev))
-                            (or magit-diff-visit-avoid-head-blob
-                                (not goto-from))))
-                   (or (get-file-buffer file)
-                       (find-file-noselect file))
-                 (magit-find-file-noselect (if (stringp rev) rev "HEAD")
-                                           file))))
-    (if line
-        (with-current-buffer buf
-          (cond ((eq rev 'staged)
-                 (setq line (magit-diff-visit--offset file nil line)))
-                ((and goto-worktree
-                      (stringp rev))
-                 (setq line (magit-diff-visit--offset file rev line))))
-          (list buf (save-restriction
-                      (widen)
-                      (goto-char (point-min))
-                      (forward-line (1- line))
-                      (move-to-column col)
-                      (point))))
-      (list buf nil))))
-
-(defun magit-diff--file-at-point (&optional expand assert)
-  ;; This is a variation of magit-file-at-point.
-  (if-let* ((file-section (magit-section-case
-                            (file it)
-                            (hunk (oref it parent))))
-            (file (or (and (magit-section-match 'hunk)
-                           (magit-diff-visit--goto-from-p
-                            (magit-current-section) nil)
-                           (oref file-section source))
-                      (oref file-section value))))
-      (if expand
-          (expand-file-name file (magit-toplevel))
-        file)
-    (when assert
-      (user-error "No file at point"))))
-
-(defun magit-diff-visit--hunk ()
-  (and-let* ((scope (magit-diff-scope))
-             (section (magit-current-section)))
-    (progn ; work around debbugs#31840
-      (cl-case scope
-        ((file files)
-         (setq section (car (oref section children))))
-        (list
-         (setq section (car (oref section children)))
-         (when section
-           (setq section (car (oref section children))))))
-      (and
-       ;; Unmerged files appear in the list of staged changes
-       ;; but unlike in the list of unstaged changes no diffs
-       ;; are shown here.  In that case `section' is nil.
-       section
-       ;; Currently the `hunk' type is also abused for file
-       ;; mode changes, which we are not interested in here.
-       (not (equal (oref section value) '(chmod)))
-       section))))
-
-(defun magit-diff-visit--goto-from-p (section in-worktree)
-  (and magit-diff-visit-previous-blob
-       (not in-worktree)
-       (not (oref section combined))
-       (not (< (magit-point) (oref section content)))
-       (= (char-after (line-beginning-position)) ?-)))
-
-(defvar magit-diff-visit-jump-to-change t)
-
-(defun magit-diff-hunk-line (section goto-from)
-  (save-excursion
-    (goto-char (line-beginning-position))
-    (with-slots (content combined from-ranges from-range to-range) section
-      (when (or from-range to-range)
-        (when (and magit-diff-visit-jump-to-change (< (point) content))
-          (goto-char content)
-          (re-search-forward "^[-+]"))
-        (+ (car (if goto-from from-range to-range))
-           (let ((prefix (if combined (length from-ranges) 1))
-                 (target (point))
-                 (offset 0))
-             (goto-char content)
-             (while (< (point) target)
-               (unless (string-search
-                        (if goto-from "+" "-")
-                        (buffer-substring (point) (+ (point) prefix)))
-                 (cl-incf offset))
-               (forward-line))
-             offset))))))
-
-(defun magit-diff-hunk-column (section goto-from)
-  (if (or (< (magit-point)
-             (oref section content))
-          (and (not goto-from)
-               (= (char-after (line-beginning-position)) ?-)))
-      0
-    (max 0 (- (+ (current-column) 2)
-              (length (oref section value))))))
-
-(defun magit-diff-visit--range-from (spec)
-  (cond ((consp spec)
-         (concat (cdr spec) "^"))
-        ((stringp spec)
-         (car (magit-split-range spec)))
-        (t
-         spec)))
-
-(defun magit-diff-visit--range-to (spec)
-  (if (symbolp spec)
-      spec
-    (let ((rev (if (consp spec)
-                   (cdr spec)
-                 (cdr (magit-split-range spec)))))
-      (if (and magit-diff-visit-avoid-head-blob
-               (magit-rev-head-p rev))
-          'unstaged
-        rev))))
-
-(defun magit-diff-visit--offset (file rev line)
-  (let ((offset 0))
-    (with-temp-buffer
-      (save-excursion
-        (magit-with-toplevel
-          (magit-git-insert "diff" rev "--" file)))
-      (catch 'found
-        (while (re-search-forward
-                "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\n"
-                nil t)
-          (let ((from-beg (string-to-number (match-string 1)))
-                (from-len (string-to-number (match-string 2)))
-                (  to-len (string-to-number (match-string 4))))
-            (if (<= from-beg line)
-                (if (< (+ from-beg from-len) line)
-                    (cl-incf offset (- to-len from-len))
-                  (let ((rest (- line from-beg)))
-                    (while (> rest 0)
-                      (pcase (char-after)
-                        (?\s                  (cl-decf rest))
-                        (?-  (cl-decf offset) (cl-decf rest))
-                        (?+  (cl-incf offset)))
-                      (forward-line))))
-              (throw 'found nil))))))
-    (+ line offset)))
-
-;;;; Scroll Commands
-
-(defun 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."
-  (interactive)
-  (magit-diff-show-or-scroll #'scroll-up))
-
-(defun 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."
-  (interactive)
-  (magit-diff-show-or-scroll #'scroll-down))
-
-(defun magit-diff-show-or-scroll (fn)
-  (let (rev cmd buf win)
-    (cond
-     ((and (bound-and-true-p magit-blame-mode)
-           (fboundp 'magit-current-blame-chunk))
-      (setq rev (oref (magit-current-blame-chunk) orig-rev))
-      (setq cmd #'magit-show-commit)
-      (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
-     ((derived-mode-p 'git-rebase-mode)
-      (with-slots (action-type target)
-          (git-rebase-current-line)
-        (if (not (eq action-type 'commit))
-            (user-error "No commit on this line")
-          (setq rev target)
-          (setq cmd #'magit-show-commit)
-          (setq buf (magit-get-mode-buffer 'magit-revision-mode)))))
-     (t
-      (magit-section-case
-        (branch
-         (setq rev (magit-ref-maybe-qualify (oref it value)))
-         (setq cmd #'magit-show-commit)
-         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
-        (commit
-         (setq rev (oref it value))
-         (setq cmd #'magit-show-commit)
-         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
-        (tag
-         (setq rev (magit-rev-hash (oref it value)))
-         (setq cmd #'magit-show-commit)
-         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
-        (stash
-         (setq rev (oref it value))
-         (setq cmd #'magit-stash-show)
-         (setq buf (magit-get-mode-buffer 'magit-stash-mode))))))
-    (if rev
-        (if (and buf
-                 (setq win (get-buffer-window buf))
-                 (with-current-buffer buf
-                   (and (equal rev magit-buffer-revision)
-                        (equal (magit-rev-parse rev)
-                               magit-buffer-revision-hash))))
-            (with-selected-window win
-              (condition-case nil
-                  (funcall fn)
-                (error
-                 (goto-char (pcase fn
-                              ('scroll-up   (point-min))
-                              ('scroll-down (point-max)))))))
-          (let ((magit-display-buffer-noselect t))
-            (if (eq cmd #'magit-show-commit)
-                (apply #'magit-show-commit rev (magit-show-commit--arguments))
-              (funcall cmd rev))))
-      (call-interactively #'magit-show-commit))))
-
-;;;; Section Commands
-
-(defun magit-section-cycle-diffs ()
-  "Cycle visibility of diff-related sections in the current buffer."
-  (interactive)
-  (when-let ((sections
-              (cond ((derived-mode-p 'magit-status-mode)
-                     (--mapcat
-                      (when it
-                        (when (oref it hidden)
-                          (magit-section-show it))
-                        (oref it children))
-                      (list (magit-get-section '((staged)   (status)))
-                            (magit-get-section '((unstaged) (status))))))
-                    ((derived-mode-p 'magit-diff-mode)
-                     (seq-filter #'magit-file-section-p
-                                 (oref magit-root-section children))))))
-    (if (--any-p (oref it hidden) sections)
-        (dolist (s sections)
-          (magit-section-show s)
-          (magit-section-hide-children s))
-      (let ((children (--mapcat (oref it children) sections)))
-        (cond ((and (--any-p (oref it hidden)   children)
-                    (--any-p (oref it children) children))
-               (mapc #'magit-section-show-headings sections))
-              ((seq-some #'magit-section-hidden-body children)
-               (mapc #'magit-section-show-children sections))
-              (t
-               (mapc #'magit-section-hide sections)))))))
-
-;;; Diff Mode
-
-(defvar-keymap magit-diff-mode-map
-  :doc "Keymap for `magit-diff-mode'."
-  :parent magit-mode-map
-  "C-c C-d" #'magit-diff-while-committing
-  "C-c C-b" #'magit-go-backward
-  "C-c C-f" #'magit-go-forward
-  "SPC"     #'scroll-up
-  "DEL"     #'scroll-down
-  "j"       #'magit-jump-to-diffstat-or-diff
-  "<remap> <write-file>" #'magit-patch-save)
-
-(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
-  "Mode for looking at a Git diff.
-
-This mode is documented in info node `(magit)Diff Buffer'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-section-toggle] to expand or hide the section at point.
-Type \\[magit-visit-thing] to visit the hunk or file at point.
-
-Staging and applying changes is documented in info node
-`(magit)Staging and Unstaging' and info node `(magit)Applying'.
-
-\\<magit-hunk-section-map>Type \
-\\[magit-apply] to apply the change at point, \
-\\[magit-stage] to stage,
-\\[magit-unstage] to unstage, \
-\\[magit-discard] to discard, or \
-\\[magit-reverse] to reverse it.
-
-\\{magit-diff-mode-map}"
-  :group 'magit-diff
-  (hack-dir-local-variables-non-file-buffer)
-  (setq magit--imenu-item-types 'file))
-
-(put 'magit-diff-mode 'magit-diff-default-arguments
-     '("--stat" "--no-ext-diff"))
-
-(defun magit-diff-setup-buffer ( range typearg args files
-                                 &optional type locked)
-  (require 'magit)
-  (magit-setup-buffer #'magit-diff-mode locked
-    (magit-buffer-range range)
-    (magit-buffer-typearg typearg)
-    (magit-buffer-diff-type type)
-    (magit-buffer-diff-args args)
-    (magit-buffer-diff-files files)
-    (magit-buffer-diff-files-suspended nil)))
-
-(defun magit-diff-refresh-buffer ()
-  "Refresh the current `magit-diff-mode' buffer."
-  (magit-set-header-line-format
-   (if (equal magit-buffer-typearg "--no-index")
-       (apply #'format "Differences between %s and %s" magit-buffer-diff-files)
-     (concat (if magit-buffer-range
-                 (if (string-match-p "\\(\\.\\.\\|\\^-\\)"
-                                     magit-buffer-range)
-                     (format "Changes in %s" magit-buffer-range)
-                   (let ((msg "Changes from %s to %s")
-                         (end (if (equal magit-buffer-typearg "--cached")
-                                  "index"
-                                "working tree")))
-                     (if (member "-R" magit-buffer-diff-args)
-                         (format msg end magit-buffer-range)
-                       (format msg magit-buffer-range end))))
-               (cond ((equal magit-buffer-typearg "--cached")
-                      "Staged changes")
-                     ((and (magit-repository-local-get 'this-commit-command)
-                           (not (magit-anything-staged-p)))
-                      "Uncommitting changes")
-                     (t "Unstaged changes")))
-             (pcase (length magit-buffer-diff-files)
-               (0)
-               (1 (concat " in file " (car magit-buffer-diff-files)))
-               (_ (concat " in files "
-                          (mapconcat #'identity magit-buffer-diff-files ", ")))))))
-  (setq magit-buffer-range-hashed
-        (and magit-buffer-range (magit-hash-range magit-buffer-range)))
-  (magit-insert-section (diffbuf)
-    (magit-run-section-hook 'magit-diff-sections-hook)))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-diff-mode))
-  (nconc (cond (magit-buffer-range
-                (delq nil (list magit-buffer-range magit-buffer-typearg)))
-               ((equal magit-buffer-typearg "--cached")
-                (list 'staged))
-               (t
-                (list 'unstaged magit-buffer-typearg)))
-         (and magit-buffer-diff-files (cons "--" magit-buffer-diff-files))))
-
-(cl-defmethod magit-menu-common-value ((_section magit-diff-section))
-  (magit-diff-scope))
-
-(define-obsolete-variable-alias 'magit-diff-section-base-map
-  'magit-diff-section-map "Magit-Section 4.0.0")
-
-(defvar-keymap magit-diff-section-map
-  :doc "Keymap for diff sections.
-The classes `magit-file-section' and `magit-hunk-section' derive
-from the abstract `magit-diff-section' class.  Accordingly this
-keymap is the parent of their keymaps."
-  "C-j"            #'magit-diff-visit-worktree-file
-  "C-<return>"     #'magit-diff-visit-worktree-file
-  "C-x 4 <return>" #'magit-diff-visit-file-other-window
-  "C-x 5 <return>" #'magit-diff-visit-file-other-frame
-  "&"              #'magit-do-async-shell-command
-  "C"              #'magit-commit-add-log
-  "C-x a"          #'magit-add-change-log-entry
-  "C-x 4 a"        #'magit-add-change-log-entry-other-window
-  "C-c C-t"        #'magit-diff-trace-definition
-  "C-c C-e"        #'magit-diff-edit-hunk-commit
-  "<remap> <magit-file-rename>"      #'magit-file-rename
-  "<remap> <magit-file-untrack>"     #'magit-file-untrack
-  "<remap> <magit-visit-thing>"      #'magit-diff-visit-file
-  "<remap> <magit-revert-no-commit>" #'magit-reverse
-  "<remap> <magit-delete-thing>"     #'magit-discard
-  "<remap> <magit-unstage-file>"     #'magit-unstage
-  "<remap> <magit-stage-file>"       #'magit-stage
-  "<remap> <magit-cherry-apply>"     #'magit-apply
-  "<8>" (magit-menu-item "Rename file" #'magit-file-rename
-                         '(:enable (eq (magit-diff-scope) 'file)))
-  "<7>" (magit-menu-item "Untrack %x" #'magit-file-untrack)
-  "<6>" (magit-menu-item "Visit file" #'magit-diff-visit-file
-                         '(:enable (memq (magit-diff-scope) '(file files))))
-  "<5>" (magit-menu-item "Reverse %x" #'magit-reverse
-                         '(:enable (not (memq (magit-diff-type)
-                                              '(untracked unstaged)))))
-  "<4>" (magit-menu-item "Discard %x" #'magit-discard
-                         '(:enable (not (memq (magit-diff-type)
-                                              '(committed undefined)))))
-  "<3>" (magit-menu-item "Unstage %x" #'magit-unstage
-                         '(:enable (eq (magit-diff-type) 'staged)))
-  "<2>" (magit-menu-item "Stage %x"   #'magit-stage
-                         '(:enable (eq (magit-diff-type) 'unstaged)))
-  "<1>" (magit-menu-item "Apply %x" #'magit-apply
-                         '(:enable (not (memq (magit-diff-type)
-                                              '(unstaged staged))))))
-
-(defvar-keymap magit-file-section-map
-  :doc "Keymap for `file' sections."
-  :parent magit-diff-section-base-map)
-
-(defvar-keymap magit-hunk-section-smerge-map
-  :doc "Keymap bound to `smerge-command-prefix' in `magit-hunk-section-map'."
-  "RET" #'magit-smerge-keep-current
-  "u"   #'magit-smerge-keep-upper
-  "b"   #'magit-smerge-keep-base
-  "l"   #'magit-smerge-keep-lower)
-
-(defvar-keymap magit-hunk-section-map
-  :doc "Keymap for `hunk' sections."
-  :parent magit-diff-section-base-map
-  (key-description smerge-command-prefix) magit-hunk-section-smerge-map)
-
-(defconst magit-diff-conflict-headline-re
-  (concat "^" (regexp-opt
-               ;; Defined in merge-tree.c in this order.
-               '("merged"
-                 "added in remote"
-                 "added in both"
-                 "added in local"
-                 "removed in both"
-                 "changed in both"
-                 "removed in local"
-                 "removed in remote"))))
-
-(defconst magit-diff-headline-re
-  (concat "^\\(@@@?\\|diff\\|Submodule\\|"
-          "\\* Unmerged path\\|"
-          (substring magit-diff-conflict-headline-re 1)
-          "\\)"))
-
-(defconst magit-diff-statline-re
-  (concat "^ ?"
-          "\\(.*\\)"     ; file
-          "\\( +| +\\)"  ; separator
-          "\\([0-9]+\\|Bin\\(?: +[0-9]+ -> [0-9]+ bytes\\)?$\\) ?"
-          "\\(\\+*\\)"   ; add
-          "\\(-*\\)$"))  ; del
-
-(defvar magit-diff--reset-non-color-moved
-  (list
-   "-c" "color.diff.context=normal"
-   "-c" "color.diff.plain=normal" ; historical synonym for context
-   "-c" "color.diff.meta=normal"
-   "-c" "color.diff.frag=normal"
-   "-c" "color.diff.func=normal"
-   "-c" "color.diff.old=normal"
-   "-c" "color.diff.new=normal"
-   "-c" "color.diff.commit=normal"
-   "-c" "color.diff.whitespace=normal"
-   ;; "git-range-diff" does not support "--color-moved", so we don't
-   ;; need to reset contextDimmed, oldDimmed, newDimmed, contextBold,
-   ;; oldBold, and newBold.
-   ))
-
-(defun magit-insert-diff ()
-  "Insert the diff into this `magit-diff-mode' buffer."
-  (magit--insert-diff t
-    "diff" magit-buffer-range "-p" "--no-prefix"
-    (and (member "--stat" magit-buffer-diff-args) "--numstat")
-    magit-buffer-typearg
-    magit-buffer-diff-args "--"
-    magit-buffer-diff-files))
-
-(defun magit--insert-diff (keep-error &rest args)
-  (declare (indent 1))
-  (pcase-let ((`(,cmd . ,args)
-               (flatten-tree args))
-              (magit-git-global-arguments
-               (remove "--literal-pathspecs" magit-git-global-arguments)))
-    ;; As of Git 2.19.0, we need to generate diffs with
-    ;; --ita-visible-in-index so that `magit-stage' can work with
-    ;; intent-to-add files (see #4026).
-    (when (and (not (equal cmd "merge-tree"))
-               (magit-git-version>= "2.19.0"))
-      (push "--ita-visible-in-index" args))
-    (setq args (magit-diff--maybe-add-stat-arguments args))
-    (when (cl-member-if (lambda (arg) (string-prefix-p "--color-moved" arg)) args)
-      (push "--color=always" args)
-      (setq magit-git-global-arguments
-            (append magit-diff--reset-non-color-moved
-                    magit-git-global-arguments)))
-    (magit--git-wash #'magit-diff-wash-diffs
-        (if (member "--no-index" args) 'wash-anyway keep-error)
-      cmd args)))
-
-(defun magit-diff--maybe-add-stat-arguments (args)
-  (if (member "--stat" args)
-      (append (if (functionp magit-diff-extra-stat-arguments)
-                  (funcall magit-diff-extra-stat-arguments)
-                magit-diff-extra-stat-arguments)
-              args)
-    args))
-
-(defun magit-diff-use-window-width-as-stat-width ()
-  "Use the `window-width' as the value of `--stat-width'."
-  (and-let* ((window (get-buffer-window (current-buffer) 'visible)))
-    (list (format "--stat-width=%d" (window-width window)))))
-
-(defun magit-diff-wash-diffs (args &optional limit)
-  (run-hooks 'magit-diff-wash-diffs-hook)
-  (when (member "--show-signature" args)
-    (magit-diff-wash-signature magit-buffer-revision-hash))
-  (when (member "--stat" args)
-    (magit-diff-wash-diffstat))
-  (when (re-search-forward magit-diff-headline-re limit t)
-    (goto-char (line-beginning-position))
-    (magit-wash-sequence (apply-partially #'magit-diff-wash-diff args))
-    (insert ?\n)))
-
-(defun magit-jump-to-diffstat-or-diff ()
-  "Jump 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."
-  (interactive)
-  (if-let ((section (magit-get-section
-                     (append (magit-section-case
-                               ([file diffstat] `((file . ,(oref it value))))
-                               (file `((file . ,(oref it value)) (diffstat)))
-                               (t '((diffstat))))
-                             (magit-section-ident magit-root-section)))))
-      (magit-section-goto section)
-    (user-error "No diffstat in this buffer")))
-
-(defun magit-diff-wash-signature (object)
-  (cond
-   ((looking-at "^No signature")
-    (delete-line))
-   ((looking-at "^gpg: ")
-    (let (title end)
-      (save-excursion
-        (while (looking-at "^gpg: ")
-          (cond
-           ((looking-at "^gpg: Good signature from")
-            (setq title (propertize
-                         (buffer-substring (point) (line-end-position))
-                         'face 'magit-signature-good)))
-           ((looking-at "^gpg: Can't check signature")
-            (setq title (propertize
-                         (buffer-substring (point) (line-end-position))
-                         'face '(italic bold)))))
-          (forward-line))
-        (setq end (point-marker)))
-      (magit-insert-section (signature object title)
-        (when title
-          (magit-insert-heading title))
-        (goto-char end)
-        (set-marker end nil)
-        (insert "\n"))))))
-
-(defun magit-diff-wash-diffstat ()
-  (let (heading (beg (point)))
-    (when (re-search-forward "^ ?\\([0-9]+ +files? change[^\n]*\n\\)" nil t)
-      (setq heading (match-string 1))
-      (magit-delete-match)
-      (goto-char beg)
-      (magit-insert-section (diffstat)
-        (insert (propertize heading 'font-lock-face 'magit-diff-file-heading))
-        (magit-insert-heading)
-        (let (files)
-          (while (looking-at "^[-0-9]+\t[-0-9]+\t\\(.+\\)$")
-            (push (magit-decode-git-path
-                   (let ((f (match-string 1)))
-                     (cond
-                      ((string-match "{.* => \\(.*\\)}" f)
-                       (replace-match (match-string 1 f) nil t f))
-                      ((string-match " => " f)
-                       (substring f (match-end 0)))
-                      (t f))))
-                  files)
-            (magit-delete-line))
-          (setq files (nreverse files))
-          (while (looking-at magit-diff-statline-re)
-            (magit-bind-match-strings (file sep cnt add del) nil
-              (magit-delete-line)
-              (when (string-match " +$" file)
-                (setq sep (concat (match-string 0 file) sep))
-                (setq file (substring file 0 (match-beginning 0))))
-              (let ((le (length file)) ld)
-                (setq file (magit-decode-git-path file))
-                (setq ld (length file))
-                (when (> le ld)
-                  (setq sep (concat (make-string (- le ld) ?\s) sep))))
-              (magit-insert-section (file (pop files))
-                (insert (propertize file 'font-lock-face 'magit-filename)
-                        sep cnt " ")
-                (when add
-                  (insert (propertize add 'font-lock-face
-                                      'magit-diffstat-added)))
-                (when del
-                  (insert (propertize del 'font-lock-face
-                                      'magit-diffstat-removed)))
-                (insert "\n")))))
-        (if (looking-at "^$") (forward-line) (insert "\n"))))))
-
-(defun magit-diff-wash-diff (args)
-  (when (cl-member-if (lambda (arg) (string-prefix-p "--color-moved" arg)) args)
-    (require 'ansi-color)
-    (ansi-color-apply-on-region (point-min) (point-max)))
-  (cond
-   ((looking-at "^Submodule")
-    (magit-diff-wash-submodule))
-   ((looking-at "^\\* Unmerged path \\(.*\\)")
-    (let ((file (magit-decode-git-path (match-string 1))))
-      (magit-delete-line)
-      (unless (and (derived-mode-p 'magit-status-mode)
-                   (not (member "--cached" args)))
-        (magit-insert-section (file file)
-          (insert (propertize
-                   (format "unmerged   %s%s" file
-                           (pcase (cddr (car (magit-file-status file)))
-                             ('(?D ?D) " (both deleted)")
-                             ('(?D ?U) " (deleted by us)")
-                             ('(?U ?D) " (deleted by them)")
-                             ('(?A ?A) " (both added)")
-                             ('(?A ?U) " (added by us)")
-                             ('(?U ?A) " (added by them)")
-                             ('(?U ?U) "")))
-                   'font-lock-face 'magit-diff-file-heading))
-          (insert ?\n))))
-    t)
-   ((looking-at magit-diff-conflict-headline-re)
-    (let ((long-status (match-string 0))
-          (status "BUG")
-          file orig base)
-      (if (equal long-status "merged")
-          (progn (setq status long-status)
-                 (setq long-status nil))
-        (setq status (pcase-exhaustive long-status
-                       ("added in remote"   "new file")
-                       ("added in both"     "new file")
-                       ("added in local"    "new file")
-                       ("removed in both"   "removed")
-                       ("changed in both"   "changed")
-                       ("removed in local"  "removed")
-                       ("removed in remote" "removed"))))
-      (magit-delete-line)
-      (while (looking-at
-              "^  \\([^ ]+\\) +[0-9]\\{6\\} \\([a-z0-9]\\{40,\\}\\) \\(.+\\)$")
-        (magit-bind-match-strings (side _blob name) nil
-          (pcase side
-            ("result" (setq file name))
-            ("our"    (setq orig name))
-            ("their"  (setq file name))
-            ("base"   (setq base name))))
-        (magit-delete-line))
-      (when orig (setq orig (magit-decode-git-path orig)))
-      (when file (setq file (magit-decode-git-path file)))
-      (magit-diff-insert-file-section
-       (or file base) orig status nil nil nil nil long-status)))
-   ;; The files on this line may be ambiguous due to whitespace.
-   ;; That's okay. We can get their names from subsequent headers.
-   ((looking-at "^diff --\
-\\(?:\\(?1:git\\) \\(?:\\(?2:.+?\\) \\2\\)?\
-\\|\\(?:cc\\|combined\\) \\(?3:.+\\)\\)")
-    (let ((status (cond ((equal (match-string 1) "git")        "modified")
-                        ((derived-mode-p 'magit-revision-mode) "resolved")
-                        (t                                     "unmerged")))
-          (orig nil)
-          (file (or (match-string 2) (match-string 3)))
-          (header (list (buffer-substring-no-properties
-                         (line-beginning-position) (1+ (line-end-position)))))
-          (modes nil)
-          (rename nil)
-          (binary nil))
-      (magit-delete-line)
-      (while (not (or (eobp) (looking-at magit-diff-headline-re)))
-        (cond
-         ((looking-at "old mode \\(?:[^\n]+\\)\nnew mode \\(?:[^\n]+\\)\n")
-          (setq modes (match-string 0)))
-         ((looking-at "deleted file .+\n")
-          (setq status "deleted"))
-         ((looking-at "new file .+\n")
-          (setq status "new file"))
-         ((looking-at "rename from \\(.+\\)\nrename to \\(.+\\)\n")
-          (setq rename (match-string 0))
-          (setq orig (match-string 1))
-          (setq file (match-string 2))
-          (setq status "renamed"))
-         ((looking-at "copy from \\(.+\\)\ncopy to \\(.+\\)\n")
-          (setq orig (match-string 1))
-          (setq file (match-string 2))
-          (setq status "new file"))
-         ((looking-at "similarity index .+\n"))
-         ((looking-at "dissimilarity index .+\n"))
-         ((looking-at "index .+\n"))
-         ((looking-at "--- \\(.+?\\)\t?\n")
-          (unless (equal (match-string 1) "/dev/null")
-            (setq orig (match-string 1))))
-         ((looking-at "\\+\\+\\+ \\(.+?\\)\t?\n")
-          (unless (equal (match-string 1) "/dev/null")
-            (setq file (match-string 1))))
-         ((looking-at "Binary files .+ and .+ differ\n")
-          (setq binary t))
-         ((looking-at "Binary files differ\n")
-          (setq binary t))
-         ;; TODO Use all combined diff extended headers.
-         ((looking-at "mode .+\n"))
-         ((error "BUG: Unknown extended header: %S"
-                 (buffer-substring (point) (line-end-position)))))
-        ;; These headers are treated as some sort of special hunk.
-        (unless (or (string-prefix-p "old mode" (match-string 0))
-                    (string-prefix-p "rename"   (match-string 0)))
-          (push (match-string 0) header))
-        (magit-delete-match))
-      (when orig
-        (setq orig (magit-decode-git-path orig)))
-      (setq file (magit-decode-git-path file))
-      (setq header (nreverse header))
-      ;; KLUDGE `git-log' ignores `--no-prefix' when `-L' is used.
-      (when (and (derived-mode-p 'magit-log-mode)
-                 (seq-some (lambda (arg) (string-prefix-p "-L" arg))
-                           magit-buffer-log-args))
-        (when orig
-          (setq orig (substring orig 2)))
-        (setq file (substring file 2))
-        (setq header (list (save-excursion
-                             (string-match "diff [^ ]+" (car header))
-                             (format "%s %s %s\n"
-                                     (match-string 0 (car header))
-                                     (or orig file)
-                                     (or file orig)))
-                           (format "--- %s\n" (or orig "/dev/null"))
-                           (format "+++ %s\n" (or file "/dev/null")))))
-      (setq header (mapconcat #'identity header ""))
-      (magit-diff-insert-file-section
-       file orig status modes rename header binary nil)))))
-
-(defun magit-diff-insert-file-section
-    (file orig status modes rename header binary long-status)
-  (magit-insert-section section
-    (file file (or (equal status "deleted")
-                   (derived-mode-p 'magit-status-mode)))
-    (insert (propertize (format "%-10s %s" status
-                                (if (or (not orig) (equal orig file))
-                                    file
-                                  (format "%s -> %s" orig file)))
-                        'font-lock-face 'magit-diff-file-heading))
-    (cond ((and binary long-status)
-           (insert (format " (%s, binary)" long-status)))
-          ((or binary long-status)
-           (insert (format " (%s)" (if binary "binary" long-status)))))
-    (magit-insert-heading)
-    (unless (equal orig file)
-      (oset section source orig))
-    (oset section header header)
-    (oset section binary binary)
-    (when modes
-      (magit-insert-section (hunk '(chmod))
-        (insert modes)
-        (magit-insert-heading)))
-    (when rename
-      (magit-insert-section (hunk '(rename))
-        (insert rename)
-        (magit-insert-heading)))
-    (magit-wash-sequence #'magit-diff-wash-hunk)))
-
-(defun magit-diff-wash-submodule ()
-  ;; See `show_submodule_summary' in submodule.c and "this" commit.
-  (when (looking-at "^Submodule \\([^ ]+\\)")
-    (let ((module (match-string 1))
-          untracked modified)
-      (when (looking-at "^Submodule [^ ]+ contains untracked content$")
-        (magit-delete-line)
-        (setq untracked t))
-      (when (looking-at "^Submodule [^ ]+ contains modified content$")
-        (magit-delete-line)
-        (setq modified t))
-      (cond
-       ((and (looking-at "^Submodule \\([^ ]+\\) \\([^ :]+\\)\\( (rewind)\\)?:$")
-             (equal (match-string 1) module))
-        (magit-bind-match-strings (_module range rewind) nil
-          (magit-delete-line)
-          (while (looking-at "^  \\([<>]\\) \\(.*\\)$")
-            (magit-delete-line))
-          (when rewind
-            (setq range (replace-regexp-in-string "[^.]\\(\\.\\.\\)[^.]"
-                                                  "..." range t t 1)))
-          (magit-insert-section (magit-module-section module t)
-            (magit-insert-heading
-              (propertize (concat "modified   " module)
-                          'font-lock-face 'magit-diff-file-heading)
-              " ("
-              (cond (rewind "rewind")
-                    ((string-search "..." range) "non-ff")
-                    (t "new commits"))
-              (and (or modified untracked)
-                   (concat ", "
-                           (and modified "modified")
-                           (and modified untracked " and ")
-                           (and untracked "untracked")
-                           " content"))
-              ")")
-            (magit-insert-section-body
-              (let ((default-directory
-                     (file-name-as-directory
-                      (expand-file-name module (magit-toplevel)))))
-                (magit-git-wash (apply-partially #'magit-log-wash-log 'module)
-                  "log" "--oneline" "--left-right" range)
-                (delete-char -1))))))
-       ((and (looking-at "^Submodule \\([^ ]+\\) \\([^ ]+\\) (\\([^)]+\\))$")
-             (equal (match-string 1) module))
-        (magit-bind-match-strings (_module _range msg) nil
-          (magit-delete-line)
-          (magit-insert-section (magit-module-section module)
-            (magit-insert-heading
-              (propertize (concat "submodule  " module)
-                          'font-lock-face 'magit-diff-file-heading)
-              " (" msg ")"))))
-       (t
-        (magit-insert-section (magit-module-section module)
-          (magit-insert-heading
-            (propertize (concat "modified   " module)
-                        'font-lock-face 'magit-diff-file-heading)
-            " ("
-            (and modified "modified")
-            (and modified untracked " and ")
-            (and untracked "untracked")
-            " content)")))))))
-
-(defun magit-diff-wash-hunk ()
-  (when (looking-at "^@\\{2,\\} \\(.+?\\) @\\{2,\\}\\(?: \\(.*\\)\\)?")
-    (let* ((heading  (match-string 0))
-           (ranges   (mapcar
-                      (lambda (str)
-                        (let ((range
-                               (mapcar #'string-to-number
-                                       (split-string (substring str 1) ","))))
-                          ;; A single line is +1 rather than +1,1.
-                          (if (length= range 1)
-                              (nconc range (list 1))
-                            range)))
-                      (split-string (match-string 1))))
-           (about    (match-string 2))
-           (combined (length= ranges 3))
-           (value    (cons about ranges)))
-      (magit-delete-line)
-      (magit-insert-section section (hunk value)
-        (insert (propertize (concat heading "\n")
-                            'font-lock-face 'magit-diff-hunk-heading))
-        (magit-insert-heading)
-        (while (not (or (eobp) (looking-at "^[^-+\s\\]")))
-          (forward-line))
-        (oset section end (point))
-        (oset section washer #'magit-diff-paint-hunk)
-        (oset section combined combined)
-        (if combined
-            (oset section from-ranges (butlast ranges))
-          (oset section from-range (car ranges)))
-        (oset section to-range (car (last ranges)))
-        (oset section about about)))
-    t))
-
-(defun magit-diff-expansion-threshold (section)
-  "Keep new diff sections collapsed if washing takes too long."
-  (and (magit-file-section-p section)
-       (> (float-time (time-subtract (current-time) magit-refresh-start-time))
-          magit-diff-expansion-threshold)
-       'hide))
-
-(add-hook 'magit-section-set-visibility-hook #'magit-diff-expansion-threshold)
-
-;;; Revision Mode
-
-(define-derived-mode magit-revision-mode magit-diff-mode "Magit Rev"
-  "Mode for looking at a Git commit.
-
-This mode is documented in info node `(magit)Revision Buffer'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-section-toggle] to expand or hide the section at point.
-Type \\[magit-visit-thing] to visit the hunk or file at point.
-
-Staging and applying changes is documented in info node
-`(magit)Staging and Unstaging' and info node `(magit)Applying'.
-
-\\<magit-hunk-section-map>Type \
-\\[magit-apply] to apply the change at point, \
-\\[magit-stage] to stage,
-\\[magit-unstage] to unstage, \
-\\[magit-discard] to discard, or \
-\\[magit-reverse] to reverse it.
-
-\\{magit-revision-mode-map}"
-  :group 'magit-revision
-  (hack-dir-local-variables-non-file-buffer))
-
-(put 'magit-revision-mode 'magit-diff-default-arguments
-     '("--stat" "--no-ext-diff"))
-
-(defun magit-revision-setup-buffer (rev args files)
-  (magit-setup-buffer #'magit-revision-mode nil
-    (magit-buffer-revision rev)
-    (magit-buffer-range (format "%s^..%s" rev rev))
-    (magit-buffer-diff-type 'committed)
-    (magit-buffer-diff-args args)
-    (magit-buffer-diff-files files)
-    (magit-buffer-diff-files-suspended nil)))
-
-(defun magit-revision-refresh-buffer ()
-  (setq magit-buffer-revision-hash (magit-rev-hash magit-buffer-revision))
-  (magit-set-header-line-format
-   (concat (magit-object-type magit-buffer-revision-hash)
-           " "  magit-buffer-revision
-           (pcase (length magit-buffer-diff-files)
-             (0)
-             (1 (concat " limited to file " (car magit-buffer-diff-files)))
-             (_ (concat " limited to files "
-                        (mapconcat #'identity magit-buffer-diff-files ", "))))))
-  (magit-insert-section (commitbuf)
-    (magit-run-section-hook 'magit-revision-sections-hook)))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-revision-mode))
-  (cons magit-buffer-revision magit-buffer-diff-files))
-
-(defun magit-insert-revision-diff ()
-  "Insert the diff into this `magit-revision-mode' buffer."
-  (magit--insert-diff t
-    "show" "-p" "--format=" "--no-prefix"
-    (and (member "--stat" magit-buffer-diff-args) "--numstat")
-    magit-buffer-diff-args
-    (magit--rev-dereference magit-buffer-revision)
-    "--" magit-buffer-diff-files))
-
-(defun magit-insert-revision-tag ()
-  "Insert tag message and headers into a revision buffer.
-This function only inserts anything when `magit-show-commit' is
-called with a tag as argument, when that is called with a commit
-or a ref which is not a branch, then it inserts nothing."
-  (when (equal (magit-object-type magit-buffer-revision) "tag")
-    (magit-insert-section (taginfo)
-      (let ((beg (point)))
-        ;; "git verify-tag -v" would output what we need, but the gpg
-        ;; output is send to stderr and we have no control over the
-        ;; order in which stdout and stderr are inserted, which would
-        ;; make parsing hard.  We are forced to use "git cat-file tag"
-        ;; instead, which inserts the signature instead of verifying
-        ;; it.  We remove that later and then insert the verification
-        ;; output using "git verify-tag" (without the "-v").
-        (magit-git-insert "cat-file" "tag" magit-buffer-revision)
-        (goto-char beg)
-        (forward-line 3)
-        (delete-region beg (point)))
-      (looking-at "^tagger \\([^<]+\\) <\\([^>]+\\)")
-      (let ((heading (format "Tagger: %s <%s>"
-                             (match-string 1)
-                             (match-string 2))))
-        (magit-delete-line)
-        (insert (propertize heading 'font-lock-face
-                            'magit-section-secondary-heading)))
-      (magit-insert-heading)
-      (forward-line)
-      (magit-insert-section section (message)
-        (oset section heading-highlight-face
-              'magit-diff-revision-summary-highlight)
-        (let ((beg (point)))
-          (forward-line)
-          (magit--add-face-text-property
-           beg (point) 'magit-diff-revision-summary))
-        (magit-insert-heading)
-        (if (re-search-forward "-----BEGIN PGP SIGNATURE-----" nil t)
-            (goto-char (match-beginning 0))
-          (goto-char (point-max)))
-        (insert ?\n))
-      (if (re-search-forward "-----BEGIN PGP SIGNATURE-----" nil t)
-          (progn
-            (let ((beg (match-beginning 0)))
-              (re-search-forward "-----END PGP SIGNATURE-----\n")
-              (delete-region beg (point)))
-            (save-excursion
-              (magit-process-git t "verify-tag" magit-buffer-revision))
-            (magit-diff-wash-signature magit-buffer-revision))
-        (goto-char (point-max)))
-      (insert ?\n))))
-
-(defvar-keymap magit-commit-message-section-map
-  :doc "Keymap for `commit-message' sections."
-  "<remap> <magit-visit-thing>"  #'magit-show-commit
-  "<1>" (magit-menu-item "Visit %t" #'magit-show-commit
-                         '(:enable (magit-thing-at-point 'git-revision t))))
-
-(defun magit-insert-revision-message ()
-  "Insert the commit message into a revision buffer."
-  (magit-insert-section section (commit-message)
-    (oset section heading-highlight-face 'magit-diff-revision-summary-highlight)
-    (let ((beg (point))
-          (rev magit-buffer-revision))
-      (insert (with-temp-buffer
-                (magit-rev-insert-format "%B" rev)
-                (magit-revision--wash-message)))
-      (if (= (point) (+ beg 2))
-          (progn (delete-char -2)
-                 (insert "(no message)\n"))
-        (goto-char beg)
-        (save-excursion
-          (while (search-forward "\r\n" nil t) ; Remove trailing CRs.
-            (delete-region (match-beginning 0) (1+ (match-beginning 0)))))
-        (when magit-revision-fill-summary-line
-          (let ((fill-column (min magit-revision-fill-summary-line
-                                  (window-width (get-buffer-window nil t)))))
-            (fill-region (point) (line-end-position))))
-        (when magit-revision-use-hash-sections
-          (save-excursion
-            ;; Start after beg to prevent a (commit text) section from
-            ;; starting at the same point as the (commit-message)
-            ;; section.
-            (goto-char (1+ beg))
-            (while (not (eobp))
-              (re-search-forward "\\_<" nil 'move)
-              (let ((beg (point)))
-                (re-search-forward "\\_>" nil t)
-                (when (> (point) beg)
-                  (let ((text (buffer-substring-no-properties beg (point))))
-                    (when (pcase magit-revision-use-hash-sections
-                            ('quickest ; false negatives and positives
-                             (and (>= (length text) 7)
-                                  (string-match-p "[0-9]" text)
-                                  (string-match-p "[a-z]" text)))
-                            ('quicker  ; false negatives (number-less hashes)
-                             (and (>= (length text) 7)
-                                  (string-match-p "[0-9]" text)
-                                  (magit-commit-p text)))
-                            ('quick    ; false negatives (short hashes)
-                             (and (>= (length text) 7)
-                                  (magit-commit-p text)))
-                            ('slow
-                             (magit-commit-p text)))
-                      (put-text-property beg (point)
-                                         'font-lock-face 'magit-hash)
-                      (let ((end (point)))
-                        (goto-char beg)
-                        (magit-insert-section (commit text)
-                          (goto-char end))))))))))
-        (save-excursion
-          (forward-line)
-          (magit--add-face-text-property
-           beg (point) 'magit-diff-revision-summary)
-          (magit-insert-heading))
-        (when magit-diff-highlight-keywords
-          (save-excursion
-            (while (re-search-forward "\\[[^[]*\\]" nil t)
-              (let ((beg (match-beginning 0))
-                    (end (match-end 0)))
-                (put-text-property
-                 beg end 'font-lock-face
-                 (if-let ((face (get-text-property beg 'font-lock-face)))
-                     (list face 'magit-keyword)
-                   'magit-keyword))))))
-        (goto-char (point-max))))))
-
-(defun magit-insert-revision-notes ()
-  "Insert commit notes into a revision buffer."
-  (let* ((var "core.notesRef")
-         (def (or (magit-get var) "refs/notes/commits")))
-    (dolist (ref (magit-list-active-notes-refs))
-      (magit-insert-section section (notes ref (not (equal ref def)))
-        (oset section heading-highlight-face 'magit-diff-hunk-heading-highlight)
-        (let ((beg (point))
-              (rev magit-buffer-revision))
-          (insert (with-temp-buffer
-                    (magit-git-insert "-c" (concat "core.notesRef=" ref)
-                                      "notes" "show" rev)
-                    (magit-revision--wash-message)))
-          (if (= (point) beg)
-              (magit-cancel-section)
-            (goto-char beg)
-            (end-of-line)
-            (insert (format " (%s)"
-                            (propertize (if (string-prefix-p "refs/notes/" ref)
-                                            (substring ref 11)
-                                          ref)
-                                        'font-lock-face 'magit-refname)))
-            (forward-char)
-            (magit--add-face-text-property beg (point) 'magit-diff-hunk-heading)
-            (magit-insert-heading)
-            (goto-char (point-max))
-            (insert ?\n)))))))
-
-(defun magit-revision--wash-message ()
-  (let ((major-mode 'git-commit-mode))
-    (hack-dir-local-variables)
-    (hack-local-variables-apply))
-  (unless (memq git-commit-major-mode '(nil text-mode))
-    (funcall git-commit-major-mode)
-    (font-lock-ensure))
-  (buffer-string))
-
-(defun magit-insert-revision-headers ()
-  "Insert headers about the commit into a revision buffer."
-  (magit-insert-section (headers)
-    (when-let ((string (magit-rev-format "%D" magit-buffer-revision
-                                         "--decorate=full")))
-      (insert (magit-format-ref-labels string) ?\s))
-    (insert (propertize
-             (magit-rev-parse (magit--rev-dereference magit-buffer-revision))
-             'font-lock-face 'magit-hash))
-    (magit-insert-heading)
-    (let ((beg (point)))
-      (magit-rev-insert-format magit-revision-headers-format
-                               magit-buffer-revision)
-      (magit-insert-revision-gravatars magit-buffer-revision beg))
-    (when magit-revision-insert-related-refs
-      (when (magit-revision-insert-related-refs-display-p 'parents)
-        (dolist (parent (magit-commit-parents magit-buffer-revision))
-          (magit-insert-section (commit parent)
-            (let ((line (magit-rev-format "%h %s" parent)))
-              (string-match "^\\([^ ]+\\) \\(.*\\)" line)
-              (magit-bind-match-strings (hash msg) line
-                (insert "Parent:     ")
-                (insert (propertize hash 'font-lock-face 'magit-hash))
-                (insert " " msg "\n"))))))
-      (when (magit-revision-insert-related-refs-display-p 'merged)
-        (magit--insert-related-refs
-         magit-buffer-revision "--merged" "Merged"
-         (eq magit-revision-insert-related-refs 'all)))
-      (when (magit-revision-insert-related-refs-display-p 'contained)
-        (magit--insert-related-refs
-         magit-buffer-revision "--contains" "Contained"
-         (memq magit-revision-insert-related-refs '(all mixed))))
-      (when (magit-revision-insert-related-refs-display-p 'follows)
-        (when-let ((follows (magit-get-current-tag magit-buffer-revision t)))
-          (let ((tag (car  follows))
-                (cnt (cadr follows)))
-            (magit-insert-section (tag tag)
-              (insert
-               (format "Follows:    %s (%s)\n"
-                       (propertize tag 'font-lock-face 'magit-tag)
-                       (propertize (number-to-string cnt)
-                                   'font-lock-face 'magit-branch-local)))))))
-      (when (magit-revision-insert-related-refs-display-p 'precedes)
-        (when-let ((precedes (magit-get-next-tag magit-buffer-revision t)))
-          (let ((tag (car  precedes))
-                (cnt (cadr precedes)))
-            (magit-insert-section (tag tag)
-              (insert (format "Precedes:   %s (%s)\n"
-                              (propertize tag 'font-lock-face 'magit-tag)
-                              (propertize (number-to-string cnt)
-                                          'font-lock-face 'magit-tag)))))))
-      (insert ?\n))))
-
-(defun magit-revision-insert-related-refs-display-p (sym)
-  "Whether to display related branches of type SYM.
-Refer to user option `magit-revision-insert-related-refs-display-alist'."
-  (if-let ((elt (assq sym magit-revision-insert-related-refs-display-alist)))
-      (cdr elt)
-    t))
-
-(defun magit--insert-related-refs (rev arg title remote)
-  (when-let ((refs (magit-list-related-branches arg rev (and remote "-a"))))
-    (insert title ":" (make-string (- 10 (length title)) ?\s))
-    (dolist (branch refs)
-      (if (<= (+ (current-column) 1 (length branch))
-              (window-width))
-          (insert ?\s)
-        (insert ?\n (make-string 12 ?\s)))
-      (magit-insert-section (branch branch)
-        (insert (propertize branch 'font-lock-face
-                            (if (string-prefix-p "remotes/" branch)
-                                'magit-branch-remote
-                              'magit-branch-local)))))
-    (insert ?\n)))
-
-(defun magit-insert-revision-gravatars (rev beg)
-  (when (and magit-revision-show-gravatars
-             (window-system))
-    (require 'gravatar)
-    (pcase-let ((`(,author . ,committer)
-                 (pcase magit-revision-show-gravatars
-                   ('t '("^Author:     " . "^Commit:     "))
-                   ('author '("^Author:     " . nil))
-                   ('committer '(nil . "^Commit:     "))
-                   (_ magit-revision-show-gravatars))))
-      (when-let ((email (and author (magit-rev-format "%aE" rev))))
-        (magit-insert-revision-gravatar beg rev email author))
-      (when-let ((email (and committer (magit-rev-format "%cE" rev))))
-        (magit-insert-revision-gravatar beg rev email committer)))))
-
-(defun magit-insert-revision-gravatar (beg rev email regexp)
-  (save-excursion
-    (goto-char beg)
-    (when (re-search-forward regexp nil t)
-      (when-let ((window (get-buffer-window)))
-        (let* ((column   (length (match-string 0)))
-               (font-obj (query-font (font-at (point) window)))
-               (size     (* 2 (+ (aref font-obj 4)
-                                 (aref font-obj 5))))
-               (align-to (+ column
-                            (ceiling (/ size (aref font-obj 7) 1.0))
-                            1))
-               (gravatar-size (- size 2)))
-          (ignore-errors ; service may be unreachable
-            (gravatar-retrieve email #'magit-insert-revision-gravatar-cb
-                               (list gravatar-size rev
-                                     (point-marker)
-                                     align-to column))))))))
-
-(defun magit-insert-revision-gravatar-cb (image size rev marker align-to column)
-  (unless (eq image 'error)
-    (when-let ((buffer (marker-buffer marker)))
-      (with-current-buffer buffer
-        (save-excursion
-          (goto-char marker)
-          ;; The buffer might display another revision by now or
-          ;; it might have been refreshed, in which case another
-          ;; process might already have inserted the image.
-          (when (and (equal rev magit-buffer-revision)
-                     (not (eq (car-safe
-                               (car-safe
-                                (get-text-property (point) 'display)))
-                              'image)))
-            (setf (image-property image :ascent) 'center)
-            (setf (image-property image :relief) 1)
-            (setf (image-property image :scale)  1)
-            (setf (image-property image :height) size)
-            (let ((top (list image '(slice 0.0 0.0 1.0 0.5)))
-                  (bot (list image '(slice 0.0 0.5 1.0 1.0)))
-                  (align `((space :align-to ,align-to))))
-              (when magit-revision-use-gravatar-kludge
-                (cl-rotatef top bot))
-              (let ((inhibit-read-only t))
-                (insert (propertize " " 'display top))
-                (insert (propertize " " 'display align))
-                (forward-line)
-                (forward-char column)
-                (insert (propertize " " 'display bot))
-                (insert (propertize " " 'display align))))))))))
-
-;;; Merge-Preview Mode
-
-(define-derived-mode magit-merge-preview-mode magit-diff-mode "Magit Merge"
-  "Mode for previewing a merge."
-  :group 'magit-diff
-  (hack-dir-local-variables-non-file-buffer))
-
-(put 'magit-merge-preview-mode 'magit-diff-default-arguments
-     '("--no-ext-diff"))
-
-(defun magit-merge-preview-setup-buffer (rev)
-  (magit-setup-buffer #'magit-merge-preview-mode nil
-    (magit-buffer-revision rev)
-    (magit-buffer-range (format "%s^..%s" rev rev))))
-
-(defun magit-merge-preview-refresh-buffer ()
-  (let* ((branch (magit-get-current-branch))
-         (head (or branch (magit-rev-verify "HEAD"))))
-    (magit-set-header-line-format (format "Preview merge of %s into %s"
-                                          magit-buffer-revision
-                                          (or branch "HEAD")))
-    (magit-insert-section (diffbuf)
-      (magit--insert-diff t
-        "merge-tree" (magit-git-string "merge-base" head magit-buffer-revision)
-        head magit-buffer-revision))))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-merge-preview-mode))
-  magit-buffer-revision)
-
-;;; Hunk Section
-
-(defun magit-hunk-set-window-start (section)
-  "When SECTION is a `hunk', ensure that its beginning is visible.
-It the SECTION has a different type, then do nothing."
-  (when (magit-hunk-section-p section)
-    (magit-section-set-window-start section)))
-
-(add-hook 'magit-section-movement-hook #'magit-hunk-set-window-start)
-
-(cl-defmethod magit-section-get-relative-position ((_section magit-hunk-section))
-  (nconc (cl-call-next-method)
-         (and (region-active-p)
-              (progn
-                (goto-char (line-beginning-position))
-                (when  (looking-at "^[-+]") (forward-line))
-                (while (looking-at "^[ @]") (forward-line))
-                (let ((beg (magit-point)))
-                  (list (cond
-                         ((looking-at "^[-+]")
-                          (forward-line)
-                          (while (looking-at "^[-+]") (forward-line))
-                          (while (looking-at "^ ")    (forward-line))
-                          (forward-line -1)
-                          (regexp-quote (buffer-substring-no-properties
-                                         beg (line-end-position))))
-                         (t t))))))))
-
-(cl-defmethod magit-section-goto-successor ((section magit-hunk-section)
-                                            line char &optional arg)
-  (or (magit-section-goto-successor--same section line char)
-      (and-let* ((parent (magit-get-section
-                          (magit-section-ident
-                           (oref section parent)))))
-        (let* ((children (oref parent children))
-               (siblings (magit-section-siblings section 'prev))
-               (previous (nth (length siblings) children)))
-          (if (not arg)
-              (when-let ((sibling (or previous (car (last children)))))
-                (magit-section-goto sibling)
-                t)
-            (when previous
-              (magit-section-goto previous))
-            (if (and (stringp arg)
-                     (re-search-forward arg (oref parent end) t))
-                (goto-char (match-beginning 0))
-              (goto-char (oref (car (last children)) end))
-              (forward-line -1)
-              (while (looking-at "^ ")    (forward-line -1))
-              (while (looking-at "^[-+]") (forward-line -1))
-              (forward-line)))))
-      (magit-section-goto-successor--related section)))
-
-;;; Diff Sections
-
-(defvar-keymap magit-unstaged-section-map
-  :doc "Keymap for the `unstaged' section."
-  "<remap> <magit-visit-thing>"  #'magit-diff-unstaged
-  "<remap> <magit-stage-file>"   #'magit-stage
-  "<remap> <magit-delete-thing>" #'magit-discard
-  "<3>" (magit-menu-item "Discard all" #'magit-discard)
-  "<2>" (magit-menu-item "Stage all"   #'magit-stage)
-  "<1>" (magit-menu-item "Visit diff"  #'magit-diff-unstaged))
-
-(magit-define-section-jumper magit-jump-to-unstaged "Unstaged changes" unstaged)
-
-(defun magit-insert-unstaged-changes ()
-  "Insert section showing unstaged changes."
-  (magit-insert-section (unstaged)
-    (magit-insert-heading "Unstaged changes:")
-    (magit--insert-diff nil
-      "diff" magit-buffer-diff-args "--no-prefix"
-      "--" magit-buffer-diff-files)))
-
-(defvar-keymap magit-staged-section-map
-  :doc "Keymap for the `staged' section."
-  "<remap> <magit-revert-no-commit>" #'magit-reverse
-  "<remap> <magit-delete-thing>"     #'magit-discard
-  "<remap> <magit-unstage-file>"     #'magit-unstage
-  "<remap> <magit-visit-thing>"      #'magit-diff-staged
-  "<4>" (magit-menu-item "Reverse all" #'magit-reverse)
-  "<3>" (magit-menu-item "Discard all" #'magit-discard)
-  "<2>" (magit-menu-item "Unstage all" #'magit-unstage)
-  "<1>" (magit-menu-item "Visit diff"  #'magit-diff-staged))
-
-(magit-define-section-jumper magit-jump-to-staged "Staged changes" staged)
-
-(defun magit-insert-staged-changes ()
-  "Insert section showing staged changes."
-  ;; Avoid listing all files as deleted when visiting a bare repo.
-  (unless (magit-bare-repo-p)
-    (magit-insert-section (staged)
-      (magit-insert-heading "Staged changes:")
-      (magit--insert-diff nil
-        "diff" "--cached" magit-buffer-diff-args "--no-prefix"
-        "--" magit-buffer-diff-files))))
-
-;;; Diff Type
-
-(defvar magit--diff-use-recorded-type-p t)
-
-(defun 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 everywhere they
-should be and 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'.
-
-Do not confuse this with `magit-diff-scope' (which see)."
-  (when-let ((section (or section (magit-current-section))))
-    (cond ((derived-mode-p 'magit-revision-mode 'magit-stash-mode) 'committed)
-          ((derived-mode-p 'magit-diff-mode)
-           (let ((range magit-buffer-range)
-                 (const magit-buffer-typearg))
-             (cond ((and magit--diff-use-recorded-type-p
-                         magit-buffer-diff-type))
-                   ((equal const "--no-index") 'undefined)
-                   ((or (not range)
-                        (equal range "HEAD")
-                        (magit-rev-eq range "HEAD"))
-                    (if (equal const "--cached")
-                        'staged
-                      'unstaged))
-                   ((equal const "--cached")
-                    (if (magit-rev-head-p range)
-                        'staged
-                      'undefined)) ; i.e., committed and staged
-                   (t 'committed))))
-          ((derived-mode-p 'magit-status-mode)
-           (let ((stype (oref section type)))
-             (if (memq stype '(staged unstaged tracked untracked))
-                 stype
-               (pcase stype
-                 ((or 'file 'module)
-                  (let* ((parent (oref section parent))
-                         (type   (oref parent type)))
-                    (if (memq type '(file module))
-                        (magit-diff-type parent)
-                      type)))
-                 ('hunk (thread-first section
-                          (oref parent)
-                          (oref parent)
-                          (oref type)))))))
-          ((derived-mode-p 'magit-log-mode)
-           (if (or (and (magit-section-match 'commit section)
-                        (oref section children))
-                   (magit-section-match [* file commit] section))
-               'committed
-             'undefined))
-          (t 'undefined))))
-
-(cl-defun magit-diff-scope (&optional (section nil ssection) 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 that is nil
-the current section, is a `hunk' section; and the region region
-starts and ends inside the body of a that section, then the type
-is `region'.  If the region is empty after a mouse click, then
-`hunk' is returned instead of `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."
-  (let ((siblings (and (not ssection) (magit-region-sections nil t))))
-    (setq section (or section (car siblings) (magit-current-section)))
-    (when (and section
-               (or (not strict)
-                   (and (not (eq (magit-diff-type section) 'untracked))
-                        (not (eq (and-let* ((parent (oref section parent)))
-                                   (oref parent type))
-                                 'diffstat)))))
-      (pcase (list (oref section type)
-                   (and siblings t)
-                   (magit-diff-use-hunk-region-p)
-                   ssection)
-        (`(hunk nil   t  ,_)
-         (if (magit-section-internal-region-p section) 'region 'hunk))
-        ('(hunk   t   t nil) 'hunks)
-        (`(hunk  ,_  ,_  ,_) 'hunk)
-        ('(file   t   t nil) 'files)
-        (`(file  ,_  ,_  ,_) 'file)
-        ('(module   t   t nil) 'files)
-        (`(module  ,_  ,_  ,_) 'file)
-        (`(,(or 'staged 'unstaged 'untracked) nil ,_ ,_) 'list)))))
-
-(defun magit-diff-use-hunk-region-p ()
-  (and (region-active-p)
-       ;; TODO implement this from first principals
-       ;; currently it's trial-and-error
-       (not (and (or (eq this-command #'mouse-drag-region)
-                     (eq last-command #'mouse-drag-region)
-                     ;; When another window was previously
-                     ;; selected then the last-command is
-                     ;; some byte-code function.
-                     (byte-code-function-p last-command))
-                 (eq (region-end) (region-beginning))))))
-
-;;; Diff Highlight
-
-(add-hook 'magit-section-unhighlight-hook #'magit-diff-unhighlight)
-(add-hook 'magit-section-highlight-hook #'magit-diff-highlight)
-
-(defun magit-diff-unhighlight (section selection)
-  "Remove the highlighting of the diff-related SECTION."
-  (when (magit-hunk-section-p section)
-    (magit-diff-paint-hunk section selection nil)
-    t))
-
-(defun magit-diff-highlight (section selection)
-  "Highlight the diff-related SECTION.
-If SECTION is not a diff-related section, then do nothing and
-return nil.  If SELECTION is non-nil, then it is a list of sections
-selected by the region, including SECTION.  All of these sections
-are highlighted."
-  (if (and (magit-section-match 'commit section)
-           (oref section children))
-      (progn (if selection
-                 (dolist (section selection)
-                   (magit-diff-highlight-list section selection))
-               (magit-diff-highlight-list section))
-             t)
-    (when-let ((scope (magit-diff-scope section t)))
-      (cond ((eq scope 'region)
-             (magit-diff-paint-hunk section selection t))
-            (selection
-             (dolist (section selection)
-               (magit-diff-highlight-recursive section selection)))
-            (t
-             (magit-diff-highlight-recursive section)))
-      t)))
-
-(defun magit-diff-highlight-recursive (section &optional selection)
-  (pcase (magit-diff-scope section)
-    ('list (magit-diff-highlight-list section selection))
-    ('file (magit-diff-highlight-file section selection))
-    ('hunk (magit-diff-highlight-heading section selection)
-           (magit-diff-paint-hunk section selection t))
-    (_     (magit-section-highlight section nil))))
-
-(defun magit-diff-highlight-list (section &optional selection)
-  (let ((beg (oref section start))
-        (cnt (oref section content))
-        (end (oref section end)))
-    (when (or (eq this-command #'mouse-drag-region)
-              (not selection))
-      (unless (and (region-active-p)
-                   (<= (region-beginning) beg))
-        (magit-section-make-overlay beg cnt 'magit-section-highlight))
-      (if (oref section hidden)
-          (oset section washer #'ignore)
-        (dolist (child (oref section children))
-          (when (or (eq this-command #'mouse-drag-region)
-                    (not (and (region-active-p)
-                              (<= (region-beginning)
-                                  (oref child start)))))
-            (magit-diff-highlight-recursive child selection)))))
-    (when magit-diff-highlight-hunk-body
-      (magit-section-make-overlay (1- end) end 'magit-section-highlight))))
-
-(defun magit-diff-highlight-file (section &optional selection)
-  (magit-diff-highlight-heading section selection)
-  (when (or (not (oref section hidden))
-            (cl-typep section 'magit-module-section))
-    (dolist (child (oref section children))
-      (magit-diff-highlight-recursive child selection))))
-
-(defun magit-diff-highlight-heading (section &optional selection)
-  (magit-section-make-overlay
-   (oref section start)
-   (or (oref section content)
-       (oref section end))
-   (pcase (list (oref section type)
-                (and (member section selection)
-                     (not (eq this-command #'mouse-drag-region))))
-     ('(file     t) 'magit-diff-file-heading-selection)
-     ('(file   nil) 'magit-diff-file-heading-highlight)
-     ('(module   t) 'magit-diff-file-heading-selection)
-     ('(module nil) 'magit-diff-file-heading-highlight)
-     ('(hunk     t) 'magit-diff-hunk-heading-selection)
-     ('(hunk   nil) 'magit-diff-hunk-heading-highlight))))
-
-;;; Hunk Paint
-
-(cl-defun magit-diff-paint-hunk
-    (section &optional selection
-             (highlight (magit-section-selected-p section selection)))
-  (let (paint)
-    (unless magit-diff-highlight-hunk-body
-      (setq highlight nil))
-    (cond (highlight
-           (unless (oref section hidden)
-             (add-to-list 'magit-section-highlighted-sections section)
-             (cond ((memq section magit-section-unhighlight-sections)
-                    (setq magit-section-unhighlight-sections
-                          (delq section magit-section-unhighlight-sections)))
-                   (magit-diff-highlight-hunk-body
-                    (setq paint t)))))
-          (t
-           (cond ((and (oref section hidden)
-                       (memq section magit-section-unhighlight-sections))
-                  (add-to-list 'magit-section-highlighted-sections section)
-                  (setq magit-section-unhighlight-sections
-                        (delq section magit-section-unhighlight-sections)))
-                 (t
-                  (setq paint t)))))
-    (when paint
-      (save-excursion
-        (goto-char (oref section start))
-        (let ((end (oref section end))
-              (merging (looking-at "@@@"))
-              (diff-type (magit-diff-type))
-              (stage nil)
-              (tab-width (magit-diff-tab-width
-                          (magit-section-parent-value section))))
-          (forward-line)
-          (while (< (point) end)
-            (when (and magit-diff-hide-trailing-cr-characters
-                       (char-equal ?\r (char-before (line-end-position))))
-              (put-text-property (1- (line-end-position)) (line-end-position)
-                                 'invisible t))
-            (put-text-property
-             (point) (1+ (line-end-position)) 'font-lock-face
-             (cond
-              ((looking-at "^\\+\\+?\\([<=|>]\\)\\{7\\}")
-               (setq stage (pcase (list (match-string 1) highlight)
-                             ('("<" nil) 'magit-diff-our)
-                             ('("<"   t) 'magit-diff-our-highlight)
-                             ('("|" nil) 'magit-diff-base)
-                             ('("|"   t) 'magit-diff-base-highlight)
-                             ('("=" nil) 'magit-diff-their)
-                             ('("="   t) 'magit-diff-their-highlight)
-                             ('(">" nil) nil)))
-               'magit-diff-conflict-heading)
-              ((looking-at (if merging "^\\(\\+\\| \\+\\)" "^\\+"))
-               (magit-diff-paint-tab merging tab-width)
-               (magit-diff-paint-whitespace merging 'added diff-type)
-               (or stage
-                   (if highlight 'magit-diff-added-highlight 'magit-diff-added)))
-              ((looking-at (if merging "^\\(-\\| -\\)" "^-"))
-               (magit-diff-paint-tab merging tab-width)
-               (magit-diff-paint-whitespace merging 'removed diff-type)
-               (if highlight 'magit-diff-removed-highlight 'magit-diff-removed))
-              (t
-               (magit-diff-paint-tab merging tab-width)
-               (magit-diff-paint-whitespace merging 'context diff-type)
-               (if highlight 'magit-diff-context-highlight 'magit-diff-context))))
-            (forward-line))))))
-  (magit-diff-update-hunk-refinement section))
-
-(defvar magit-diff--tab-width-cache nil)
-
-(defun magit-diff-tab-width (file)
-  (setq file (expand-file-name file))
-  (cl-flet ((cache (value)
-              (let ((elt (assoc file magit-diff--tab-width-cache)))
-                (if elt
-                    (setcdr elt value)
-                  (setq magit-diff--tab-width-cache
-                        (cons (cons file value)
-                              magit-diff--tab-width-cache))))
-              value))
-    (cond
-     ((not magit-diff-adjust-tab-width)
-      tab-width)
-     ((and-let* ((buffer (find-buffer-visiting file)))
-        (cache (buffer-local-value 'tab-width buffer))))
-     ((and-let* ((elt (assoc file magit-diff--tab-width-cache)))
-        (or (cdr elt)
-            tab-width)))
-     ((or (eq magit-diff-adjust-tab-width 'always)
-          (and (numberp magit-diff-adjust-tab-width)
-               (>= magit-diff-adjust-tab-width
-                   (nth 7 (file-attributes file)))))
-      (cache (buffer-local-value 'tab-width (find-file-noselect file))))
-     (t
-      (cache nil)
-      tab-width))))
-
-(defun magit-diff-paint-tab (merging width)
-  (save-excursion
-    (forward-char (if merging 2 1))
-    (while (= (char-after) ?\t)
-      (put-text-property (point) (1+ (point))
-                         'display (list (list 'space :width width)))
-      (forward-char))))
-
-(defun magit-diff-paint-whitespace (merging line-type diff-type)
-  (when (and magit-diff-paint-whitespace
-             (or (not (memq magit-diff-paint-whitespace '(uncommitted status)))
-                 (memq diff-type '(staged unstaged)))
-             (cl-case line-type
-               (added   t)
-               (removed (memq magit-diff-paint-whitespace-lines '(all both)))
-               (context (memq magit-diff-paint-whitespace-lines '(all)))))
-    (let ((prefix (if merging "^[-\\+\s]\\{2\\}" "^[-\\+\s]"))
-          (indent
-           (if (local-variable-p 'magit-diff-highlight-indentation)
-               magit-diff-highlight-indentation
-             (setq-local
-              magit-diff-highlight-indentation
-              (cdr (--first (string-match-p (car it) default-directory)
-                            (nreverse
-                             (default-value
-                              'magit-diff-highlight-indentation))))))))
-      (when (and magit-diff-highlight-trailing
-                 (looking-at (concat prefix ".*?\\([ \t]+\\)?$")))
-        (let ((ov (make-overlay (match-beginning 1) (match-end 1) nil t)))
-          (overlay-put ov 'font-lock-face 'magit-diff-whitespace-warning)
-          (overlay-put ov 'priority 2)
-          (overlay-put ov 'evaporate t)))
-      (when (or (and (eq indent 'tabs)
-                     (looking-at (concat prefix "\\( *\t[ \t]*\\)")))
-                (and (integerp indent)
-                     (looking-at (format "%s\\([ \t]* \\{%s,\\}[ \t]*\\)"
-                                         prefix indent))))
-        (let ((ov (make-overlay (match-beginning 1) (match-end 1) nil t)))
-          (overlay-put ov 'font-lock-face 'magit-diff-whitespace-warning)
-          (overlay-put ov 'priority 2)
-          (overlay-put ov 'evaporate t))))))
-
-(defun magit-diff-update-hunk-refinement (&optional section)
-  (if section
-      (unless (oref section hidden)
-        (pcase (list magit-diff-refine-hunk
-                     (oref section refined)
-                     (eq section (magit-current-section)))
-          ((or `(all nil ,_) '(t nil t))
-           (oset section refined t)
-           (save-excursion
-             (goto-char (oref section start))
-             ;; `diff-refine-hunk' does not handle combined diffs.
-             (unless (looking-at "@@@")
-               (let ((smerge-refine-ignore-whitespace
-                      magit-diff-refine-ignore-whitespace)
-                     ;; Avoid fsyncing many small temp files
-                     (write-region-inhibit-fsync t))
-                 (diff-refine-hunk)))))
-          ((or `(nil t ,_) '(t t nil))
-           (oset section refined nil)
-           (remove-overlays (oref section start)
-                            (oref section end)
-                            'diff-mode 'fine))))
-    (cl-labels ((recurse (section)
-                  (if (magit-section-match 'hunk section)
-                      (magit-diff-update-hunk-refinement section)
-                    (dolist (child (oref section children))
-                      (recurse child)))))
-      (recurse magit-root-section))))
-
-
-;;; Hunk Region
-
-(defun magit-diff-hunk-region-beginning ()
-  (save-excursion (goto-char (region-beginning))
-                  (line-beginning-position)))
-
-(defun magit-diff-hunk-region-end ()
-  (save-excursion (goto-char (region-end))
-                  (line-end-position)))
-
-(defun magit-diff-update-hunk-region (section)
-  "Highlight the hunk-internal region if any."
-  (when (and (eq (oref section type) 'hunk)
-             (eq (magit-diff-scope section t) 'region))
-    (magit-diff--make-hunk-overlay
-     (oref section start)
-     (1- (oref section content))
-     'font-lock-face 'magit-diff-lines-heading
-     'display (magit-diff-hunk-region-header section)
-     'after-string (magit-diff--hunk-after-string 'magit-diff-lines-heading))
-    (run-hook-with-args 'magit-diff-highlight-hunk-region-functions section)
-    t))
-
-(defun magit-diff-highlight-hunk-region-dim-outside (section)
-  "Dim the parts of the hunk that are outside the hunk-internal region.
-This is done by using the same foreground and background color
-for added and removed lines as for context lines."
-  (let ((face (if magit-diff-highlight-hunk-body
-                  'magit-diff-context-highlight
-                'magit-diff-context)))
-    (when magit-diff-unmarked-lines-keep-foreground
-      (setq face `(,@(and (>= emacs-major-version 27) '(:extend t))
-                   :background ,(face-attribute face :background))))
-    (magit-diff--make-hunk-overlay (oref section content)
-                                   (magit-diff-hunk-region-beginning)
-                                   'font-lock-face face
-                                   'priority 2)
-    (magit-diff--make-hunk-overlay (1+ (magit-diff-hunk-region-end))
-                                   (oref section end)
-                                   'font-lock-face face
-                                   'priority 2)))
-
-(defun magit-diff-highlight-hunk-region-using-face (_section)
-  "Highlight the hunk-internal region by making it bold.
-Or rather highlight using the face `magit-diff-hunk-region', though
-changing only the `:weight' and/or `:slant' is recommended for that
-face."
-  (magit-diff--make-hunk-overlay (magit-diff-hunk-region-beginning)
-                                 (1+ (magit-diff-hunk-region-end))
-                                 'font-lock-face 'magit-diff-hunk-region))
-
-(defun magit-diff-highlight-hunk-region-using-overlays (section)
-  "Emphasize the hunk-internal region using delimiting horizontal lines.
-This is implemented as single-pixel newlines places inside overlays."
-  (if (window-system)
-      (let ((beg (magit-diff-hunk-region-beginning))
-            (end (magit-diff-hunk-region-end))
-            (str (propertize
-                  (concat (propertize "\s" 'display '(space :height (1)))
-                          (propertize "\n" 'line-height t))
-                  'font-lock-face 'magit-diff-lines-boundary)))
-        (magit-diff--make-hunk-overlay beg (1+ beg) 'before-string str)
-        (magit-diff--make-hunk-overlay end (1+ end) 'after-string  str))
-    (magit-diff-highlight-hunk-region-using-face section)))
-
-(defun magit-diff-highlight-hunk-region-using-underline (section)
-  "Emphasize the hunk-internal region using delimiting horizontal lines.
-This is implemented by overlining and underlining the first and
-last (visual) lines of the region."
-  (if (window-system)
-      (let* ((beg (magit-diff-hunk-region-beginning))
-             (end (magit-diff-hunk-region-end))
-             (beg-eol (save-excursion (goto-char beg)
-                                      (end-of-visual-line)
-                                      (point)))
-             (end-bol (save-excursion (goto-char end)
-                                      (beginning-of-visual-line)
-                                      (point)))
-             (color (face-background 'magit-diff-lines-boundary nil t)))
-        (cl-flet ((ln (b e &rest face)
-                    (magit-diff--make-hunk-overlay
-                     b e 'font-lock-face face 'after-string
-                     (magit-diff--hunk-after-string face))))
-          (if (= beg end-bol)
-              (ln beg beg-eol :overline color :underline color)
-            (ln beg beg-eol :overline color)
-            (ln end-bol end :underline color))))
-    (magit-diff-highlight-hunk-region-using-face section)))
-
-(defun magit-diff--make-hunk-overlay (start end &rest args)
-  (let ((ov (make-overlay start end nil t)))
-    (overlay-put ov 'evaporate t)
-    (while args (overlay-put ov (pop args) (pop args)))
-    (push ov magit-section--region-overlays)
-    ov))
-
-(defun magit-diff--hunk-after-string (face)
-  (propertize "\s"
-              'font-lock-face face
-              'display (list 'space :align-to
-                             `(+ (0 . right)
-                                 ,(min (window-hscroll)
-                                       (- (line-end-position)
-                                          (line-beginning-position)))))
-              ;; This prevents the cursor from being rendered at the
-              ;; edge of the window.
-              'cursor t))
-
-;;; Utilities
-
-(defun magit-diff-inside-hunk-body-p ()
-  "Return non-nil if point is inside the body of a hunk."
-  (and (magit-section-match 'hunk)
-       (and-let* ((content (oref (magit-current-section) content)))
-         (> (magit-point) content))))
-
-(defun magit-diff--combined-p (section)
-  (cl-assert (cl-typep section 'magit-file-section))
-  (string-match-p "\\`diff --\\(combined\\|cc\\)" (oref section value)))
-
-;;; Diff Extract
-
-(defun magit-diff-file-header (section &optional no-rename)
-  (when (magit-hunk-section-p section)
-    (setq section (oref section parent)))
-  (and (magit-file-section-p section)
-       (let ((header (oref section header)))
-         (if no-rename
-             (replace-regexp-in-string
-              "^--- \\(.+\\)" (oref section value) header t t 1)
-           header))))
-
-(defun magit-diff-hunk-region-header (section)
-  (let ((patch (magit-diff-hunk-region-patch section)))
-    (string-match "\n" patch)
-    (substring patch 0 (1- (match-end 0)))))
-
-(defun magit-diff-hunk-region-patch (section &optional args)
-  (let ((op (if (member "--reverse" args) "+" "-"))
-        (sbeg (oref section start))
-        (rbeg (magit-diff-hunk-region-beginning))
-        (rend (region-end))
-        (send (oref section end))
-        (patch nil))
-    (save-excursion
-      (goto-char sbeg)
-      (while (< (point) send)
-        (looking-at "\\(.\\)\\([^\n]*\n\\)")
-        (cond ((or (string-match-p "[@ ]" (match-string-no-properties 1))
-                   (and (>= (point) rbeg)
-                        (<= (point) rend)))
-               (push (match-string-no-properties 0) patch))
-              ((equal op (match-string-no-properties 1))
-               (push (concat " " (match-string-no-properties 2)) patch)))
-        (forward-line)))
-    (let ((buffer-list-update-hook nil)) ; #3759
-      (with-temp-buffer
-        (insert (mapconcat #'identity (reverse patch) ""))
-        (diff-fixup-modifs (point-min) (point-max))
-        (setq patch (buffer-string))))
-    patch))
-
-;;; _
-(provide 'magit-diff)
-;;; magit-diff.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-diff.elc b/emacs/elpa/magit-20240426.2118/magit-diff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-extras.el b/emacs/elpa/magit-20240426.2118/magit-extras.el
@@ -1,919 +0,0 @@
-;;; magit-extras.el --- Additional functionality 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:
-
-;; Additional functionality for Magit.
-
-;;; Code:
-
-(require 'magit)
-
-;; For `magit-do-async-shell-command'.
-(declare-function dired-read-shell-command "dired-aux" (prompt arg files))
-;; For `magit-project-status'.
-(declare-function vc-git-command "vc-git"
-                  (buffer okstatus file-or-list &rest flags))
-
-(defvar ido-exit)
-(defvar ido-fallback)
-(defvar project-prefix-map)
-(defvar project-switch-commands)
-
-(defgroup magit-extras nil
-  "Additional functionality for Magit."
-  :group 'magit-extensions)
-
-;;; Git Tools
-;;;; Git-Mergetool
-
-;;;###autoload (autoload 'magit-git-mergetool "magit-extras" nil t)
-(transient-define-prefix magit-git-mergetool (file args &optional transient)
-  "Resolve conflicts in FILE using \"git mergetool --gui\".
-With a prefix argument allow changing ARGS using a transient
-popup.  See info node `(magit) Ediffing' for information about
-alternative commands."
-  :man-page "git-mergetool"
-  ["Settings"
-   ("-t" magit-git-mergetool:--tool)
-   ("=t" magit-merge.guitool)
-   ("=T" magit-merge.tool)
-   ("-r" magit-mergetool.hideResolved)
-   ("-b" magit-mergetool.keepBackup)
-   ("-k" magit-mergetool.keepTemporaries)
-   ("-w" magit-mergetool.writeToTemp)]
-  ["Actions"
-   (" m" "Invoke mergetool" magit-git-mergetool)]
-  (interactive
-   (if (and (not (eq transient-current-prefix 'magit-git-mergetool))
-            current-prefix-arg)
-       (list nil nil t)
-     (list (magit-read-unmerged-file "Resolve")
-           (transient-args 'magit-git-mergetool))))
-  (if transient
-      (transient-setup 'magit-git-mergetool)
-    (magit-run-git-async "mergetool" "--gui" args "--" file)))
-
-(transient-define-infix magit-git-mergetool:--tool ()
-  :description "Override mergetool"
-  :class 'transient-option
-  :shortarg "-t"
-  :argument "--tool="
-  :reader #'magit--read-mergetool)
-
-(transient-define-infix magit-merge.guitool ()
-  :class 'magit--git-variable
-  :variable "merge.guitool"
-  :global t
-  :reader #'magit--read-mergetool)
-
-(transient-define-infix magit-merge.tool ()
-  :class 'magit--git-variable
-  :variable "merge.tool"
-  :global t
-  :reader #'magit--read-mergetool)
-
-(defun magit--read-mergetool (prompt _initial-input history)
-  (let ((choices nil)
-        (lines (cdr (magit-git-lines "mergetool" "--tool-help"))))
-    (while (string-prefix-p "\t\t" (car lines))
-      (push (substring (pop lines) 2) choices))
-    (setq choices (nreverse choices))
-    (magit-completing-read (or prompt "Select mergetool")
-                           choices nil t nil history)))
-
-(transient-define-infix magit-mergetool.hideResolved ()
-  :class 'magit--git-variable:boolean
-  :variable "mergetool.hideResolved"
-  :default "false"
-  :global t)
-
-(transient-define-infix magit-mergetool.keepBackup ()
-  :class 'magit--git-variable:boolean
-  :variable "mergetool.keepBackup"
-  :default "true"
-  :global t)
-
-(transient-define-infix magit-mergetool.keepTemporaries ()
-  :class 'magit--git-variable:boolean
-  :variable "mergetool.keepTemporaries"
-  :default "false"
-  :global t)
-
-(transient-define-infix magit-mergetool.writeToTemp ()
-  :class 'magit--git-variable:boolean
-  :variable "mergetool.writeToTemp"
-  :default "false"
-  :global t)
-
-;;;; Git-Gui
-
-;;;###autoload
-(defun magit-run-git-gui-blame (commit filename &optional linenum)
-  "Run `git gui blame' on the given FILENAME and COMMIT.
-Interactively run it for the current file and the `HEAD', with a
-prefix or when the current file cannot be determined let the user
-choose.  When the current buffer is visiting FILENAME instruct
-blame to center around the line point is on."
-  (interactive
-   (let (revision filename)
-     (when (or current-prefix-arg
-               (progn
-                 (setq revision "HEAD")
-                 (not (setq filename (magit-file-relative-name nil 'tracked)))))
-       (setq revision (magit-read-branch-or-commit "Blame from revision"))
-       (setq filename (magit-read-file-from-rev revision "Blame file")))
-     (list revision filename
-           (and (equal filename
-                       (ignore-errors
-                         (magit-file-relative-name buffer-file-name)))
-                (line-number-at-pos)))))
-  (magit-with-toplevel
-    (magit-process-git 0 "gui" "blame"
-                       (and linenum (list (format "--line=%d" linenum)))
-                       commit
-                       filename)))
-
-;;;; Gitk
-
-(defcustom magit-gitk-executable
-  (or (and (eq system-type 'windows-nt)
-           (let ((exe (magit-git-string
-                       "-c" "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
-                       "X" "gitk.exe")))
-             (and exe (file-executable-p exe) exe)))
-      (executable-find "gitk") "gitk")
-  "The Gitk executable."
-  :group 'magit-extras
-  :set-after '(magit-git-executable)
-  :type 'string)
-
-;;;###autoload
-(defun magit-run-git-gui ()
-  "Run `git gui' for the current git repository."
-  (interactive)
-  (magit-with-toplevel (magit-process-git 0 "gui")))
-
-;;;###autoload
-(defun magit-run-gitk ()
-  "Run `gitk' in the current repository."
-  (interactive)
-  (magit-process-file magit-gitk-executable nil 0))
-
-;;;###autoload
-(defun magit-run-gitk-branches ()
-  "Run `gitk --branches' in the current repository."
-  (interactive)
-  (magit-process-file magit-gitk-executable nil 0 nil "--branches"))
-
-;;;###autoload
-(defun magit-run-gitk-all ()
-  "Run `gitk --all' in the current repository."
-  (interactive)
-  (magit-process-file magit-gitk-executable nil 0 nil "--all"))
-
-;;; Emacs Tools
-
-;;;###autoload
-(defun ido-enter-magit-status ()
-  "Drop into `magit-status' from file switching.
-
-This command does not work in Emacs 26.1.
-See https://github.com/magit/magit/issues/3634
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707.
-
-To make this command available use something like:
-
-  (add-hook \\='ido-setup-hook
-            (lambda ()
-              (keymap-set ido-completion-map
-                          \"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:
-
-  (keymap-set ido-common-completion-map
-              \"C-x g\" \\='ido-enter-magit-status)"
-  (interactive)
-  (setq ido-exit 'fallback)
-  (setq ido-fallback #'magit-status)                ; for Emacs >= 26.2
-  (with-no-warnings (setq fallback #'magit-status)) ; for Emacs 25
-  (exit-minibuffer))
-
-;;;###autoload
-(defun magit-project-status ()
-  "Run `magit-status' in the current project's root."
-  (interactive)
-  (if (fboundp 'project-root)
-      (magit-status-setup-buffer (project-root (project-current t)))
-    (user-error "`magit-project-status' requires `project' 0.3.0 or greater")))
-
-(defvar magit-bind-magit-project-status t
-  "Whether to bind \"m\" to `magit-project-status' in `project-prefix-map'.
-If so, then an entry is added to `project-switch-commands' as
-well.  If you want to use another key, then you must set this
-to nil before loading Magit to prevent \"m\" from being bound.")
-
-(with-eval-after-load 'project
-  ;; Only more recent versions of project.el have `project-prefix-map' and
-  ;; `project-switch-commands', though project.el is available in Emacs 25.
-  (when (and magit-bind-magit-project-status
-             (boundp 'project-prefix-map)
-             ;; Only modify if it hasn't already been modified.
-             (equal project-switch-commands
-                    (eval (car (get 'project-switch-commands 'standard-value))
-                          t)))
-    (keymap-set project-prefix-map "m" #'magit-project-status)
-    (add-to-list 'project-switch-commands '(magit-project-status "Magit") t)))
-
-;;;###autoload
-(defun magit-dired-jump (&optional other-window)
-  "Visit file at point using Dired.
-With a prefix argument, visit in another window.  If there
-is no file at point, then instead visit `default-directory'."
-  (interactive "P")
-  (dired-jump other-window
-              (and-let* ((file (magit-file-at-point)))
-                (expand-file-name (if (file-directory-p file)
-                                      (file-name-as-directory file)
-                                    file)))))
-
-;;;###autoload
-(defun magit-dired-log (&optional follow)
-  "Show log for all marked files, or the current file."
-  (interactive "P")
-  (if-let ((topdir (magit-toplevel default-directory)))
-      (let ((args (car (magit-log-arguments)))
-            (files (dired-get-marked-files nil nil #'magit-file-tracked-p)))
-        (unless files
-          (user-error "No marked file is being tracked by Git"))
-        (when (and follow
-                   (not (member "--follow" args))
-                   (not (cdr files)))
-          (push "--follow" args))
-        (magit-log-setup-buffer
-         (list (or (magit-get-current-branch) "HEAD"))
-         args
-         (let ((default-directory topdir))
-           (mapcar #'file-relative-name files))
-         magit-log-buffer-file-locked))
-    (magit--not-inside-repository-error)))
-
-;;;###autoload
-(defun magit-dired-am-apply-patches (repo &optional arg)
-  "In Dired, apply the marked (or next ARG) files as patches.
-If inside a repository, then apply in that.  Otherwise prompt
-for a repository."
-  (interactive (list (or (magit-toplevel)
-                         (magit-read-repository t))
-                     current-prefix-arg))
-  ;; Note: The ERROR argument of `dired-get-marked-files' isn't
-  ;; available until Emacs 27.
-  (let ((files (or (dired-get-marked-files nil arg)
-                   (user-error "No files specified"))))
-    (magit-status-setup-buffer repo)
-    (magit-am-apply-patches files)))
-
-;;;###autoload
-(defun magit-do-async-shell-command (file)
-  "Open FILE with `dired-do-async-shell-command'.
-Interactively, open the file at point."
-  (interactive (list (or (magit-file-at-point)
-                         (magit-read-file "Act on file"))))
-  (require 'dired-aux)
-  (dired-do-async-shell-command
-   (dired-read-shell-command "& on %s: " current-prefix-arg (list file))
-   nil (list file)))
-
-;;; Shift Selection
-
-(defun magit--turn-on-shift-select-mode-p ()
-  (and shift-select-mode
-       this-command-keys-shift-translated
-       (not mark-active)
-       (not (eq (car-safe transient-mark-mode) 'only))))
-
-;;;###autoload
-(defun magit-previous-line (&optional arg try-vscroll)
-  "Like `previous-line' but with Magit-specific shift-selection.
-
-Magit's selection mechanism is based on the region but selects an
-area that is larger than the region.  This causes `previous-line'
-when invoked while holding the shift key to move up one line and
-thereby select two lines.  When invoked inside a hunk body this
-command does not move point on the first invocation and thereby
-it only selects a single line.  Which inconsistency you prefer
-is a matter of preference."
-  (declare (interactive-only
-            "use `forward-line' with negative argument instead."))
-  (interactive "p\np")
-  (unless arg (setq arg 1))
-  (let ((stay (or (magit-diff-inside-hunk-body-p)
-                  (magit-section-position-in-heading-p))))
-    (if (and stay (= arg 1) (magit--turn-on-shift-select-mode-p))
-        (push-mark nil nil t)
-      (with-no-warnings
-        (handle-shift-selection)
-        (previous-line (if stay (max (1- arg) 1) arg) try-vscroll)))))
-
-;;;###autoload
-(defun magit-next-line (&optional arg try-vscroll)
-  "Like `next-line' but with Magit-specific shift-selection.
-
-Magit's selection mechanism is based on the region but selects
-an area that is larger than the region.  This causes `next-line'
-when invoked while holding the shift key to move down one line
-and thereby select two lines.  When invoked inside a hunk body
-this command does not move point on the first invocation and
-thereby it only selects a single line.  Which inconsistency you
-prefer is a matter of preference."
-  (declare (interactive-only forward-line))
-  (interactive "p\np")
-  (unless arg (setq arg 1))
-  (let ((stay (or (magit-diff-inside-hunk-body-p)
-                  (magit-section-position-in-heading-p))))
-    (if (and stay (= arg 1) (magit--turn-on-shift-select-mode-p))
-        (push-mark nil nil t)
-      (with-no-warnings
-        (handle-shift-selection)
-        (next-line (if stay (max (1- arg) 1) arg) try-vscroll)))))
-
-;;; Clean
-
-;;;###autoload
-(defun magit-clean (&optional arg)
-  "Remove untracked files from the working tree.
-With a prefix argument also remove ignored files,
-with two prefix arguments remove ignored files only.
-\n(git clean -f -d [-x|-X])"
-  (interactive "p")
-  (when (yes-or-no-p (format "Remove %s files? "
-                             (pcase arg
-                               (1 "untracked")
-                               (4 "untracked and ignored")
-                               (_ "ignored"))))
-    (magit-wip-commit-before-change)
-    (magit-run-git "clean" "-f" "-d" (pcase arg (4 "-x") (16 "-X")))))
-
-(put 'magit-clean 'disabled t)
-
-;;; ChangeLog
-
-;;;###autoload
-(defun magit-generate-changelog (&optional amending)
-  "Insert ChangeLog entries into the current buffer.
-
-The entries are generated from the diff being committed.
-If prefix argument, AMENDING, is non-nil, include changes
-in HEAD as well as staged changes in the diff to check."
-  (interactive "P")
-  (unless (magit-commit-message-buffer)
-    (user-error "No commit in progress"))
-  (require 'diff-mode) ; `diff-add-log-current-defuns'.
-  (require 'vc-git)    ; `vc-git-diff'.
-  (require 'add-log)   ; `change-log-insert-entries'.
-  (cond
-   ((and (fboundp 'change-log-insert-entries)
-         (fboundp 'diff-add-log-current-defuns))
-    (setq default-directory
-          (if (and (file-regular-p "gitdir")
-                   (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
-                   (magit-git-true "rev-parse" "--is-inside-git-dir"))
-              (file-name-directory (magit-file-line "gitdir"))
-            (magit-toplevel)))
-    (let ((rev1 (if amending "HEAD^1" "HEAD"))
-          (rev2 nil))
-      ;; Magit may have updated the files without notifying vc, but
-      ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
-      (mapc #'vc-file-clearprops (magit-staged-files))
-      (change-log-insert-entries
-       (with-temp-buffer
-         (vc-git-command (current-buffer) 1 nil
-                         "diff-index" "--exit-code" "--patch"
-                         (and (magit-anything-staged-p) "--cached")
-                         rev1 "--")
-         ;; `diff-find-source-location' consults these vars.
-         (defvar diff-vc-revisions)
-         (setq-local diff-vc-revisions (list rev1 rev2))
-         (setq-local diff-vc-backend 'Git)
-         (diff-add-log-current-defuns)))))
-   (t (user-error "`magit-generate-changelog' requires Emacs 27 or greater"))))
-
-;;;###autoload
-(defun magit-add-change-log-entry (&optional whoami file-name other-window)
-  "Find change log file and add date entry and item for current change.
-This differs from `add-change-log-entry' (which see) in that
-it acts on the current hunk in a Magit buffer instead of on
-a position in a file-visiting buffer."
-  (interactive (list current-prefix-arg
-                     (prompt-for-change-log-name)))
-  (pcase-let ((`(,buf ,pos) (magit-diff-visit-file--noselect)))
-    (magit--with-temp-position buf pos
-      (let ((add-log-buffer-file-name-function
-             (lambda ()
-               (or magit-buffer-file-name
-                   (buffer-file-name)))))
-        (add-change-log-entry whoami file-name other-window)))))
-
-;;;###autoload
-(defun magit-add-change-log-entry-other-window (&optional whoami file-name)
-  "Find change log file in other window and add entry and item.
-This differs from `add-change-log-entry-other-window' (which see)
-in that it acts on the current hunk in a Magit buffer instead of
-on a position in a file-visiting buffer."
-  (interactive (and current-prefix-arg
-                    (list current-prefix-arg
-                          (prompt-for-change-log-name))))
-  (magit-add-change-log-entry whoami file-name t))
-
-;;; Edit Line Commit
-
-;;;###autoload
-(defun magit-edit-line-commit (&optional type)
-  "Edit the commit that added the current line.
-
-With a prefix argument edit the commit 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."
-  (interactive (list (and current-prefix-arg 'removal)))
-  (let* ((chunk (magit-current-blame-chunk (or type 'addition)))
-         (rev   (oref chunk orig-rev)))
-    (if (string-match-p "\\`0\\{40,\\}\\'" rev)
-        (message "This line has not been committed yet")
-      (let ((rebase (magit-rev-ancestor-p rev "HEAD"))
-            (file   (expand-file-name (oref chunk orig-file)
-                                      (magit-toplevel))))
-        (if rebase
-            (let ((magit--rebase-published-symbol 'edit-published))
-              (magit-rebase-edit-commit rev (magit-rebase-arguments)))
-          (magit--checkout (or (magit-rev-branch rev) rev)))
-        (unless (and buffer-file-name
-                     (file-equal-p file buffer-file-name))
-          (let ((blame-type (and magit-blame-mode magit-blame-type)))
-            (if rebase
-                (set-process-sentinel
-                 magit-this-process
-                 (lambda (process event)
-                   (magit-sequencer-process-sentinel process event)
-                   (when (eq (process-status process) 'exit)
-                     (find-file file)
-                     (when blame-type
-                       (magit-blame--pre-blame-setup blame-type)
-                       (magit-blame--run (magit-blame-arguments))))))
-              (find-file file)
-              (when blame-type
-                (magit-blame--pre-blame-setup blame-type)
-                (magit-blame--run (magit-blame-arguments))))))))))
-
-(put 'magit-edit-line-commit 'disabled t)
-
-;;;###autoload
-(defun magit-diff-edit-hunk-commit (file)
-  "From a hunk, edit the respective commit and visit the file.
-
-First visit 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 invoke `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."
-  (interactive (list (magit-file-at-point t t)))
-  (let ((magit-diff-visit-previous-blob nil))
-    (with-current-buffer
-        (magit-diff-visit-file--internal file nil #'pop-to-buffer-same-window)
-      (magit-edit-line-commit))))
-
-(put 'magit-diff-edit-hunk-commit 'disabled t)
-
-;;; Reshelve
-
-(defcustom magit-reshelve-since-committer-only nil
-  "Whether `magit-reshelve-since' changes only the committer dates.
-Otherwise the author dates are also changed."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-commands
-  :type 'boolean)
-
-;;;###autoload
-(defun magit-reshelve-since (rev keyid)
-  "Change the author and committer dates of the commits since REV.
-
-Ask the user for the first reachable commit whose dates should
-be changed.  Then read the new date for that commit.  The initial
-minibuffer input and the previous history element offer good
-values.  The next commit will be created one minute later and so
-on.
-
-This command is only intended for interactive use and should only
-be used on highly rearranged and unpublished history.
-
-If KEYID is non-nil, then use that to sign all reshelved commits.
-Interactively use the value of the \"--gpg-sign\" option in the
-list returned by `magit-rebase-arguments'."
-  (interactive (list nil
-                     (transient-arg-value "--gpg-sign="
-                                          (magit-rebase-arguments))))
-  (let* ((current (or (magit-get-current-branch)
-                      (user-error "Refusing to reshelve detached head")))
-         (backup (concat "refs/original/refs/heads/" current)))
-    (cond
-     ((not rev)
-      (when (and (magit-ref-p backup)
-                 (not (magit-y-or-n-p
-                       (format "Backup ref %s already exists.  Override? " backup))))
-        (user-error "Abort"))
-      (magit-log-select
-        (lambda (rev)
-          (magit-reshelve-since rev keyid))
-        "Type %p on a commit to reshelve it and the commits above it,"))
-     (t
-      (cl-flet ((adjust (time offset)
-                  (format-time-string
-                   "%F %T %z"
-                   (+ (floor time)
-                      (* offset 60)
-                      (- (car (decode-time time)))))))
-        (let* ((start (concat rev "^"))
-               (range (concat start ".." current))
-               (time-rev (adjust (float-time (string-to-number
-                                              (magit-rev-format "%at" start)))
-                                 1))
-               (time-now (adjust (float-time)
-                                 (- (string-to-number
-                                     (magit-git-string "rev-list" "--count"
-                                                       range))))))
-          (push time-rev magit--reshelve-history)
-          (let ((date (floor
-                       (float-time
-                        (date-to-time
-                         (read-string "Date for first commit: "
-                                      time-now 'magit--reshelve-history))))))
-            (with-environment-variables (("FILTER_BRANCH_SQUELCH_WARNING" "1"))
-              (magit-with-toplevel
-                (magit-run-git-async
-                 "filter-branch" "--force" "--env-filter"
-                 (format
-                  "case $GIT_COMMIT in %s\nesac"
-                  (mapconcat
-                   (lambda (rev)
-                     (prog1
-                         (concat
-                          (format "%s) " rev)
-                          (and (not magit-reshelve-since-committer-only)
-                               (format "export GIT_AUTHOR_DATE=\"%s\"; " date))
-                          (format "export GIT_COMMITTER_DATE=\"%s\";;" date))
-                       (cl-incf date 60)))
-                   (magit-git-lines "rev-list" "--reverse" range)
-                   " "))
-                 (and keyid
-                      (list "--commit-filter"
-                            (format "git commit-tree --gpg-sign=%s \"$@\";"
-                                    keyid)))
-                 range "--"))
-              (set-process-sentinel
-               magit-this-process
-               (lambda (process event)
-                 (when (memq (process-status process) '(exit signal))
-                   (if (> (process-exit-status process) 0)
-                       (magit-process-sentinel process event)
-                     (process-put process 'inhibit-refresh t)
-                     (magit-process-sentinel process event)
-                     (magit-run-git "update-ref" "-d" backup)))))))))))))
-
-;;; Revision Stack
-
-(defvar magit-revision-stack nil)
-
-(defcustom magit-pop-revision-stack-format
-  '("[%N: %h] "
-    "%N: %cs %H\n   %s\n"
-    "\\[\\([0-9]+\\)[]:]")
-  "Control how `magit-pop-revision-stack' inserts a revision.
-
-The command `magit-pop-revision-stack' inserts a representation
-of the revision last pushed to the `magit-revision-stack' into
-the current buffer.  It inserts text at point and/or near the end
-of the buffer, and removes the consumed revision from the stack.
-
-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)."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-commands
-  :type '(list (choice (string :tag "Insert at point format")
-                       (cons (string :tag "Insert at point format")
-                             (repeat (string :tag "Argument to git show")))
-                       (const :tag "Don't insert at point" nil))
-               (choice (string :tag "Insert at eob format")
-                       (cons (string :tag "Insert at eob format")
-                             (repeat (string :tag "Argument to git show")))
-                       (const :tag "Don't insert at eob" nil))
-               (choice (regexp :tag "Find index regexp")
-                       (const :tag "Don't number entries" nil))))
-
-(defcustom magit-copy-revision-abbreviated nil
-  "Whether to save abbreviated revision to `kill-ring' and `magit-revision-stack'."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-miscellaneous
-  :type 'boolean)
-
-;;;###autoload
-(defun magit-pop-revision-stack (rev toplevel)
-  "Insert a representation of a revision into the current buffer.
-
-Pop a revision from the `magit-revision-stack' and insert 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, instead read 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."
-  (interactive
-   (if (or current-prefix-arg (not magit-revision-stack))
-       (let ((default-directory
-              (or (and (not (= (prefix-numeric-value current-prefix-arg) 16))
-                       (or (magit-toplevel)
-                           (cadr (car magit-revision-stack))))
-                  (magit-read-repository))))
-         (list (magit-read-branch-or-commit "Insert revision")
-               default-directory))
-     (push (caar magit-revision-stack) magit-revision-history)
-     (pop magit-revision-stack)))
-  (if rev
-      (pcase-let ((`(,pnt-format ,eob-format ,idx-format)
-                   magit-pop-revision-stack-format))
-        (let ((default-directory toplevel)
-              (idx (and idx-format
-                        (save-excursion
-                          (if (re-search-backward idx-format nil t)
-                              (number-to-string
-                               (1+ (string-to-number (match-string 1))))
-                            "1"))))
-              pnt-args eob-args)
-          (when (listp pnt-format)
-            (setq pnt-args (cdr pnt-format))
-            (setq pnt-format (car pnt-format)))
-          (when (listp eob-format)
-            (setq eob-args (cdr eob-format))
-            (setq eob-format (car eob-format)))
-          (when pnt-format
-            (when idx-format
-              (setq pnt-format
-                    (string-replace "%N" idx pnt-format)))
-            (magit-rev-insert-format pnt-format rev pnt-args)
-            (delete-char -1))
-          (when eob-format
-            (when idx-format
-              (setq eob-format
-                    (string-replace "%N" idx eob-format)))
-            (save-excursion
-              (goto-char (point-max))
-              (skip-syntax-backward ">-")
-              (beginning-of-line)
-              (if (and comment-start (looking-at comment-start))
-                  (while (looking-at comment-start)
-                    (forward-line -1))
-                (forward-line)
-                (unless (= (current-column) 0)
-                  (insert ?\n)))
-              (insert ?\n)
-              (magit-rev-insert-format eob-format rev eob-args)
-              (delete-char -1)))))
-    (user-error "Revision stack is empty")))
-
-(keymap-set git-commit-mode-map "C-c C-w" #'magit-pop-revision-stack)
-
-;;;###autoload
-(defun magit-copy-section-value (arg)
-  "Save the value of the current section for later use.
-
-Save the section value to the `kill-ring', and, provided that
-the current section is a commit, branch, or tag section, push
-the (referenced) revision to the `magit-revision-stack' for use
-with `magit-pop-revision-stack'.
-
-When `magit-copy-revision-abbreviated' is non-nil, save the
-abbreviated revision to the `kill-ring' and the
-`magit-revision-stack'.
-
-When the current section is a branch or a tag, and a prefix
-argument is used, then save the revision at its tip to the
-`kill-ring' instead of the reference name.
-
-When the region is active, then save 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 strip the diff marker column and keep only either
-the added or removed lines, depending on the sign of the prefix
-argument."
-  (interactive "P")
-  (cond
-   ((and arg
-         (magit-section-internal-region-p)
-         (magit-section-match 'hunk))
-    (kill-new
-     (thread-last (buffer-substring-no-properties
-                   (region-beginning)
-                   (region-end))
-       (replace-regexp-in-string
-        (format "^\\%c.*\n?" (if (< (prefix-numeric-value arg) 0) ?+ ?-))
-        "")
-       (replace-regexp-in-string "^[ +-]" "")))
-    (deactivate-mark))
-   ((use-region-p)
-    (call-interactively #'copy-region-as-kill))
-   (t
-    (when-let* ((section (magit-current-section))
-                (value (oref section value)))
-      (magit-section-case
-        ((branch commit module-commit tag)
-         (let ((default-directory default-directory) ref)
-           (magit-section-case
-             ((branch tag)
-              (setq ref value))
-             (module-commit
-              (setq default-directory
-                    (file-name-as-directory
-                     (expand-file-name (magit-section-parent-value section)
-                                       (magit-toplevel))))))
-           (setq value (magit-rev-parse
-                        (and magit-copy-revision-abbreviated "--short")
-                        value))
-           (push (list value default-directory) magit-revision-stack)
-           (kill-new (message "%s" (or (and current-prefix-arg ref)
-                                       value)))))
-        (t (kill-new (message "%s" value))))))))
-
-;;;###autoload
-(defun magit-copy-buffer-revision ()
-  "Save the revision of the current buffer for later use.
-
-Save the revision shown in the current buffer to the `kill-ring'
-and push it to the `magit-revision-stack'.
-
-This command 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.
-
-In such buffers it is often more useful to save the value of
-the current section instead, using `magit-copy-section-value'.
-
-When the region is active, then save that to the `kill-ring',
-like `kill-ring-save' would, instead of behaving as described
-above.
-
-When `magit-copy-revision-abbreviated' is non-nil, save the
-abbreviated revision to the `kill-ring' and the
-`magit-revision-stack'."
-  (interactive)
-  (if (use-region-p)
-      (call-interactively #'copy-region-as-kill)
-    (when-let ((rev (or magit-buffer-revision
-                        (cl-case major-mode
-                          (magit-diff-mode
-                           (if (string-match "\\.\\.\\.?\\(.+\\)"
-                                             magit-buffer-range)
-                               (match-string 1 magit-buffer-range)
-                             magit-buffer-range))
-                          (magit-status-mode "HEAD")))))
-      (when (magit-commit-p rev)
-        (setq rev (magit-rev-parse
-                   (and magit-copy-revision-abbreviated "--short")
-                   rev))
-        (push (list rev default-directory) magit-revision-stack)
-        (kill-new (message "%s" rev))))))
-
-;;; Buffer Switching
-
-;;;###autoload
-(defun magit-display-repository-buffer (buffer)
-  "Display a Magit buffer belonging to the current Git repository.
-The buffer is displayed using `magit-display-buffer', which see."
-  (interactive (list (magit--read-repository-buffer
-                      "Display magit buffer: ")))
-  (magit-display-buffer (get-buffer buffer)))
-
-;;;###autoload
-(defun magit-switch-to-repository-buffer (buffer)
-  "Switch to a Magit buffer belonging to the current Git repository."
-  (interactive (list (magit--read-repository-buffer
-                      "Switch to magit buffer: ")))
-  (switch-to-buffer buffer))
-
-;;;###autoload
-(defun magit-switch-to-repository-buffer-other-window (buffer)
-  "Switch to a Magit buffer belonging to the current Git repository."
-  (interactive (list (magit--read-repository-buffer
-                      "Switch to magit buffer in another window: ")))
-  (switch-to-buffer-other-window buffer))
-
-;;;###autoload
-(defun magit-switch-to-repository-buffer-other-frame (buffer)
-  "Switch to a Magit buffer belonging to the current Git repository."
-  (interactive (list (magit--read-repository-buffer
-                      "Switch to magit buffer in another frame: ")))
-  (switch-to-buffer-other-frame buffer))
-
-(defun magit--read-repository-buffer (prompt)
-  (if-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
-      (read-buffer
-       prompt (magit-get-mode-buffer 'magit-status-mode) t
-       (pcase-lambda (`(,_ . ,buf))
-         (and buf
-              (with-current-buffer buf
-                (and (or (derived-mode-p 'magit-mode
-                                         'magit-repolist-mode
-                                         'magit-submodule-list-mode
-                                         'git-rebase-mode)
-                         (and buffer-file-name
-                              (string-match-p git-commit-filename-regexp
-                                              buffer-file-name)))
-                     (equal (magit-rev-parse-safe "--show-toplevel")
-                            topdir))))))
-    (user-error "Not inside a Git repository")))
-
-;;; Miscellaneous
-
-;;;###autoload
-(defun magit-abort-dwim ()
-  "Abort current operation.
-Depending on the context, this will abort a merge, a rebase, a
-patch application, a cherry-pick, a revert, or a bisect."
-  (interactive)
-  (cond ((magit-merge-in-progress-p)     (magit-merge-abort))
-        ((magit-rebase-in-progress-p)    (magit-rebase-abort))
-        ((magit-am-in-progress-p)        (magit-am-abort))
-        ((magit-sequencer-in-progress-p) (magit-sequencer-abort))
-        ((magit-bisect-in-progress-p)    (magit-bisect-reset))))
-
-;;; _
-(provide 'magit-extras)
-;;; magit-extras.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-extras.elc b/emacs/elpa/magit-20240426.2118/magit-extras.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-git.el b/emacs/elpa/magit-20240426.2118/magit-git.el
@@ -1,2901 +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))
-
-;;; Git implementations
-
-(defvar magit-inhibit-libgit t
-  "Whether to inhibit the use of libgit.
-Use of libgit is inhibited by default because support for libgit
-in magit is only a stub for now.  There is no benefit in using
-it.")
-
-(defvar magit--libgit-available-p 'unknown
-  "Whether libgit is available.
-Use the function by the same name instead of this variable.")
-
-(defun magit--libgit-available-p ()
-  (if (eq magit--libgit-available-p 'unknown)
-      (setq magit--libgit-available-p
-            (and module-file-suffix
-                 (let ((libgit (locate-library "libgit")))
-                   (and libgit
-                        (or (locate-library "libegit2")
-                            (let ((load-path
-                                   (cons (expand-file-name
-                                          (convert-standard-filename "build")
-                                          (file-name-directory libgit))
-                                         load-path)))
-                              (locate-library "libegit2")))))))
-    magit--libgit-available-p))
-
-(defun magit-gitimpl ()
-  "Return the Git implementation used in this repository."
-  (if (and (not magit-inhibit-libgit)
-           (not (file-remote-p default-directory))
-           (magit--libgit-available-p))
-      'libgit
-    'git))
-
-;;; 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))))
-               (t (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 (mapconcat #'identity keys ".")))
-    (if (and magit--refresh-cache (not arg))
-        (magit-config-get-from-cached-list key)
-      (magit-git-items "config" arg "-z" "--get-all" 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 (mapconcat #'identity keys ".")))
-    (equal (if magit--refresh-cache
-               (car (last (magit-config-get-from-cached-list key)))
-             (magit-git-str "config" arg "--bool" 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 (mapconcat #'identity 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 (mapconcat #'identity 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
-  "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)
-               (t (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)
-  (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"
-                   (and nomodules "--ignore-submodules")
-                   (magit-headish) "--" files))
-
-(defun magit-unstaged-files (&optional nomodules files)
-  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=u"
-                   (and nomodules "--ignore-submodules")
-                   "--" files))
-
-(defun magit-staged-files (&optional nomodules files)
-  (magit-git-items "diff-index" "-z" "--name-only" "--cached"
-                   (and nomodules "--ignore-submodules")
-                   (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"
-                     (and ignore-submodules "--ignore-submodules")
-                     "--" 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"
-                     (and ignore-submodules "--ignore-submodules")
-                     "--" 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)
-        (t (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)))
-          (t (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/*")))
-    (progn ; work around debbugs#31840
-      (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 'magit-module-section)
-    (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 ; work around debbugs#31840
-      (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))))))
-        (mapconcat #'identity
-                   (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)))
-
-(defvar magit-tramp-process-environment nil)
-
-(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)))
-             (if (file-remote-p default-directory)
-                 (let ((magit-tramp-process-environment
-                        (cons (concat "GIT_INDEX_FILE=" ,file)
-                              magit-tramp-process-environment)))
-                   ,@body)
-               (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)
-  (let ((minibuffer-default-add-function (magit--minibuf-default-add-commit)))
-    (or (magit-completing-read prompt (magit-list-refnames nil t)
-                               nil nil nil 'magit-revision-history
-                               (or (magit-branch-or-commit-at-point)
-                                   secondary-default
-                                   (magit-get-current-branch)))
-        (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 ; work around debbugs#31840
-           (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
-                                    (concat remote "/" 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 'magit-module-section))
-      (when modules
-        (when predicate
-          (setq modules (seq-filter predicate modules)))
-        (unless modules
-          (user-error "No modules satisfying %s selected" predicate))))
-    (if (length> modules 1)
-        (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-20240426.2118/magit-git.elc b/emacs/elpa/magit-20240426.2118/magit-git.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-log.el b/emacs/elpa/magit-20240426.2118/magit-log.el
@@ -1,2017 +0,0 @@
-;;; magit-log.el --- Inspect Git history  -*- 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>
-
-;; 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 support for looking at Git logs, including
-;; special logs like cherry-logs, as well as for selecting a commit
-;; from a log.
-
-;;; Code:
-
-(require 'magit-core)
-(require 'magit-diff)
-
-(declare-function magit-blob-visit "magit-files" (blob-or-file))
-(declare-function magit-cherry-apply "magit-sequence" (commit &optional args))
-(declare-function magit-insert-head-branch-header "magit-status"
-                  (&optional branch))
-(declare-function magit-insert-upstream-branch-header "magit-status"
-                  (&optional branch pull keyword))
-(declare-function magit-read-file-from-rev "magit-files"
-                  (rev prompt &optional default))
-(declare-function magit-rebase--get-state-lines "magit-sequence"
-                  (file))
-(declare-function magit-show-commit "magit-diff"
-                  (arg1 &optional arg2 arg3 arg4))
-(declare-function magit-reflog-format-subject "magit-reflog" (subject))
-(defvar magit-refs-focus-column-width)
-(defvar magit-refs-margin)
-(defvar magit-refs-show-commit-count)
-(defvar magit-buffer-margin)
-(defvar magit-status-margin)
-(defvar magit-status-sections-hook)
-
-(require 'ansi-color)
-(require 'crm)
-(require 'which-func)
-
-;;; Options
-;;;; Log Mode
-
-(defgroup magit-log nil
-  "Inspect and manipulate Git history."
-  :link '(info-link "(magit)Logging")
-  :group 'magit-commands
-  :group 'magit-modes)
-
-(defcustom magit-log-mode-hook nil
-  "Hook run after entering Magit-Log mode."
-  :group 'magit-log
-  :type 'hook)
-
-(defcustom magit-log-remove-graph-args '("--follow" "--grep" "-G" "-S" "-L")
-  "The log arguments that cause the `--graph' argument to be dropped.
-
-The default value lists the arguments that are incompatible with
-`--graph' and therefore must be dropped when that is used.  You
-can add additional arguments that are available in `magit-log',
-but I recommend that you don't do that.  Nowadays I would define
-this as a constant, but I am preserving it as an option, in case
-someone actually customized it."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-log
-  :type '(repeat (string :tag "Argument"))
-  :options '("--follow" "--grep" "-G" "-S" "-L"))
-
-(defcustom magit-log-revision-headers-format "\
-%+b%+N
-Author:    %aN <%aE>
-Committer: %cN <%cE>"
-  "Additional format string used with the `++header' argument."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-log
-  :type 'string)
-
-(defcustom magit-log-auto-more nil
-  "Insert more log entries automatically when moving past the last entry.
-Only considered when moving past the last entry with
-`magit-goto-*-section' commands."
-  :group 'magit-log
-  :type 'boolean)
-
-(defcustom magit-log-margin '(t age magit-log-margin-width t 18)
-  "Format of the margin in `magit-log-mode' buffers.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-log
-  :group 'magit-margin
-  :type magit-log-margin--custom-type
-  :initialize #'magit-custom-initialize-reset
-  :set (apply-partially #'magit-margin-set-variable 'magit-log-mode))
-
-(defcustom magit-log-margin-show-committer-date nil
-  "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."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-log
-  :group 'magit-margin
-  :type 'boolean)
-
-(defcustom magit-log-show-refname-after-summary nil
-  "Whether to show refnames after commit summaries.
-This is useful if you use really long branch names."
-  :package-version '(magit . "2.2.0")
-  :group 'magit-log
-  :type 'boolean)
-
-(defcustom magit-log-highlight-keywords t
-  "Whether to highlight bracketed keywords in commit summaries."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-log
-  :type 'boolean)
-
-(defcustom magit-log-header-line-function #'magit-log-header-line-sentence
-  "Function used to generate text shown in header line of log buffers."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-log
-  :type '(choice (function-item magit-log-header-line-arguments)
-                 (function-item magit-log-header-line-sentence)
-                 function))
-
-(defcustom magit-log-trace-definition-function #'magit-which-function
-  "Function used to determine the function at point.
-This is used by the command `magit-log-trace-definition'.
-You should prefer `magit-which-function' over `which-function'
-because the latter may make use of Imenu's outdated cache."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-log
-  :type '(choice (function-item magit-which-function)
-                 (function-item which-function)
-                 (function-item add-log-current-defun)
-                 function))
-
-(defcustom magit-log-color-graph-limit 256
-  "Number of commits over which log graphs are not colored.
-When showing more commits than specified, then the `--color'
-argument is silently dropped.  This is necessary because the
-`ansi-color' library, which is used to turn control sequences
-into faces, is just too slow."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-log
-  :type 'number)
-
-(defcustom magit-log-show-signatures-limit 256
-  "Number of commits over which signatures are not verified.
-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."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-log
-  :type 'number)
-
-(defface magit-log-graph
-  '((((class color) (background light)) :foreground "grey30")
-    (((class color) (background  dark)) :foreground "grey80"))
-  "Face for the graph part of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-author
-  '((((class color) (background light))
-     :foreground "firebrick"
-     :slant normal
-     :weight normal)
-    (((class color) (background  dark))
-     :foreground "tomato"
-     :slant normal
-     :weight normal))
-  "Face for the author part of the log output."
-  :group 'magit-faces)
-
-(defface magit-log-date
-  '((((class color) (background light))
-     :foreground "grey30"
-     :slant normal
-     :weight normal)
-    (((class color) (background  dark))
-     :foreground "grey80"
-     :slant normal
-     :weight normal))
-  "Face for the date part of the log output."
-  :group 'magit-faces)
-
-(defface magit-header-line-log-select
-  '((t :inherit bold))
-  "Face for the `header-line' in `magit-log-select-mode'."
-  :group 'magit-faces)
-
-;;;; File Log
-
-(defcustom magit-log-buffer-file-locked t
-  "Whether `magit-log-buffer-file-quick' uses a dedicated buffer."
-  :package-version '(magit . "2.7.0")
-  :group 'magit-commands
-  :group 'magit-log
-  :type 'boolean)
-
-;;;; Select Mode
-
-(defcustom magit-log-select-show-usage 'both
-  "Whether to show usage information when selecting a commit from a log.
-The message can be shown in the `echo-area' or the `header-line', or in
-`both' places.  If the value isn't one of these symbols, then it should
-be nil, in which case no usage information is shown."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-log
-  :type '(choice (const :tag "in echo-area" echo-area)
-                 (const :tag "in header-line" header-line)
-                 (const :tag "in both places" both)
-                 (const :tag "nowhere")))
-
-(defcustom magit-log-select-margin
-  (list (nth 0 magit-log-margin)
-        (nth 1 magit-log-margin)
-        'magit-log-margin-width t
-        (nth 4 magit-log-margin))
-  "Format of the margin in `magit-log-select-mode' buffers.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-log
-  :group 'magit-margin
-  :type magit-log-margin--custom-type
-  :initialize #'magit-custom-initialize-reset
-  :set-after '(magit-log-margin)
-  :set (apply-partially #'magit-margin-set-variable 'magit-log-select-mode))
-
-;;;; Cherry Mode
-
-(defcustom magit-cherry-sections-hook
-  '(magit-insert-cherry-headers
-    magit-insert-cherry-commits)
-  "Hook run to insert sections into the cherry buffer."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-log
-  :type 'hook)
-
-(defcustom magit-cherry-margin
-  (list (nth 0 magit-log-margin)
-        (nth 1 magit-log-margin)
-        'magit-log-margin-width t
-        (nth 4 magit-log-margin))
-  "Format of the margin in `magit-cherry-mode' buffers.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-log
-  :group 'magit-margin
-  :type magit-log-margin--custom-type
-  :initialize #'magit-custom-initialize-reset
-  :set-after '(magit-log-margin)
-  :set (apply-partially #'magit-margin-set-variable 'magit-cherry-mode))
-
-;;;; Log Sections
-
-(defcustom magit-log-section-commit-count 10
-  "How many recent commits to show in certain log sections.
-How many recent commits `magit-insert-recent-commits' and
-`magit-insert-unpulled-from-upstream-or-recent' (provided
-the upstream isn't ahead of the current branch) show."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-status
-  :type 'number)
-
-(defcustom magit-log-merged-commit-count 20
-  "How many surrounding commits to show for `magit-log-merged'.
-`magit-log-merged' will shows approximately half of this number
-commits before and half after."
-  :package-version '(magit . "3.3.0")
-  :group 'magit-log
-  :type 'integer)
-
-;;; Arguments
-;;;; Prefix Classes
-
-(defclass magit-log-prefix (transient-prefix)
-  ((history-key :initform 'magit-log)
-   (major-mode  :initform 'magit-log-mode)))
-
-(defclass magit-log-refresh-prefix (magit-log-prefix)
-  ((history-key :initform 'magit-log)
-   (major-mode  :initform nil)))
-
-;;;; Prefix Methods
-
-(cl-defmethod transient-init-value ((obj magit-log-prefix))
-  (pcase-let ((`(,args ,files)
-               (magit-log--get-value 'magit-log-mode
-                                     magit-prefix-use-buffer-arguments)))
-    (unless (eq transient-current-command 'magit-dispatch)
-      (when-let ((file (magit-file-relative-name)))
-        (setq files (list file))))
-    (oset obj value (if files `(("--" ,@files) ,args) args))))
-
-(cl-defmethod transient-init-value ((obj magit-log-refresh-prefix))
-  (oset obj value (if magit-buffer-log-files
-                      `(("--" ,@magit-buffer-log-files)
-                        ,magit-buffer-log-args)
-                    magit-buffer-log-args)))
-
-(cl-defmethod transient-set-value ((obj magit-log-prefix))
-  (magit-log--set-value obj))
-
-(cl-defmethod transient-save-value ((obj magit-log-prefix))
-  (magit-log--set-value obj 'save))
-
-;;;; Argument Access
-
-(defun magit-log-arguments (&optional mode)
-  "Return the current log arguments."
-  (if (memq transient-current-command '(magit-log magit-log-refresh))
-      (magit--transient-args-and-files)
-    (magit-log--get-value (or mode 'magit-log-mode))))
-
-(defun magit-log--get-value (mode &optional use-buffer-args)
-  (unless use-buffer-args
-    (setq use-buffer-args magit-direct-use-buffer-arguments))
-  (let (args files)
-    (cond
-     ((and (memq use-buffer-args '(always selected current))
-           (eq major-mode mode))
-      (setq args  magit-buffer-log-args)
-      (setq files magit-buffer-log-files))
-     ((and (memq use-buffer-args '(always selected))
-           (when-let ((buffer (magit-get-mode-buffer
-                               mode nil
-                               (eq use-buffer-args 'selected))))
-             (setq args  (buffer-local-value 'magit-buffer-log-args buffer))
-             (setq files (buffer-local-value 'magit-buffer-log-files buffer))
-             t)))
-     ((plist-member (symbol-plist mode) 'magit-log-current-arguments)
-      (setq args (get mode 'magit-log-current-arguments)))
-     ((when-let ((elt (assq (intern (format "magit-log:%s" mode))
-                            transient-values)))
-        (setq args (cdr elt))
-        t))
-     (t
-      (setq args (get mode 'magit-log-default-arguments))))
-    (list args files)))
-
-(defun magit-log--set-value (obj &optional save)
-  (pcase-let* ((obj  (oref obj prototype))
-               (mode (or (oref obj major-mode) major-mode))
-               (key  (intern (format "magit-log:%s" mode)))
-               (`(,args ,files) (magit--transient-args-and-files)))
-    (put mode 'magit-log-current-arguments args)
-    (when save
-      (setf (alist-get key transient-values) args)
-      (transient-save-values))
-    (transient--history-push obj)
-    (setq magit-buffer-log-args args)
-    (unless (derived-mode-p 'magit-log-select-mode)
-      (setq magit-buffer-log-files files))
-    (magit-refresh)))
-
-;;; Commands
-;;;; Prefix Commands
-
-;;;###autoload (autoload 'magit-log "magit-log" nil t)
-(transient-define-prefix magit-log ()
-  "Show a commit or reference log."
-  :man-page "git-log"
-  :class 'magit-log-prefix
-  ;; The grouping in git-log(1) appears to be guided by implementation
-  ;; details, so our logical grouping only follows it to an extend.
-  ;; Arguments that are "misplaced" here:
-  ;;   1. From "Commit Formatting".
-  ;;   2. From "Common Diff Options".
-  ;;   3. From unnamed first group.
-  ;;   4. Implemented by Magit.
-  ["Commit limiting"
-   (magit-log:-n)
-   (magit:--author)
-   (7 magit-log:--since)
-   (7 magit-log:--until)
-   (magit-log:--grep)
-   (7 "-i" "Search case-insensitive" ("-i" "--regexp-ignore-case"))
-   (7 "-I" "Invert search pattern"   "--invert-grep")
-   (magit-log:-G)     ;2
-   (magit-log:-S)     ;2
-   (magit-log:-L)     ;2
-   (7 "=m" "Omit merges"            "--no-merges")
-   (7 "=p" "First parent"           "--first-parent")]
-  ["History simplification"
-   (  "-D" "Simplify by decoration"                  "--simplify-by-decoration")
-   (magit:--)
-   (  "-f" "Follow renames when showing single-file log"     "--follow") ;3
-   (6 "/s" "Only commits changing given paths"               "--sparse")
-   (7 "/d" "Only selected commits plus meaningful history"   "--dense")
-   (7 "/a" "Only commits existing directly on ancestry path" "--ancestry-path")
-   (6 "/f" "Do not prune history"                            "--full-history")
-   (7 "/m" "Prune some history"                              "--simplify-merges")]
-  ["Commit ordering"
-   (magit-log:--*-order)
-   ("-r" "Reverse order" "--reverse")]
-  ["Formatting"
-   ("-g" "Show graph"          "--graph")          ;1
-   ("-c" "Show graph in color" "--color")          ;2
-   ("-d" "Show refnames"       "--decorate")       ;3
-   ("=S" "Show signatures"     "--show-signature") ;1
-   ("-h" "Show header"         "++header")         ;4
-   ("-p" "Show diffs"          ("-p" "--patch"))   ;2
-   ("-s" "Show diffstats"      "--stat")]          ;2
-  [["Log"
-    ("l" "current"             magit-log-current)
-    ("h" "HEAD"                magit-log-head)
-    ("u" "related"             magit-log-related)
-    ("o" "other"               magit-log-other)]
-   [""
-    ("L" "local branches"      magit-log-branches)
-    ("b" "all branches"        magit-log-all-branches)
-    ("a" "all references"      magit-log-all)
-    (7 "B" "matching branches" magit-log-matching-branches)
-    (7 "T" "matching tags"     magit-log-matching-tags)
-    (7 "m" "merged"            magit-log-merged)]
-   ["Reflog"
-    ("r" "current"             magit-reflog-current)
-    ("H" "HEAD"                magit-reflog-head)
-    ("O" "other"               magit-reflog-other)]
-   [:if (lambda ()
-          (and (fboundp 'magit--any-wip-mode-enabled-p)
-               (magit--any-wip-mode-enabled-p)))
-    :description "Wiplog"
-    ("i" "index"          magit-wip-log-index)
-    ("w" "worktree"       magit-wip-log-worktree)]
-   ["Other"
-    (5 "s" "shortlog"    magit-shortlog)]])
-
-;;;###autoload (autoload 'magit-log-refresh "magit-log" nil t)
-(transient-define-prefix magit-log-refresh ()
-  "Change the arguments used for the log(s) in the current buffer."
-  :man-page "git-log"
-  :class 'magit-log-refresh-prefix
-  [:if-mode magit-log-mode
-   :class transient-subgroups
-   ["Commit limiting"
-    (magit-log:-n)
-    (magit:--author)
-    (magit-log:--grep)
-    (7 "-i" "Search case-insensitive" ("-i" "--regexp-ignore-case"))
-    (7 "-I" "Invert search pattern"   "--invert-grep")
-    (magit-log:-G)
-    (magit-log:-S)
-    (magit-log:-L)]
-   ["History simplification"
-    (  "-D" "Simplify by decoration"                  "--simplify-by-decoration")
-    (magit:--)
-    (  "-f" "Follow renames when showing single-file log"     "--follow") ;3
-    (6 "/s" "Only commits changing given paths"               "--sparse")
-    (7 "/d" "Only selected commits plus meaningful history"   "--dense")
-    (7 "/a" "Only commits existing directly on ancestry path" "--ancestry-path")
-    (6 "/f" "Do not prune history"                            "--full-history")
-    (7 "/m" "Prune some history"                              "--simplify-merges")]
-   ["Commit ordering"
-    (magit-log:--*-order)
-    ("-r" "Reverse order" "--reverse")]
-   ["Formatting"
-    ("-g" "Show graph"              "--graph")
-    ("-c" "Show graph in color"     "--color")
-    ("-d" "Show refnames"           "--decorate")
-    ("=S" "Show signatures"         "--show-signature")
-    ("-h" "Show header"             "++header")
-    ("-p" "Show diffs"              ("-p" "--patch"))
-    ("-s" "Show diffstats"          "--stat")]]
-  [:if-not-mode magit-log-mode
-   :description "Arguments"
-   (magit-log:-n)
-   (magit-log:--*-order)
-   ("-g" "Show graph"               "--graph")
-   ("-c" "Show graph in color"      "--color")
-   ("-d" "Show refnames"            "--decorate")]
-  [["Refresh"
-    ("g" "buffer"                   magit-log-refresh)
-    ("s" "buffer and set defaults"  transient-set-and-exit)
-    ("w" "buffer and save defaults" transient-save-and-exit)]
-   ["Margin"
-    (magit-toggle-margin)
-    (magit-cycle-margin-style)
-    (magit-toggle-margin-details)
-    (magit-toggle-log-margin-style)]
-   [:if-mode magit-log-mode
-    :description "Toggle"
-    ("b" "buffer lock"              magit-toggle-buffer-lock)]]
-  (interactive)
-  (cond
-   ((not (eq transient-current-command 'magit-log-refresh))
-    (pcase major-mode
-      ('magit-reflog-mode
-       (user-error "Cannot change log arguments in reflog buffers"))
-      ('magit-cherry-mode
-       (user-error "Cannot change log arguments in cherry buffers")))
-    (transient-setup 'magit-log-refresh))
-   (t
-    (pcase-let ((`(,args ,files) (magit-log-arguments)))
-      (setq magit-buffer-log-args args)
-      (unless (derived-mode-p 'magit-log-select-mode)
-        (setq magit-buffer-log-files files)))
-    (magit-refresh))))
-
-;;;; Infix Commands
-
-(transient-define-argument magit-log:-n ()
-  :description "Limit number of commits"
-  :class 'transient-option
-  ;; For historic reasons (and because it easy to guess what "-n"
-  ;; stands for) this is the only argument where we do not use the
-  ;; long argument ("--max-count").
-  :shortarg "-n"
-  :argument "-n"
-  :reader #'transient-read-number-N+)
-
-(transient-define-argument magit:--author ()
-  :description "Limit to author"
-  :class 'transient-option
-  :key "-A"
-  :argument "--author="
-  :reader #'magit-transient-read-person)
-
-(transient-define-argument magit-log:--since ()
-  :description "Limit to commits since"
-  :class 'transient-option
-  :key "=s"
-  :argument "--since="
-  :reader #'transient-read-date)
-
-(transient-define-argument magit-log:--until ()
-  :description "Limit to commits until"
-  :class 'transient-option
-  :key "=u"
-  :argument "--until="
-  :reader #'transient-read-date)
-
-(transient-define-argument magit-log:--*-order ()
-  :description "Order commits by"
-  :class 'transient-switches
-  :key "-o"
-  :argument-format "--%s-order"
-  :argument-regexp "\\(--\\(topo\\|author-date\\|date\\)-order\\)"
-  :choices '("topo" "author-date" "date"))
-
-(transient-define-argument magit-log:--grep ()
-  :description "Search messages"
-  :class 'transient-option
-  :key "-F"
-  :argument "--grep=")
-
-(transient-define-argument magit-log:-G ()
-  :description "Search changes"
-  :class 'transient-option
-  :argument "-G")
-
-(transient-define-argument magit-log:-S ()
-  :description "Search occurrences"
-  :class 'transient-option
-  :argument "-S")
-
-(transient-define-argument magit-log:-L ()
-  :description "Trace line evolution"
-  :class 'transient-option
-  :argument "-L"
-  :reader #'magit-read-file-trace)
-
-(defun magit-read-file-trace (&rest _ignored)
-  (let ((file  (magit-read-file-from-rev "HEAD" "File"))
-        (trace (magit-read-string "Trace")))
-    (concat trace ":" file)))
-
-;;;; Setup Commands
-
-(defvar-keymap magit-log-read-revs-map
-  :parent crm-local-completion-map
-  "SPC" #'self-insert-command)
-
-(defun magit-log-read-revs (&optional use-current)
-  (or (and use-current (and-let* ((buf (magit-get-current-branch))) (list buf)))
-      (let ((crm-separator "\\(\\.\\.\\.?\\|[, ]\\)")
-            (crm-local-completion-map magit-log-read-revs-map))
-        (split-string (magit-completing-read-multiple
-                       "Log rev,s: "
-                       (magit-list-refnames nil t)
-                       nil nil nil 'magit-revision-history
-                       (or (magit-branch-or-commit-at-point)
-                           (and (not use-current)
-                                (magit-get-previous-branch)))
-                       nil t)
-                      "[, ]" t))))
-
-(defun magit-log-read-pattern (option)
-  "Read a string from the user to pass as parameter to OPTION."
-  (magit-read-string (format "Type a pattern to pass to %s" option)))
-
-;;;###autoload
-(defun magit-log-current (revs &optional args files)
-  "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."
-  (interactive (cons (magit-log-read-revs t)
-                     (magit-log-arguments)))
-  (magit-log-setup-buffer revs args files))
-
-;;;###autoload
-(defun magit-log-head (&optional args files)
-  "Show log for `HEAD'."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (list "HEAD") args files))
-
-;;;###autoload
-(defun magit-log-related (revs &optional args files)
-  "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."
-  (interactive
-   (cons (let ((current (magit-get-current-branch))
-               head rebase target upstream upup)
-           (unless current
-             (setq rebase (magit-rebase--get-state-lines "head-name"))
-             (cond (rebase
-                    (setq rebase (magit-ref-abbrev rebase))
-                    (setq current rebase)
-                    (setq head "HEAD"))
-                   (t (setq current (magit-get-previous-branch)))))
-           (cond (current
-                  (setq current
-                        (magit--propertize-face current'magit-branch-local))
-                  (setq target (magit-get-push-branch current t))
-                  (setq upstream (magit-get-upstream-branch current))
-                  (when upstream
-                    (setq upup (and (magit-local-branch-p upstream)
-                                    (magit-get-upstream-branch upstream)))))
-                 (t (setq head "HEAD")))
-           (delq nil (list current head target upstream upup)))
-         (magit-log-arguments)))
-  (magit-log-setup-buffer revs args files))
-
-;;;###autoload
-(defun magit-log-other (revs &optional args files)
-  "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 and tags, and a
-representation of the commit at point, are available as
-completion candidates."
-  (interactive (cons (magit-log-read-revs)
-                     (magit-log-arguments)))
-  (magit-log-setup-buffer revs args files))
-
-;;;###autoload
-(defun magit-log-branches (&optional args files)
-  "Show log for all local branches and `HEAD'."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (if (magit-get-current-branch)
-                              (list "--branches")
-                            (list "HEAD" "--branches"))
-                          args files))
-
-;;;###autoload
-(defun magit-log-matching-branches (pattern &optional args files)
-  "Show log for all branches matching PATTERN and `HEAD'."
-  (interactive (cons (magit-log-read-pattern "--branches") (magit-log-arguments)))
-  (magit-log-setup-buffer
-   (list "HEAD" (format "--branches=%s" pattern))
-   args files))
-
-;;;###autoload
-(defun magit-log-matching-tags (pattern &optional args files)
-  "Show log for all tags matching PATTERN and `HEAD'."
-  (interactive (cons (magit-log-read-pattern "--tags") (magit-log-arguments)))
-  (magit-log-setup-buffer
-   (list "HEAD" (format "--tags=%s" pattern))
-   args files))
-
-;;;###autoload
-(defun magit-log-all-branches (&optional args files)
-  "Show log for all local and remote branches and `HEAD'."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (if (magit-get-current-branch)
-                              (list "--branches" "--remotes")
-                            (list "HEAD" "--branches" "--remotes"))
-                          args files))
-
-;;;###autoload
-(defun magit-log-all (&optional args files)
-  "Show log for all references and `HEAD'."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (if (magit-get-current-branch)
-                              (list "--all")
-                            (list "HEAD" "--all"))
-                          args files))
-
-;;;###autoload
-(defun magit-log-buffer-file (&optional follow beg end)
-  "Show log for the blob or file visited in the current buffer.
-With a prefix argument or when `--follow' is an active log
-argument, then follow renames.  When the region is active,
-restrict the log to the lines that the region touches."
-  (interactive
-   (cons current-prefix-arg
-         (and (region-active-p)
-              (magit-file-relative-name)
-              (save-restriction
-                (widen)
-                (list (line-number-at-pos (region-beginning))
-                      (line-number-at-pos
-                       (let ((end (region-end)))
-                         (if (char-after end)
-                             end
-                           ;; Ensure that we don't get the line number
-                           ;; of a trailing newline.
-                           (1- end)))))))))
-  (require 'magit)
-  (if-let ((file (magit-file-relative-name)))
-      (magit-log-setup-buffer
-       (list (or magit-buffer-refname
-                 (magit-get-current-branch)
-                 "HEAD"))
-       (let ((args (car (magit-log-arguments))))
-         (when (and follow (not (member "--follow" args)))
-           (push "--follow" args))
-         (when (and (file-regular-p
-                     (expand-file-name file (magit-toplevel)))
-                    beg end)
-           (setq args (cons (format "-L%s,%s:%s" beg end file)
-                            (cl-delete "-L" args :test
-                                       #'string-prefix-p)))
-           (setq file nil))
-         args)
-       (and file (list file))
-       magit-log-buffer-file-locked)
-    (user-error "Buffer isn't visiting a file")))
-
-;;;###autoload
-(defun magit-log-trace-definition (file fn rev)
-  "Show log for the definition at point."
-  (interactive (list (or (magit-file-relative-name)
-                         (user-error "Buffer isn't visiting a file"))
-                     (or (funcall magit-log-trace-definition-function)
-                         (user-error "No function at point found"))
-                     (or magit-buffer-refname
-                         (magit-get-current-branch)
-                         "HEAD")))
-  (require 'magit)
-  (magit-log-setup-buffer
-   (list rev)
-   (cons (format "-L:%s%s:%s"
-                 (string-replace ":" "\\:" (regexp-quote fn))
-                 (if (derived-mode-p 'lisp-mode 'emacs-lisp-mode)
-                     ;; Git doesn't treat "-" the same way as
-                     ;; "_", leading to false-positives such as
-                     ;; "foo-suffix" being considered a match
-                     ;; for "foo".  Wing it.
-                     "\\( \\|$\\)"
-                   ;; We could use "\\b" here, but since Git
-                   ;; already does something equivalent, that
-                   ;; isn't necessary.
-                   "")
-                 file)
-         (cl-delete "-L" (car (magit-log-arguments))
-                    :test #'string-prefix-p))
-   nil magit-log-buffer-file-locked))
-
-(defun magit-diff-trace-definition ()
-  "Show log for the definition at point in a diff."
-  (interactive)
-  (pcase-let ((`(,buf ,pos) (magit-diff-visit-file--noselect)))
-    (magit--with-temp-position buf pos
-      (call-interactively #'magit-log-trace-definition))))
-
-;;;###autoload
-(defun magit-log-merged (commit branch &optional args files)
-  "Show log for the merge of COMMIT into BRANCH.
-
-More precisely, find merge commit M that brought COMMIT into
-BRANCH, and show the log of the range \"M^1..M\". If COMMIT is
-directly on BRANCH, then show approximately
-`magit-log-merged-commit-count' surrounding commits instead.
-
-This command requires git-when-merged, which is available from
-https://github.com/mhagger/git-when-merged."
-  (interactive
-   (append (let ((commit (magit-read-branch-or-commit "Log merge of commit")))
-             (list commit
-                   (magit-read-other-branch "Merged into" commit)))
-           (magit-log-arguments)))
-  (unless (magit-git-executable-find "git-when-merged")
-    (user-error "This command requires git-when-merged (%s)"
-                "https://github.com/mhagger/git-when-merged"))
-  (let (exit m)
-    (with-temp-buffer
-      (save-excursion
-        (setq exit (magit-process-git t "when-merged" "-c"
-                                      (magit-abbrev-arg)
-                                      commit branch)))
-      (setq m (buffer-substring-no-properties (point) (line-end-position))))
-    (if (zerop exit)
-        (magit-log-setup-buffer (list (format "%s^1..%s" m m))
-                                args files nil commit)
-      ;; Output: "<ref><lots of spaces><message>".
-      ;; This is not the same as `string-trim'.
-      (setq m (string-trim-left (substring m (string-match " " m))))
-      (if (equal m "Commit is directly on this branch.")
-          (let* ((from (format "%s~%d" commit
-                               (/ magit-log-merged-commit-count 2)))
-                 (to (- (car (magit-rev-diff-count branch commit t))
-                        (/ magit-log-merged-commit-count 2)))
-                 (to (if (<= to 0)
-                         branch
-                       (format "%s~%s" branch to))))
-            (unless (magit-rev-verify-commit from)
-              (setq from (magit-git-string "rev-list" "--max-parents=0"
-                                           commit)))
-            (magit-log-setup-buffer (list (concat from ".." to))
-                                    (cons "--first-parent" args)
-                                    files nil commit))
-        (user-error "Could not find when %s was merged into %s: %s"
-                    commit branch m)))))
-
-;;;; Limit Commands
-
-(defun 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."
-  (interactive)
-  (magit-log-set-commit-limit (lambda (&rest _) nil)))
-
-(defun magit-log-double-commit-limit ()
-  "Double the number of commits the current log buffer is limited to."
-  (interactive)
-  (magit-log-set-commit-limit '*))
-
-(defun magit-log-half-commit-limit ()
-  "Half the number of commits the current log buffer is limited to."
-  (interactive)
-  (magit-log-set-commit-limit '/))
-
-(defun magit-log-set-commit-limit (fn)
-  (let* ((val magit-buffer-log-args)
-         (arg (--first (string-match "^-n\\([0-9]+\\)?$" it) val))
-         (num (and arg (string-to-number (match-string 1 arg))))
-         (num (if num (funcall fn num 2) 256)))
-    (setq val (remove arg val))
-    (setq magit-buffer-log-args
-          (if (and num (> num 0))
-              (cons (format "-n%d" num) val)
-            val)))
-  (magit-refresh))
-
-(defun magit-log-get-commit-limit (&optional args)
-  (and-let* ((str (--first (string-match "^-n\\([0-9]+\\)?$" it)
-                           (or args magit-buffer-log-args))))
-    (string-to-number (match-string 1 str))))
-
-;;;; Mode Commands
-
-(defun magit-log-bury-buffer (&optional arg)
-  "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."
-  (interactive "p")
-  (if (< arg 0)
-      (let* ((buf (magit-get-mode-buffer 'magit-revision-mode))
-             (win (and buf (get-buffer-window buf (selected-frame)))))
-        (if win
-            (with-selected-window win
-              (with-current-buffer buf
-                (magit-mode-bury-buffer (> (abs arg) 1))))
-          (user-error "No revision buffer in this frame")))
-    (magit-mode-bury-buffer (> arg 1))))
-
-;;;###autoload
-(defun magit-log-move-to-parent (&optional n)
-  "Move to the Nth parent of the current commit."
-  (interactive "p")
-  (when (derived-mode-p 'magit-log-mode)
-    (when (magit-section-match 'commit)
-      (let* ((section (magit-current-section))
-             (parent-rev (format "%s^%s" (oref section value) (or n 1))))
-        (if-let ((parent-hash (magit-rev-parse "--short" parent-rev)))
-            (if-let ((parent (--first (equal (oref it value)
-                                             parent-hash)
-                                      (magit-section-siblings section 'next))))
-                (magit-section-goto parent)
-              (user-error
-               (substitute-command-keys
-                (concat "Parent " parent-hash " not found.  Try typing "
-                        "\\[magit-log-double-commit-limit] first"))))
-          (user-error "Parent %s does not exist" parent-rev))))))
-
-(defun magit-log-move-to-revision (rev)
-  "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."
-  (interactive
-   (list (or (magit-completing-read
-              "In log, jump to"
-              (magit-list-refnames nil t)
-              nil nil nil 'magit-revision-history
-              (or (and-let* ((rev (magit-commit-at-point)))
-                    (magit-rev-fixup-target rev))
-                  (magit-get-current-branch)))
-             (user-error "Nothing selected"))))
-  (with-current-buffer
-      (cond ((derived-mode-p 'magit-log-mode)
-             (current-buffer))
-            ((and-let* ((buf (magit-get-mode-buffer 'magit-log-mode)))
-               (pop-to-buffer-same-window buf)))
-            (t
-             (apply #'magit-log-all-branches (magit-log-arguments))))
-    (unless (magit-log-goto-commit-section (magit-rev-abbrev rev))
-      (user-error "%s isn't visible in the current log buffer" rev))))
-
-;;;; Shortlog Commands
-
-;;;###autoload (autoload 'magit-shortlog "magit-log" nil t)
-(transient-define-prefix magit-shortlog ()
-  "Show a history summary."
-  :man-page "git-shortlog"
-  :value '("--numbered" "--summary")
-  ["Arguments"
-   ("-n" "Sort by number of commits"      ("-n" "--numbered"))
-   ("-s" "Show commit count summary only" ("-s" "--summary"))
-   ("-e" "Show email addresses"           ("-e" "--email"))
-   ("-g" "Group commits by" "--group="
-    :choices ("author" "committer" "trailer:"))
-   (7 "-f" "Format string" "--format=")
-   (7 "-w" "Linewrap" "-w" :class transient-option)]
-  ["Shortlog"
-   ("s" "since" magit-shortlog-since)
-   ("r" "range" magit-shortlog-range)])
-
-(defun magit-git-shortlog (rev args)
-  (let ((dir default-directory))
-    (with-current-buffer (get-buffer-create "*magit-shortlog*")
-      (setq default-directory dir)
-      (setq buffer-read-only t)
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (save-excursion
-          (magit-git-insert "shortlog" args rev))
-        (switch-to-buffer-other-window (current-buffer))))))
-
-;;;###autoload
-(defun magit-shortlog-since (rev args)
-  "Show a history summary for commits since REV."
-  (interactive
-   (list (magit-read-branch-or-commit "Shortlog since" (magit-get-current-tag))
-         (transient-args 'magit-shortlog)))
-  (magit-git-shortlog (concat rev "..") args))
-
-;;;###autoload
-(defun magit-shortlog-range (rev-or-range args)
-  "Show a history summary for commit or range REV-OR-RANGE."
-  (interactive
-   (list (magit-read-range-or-commit "Shortlog for revision or range")
-         (transient-args 'magit-shortlog)))
-  (magit-git-shortlog rev-or-range args))
-
-;;; Log Mode
-
-(defvar magit-log-disable-graph-hack-args
-  '("-G" "--grep" "--author")
-  "Arguments which disable the graph speedup hack.")
-
-(defvar-keymap magit-log-mode-map
-  :doc "Keymap for `magit-log-mode'."
-  :parent magit-mode-map
-  "C-c C-b" #'magit-go-backward
-  "C-c C-f" #'magit-go-forward
-  "C-c C-n" #'magit-log-move-to-parent
-  "j" #'magit-log-move-to-revision
-  "=" #'magit-log-toggle-commit-limit
-  "+" #'magit-log-double-commit-limit
-  "-" #'magit-log-half-commit-limit
-  "q" #'magit-log-bury-buffer)
-
-(define-derived-mode magit-log-mode magit-mode "Magit Log"
-  "Mode for looking at Git log.
-
-This mode is documented in info node `(magit)Log Buffer'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
-to visit the commit at point.
-
-Type \\[magit-branch] to see available branch commands.
-Type \\[magit-merge] to merge the branch or commit at point.
-Type \\[magit-cherry-pick] to apply the commit at point.
-Type \\[magit-reset] to reset `HEAD' to the commit at point.
-
-\\{magit-log-mode-map}"
-  :group 'magit-log
-  (hack-dir-local-variables-non-file-buffer)
-  (setq magit--imenu-item-types 'commit))
-
-(put 'magit-log-mode 'magit-log-default-arguments
-     '("--graph" "-n256" "--decorate"))
-
-(defun magit-log-setup-buffer (revs args files &optional locked focus)
-  (require 'magit)
-  (with-current-buffer
-      (magit-setup-buffer #'magit-log-mode locked
-        (magit-buffer-revisions revs)
-        (magit-buffer-log-args args)
-        (magit-buffer-log-files files))
-    (when (if focus
-              (magit-log-goto-commit-section focus)
-            (magit-log-goto-same-commit))
-      (magit-section-update-highlight))
-    (current-buffer)))
-
-(defun magit-log-refresh-buffer ()
-  (let ((revs  magit-buffer-revisions)
-        (args  magit-buffer-log-args)
-        (files magit-buffer-log-files)
-        (limit (magit-log-get-commit-limit)))
-    (magit-set-header-line-format
-     (funcall magit-log-header-line-function revs args files))
-    (unless (length= files 1)
-      (setq args (remove "--follow" args)))
-    (when (and (car magit-log-remove-graph-args)
-               (--any-p (string-match-p
-                         (concat "^" (regexp-opt magit-log-remove-graph-args)) it)
-                        args))
-      (setq args (remove "--graph" args)))
-    (setq args (magit-log--maybe-drop-color-graph args limit))
-    (when-let* ((limit limit)
-                (limit (* 2 limit)) ; increase odds for complete graph
-                (count (and (length= revs 1)
-                            (> limit 1024) ; otherwise it's fast enough
-                            (setq revs (car revs))
-                            (not (string-search ".." revs))
-                            (not (member revs '("--all" "--branches")))
-                            (not (seq-some
-                                  (lambda (arg)
-                                    (--any-p (string-prefix-p it arg)
-                                             magit-log-disable-graph-hack-args))
-                                  args))
-                            (magit-git-string "rev-list" "--count"
-                                              "--first-parent" args revs))))
-      (setq revs (if (< (string-to-number count) limit)
-                     revs
-                   (format "%s~%s..%s" revs limit revs))))
-    (let ((delay (cl-find-if (lambda (arg)
-                               (member arg '("++header" "--patch" "--stat")))
-                             args)))
-      (setq magit-section-inhibit-markers (if delay 'delay t))
-      (setq magit-section-insert-in-reverse (not delay)))
-    (magit-insert-section (logbuf)
-      (magit--insert-log t revs args files))))
-
-(defvar-local magit-log--color-graph nil)
-
-(defun magit-log--maybe-drop-color-graph (args limit)
-  (if (member "--color" args)
-      (if (cond ((not (member "--graph" args)))
-                ((not magit-log-color-graph-limit) nil)
-                ((not limit)
-                 (message "Dropping --color because -n isn't set (see %s)"
-                          'magit-log-color-graph-limit))
-                ((> limit magit-log-color-graph-limit)
-                 (message "Dropping --color because -n is larger than %s"
-                          'magit-log-color-graph-limit)))
-          (progn (setq args (remove "--color" args))
-                 (setq magit-log--color-graph nil))
-        (setq magit-log--color-graph t))
-    (setq magit-log--color-graph nil))
-  args)
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-log-mode))
-  (append magit-buffer-revisions
-          (if (and magit-buffer-revisions magit-buffer-log-files)
-              (cons "--" magit-buffer-log-files)
-            magit-buffer-log-files)))
-
-(defun magit-log-header-line-arguments (revs args files)
-  "Return string describing some of the used arguments."
-  (mapconcat (lambda (arg)
-               (if (string-search " " arg)
-                   (prin1 arg)
-                 arg))
-             `("git" "log" ,@args ,@revs "--" ,@files)
-             " "))
-
-(defun magit-log-header-line-sentence (revs args files)
-  "Return string containing all arguments."
-  (concat "Commits in "
-          (mapconcat #'identity revs " ")
-          (and (member "--reverse" args)
-               " in reverse")
-          (and files (concat " touching "
-                             (mapconcat #'identity files " ")))
-          (--some (and (string-prefix-p "-L" it)
-                       (concat " " it))
-                  args)))
-
-(defun magit-insert-log (revs &optional args files)
-  (declare (obsolete magit--insert-log "Magit 4.0.0"))
-  (magit--insert-log nil revs args files))
-
-(defun magit--insert-log (keep-error revs &optional args files)
-  "Insert a log section.
-Do not add this to a hook variable."
-  (declare (indent defun))
-  (setq magit-section-preserve-visibility t) ; TODO do it here?
-  (let ((magit-git-global-arguments
-         (remove "--literal-pathspecs" magit-git-global-arguments)))
-    (magit--git-wash (apply-partially #'magit-log-wash-log 'log) keep-error
-      "log"
-      (format "--format=%s%%h%%x0c%s%%x0c%s%%x0c%%aN%%x0c%s%%x0c%%s%s"
-              (if (and (member "--left-right" args)
-                       (not (member "--graph" args)))
-                  "%m "
-                "")
-              (if (member "--decorate" args) "%D" "")
-              (if (not (member "--show-signature" args))
-                  ""
-                (setq args (remove "--show-signature" args))
-                (let ((limit (magit-log-get-commit-limit args)))
-                  (cond
-                   ((not limit)
-                    (message
-                     "Dropping --show-signature because -n isn't set (see %s)"
-                     'magit-log-show-signatures-limit)
-                    "")
-                   ((> limit magit-log-show-signatures-limit)
-                    (message
-                     "Dropping --show-signature because -n is larger than %s"
-                     'magit-log-show-signatures-limit)
-                    "")
-                   ("%G?"))))
-              (if magit-log-margin-show-committer-date "%ct" "%at")
-              (if (member "++header" args)
-                  (if (member "--graph" (setq args (remove "++header" args)))
-                      (concat "\n" magit-log-revision-headers-format "\n")
-                    (concat "\n" magit-log-revision-headers-format "\n"))
-                ""))
-      (progn
-        (when-let ((order (--first (string-match "^\\+\\+order=\\(.+\\)$" it)
-                                   args)))
-          (setq args (cons (format "--%s-order" (match-string 1 order))
-                           (remove order args))))
-        (when (member "--decorate" args)
-          (setq args (cons "--decorate=full" (remove "--decorate" args))))
-        (when (member "--reverse" args)
-          (setq args (remove "--graph" args)))
-        (setq args (magit-diff--maybe-add-stat-arguments args))
-        args)
-      "--use-mailmap" "--no-prefix" revs "--" files)))
-
-(cl-defmethod magit-menu-common-value ((_section magit-commit-section))
-  (or (magit-diff--region-range)
-      (oref (magit-current-section) value)))
-
-(defvar-keymap magit-commit-section-map
-  :doc "Keymap for `commit' sections."
-  "<remap> <magit-visit-thing>" #'magit-show-commit
-  "<3>" (magit-menu-item "Apply %x" #'magit-cherry-apply)
-  "<2>" (magit-menu-item "Show commit %x" #'magit-show-commit
-                         '(:visible (not (region-active-p))))
-  "<1>" (magit-menu-item "Diff %x" #'magit-diff-range
-                         '(:visible (region-active-p))))
-
-(defvar-keymap magit-module-commit-section-map
-  :doc "Keymap for `module-commit' sections."
-  :parent magit-commit-section-map)
-
-(defconst magit-log-heading-re
-  ;; Note: A form feed instead of a null byte is used as the delimiter
-  ;; because using the latter interferes with the graph prefix when
-  ;; ++header is used.
-  (concat "^"
-          "\\(?4:[-_/|\\*o<>. ]*\\)"               ; graph
-          "\\(?1:[0-9a-fA-F]+\\)?"               ; hash
-          "\\(?3:[^\n]+\\)?"                   ; refs
-          "\\(?7:[BGUXYREN]\\)?"                 ; gpg
-          "\\(?5:[^\n]*\\)"                    ; author
-          ;; Note: Date is optional because, prior to Git v2.19.0,
-          ;; `git rebase -i --root` corrupts the root's author date.
-          "\\(?6:[^\n]*\\)"                    ; date
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defconst magit-log-cherry-re
-  (concat "^"
-          "\\(?8:[-+]\\) "                         ; cherry
-          "\\(?1:[0-9a-fA-F]+\\) "                 ; hash
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defconst magit-log-module-re
-  (concat "^"
-          "\\(?:\\(?11:[<>]\\) \\)?"               ; side
-          "\\(?1:[0-9a-fA-F]+\\) "                 ; hash
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defconst magit-log-bisect-vis-re
-  (concat "^"
-          "\\(?4:[-_/|\\*o<>. ]*\\)"               ; graph
-          "\\(?1:[0-9a-fA-F]+\\)?\0"               ; hash
-          "\\(?3:[^\0\n]+\\)?\0"                   ; refs
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defconst magit-log-bisect-log-re
-  (concat "^# "
-          "\\(?3:[^: \n]+:\\) "                    ; "refs"
-          "\\[\\(?1:[^]\n]+\\)\\] "                ; hash
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defconst magit-log-reflog-re
-  (concat "^"
-          "\\(?1:[^\0\n]+\\)\0"                    ; hash
-          "\\(?5:[^\0\n]*\\)\0"                    ; author
-          "\\(?:\\(?:[^@\n]+@{\\(?6:[^}\n]+\\)}\0" ; date
-                                                 ;;; refsub
-          "\\(?10:merge \\|autosave \\|restart \\|rewritten \\|[^:\n]+: \\)?"
-          "\\(?2:.*\\)\\)\\|\0\\)$"))              ; msg
-
-(defconst magit-reflog-subject-re
-  (concat "\\(?1:[^ ]+\\) ?"                       ; command
-          "\\(?2:\\(?: ?-[^ ]+\\)+\\)?"            ; option
-          "\\(?: ?(\\(?3:[^)]+\\))\\)?"))          ; type
-
-(defconst magit-log-stash-re
-  (concat "^"
-          "\\(?1:[^\0\n]+\\)\0"                    ; "hash"
-          "\\(?5:[^\0\n]*\\)\0"                    ; author
-          "\\(?6:[^\0\n]+\\)\0"                    ; date
-          "\\(?2:.*\\)$"))                         ; msg
-
-(defvar magit-log-count nil)
-
-(defvar magit-log-format-message-function #'magit-log-propertize-keywords)
-
-(defun magit-log-wash-log (style args)
-  (setq args (flatten-tree args))
-  (when (if (derived-mode-p 'magit-log-mode)
-            magit-log--color-graph
-          (and (member "--graph" args)
-               (member "--color" args)))
-    (let ((ansi-color-apply-face-function
-           (lambda (beg end face)
-             (put-text-property beg end 'font-lock-face
-                                (or face 'magit-log-graph)))))
-      (ansi-color-apply-on-region (point-min) (point-max))))
-  (when (eq style 'cherry)
-    (reverse-region (point-min) (point-max)))
-  (let ((magit-log-count 0))
-    (when (looking-at "^\\.\\.\\.")
-      (magit-delete-line))
-    (magit-wash-sequence (apply-partially #'magit-log-wash-rev style
-                                          (magit-abbrev-length)))
-    (if (derived-mode-p 'magit-log-mode 'magit-reflog-mode)
-        (when (eq magit-log-count (magit-log-get-commit-limit))
-          (magit-insert-section (longer)
-            (insert-text-button
-             (substitute-command-keys
-              (format "Type \\<%s>\\[%s] to show more history"
-                      'magit-log-mode-map
-                      'magit-log-double-commit-limit))
-             'action (lambda (_button)
-                       (magit-log-double-commit-limit))
-             'follow-link t
-             'mouse-face 'magit-section-highlight)))
-      (insert ?\n))))
-
-(cl-defun magit-log-wash-rev (style abbrev)
-  (when (derived-mode-p 'magit-log-mode 'magit-reflog-mode)
-    (cl-incf magit-log-count))
-  (looking-at (pcase style
-                ('log        magit-log-heading-re)
-                ('cherry     magit-log-cherry-re)
-                ('module     magit-log-module-re)
-                ('reflog     magit-log-reflog-re)
-                ('stash      magit-log-stash-re)
-                ('bisect-vis magit-log-bisect-vis-re)
-                ('bisect-log magit-log-bisect-log-re)))
-  (magit-bind-match-strings
-      (hash msg refs graph author date gpg cherry _ refsub side) nil
-    (setq msg (substring-no-properties msg))
-    (when refs
-      (setq refs (substring-no-properties refs)))
-    (let ((align (or (eq style 'cherry)
-                     (not (member "--stat" magit-buffer-log-args))))
-          (non-graph-re (if (eq style 'bisect-vis)
-                            magit-log-bisect-vis-re
-                          magit-log-heading-re)))
-      (magit-delete-line)
-      ;; If the reflog entries have been pruned, the output of `git
-      ;; reflog show' includes a partial line that refers to the hash
-      ;; of the youngest expired reflog entry.
-      (when (and (eq style 'reflog) (not date))
-        (cl-return-from magit-log-wash-rev t))
-      (magit-insert-section
-        ((eval (pcase style
-                 ('stash  'stash)
-                 ('module 'module-commit)
-                 (_       'commit)))
-         hash)
-        (setq hash (propertize (if (eq style 'bisect-log)
-                                   (magit-rev-parse "--short" hash)
-                                 hash)
-                               'font-lock-face
-                               (pcase (and gpg (aref gpg 0))
-                                 (?G 'magit-signature-good)
-                                 (?B 'magit-signature-bad)
-                                 (?U 'magit-signature-untrusted)
-                                 (?X 'magit-signature-expired)
-                                 (?Y 'magit-signature-expired-key)
-                                 (?R 'magit-signature-revoked)
-                                 (?E 'magit-signature-error)
-                                 (?N 'magit-hash)
-                                 (_  'magit-hash))))
-        (when cherry
-          (when (and (derived-mode-p 'magit-refs-mode)
-                     magit-refs-show-commit-count)
-            (insert (make-string (1- magit-refs-focus-column-width) ?\s)))
-          (insert (propertize cherry 'font-lock-face
-                              (if (string= cherry "-")
-                                  'magit-cherry-equivalent
-                                'magit-cherry-unmatched)))
-          (insert ?\s))
-        (when side
-          (insert (propertize side 'font-lock-face
-                              (if (string= side "<")
-                                  'magit-cherry-equivalent
-                                'magit-cherry-unmatched)))
-          (insert ?\s))
-        (when align
-          (insert hash ?\s))
-        (when graph
-          (insert graph))
-        (unless align
-          (insert hash ?\s))
-        (when (and refs (not magit-log-show-refname-after-summary))
-          (insert (magit-format-ref-labels refs) ?\s))
-        (when (eq style 'reflog)
-          (insert (format "%-2s " (1- magit-log-count)))
-          (when refsub
-            (insert (magit-reflog-format-subject
-                     (substring refsub 0
-                                (if (string-search ":" refsub) -2 -1))))))
-        (insert (funcall magit-log-format-message-function hash msg))
-        (when (and refs magit-log-show-refname-after-summary)
-          (insert ?\s)
-          (insert (magit-format-ref-labels refs)))
-        (insert ?\n)
-        (when (memq style '(log reflog stash))
-          (goto-char (line-beginning-position))
-          (when (and refsub
-                     (string-match "\\`\\([^ ]\\) \\+\\(..\\)\\(..\\)" date))
-            (setq date (+ (string-to-number (match-string 1 date))
-                          (* (string-to-number (match-string 2 date)) 60 60)
-                          (* (string-to-number (match-string 3 date)) 60))))
-          (save-excursion
-            (backward-char)
-            (magit-log-format-margin hash author date)))
-        (when (and (eq style 'cherry)
-                   (magit-buffer-margin-p))
-          (save-excursion
-            (backward-char)
-            (apply #'magit-log-format-margin hash
-                   (split-string (magit-rev-format "%aN%x00%ct" hash) "\0"))))
-        (when (and graph
-                   (not (eobp))
-                   (not (looking-at non-graph-re)))
-          (when (looking-at "")
-            (magit-insert-heading)
-            (delete-char 1)
-            (magit-insert-section (commit-header)
-              (forward-line)
-              (magit-insert-heading)
-              (re-search-forward "")
-              (delete-char -1)
-              (forward-char)
-              (insert ?\n))
-            (delete-char 1))
-          (if (looking-at "^\\(---\\|\n\s\\|\ndiff\\)")
-              (let ((limit (save-excursion
-                             (and (re-search-forward non-graph-re nil t)
-                                  (match-beginning 0)))))
-                (unless (oref magit-insert-section--current content)
-                  (magit-insert-heading))
-                (delete-char (if (looking-at "\n") 1 4))
-                (magit-diff-wash-diffs (list "--stat") limit))
-            (when align
-              (setq align (make-string (1+ abbrev) ? )))
-            (when (and (not (eobp)) (not (looking-at non-graph-re)))
-              (when align
-                (setq align (make-string (1+ abbrev) ? )))
-              (while (and (not (eobp)) (not (looking-at non-graph-re)))
-                (when align
-                  (save-excursion (insert align)))
-                (magit-make-margin-overlay)
-                (forward-line))
-              ;; When `--format' is used and its value isn't one of the
-              ;; predefined formats, then `git-log' does not insert a
-              ;; separator line.
-              (save-excursion
-                (forward-line -1)
-                (looking-at "[-_/|\\*o<>. ]*"))
-              (setq graph (match-string 0))
-              (unless (string-match-p "[/\\.]" graph)
-                (insert graph ?\n))))))))
-  t)
-
-(defun magit-log-propertize-keywords (_rev msg)
-  (let ((boundary 0))
-    (when (string-match "^\\(?:squash\\|fixup\\)! " msg boundary)
-      (setq boundary (match-end 0))
-      (magit--put-face (match-beginning 0) (1- boundary)
-                       'magit-keyword-squash msg))
-    (when magit-log-highlight-keywords
-      (while (string-match "\\[[^][]*]" msg boundary)
-        (setq boundary (match-end 0))
-        (magit--put-face (match-beginning 0) boundary
-                         'magit-keyword msg))))
-  msg)
-
-(defun magit-log-maybe-show-more-commits (section)
-  "When point is at the end of a log buffer, insert more commits.
-
-Log buffers end with a button \"Type + to show more history\".
-When the use of a section movement command puts point on that
-button, then automatically show more commits, without the user
-having to press \"+\".
-
-This function is called by `magit-section-movement-hook' and
-exists mostly for backward compatibility reasons."
-  (when (and (eq (oref section type) 'longer)
-             magit-log-auto-more)
-    (magit-log-double-commit-limit)
-    (forward-line -1)
-    (magit-section-forward)))
-
-(add-hook 'magit-section-movement-hook #'magit-log-maybe-show-more-commits)
-
-(defvar magit--update-revision-buffer nil)
-
-(defun magit-log-maybe-update-revision-buffer (&optional _)
-  "When moving in a log or cherry buffer, update the revision buffer.
-If there is no revision buffer in the same frame, then do nothing."
-  (when (derived-mode-p 'magit-log-mode 'magit-cherry-mode 'magit-reflog-mode)
-    (magit--maybe-update-revision-buffer)))
-
-(add-hook 'magit-section-movement-hook #'magit-log-maybe-update-revision-buffer)
-
-(defun magit--maybe-update-revision-buffer ()
-  (when-let* ((commit (magit-section-value-if 'commit))
-              (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
-       (let ((args (let ((magit-direct-use-buffer-arguments 'selected))
-                     (magit-show-commit--arguments))))
-         (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 args))))
-           (setq magit--update-revision-buffer nil)))))))
-
-(defvar magit--update-blob-buffer nil)
-
-(defun magit-log-maybe-update-blob-buffer (&optional _)
-  "When moving in a log or cherry buffer, update the blob buffer.
-If there is no blob buffer in the same frame, then do nothing."
-  (when (derived-mode-p 'magit-log-mode 'magit-cherry-mode 'magit-reflog-mode)
-    (magit--maybe-update-blob-buffer)))
-
-(defun magit--maybe-update-blob-buffer ()
-  (when-let* ((commit (magit-section-value-if 'commit))
-              (buffer (--first (with-current-buffer it
-                                 (eq revert-buffer-function
-                                     'magit-revert-rev-file-buffer))
-                               (mapcar #'window-buffer (window-list)))))
-    (if magit--update-blob-buffer
-        (setq magit--update-blob-buffer (list commit buffer))
-      (setq magit--update-blob-buffer (list commit buffer))
-      (run-with-idle-timer
-       magit-update-other-window-delay nil
-       (lambda ()
-         (pcase-let ((`(,rev ,buf) magit--update-blob-buffer))
-           (setq magit--update-blob-buffer nil)
-           (when (buffer-live-p buf)
-             (with-selected-window (get-buffer-window buf)
-               (with-current-buffer buf
-                 (save-excursion
-                   (magit-blob-visit (list (magit-rev-parse rev)
-                                           (magit-file-relative-name
-                                            magit-buffer-file-name)))))))))))))
-
-(defun magit-log-goto-commit-section (rev)
-  (let ((abbrev (magit-rev-format "%h" rev)))
-    (when-let ((section (--first (equal (oref it value) abbrev)
-                                 (oref magit-root-section children))))
-      (goto-char (oref section start)))))
-
-(defun magit-log-goto-same-commit ()
-  (when (and magit-previous-section
-             (magit-section-match '(commit branch)
-                                  magit-previous-section))
-    (magit-log-goto-commit-section (oref magit-previous-section value))))
-
-;;; Log Margin
-
-(defvar-local magit-log-margin-show-shortstat nil)
-
-(transient-define-suffix magit-toggle-log-margin-style ()
-  "Toggle between the regular and the shortstat margin style.
-The shortstat style is experimental and rather slow."
-  :description "Toggle shortstat"
-  :key "x"
-  :transient t
-  (interactive)
-  (setq magit-log-margin-show-shortstat
-        (not magit-log-margin-show-shortstat))
-  (magit-set-buffer-margin nil t))
-
-(defun magit-log-format-margin (rev author date)
-  (when (magit-margin-option)
-    (if magit-log-margin-show-shortstat
-        (magit-log-format-shortstat-margin rev)
-      (magit-log-format-author-margin author date))))
-
-(defun magit-log-format-author-margin (author date &optional previous-line)
-  (pcase-let ((`(,_ ,style ,width ,details ,details-width)
-               (or magit-buffer-margin
-                   (symbol-value (magit-margin-option))
-                   (error "No margin format specified for %s" major-mode))))
-    (magit-make-margin-overlay
-     (concat (and details
-                  (concat (magit--propertize-face
-                           (truncate-string-to-width
-                            (or author "")
-                            details-width
-                            nil ?\s
-                            (magit--ellipsis 'margin))
-                           'magit-log-author)
-                          " "))
-             (magit--propertize-face
-              (if (stringp style)
-                  (format-time-string
-                   style
-                   (seconds-to-time (string-to-number date)))
-                (pcase-let* ((abbr (eq style 'age-abbreviated))
-                             (`(,cnt ,unit) (magit--age date abbr)))
-                  (format (format (if abbr "%%2d%%-%dc" "%%2d %%-%ds")
-                                  (- width (if details (1+ details-width) 0)))
-                          cnt unit)))
-              'magit-log-date))
-     previous-line)))
-
-(defun magit-log-format-shortstat-margin (rev)
-  (magit-make-margin-overlay
-   (if-let ((line (and rev (magit-git-string
-                            "show" "--format=" "--shortstat" rev))))
-       (if (string-match "\
-\\([0-9]+\\) files? changed, \
-\\(?:\\([0-9]+\\) insertions?(\\+)\\)?\
-\\(?:\\(?:, \\)?\\([0-9]+\\) deletions?(-)\\)?\\'" line)
-           (magit-bind-match-strings (files add del) line
-             (format
-              "%5s %5s%4s"
-              (if add
-                  (magit--propertize-face (format "%s+" add)
-                                          'magit-diffstat-added)
-                "")
-              (if del
-                  (magit--propertize-face (format "%s-" del)
-                                          'magit-diffstat-removed)
-                "")
-              files))
-         "")
-     "")))
-
-(defun magit-log-margin-width (style details details-width)
-  (if magit-log-margin-show-shortstat
-      16
-    (+ (if details (1+ details-width) 0)
-       (if (stringp style)
-           (length (format-time-string style))
-         (+ 2 ; two digits
-            1 ; trailing space
-            (if (eq style 'age-abbreviated)
-                1  ; single character
-              (+ 1 ; gap after digits
-                 (apply #'max (--map (max (length (nth 1 it))
-                                          (length (nth 2 it)))
-                                     magit--age-spec)))))))))
-
-;;; Select Mode
-
-(defvar-keymap magit-log-select-mode-map
-  :doc "Keymap for `magit-log-select-mode'."
-  :parent magit-log-mode-map
-  "C-c C-b" #'undefined
-  "C-c C-f" #'undefined
-  "."       #'magit-log-select-pick
-  "e"       #'magit-log-select-pick
-  "C-c C-c" #'magit-log-select-pick
-  "q"       #'magit-log-select-quit
-  "C-c C-k" #'magit-log-select-quit)
-(put 'magit-log-select-pick :advertised-binding [?\C-c ?\C-c])
-(put 'magit-log-select-quit :advertised-binding [?\C-c ?\C-k])
-
-(define-derived-mode magit-log-select-mode magit-log-mode "Magit Select"
-  "Mode for selecting a commit from history.
-
-This mode is documented in info node `(magit)Select from Log'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
-to visit the commit at point.
-
-\\<magit-log-select-mode-map>\
-Type \\[magit-log-select-pick] to select the commit at point.
-Type \\[magit-log-select-quit] to abort without selecting a commit."
-  :group 'magit-log
-  (hack-dir-local-variables-non-file-buffer))
-
-(put 'magit-log-select-mode 'magit-log-default-arguments
-     '("--graph" "-n256" "--decorate"))
-
-(defun magit-log-select-setup-buffer (revs args)
-  (magit-setup-buffer #'magit-log-select-mode nil
-    (magit-buffer-revisions revs)
-    (magit-buffer-log-args args)))
-
-(defun magit-log-select-refresh-buffer ()
-  (setq magit-section-inhibit-markers t)
-  (setq magit-section-insert-in-reverse t)
-  (magit-insert-section (logbuf)
-    (magit--insert-log t magit-buffer-revisions
-      (magit-log--maybe-drop-color-graph
-       magit-buffer-log-args
-       (magit-log-get-commit-limit)))))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-log-select-mode))
-  magit-buffer-revisions)
-
-(defvar-local magit-log-select-pick-function nil)
-(defvar-local magit-log-select-quit-function nil)
-
-(defun magit-log-select (pick &optional msg quit branch args initial)
-  (declare (indent defun))
-  (unless initial
-    (setq initial (magit-commit-at-point)))
-  (magit-log-select-setup-buffer
-   (or branch (magit-get-current-branch) "HEAD")
-   (append args
-           (car (magit-log--get-value 'magit-log-select-mode
-                                      magit-direct-use-buffer-arguments))))
-  (when initial
-    (magit-log-goto-commit-section initial))
-  (setq magit-log-select-pick-function pick)
-  (setq magit-log-select-quit-function quit)
-  (when magit-log-select-show-usage
-    (let ((pick (propertize (substitute-command-keys
-                             "\\[magit-log-select-pick]")
-                            'font-lock-face
-                            'magit-header-line-key))
-          (quit (propertize (substitute-command-keys
-                             "\\[magit-log-select-quit]")
-                            'font-lock-face
-                            'magit-header-line-key)))
-      (setq msg (format-spec
-                 (if msg
-                     (if (string-suffix-p "," msg)
-                         (concat msg " or %q to abort")
-                       msg)
-                   "Type %p to select commit at point, or %q to abort")
-                 `((?p . ,pick)
-                   (?q . ,quit)))))
-    (magit--add-face-text-property
-     0 (length msg) 'magit-header-line-log-select t msg)
-    (when (memq magit-log-select-show-usage '(both header-line))
-      (magit-set-header-line-format msg))
-    (when (memq magit-log-select-show-usage '(both echo-area))
-      (message "%s" (substring-no-properties msg)))))
-
-(defun 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."
-  (interactive)
-  (let ((fun magit-log-select-pick-function)
-        (rev (magit-commit-at-point)))
-    (magit-mode-bury-buffer 'kill)
-    (funcall fun rev)))
-
-(defun magit-log-select-quit ()
-  "Abort selecting a commit, don't act on any commit.
-Call `magit-log-select-quit-function' if set."
-  (interactive)
-  (let ((fun magit-log-select-quit-function))
-    (magit-mode-bury-buffer 'kill)
-    (when fun (funcall fun))))
-
-;;; Cherry Mode
-
-(defvar-keymap magit-cherry-mode-map
-  :doc "Keymap for `magit-cherry-mode'."
-  :parent magit-mode-map
-  "q" #'magit-log-bury-buffer
-  "L" #'magit-margin-settings)
-
-(define-derived-mode magit-cherry-mode magit-mode "Magit Cherry"
-  "Mode for looking at commits not merged upstream.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
-to visit the commit at point.
-
-Type \\[magit-cherry-pick] to apply the commit at point.
-
-\\{magit-cherry-mode-map}"
-  :group 'magit-log
-  (hack-dir-local-variables-non-file-buffer)
-  (setq magit--imenu-group-types 'cherries))
-
-(defun magit-cherry-setup-buffer (head upstream)
-  (magit-setup-buffer #'magit-cherry-mode nil
-    (magit-buffer-refname head)
-    (magit-buffer-upstream upstream)
-    (magit-buffer-range (concat upstream ".." head))))
-
-(defun magit-cherry-refresh-buffer ()
-  (setq magit-section-insert-in-reverse t)
-  (magit-insert-section (cherry)
-    (magit-run-section-hook 'magit-cherry-sections-hook)))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-cherry-mode))
-  magit-buffer-range)
-
-;;;###autoload
-(defun magit-cherry (head upstream)
-  "Show commits in a branch that are not merged in the upstream branch."
-  (interactive
-   (let  ((head (magit-read-branch "Cherry head")))
-     (list head (magit-read-other-branch "Cherry upstream" head
-                                         (magit-get-upstream-branch head)))))
-  (require 'magit)
-  (magit-cherry-setup-buffer head upstream))
-
-(defun magit-insert-cherry-headers ()
-  "Insert headers appropriate for `magit-cherry-mode' buffers."
-  (let ((branch (propertize magit-buffer-refname
-                            'font-lock-face 'magit-branch-local))
-        (upstream (propertize magit-buffer-upstream 'font-lock-face
-                              (if (magit-local-branch-p magit-buffer-upstream)
-                                  'magit-branch-local
-                                'magit-branch-remote))))
-    (magit-insert-head-branch-header branch)
-    (magit-insert-upstream-branch-header branch upstream "Upstream: ")
-    (insert ?\n)))
-
-(defun magit-insert-cherry-commits ()
-  "Insert commit sections into a `magit-cherry-mode' buffer."
-  (magit-insert-section (cherries)
-    (magit-insert-heading "Cherry commits:")
-    (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
-      "cherry" "-v" "--abbrev"
-      magit-buffer-upstream
-      magit-buffer-refname)))
-
-;;; Log Sections
-;;;; Standard Log Sections
-
-(defvar-keymap magit-log-section-map
-  :doc "Keymap for log sections.
-The classes `magit-{unpulled,unpushed,unmerged}-section' derive
-from the abstract `magit-log-section' class.  Accordingly this
-keymap is the parent of their keymaps."
-  "<remap> <magit-visit-thing>" #'magit-diff-dwim
-  "<1>" (magit-menu-item "Visit diff" #'magit-diff-dwim))
-
-(defvar-keymap magit-unpulled-section-map
-  :doc "Keymap for `unpulled' sections."
-  :parent magit-log-section-map)
-
-(cl-defmethod magit-section-ident-value ((section magit-unpulled-section))
-  "\"..@{push}\" cannot be used as the value because that is
-ambiguous if `push.default' does not allow a 1:1 mapping, and
-many commands would fail because of that.  But here that does
-not matter and we need an unique value so we use that string
-in the pushremote case."
-  (let ((value (oref section value)))
-    (if (equal value "..@{upstream}") value "..@{push}")))
-
-(magit-define-section-jumper magit-jump-to-unpulled-from-upstream
-  "Unpulled from @{upstream}" unpulled "..@{upstream}")
-
-(defun magit-insert-unpulled-from-upstream ()
-  "Insert commits that haven't been pulled from the upstream yet."
-  (when-let ((upstream (magit-get-upstream-branch)))
-    (magit-insert-section (unpulled "..@{upstream}" t)
-      (magit-insert-heading
-        (format (propertize "Unpulled from %s."
-                            'font-lock-face 'magit-section-heading)
-                upstream))
-      (magit--insert-log nil "..@{upstream}" magit-buffer-log-args)
-      (magit-log-insert-child-count))))
-
-(magit-define-section-jumper magit-jump-to-unpulled-from-pushremote
-  "Unpulled from <push-remote>" unpulled "..@{push}")
-
-(defun magit-insert-unpulled-from-pushremote ()
-  "Insert commits that haven't been pulled from the push-remote yet."
-  (when-let* ((target (magit-get-push-branch))
-              (range  (concat ".." target)))
-    (when (magit--insert-pushremote-log-p)
-      (magit-insert-section (unpulled range t)
-        (magit-insert-heading
-          (format (propertize "Unpulled from %s."
-                              'font-lock-face 'magit-section-heading)
-                  (propertize target 'font-lock-face 'magit-branch-remote)))
-        (magit--insert-log nil range magit-buffer-log-args)
-        (magit-log-insert-child-count)))))
-
-(defvar-keymap magit-unpushed-section-map
-  :doc "Keymap for `unpushed' sections."
-  :parent magit-log-section-map)
-
-(cl-defmethod magit-section-ident-value ((section magit-unpushed-section))
-  "\"..@{push}\" cannot be used as the value because that is
-ambiguous if `push.default' does not allow a 1:1 mapping, and
-many commands would fail because of that.  But here that does
-not matter and we need an unique value so we use that string
-in the pushremote case."
-  (let ((value (oref section value)))
-    (if (equal value "@{upstream}..") value "@{push}..")))
-
-(magit-define-section-jumper magit-jump-to-unpushed-to-upstream
-  "Unpushed to @{upstream}" unpushed "@{upstream}..")
-
-(defun magit-insert-unpushed-to-upstream-or-recent ()
-  "Insert section showing unpushed or other recent commits.
-If an upstream is configured for the current branch and it is
-behind of the current branch, then show the commits that have
-not yet been pushed into the upstream branch.  If no upstream is
-configured or if the upstream is not behind of the current branch,
-then show the last `magit-log-section-commit-count' commits."
-  (let ((upstream (magit-get-upstream-branch)))
-    (if (or (not upstream)
-            (magit-rev-ancestor-p "HEAD" upstream))
-        (magit-insert-recent-commits 'unpushed "@{upstream}..")
-      (magit-insert-unpushed-to-upstream))))
-
-(defun magit-insert-unpushed-to-upstream ()
-  "Insert commits that haven't been pushed to the upstream yet."
-  (when (magit-git-success "rev-parse" "@{upstream}")
-    (magit-insert-section (unpushed "@{upstream}..")
-      (magit-insert-heading
-        (format (propertize "Unmerged into %s."
-                            'font-lock-face 'magit-section-heading)
-                (magit-get-upstream-branch)))
-      (magit--insert-log nil "@{upstream}.." magit-buffer-log-args)
-      (magit-log-insert-child-count))))
-
-(defun magit-insert-recent-commits (&optional type value)
-  "Insert section showing recent commits.
-Show the last `magit-log-section-commit-count' commits."
-  (let* ((start (format "HEAD~%s" magit-log-section-commit-count))
-         (range (and (magit-rev-verify start)
-                     (concat start "..HEAD"))))
-    (magit-insert-section ((eval (or type 'recent))
-                           (or value range)
-                           t)
-      (magit-insert-heading "Recent commits")
-      (magit--insert-log nil range
-        (cons (format "-n%d" magit-log-section-commit-count)
-              (--remove (string-prefix-p "-n" it)
-                        magit-buffer-log-args))))))
-
-(magit-define-section-jumper magit-jump-to-unpushed-to-pushremote
-  "Unpushed to <push-remote>" unpushed "@{push}..")
-
-(defun magit-insert-unpushed-to-pushremote ()
-  "Insert commits that haven't been pushed to the push-remote yet."
-  (when-let* ((target (magit-get-push-branch))
-              (range  (concat target "..")))
-    (when (magit--insert-pushremote-log-p)
-      (magit-insert-section (unpushed range t)
-        (magit-insert-heading
-          (format (propertize "Unpushed to %s."
-                              'font-lock-face 'magit-section-heading)
-                  (propertize target 'font-lock-face 'magit-branch-remote)))
-        (magit--insert-log nil range magit-buffer-log-args)
-        (magit-log-insert-child-count)))))
-
-(defun magit--insert-pushremote-log-p ()
-  (magit--with-refresh-cache
-      (cons default-directory 'magit--insert-pushremote-log-p)
-    (not (and (equal (magit-get-push-branch)
-                     (magit-get-upstream-branch))
-              (or (memq 'magit-insert-unpulled-from-upstream
-                        magit-status-sections-hook)
-                  (memq 'magit-insert-unpulled-from-upstream-or-recent
-                        magit-status-sections-hook))))))
-
-(defun magit-log-insert-child-count ()
-  (when magit-section-show-child-count
-    (let ((count (length (oref magit-insert-section--current children))))
-      (when (> count 0)
-        (when (eq count (magit-log-get-commit-limit))
-          (setq count (format "%s+" count)))
-        (save-excursion
-          (goto-char (- (oref magit-insert-section--current content) 2))
-          (insert (format " (%s)" count))
-          (delete-char 1))))))
-
-;;;; Auxiliary Log Sections
-
-(defun magit-insert-unpulled-cherries ()
-  "Insert section showing unpulled commits.
-Like `magit-insert-unpulled-from-upstream' but prefix each commit
-which has not been applied yet (i.e., a commit with a patch-id
-not shared with any local commit) with \"+\", and all others with
-\"-\"."
-  (when (magit-git-success "rev-parse" "@{upstream}")
-    (magit-insert-section (unpulled "..@{upstream}")
-      (magit-insert-heading "Unpulled commits:")
-      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
-        "cherry" "-v" (magit-abbrev-arg)
-        (magit-get-current-branch) "@{upstream}"))))
-
-(defun magit-insert-unpushed-cherries ()
-  "Insert section showing unpushed commits.
-Like `magit-insert-unpushed-to-upstream' 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 \"-\"."
-  (when (magit-git-success "rev-parse" "@{upstream}")
-    (magit-insert-section (unpushed "@{upstream}..")
-      (magit-insert-heading "Unpushed commits:")
-      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
-        "cherry" "-v" (magit-abbrev-arg) "@{upstream}"))))
-
-;;; _
-(provide 'magit-log)
-;;; magit-log.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-log.elc b/emacs/elpa/magit-20240426.2118/magit-log.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-merge.el b/emacs/elpa/magit-20240426.2118/magit-merge.el
@@ -1,319 +0,0 @@
-;;; magit-merge.el --- Merge 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 merge commands.
-
-;;; Code:
-
-(require 'magit)
-(require 'magit-diff)
-
-(declare-function magit-git-push "magit-push" (branch target args))
-
-;;; Commands
-
-;;;###autoload (autoload 'magit-merge "magit" nil t)
-(transient-define-prefix magit-merge ()
-  "Merge branches."
-  :man-page "git-merge"
-  :incompatible '(("--ff-only" "--no-ff"))
-  ["Arguments"
-   :if-not magit-merge-in-progress-p
-   ("-f" "Fast-forward only" "--ff-only")
-   ("-n" "No fast-forward"   "--no-ff")
-   (magit-merge:--strategy)
-   (5 magit-merge:--strategy-option)
-   (5 "-b" "Ignore changes in amount of whitespace" "-Xignore-space-change")
-   (5 "-w" "Ignore whitespace when comparing lines" "-Xignore-all-space")
-   (5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
-   (5 magit:--gpg-sign)]
-  ["Actions"
-   :if-not magit-merge-in-progress-p
-   [("m" "Merge"                  magit-merge-plain)
-    ("e" "Merge and edit message" magit-merge-editmsg)
-    ("n" "Merge but don't commit" magit-merge-nocommit)
-    ("a" "Absorb"                 magit-merge-absorb)]
-   [("p" "Preview merge"          magit-merge-preview)
-    ""
-    ("s" "Squash merge"           magit-merge-squash)
-    ("i" "Dissolve"               magit-merge-into)]]
-  ["Actions"
-   :if magit-merge-in-progress-p
-   ("m" "Commit merge" magit-commit-create)
-   ("a" "Abort merge"  magit-merge-abort)])
-
-(defun magit-merge-arguments ()
-  (transient-args 'magit-merge))
-
-(transient-define-argument magit-merge:--strategy ()
-  :description "Strategy"
-  :class 'transient-option
-  ;; key for merge and rebase: "-s"
-  ;; key for cherry-pick and revert: "=s"
-  ;; shortarg for merge and rebase: "-s"
-  ;; shortarg for cherry-pick and revert: none
-  :key "-s"
-  :argument "--strategy="
-  :choices '("resolve" "recursive" "octopus" "ours" "subtree"))
-
-(transient-define-argument magit-merge:--strategy-option ()
-  :description "Strategy Option"
-  :class 'transient-option
-  :key "-X"
-  :argument "--strategy-option="
-  :choices '("ours" "theirs" "patience"))
-
-;;;###autoload
-(defun magit-merge-plain (rev &optional args nocommit)
-  "Merge commit REV into the current branch; using default message.
-
-Unless there are conflicts or a prefix argument is used create a
-merge commit using a generic commit message and without letting
-the user inspect the result.  With a prefix argument pretend the
-merge failed to give the user the opportunity to inspect the
-merge.
-
-\(git merge --no-edit|--no-commit [ARGS] REV)"
-  (interactive (list (magit-read-other-branch-or-commit "Merge")
-                     (magit-merge-arguments)
-                     current-prefix-arg))
-  (magit-merge-assert)
-  (magit-run-git-async "merge" (if nocommit "--no-commit" "--no-edit") args rev))
-
-;;;###autoload
-(defun magit-merge-editmsg (rev &optional args)
-  "Merge commit REV into the current branch; and edit message.
-Perform the merge and prepare a commit message but let the user
-edit it.
-\n(git merge --edit --no-ff [ARGS] REV)"
-  (interactive (list (magit-read-other-branch-or-commit "Merge")
-                     (magit-merge-arguments)))
-  (magit-merge-assert)
-  (cl-pushnew "--no-ff" args :test #'equal)
-  (apply #'magit-run-git-with-editor "merge" "--edit"
-         (append (delete "--ff-only" args)
-                 (list rev))))
-
-;;;###autoload
-(defun magit-merge-nocommit (rev &optional args)
-  "Merge commit REV into the current branch; pretending it failed.
-Pretend the merge failed to give the user the opportunity to
-inspect the merge and change the commit message.
-\n(git merge --no-commit --no-ff [ARGS] REV)"
-  (interactive (list (magit-read-other-branch-or-commit "Merge")
-                     (magit-merge-arguments)))
-  (magit-merge-assert)
-  (cl-pushnew "--no-ff" args :test #'equal)
-  (magit-run-git-async "merge" "--no-commit" args rev))
-
-;;;###autoload
-(defun magit-merge-into (branch &optional args)
-  "Merge the current branch into BRANCH and remove the former.
-
-Before merging, force push the source branch to its push-remote,
-provided the respective remote branch already exists, ensuring
-that the respective pull-request (if any) won't get stuck on some
-obsolete version of the commits that are being merged.  Finally
-if `forge-branch-pullreq' was used to create the merged branch,
-then also remove the respective remote branch."
-  (interactive
-   (list (magit-read-other-local-branch
-          (format "Merge `%s' into"
-                  (or (magit-get-current-branch)
-                      (magit-rev-parse "HEAD")))
-          nil
-          (and-let* ((upstream (magit-get-upstream-branch))
-                     (upstream (cdr (magit-split-branch-name upstream))))
-            (and (magit-branch-p upstream) upstream)))
-         (magit-merge-arguments)))
-  (let ((current (magit-get-current-branch))
-        (head (magit-rev-parse "HEAD")))
-    (when (zerop (magit-call-git "checkout" branch))
-      (if current
-          (magit--merge-absorb current args)
-        (magit-run-git-with-editor "merge" args head)))))
-
-;;;###autoload
-(defun magit-merge-absorb (branch &optional args)
-  "Merge BRANCH into the current branch and remove the former.
-
-Before merging, force push the source branch to its push-remote,
-provided the respective remote branch already exists, ensuring
-that the respective pull-request (if any) won't get stuck on some
-obsolete version of the commits that are being merged.  Finally
-if `forge-branch-pullreq' was used to create the merged branch,
-then also remove the respective remote branch."
-  (interactive (list (magit-read-other-local-branch "Absorb branch")
-                     (magit-merge-arguments)))
-  (magit--merge-absorb branch args))
-
-(defun magit--merge-absorb (branch args)
-  (when (equal branch (magit-main-branch))
-    (unless (yes-or-no-p
-             (format "Do you really want to merge `%s' into another branch? "
-                     branch))
-      (user-error "Abort")))
-  (if-let ((target (magit-get-push-branch branch t)))
-      (progn
-        (magit-git-push branch target (list "--force-with-lease"))
-        (set-process-sentinel
-         magit-this-process
-         (lambda (process event)
-           (when (memq (process-status process) '(exit signal))
-             (if (not (zerop (process-exit-status process)))
-                 (magit-process-sentinel process event)
-               (process-put process 'inhibit-refresh t)
-               (magit-process-sentinel process event)
-               (magit--merge-absorb-1 branch args))))))
-    (magit--merge-absorb-1 branch args)))
-
-(defun magit--merge-absorb-1 (branch args)
-  (if-let ((pr (magit-get "branch" branch "pullRequest")))
-      (magit-run-git-async
-       "merge" args "-m"
-       (format "Merge branch '%s'%s [#%s]"
-               branch
-               (let ((current (magit-get-current-branch)))
-                 (if (equal current (magit-main-branch))
-                     ""
-                   (format " into %s" current)))
-               pr)
-       branch)
-    (magit-run-git-async "merge" args "--no-edit" branch))
-  (set-process-sentinel
-   magit-this-process
-   (lambda (process event)
-     (when (memq (process-status process) '(exit signal))
-       (if (> (process-exit-status process) 0)
-           (magit-process-sentinel process event)
-         (process-put process 'inhibit-refresh t)
-         (magit-process-sentinel process event)
-         (magit-branch-maybe-delete-pr-remote branch)
-         (magit-branch-unset-pushRemote branch)
-         (magit-run-git "branch" "-D" branch))))))
-
-;;;###autoload
-(defun magit-merge-squash (rev)
-  "Squash commit REV into the current branch; don't create a commit.
-\n(git merge --squash REV)"
-  (interactive (list (magit-read-other-branch-or-commit "Squash")))
-  (magit-merge-assert)
-  (magit-run-git-async "merge" "--squash" rev))
-
-;;;###autoload
-(defun magit-merge-preview (rev)
-  "Preview result of merging REV into the current branch."
-  (interactive (list (magit-read-other-branch-or-commit "Preview merge")))
-  (magit-merge-preview-setup-buffer rev))
-
-;;;###autoload
-(defun magit-merge-abort ()
-  "Abort the current merge operation.
-\n(git merge --abort)"
-  (interactive)
-  (unless (file-exists-p (expand-file-name "MERGE_HEAD" (magit-gitdir)))
-    (user-error "No merge in progress"))
-  (magit-confirm 'abort-merge)
-  (magit-run-git-async "merge" "--abort"))
-
-(defun magit-checkout-stage (file arg)
-  "During a conflict checkout and stage side, or restore conflict."
-  (interactive
-   (let ((file (magit-completing-read "Checkout file"
-                                      (magit-tracked-files) nil nil nil
-                                      'magit-read-file-hist
-                                      (magit-current-file))))
-     (cond ((member file (magit-unmerged-files))
-            (list file (magit-checkout-read-stage file)))
-           ((yes-or-no-p (format "Restore conflicts in %s? " file))
-            (list file "--merge"))
-           (t
-            (user-error "Quit")))))
-  (pcase (cons arg (cddr (car (magit-file-status file))))
-    ((or `("--ours"   ?D ,_)
-         '("--ours"   ?U ?A)
-         `("--theirs" ,_ ?D)
-         '("--theirs" ?A ?U))
-     (magit-run-git "rm" "--" file))
-    (_ (if (equal arg "--merge")
-           ;; This fails if the file was deleted on one
-           ;; side.  And we cannot do anything about it.
-           (magit-run-git "checkout" "--merge" "--" file)
-         (magit-call-git "checkout" arg "--" file)
-         (magit-run-git "add" "-u" "--" file)))))
-
-;;; Utilities
-
-(defun magit-merge-in-progress-p ()
-  (file-exists-p (expand-file-name "MERGE_HEAD" (magit-gitdir))))
-
-(defun magit--merge-range (&optional head)
-  (unless head
-    (setq head (magit-get-shortname
-                (car (magit-file-lines
-                      (expand-file-name "MERGE_HEAD" (magit-gitdir)))))))
-  (and head
-       (concat (magit-git-string "merge-base" "--octopus" "HEAD" head)
-               ".." head)))
-
-(defun magit-merge-assert ()
-  (or (not (magit-anything-modified-p t))
-      (magit-confirm 'merge-dirty
-        "Merging with dirty worktree is risky.  Continue")))
-
-(defun magit-checkout-read-stage (file)
-  (magit-read-char-case (format "For %s checkout: " file) t
-    (?o "[o]ur stage"   "--ours")
-    (?t "[t]heir stage" "--theirs")
-    (?c (if magit-verbose-messages "restore [c]onflict" "[c]onflict")
-        "--merge")))
-
-;;; Sections
-
-(defvar-keymap magit-unmerged-section-map
-  :doc "Keymap for `unmerged' sections."
-  :parent magit-log-section-map)
-
-(defun 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."
-  (when (magit-merge-in-progress-p)
-    (let* ((heads (mapcar #'magit-get-shortname
-                          (magit-file-lines
-                           (expand-file-name "MERGE_HEAD" (magit-gitdir)))))
-           (range (magit--merge-range (car heads))))
-      (magit-insert-section (unmerged range)
-        (magit-insert-heading
-          (format "Merging %s:" (mapconcat #'identity heads ", ")))
-        (magit--insert-log nil
-          range
-          (let ((args magit-buffer-log-args))
-            (unless (member "--decorate=full" magit-buffer-log-args)
-              (push "--decorate=full" args))
-            args))))))
-
-;;; _
-(provide 'magit-merge)
-;;; magit-merge.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-merge.elc b/emacs/elpa/magit-20240426.2118/magit-merge.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-mode.el b/emacs/elpa/magit-20240426.2118/magit-mode.el
@@ -1,1437 +0,0 @@
-;;; magit-mode.el --- Create and refresh Magit buffers  -*- 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 the abstract major-mode `magit-mode' from
-;; which almost all other Magit major-modes derive.  The code in here
-;; is mostly concerned with creating and refreshing Magit buffers.
-
-;;; Code:
-
-(require 'magit-base)
-(require 'magit-git)
-
-(require 'format-spec)
-(require 'help-mode)
-
-(require 'transient)
-
-(defvar bookmark-make-record-function)
-(defvar magit--wip-inhibit-autosave)
-(defvar magit-wip-after-save-local-mode)
-(declare-function magit-wip-get-ref "magit-wip" ())
-(declare-function magit-wip-commit-worktree "magit-wip" (ref files msg))
-
-;;; Options
-
-(defcustom magit-mode-hook
-  '(magit-load-config-extensions)
-  "Hook run when entering a mode derived from Magit mode."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-modes
-  :type 'hook
-  :options '(magit-load-config-extensions
-             bug-reference-mode))
-
-(defcustom magit-setup-buffer-hook
-  '(magit-maybe-save-repository-buffers
-    magit-set-buffer-margin)
-  "Hook run by `magit-setup-buffer'.
-
-This is run right after displaying the buffer and right before
-generating or updating its content.  `magit-mode-hook' and other,
-more specific, `magit-mode-*-hook's on the other hand are run
-right before displaying the buffer.  Usually one of these hooks
-should be used instead of this one."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-modes
-  :type 'hook
-  :options '(magit-maybe-save-repository-buffers
-             magit-set-buffer-margin))
-
-(defcustom magit-pre-refresh-hook '(magit-maybe-save-repository-buffers)
-  "Hook run before refreshing in `magit-refresh'.
-
-This hook, or `magit-post-refresh-hook', should be used
-for functions that are not tied to a particular buffer.
-
-To run a function with a particular buffer current, use
-`magit-refresh-buffer-hook' and use `derived-mode-p'
-inside your function."
-  :package-version '(magit . "2.4.0")
-  :group 'magit-refresh
-  :type 'hook
-  :options '(magit-maybe-save-repository-buffers))
-
-(defcustom magit-post-refresh-hook
-  '(magit-auto-revert-buffers
-    magit-run-post-commit-hook
-    magit-run-post-stage-hook
-    magit-run-post-unstage-hook)
-  "Hook run after refreshing in `magit-refresh'.
-
-This hook, or `magit-pre-refresh-hook', should be used
-for functions that are not tied to a particular buffer.
-
-To run a function with a particular buffer current, use
-`magit-refresh-buffer-hook' and use `derived-mode-p'
-inside your function."
-  :package-version '(magit . "2.4.0")
-  :group 'magit-refresh
-  :type 'hook
-  :options '(magit-auto-revert-buffers
-             magit-run-post-commit-hook
-             magit-run-post-stage-hook
-             magit-run-post-unstage-hook))
-
-(defcustom magit-display-buffer-function #'magit-display-buffer-traditional
-  "The function used to display a Magit buffer.
-
-All Magit buffers (buffers whose major-modes derive from
-`magit-mode') are displayed using `magit-display-buffer',
-which in turn uses the function specified here."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-buffers
-  :type '(radio (function-item magit-display-buffer-traditional)
-                (function-item magit-display-buffer-same-window-except-diff-v1)
-                (function-item magit-display-buffer-fullframe-status-v1)
-                (function-item magit-display-buffer-fullframe-status-topleft-v1)
-                (function-item magit-display-buffer-fullcolumn-most-v1)
-                (function-item display-buffer)
-                (function :tag "Function")))
-
-(defcustom magit-pre-display-buffer-hook '(magit-save-window-configuration)
-  "Hook run by `magit-display-buffer' before displaying the buffer."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-buffers
-  :type 'hook
-  :get #'magit-hook-custom-get
-  :options '(magit-save-window-configuration))
-
-(defcustom magit-post-display-buffer-hook '(magit-maybe-set-dedicated)
-  "Hook run by `magit-display-buffer' after displaying the buffer."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-buffers
-  :type 'hook
-  :get #'magit-hook-custom-get
-  :options '(magit-maybe-set-dedicated))
-
-(defcustom magit-generate-buffer-name-function
-  #'magit-generate-buffer-name-default-function
-  "The function used to generate the name for a Magit buffer."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-buffers
-  :type '(radio (function-item magit-generate-buffer-name-default-function)
-                (function :tag "Function")))
-
-(defcustom magit-buffer-name-format "%x%M%v: %t%x"
-  "The format string used to name Magit buffers.
-
-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.
-
-This is used by `magit-generate-buffer-name-default-function'.
-If another `magit-generate-buffer-name-function' is used, then
-it may not respect this option, or on the contrary it may
-support additional %-sequences."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-buffers
-  :type 'string)
-
-(defcustom magit-uniquify-buffer-names t
-  "Whether to uniquify the names of Magit buffers."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-buffers
-  :type 'boolean)
-
-(defcustom magit-bury-buffer-function #'magit-mode-quit-window
-  "The function used to bury or kill the current Magit buffer."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-buffers
-  :type '(radio (function-item quit-window)
-                (function-item magit-mode-quit-window)
-                (function-item magit-restore-window-configuration)
-                (function :tag "Function")))
-
-(defcustom magit-prefix-use-buffer-arguments 'selected
-  "Whether certain prefix commands reuse arguments active in relevant buffer.
-
-This affects the transient prefix commands `magit-diff',
-`magit-log' and `magit-show-refs'.
-
-Valid values are:
-
-`always': Always use the set of arguments that is currently
-  active in the respective buffer, provided that buffer exists
-  of course.
-`selected': 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.
-`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.
-
-For more information see info node `(magit)Transient Arguments
-and Buffer Variables'."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-buffers
-  :group 'magit-commands
-  :group 'magit-diff
-  :group 'magit-log
-  :type '(choice
-          (const :tag "always use args from buffer" always)
-          (const :tag "use args from buffer if displayed in frame" selected)
-          (const :tag "use args from buffer if it is current" current)
-          (const :tag "never use args from buffer" never)))
-
-(defcustom magit-direct-use-buffer-arguments 'selected
-  "Whether certain commands reuse arguments active in relevant buffer.
-
-This affects certain commands such as `magit-show-commit' that
-are suffixes of the diff or log transient prefix commands, but
-only if they are invoked directly, i.e., *not* as a suffix.
-
-Valid values are:
-
-`always': Always use the set of arguments that is currently
-  active in the respective buffer, provided that buffer exists
-  of course.
-`selected': 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.
-`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.
-
-For more information see info node `(magit)Transient Arguments
-and Buffer Variables'."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-buffers
-  :group 'magit-commands
-  :group 'magit-diff
-  :group 'magit-log
-  :type '(choice
-          (const :tag "always use args from buffer" always)
-          (const :tag "use args from buffer if displayed in frame" selected)
-          (const :tag "use args from buffer if it is current" current)
-          (const :tag "never use args from buffer" never)))
-
-(defcustom magit-region-highlight-hook '(magit-diff-update-hunk-region)
-  "Functions used to highlight the region.
-
-Each function is run with the current section as only argument
-until one of them returns non-nil.  If all functions return nil,
-then fall back to regular region highlighting."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refresh
-  :type 'hook
-  :options '(magit-diff-update-hunk-region))
-
-(defcustom magit-create-buffer-hook nil
-  "Normal hook run after creating a new `magit-mode' buffer."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-refresh
-  :type 'hook)
-
-(defcustom magit-refresh-buffer-hook nil
-  "Normal hook for `magit-refresh-buffer' to run after refreshing."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refresh
-  :type 'hook)
-
-(defcustom magit-refresh-status-buffer t
-  "Whether the status buffer is refreshed after running git.
-
-When this 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."
-  :package-version '(magit . "2.4.0")
-  :group 'magit-refresh
-  :group 'magit-status
-  :type 'boolean)
-
-(defcustom magit-refresh-verbose nil
-  "Whether to revert Magit buffers verbosely."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refresh
-  :type 'boolean)
-
-(defcustom magit-save-repository-buffers t
-  "Whether to save file-visiting buffers when appropriate.
-
-If non-nil, then all modified file-visiting buffers belonging
-to the current repository may be saved before running Magit
-commands and before creating or refreshing Magit buffers.
-If `dontask', then this is done without user intervention, for
-any other non-nil value the user has to confirm each save.
-
-The default is t to avoid surprises, but `dontask' is the
-recommended value."
-  :group 'magit-essentials
-  :group 'magit-buffers
-  :type '(choice (const :tag "Never" nil)
-                 (const :tag "Ask" t)
-                 (const :tag "Save without asking" dontask)))
-
-;;; Key Bindings
-
-(defvar-keymap magit-mode-map
-  :doc "Parent keymap for all keymaps of modes derived from `magit-mode'."
-  :parent magit-section-mode-map
-  ;; Don't function-quote but make sure all commands are autoloaded.
-  "C-<return>"  'magit-visit-thing
-  "RET"         'magit-visit-thing
-  "M-TAB"       'magit-dired-jump
-  "M-<tab>"     'magit-section-cycle-diffs
-  "SPC"         'magit-diff-show-or-scroll-up
-  "S-SPC"       'magit-diff-show-or-scroll-down
-  "DEL"         'magit-diff-show-or-scroll-down
-  "+"           'magit-diff-more-context
-  "-"           'magit-diff-less-context
-  "0"           'magit-diff-default-context
-  "a" 'magit-cherry-apply
-  "A" 'magit-cherry-pick
-  "b" 'magit-branch
-  "B" 'magit-bisect
-  "c" 'magit-commit
-  "C" 'magit-clone
-  "d" 'magit-diff
-  "D" 'magit-diff-refresh
-  "e" 'magit-ediff-dwim
-  "E" 'magit-ediff
-  "f" 'magit-fetch
-  "F" 'magit-pull
-  "g" 'magit-refresh
-  "G" 'magit-refresh-all
-  "h" 'magit-dispatch
-  "?" 'magit-dispatch
-  "H" 'magit-describe-section
-  "i" 'magit-gitignore
-  "I" 'magit-init
-  "j" 'magit-status-quick
-  "J" 'magit-display-repository-buffer
-  "k" 'magit-delete-thing
-  "K" 'magit-file-untrack
-  "l" 'magit-log
-  "L" 'magit-log-refresh
-  "m" 'magit-merge
-  "M" 'magit-remote
-  ;; "n" magit-section-forward in magit-section-mode-map
-  ;; "N" forge-dispatch, added by forge package
-  "o" 'magit-submodule
-  "O" 'magit-subtree
-  ;; "p" magit-section-backward in magit-section-mode-map
-  "P" 'magit-push
-  "q" 'magit-mode-bury-buffer
-  "Q" 'magit-git-command
-  ":" 'magit-git-command
-  "r" 'magit-rebase
-  "R" 'magit-file-rename
-  "s" 'magit-stage-file
-  "S" 'magit-stage-modified
-  "t" 'magit-tag
-  "T" 'magit-notes
-  "u" 'magit-unstage-file
-  "U" 'magit-unstage-all
-  "v" 'magit-revert-no-commit
-  "V" 'magit-revert
-  "w" 'magit-am
-  "W" 'magit-patch
-  "x" 'magit-reset-quickly
-  "X" 'magit-reset
-  "y" 'magit-show-refs
-  "Y" 'magit-cherry
-  "z" 'magit-stash
-  "Z" 'magit-worktree
-  "%" 'magit-worktree
-  "$" 'magit-process-buffer
-  "!" 'magit-run
-  ">" 'magit-sparse-checkout
-  "C-c C-c" 'magit-dispatch
-  "C-c C-e" 'magit-edit-thing
-  "C-c C-o" 'magit-browse-thing
-  "C-c C-w" 'magit-copy-thing
-  "C-w"     'magit-copy-section-value
-  "M-w"     'magit-copy-buffer-revision
-  "<remap> <previous-line>"      'magit-previous-line
-  "<remap> <next-line>"          'magit-next-line
-  "<remap> <evil-previous-line>" 'evil-previous-visual-line
-  "<remap> <evil-next-line>"     'evil-next-visual-line)
-
-(defun magit-delete-thing ()
-  "This is a placeholder command, which signals an error if called.
-Where applicable, other keymaps remap this command to another,
-which actually deletes the thing at point."
-  (interactive)
-  (user-error "There is no thing at point that could be deleted"))
-;; Starting with Emacs 28.1 we could use (declare (completion ignore)).
-(put 'magit-delete-thing 'completion-predicate #'ignore)
-
-(defun magit-visit-thing ()
-  "This is a placeholder command, which may signal an error if called.
-Where applicable, other keymaps remap this command to another,
-which actually visits the thing at point."
-  (interactive)
-  (if (eq transient-current-command 'magit-dispatch)
-      (call-interactively (key-binding (this-command-keys)))
-    (user-error "There is no thing at point that could be visited")))
-(put 'magit-visit-thing 'completion-predicate #'ignore)
-
-(defun magit-edit-thing ()
-  "This is a placeholder command, which may signal an error if called.
-Where applicable, other keymaps remap this command to another,
-which actually lets you edit the thing at point, likely in another
-buffer."
-  (interactive)
-  (if (eq transient-current-command 'magit-dispatch)
-      (call-interactively (key-binding (this-command-keys)))
-    (user-error "There is no thing at point that could be edited")))
-(put 'magit-edit-thing 'completion-predicate #'ignore)
-
-(defun magit-browse-thing ()
-  "This is a placeholder command, which signals an error if called.
-Where applicable, other keymaps remap this command to another,
-which actually visits thing at point using `browse-url'."
-  (interactive)
-  (user-error "There is no thing at point that could be browsed"))
-(put 'magit-browse-thing 'completion-predicate #'ignore)
-
-(defun magit-copy-thing ()
-  "This is a placeholder command, which signals an error if called.
-Where applicable, other keymaps remap this command to another,
-which actually copies some representation of the thing at point
-to the kill ring."
-  (interactive)
-  (user-error "There is no thing at point that we know how to copy"))
-(put 'magit-copy-thing 'completion-predicate #'ignore)
-
-;;;###autoload
-(defun magit-info ()
-  "Visit the Magit manual."
-  (interactive)
-  (info "magit"))
-
-(defvar bug-reference-map)
-(with-eval-after-load 'bug-reference
-  (keymap-set bug-reference-map "<remap> <magit-visit-thing>"
-              'bug-reference-push-button))
-
-(easy-menu-define magit-mode-menu magit-mode-map
-  "Magit menu"
-  ;; Similar to `magit-dispatch' but exclude:
-  ;; - commands that are available from context menus:
-  ;;   apply, reverse, discard, stage, unstage,
-  ;;   cherry-pick, revert, reset,
-  ;;   describe-section
-  ;; - commands that are available from submenus:
-  ;;   git-command, ediff-dwim
-  ;; - and: refresh-all, status-jump, status-quick.
-  '("Magit"
-    "---" "Inspect"
-    ["     Bisect..."             magit-bisect t]
-    ["     Cherries..."           magit-cherry t]
-    ["     Diff..."               magit-diff t]
-    ["     Ediff..."              magit-ediff t]
-    ["     Log..."                magit-log t]
-    ["     References..."         magit-show-refs t]
-    "---" "Manipulate"
-    ["     Commit..."             magit-commit t]
-    ["     Stash..."              magit-stash t]
-    ["     Tag..."                magit-tag t]
-    "---"
-    ["     Branch..."             magit-branch t]
-    ["     Remote..."             magit-remote t]
-    "---"
-    ["     Merge..."              magit-merge t]
-    ["     Rebase..."             magit-rebase t]
-    "---" "Transfer"
-    ["     Fetch..."              magit-fetch t]
-    ["     Pull..."               magit-pull t]
-    ["     Push..."               magit-push t]
-    "---" "Setup"
-    ["     Clone..."              magit-clone t]
-    ["     Ignore..."             magit-gitignore t]
-    ["     Init..."               magit-init t]
-    "---"
-    ("Advanced"
-     ["Run..."                    magit-run t]
-     "---"
-     ["Apply patches..."          magit-am t]
-     ["Format patches..."         magit-patch t]
-     "---"
-     ["Note..."                   magit-notes t]
-     "---"
-     ["Submodule..."              magit-submodule t]
-     ["Subtree..."                magit-subtree t]
-     ["Worktree..."               magit-worktree t])
-    "---"
-    ["Show command dispatcher..." magit-dispatch t]
-    ["Show manual"                magit-info t]
-    ["Show another buffer"        magit-display-repository-buffer t]
-    "---"
-    ("Change buffer arguments"
-     ["Diff arguments"            magit-diff-refresh t]
-     ["Log arguments"             magit-log-refresh t])
-    ["Refresh buffer"             magit-refresh t]
-    ["Bury buffer"                magit-mode-bury-buffer t]))
-
-;;; Mode
-
-(defun magit-load-config-extensions ()
-  "Load Magit extensions that are defined at the Git config layer."
-  (dolist (ext (magit-get-all "magit.extension"))
-    (let ((sym (intern (format "magit-%s-mode" ext))))
-      (when (fboundp sym)
-        (funcall sym 1)))))
-
-(define-derived-mode magit-mode magit-section-mode "Magit"
-  "Parent major mode from which Magit major modes inherit.
-
-Magit is documented in info node `(magit)'."
-  :group 'magit
-  (hack-dir-local-variables-non-file-buffer)
-  (face-remap-add-relative 'header-line 'magit-header-line)
-  (setq mode-line-process (magit-repository-local-get 'mode-line-process))
-  (setq-local revert-buffer-function #'magit-refresh-buffer)
-  (setq-local bookmark-make-record-function #'magit--make-bookmark)
-  (setq-local imenu-create-index-function #'magit--imenu-create-index)
-  (setq-local imenu-default-goto-function #'magit--imenu-goto-function)
-  (setq-local isearch-filter-predicate #'magit-section--open-temporarily))
-
-;;; Local Variables
-
-(defvar-local magit-buffer-arguments nil)
-(defvar-local magit-buffer-diff-type nil)
-(defvar-local magit-buffer-diff-args nil)
-(defvar-local magit-buffer-diff-files nil)
-(defvar-local magit-buffer-diff-files-suspended nil)
-(defvar-local magit-buffer-file-name nil)
-(defvar-local magit-buffer-files nil)
-(defvar-local magit-buffer-log-args nil)
-(defvar-local magit-buffer-log-files nil)
-(defvar-local magit-buffer-range nil)
-(defvar-local magit-buffer-range-hashed nil)
-(defvar-local magit-buffer-refname nil)
-(defvar-local magit-buffer-revision nil)
-(defvar-local magit-buffer-revision-hash nil)
-(defvar-local magit-buffer-revisions nil)
-(defvar-local magit-buffer-typearg nil)
-(defvar-local magit-buffer-upstream nil)
-
-;; These variables are also used in file-visiting buffers.
-;; Because the user may change the major-mode, they have
-;; to be permanent buffer-local.
-(put 'magit-buffer-file-name 'permanent-local t)
-(put 'magit-buffer-refname 'permanent-local t)
-(put 'magit-buffer-revision 'permanent-local t)
-(put 'magit-buffer-revision-hash 'permanent-local t)
-
-;; `magit-status' re-enables mode function but its refresher
-;; function does not reinstate this.
-(put 'magit-buffer-diff-files-suspended 'permanent-local t)
-
-(cl-defgeneric magit-buffer-value ()
-  "Return the value of the current buffer.
-The \"value\" identifies what is being displayed in the buffer.
-The buffer's major-mode should derive from `magit-section-mode'."
-  nil)
-
-(defvar-local magit-previous-section nil)
-(put 'magit-previous-section 'permanent-local t)
-
-;;; Setup Buffer
-
-(defmacro magit-setup-buffer (mode &optional locked &rest bindings)
-  (declare (indent 2))
-  `(magit-setup-buffer-internal
-    ,mode ,locked
-    ,(cons 'list (mapcar (pcase-lambda (`(,var ,form))
-                           `(list ',var ,form))
-                         bindings))))
-
-(defun magit-setup-buffer-internal ( mode locked bindings
-                                     &optional buffer-or-name)
-  (let* ((value   (and locked
-                       (with-temp-buffer
-                         (pcase-dolist (`(,var ,val) bindings)
-                           (set (make-local-variable var) val))
-                         (let ((major-mode mode))
-                           (magit-buffer-value)))))
-         (buffer  (if buffer-or-name
-                      (get-buffer-create buffer-or-name)
-                    (magit-get-mode-buffer mode value)))
-         (section (and buffer (magit-current-section)))
-         (created (not buffer)))
-    (unless buffer
-      (setq buffer (magit-generate-new-buffer mode value)))
-    (with-current-buffer buffer
-      (setq magit-previous-section section)
-      (funcall mode)
-      (magit-xref-setup #'magit-setup-buffer-internal bindings)
-      (pcase-dolist (`(,var ,val) bindings)
-        (set (make-local-variable var) val))
-      (when created
-        (run-hooks 'magit-create-buffer-hook)))
-    (magit-display-buffer buffer)
-    (with-current-buffer buffer
-      (run-hooks 'magit-setup-buffer-hook)
-      (magit-refresh-buffer))
-    buffer))
-
-;;; Display Buffer
-
-(defvar magit-display-buffer-noselect nil
-  "If non-nil, then `magit-display-buffer' doesn't call `select-window'.")
-
-(defun magit-display-buffer (buffer &optional display-function)
-  "Display BUFFER in some window and maybe select it.
-
-If optional DISPLAY-FUNCTION is non-nil, then use that to display
-the buffer.  Otherwise use `magit-display-buffer-function', which
-is the normal case.
-
-Then, unless `magit-display-buffer-noselect' is non-nil, select
-the window which was used to display the buffer.
-
-Also run the hooks `magit-pre-display-buffer-hook'
-and `magit-post-display-buffer-hook'."
-  (with-current-buffer buffer
-    (run-hooks 'magit-pre-display-buffer-hook))
-  (let ((window (funcall (or display-function magit-display-buffer-function)
-                         buffer)))
-    (unless magit-display-buffer-noselect
-      (let* ((old-frame (selected-frame))
-             (new-frame (window-frame window)))
-        (select-window window)
-        (unless (eq old-frame new-frame)
-          (select-frame-set-input-focus new-frame)))))
-  (with-current-buffer buffer
-    (run-hooks 'magit-post-display-buffer-hook)))
-
-(defun magit-display-buffer-traditional (buffer)
-  "Display BUFFER the way this has traditionally been done."
-  (display-buffer
-   buffer (if (and (derived-mode-p 'magit-mode)
-                   (not (memq (with-current-buffer buffer major-mode)
-                              '(magit-process-mode
-                                magit-revision-mode
-                                magit-diff-mode
-                                magit-stash-mode
-                                magit-status-mode))))
-              '(display-buffer-same-window)
-            nil))) ; display in another window
-
-(defun magit-display-buffer-same-window-except-diff-v1 (buffer)
-  "Display BUFFER in the selected window except for some modes.
-If a buffer's `major-mode' derives from `magit-diff-mode' or
-`magit-process-mode', display it in another window.  Display all
-other buffers in the selected window."
-  (display-buffer
-   buffer (if (with-current-buffer buffer
-                (derived-mode-p 'magit-diff-mode 'magit-process-mode))
-              '(nil (inhibit-same-window . t))
-            '(display-buffer-same-window))))
-
-(defun magit--display-buffer-fullframe (buffer alist)
-  (when-let ((window (or (display-buffer-reuse-window buffer alist)
-                         (display-buffer-same-window buffer alist)
-                         (display-buffer-pop-up-window buffer alist)
-                         (display-buffer-use-some-window buffer alist))))
-    (delete-other-windows window)
-    window))
-
-(defun magit-display-buffer-fullframe-status-v1 (buffer)
-  "Display BUFFER, filling entire frame if BUFFER is a status buffer.
-Otherwise, behave like `magit-display-buffer-traditional'."
-  (if (eq (with-current-buffer buffer major-mode)
-          'magit-status-mode)
-      (display-buffer buffer '(magit--display-buffer-fullframe))
-    (magit-display-buffer-traditional buffer)))
-
-(defun magit--display-buffer-topleft (buffer alist)
-  (or (display-buffer-reuse-window buffer alist)
-      (when-let ((window2 (display-buffer-pop-up-window buffer alist)))
-        (let ((window1 (get-buffer-window))
-              (buffer1 (current-buffer))
-              (buffer2 (window-buffer window2))
-              (w2-quit-restore (window-parameter window2 'quit-restore)))
-          (set-window-buffer window1 buffer2)
-          (set-window-buffer window2 buffer1)
-          (select-window window2)
-          ;; Swap some window state that `magit-mode-quit-window' and
-          ;; `quit-restore-window' inspect.
-          (set-window-prev-buffers window2 (cdr (window-prev-buffers window1)))
-          (set-window-prev-buffers window1 nil)
-          (set-window-parameter window2 'magit-dedicated
-                                (window-parameter window1 'magit-dedicated))
-          (set-window-parameter window1 'magit-dedicated t)
-          (set-window-parameter window1 'quit-restore
-                                (list 'window 'window
-                                      (nth 2 w2-quit-restore)
-                                      (nth 3 w2-quit-restore)))
-          (set-window-parameter window2 'quit-restore nil)
-          window1))))
-
-(defun magit-display-buffer-fullframe-status-topleft-v1 (buffer)
-  "Display BUFFER, filling entire frame if BUFFER is a status buffer.
-When BUFFER derives from `magit-diff-mode' or
-`magit-process-mode', try to display BUFFER to the top or left of
-the current buffer rather than to the bottom or right, as
-`magit-display-buffer-fullframe-status-v1' would.  Whether the
-split is made vertically or horizontally is determined by
-`split-window-preferred-function'."
-  (display-buffer
-   buffer
-   (cond ((eq (with-current-buffer buffer major-mode)
-              'magit-status-mode)
-          '(magit--display-buffer-fullframe))
-         ((with-current-buffer buffer
-            (derived-mode-p 'magit-diff-mode 'magit-process-mode))
-          '(magit--display-buffer-topleft))
-         (t
-          '(display-buffer-same-window)))))
-
-(defun magit--display-buffer-fullcolumn (buffer alist)
-  (when-let ((window (or (display-buffer-reuse-window buffer alist)
-                         (display-buffer-same-window buffer alist)
-                         (display-buffer-below-selected buffer alist))))
-    (delete-other-windows-vertically window)
-    window))
-
-(defun magit-display-buffer-fullcolumn-most-v1 (buffer)
-  "Display BUFFER using the full column except in some cases.
-For most cases where BUFFER's `major-mode' derives from
-`magit-mode', display it in the selected window and grow that
-window to the full height of the frame, deleting other windows in
-that column as necessary.  However, display BUFFER in another
-window if 1) BUFFER's mode derives from `magit-process-mode', or
-2) 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'."
-  (display-buffer
-   buffer
-   (cond ((and (or (bound-and-true-p git-commit-mode)
-                   (derived-mode-p 'magit-log-mode
-                                   'magit-cherry-mode
-                                   'magit-reflog-mode))
-               (with-current-buffer buffer
-                 (derived-mode-p 'magit-diff-mode)))
-          nil)
-         ((with-current-buffer buffer
-            (derived-mode-p 'magit-process-mode))
-          nil)
-         (t
-          '(magit--display-buffer-fullcolumn)))))
-
-(defun magit-maybe-set-dedicated ()
-  "Mark the selected window as dedicated if appropriate.
-
-If a new window was created to display the buffer, then remember
-that fact.  That information is used by `magit-mode-quit-window',
-to determine whether the window should be deleted when its last
-Magit buffer is buried."
-  (let ((window (get-buffer-window (current-buffer))))
-    (when (and (window-live-p window)
-               (not (window-prev-buffers window)))
-      (set-window-parameter window 'magit-dedicated t))))
-
-;;; Get Buffer
-
-(defvar-local magit--default-directory nil
-  "Value of `default-directory' when buffer is generated.
-This exists to prevent a let-bound `default-directory' from
-tricking `magit-get-mode-buffer' or `magit-mode-get-buffers'
-into thinking a buffer belongs to a repo that it doesn't.")
-(put 'magit--default-directory 'permanent-local t)
-
-(defun magit-mode-get-buffers ()
-  (let ((topdir (magit-toplevel)))
-    (--filter (with-current-buffer it
-                (and (derived-mode-p 'magit-mode)
-                     (equal magit--default-directory topdir)))
-              (buffer-list))))
-
-(defvar-local magit-buffer-locked-p nil)
-(put 'magit-buffer-locked-p 'permanent-local t)
-
-(defun magit-get-mode-buffer (mode &optional value frame)
-  "Return buffer belonging to the current repository whose major-mode is MODE.
-
-If no such buffer exists then return nil.  Multiple buffers with
-the same major-mode may exist for a repository but only one can
-exist that hasn't been locked to its value.  Return that buffer
-\(or nil if there is no such buffer) unless VALUE is non-nil, in
-which case return the buffer that has been locked to that value.
-
-If FRAME is nil or omitted, then consider all buffers.  Otherwise
-  only consider buffers that are displayed in some live window
-  on some frame.
-If `all', then consider all buffers on all frames.
-If `visible', then only consider buffers on all visible frames.
-If `selected' or t, then only consider buffers on the selected
-  frame.
-If a frame, then only consider buffers on that frame."
-  (let ((topdir (magit--toplevel-safe)))
-    (cl-flet* ((b (buffer)
-                 (with-current-buffer buffer
-                   (and (eq major-mode mode)
-                        (equal magit--default-directory topdir)
-                        (if value
-                            (and magit-buffer-locked-p
-                                 (equal (magit-buffer-value) value))
-                          (not magit-buffer-locked-p))
-                        buffer)))
-               (w (window)
-                 (b (window-buffer window)))
-               (f (frame)
-                 (seq-some #'w (window-list frame 'no-minibuf))))
-      (pcase-exhaustive frame
-        ('nil                   (seq-some #'b (buffer-list)))
-        ('all                   (seq-some #'f (frame-list)))
-        ('visible               (seq-some #'f (visible-frame-list)))
-        ((or 'selected 't)      (seq-some #'w (window-list (selected-frame))))
-        ((guard (framep frame)) (seq-some #'w (window-list frame)))))))
-
-(defun magit-generate-new-buffer (mode &optional value directory)
-  (let* ((default-directory (or directory (magit--toplevel-safe)))
-         (name (funcall magit-generate-buffer-name-function mode value))
-         (buffer (generate-new-buffer name)))
-    (with-current-buffer buffer
-      (setq magit--default-directory default-directory)
-      (setq magit-buffer-locked-p (and value t))
-      (magit-restore-section-visibility-cache mode))
-    (when magit-uniquify-buffer-names
-      (add-to-list 'uniquify-list-buffers-directory-modes mode)
-      (with-current-buffer buffer
-        (setq list-buffers-directory (abbreviate-file-name default-directory)))
-      (let ((uniquify-buffer-name-style
-             (if (memq uniquify-buffer-name-style '(nil forward))
-                 'post-forward-angle-brackets
-               uniquify-buffer-name-style)))
-        (uniquify-rationalize-file-buffer-names
-         name (file-name-directory (directory-file-name default-directory))
-         buffer)))
-    buffer))
-
-(defun magit-generate-buffer-name-default-function (mode &optional value)
-  "Generate buffer name for a MODE buffer in the current repository.
-The returned name is based on `magit-buffer-name-format' and
-takes `magit-uniquify-buffer-names' and VALUE, if non-nil, into
-account."
-  (let ((m (substring (symbol-name mode) 0 -5))
-        (v (and value (format "%s" (if (listp value) value (list value)))))
-        (n (if magit-uniquify-buffer-names
-               (file-name-nondirectory
-                (directory-file-name default-directory))
-             (abbreviate-file-name default-directory))))
-    (format-spec
-     magit-buffer-name-format
-     `((?m . ,m)
-       (?M . ,(if (eq mode 'magit-status-mode) "magit" m))
-       (?v . ,(or v ""))
-       (?V . ,(if v (concat " " v) ""))
-       (?t . ,n)
-       (?x . ,(if magit-uniquify-buffer-names "" "*"))))))
-
-;;; Buffer Lock
-
-(defun magit-toggle-buffer-lock ()
-  "Lock the current buffer to its value or unlock 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."
-  (interactive)
-  (if magit-buffer-locked-p
-      (if-let ((unlocked (magit-get-mode-buffer major-mode)))
-          (let ((locked (current-buffer)))
-            (switch-to-buffer unlocked nil t)
-            (kill-buffer locked))
-        (setq magit-buffer-locked-p nil)
-        (rename-buffer (funcall magit-generate-buffer-name-function
-                                major-mode)))
-    (if-let ((value (magit-buffer-value)))
-        (if-let ((locked (magit-get-mode-buffer major-mode value)))
-            (let ((unlocked (current-buffer)))
-              (switch-to-buffer locked nil t)
-              (kill-buffer unlocked))
-          (setq magit-buffer-locked-p t)
-          (rename-buffer (funcall magit-generate-buffer-name-function
-                                  major-mode value)))
-      (user-error "Buffer has no value it could be locked to"))))
-
-;;; Bury Buffer
-
-(defun magit-mode-bury-buffer (&optional kill-buffer)
-  "Bury or kill the current buffer.
-
-Use `magit-bury-buffer-function' to bury the buffer when called
-without a prefix argument or to kill it when called with a single
-prefix argument.
-
-With two prefix arguments, always kill the current and all other
-Magit buffers, associated with this repository."
-  (interactive "P")
-  (if (>= (prefix-numeric-value kill-buffer) 16)
-      (mapc #'kill-buffer (magit-mode-get-buffers))
-    (funcall magit-bury-buffer-function kill-buffer)))
-
-(defun magit-mode-quit-window (kill-buffer)
-  "Quit the selected window and bury its buffer.
-
-This behaves similar to `quit-window', but when the window
-was originally created to display a Magit buffer and the
-current buffer is the last remaining Magit buffer that was
-ever displayed in the selected window, then delete that
-window."
-  (if (or (one-window-p)
-          (--first (let ((buffer (car it)))
-                     (and (not (eq buffer (current-buffer)))
-                          (buffer-live-p buffer)
-                          (or (not (window-parameter nil 'magit-dedicated))
-                              (with-current-buffer buffer
-                                (derived-mode-p 'magit-mode
-                                                'magit-process-mode)))))
-                   (window-prev-buffers)))
-      (quit-window kill-buffer)
-    (let ((window (selected-window)))
-      (quit-window kill-buffer)
-      (when (window-live-p window)
-        (delete-window window)))))
-
-;;; Refresh Buffers
-
-(defvar magit-inhibit-refresh nil)
-
-(defun magit-refresh ()
-  "Refresh some buffers belonging to the current repository.
-
-Refresh the current buffer if its major mode derives from
-`magit-mode', and refresh the corresponding status buffer.
-
-Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
-  (interactive)
-  (unless magit-inhibit-refresh
-    (unwind-protect
-        (let ((start (current-time))
-              (magit--refresh-cache (or magit--refresh-cache
-                                        (list (cons 0 0)))))
-          (when magit-refresh-verbose
-            (message "Refreshing magit..."))
-          (magit-run-hook-with-benchmark 'magit-pre-refresh-hook)
-          (cond ((derived-mode-p 'magit-mode)
-                 (magit-refresh-buffer))
-                ((derived-mode-p 'tabulated-list-mode)
-                 (revert-buffer)))
-          (when-let ((buffer (and magit-refresh-status-buffer
-                                  (not (derived-mode-p 'magit-status-mode))
-                                  (magit-get-mode-buffer 'magit-status-mode))))
-            (with-current-buffer buffer
-              (magit-refresh-buffer)))
-          (magit-run-hook-with-benchmark 'magit-post-refresh-hook)
-          (when magit-refresh-verbose
-            (let* ((c (caar magit--refresh-cache))
-                   (a (+ c (cdar magit--refresh-cache))))
-              (message "Refreshing magit...done (%.3fs, cached %s/%s (%.0f%%))"
-                       (float-time (time-subtract (current-time) start))
-                       c a (* (/ c (* a 1.0)) 100)))))
-      (run-hooks 'magit-unwind-refresh-hook))))
-
-(defun magit-refresh-all ()
-  "Refresh all buffers belonging to the current repository.
-
-Refresh all Magit buffers belonging to the current repository,
-and revert buffers that visit files located inside the current
-repository.
-
-Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
-  (interactive)
-  (magit-run-hook-with-benchmark 'magit-pre-refresh-hook)
-  (dolist (buffer (magit-mode-get-buffers))
-    (with-current-buffer buffer (magit-refresh-buffer)))
-  (magit-run-hook-with-benchmark 'magit-post-refresh-hook))
-
-(defvar-local magit-refresh-start-time nil)
-
-(defun magit-refresh-buffer (&rest _ignore)
-  "Refresh the current Magit buffer."
-  (interactive)
-  (setq magit-refresh-start-time (current-time))
-  (let ((refresh (intern (format "%s-refresh-buffer"
-                                 (substring (symbol-name major-mode) 0 -5))))
-        (magit--refresh-cache (or magit--refresh-cache (list (cons 0 0)))))
-    (when (functionp refresh)
-      (when magit-refresh-verbose
-        (message "Refreshing buffer `%s'..." (buffer-name)))
-      (let* ((buffer (current-buffer))
-             (windows (cl-mapcan
-                       (lambda (window)
-                         (with-selected-window window
-                           (with-current-buffer buffer
-                             (and-let* ((section (magit-section-at)))
-                               `(( ,window
-                                   ,section
-                                   ,@(magit-section-get-relative-position
-                                      section)))))))
-                       ;; If it qualifies, then the selected window
-                       ;; comes first, but we want to handle it last
-                       ;; so that its `magit-section-movement-hook'
-                       ;; run can override the effects of other runs.
-                       (or (nreverse (get-buffer-window-list buffer nil t))
-                           (list (selected-window))))))
-        (deactivate-mark)
-        (setq magit-section-pre-command-section nil)
-        (setq magit-section-highlight-overlays nil)
-        (setq magit-section-highlighted-sections nil)
-        (setq magit-section-unhighlight-sections nil)
-        (let ((inhibit-read-only t))
-          (erase-buffer)
-          (save-excursion
-            (funcall refresh)))
-        (pcase-dolist (`(,window . ,args) windows)
-          (if (eq buffer (window-buffer window))
-              (with-selected-window window
-                (apply #'magit-section-goto-successor args))
-            (with-current-buffer buffer
-              (let ((magit-section-movement-hook nil))
-                (apply #'magit-section-goto-successor args)))))
-        (run-hooks 'magit-refresh-buffer-hook)
-        (magit-section-update-highlight)
-        (set-buffer-modified-p nil))
-      (when magit-refresh-verbose
-        (message "Refreshing buffer `%s'...done (%.3fs)" (buffer-name)
-                 (float-time (time-subtract (current-time)
-                                            magit-refresh-start-time)))))))
-
-;;; Save File-Visiting Buffers
-
-(defvar magit--disable-save-buffers nil)
-
-(defun magit-pre-command-hook ()
-  (setq magit--disable-save-buffers nil))
-(add-hook 'pre-command-hook #'magit-pre-command-hook)
-
-(defvar magit-after-save-refresh-buffers nil)
-
-(defun magit-after-save-refresh-buffers ()
-  (dolist (buffer magit-after-save-refresh-buffers)
-    (when (buffer-live-p buffer)
-      (with-current-buffer buffer
-        (magit-refresh-buffer))))
-  (setq magit-after-save-refresh-buffers nil)
-  (remove-hook 'post-command-hook #'magit-after-save-refresh-buffers))
-
-(defun magit-after-save-refresh-status ()
-  "Refresh the status buffer of the current repository.
-
-This function is intended to be added to `after-save-hook'.
-
-If the status buffer does not exist or the file being visited in
-the current buffer isn't inside the working tree of a repository,
-then do nothing.
-
-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."
-  (when (and (not magit--disable-save-buffers)
-             (magit-inside-worktree-p t))
-    (when-let ((buffer (ignore-errors
-                         (magit-get-mode-buffer 'magit-status-mode))))
-      (add-to-list 'magit-after-save-refresh-buffers buffer)
-      (add-hook 'post-command-hook #'magit-after-save-refresh-buffers))))
-
-(defun magit-maybe-save-repository-buffers ()
-  "Maybe save file-visiting buffers belonging to the current repository.
-Do so if `magit-save-repository-buffers' is non-nil.  You should
-not remove this from any hooks, instead set that variable to nil
-if you so desire."
-  (when (and magit-save-repository-buffers
-             (not magit--disable-save-buffers))
-    (setq magit--disable-save-buffers t)
-    (let ((msg (current-message)))
-      (magit-save-repository-buffers
-       (eq magit-save-repository-buffers 'dontask))
-      (when (and msg
-                 (current-message)
-                 (not (equal msg (current-message))))
-        (message "%s" msg)))))
-
-(add-hook 'magit-pre-refresh-hook #'magit-maybe-save-repository-buffers)
-(add-hook 'magit-pre-call-git-hook #'magit-maybe-save-repository-buffers)
-(add-hook 'magit-pre-start-git-hook #'magit-maybe-save-repository-buffers)
-
-(defvar-local magit-inhibit-refresh-save nil)
-
-(defun magit-save-repository-buffers (&optional arg)
-  "Save file-visiting buffers belonging to the current repository.
-After any buffer where `buffer-save-without-query' is non-nil
-is saved without asking, the user is asked about each modified
-buffer which visits a file in the current repository.  Optional
-argument (the prefix) non-nil means save all with no questions."
-  (interactive "P")
-  (when-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
-    (let ((remote (file-remote-p default-directory))
-          (save-some-buffers-action-alist
-           `((?Y (lambda (buffer)
-                   (with-current-buffer buffer
-                     (setq buffer-save-without-query t)
-                     (save-buffer)))
-                 "to save the current buffer and remember choice")
-             (?N (lambda (buffer)
-                   (with-current-buffer buffer
-                     (setq magit-inhibit-refresh-save t)))
-                 "to skip the current buffer and remember choice")
-             ,@save-some-buffers-action-alist))
-          (topdirs nil)
-          (unwiped nil)
-          (magit--wip-inhibit-autosave t))
-      (unwind-protect
-          (save-some-buffers
-           arg
-           (lambda ()
-             ;; If the current file is modified and resides inside
-             ;; a repository, and a let-binding is in effect, which
-             ;; places us in another repository, then this binding
-             ;; is needed to prevent that file from being saved.
-             (and-let* ((default-directory
-                         (and buffer-file-name
-                              (file-name-directory buffer-file-name))))
-               (and
-                ;; Check whether the repository still exists.
-                (file-exists-p default-directory)
-                ;; Check whether refreshing is disabled.
-                (not magit-inhibit-refresh-save)
-                ;; Check whether the visited file is either on the
-                ;; same remote as the repository, or both are on
-                ;; the local system.
-                (equal (file-remote-p buffer-file-name) remote)
-                ;; Delayed checks that are more expensive for remote
-                ;; repositories, due to the required network access.
-                ;;
-                ;; Check whether the file is inside the repository.
-                (equal (or (cdr (assoc default-directory topdirs))
-                           (let ((top (magit-rev-parse-safe "--show-toplevel")))
-                             (push (cons default-directory top) topdirs)
-                             top))
-                       topdir)
-                ;; Check whether the file is actually writable.
-                (file-writable-p buffer-file-name)
-                (prog1 t
-                  ;; Schedule for wip commit, if appropriate.
-                  (when magit-wip-after-save-local-mode
-                    (push (expand-file-name buffer-file-name) unwiped)))))))
-        (when unwiped
-          (let ((default-directory topdir))
-            (magit-wip-commit-worktree
-             (magit-wip-get-ref)
-             unwiped
-             (if (cdr unwiped)
-                 (format "autosave %s files after save" (length unwiped))
-               (format "autosave %s after save"
-                       (file-relative-name (car unwiped)))))))))))
-
-;;; Restore Window Configuration
-
-(defvar magit-inhibit-save-previous-winconf nil)
-
-(defvar-local magit-previous-window-configuration nil)
-(put 'magit-previous-window-configuration 'permanent-local t)
-
-(defun magit-save-window-configuration ()
-  "Save the current window configuration.
-
-Later, when the buffer is buried, it may be restored by
-`magit-restore-window-configuration'."
-  (if magit-inhibit-save-previous-winconf
-      (when (eq magit-inhibit-save-previous-winconf 'unset)
-        (setq magit-previous-window-configuration nil))
-    (unless (get-buffer-window (current-buffer) (selected-frame))
-      (setq magit-previous-window-configuration
-            (current-window-configuration)))))
-
-(defun magit-restore-window-configuration (&optional kill-buffer)
-  "Bury or kill the current buffer and restore previous window configuration."
-  (let ((winconf magit-previous-window-configuration)
-        (buffer (current-buffer))
-        (frame (selected-frame)))
-    (quit-window kill-buffer (selected-window))
-    (when (and winconf (equal frame (window-configuration-frame winconf)))
-      (set-window-configuration winconf)
-      (when (buffer-live-p buffer)
-        (with-current-buffer buffer
-          (setq magit-previous-window-configuration nil)))
-      (set-buffer (with-selected-window (selected-window)
-                    (current-buffer))))))
-
-;;; Buffer History
-
-(defun magit-go-backward ()
-  "Move backward in current buffer's history."
-  (interactive)
-  (if help-xref-stack
-      (help-xref-go-back (current-buffer))
-    (user-error "No previous entry in buffer's history")))
-
-(defun magit-go-forward ()
-  "Move forward in current buffer's history."
-  (interactive)
-  (if help-xref-forward-stack
-      (help-xref-go-forward (current-buffer))
-    (user-error "No next entry in buffer's history")))
-
-(defun magit-insert-xref-buttons ()
-  "Insert xref buttons."
-  (when (and (not magit-buffer-locked-p)
-             (or help-xref-stack help-xref-forward-stack))
-    (when help-xref-stack
-      (magit-xref-insert-button help-back-label 'magit-xref-backward))
-    (when help-xref-forward-stack
-      (when help-xref-stack
-        (insert " "))
-      (magit-xref-insert-button help-forward-label 'magit-xref-forward))))
-
-(defun magit-xref-insert-button (label type)
-  (magit-insert-section (button label)
-    (insert-text-button label 'type type
-                        'help-args (list (current-buffer)))))
-
-(define-button-type 'magit-xref-backward
-  :supertype 'help-back
-  'mouse-face 'magit-section-highlight
-  'help-echo (purecopy "mouse-2, RET: go back to previous history entry"))
-
-(define-button-type 'magit-xref-forward
-  :supertype 'help-forward
-  'mouse-face 'magit-section-highlight
-  'help-echo (purecopy "mouse-2, RET: go back to next history entry"))
-
-(defvar magit-xref-modes
-  '(magit-log-mode
-    magit-reflog-mode
-    magit-diff-mode
-    magit-revision-mode)
-  "List of modes for which to insert navigation buttons.")
-
-(defun magit-xref-setup (fn args)
-  (when (memq major-mode magit-xref-modes)
-    (when help-xref-stack-item
-      (push (cons (point) help-xref-stack-item) help-xref-stack)
-      (setq help-xref-forward-stack nil))
-    (when-let ((tail (nthcdr 30 help-xref-stack)))
-      (setcdr tail nil))
-    (setq help-xref-stack-item
-          (list 'magit-xref-restore fn default-directory args))))
-
-(defun magit-xref-restore (fn dir args)
-  (setq default-directory dir)
-  (funcall fn major-mode nil args)
-  (magit-refresh-buffer))
-
-;;; Repository-Local Cache
-
-(defvar magit-repository-local-cache nil
-  "Alist mapping `magit-toplevel' paths to alists of key/value pairs.")
-
-(defun magit-repository-local-repository ()
-  "Return the key for the current repository."
-  (or (bound-and-true-p magit--default-directory)
-      (magit-toplevel)))
-
-(defun magit-repository-local-set (key value &optional repository)
-  "Set the repository-local VALUE for KEY.
-
-Unless specified, REPOSITORY is the current buffer's repository.
-
-If REPOSITORY is nil (meaning there is no current repository),
-then the value is not cached, and we return nil."
-  (let* ((repokey (or repository (magit-repository-local-repository)))
-         (cache (assoc repokey magit-repository-local-cache)))
-    ;; Don't cache values for a nil REPOSITORY, as the 'set' and 'get'
-    ;; calls for some KEY may happen in unrelated contexts.
-    (when repokey
-      (if cache
-          (let ((keyvalue (assoc key (cdr cache))))
-            (if keyvalue
-                ;; Update pre-existing value for key.
-                (setcdr keyvalue value)
-              ;; No such key in repository-local cache.
-              (push (cons key value) (cdr cache))))
-        ;; No cache for this repository.
-        (push (cons repokey (list (cons key value)))
-              magit-repository-local-cache)))))
-
-(defun magit-repository-local-exists-p (key &optional repository)
-  "Non-nil when a repository-local value exists for KEY.
-
-Return a (KEY . VALUE) cons cell.
-
-The KEY is matched using `equal'.
-
-Unless specified, REPOSITORY is the current buffer's repository."
-  (and-let* ((cache (assoc (or repository
-                               (magit-repository-local-repository))
-                           magit-repository-local-cache)))
-    (assoc key (cdr cache))))
-
-(defun magit-repository-local-get (key &optional default repository)
-  "Return the repository-local value for KEY.
-
-Return DEFAULT if no value for KEY exists.
-
-The KEY is matched using `equal'.
-
-Unless specified, REPOSITORY is the current buffer's repository."
-  (if-let ((keyvalue (magit-repository-local-exists-p key repository)))
-      (cdr keyvalue)
-    default))
-
-(defun magit-repository-local-delete (key &optional repository)
-  "Delete the repository-local value for KEY.
-
-Unless specified, REPOSITORY is the current buffer's repository.
-If REPOSITORY is `all', then delete the value for KEY for all
-repositories."
-  (if (eq repository 'all)
-      (dolist (cache magit-repository-local-cache)
-        (setf cache (compat-call assoc-delete-all key cache)))
-    (when-let ((cache (assoc (or repository
-                                 (magit-repository-local-repository))
-                             magit-repository-local-cache)))
-      (setf cache (compat-call assoc-delete-all key cache)))))
-
-(defmacro magit--with-repository-local-cache (key &rest body)
-  (declare (indent 1) (debug (form body)))
-  (let ((k (cl-gensym)))
-    `(let ((,k ,key))
-       (if-let ((kv (magit-repository-local-exists-p ,k)))
-           (cdr kv)
-         (let ((v ,(macroexp-progn body)))
-           (magit-repository-local-set ,k v)
-           v)))))
-
-(defun magit-preserve-section-visibility-cache ()
-  (when (derived-mode-p 'magit-status-mode 'magit-refs-mode)
-    (magit-repository-local-set
-     (cons major-mode 'magit-section-visibility-cache)
-     magit-section-visibility-cache)))
-
-(defun magit-restore-section-visibility-cache (mode)
-  (setq magit-section-visibility-cache
-        (magit-repository-local-get
-         (cons mode 'magit-section-visibility-cache))))
-
-(defun magit-zap-caches (&optional all)
-  "Zap caches for the current repository.
-
-Remove the repository's entry from `magit-repository-local-cache',
-remove the host's entry from `magit--host-git-version-cache', set
-`magit-section-visibility-cache' to nil for all Magit buffers of
-the repository and set `magit--libgit-available-p' to `unknown'.
-
-With a prefix argument or if optional ALL is non-nil, discard the
-mentioned caches completely."
-  (interactive)
-  (cond (all
-         (setq magit-repository-local-cache nil)
-         (setq magit--host-git-version-cache nil)
-         (dolist (buffer (buffer-list))
-           (with-current-buffer buffer
-             (when (derived-mode-p 'magit-mode)
-               (setq magit-section-visibility-cache nil)))))
-        (t
-         (magit-with-toplevel
-           (setq magit-repository-local-cache
-                 (cl-delete default-directory
-                            magit-repository-local-cache
-                            :key #'car :test #'equal))
-           (setq magit--host-git-version-cache
-                 (cl-delete (file-remote-p default-directory)
-                            magit--host-git-version-cache
-                            :key #'car :test #'equal)))
-         (dolist (buffer (magit-mode-get-buffers))
-           (with-current-buffer buffer
-             (setq magit-section-visibility-cache nil)))))
-  (setq magit--libgit-available-p 'unknown))
-
-;;; Utilities
-
-(defun magit-toggle-verbose-refresh ()
-  "Toggle whether Magit refreshes buffers verbosely.
-Enabling this helps figuring out which sections are bottlenecks.
-The additional output can be found in the *Messages* buffer."
-  (interactive)
-  (setq magit-refresh-verbose (not magit-refresh-verbose))
-  (message "%s verbose refreshing"
-           (if magit-refresh-verbose "Enabled" "Disabled")))
-
-(defun magit-run-hook-with-benchmark (hook)
-  (when hook
-    (if magit-refresh-verbose
-        (let ((start (current-time)))
-          (message "Running %s..." hook)
-          (run-hooks hook)
-          (message "Running %s...done (%.3fs)" hook
-                   (float-time (time-subtract (current-time) start))))
-      (run-hooks hook))))
-
-;;; _
-(provide 'magit-mode)
-;;; magit-mode.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-mode.elc b/emacs/elpa/magit-20240426.2118/magit-mode.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-pkg.el b/emacs/elpa/magit-20240426.2118/magit-pkg.el
@@ -1,20 +0,0 @@
-(define-package "magit" "20240426.2118" "A Git porcelain inside Emacs."
-  '((emacs "25.1")
-    (compat "29.1.4.4")
-    (dash "20240103")
-    (git-commit "20240123")
-    (magit-section "20240114")
-    (seq "2.24")
-    (transient "20240201")
-    (with-editor "20240101"))
-  :commit "49ba535f526266b69fcaf7442acfa59ad8473caf" :authors
-  '(("Marius Vollmer" . "marius.vollmer@gmail.com")
-    ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
-  :maintainer
-  '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
-  :keywords
-  '("git" "tools" "vc")
-  :url "https://github.com/magit/magit")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/magit-20240426.2118/magit-process.el b/emacs/elpa/magit-20240426.2118/magit-process.el
@@ -1,1291 +0,0 @@
-;;; magit-process.el --- Process 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 the tools used to run Git for side-effects.
-
-;; Note that the functions used to run Git and then consume its
-;; output, are defined in `magit-git.el'.  There's a bit of overlap
-;; though.
-
-;;; Code:
-
-(require 'magit-base)
-(require 'magit-git)
-(require 'magit-mode)
-
-(require 'ansi-color)
-(require 'auth-source)
-(require 'with-editor)
-
-(defvar y-or-n-p-map)
-
-;;; Options
-
-(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
-  "Connection type used for the Git process.
-
-If nil, use pipes: this is usually more efficient, and works on Cygwin.
-If t, use ptys: this enables Magit to prompt for passphrases when needed."
-  :group 'magit-process
-  :type '(choice (const :tag "pipe" nil)
-                 (const :tag "pty" t)))
-
-(defcustom magit-need-cygwin-noglob
-  (and (eq system-type 'windows-nt)
-       (with-temp-buffer
-         (let ((process-environment
-                (append magit-git-environment process-environment)))
-           (condition-case e
-               (process-file magit-git-executable
-                             nil (current-buffer) nil
-                             "-c" "alias.echo=!echo" "echo" "x{0}")
-             (file-error
-              (lwarn 'magit-process :warning
-                     "Could not run Git: %S" e))))
-         (equal "x0\n" (buffer-string))))
-  "Whether to use a workaround for Cygwin's globbing behavior.
-
-If non-nil, add environment variables to `process-environment' to
-prevent the git.exe distributed by Cygwin and MSYS2 from
-attempting to perform glob expansion when called from a native
-Windows build of Emacs.  See #2246."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-process
-  :type '(choice (const :tag "Yes" t)
-                 (const :tag "No" nil)))
-
-(defcustom magit-process-popup-time -1
-  "Popup the process buffer if a command takes longer than this many seconds."
-  :group 'magit-process
-  :type '(choice (const :tag "Never" -1)
-                 (const :tag "Immediately" 0)
-                 (integer :tag "After this many seconds")))
-
-(defcustom magit-process-log-max 32
-  "Maximum number of sections to keep in a process log buffer.
-When adding a new section would go beyond the limit set here,
-then the older half of the sections are remove.  Sections that
-belong to processes that are still running are never removed.
-When this is nil, no sections are ever removed."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-process
-  :type '(choice (const :tag "Never remove old sections" nil) integer))
-
-(defvar magit-process-extreme-logging nil
-  "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.
-
-Also see `magit-git-debug'.")
-
-(defcustom magit-process-error-tooltip-max-lines 20
-  "The number of lines for `magit-process-error-lines' to return.
-
-These are displayed in a tooltip for `mode-line-process' errors.
-
-If `magit-process-error-tooltip-max-lines' is nil, the tooltip
-displays the text of `magit-process-error-summary' instead."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-process
-  :type '(choice (const :tag "Use summary line" nil)
-                 integer))
-
-(defcustom magit-credential-cache-daemon-socket
-  (--some (pcase-let ((`(,prog . ,args) (split-string it)))
-            (if (and prog
-                     (string-match-p
-                      "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" prog))
-                (or (cl-loop for (opt val) on args
-                             if (string= opt "--socket")
-                             return val)
-                    (expand-file-name "~/.git-credential-cache/socket"))))
-          ;; Note: `magit-process-file' is not yet defined when
-          ;; evaluating this form, so we use `process-lines'.
-          (ignore-errors
-            (let ((process-environment
-                   (append magit-git-environment process-environment)))
-              (process-lines magit-git-executable
-                             "config" "--get-all" "credential.helper"))))
-  "If non-nil, start a credential cache daemon using this socket.
-
-When using Git's cache credential helper in the normal way, Emacs
-sends a SIGHUP to the credential daemon after the git subprocess
-has exited, causing the daemon to also quit.  This can be avoided
-by starting the `git-credential-cache--daemon' process directly
-from Emacs.
-
-The function `magit-maybe-start-credential-cache-daemon' takes
-care of starting the daemon if necessary, using the value of this
-option as the socket.  If this option is nil, then it does not
-start any daemon.  Likewise if another daemon is already running,
-then it starts no new daemon.  This function has to be a member
-of the hook variable `magit-credential-hook' for this to work.
-If an error occurs while starting the daemon, most likely because
-the necessary executable is missing, then the function removes
-itself from the hook, to avoid further futile attempts."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-process
-  :type '(choice (file  :tag "Socket")
-                 (const :tag "Don't start a cache daemon" nil)))
-
-(defcustom magit-process-yes-or-no-prompt-regexp
-  (concat " [([]"
-          "\\([Yy]\\(?:es\\)?\\)"
-          "[/|]"
-          "\\([Nn]o?\\)"
-          ;; OpenSSH v8 prints this.  See #3969.
-          "\\(?:/\\[fingerprint\\]\\)?"
-          "[])] ?[?:]? ?$")
-  "Regexp matching Yes-or-No prompts of Git and its subprocesses."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-process
-  :type 'regexp)
-
-(defcustom magit-process-password-prompt-regexps
-  '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
-    ;; Match-group 99 is used to identify the "user@host" part.
-    "^\\(Enter \\|([^) ]+) \\)?\
-[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$"
-    "Please enter the passphrase for the ssh key"
-    "Please enter the passphrase to unlock the OpenPGP secret key"
-    "^.*'s password: ?$"
-    "^Token: $" ; For git-credential-manager-core (#4318).
-    "^Yubikey for .*: ?$"
-    "^Enter PIN for .*: ?$")
-  "List of regexps matching password prompts of Git and its subprocesses.
-Also see `magit-process-find-password-functions'."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-process
-  :type '(repeat (regexp)))
-
-(defcustom magit-process-find-password-functions nil
-  "List of functions to try in sequence to get a password.
-
-These functions may be called when git asks for a password, which
-is detected using `magit-process-password-prompt-regexps'.  They
-are called if and only if matching the prompt resulted in the
-value of the 99th submatch to be non-nil.  Therefore users can
-control for which prompts these functions should be called by
-putting the host name in the 99th submatch, or not.
-
-If the functions are called, then they are called in the order
-given, with the host name as only argument, until one of them
-returns non-nil.  If they are not called or none of them returns
-non-nil, then the password is read from the user instead."
-  :package-version '(magit . "2.3.0")
-  :group 'magit-process
-  :type 'hook
-  :options '(magit-process-password-auth-source))
-
-(defcustom magit-process-username-prompt-regexps
-  '("^Username for '.*': ?$")
-  "List of regexps matching username prompts of Git and its subprocesses."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-process
-  :type '(repeat (regexp)))
-
-(defcustom magit-process-prompt-functions nil
-  "List of functions used to forward arbitrary questions to the user.
-
-Magit has dedicated support for forwarding username and password
-prompts and Yes-or-No questions asked by Git and its subprocesses
-to the user.  This can be customized using other options in the
-`magit-process' customization group.
-
-If you encounter a new question that isn't handled by default,
-then those options should be used instead of this hook.
-
-However subprocesses may also ask questions that differ too much
-from what the code related to the above options assume, and this
-hook allows users to deal with such questions explicitly.
-
-Each function is called with the process and the output string
-as arguments until one of the functions returns non-nil.  The
-function is responsible for asking the user the appropriate
-question using, e.g., `read-char-choice' and then forwarding the
-answer to the process using `process-send-string'.
-
-While functions such as `magit-process-yes-or-no-prompt' may not
-be sufficient to handle some prompt, it may still be of benefit
-to look at the implementations to gain some insights on how to
-implement such functions."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-process
-  :type 'hook)
-
-(defcustom magit-process-ensure-unix-line-ending t
-  "Whether Magit should ensure a unix coding system when talking to Git."
-  :package-version '(magit . "2.6.0")
-  :group 'magit-process
-  :type 'boolean)
-
-(defcustom magit-process-display-mode-line-error t
-  "Whether Magit should retain and highlight process errors in the mode line."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-process
-  :type 'boolean)
-
-(defcustom magit-process-timestamp-format nil
-  "Format of timestamp for each process in the process buffer.
-If non-nil, pass this to `format-time-string' when creating a
-process section in the process buffer, and insert the returned
-string in the heading of its section."
-  :package-version '(magit . "4.0.0")
-  :group 'magit-process
-  :type '(choice (const :tag "none" nil) string))
-
-(defvar tramp-pipe-stty-settings)
-(defvar magit-tramp-pipe-stty-settings ""
-  "Override `tramp-pipe-stty-settings' in `magit-start-process'.
-
-The default for that Tramp variable is \"-icanon min 1 time 0\",
-which causes staging of individual hunks to hang.  Using \"\"
-prevents that, but apparently has other issues, which is why it
-isn't the default.
-
-This variable defaults to \"\" and is used to override the Tramp
-variable in `magit-start-process'.  This only has an effect when
-using Tramp 2.6.2 or greater.  This can also be set to `pty', in
-which case a pty is used instead of a pipe.  That also prevents
-the hanging, but comes with its own problems (see #20).  To fall
-back to the value of `tramp-pipe-stty-settings', set this
-variable to nil.
-
-Also see https://github.com/magit/magit/issues/4720
-and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62093.")
-
-(defface magit-process-ok
-  '((t :inherit magit-section-heading :foreground "green"))
-  "Face for zero exit-status."
-  :group 'magit-faces)
-
-(defface magit-process-ng
-  '((t :inherit magit-section-heading :foreground "red"))
-  "Face for non-zero exit-status."
-  :group 'magit-faces)
-
-(defface magit-mode-line-process
-  '((t :inherit mode-line-emphasis))
-  "Face for `mode-line-process' status when Git is running for side-effects."
-  :group 'magit-faces)
-
-(defface magit-mode-line-process-error
-  '((t :inherit error))
-  "Face for `mode-line-process' error status.
-
-Used when `magit-process-display-mode-line-error' is non-nil."
-  :group 'magit-faces)
-
-;;; Process Mode
-
-(defvar-keymap magit-process-mode-map
-  :doc "Keymap for `magit-process-mode'."
-  :parent magit-mode-map
-  "<remap> <magit-delete-thing>" #'magit-process-kill)
-
-(define-derived-mode magit-process-mode magit-mode "Magit Process"
-  "Mode for looking at Git process output."
-  :group 'magit-process
-  (hack-dir-local-variables-non-file-buffer)
-  (setq magit--imenu-item-types 'process))
-
-(defun magit-process-buffer (&optional nodisplay)
-  "Display the current repository's process buffer.
-
-If that buffer doesn't exist yet, then create it.
-Non-interactively return the buffer and unless
-optional NODISPLAY is non-nil also display it."
-  (interactive)
-  (let ((topdir (magit-toplevel)))
-    (unless topdir
-      (magit--with-safe-default-directory nil
-        (setq topdir default-directory)
-        (let (prev)
-          (while (not (equal topdir prev))
-            (setq prev topdir)
-            (setq topdir (file-name-directory (directory-file-name topdir)))))))
-    (let ((buffer (or (--first (with-current-buffer it
-                                 (and (eq major-mode 'magit-process-mode)
-                                      (equal default-directory topdir)))
-                               (buffer-list))
-                      (magit-generate-new-buffer 'magit-process-mode
-                                                 nil topdir))))
-      (with-current-buffer buffer
-        (if magit-root-section
-            (when magit-process-log-max
-              (magit-process-truncate-log))
-          (magit-process-mode)
-          (let ((inhibit-read-only t)
-                (magit-insert-section--parent  nil)
-                (magit-insert-section--oldroot nil))
-            (make-local-variable 'text-property-default-nonsticky)
-            (magit-insert-section (processbuf)
-              (insert "\n")))))
-      (unless nodisplay
-        (magit-display-buffer buffer))
-      buffer)))
-
-(defun magit-process-kill ()
-  "Kill the process at point."
-  (interactive)
-  (when-let ((process (magit-section-value-if 'process)))
-    (unless (eq (process-status process) 'run)
-      (user-error "Process isn't running"))
-    (magit-confirm 'kill-process)
-    (kill-process process)))
-
-;;; Synchronous Processes
-
-(defvar magit-process-raise-error nil)
-
-(defun magit-git (&rest args)
-  "Call Git synchronously in a separate process, for side-effects.
-
-Option `magit-git-executable' specifies the Git executable.
-The arguments ARGS specify arguments to Git, they are flattened
-before use.
-
-Process output goes into a new section in the buffer returned by
-`magit-process-buffer'.  If Git exits with a non-zero status,
-then raise an error."
-  (let ((magit-process-raise-error t))
-    (magit-call-git args)))
-
-(defun magit-run-git (&rest args)
-  "Call Git synchronously in a separate process, and refresh.
-
-Function `magit-git-executable' specifies the Git executable and
-option `magit-git-global-arguments' specifies constant arguments.
-The arguments ARGS specify arguments to Git, they are flattened
-before use.
-
-After Git returns, the current buffer (if it is a Magit buffer)
-as well as the current repository's status buffer are refreshed.
-
-Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
-  (let ((magit--refresh-cache (list (cons 0 0))))
-    (magit-call-git args)
-    (when (member (car args) '("init" "clone"))
-      ;; Creating a new repository invalidates the cache.
-      (setq magit--refresh-cache nil))
-    (magit-refresh)))
-
-(defvar magit-pre-call-git-hook nil)
-
-(defun magit-call-git (&rest args)
-  "Call Git synchronously in a separate process.
-
-Function `magit-git-executable' specifies the Git executable and
-option `magit-git-global-arguments' specifies constant arguments.
-The arguments ARGS specify arguments to Git, they are flattened
-before use.
-
-Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
-  (run-hooks 'magit-pre-call-git-hook)
-  (let ((default-process-coding-system (magit--process-coding-system)))
-    (apply #'magit-call-process
-           (magit-git-executable)
-           (magit-process-git-arguments args))))
-
-(defun magit-call-process (program &rest args)
-  "Call PROGRAM synchronously in a separate process.
-Process output goes into a new section in the buffer returned by
-`magit-process-buffer'."
-  (pcase-let ((`(,process-buf . ,section)
-               (magit-process-setup program args)))
-    (magit-process-finish
-     (let ((inhibit-read-only t))
-       (apply #'magit-process-file program nil process-buf nil args))
-     process-buf (current-buffer) default-directory section)))
-
-(defun magit-process-git (destination &rest args)
-  "Call 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.
-Enable Cygwin's \"noglob\" option during the call and
-ensure unix eol conversion."
-  (apply #'magit-process-file
-         (magit-git-executable)
-         nil destination nil
-         (magit-process-git-arguments args)))
-
-(defun magit-process-file (process &optional infile buffer display &rest args)
-  "Process files synchronously in a separate process.
-Identical to `process-file' but temporarily enable Cygwin's
-\"noglob\" option during the call and ensure unix eol
-conversion."
-  (when magit-process-extreme-logging
-    (let ((inhibit-message t))
-      (message "$ %s" (magit-process--format-arguments process args))))
-  (let ((process-environment (magit-process-environment))
-        (default-process-coding-system (magit--process-coding-system)))
-    (apply #'process-file process infile buffer display args)))
-
-(defun magit-process-environment ()
-  ;; The various w32 hacks are only applicable when running on the
-  ;; local machine.  As of Emacs 25.1, a local binding of
-  ;; process-environment different from the top-level value affects
-  ;; the environment used in
-  ;; tramp-sh-handle-{start-file-process,process-file}.
-  (let ((local (not (file-remote-p default-directory))))
-    (append magit-git-environment
-            (and local
-                 (cdr (assoc magit-git-executable magit-git-w32-path-hack)))
-            (and local magit-need-cygwin-noglob
-                 (mapcar (lambda (var)
-                           (concat var "=" (if-let ((val (getenv var)))
-                                               (concat val " noglob")
-                                             "noglob")))
-                         '("CYGWIN" "MSYS")))
-            process-environment)))
-
-(defvar magit-this-process nil)
-
-(defun magit-run-git-with-input (&rest args)
-  "Call Git in a separate process.
-ARGS is flattened and then used as arguments to Git.
-
-The current buffer's content is used as the process's standard
-input.  The buffer is assumed to be temporary and thus OK to
-modify.
-
-Function `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."
-  (when (eq system-type 'windows-nt)
-    ;; On w32, git expects UTF-8 encoded input, ignore any user
-    ;; configuration telling us otherwise (see #3250).
-    (encode-coding-region (point-min) (point-max) 'utf-8-unix))
-  (if (file-remote-p default-directory)
-      ;; We lack `process-file-region', so fall back to asynch +
-      ;; waiting in remote case.
-      (progn
-        (magit-start-git (current-buffer) args)
-        (while (and magit-this-process
-                    (eq (process-status magit-this-process) 'run))
-          (sleep-for 0.005)))
-    (run-hooks 'magit-pre-call-git-hook)
-    (pcase-let* ((process-environment (magit-process-environment))
-                 (default-process-coding-system (magit--process-coding-system))
-                 (flat-args (magit-process-git-arguments args))
-                 (`(,process-buf . ,section)
-                  (magit-process-setup (magit-git-executable) flat-args))
-                 (inhibit-read-only t))
-      (magit-process-finish
-       (apply #'call-process-region (point-min) (point-max)
-              (magit-git-executable) nil process-buf nil flat-args)
-       process-buf nil default-directory section))))
-
-;;; Asynchronous Processes
-
-(defun 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.
-
-See `magit-start-process' for more information."
-  (message "Running %s %s" (magit-git-executable)
-           (let ((m (mapconcat #'identity (flatten-tree args) " ")))
-             (remove-list-of-text-properties 0 (length m) '(face) m)
-             m))
-  (magit-start-git nil args))
-
-(defun 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.
-
-See `magit-start-process' and `with-editor' for more information."
-  (magit--record-separated-gitdir)
-  (magit-with-editor (magit-run-git-async args)))
-
-(defun magit-run-git-sequencer (&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.
-If the sequence stops at a commit, make the section representing
-that commit the current section by moving `point' there.
-
-See `magit-start-process' and `with-editor' for more information."
-  (apply #'magit-run-git-with-editor args)
-  (set-process-sentinel magit-this-process #'magit-sequencer-process-sentinel)
-  magit-this-process)
-
-(defvar magit-pre-start-git-hook nil)
-
-(defun 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.
-
-Function `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.
-
-See `magit-start-process' for more information."
-  (run-hooks 'magit-pre-start-git-hook)
-  (let ((default-process-coding-system (magit--process-coding-system)))
-    (apply #'magit-start-process (magit-git-executable) input
-           (magit-process-git-arguments args))))
-
-(defun magit-start-process (program &optional input &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."
-  (pcase-let*
-      ((`(,process-buf . ,section)
-        (magit-process-setup program args))
-       (process
-        (let ((process-connection-type ;t=pty nil=pipe
-               (or
-                ;; With Tramp, maybe force use a pty.  #4720
-                (and (file-remote-p default-directory)
-                     (eq magit-tramp-pipe-stty-settings 'pty))
-                ;; Without input, don't use a pty, because it would
-                ;; set icrnl, which would modify the input.  #20
-                (and (not input) magit-process-connection-type)))
-              (tramp-pipe-stty-settings
-               (or (and (not (eq magit-tramp-pipe-stty-settings 'pty))
-                        ;; Defaults to "", to allow staging hunks over
-                        ;; Tramp again.  #4720
-                        magit-tramp-pipe-stty-settings)
-                   tramp-pipe-stty-settings))
-              (process-environment (magit-process-environment))
-              (default-process-coding-system (magit--process-coding-system)))
-          (apply #'start-file-process
-                 (file-name-nondirectory program)
-                 process-buf program args))))
-    (with-editor-set-process-filter process #'magit-process-filter)
-    (set-process-sentinel process #'magit-process-sentinel)
-    (set-process-buffer   process process-buf)
-    (when (eq system-type 'windows-nt)
-      ;; On w32, git expects UTF-8 encoded input, ignore any user
-      ;; configuration telling us otherwise.
-      (set-process-coding-system process nil 'utf-8-unix))
-    (process-put process 'section section)
-    (process-put process 'command-buf (current-buffer))
-    (process-put process 'default-dir default-directory)
-    (when magit-inhibit-refresh
-      (process-put process 'inhibit-refresh t))
-    (oset section process process)
-    (with-current-buffer process-buf
-      (set-marker (process-mark process) (point)))
-    (when input
-      (with-current-buffer input
-        (process-send-region process (point-min) (point-max))
-        ;; `process-send-eof' appears to be broken over
-        ;;  Tramp from Windows. See #3624 and bug#43226.
-        (if (and (eq system-type 'windows-nt)
-                 (file-remote-p (process-get process 'default-dir) nil t))
-            (process-send-string process "")
-          (process-send-eof process))))
-    (setq magit-this-process process)
-    (oset section value process)
-    (magit-process-display-buffer process)
-    process))
-
-(defun magit-parse-git-async (&rest args)
-  (setq args (magit-process-git-arguments args))
-  (let ((command-buf (current-buffer))
-        (process-buf (generate-new-buffer " *temp*"))
-        (toplevel (magit-toplevel)))
-    (with-current-buffer process-buf
-      (setq default-directory toplevel)
-      (let ((process
-             (let ((process-connection-type nil)
-                   (process-environment (magit-process-environment))
-                   (default-process-coding-system
-                    (magit--process-coding-system)))
-               (apply #'start-file-process "git" process-buf
-                      (magit-git-executable) args))))
-        (process-put process 'command-buf command-buf)
-        (process-put process 'parsed (point))
-        (setq magit-this-process process)
-        process))))
-
-;;; Process Internals
-
-(defun magit-process-setup (program args)
-  (magit-process-set-mode-line program args)
-  (let ((pwd default-directory)
-        (buf (magit-process-buffer t)))
-    (cons buf (with-current-buffer buf
-                (prog1 (magit-process-insert-section pwd program args nil nil)
-                  (backward-char 1))))))
-
-(defun magit-process-insert-section (pwd program args &optional errcode errlog)
-  (let ((inhibit-read-only t)
-        (magit-insert-section--parent magit-root-section)
-        (magit-insert-section--oldroot nil))
-    (goto-char (1- (point-max)))
-    (magit-insert-section (process)
-      (insert (if errcode
-                  (format "%3s " (propertize (number-to-string errcode)
-                                             'font-lock-face 'magit-process-ng))
-                "run "))
-      (when magit-process-timestamp-format
-        (insert (format-time-string magit-process-timestamp-format) " "))
-      (unless (equal (expand-file-name pwd)
-                     (expand-file-name default-directory))
-        (insert (file-relative-name pwd default-directory) ?\s))
-      (insert (magit-process--format-arguments program args))
-      (magit-insert-heading)
-      (when errlog
-        (if (bufferp errlog)
-            (insert (with-current-buffer errlog
-                      (buffer-substring-no-properties (point-min) (point-max))))
-          (insert-file-contents errlog)
-          (goto-char (1- (point-max)))))
-      (insert "\n"))))
-
-(defun magit-process--format-arguments (program args)
-  (cond
-   ((and args (equal program (magit-git-executable)))
-    (let ((global (length magit-git-global-arguments)))
-      (concat
-       (propertize (file-name-nondirectory program)
-                   'font-lock-face 'magit-section-heading)
-       " "
-       (propertize (magit--ellipsis)
-                   'font-lock-face 'magit-section-heading
-                   'help-echo (mapconcat #'identity (seq-take args global) " "))
-       " "
-       (propertize (mapconcat #'shell-quote-argument (seq-drop args global) " ")
-                   'font-lock-face 'magit-section-heading))))
-   ((and args (equal program shell-file-name))
-    (propertize (cadr args)
-                'font-lock-face 'magit-section-heading))
-   (t
-    (concat (propertize (file-name-nondirectory program)
-                        'font-lock-face 'magit-section-heading)
-            " "
-            (propertize (mapconcat #'shell-quote-argument args " ")
-                        'font-lock-face 'magit-section-heading)))))
-
-(defun magit-process-truncate-log ()
-  (let* ((head nil)
-         (tail (oref magit-root-section children))
-         (count (length tail)))
-    (when (> (1+ count) magit-process-log-max)
-      (while (and (cdr tail)
-                  (> count (/ magit-process-log-max 2)))
-        (let* ((inhibit-read-only t)
-               (section (car tail))
-               (process (oref section process)))
-          (cond ((not process))
-                ((memq (process-status process) '(exit signal))
-                 (delete-region (oref section start)
-                                (1+ (oref section end)))
-                 (cl-decf count))
-                (t
-                 (push section head))))
-        (pop tail))
-      (oset magit-root-section children
-            (nconc (reverse head) tail)))))
-
-(defun magit-process-sentinel (process event)
-  "Default sentinel used by `magit-start-process'."
-  (when (memq (process-status process) '(exit signal))
-    (setq event (substring event 0 -1))
-    (when (string-match "^finished" event)
-      (message (concat (capitalize (process-name process)) " finished")))
-    (magit-process-finish process)
-    (when (eq process magit-this-process)
-      (setq magit-this-process nil))
-    (unless (process-get process 'inhibit-refresh)
-      (let ((command-buf (process-get process 'command-buf)))
-        (if (buffer-live-p command-buf)
-            (with-current-buffer command-buf
-              (magit-refresh))
-          (with-temp-buffer
-            (setq default-directory (process-get process 'default-dir))
-            (magit-refresh)))))))
-
-(defun magit-sequencer-process-sentinel (process event)
-  "Special sentinel used by `magit-run-git-sequencer'."
-  (when (memq (process-status process) '(exit signal))
-    (magit-process-sentinel process event)
-    (when-let* ((process-buf (process-buffer process))
-                ((buffer-live-p process-buf))
-                (status-buf (with-current-buffer process-buf
-                              (magit-get-mode-buffer 'magit-status-mode))))
-      (with-current-buffer status-buf
-        (when-let ((section
-                    (magit-get-section
-                     `((commit . ,(magit-rev-parse "HEAD"))
-                       (,(pcase (car (seq-drop
-                                      (process-command process)
-                                      (1+ (length magit-git-global-arguments))))
-                           ((or "rebase" "am") 'rebase-sequence)
-                           ((or "cherry-pick" "revert") 'sequence)))
-                       (status)))))
-          (goto-char (oref section start))
-          (magit-section-update-highlight))))))
-
-(defun magit-process-filter (proc string)
-  "Default filter used by `magit-start-process'."
-  (with-current-buffer (process-buffer proc)
-    (let ((inhibit-read-only t))
-      (goto-char (process-mark proc))
-      ;; Find last ^M in string.  If one was found, ignore
-      ;; everything before it and delete the current line.
-      (when-let ((ret-pos (cl-position ?\r string :from-end t)))
-        (cl-callf substring string (1+ ret-pos))
-        (delete-region (line-beginning-position) (point)))
-      (setq string (magit-process-remove-bogus-errors string))
-      (insert (propertize string 'magit-section
-                          (process-get proc 'section)))
-      (set-marker (process-mark proc) (point))
-      ;; Make sure prompts are matched after removing ^M.
-      (magit-process-yes-or-no-prompt proc string)
-      (magit-process-username-prompt  proc string)
-      (magit-process-password-prompt  proc string)
-      (run-hook-with-args-until-success 'magit-process-prompt-functions
-                                        proc string))))
-
-(defun magit-process-make-keymap (process parent)
-  "Remap `abort-minibuffers' to a command that also kills PROCESS.
-PARENT is used as the parent of the returned keymap."
-  (let ((cmd (lambda ()
-               (interactive)
-               (ignore-errors (kill-process process))
-               (if (fboundp 'abort-minibuffers)
-                   (abort-minibuffers)
-                 (abort-recursive-edit)))))
-    (define-keymap :parent parent
-      "C-g" cmd
-      "<remap> <abort-minibuffers>" cmd
-      "<remap> <abort-recursive-edit>" cmd)))
-
-(defmacro magit-process-kill-on-abort (process &rest body)
-  (declare (indent 1)
-           (debug (form body))
-           (obsolete magit-process-make-keymap "Magit 4.0.0"))
-  `(let ((minibuffer-local-map
-          (magit-process-make-keymap ,process minibuffer-local-map)))
-     ,@body))
-
-(defun magit-process-remove-bogus-errors (str)
-  (save-match-data
-    (when (string-match "^\\(\\*ERROR\\*: \\)Canceled by user" str)
-      (setq str (replace-match "" nil nil str 1)))
-    (when (string-match "^error: There was a problem with the editor.*\n" str)
-      (setq str (replace-match "" nil nil str)))
-    (when (string-match
-           "^Please supply the message using either -m or -F option\\.\n" str)
-      (setq str (replace-match "" nil nil str))))
-  str)
-
-(defun magit-process-yes-or-no-prompt (process string)
-  "Forward Yes-or-No prompts to the user."
-  (when-let ((beg (string-match magit-process-yes-or-no-prompt-regexp string)))
-    (process-send-string
-     process
-     (if (save-match-data
-           (let ((max-mini-window-height 30)
-                 (minibuffer-local-map
-                  (magit-process-make-keymap process minibuffer-local-map))
-                 ;; In case yes-or-no-p is fset to that, but does
-                 ;; not cover use-dialog-box-p and y-or-n-p-read-key.
-                 (y-or-n-p-map
-                  (magit-process-make-keymap process y-or-n-p-map)))
-             (yes-or-no-p (substring string 0 beg))))
-         (concat (downcase (match-string 1 string)) "\n")
-       (concat (downcase (match-string 2 string)) "\n")))))
-
-(defun magit-process-password-auth-source (key)
-  "Use `auth-source-search' to get a password.
-If found, return the password.  Otherwise, return nil.
-
-To use this function add it to the appropriate hook
-  (add-hook \\='magit-process-find-password-functions
-            \\='magit-process-password-auth-source)
-
-KEY typically derives from a prompt such as:
-  Password for \\='https://yourname@github.com\\='
-in which case it would be the string
-  yourname@github.com
-which matches the ~/.authinfo.gpg entry
-  machine github.com login yourname password 12345
-or iff that is undefined, for backward compatibility
-  machine yourname@github.com password 12345
-
-On github.com you should not use your password but a
-personal access token, see [1].  For information about
-the peculiarities of other forges, please consult the
-respective documentation.
-
-After manually editing ~/.authinfo.gpg you must reset
-the cache using
-  M-x auth-source-forget-all-cached RET
-
-The above will save you from having to repeatedly type
-your token or password, but you might still repeatedly
-be asked for your username.  To prevent that, change an
-URL like
-  https://github.com/foo/bar.git
-to
-  https://yourname@github.com/foo/bar.git
-
-Instead of changing all such URLs manually, they can
-be translated on the fly by doing this once
-  git config --global \
-    url.https://yourname@github.com.insteadOf \
-    https://github.com
-
-[1]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token."
-  (require 'auth-source)
-  (and (fboundp 'auth-source-search)
-       (string-match "\\`\\(.+\\)@\\([^@]+\\)\\'" key)
-       (let* ((user (match-string 1 key))
-              (host (match-string 2 key))
-              (secret
-               (plist-get
-                (car (or (auth-source-search :max 1 :host host :user user)
-                         (auth-source-search :max 1 :host key)))
-                :secret)))
-         (if (functionp secret)
-             (funcall secret)
-           secret))))
-
-(defun magit-process-git-credential-manager-core (process string)
-  "Authenticate using `git-credential-manager-core'.
-
-To use this function add it to the appropriate hook
-  (add-hook \\='magit-process-prompt-functions
-            \\='magit-process-git-credential-manager-core)"
-  (and (string-match "^option (enter for default): $" string)
-       (progn
-         (magit-process-buffer)
-         (let ((option (format "%c\n"
-                               (read-char-choice "Option: " '(?\r ?\j ?1 ?2)))))
-           (insert-before-markers-and-inherit option)
-           (process-send-string process option)))))
-
-(defun magit-process-password-prompt (process string)
-  "Find a password based on prompt STRING and send it to git.
-Use `magit-process-password-prompt-regexps' to find a known
-prompt.  If and only if one is found, then call functions in
-`magit-process-find-password-functions' until one of them returns
-the password.  If all functions return nil, then read the password
-from the user."
-  (when-let ((prompt (magit-process-match-prompt
-                      magit-process-password-prompt-regexps string)))
-    (process-send-string
-     process
-     (concat (or (and-let* ((key (match-string 99 string)))
-                   (run-hook-with-args-until-success
-                    'magit-process-find-password-functions key))
-                 (let ((read-passwd-map
-                        (magit-process-make-keymap process read-passwd-map)))
-                   (read-passwd prompt)))
-             "\n"))))
-
-(defun magit-process-username-prompt (process string)
-  "Forward username prompts to the user."
-  (when-let ((prompt (magit-process-match-prompt
-                      magit-process-username-prompt-regexps string)))
-    (process-send-string
-     process
-     (let ((minibuffer-local-map
-            (magit-process-make-keymap process minibuffer-local-map)))
-       (concat (read-string prompt nil nil (user-login-name)) "\n")))))
-
-(defun magit-process-match-prompt (prompts string)
-  "Match STRING against PROMPTS and set match data.
-Return the matched string suffixed with \": \", if needed."
-  (when (--any-p (string-match it string) prompts)
-    (let ((prompt (match-string 0 string)))
-      (cond ((string-suffix-p ": " prompt) prompt)
-            ((string-suffix-p ":"  prompt) (concat prompt " "))
-            (t                             (concat prompt ": "))))))
-
-(defun magit--process-coding-system ()
-  (let ((fro (or magit-git-output-coding-system
-                 (car default-process-coding-system)))
-        (to (cdr default-process-coding-system)))
-    (if magit-process-ensure-unix-line-ending
-        (cons (coding-system-change-eol-conversion fro 'unix)
-              (coding-system-change-eol-conversion to 'unix))
-      (cons fro to))))
-
-(defvar magit-credential-hook nil
-  "Hook run before Git needs credentials.")
-
-(defvar magit-credential-cache-daemon-process nil)
-
-(defun magit-maybe-start-credential-cache-daemon ()
-  "Maybe start a `git-credential-cache--daemon' process.
-
-If such a process is already running or if the value of option
-`magit-credential-cache-daemon-socket' is nil, then do nothing.
-Otherwise start the process passing the value of that options
-as argument."
-  (unless (or (not magit-credential-cache-daemon-socket)
-              (process-live-p magit-credential-cache-daemon-process)
-              (memq magit-credential-cache-daemon-process
-                    (list-system-processes)))
-    (setq magit-credential-cache-daemon-process
-          (or (--first (let* ((attr (process-attributes it))
-                              (comm (cdr (assq 'comm attr)))
-                              (user (cdr (assq 'user attr))))
-                         (and (string= comm "git-credential-cache--daemon")
-                              (string= user user-login-name)))
-                       (list-system-processes))
-              (condition-case nil
-                  (start-process "git-credential-cache--daemon"
-                                 " *git-credential-cache--daemon*"
-                                 (magit-git-executable)
-                                 "credential-cache--daemon"
-                                 magit-credential-cache-daemon-socket)
-                ;; Some Git implementations (e.g., Windows) won't have
-                ;; this program; if we fail the first time, stop trying.
-                ((debug error)
-                 (remove-hook 'magit-credential-hook
-                              #'magit-maybe-start-credential-cache-daemon)))))))
-
-(add-hook 'magit-credential-hook #'magit-maybe-start-credential-cache-daemon)
-
-(defun tramp-sh-handle-start-file-process--magit-tramp-process-environment
-    (fn name buffer program &rest args)
-  (if magit-tramp-process-environment
-      (apply fn name buffer
-             (car magit-tramp-process-environment)
-             (append (cdr magit-tramp-process-environment)
-                     (cons program args)))
-    (apply fn name buffer program args)))
-
-(advice-add 'tramp-sh-handle-start-file-process :around
-            #'tramp-sh-handle-start-file-process--magit-tramp-process-environment)
-
-(defun tramp-sh-handle-process-file--magit-tramp-process-environment
-    (fn program &optional infile destination display &rest args)
-  (if magit-tramp-process-environment
-      (apply fn "env" infile destination display
-             (append magit-tramp-process-environment
-                     (cons program args)))
-    (apply fn program infile destination display args)))
-
-(advice-add 'tramp-sh-handle-process-file :around
-            #'tramp-sh-handle-process-file--magit-tramp-process-environment)
-
-(defvar-keymap magit-mode-line-process-map
-  :doc "Keymap for `mode-line-process'."
-  "<mode-line> <mouse-1>" ''magit-process-buffer)
-
-(defun magit-process-set-mode-line (program args)
-  "Display the git command (sans arguments) in the mode line."
-  (when (equal program (magit-git-executable))
-    (setq args (nthcdr (length magit-git-global-arguments) args)))
-  (let ((str (concat " " (propertize
-                          (concat (file-name-nondirectory program)
-                                  (and args (concat " " (car args))))
-                          'mouse-face 'highlight
-                          'keymap magit-mode-line-process-map
-                          'help-echo "mouse-1: Show process buffer"
-                          'font-lock-face 'magit-mode-line-process))))
-    (magit-repository-local-set 'mode-line-process str)
-    (dolist (buf (magit-mode-get-buffers))
-      (with-current-buffer buf
-        (setq mode-line-process str)))
-    (force-mode-line-update t)))
-
-(defun magit-process-set-mode-line-error-status (&optional error str)
-  "Apply an error face to the string set by `magit-process-set-mode-line'.
-
-If ERROR is supplied, include it in the `mode-line-process' tooltip.
-
-If STR is supplied, it replaces the `mode-line-process' text."
-  (setq str (or str (magit-repository-local-get 'mode-line-process)))
-  (when str
-    (setq error (format "%smouse-1: Show process buffer"
-                        (if (stringp error)
-                            (concat error "\n\n")
-                          "")))
-    (setq str (concat " " (propertize
-                           (substring-no-properties str 1)
-                           'mouse-face 'highlight
-                           'keymap magit-mode-line-process-map
-                           'help-echo error
-                           'font-lock-face 'magit-mode-line-process-error)))
-    (magit-repository-local-set 'mode-line-process str)
-    (dolist (buf (magit-mode-get-buffers))
-      (with-current-buffer buf
-        (setq mode-line-process str)))
-    (force-mode-line-update t)
-    ;; We remove any error status from the mode line when a magit
-    ;; buffer is refreshed (see `magit-refresh-buffer'), but we must
-    ;; ensure that we ignore any refreshes during the remainder of the
-    ;; current command -- otherwise a newly-set error status would be
-    ;; removed before it was seen.  We set a flag which prevents the
-    ;; status from being removed prior to the next command, so that
-    ;; the error status is guaranteed to remain visible until then.
-    (let ((repokey (magit-repository-local-repository)))
-      ;; The following closure captures the repokey value, and is
-      ;; added to `pre-command-hook'.
-      (cl-labels ((enable-magit-process-unset-mode-line ()
-                    ;; Remove ourself from the hook variable, so
-                    ;; that we only run once.
-                    (remove-hook 'pre-command-hook
-                                 #'enable-magit-process-unset-mode-line)
-                    ;; Clear the inhibit flag for the repository in
-                    ;; which we set it.
-                    (magit-repository-local-set
-                     'inhibit-magit-process-unset-mode-line nil repokey)))
-        ;; Set the inhibit flag until the next command is invoked.
-        (magit-repository-local-set
-         'inhibit-magit-process-unset-mode-line t repokey)
-        (add-hook 'pre-command-hook
-                  #'enable-magit-process-unset-mode-line)))))
-
-(defun magit-process-unset-mode-line-error-status ()
-  "Remove any current error status from the mode line."
-  (let ((status (or mode-line-process
-                    (magit-repository-local-get 'mode-line-process))))
-    (when (and status
-               (eq (get-text-property 1 'font-lock-face status)
-                   'magit-mode-line-process-error))
-      (magit-process-unset-mode-line))))
-
-(add-hook 'magit-refresh-buffer-hook
-          #'magit-process-unset-mode-line-error-status)
-
-(defun magit-process-unset-mode-line (&optional directory)
-  "Remove the git command from the mode line."
-  (let ((default-directory (or directory default-directory)))
-    (unless (magit-repository-local-get 'inhibit-magit-process-unset-mode-line)
-      (magit-repository-local-set 'mode-line-process nil)
-      (dolist (buf (magit-mode-get-buffers))
-        (with-current-buffer buf (setq mode-line-process nil)))
-      (force-mode-line-update t))))
-
-(defvar magit-process-error-message-regexps
-  (list "^\\*ERROR\\*: Canceled by user$"
-        "^\\(?:error\\|fatal\\|git\\): \\(.*\\)$"
-        "^\\(Cannot rebase:.*\\)$"))
-
-(define-error 'magit-git-error "Git error")
-
-(defun magit-process-error-summary (process-buf section)
-  "A one-line error summary from the given SECTION."
-  (or (and (buffer-live-p process-buf)
-           (with-current-buffer process-buf
-             (and (oref section content)
-                  (save-excursion
-                    (goto-char (oref section end))
-                    (run-hook-wrapped
-                     'magit-process-error-message-regexps
-                     (lambda (re)
-                       (save-excursion
-                         (and (re-search-backward
-                               re (oref section start) t)
-                              (or (match-string-no-properties 1)
-                                  (and (not magit-process-raise-error)
-                                       'suppressed))))))))))
-      "Git failed"))
-
-(defun magit-process-error-tooltip (process-buf section)
-  "Returns the text from SECTION of the PROCESS-BUF buffer.
-
-Limited by `magit-process-error-tooltip-max-lines'."
-  (and (integerp magit-process-error-tooltip-max-lines)
-       (> magit-process-error-tooltip-max-lines 0)
-       (buffer-live-p process-buf)
-       (with-current-buffer process-buf
-         (save-excursion
-           (goto-char (or (oref section content)
-                          (oref section start)))
-           (buffer-substring-no-properties
-            (point)
-            (save-excursion
-              (forward-line magit-process-error-tooltip-max-lines)
-              (goto-char
-               (if (> (point) (oref section end))
-                   (oref section end)
-                 (point)))
-              ;; Remove any trailing whitespace.
-              (when (re-search-backward "[^[:space:]\n]"
-                                        (oref section start) t)
-                (forward-char 1))
-              (point)))))))
-
-(defvar-local magit-this-error nil)
-
-(defvar magit-process-finish-apply-ansi-colors nil)
-
-(defun magit-process-finish (arg &optional process-buf command-buf
-                                 default-dir section)
-  (unless (integerp arg)
-    (setq process-buf (process-buffer arg))
-    (setq command-buf (process-get arg 'command-buf))
-    (setq default-dir (process-get arg 'default-dir))
-    (setq section     (process-get arg 'section))
-    (setq arg         (process-exit-status arg)))
-  (when (fboundp 'dired-uncache)
-    (dired-uncache default-dir))
-  (when (buffer-live-p process-buf)
-    (with-current-buffer process-buf
-      (let ((inhibit-read-only t)
-            (marker (oref section start)))
-        (goto-char marker)
-        (save-excursion
-          (delete-char 3)
-          (set-marker-insertion-type marker nil)
-          (insert (propertize (format "%3s" arg)
-                              'magit-section section
-                              'font-lock-face (if (= arg 0)
-                                                  'magit-process-ok
-                                                'magit-process-ng)))
-          (set-marker-insertion-type marker t))
-        (when magit-process-finish-apply-ansi-colors
-          (ansi-color-apply-on-region (oref section content)
-                                      (oref section end)))
-        (if (= (oref section end)
-               (+ (line-end-position) 2))
-            (save-excursion
-              (goto-char (1+ (line-end-position)))
-              (delete-char -1)
-              (oset section content nil))
-          (when (and (= arg 0)
-                     (not (--any-p (eq (window-buffer it) process-buf)
-                                   (window-list))))
-            (magit-section-hide section))))))
-  (if (= arg 0)
-      ;; Unset the `mode-line-process' value upon success.
-      (magit-process-unset-mode-line default-dir)
-    ;; Otherwise process the error.
-    (let ((msg (magit-process-error-summary process-buf section)))
-      ;; Change `mode-line-process' to an error face upon failure.
-      (if magit-process-display-mode-line-error
-          (magit-process-set-mode-line-error-status
-           (or (magit-process-error-tooltip process-buf section)
-               msg))
-        (magit-process-unset-mode-line default-dir))
-      ;; Either signal the error, or else display the error summary in
-      ;; the status buffer and with a message in the echo area.
-      (cond
-       (magit-process-raise-error
-        (signal 'magit-git-error (list (format "%s (in %s)" msg default-dir))))
-       ((not (eq msg 'suppressed))
-        (when (buffer-live-p process-buf)
-          (with-current-buffer process-buf
-            (when-let ((status-buf (magit-get-mode-buffer 'magit-status-mode)))
-              (with-current-buffer status-buf
-                (setq magit-this-error msg)))))
-        (message "%s ... [%s buffer %s for details]" msg
-                 (if-let ((key (and (buffer-live-p command-buf)
-                                    (with-current-buffer command-buf
-                                      (car (where-is-internal
-                                            'magit-process-buffer))))))
-                     (format "Hit %s to see" (key-description key))
-                   "See")
-                 (buffer-name process-buf))))))
-  arg)
-
-(defun magit-process-display-buffer (process)
-  (when (process-live-p process)
-    (let ((buf (process-buffer process)))
-      (cond ((not (buffer-live-p buf)))
-            ((= magit-process-popup-time 0)
-             (if (minibufferp)
-                 (switch-to-buffer-other-window buf)
-               (pop-to-buffer buf)))
-            ((> magit-process-popup-time 0)
-             (run-with-timer magit-process-popup-time nil
-                             (lambda (p)
-                               (when (eq (process-status p) 'run)
-                                 (let ((buf (process-buffer p)))
-                                   (when (buffer-live-p buf)
-                                     (if (minibufferp)
-                                         (switch-to-buffer-other-window buf)
-                                       (pop-to-buffer buf))))))
-                             process))))))
-
-(defun magit--log-action (summary line list)
-  (let (heading lines)
-    (if (cdr list)
-        (progn (setq heading (funcall summary list))
-               (setq lines (mapcar line list)))
-      (setq heading (funcall line (car list))))
-    (with-current-buffer (magit-process-buffer t)
-      (goto-char (1- (point-max)))
-      (let ((inhibit-read-only t))
-        (magit-insert-section (message)
-          (magit-insert-heading (concat "  * " heading))
-          (when lines
-            (dolist (line lines)
-              (insert line "\n"))
-            (insert "\n"))))
-      (let ((inhibit-message t))
-        (when heading
-          (setq lines (cons heading lines)))
-        (message (mapconcat #'identity lines "\n"))))))
-
-;;; _
-(provide 'magit-process)
-;;; magit-process.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-process.elc b/emacs/elpa/magit-20240426.2118/magit-process.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-push.el b/emacs/elpa/magit-20240426.2118/magit-push.el
@@ -1,377 +0,0 @@
-;;; magit-push.el --- Update remote objects and refs  -*- 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 push commands.
-
-;;; Code:
-
-(require 'magit)
-
-;;; Commands
-
-;;;###autoload (autoload 'magit-push "magit-push" nil t)
-(transient-define-prefix magit-push ()
-  "Push to another repository."
-  :man-page "git-push"
-  ["Arguments"
-   ("-f" "Force with lease" (nil "--force-with-lease"))
-   ("-F" "Force"            ("-f" "--force"))
-   ("-h" "Disable hooks"    "--no-verify")
-   ("-n" "Dry run"          ("-n" "--dry-run"))
-   (5 "-u" "Set upstream"   "--set-upstream")
-   (7 "-t" "Follow tags"    "--follow-tags")]
-  [:if magit-get-current-branch
-   :description (lambda ()
-                  (format (propertize "Push %s to" 'face 'transient-heading)
-                          (propertize (magit-get-current-branch)
-                                      'face 'magit-branch-local)))
-   ("p" magit-push-current-to-pushremote)
-   ("u" magit-push-current-to-upstream)
-   ("e" "elsewhere" magit-push-current)]
-  ["Push"
-   [("o" "another branch"    magit-push-other)
-    ("r" "explicit refspecs" magit-push-refspecs)
-    ("m" "matching branches" magit-push-matching)]
-   [("T" "a tag"             magit-push-tag)
-    ("t" "all tags"          magit-push-tags)
-    (6 "n" "a note ref"      magit-push-notes-ref)]]
-  ["Configure"
-   ("C" "Set variables..."  magit-branch-configure)])
-
-(defun magit-push-arguments ()
-  (transient-args 'magit-push))
-
-(defun magit-git-push (branch target args)
-  (run-hooks 'magit-credential-hook)
-  ;; If the remote branch already exists, then we do not have to
-  ;; qualify the target, which we prefer to avoid doing because
-  ;; using the default namespace is wrong in obscure cases.
-  (pcase-let ((namespace (if (magit-get-tracked target) "" "refs/heads/"))
-              (`(,remote . ,target)
-               (magit-split-branch-name target)))
-    (magit-run-git-async "push" "-v" args remote
-                         (format "%s:%s%s" branch namespace target))))
-
-;;;###autoload (autoload 'magit-push-current-to-pushremote "magit-push" nil t)
-(transient-define-suffix magit-push-current-to-pushremote (args)
-  "Push the current branch to its push-remote.
-
-When the push-remote is not configured, then read the push-remote
-from the user, set it, and then push to it.  With a prefix
-argument the push-remote can be changed before pushed to it."
-  :if #'magit-get-current-branch
-  :description #'magit-push--pushbranch-description
-  (interactive (list (magit-push-arguments)))
-  (pcase-let ((`(,branch ,remote ,changed)
-               (magit--select-push-remote "push there")))
-    (when changed
-      (magit-confirm 'set-and-push
-        (string-replace
-         "%" "%%"
-         (format "Really use \"%s\" as push-remote and push \"%s\" there"
-                 remote branch))))
-    (run-hooks 'magit-credential-hook)
-    (magit-run-git-async "push" "-v" args remote
-                         (format "refs/heads/%s:refs/heads/%s"
-                                 branch branch)))) ; see #3847 and #3872
-
-(defun magit-push--pushbranch-description ()
-  (let* ((branch (magit-get-current-branch))
-         (target (magit-get-push-branch branch t))
-         (remote (magit-get-push-remote branch))
-         (v (magit--push-remote-variable branch t)))
-    (cond
-     (target)
-     ((member remote (magit-list-remotes))
-      (format "%s, creating it"
-              (magit--propertize-face (concat remote "/" branch)
-                                      'magit-branch-remote)))
-     (remote
-      (format "%s, replacing invalid" v))
-     (t
-      (format "%s, setting that" v)))))
-
-;;;###autoload (autoload 'magit-push-current-to-upstream "magit-push" nil t)
-(transient-define-suffix magit-push-current-to-upstream (args)
-  "Push 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."
-  :if #'magit-get-current-branch
-  :description #'magit-push--upstream-description
-  (interactive (list (magit-push-arguments)))
-  (let* ((branch (or (magit-get-current-branch)
-                     (user-error "No branch is checked out")))
-         (remote (magit-get "branch" branch "remote"))
-         (merge  (magit-get "branch" branch "merge")))
-    (when (or current-prefix-arg
-              (not (or (magit-get-upstream-branch branch)
-                       (magit--unnamed-upstream-p remote merge)
-                       (magit--valid-upstream-p remote merge))))
-      (let* ((branches (cl-union (--map (concat it "/" branch)
-                                        (magit-list-remotes))
-                                 (magit-list-remote-branch-names)
-                                 :test #'equal))
-             (upstream (magit-completing-read
-                        (format "Set upstream of %s and push there" branch)
-                        branches nil nil nil 'magit-revision-history
-                        (or (car (member (magit-remote-branch-at-point) branches))
-                            (car (member "origin/master" branches)))))
-             (upstream* (or (magit-get-tracked upstream)
-                            (magit-split-branch-name upstream))))
-        (setq remote (car upstream*))
-        (setq merge  (cdr upstream*))
-        (unless (string-prefix-p "refs/" merge)
-          ;; User selected a non-existent remote-tracking branch.
-          ;; It is very likely, but not certain, that this is the
-          ;; correct thing to do.  It is even more likely that it
-          ;; is what the user wants to happen.
-          (setq merge (concat "refs/heads/" merge)))
-        (magit-confirm 'set-and-push
-          (string-replace
-           "%" "%%"
-           (format "Really use \"%s\" as upstream and push \"%s\" there"
-                   upstream branch))))
-      (cl-pushnew "--set-upstream" args :test #'equal))
-    (run-hooks 'magit-credential-hook)
-    (magit-run-git-async "push" "-v" args remote (concat branch ":" merge))))
-
-(defun magit-push--upstream-description ()
-  (and-let* ((branch (magit-get-current-branch)))
-    (or (magit-get-upstream-branch branch)
-        (let ((remote (magit-get "branch" branch "remote"))
-              (merge  (magit-get "branch" branch "merge"))
-              (u (magit--propertize-face "@{upstream}" 'bold)))
-          (cond
-           ((magit--unnamed-upstream-p remote merge)
-            (format "%s as %s"
-                    (magit--propertize-face remote 'bold)
-                    (magit--propertize-face merge 'magit-branch-remote)))
-           ((magit--valid-upstream-p remote merge)
-            (format "%s creating %s"
-                    (magit--propertize-face remote 'magit-branch-remote)
-                    (magit--propertize-face merge 'magit-branch-remote)))
-           ((or remote merge)
-            (concat u ", creating it and replacing invalid"))
-           (t
-            (concat u ", creating it")))))))
-
-;;;###autoload
-(defun magit-push-current (target args)
-  "Push the current branch to a branch read in the minibuffer."
-  (interactive
-   (if-let ((current (magit-get-current-branch)))
-       (list (magit-read-remote-branch (format "Push %s to" current)
-                                       nil nil current 'confirm)
-             (magit-push-arguments))
-     (user-error "No branch is checked out")))
-  (magit-git-push (magit-get-current-branch) target args))
-
-;;;###autoload
-(defun magit-push-other (source target args)
-  "Push an arbitrary branch or commit somewhere.
-Both the source and the target are read in the minibuffer."
-  (interactive
-   (let ((source (magit-read-local-branch-or-commit "Push")))
-     (list source
-           (magit-read-remote-branch
-            (format "Push %s to" source) nil
-            (if (magit-local-branch-p source)
-                (or (magit-get-push-branch source)
-                    (magit-get-upstream-branch source))
-              (and (magit-rev-ancestor-p source "HEAD")
-                   (or (magit-get-push-branch)
-                       (magit-get-upstream-branch))))
-            source 'confirm)
-           (magit-push-arguments))))
-  (magit-git-push source target args))
-
-(defvar magit-push-refspecs-history nil)
-
-;;;###autoload
-(defun magit-push-refspecs (remote refspecs args)
-  "Push one or multiple REFSPECS to a REMOTE.
-Both the REMOTE and the REFSPECS 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."
-  (interactive
-   (list (magit-read-remote "Push to remote")
-         (magit-completing-read-multiple
-          "Push refspec,s: "
-          (cons "HEAD" (magit-list-local-branch-names))
-          nil nil nil 'magit-push-refspecs-history)
-         (magit-push-arguments)))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" "-v" args remote refspecs))
-
-;;;###autoload
-(defun magit-push-matching (remote &optional args)
-  "Push all matching branches to another repository.
-If multiple remotes exist, then read one from the user.
-If just one exists, use that without requiring confirmation."
-  (interactive (list (magit-read-remote "Push matching branches to" nil t)
-                     (magit-push-arguments)))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" "-v" args remote ":"))
-
-;;;###autoload
-(defun magit-push-tags (remote &optional args)
-  "Push 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."
-  (interactive (list (magit-read-remote "Push tags to remote" nil t)
-                     (magit-push-arguments)))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" remote "--tags" args))
-
-;;;###autoload
-(defun magit-push-tag (tag remote &optional args)
-  "Push a tag to another repository."
-  (interactive
-   (let  ((tag (magit-read-tag "Push tag")))
-     (list tag (magit-read-remote (format "Push %s to remote" tag) nil t)
-           (magit-push-arguments))))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" remote tag args))
-
-;;;###autoload
-(defun magit-push-notes-ref (ref remote &optional args)
-  "Push a notes ref to another repository."
-  (interactive
-   (let ((note (magit-notes-read-ref "Push notes" nil nil)))
-     (list note
-           (magit-read-remote (format "Push %s to remote" note) nil t)
-           (magit-push-arguments))))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" remote ref args))
-
-;;;###autoload (autoload 'magit-push-implicitly "magit-push" nil t)
-(transient-define-suffix magit-push-implicitly (args)
-  "Push somewhere without using an explicit refspec.
-
-This command simply runs \"git push -v [ARGS]\".  ARGS are the
-arguments specified in the popup buffer.  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.  To add it use something like:
-
-  (transient-insert-suffix \\='magit-push \"o\"
-    \\='(\"i\" magit-push-implicitly))"
-  :description #'magit-push-implicitly--desc
-  (interactive (list (magit-push-arguments)))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" "-v" args))
-
-(defun magit-push-implicitly--desc ()
-  ;; This implements the logic for git push as documented.
-  ;; First, we resolve a remote to use based on various remote and
-  ;; pushRemote options.
-  ;; Then, we resolve the refspec to use for the remote based on push
-  ;; and pushDefault options.
-  ;; Note that the remote and refspec to push are handled separately,
-  ;; so it doesn't make sense to talk about "pushing to upstream".
-  ;; Depending on the options, you could end up pushing to the
-  ;; "upstream" remote but not the "upstream" branch, and vice versa.
-  (let* ((branch (magit-get-current-branch))
-         (remote (or (magit-get-push-remote branch)
-                     ;; Note: Avoid `magit-get-remote' because it
-                     ;; filters out the local repo case (".").
-                     (magit-get "branch" branch "remote")
-                     (let ((remotes (magit-list-remotes)))
-                       (cond
-                        ((and (magit-git-version>= "2.27")
-                              (= (length remotes) 1))
-                         (car remotes))
-                        ((member "origin" remotes) "origin"))))))
-    (if (null remote)
-        "nothing (no remote)"
-      (let ((refspec (magit-get "remote" remote "push")))
-        (if refspec
-            (format "to %s with refspecs %s"
-                    (magit--propertize-face remote 'bold)
-                    (magit--propertize-face refspec 'bold))
-          (pcase (or (magit-get "push.default") "simple")
-            ("nothing" "nothing (due to push.default)")
-            ((or "current" "simple")
-             (format "%s to %s"
-                     (magit--propertize-face branch 'magit-branch-current)
-                     (magit--propertize-face (format "%s/%s" remote branch)
-                                             'magit-branch-remote)))
-            ((or "upstream" "tracking")
-             (let ((ref (magit-get "branch" branch "merge")))
-               (if ref
-                   (format "%s to %s"
-                           (magit--propertize-face branch 'magit-branch-current)
-                           (cond
-                            ((string-prefix-p "refs/heads/" ref)
-                             (magit--propertize-face
-                              (format "%s/%s" remote
-                                      (substring ref (length "refs/heads/")))
-                              'magit-branch-remote))
-                            ((not (string-match "/" ref))
-                             (magit--propertize-face (format "%s/%s" remote ref)
-                                                     'magit-branch-remote))
-                            (t (format "%s as %s"
-                                       (magit--propertize-face remote 'bold)
-                                       (magit--propertize-face ref 'bold)))))
-                 "nothing (no upstream)")))
-            ("matching" (format "all matching to %s"
-                                (magit--propertize-face remote 'bold)))))))))
-
-;;;###autoload (autoload 'magit-push-to-remote "magit-push" nil t)
-(transient-define-suffix magit-push-to-remote (remote args)
-  "Push to 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 arguments specified in the popup buffer.  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'.
-
-You can add this command as a suffix using something like:
-
-  (transient-insert-suffix \\='magit-push \"o\"
-    \\='(\"x\" magit-push-to-remote))"
-  :description #'magit-push-to-remote--desc
-  (interactive (list (magit-read-remote "Push to remote")
-                     (magit-push-arguments)))
-  (run-hooks 'magit-credential-hook)
-  (magit-run-git-async "push" "-v" args remote))
-
-(defun magit-push-to-remote--desc ()
-  (format "using %s" (magit--propertize-face "git push <remote>" 'bold)))
-
-;;; _
-(provide 'magit-push)
-;;; magit-push.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-reflog.elc b/emacs/elpa/magit-20240426.2118/magit-reflog.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-refs.el b/emacs/elpa/magit-20240426.2118/magit-refs.el
@@ -1,789 +0,0 @@
-;;; magit-refs.el --- Listing references  -*- 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 support for listing references in a buffer.
-
-;;; Code:
-
-(require 'magit)
-
-;;; Options
-
-(defgroup magit-refs nil
-  "Inspect and manipulate Git branches and tags."
-  :link '(info-link "(magit)References Buffer")
-  :group 'magit-modes)
-
-(defcustom magit-refs-mode-hook nil
-  "Hook run after entering Magit-Refs mode."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refs
-  :type 'hook)
-
-(defcustom magit-refs-sections-hook
-  '(magit-insert-error-header
-    magit-insert-branch-description
-    magit-insert-local-branches
-    magit-insert-remote-branches
-    magit-insert-tags)
-  "Hook run to insert sections into a references buffer."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refs
-  :type 'hook)
-
-(defcustom magit-refs-show-commit-count nil
-  "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.
-
-To change the value in an existing buffer use the command
-`magit-refs-set-show-commit-count'."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-refs
-  :safe (lambda (val) (memq val '(all branch nil)))
-  :type '(choice (const :tag "For branches and tags" all)
-                 (const :tag "For branches only"     branch)
-                 (const :tag "Never"                 nil)))
-(put 'magit-refs-show-commit-count 'safe-local-variable 'symbolp)
-(put 'magit-refs-show-commit-count 'permanent-local t)
-
-(defcustom magit-refs-pad-commit-counts nil
-  "Whether to pad all 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."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-refs
-  :type 'boolean)
-
-(defvar magit-refs-show-push-remote nil
-  "Whether to show the push-remotes of local branches.
-Also show the commits that the local branch is ahead and behind
-the push-target.  Unfortunately there is a bug in Git that makes
-this useless (the commits ahead and behind the upstream are
-shown), so this isn't enabled yet.")
-
-(defcustom magit-refs-show-remote-prefix nil
-  "Whether to show the remote prefix in lists of remote branches.
-
-This is redundant because the name of the remote is already shown
-in the heading preceding the list of its branches."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-refs
-  :type 'boolean)
-
-(defcustom magit-refs-margin
-  (list nil
-        (nth 1 magit-log-margin)
-        'magit-log-margin-width nil
-        (nth 4 magit-log-margin))
-  "Format of the margin in `magit-refs-mode' buffers.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-refs
-  :group 'magit-margin
-  :safe (lambda (val) (memq val '(all branch nil)))
-  :type magit-log-margin--custom-type
-  :initialize #'magit-custom-initialize-reset
-  :set-after '(magit-log-margin)
-  :set (apply-partially #'magit-margin-set-variable 'magit-refs-mode))
-
-(defcustom magit-refs-margin-for-tags nil
-  "Whether to show information about tags in the margin.
-
-This is disabled by default because it is slow if there are many
-tags."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-refs
-  :group 'magit-margin
-  :type 'boolean)
-
-(defcustom magit-refs-primary-column-width (cons 16 32)
-  "Width of the focus 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.)"
-  :package-version '(magit . "2.12.0")
-  :group 'magit-refs
-  :type '(choice (integer :tag "Constant wide")
-                 (cons    :tag "Wide constrains"
-                          (integer :tag "Minimum")
-                          (integer :tag "Maximum"))))
-
-(defcustom magit-refs-focus-column-width 5
-  "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."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-refs
-  :type 'integer)
-
-(defcustom magit-refs-filter-alist nil
-  "Alist controlling which refs are omitted from `magit-refs-mode' buffers.
-
-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.
-
-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."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-refs
-  :type '(alist :key-type   (choice  :tag "Key" regexp function)
-                :value-type (boolean :tag "Value"
-                                     :on  "show (non-nil)"
-                                     :off "omit (nil)")))
-
-(defcustom magit-visit-ref-behavior nil
-  "Control 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 have grown accustomed
-to such inconsistent, but to you useful, behavior, then you can
-restore that 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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-refs
-  :group 'magit-commands
-  :options '(focus-on-ref create-branch checkout-any checkout-branch)
-  :type '(list :convert-widget custom-hook-convert-widget))
-
-;;; Mode
-
-(defvar-keymap magit-refs-mode-map
-  :doc "Keymap for `magit-refs-mode'."
-  :parent magit-mode-map
-  "C-y" #'magit-refs-set-show-commit-count
-  "L"   #'magit-margin-settings)
-
-(define-derived-mode magit-refs-mode magit-mode "Magit Refs"
-  "Mode which lists and compares references.
-
-This mode is documented in info node `(magit)References Buffer'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-section-toggle] to expand or hide the section at point.
-Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
-to visit the commit or branch at point.
-
-Type \\[magit-branch] to see available branch commands.
-Type \\[magit-merge] to merge the branch or commit at point.
-Type \\[magit-cherry-pick] to apply the commit at point.
-Type \\[magit-reset] to reset `HEAD' to the commit at point.
-
-\\{magit-refs-mode-map}"
-  :group 'magit-refs
-  (hack-dir-local-variables-non-file-buffer)
-  (setq magit--imenu-group-types '(local remote tags)))
-
-(defun magit-refs-setup-buffer (ref args)
-  (magit-setup-buffer #'magit-refs-mode nil
-    (magit-buffer-upstream ref)
-    (magit-buffer-arguments args)))
-
-(defun magit-refs-refresh-buffer ()
-  (setq magit-set-buffer-margin-refresh (not (magit-buffer-margin-p)))
-  (unless (magit-rev-verify magit-buffer-upstream)
-    (setq magit-refs-show-commit-count nil))
-  (magit-set-header-line-format
-   (format "%s %s" magit-buffer-upstream
-           (mapconcat #'identity magit-buffer-arguments " ")))
-  (magit-insert-section (branchbuf)
-    (magit-run-section-hook 'magit-refs-sections-hook))
-  (add-hook 'kill-buffer-hook #'magit-preserve-section-visibility-cache))
-
-(cl-defmethod magit-buffer-value (&context (major-mode magit-refs-mode))
-  (cons magit-buffer-upstream magit-buffer-arguments))
-
-;;; Commands
-
-;;;###autoload (autoload 'magit-show-refs "magit-refs" nil t)
-(transient-define-prefix magit-show-refs (&optional transient)
-  "List and compare references in a dedicated buffer."
-  :man-page "git-branch"
-  :value (lambda ()
-           (magit-show-refs-arguments magit-prefix-use-buffer-arguments))
-  ["Arguments"
-   (magit-for-each-ref:--contains)
-   ("-M" "Merged"               "--merged=" magit-transient-read-revision)
-   ("-m" "Merged to HEAD"       "--merged")
-   ("-N" "Not merged"           "--no-merged=" magit-transient-read-revision)
-   ("-n" "Not merged to HEAD"   "--no-merged")
-   (magit-for-each-ref:--sort)]
-  ["Actions"
-   ("y" "Show refs, comparing them with HEAD"           magit-show-refs-head)
-   ("c" "Show refs, comparing them with current branch" magit-show-refs-current)
-   ("o" "Show refs, comparing them with other branch"   magit-show-refs-other)
-   ("r" "Show refs, changing commit count display"
-    magit-refs-set-show-commit-count)]
-  (interactive (list (or (derived-mode-p 'magit-refs-mode)
-                         current-prefix-arg)))
-  (if transient
-      (transient-setup 'magit-show-refs)
-    (magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))
-
-(defun magit-show-refs-arguments (&optional use-buffer-args)
-  (unless use-buffer-args
-    (setq use-buffer-args magit-direct-use-buffer-arguments))
-  (let (args)
-    (cond
-     ((eq transient-current-command 'magit-show-refs)
-      (setq args (transient-args 'magit-show-refs)))
-     ((eq major-mode 'magit-refs-mode)
-      (setq args magit-buffer-arguments))
-     ((and (memq use-buffer-args '(always selected))
-           (and-let* ((buffer (magit-get-mode-buffer
-                               'magit-refs-mode nil
-                               (eq use-buffer-args 'selected))))
-             (progn ; work around debbugs#31840
-               (setq args (buffer-local-value 'magit-buffer-arguments buffer))
-               t))))
-     (t
-      (setq args (alist-get 'magit-show-refs transient-values))))
-    args))
-
-(transient-define-argument magit-for-each-ref:--contains ()
-  :description "Contains"
-  :class 'transient-option
-  :key "-c"
-  :argument "--contains="
-  :reader #'magit-transient-read-revision)
-
-(transient-define-argument magit-for-each-ref:--sort ()
-  :description "Sort"
-  :class 'transient-option
-  :key "-s"
-  :argument "--sort="
-  :reader #'magit-read-ref-sort)
-
-(defun magit-read-ref-sort (prompt initial-input _history)
-  (magit-completing-read prompt
-                         '("-committerdate" "-authordate"
-                           "committerdate" "authordate")
-                         nil nil initial-input))
-
-;;;###autoload
-(defun magit-show-refs-head (&optional args)
-  "List and compare references in a dedicated buffer.
-Compared with `HEAD'."
-  (interactive (list (magit-show-refs-arguments)))
-  (magit-refs-setup-buffer "HEAD" args))
-
-;;;###autoload
-(defun magit-show-refs-current (&optional args)
-  "List and compare references in a dedicated buffer.
-Compare with the current branch or `HEAD' if it is detached."
-  (interactive (list (magit-show-refs-arguments)))
-  (magit-refs-setup-buffer (magit-get-current-branch) args))
-
-;;;###autoload
-(defun magit-show-refs-other (&optional ref args)
-  "List and compare references in a dedicated buffer.
-Compared with a branch read from the user."
-  (interactive (list (magit-read-other-branch "Compare with")
-                     (magit-show-refs-arguments)))
-  (magit-refs-setup-buffer ref args))
-
-(transient-define-suffix magit-refs-set-show-commit-count ()
-  "Change for which refs the commit count is shown."
-  :description "Change verbosity"
-  :key "v"
-  :transient nil
-  :if-derived 'magit-refs-mode
-  (interactive)
-  (setq-local magit-refs-show-commit-count
-              (magit-read-char-case "Show commit counts for " nil
-                (?a "[a]ll refs" 'all)
-                (?b "[b]ranches only" t)
-                (?n "[n]othing" nil)))
-  (magit-refresh))
-
-(defun magit-visit-ref ()
-  "Visit the reference or revision at point in another buffer.
-If there is no revision at point or with a prefix argument prompt
-for a revision.
-
-This command behaves just like `magit-show-commit', except if
-point is on a reference in a `magit-refs-mode' buffer (a buffer
-listing branches and tags), in which case the behavior may be
-different, but only if you have customized the option
-`magit-visit-ref-behavior' (which see).  When invoked from a
-menu this command always behaves like `magit-show-commit'."
-  (interactive)
-  (if (and (derived-mode-p 'magit-refs-mode)
-           (magit-section-match '(branch tag))
-           (not (magit-menu-position)))
-      (let ((ref (oref (magit-current-section) value)))
-        (cond (current-prefix-arg
-               (cond ((memq 'focus-on-ref magit-visit-ref-behavior)
-                      (magit-refs-setup-buffer ref (magit-show-refs-arguments)))
-                     (magit-visit-ref-behavior
-                      ;; Don't prompt for commit to visit.
-                      (let ((current-prefix-arg nil))
-                        (call-interactively #'magit-show-commit)))))
-              ((and (memq 'create-branch magit-visit-ref-behavior)
-                    (magit-section-match [branch remote]))
-               (let ((branch (cdr (magit-split-branch-name ref))))
-                 (if (magit-branch-p branch)
-                     (if (magit-rev-eq branch ref)
-                         (magit-call-git "checkout" branch)
-                       (setq branch (propertize branch 'face 'magit-branch-local))
-                       (setq ref (propertize ref 'face 'magit-branch-remote))
-                       (pcase (prog1 (read-char-choice (format (propertize "\
-Branch %s already exists.
-  [c]heckout %s as-is
-  [r]reset %s to %s and checkout %s
-  [a]bort " 'face 'minibuffer-prompt) branch branch branch ref branch)
-                                                       '(?c ?r ?a))
-                                (message "")) ; otherwise prompt sticks
-                         (?c (magit-call-git "checkout" branch))
-                         (?r (magit-call-git "checkout" "-B" branch ref))
-                         (?a (user-error "Abort"))))
-                   (magit-call-git "checkout" "-b" branch ref))
-                 (setq magit-buffer-upstream branch)
-                 (magit-refresh)))
-              ((or (memq 'checkout-any magit-visit-ref-behavior)
-                   (and (memq 'checkout-branch magit-visit-ref-behavior)
-                        (magit-section-match [branch local])))
-               (magit-call-git "checkout" ref)
-               (setq magit-buffer-upstream ref)
-               (magit-refresh))
-              (t
-               (call-interactively #'magit-show-commit))))
-    (call-interactively #'magit-show-commit)))
-
-;;; Sections
-
-(defvar-keymap magit-remote-section-map
-  :doc "Keymap for `remote' sections."
-  "<remap> <magit-file-rename>"  #'magit-remote-rename
-  "<remap> <magit-delete-thing>" #'magit-remote-remove
-  "<2>" (magit-menu-item "Rename %s" #'magit-remote-rename)
-  "<1>" (magit-menu-item "Remove %m" #'magit-remote-remove))
-
-(defvar-keymap magit-branch-section-map
-  :doc "Keymap for `branch' sections."
-  "<remap> <magit-file-rename>"  #'magit-branch-rename
-  "<remap> <magit-delete-thing>" #'magit-branch-delete
-  "<remap> <magit-visit-thing>"  #'magit-visit-ref
-  "<3>" (magit-menu-item "Rename %s"    #'magit-branch-rename)
-  "<2>" (magit-menu-item "Delete %m"    #'magit-branch-delete)
-  "<1>" (magit-menu-item "Visit commit" #'magit-visit-ref))
-
-(defvar-keymap magit-tag-section-map
-  :doc "Keymap for `tag' sections."
-  "<remap> <magit-delete-thing>" #'magit-tag-delete
-  "<remap> <magit-visit-thing>"  #'magit-visit-ref
-  "<2>" (magit-menu-item "Delete %m" #'magit-tag-delete)
-  "<1>" (magit-menu-item "Visit %s"  #'magit-visit-ref))
-
-(defun magit--painted-branch-as-menu-section (section)
-  (and-let* ((branch (and (magit-section-match 'commit)
-                          (magit--painted-branch-at-point))))
-    (let ((dummy (magit-section :type 'branch :value branch)))
-      (oset dummy keymap magit-branch-section-map)
-      (dolist (slot '(start content hidden parent children))
-        (when (slot-boundp section slot)
-          (setf (eieio-oref dummy slot)
-                (eieio-oref section slot))))
-      dummy)))
-
-(add-hook 'magit-menu-alternative-section-hook
-          #'magit--painted-branch-as-menu-section)
-
-(defun magit-insert-branch-description ()
-  "Insert header containing the description of the current branch.
-Insert a header line with the name and description of the
-current branch.  The description is taken from the Git variable
-`branch.<NAME>.description'; if that is undefined then no header
-line is inserted at all."
-  (when-let* ((branch (magit-get-current-branch))
-              (desc (magit-get "branch" branch "description"))
-              (desc (split-string desc "\n")))
-    (when (equal (car (last desc)) "")
-      (setq desc (butlast desc)))
-    (magit-insert-section (branchdesc branch t)
-      (magit-insert-heading branch ": " (car desc))
-      (when (cdr desc)
-        (insert (mapconcat #'identity (cdr desc) "\n"))
-        (insert "\n\n")))))
-
-(defun magit-insert-tags ()
-  "Insert sections showing all tags."
-  (when-let ((tags (magit-git-lines "tag" "--list" "-n" magit-buffer-arguments)))
-    (let ((_head (magit-rev-parse "HEAD")))
-      (magit-insert-section (tags)
-        (magit-insert-heading "Tags:")
-        (dolist (tag tags)
-          (string-match "^\\([^ \t]+\\)[ \t]+\\([^ \t\n].*\\)?" tag)
-          (let ((tag (match-string 1 tag))
-                (msg (match-string 2 tag)))
-            (when (magit-refs--insert-refname-p tag)
-              (magit-insert-section (tag tag t)
-                (magit-insert-heading
-                  (magit-refs--format-focus-column tag 'tag)
-                  (propertize tag 'font-lock-face 'magit-tag)
-                  (make-string
-                   (max 1 (- (if (consp magit-refs-primary-column-width)
-                                 (car magit-refs-primary-column-width)
-                               magit-refs-primary-column-width)
-                             (length tag)))
-                   ?\s)
-                  (and msg (magit-log-propertize-keywords nil msg)))
-                (when (and magit-refs-margin-for-tags (magit-buffer-margin-p))
-                  (magit-refs--format-margin tag))
-                (magit-refs--insert-cherry-commits tag)))))
-        (insert ?\n)
-        (magit-make-margin-overlay nil t)))))
-
-(defun magit-insert-remote-branches ()
-  "Insert sections showing all remote-tracking branches."
-  (dolist (remote (magit-list-remotes))
-    (magit-insert-section (remote remote)
-      (magit-insert-heading
-        (let ((pull (magit-get "remote" remote "url"))
-              (push (magit-get "remote" remote "pushurl")))
-          (format (propertize "Remote %s (%s):"
-                              'font-lock-face 'magit-section-heading)
-                  (propertize remote 'font-lock-face 'magit-branch-remote)
-                  (concat pull (and pull push ", ") push))))
-      (let (head)
-        (dolist (line (magit-git-lines "for-each-ref" "--format=\
-%(symref:short)%00%(refname:short)%00%(refname)%00%(subject)"
-                                       (concat "refs/remotes/" remote)
-                                       magit-buffer-arguments))
-          (pcase-let ((`(,head-branch ,branch ,ref ,msg)
-                       (cl-substitute nil ""
-                                      (split-string line "\0")
-                                      :test #'equal)))
-            (cond
-             (head-branch
-              ;; Note: Use `ref' instead of `branch' for the check
-              ;; below because 'refname:short' shortens the remote
-              ;; HEAD to '<remote>' instead of '<remote>/HEAD' as of
-              ;; Git v2.40.0.
-              (cl-assert
-               (equal ref (concat "refs/remotes/" remote "/HEAD")))
-              (setq head head-branch))
-             ((not (equal ref (concat "refs/remotes/" remote "/HEAD")))
-              ;; ^ Skip mis-configured remotes where HEAD is not a
-              ;; symref.  See #5092.
-              (when (magit-refs--insert-refname-p branch)
-                (magit-insert-section (branch branch t)
-                  (let ((headp (equal branch head))
-                        (abbrev (if magit-refs-show-remote-prefix
-                                    branch
-                                  (substring branch (1+ (length remote))))))
-                    (magit-insert-heading
-                      (magit-refs--format-focus-column branch)
-                      (magit-refs--propertize-branch
-                       abbrev ref (and headp 'magit-branch-remote-head))
-                      (make-string
-                       (max 1 (- (if (consp magit-refs-primary-column-width)
-                                     (car magit-refs-primary-column-width)
-                                   magit-refs-primary-column-width)
-                                 (length abbrev)))
-                       ?\s)
-                      (and msg (magit-log-propertize-keywords nil msg))))
-                  (when (magit-buffer-margin-p)
-                    (magit-refs--format-margin branch))
-                  (magit-refs--insert-cherry-commits branch))))))))
-      (insert ?\n)
-      (magit-make-margin-overlay nil t))))
-
-(defun magit-insert-local-branches ()
-  "Insert sections showing all local branches."
-  (magit-insert-section (local nil)
-    (magit-insert-heading "Branches:")
-    (dolist (line (magit-refs--format-local-branches))
-      (pcase-let ((`(,branch . ,strings) line))
-        (magit-insert-section
-          ((eval (if branch 'branch 'commit))
-           (or branch (magit-rev-parse "HEAD"))
-           t)
-          (apply #'magit-insert-heading strings)
-          (when (magit-buffer-margin-p)
-            (magit-refs--format-margin branch))
-          (magit-refs--insert-cherry-commits branch))))
-    (insert ?\n)
-    (magit-make-margin-overlay nil t)))
-
-(defun magit-refs--format-local-branches ()
-  (let ((lines (seq-keep #'magit-refs--format-local-branch
-                         (magit-git-lines
-                          "for-each-ref"
-                          (concat "--format=\
-%(HEAD)%00%(refname:short)%00%(refname)%00\
-%(upstream:short)%00%(upstream)%00%(upstream:track)%00"
-                                  (if magit-refs-show-push-remote "\
-%(push:remotename)%00%(push)%00%(push:track)%00%(subject)"
-                                 "%00%00%00%(subject)"))
-                          "refs/heads"
-                          magit-buffer-arguments))))
-    (unless (magit-get-current-branch)
-      (push (magit-refs--format-local-branch
-             (concat "*\0\0\0\0\0\0\0\0" (magit-rev-format "%s")))
-            lines))
-    (setq-local magit-refs-primary-column-width
-                (let ((def (default-value 'magit-refs-primary-column-width)))
-                  (if (atom def)
-                      def
-                    (pcase-let ((`(,min . ,max) def))
-                      (min max (apply #'max min (mapcar #'car lines)))))))
-    (mapcar (pcase-lambda (`(,_ ,branch ,focus ,branch-desc ,u:ahead ,p:ahead
-                                ,u:behind ,upstream ,p:behind ,push ,msg))
-              (list branch focus branch-desc u:ahead p:ahead
-                    (make-string (max 1 (- magit-refs-primary-column-width
-                                           (length (concat branch-desc
-                                                           u:ahead
-                                                           p:ahead
-                                                           u:behind))))
-                                 ?\s)
-                    u:behind upstream p:behind push
-                    msg))
-            lines)))
-
-(defun magit-refs--format-local-branch (line)
-  (pcase-let ((`(,head ,branch ,ref ,upstream ,u:ref ,u:track
-                       ,push ,p:ref ,p:track ,msg)
-               (cl-substitute nil "" (split-string line "\0") :test #'equal)))
-    (when (or (not branch)
-              (magit-refs--insert-refname-p branch))
-      (let* ((headp (equal head "*"))
-             (pushp (and push
-                         magit-refs-show-push-remote
-                         (magit-rev-verify p:ref)
-                         (not (equal p:ref u:ref))))
-             (branch-desc
-              (if branch
-                  (magit-refs--propertize-branch
-                   branch ref (and headp 'magit-branch-current))
-                (magit--propertize-face "(detached)" 'magit-branch-warning)))
-             (u:ahead  (and u:track
-                            (string-match "ahead \\([0-9]+\\)" u:track)
-                            (magit--propertize-face
-                             (concat (and magit-refs-pad-commit-counts " ")
-                                     (match-string 1 u:track)
-                                     ">")
-                             'magit-dimmed)))
-             (u:behind (and u:track
-                            (string-match "behind \\([0-9]+\\)" u:track)
-                            (magit--propertize-face
-                             (concat "<"
-                                     (match-string 1 u:track)
-                                     (and magit-refs-pad-commit-counts " "))
-                             'magit-dimmed)))
-             (p:ahead  (and pushp p:track
-                            (string-match "ahead \\([0-9]+\\)" p:track)
-                            (magit--propertize-face
-                             (concat (match-string 1 p:track)
-                                     ">"
-                                     (and magit-refs-pad-commit-counts " "))
-                             'magit-branch-remote)))
-             (p:behind (and pushp p:track
-                            (string-match "behind \\([0-9]+\\)" p:track)
-                            (magit--propertize-face
-                             (concat "<"
-                                     (match-string 1 p:track)
-                                     (and magit-refs-pad-commit-counts " "))
-                             'magit-dimmed))))
-        (list (1+ (length (concat branch-desc u:ahead p:ahead u:behind)))
-              branch
-              (magit-refs--format-focus-column branch headp)
-              branch-desc u:ahead p:ahead u:behind
-              (and upstream
-                   (concat (if (equal u:track "[gone]")
-                               (magit--propertize-face upstream 'error)
-                             (magit-refs--propertize-branch upstream u:ref))
-                           " "))
-              (and pushp
-                   (concat p:behind
-                           (magit--propertize-face
-                            push 'magit-branch-remote)
-                           " "))
-              (and msg (magit-log-propertize-keywords nil msg)))))))
-
-(defun magit-refs--format-focus-column (ref &optional type)
-  (let ((focus magit-buffer-upstream)
-        (width (if magit-refs-show-commit-count
-                   magit-refs-focus-column-width
-                 1)))
-    (format
-     (format "%%%ss " width)
-     (cond ((or (equal ref focus)
-                (and (eq type t)
-                     (equal focus "HEAD")))
-            (magit--propertize-face (concat (if (equal focus "HEAD") "@" "*")
-                                            (make-string (1- width) ?\s))
-                                    'magit-section-heading))
-           ((if (eq type 'tag)
-                (eq magit-refs-show-commit-count 'all)
-              magit-refs-show-commit-count)
-            (pcase-let ((`(,behind ,ahead)
-                         (magit-rev-diff-count magit-buffer-upstream ref)))
-              (magit--propertize-face
-               (cond ((> ahead  0) (concat "<" (number-to-string ahead)))
-                     ((> behind 0) (concat (number-to-string behind) ">"))
-                     (t "="))
-               'magit-dimmed)))
-           (t "")))))
-
-(defun magit-refs--propertize-branch (branch ref &optional head-face)
-  (let ((face (cdr (cl-find-if (pcase-lambda (`(,re . ,_))
-                                 (string-match-p re ref))
-                               magit-ref-namespaces))))
-    (magit--propertize-face
-     branch (if head-face (list face head-face) face))))
-
-(defun magit-refs--insert-refname-p (refname)
-  (if-let ((entry (seq-find (pcase-lambda (`(,key . ,_))
-                              (if (functionp key)
-                                  (funcall key refname)
-                                (string-match-p key refname)))
-                            magit-refs-filter-alist)))
-      (cdr entry)
-    t))
-
-(defun magit-refs--insert-cherry-commits (ref)
-  (magit-insert-section-body
-    (let ((start (point))
-          (magit-insert-section--current nil))
-      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
-        "cherry" "-v" (magit-abbrev-arg) magit-buffer-upstream ref)
-      (if (= (point) start)
-          (message "No cherries for %s" ref)
-        (magit-make-margin-overlay nil t)))))
-
-(defun magit-refs--format-margin (commit)
-  (save-excursion
-    (goto-char (line-beginning-position 0))
-    (let ((line (magit-rev-format "%ct%cN" commit)))
-      (magit-log-format-margin commit
-                               (substring line 10)
-                               (substring line 0 10)))))
-
-;;; _
-(provide 'magit-refs)
-;;; magit-refs.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-refs.elc b/emacs/elpa/magit-20240426.2118/magit-refs.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-sequence.elc b/emacs/elpa/magit-20240426.2118/magit-sequence.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-stash.elc b/emacs/elpa/magit-20240426.2118/magit-stash.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-status.el b/emacs/elpa/magit-20240426.2118/magit-status.el
@@ -1,822 +0,0 @@
-;;; magit-status.el --- The grand overview  -*- 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 the status buffer.
-
-;;; Code:
-
-(require 'magit)
-
-;;; Options
-
-(defgroup magit-status nil
-  "Inspect and manipulate Git repositories."
-  :link '(info-link "(magit)Status Buffer")
-  :group 'magit-modes)
-
-(defcustom magit-status-mode-hook nil
-  "Hook run after entering Magit-Status mode."
-  :group 'magit-status
-  :type 'hook)
-
-(defcustom magit-status-headers-hook
-  '(magit-insert-error-header
-    magit-insert-diff-filter-header
-    magit-insert-head-branch-header
-    magit-insert-upstream-branch-header
-    magit-insert-push-branch-header
-    magit-insert-tags-header)
-  "Hook run to insert headers 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."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-status
-  :type 'hook
-  :options '(magit-insert-error-header
-             magit-insert-diff-filter-header
-             magit-insert-repo-header
-             magit-insert-remote-header
-             magit-insert-head-branch-header
-             magit-insert-upstream-branch-header
-             magit-insert-push-branch-header
-             magit-insert-tags-header))
-
-(defcustom magit-status-sections-hook
-  '(magit-insert-status-headers
-    magit-insert-merge-log
-    magit-insert-rebase-sequence
-    magit-insert-am-sequence
-    magit-insert-sequencer-sequence
-    magit-insert-bisect-output
-    magit-insert-bisect-rest
-    magit-insert-bisect-log
-    magit-insert-untracked-files
-    magit-insert-unstaged-changes
-    magit-insert-staged-changes
-    magit-insert-stashes
-    magit-insert-unpushed-to-pushremote
-    magit-insert-unpushed-to-upstream-or-recent
-    magit-insert-unpulled-from-pushremote
-    magit-insert-unpulled-from-upstream)
-  "Hook run to insert sections into a status buffer."
-  :package-version '(magit . "2.12.0")
-  :group 'magit-status
-  :type 'hook)
-
-(defcustom magit-status-initial-section '(1)
-  "The section point is placed on when a status buffer is created.
-
-When such a buffer is merely being refreshed or being shown again
-after it was merely buried, then this option has no effect.
-
-If this is nil, then point remains on the very first section as
-usual.  Otherwise it has to be a list of integers and section
-identity lists.  The members of that list are tried in order
-until a matching section is found.
-
-An integer means to jump to the nth section, 1 for example
-jumps over the headings.  To get a section's \"identity list\"
-use \\[universal-argument] \\[magit-describe-section-briefly].
-
-If, for example, you want to jump to the commits that haven't
-been pulled from the upstream, or else the second section, then
-use: (((unpulled . \"..@{upstream}\") (status)) 1).
-
-See option `magit-section-initial-visibility-alist' for how to
-control the initial visibility of the jumped to section."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-status
-  :type '(choice (const :tag "as usual" nil)
-                 (repeat (choice (number :tag "nth top-level section")
-                                 (sexp   :tag "section identity")))))
-
-(defcustom magit-status-goto-file-position nil
-  "Whether to go to position corresponding to file position.
-
-If this is non-nil and the current buffer is visiting a file,
-then `magit-status' tries to go to the position in the status
-buffer that corresponds to the position in the file-visiting
-buffer.  This jumps into either the diff of unstaged changes
-or the diff of staged changes.
-
-If the previously current buffer does not visit a file, or if
-the file has neither unstaged nor staged changes then this has
-no effect.
-
-The command `magit-status-here' tries to go to that position,
-regardless of the value of this option."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-status
-  :type 'boolean)
-
-(defcustom magit-status-show-hashes-in-headers nil
-  "Whether headers in the status buffer show hashes.
-The functions which respect this option are
-`magit-insert-head-branch-header',
-`magit-insert-upstream-branch-header', and
-`magit-insert-push-branch-header'."
-  :package-version '(magit . "2.4.0")
-  :group 'magit-status
-  :type 'boolean)
-
-(defcustom magit-status-margin
-  (list nil
-        (nth 1 magit-log-margin)
-        'magit-log-margin-width nil
-        (nth 4 magit-log-margin))
-  "Format of the margin in `magit-status-mode' buffers.
-
-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."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-status
-  :group 'magit-margin
-  :type magit-log-margin--custom-type
-  :initialize #'magit-custom-initialize-reset
-  :set-after '(magit-log-margin)
-  :set (apply-partially #'magit-margin-set-variable 'magit-status-mode))
-
-(defcustom magit-status-use-buffer-arguments 'selected
-  "Whether `magit-status' reuses arguments when the buffer already exists.
-
-This option has no effect when merely refreshing the status
-buffer using `magit-refresh'.
-
-Valid values are:
-
-`always': Always use the set of arguments that is currently
-  active in the status buffer, provided that buffer exists
-  of course.
-`selected': Use the set of arguments from the status
-  buffer, but only if it is displayed in a window of the
-  current frame.  This is the default.
-`current': Use the set of arguments from the status buffer,
-  but only if it is the current buffer.
-`never': Never use the set of arguments from the status
-  buffer."
-  :package-version '(magit . "3.0.0")
-  :group 'magit-buffers
-  :group 'magit-commands
-  :type '(choice
-          (const :tag "always use args from buffer" always)
-          (const :tag "use args from buffer if displayed in frame" selected)
-          (const :tag "use args from buffer if it is current" current)
-          (const :tag "never use args from buffer" never)))
-
-;;; Commands
-
-;;;###autoload
-(defun magit-init (directory)
-  "Initialize a Git repository, then show its status.
-
-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.
-
-Non-interactively DIRECTORY is (re-)initialized unconditionally."
-  (interactive
-   (let ((directory (file-name-as-directory
-                     (expand-file-name
-                      (read-directory-name "Create repository in: ")))))
-     (when-let ((toplevel (magit-toplevel directory)))
-       (setq toplevel (expand-file-name toplevel))
-       (unless (y-or-n-p (if (file-equal-p toplevel directory)
-                             (format "Reinitialize existing repository %s? "
-                                     directory)
-                           (format "%s is a repository.  Create another in %s? "
-                                   toplevel directory)))
-         (user-error "Abort")))
-     (list directory)))
-  ;; `git init' does not understand the meaning of "~"!
-  (magit-call-git "init" (magit-convert-filename-for-git
-                          (expand-file-name directory)))
-  (magit-status-setup-buffer directory))
-
-;;;###autoload
-(defun magit-status (&optional directory cache)
-  "Show the status of the current Git repository in a buffer.
-
-If the current directory isn't located within a Git repository,
-then prompt for an existing repository or an arbitrary directory,
-depending on option `magit-repository-directories', and show the
-status of the selected repository instead.
-
-* If that option specifies any existing repositories, then offer
-  those for completion and show the status buffer for the
-  selected one.
-
-* Otherwise read an arbitrary directory using regular file-name
-  completion.  If the selected directory is the top-level of an
-  existing working tree, then show the status buffer for that.
-
-* Otherwise offer to initialize the selected directory as a new
-  repository.  After creating the repository show its status
-  buffer.
-
-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) read an arbitrary directory and act on
-  it as described above.  The same could be accomplished using
-  the command `magit-init'.
-
-* With a single prefix argument read an existing repository, or
-  if none can be found based on `magit-repository-directories',
-  then fall back to the same behavior as with two prefix
-  arguments."
-  (interactive
-   (let ((magit--refresh-cache (list (cons 0 0))))
-     (list (and (or current-prefix-arg (not (magit-toplevel)))
-                (progn (magit--assert-usable-git)
-                       (magit-read-repository
-                        (>= (prefix-numeric-value current-prefix-arg) 16))))
-           magit--refresh-cache)))
-  (let ((magit--refresh-cache (or cache (list (cons 0 0)))))
-    (if directory
-        (let ((toplevel (magit-toplevel directory)))
-          (setq directory (file-name-as-directory
-                           (expand-file-name directory)))
-          (if (and toplevel (file-equal-p directory toplevel))
-              (magit-status-setup-buffer directory)
-            (when (y-or-n-p
-                   (if toplevel
-                       (format "%s is a repository.  Create another in %s? "
-                               toplevel directory)
-                     (format "Create repository in %s? " directory)))
-              ;; Creating a new repository invalidates cached values.
-              (setq magit--refresh-cache nil)
-              (magit-init directory))))
-      (magit-status-setup-buffer default-directory))))
-
-(put 'magit-status 'interactive-only 'magit-status-setup-buffer)
-
-;;;###autoload
-(defalias 'magit #'magit-status
-  "Begin using Magit.
-
-This alias for `magit-status' exists for better discoverability.
-
-Instead of invoking this alias for `magit-status' using
-\"M-x magit RET\", you should bind a key to `magit-status'
-and read the info node `(magit)Getting Started', which
-also contains other useful hints.")
-
-;;;###autoload
-(defun magit-status-here ()
-  "Like `magit-status' but with non-nil `magit-status-goto-file-position'."
-  (interactive)
-  (let ((magit-status-goto-file-position t))
-    (call-interactively #'magit-status)))
-
-(put 'magit-status-here 'interactive-only 'magit-status-setup-buffer)
-
-;;;###autoload
-(defun magit-status-quick ()
-  "Show the status of the current Git repository, maybe without refreshing.
-
-If the status buffer of the current Git repository exists but
-isn't being displayed in the selected frame, then display it
-without refreshing it.
-
-If the status buffer is being displayed in the selected frame,
-then also refresh it.
-
-Prefix arguments have the same meaning as for `magit-status',
-and additionally cause the buffer to be refresh.
-
-To use this function instead of `magit-status', add this to your
-init file: (global-set-key (kbd \"C-x g\") \\='magit-status-quick)."
-  (interactive)
-  (if-let ((buffer
-            (and (not current-prefix-arg)
-                 (not (magit-get-mode-buffer 'magit-status-mode nil 'selected))
-                 (magit-get-mode-buffer 'magit-status-mode))))
-      (magit-display-buffer buffer)
-    (call-interactively #'magit-status)))
-
-;;; Mode
-
-(defvar-keymap magit-status-mode-map
-  :doc "Keymap for `magit-status-mode'."
-  :parent magit-mode-map
-  "j" #'magit-status-jump
-  "<remap> <dired-jump>" #'magit-dired-jump)
-
-(transient-define-prefix magit-status-jump ()
-  "In a Magit-Status buffer, jump to a section."
-  ["Jump to"
-   [("z " "Stashes" magit-jump-to-stashes
-     :if (lambda () (memq 'magit-insert-stashes magit-status-sections-hook)))
-    ("t " "Tracked" magit-jump-to-tracked
-     :if (lambda () (memq 'magit-insert-tracked-files magit-status-sections-hook)))
-    ("n " "Untracked" magit-jump-to-untracked
-     :if (lambda () (memq 'magit-insert-untracked-files magit-status-sections-hook)))
-    ("u " "Unstaged" magit-jump-to-unstaged
-     :if (lambda () (memq 'magit-insert-unstaged-changes magit-status-sections-hook)))
-    ("s " "Staged" magit-jump-to-staged
-     :if (lambda () (memq 'magit-insert-staged-changes magit-status-sections-hook)))]
-   [("fu" "Unpulled from upstream" magit-jump-to-unpulled-from-upstream
-     :if (lambda () (memq 'magit-insert-unpulled-from-upstream magit-status-sections-hook)))
-    ("fp" "Unpulled from pushremote" magit-jump-to-unpulled-from-pushremote
-     :if (lambda () (memq 'magit-insert-unpulled-from-pushremote magit-status-sections-hook)))
-    ("pu" magit-jump-to-unpushed-to-upstream
-     :if (lambda ()
-           (or (memq 'magit-insert-unpushed-to-upstream-or-recent magit-status-sections-hook)
-               (memq 'magit-insert-unpushed-to-upstream magit-status-sections-hook)))
-     :description (lambda ()
-                    (let ((upstream (magit-get-upstream-branch)))
-                      (if (or (not upstream)
-                              (magit-rev-ancestor-p "HEAD" upstream))
-                          "Recent commits"
-                        "Unmerged into upstream"))))
-    ("pp" "Unpushed to pushremote" magit-jump-to-unpushed-to-pushremote
-     :if (lambda () (memq 'magit-insert-unpushed-to-pushremote magit-status-sections-hook)))
-    ("a " "Assumed unstaged" magit-jump-to-assume-unchanged
-     :if (lambda () (memq 'magit-insert-assume-unchanged-files magit-status-sections-hook)))
-    ("w " "Skip worktree" magit-jump-to-skip-worktree
-     :if (lambda () (memq 'magit-insert-skip-worktree-files magit-status-sections-hook)))]
-   [("i" "Using Imenu" imenu)]])
-
-(define-derived-mode magit-status-mode magit-mode "Magit"
-  "Mode for looking at Git status.
-
-This mode is documented in info node `(magit)Status Buffer'.
-
-\\<magit-mode-map>\
-Type \\[magit-refresh] to refresh the current buffer.
-Type \\[magit-section-toggle] to expand or hide the section at point.
-Type \\[magit-visit-thing] to visit the change or commit at point.
-
-Type \\[magit-dispatch] to invoke major commands.
-
-Staging and applying changes is documented in info node
-`(magit)Staging and Unstaging' and info node `(magit)Applying'.
-
-\\<magit-hunk-section-map>Type \
-\\[magit-apply] to apply the change at point, \
-\\[magit-stage] to stage,
-\\[magit-unstage] to unstage, \
-\\[magit-discard] to discard, or \
-\\[magit-reverse] to reverse it.
-
-\\<magit-status-mode-map>\
-Type \\[magit-commit] to create a commit.
-
-\\{magit-status-mode-map}"
-  :group 'magit-status
-  (hack-dir-local-variables-non-file-buffer)
-  (when magit-status-initial-section
-    (add-hook 'magit-refresh-buffer-hook
-              #'magit-status-goto-initial-section nil t))
-  (setq magit--imenu-group-types '(not branch commit)))
-
-(put 'magit-status-mode 'magit-diff-default-arguments
-     '("--no-ext-diff"))
-(put 'magit-status-mode 'magit-log-default-arguments
-     '("-n256" "--decorate"))
-
-;;;###autoload
-(defun magit-status-setup-buffer (&optional directory)
-  (unless directory
-    (setq directory default-directory))
-  (when (file-remote-p directory)
-    (magit-git-version-assert))
-  (let* ((default-directory directory)
-         (d (magit-diff--get-value 'magit-status-mode
-                                   magit-status-use-buffer-arguments))
-         (l (magit-log--get-value 'magit-status-mode
-                                  magit-status-use-buffer-arguments))
-         (file (and magit-status-goto-file-position
-                    (magit-file-relative-name)))
-         (line (and file (save-restriction (widen) (line-number-at-pos))))
-         (col  (and file (save-restriction (widen) (current-column))))
-         (buf  (magit-setup-buffer #'magit-status-mode nil
-                 (magit-buffer-diff-args  (nth 0 d))
-                 (magit-buffer-diff-files (nth 1 d))
-                 (magit-buffer-log-args   (nth 0 l))
-                 (magit-buffer-log-files  (nth 1 l)))))
-    (when file
-      (with-current-buffer buf
-        (let ((staged (magit-get-section '((staged) (status)))))
-          (if (and staged
-                   (cadr (magit-diff--locate-hunk file line staged)))
-              (magit-diff--goto-position file line col staged)
-            (let ((unstaged (magit-get-section '((unstaged) (status)))))
-              (unless (and unstaged
-                           (magit-diff--goto-position file line col unstaged))
-                (when staged
-                  (magit-diff--goto-position file line col staged))))))))
-    buf))
-
-(defun magit-status-refresh-buffer ()
-  (magit-git-exit-code "update-index" "--refresh")
-  (magit-insert-section (status)
-    (magit-run-section-hook 'magit-status-sections-hook)))
-
-(defun magit-status-goto-initial-section ()
-  "Jump to the section specified by `magit-status-initial-section'."
-  (when-let ((section
-              (--some (if (integerp it)
-                          (nth (1- it)
-                               (magit-section-siblings (magit-current-section)
-                                                       'next))
-                        (magit-get-section it))
-                      magit-status-initial-section)))
-    (goto-char (oref section start))
-    (when-let ((vis (cdr (assq 'magit-status-initial-section
-                               magit-section-initial-visibility-alist))))
-      (if (eq vis 'hide)
-          (magit-section-hide section)
-        (magit-section-show section))))
-  (remove-hook 'magit-refresh-buffer-hook
-               #'magit-status-goto-initial-section t))
-
-(defun magit-status-maybe-update-revision-buffer (&optional _)
-  "When moving in the status buffer, update the revision buffer.
-If there is no revision buffer in the same frame, then do nothing."
-  (when (derived-mode-p 'magit-status-mode)
-    (magit--maybe-update-revision-buffer)))
-
-(defun magit-status-maybe-update-stash-buffer (&optional _)
-  "When moving in the status buffer, update the stash buffer.
-If there is no stash buffer in the same frame, then do nothing."
-  (when (derived-mode-p 'magit-status-mode)
-    (magit--maybe-update-stash-buffer)))
-
-(defun magit-status-maybe-update-blob-buffer (&optional _)
-  "When moving in the status buffer, update the blob buffer.
-If there is no blob buffer in the same frame, then do nothing."
-  (when (derived-mode-p 'magit-status-mode)
-    (magit--maybe-update-blob-buffer)))
-
-;;; Sections
-;;;; Special Headers
-
-(defun magit-insert-status-headers ()
-  "Insert header sections appropriate for `magit-status-mode' buffers.
-The sections are inserted by running the functions on the hook
-`magit-status-headers-hook'."
-  (if (magit-rev-verify "HEAD")
-      (magit-insert-headers 'magit-status-headers-hook)
-    (insert "In the beginning there was darkness\n\n")))
-
-(defvar-keymap magit-error-section-map
-  :doc "Keymap for `error' sections."
-  "<remap> <magit-visit-thing>" #'magit-process-buffer
-  "<1>" (magit-menu-item "Visit process output" #'magit-process-buffer))
-
-(defun magit-insert-error-header ()
-  "Insert 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."
-  (when magit-this-error
-    (magit-insert-section (error 'git)
-      (insert (propertize (format "%-10s" "GitError! ")
-                          'font-lock-face 'magit-section-heading))
-      (insert (propertize magit-this-error 'font-lock-face 'error))
-      (when-let ((key (car (where-is-internal 'magit-process-buffer))))
-        (insert (format "  [Type `%s' for details]" (key-description key))))
-      (insert ?\n))
-    (setq magit-this-error nil)))
-
-(defun magit-insert-diff-filter-header ()
-  "Insert a header line showing the effective diff filters."
-  (let ((ignore-modules (magit-ignore-submodules-p)))
-    (when (or ignore-modules
-              magit-buffer-diff-files)
-      (insert (propertize (format "%-10s" "Filter! ")
-                          'font-lock-face 'magit-section-heading))
-      (when ignore-modules
-        (insert ignore-modules)
-        (when magit-buffer-diff-files
-          (insert " -- ")))
-      (when magit-buffer-diff-files
-        (insert (mapconcat #'identity magit-buffer-diff-files " ")))
-      (insert ?\n))))
-
-;;;; Reference Headers
-
-(defun magit-insert-head-branch-header (&optional branch)
-  "Insert a header line about the current branch.
-If `HEAD' is detached, then insert information about that commit
-instead.  The optional BRANCH argument is for internal use only."
-  (let ((branch (or branch (magit-get-current-branch)))
-        (output (magit-rev-format "%h %s" (or branch "HEAD"))))
-    (string-match "^\\([^ ]+\\) \\(.*\\)" output)
-    (magit-bind-match-strings (commit summary) output
-      (when (equal summary "")
-        (setq summary "(no commit message)"))
-      (if branch
-          (magit-insert-section (branch branch)
-            (insert (format "%-10s" "Head: "))
-            (when magit-status-show-hashes-in-headers
-              (insert (propertize commit 'font-lock-face 'magit-hash) ?\s))
-            (insert (propertize branch 'font-lock-face 'magit-branch-local))
-            (insert ?\s)
-            (insert (funcall magit-log-format-message-function branch summary))
-            (insert ?\n))
-        (magit-insert-section (commit commit)
-          (insert (format "%-10s" "Head: "))
-          (insert (propertize commit 'font-lock-face 'magit-hash))
-          (insert ?\s)
-          (insert (funcall magit-log-format-message-function nil summary))
-          (insert ?\n))))))
-
-(defun magit-insert-upstream-branch-header (&optional branch upstream keyword)
-  "Insert a header line about the upstream of the current branch.
-If no branch is checked out, then insert nothing.  The optional
-arguments are for internal use only."
-  (when-let ((branch (or branch (magit-get-current-branch))))
-    (let ((remote (magit-get "branch" branch "remote"))
-          (merge  (magit-get "branch" branch "merge"))
-          (rebase (magit-get "branch" branch "rebase")))
-      (when (or remote merge)
-        (unless upstream
-          (setq upstream (magit-get-upstream-branch branch)))
-        (magit-insert-section (branch upstream)
-          (pcase rebase
-            ("true")
-            ("false" (setq rebase nil))
-            (_       (setq rebase (magit-get-boolean "pull.rebase"))))
-          (insert (format "%-10s" (or keyword (if rebase "Rebase: " "Merge: "))))
-          (insert
-           (if upstream
-               (concat (and magit-status-show-hashes-in-headers
-                            (concat (propertize (magit-rev-format "%h" upstream)
-                                                'font-lock-face 'magit-hash)
-                                    " "))
-                       upstream " "
-                       (funcall magit-log-format-message-function upstream
-                                (funcall magit-log-format-message-function nil
-                                         (or (magit-rev-format "%s" upstream)
-                                             "(no commit message)"))))
-             (cond
-              ((magit--unnamed-upstream-p remote merge)
-               (concat (propertize merge  'font-lock-face 'magit-branch-remote)
-                       " from "
-                       (propertize remote 'font-lock-face 'bold)))
-              ((magit--valid-upstream-p remote merge)
-               (if (equal remote ".")
-                   (concat
-                    (propertize merge 'font-lock-face 'magit-branch-local) " "
-                    (propertize "does not exist"
-                                'font-lock-face 'magit-branch-warning))
-                 (format
-                  "%s %s %s"
-                  (propertize merge 'font-lock-face 'magit-branch-remote)
-                  (propertize "does not exist on"
-                              'font-lock-face 'magit-branch-warning)
-                  (propertize remote 'font-lock-face 'magit-branch-remote))))
-              (t
-               (propertize "invalid upstream configuration"
-                           'font-lock-face 'magit-branch-warning)))))
-          (insert ?\n))))))
-
-(defun magit-insert-push-branch-header ()
-  "Insert a header line about the branch the current branch is pushed to."
-  (when-let* ((branch (magit-get-current-branch))
-              (target (magit-get-push-branch branch)))
-    (magit-insert-section (branch target)
-      (insert (format "%-10s" "Push: "))
-      (insert
-       (if (magit-rev-verify target)
-           (concat (and magit-status-show-hashes-in-headers
-                        (concat (propertize (magit-rev-format "%h" target)
-                                            'font-lock-face 'magit-hash)
-                                " "))
-                   target " "
-                   (funcall magit-log-format-message-function target
-                            (funcall magit-log-format-message-function nil
-                                     (or (magit-rev-format "%s" target)
-                                         "(no commit message)"))))
-         (let ((remote (magit-get-push-remote branch)))
-           (if (magit-remote-p remote)
-               (concat target " "
-                       (propertize "does not exist"
-                                   'font-lock-face 'magit-branch-warning))
-             (concat remote " "
-                     (propertize "remote does not exist"
-                                 'font-lock-face 'magit-branch-warning))))))
-      (insert ?\n))))
-
-(defun magit-insert-tags-header ()
-  "Insert a header line about the current and/or next tag."
-  (let* ((this-tag (magit-get-current-tag nil t))
-         (next-tag (magit-get-next-tag nil t))
-         (this-cnt (cadr this-tag))
-         (next-cnt (cadr next-tag))
-         (this-tag (car this-tag))
-         (next-tag (car next-tag))
-         (both-tags (and this-tag next-tag t)))
-    (when (or this-tag next-tag)
-      (magit-insert-section (tag (or this-tag next-tag))
-        (insert (format "%-10s" (if both-tags "Tags: " "Tag: ")))
-        (cl-flet ((insert-count (tag count face)
-                    (insert (concat (propertize tag 'font-lock-face 'magit-tag)
-                                    (and (> count 0)
-                                         (format " (%s)"
-                                                 (propertize
-                                                  (format "%s" count)
-                                                  'font-lock-face face)))))))
-          (when this-tag  (insert-count this-tag this-cnt 'magit-branch-local))
-          (when both-tags (insert ", "))
-          (when next-tag  (insert-count next-tag next-cnt 'magit-tag)))
-        (insert ?\n)))))
-
-;;;; Auxiliary Headers
-
-(defun magit-insert-user-header ()
-  "Insert a header line about the current user."
-  (let ((name  (magit-get "user.name"))
-        (email (magit-get "user.email")))
-    (when (and name email)
-      (magit-insert-section (user name)
-        (insert (format "%-10s" "User: "))
-        (insert (propertize name 'font-lock-face 'magit-log-author))
-        (insert " <" email ">\n")))))
-
-(defun magit-insert-repo-header ()
-  "Insert a header line showing the path to the repository top-level."
-  (let ((topdir (magit-toplevel)))
-    (magit-insert-section (repo topdir)
-      (insert (format "%-10s%s\n" "Repo: " (abbreviate-file-name topdir))))))
-
-(defun 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."
-  (when-let* ((name (magit-get-some-remote))
-              ;; Under certain configurations it's possible for
-              ;; url to be nil, when name is not, see #2858.
-              (url (magit-get "remote" name "url")))
-    (magit-insert-section (remote name)
-      (insert (format "%-10s" "Remote: "))
-      (insert (propertize name 'font-lock-face 'magit-branch-remote) ?\s)
-      (insert url ?\n))))
-
-;;;; File Sections
-
-(defvar-keymap magit-untracked-section-map
-  :doc "Keymap for the `untracked' section."
-  "<remap> <magit-delete-thing>" #'magit-discard
-  "<remap> <magit-stage-file>"   #'magit-stage
-  "<2>" (magit-menu-item "Discard files" #'magit-discard)
-  "<1>" (magit-menu-item "Stage files"   #'magit-stage))
-
-(magit-define-section-jumper magit-jump-to-untracked "Untracked files" untracked)
-
-(defun 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\".
-
-If the first element of `magit-buffer-diff-files' is a
-directory, then limit the list to files below that.  The value
-value of that variable can be set using \"D -- DIRECTORY RET g\"."
-  (let* ((show (or (magit-get "status.showUntrackedFiles") "normal"))
-         (base (car magit-buffer-diff-files))
-         (base (and base (file-directory-p base) base)))
-    (unless (equal show "no")
-      (if (equal show "all")
-          (when-let ((files (magit-untracked-files nil base)))
-            (magit-insert-section (untracked)
-              (magit-insert-heading "Untracked files:")
-              (magit-insert-files files base)
-              (insert ?\n)))
-        (when-let ((files
-                    (--mapcat (and (eq (aref it 0) ??)
-                                   (list (substring it 3)))
-                              (magit-git-items "status" "-z" "--porcelain"
-                                               (magit-ignore-submodules-p t)
-                                               "--" base))))
-          (magit-insert-section (untracked)
-            (magit-insert-heading "Untracked files:")
-            (dolist (file files)
-              (magit-insert-section (file file)
-                (insert (propertize file 'font-lock-face 'magit-filename) ?\n)))
-            (insert ?\n)))))))
-
-(magit-define-section-jumper magit-jump-to-tracked "Tracked files" tracked)
-
-(defun magit-insert-tracked-files ()
-  "Insert a tree of tracked files.
-
-If the first element of `magit-buffer-diff-files' is a
-directory, then limit the list to files below that.  The value
-value of that variable can be set using \"D -- DIRECTORY RET g\"."
-  (when-let ((files (magit-list-files)))
-    (let* ((base (car magit-buffer-diff-files))
-           (base (and base (file-directory-p base) base)))
-      (magit-insert-section (tracked nil t)
-        (magit-insert-heading "Tracked files:")
-        (magit-insert-files files base)
-        (insert ?\n)))))
-
-(defun magit-insert-ignored-files ()
-  "Insert a tree of ignored 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\"."
-  (when-let ((files (magit-ignored-files)))
-    (let* ((base (car magit-buffer-diff-files))
-           (base (and base (file-directory-p base) base)))
-      (magit-insert-section (tracked nil t)
-        (magit-insert-heading "Ignored files:")
-        (magit-insert-files files base)
-        (insert ?\n)))))
-
-(magit-define-section-jumper magit-jump-to-skip-worktree "Skip-worktree files" skip-worktree)
-
-(defun 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\"."
-  (when-let ((files (magit-skip-worktree-files)))
-    (let* ((base (car magit-buffer-diff-files))
-           (base (and base (file-directory-p base) base)))
-      (magit-insert-section (skip-worktree nil t)
-        (magit-insert-heading "Skip-worktree files:")
-        (magit-insert-files files base)
-        (insert ?\n)))))
-
-(magit-define-section-jumper magit-jump-to-assume-unchanged "Assume-unchanged files" assume-unchanged)
-
-(defun magit-insert-assume-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\"."
-  (when-let ((files (magit-assume-unchanged-files)))
-    (let* ((base (car magit-buffer-diff-files))
-           (base (and base (file-directory-p base) base)))
-      (magit-insert-section (assume-unchanged nil t)
-        (magit-insert-heading "Assume-unchanged files:")
-        (magit-insert-files files base)
-        (insert ?\n)))))
-
-(defun magit-insert-files (files directory)
-  (while (and files (string-prefix-p (or directory "") (car files)))
-    (let ((dir (file-name-directory (car files))))
-      (if (equal dir directory)
-          (let ((file (pop files)))
-            (magit-insert-section (file file)
-              (insert (propertize file 'font-lock-face 'magit-filename) ?\n)))
-        (magit-insert-section (file dir t)
-          (insert (propertize dir 'file 'magit-filename) ?\n)
-          (magit-insert-heading)
-          (setq files (magit-insert-files files dir))))))
-  files)
-
-;;; _
-(provide 'magit-status)
-;;; magit-status.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-status.elc b/emacs/elpa/magit-20240426.2118/magit-status.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-submodule.el b/emacs/elpa/magit-20240426.2118/magit-submodule.el
@@ -1,719 +0,0 @@
-;;; magit-submodule.el --- Submodule 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/>.
-
-;;; Code:
-
-(require 'magit)
-
-(defvar x-stretch-cursor)
-
-;;; Options
-
-(defcustom magit-module-sections-hook
-  '(magit-insert-modules-overview
-    magit-insert-modules-unpulled-from-upstream
-    magit-insert-modules-unpulled-from-pushremote
-    magit-insert-modules-unpushed-to-upstream
-    magit-insert-modules-unpushed-to-pushremote)
-  "Hook run by `magit-insert-modules'.
-
-That function isn't part of `magit-status-sections-hook's default
-value, so you have to add it yourself for this hook to have any
-effect."
-  :package-version '(magit . "2.11.0")
-  :group 'magit-status
-  :type 'hook)
-
-(defcustom magit-module-sections-nested t
-  "Whether `magit-insert-modules' wraps inserted sections.
-
-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."
-  :package-version '(magit . "2.11.0")
-  :group 'magit-status
-  :type 'boolean)
-
-(defcustom magit-submodule-list-mode-hook '(hl-line-mode)
-  "Hook run after entering Magit-Submodule-List mode."
-  :package-version '(magit . "2.9.0")
-  :group 'magit-repolist
-  :type 'hook
-  :get 'magit-hook-custom-get
-  :options '(hl-line-mode))
-
-(defcustom magit-submodule-list-columns
-  '(("Path"     25 magit-modulelist-column-path   nil)
-    ("Version"  25 magit-repolist-column-version
-     ((:sort magit-repolist-version<)))
-    ("Branch"   20 magit-repolist-column-branch   nil)
-    ("B<U" 3 magit-repolist-column-unpulled-from-upstream
-     ((:right-align t)
-      (:sort <)))
-    ("B>U" 3 magit-repolist-column-unpushed-to-upstream
-     ((:right-align t)
-      (:sort <)))
-    ("B<P" 3 magit-repolist-column-unpulled-from-pushremote
-     ((:right-align t)
-      (:sort <)))
-    ("B>P" 3 magit-repolist-column-unpushed-to-pushremote
-     ((:right-align t)
-      (:sort <)))
-    ("B"   3 magit-repolist-column-branches
-     ((:right-align t)
-      (:sort <)))
-    ("S"   3 magit-repolist-column-stashes
-     ((:right-align t)
-      (:sort <))))
-  "List of columns displayed by `magit-list-submodules'.
-
-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 0.  \"+\" is substituted for numbers higher
-than 9."
-  :package-version '(magit . "2.8.0")
-  :group 'magit-repolist
-  :type `(repeat (list :tag "Column"
-                       (string   :tag "Header Label")
-                       (integer  :tag "Column Width")
-                       (function :tag "Inserter Function")
-                       (repeat   :tag "Properties"
-                                 (list (choice :tag "Property"
-                                               (const :right-align)
-                                               (const :pad-right)
-                                               (const :sort)
-                                               (symbol))
-                                       (sexp   :tag "Value"))))))
-
-(defcustom magit-submodule-list-sort-key '("Path" . nil)
-  "Initial sort key for buffer created by `magit-list-submodules'.
-If nil, no additional sorting is performed.  Otherwise, this
-should be a cons cell (NAME . FLIP).  NAME is a string matching
-one of the column names in `magit-submodule-list-columns'.  FLIP,
-if non-nil, means to invert the resulting sort."
-  :package-version '(magit . "3.2.0")
-  :group 'magit-repolist
-  :type '(choice (const nil)
-                 (cons (string :tag "Column name")
-                       (boolean :tag "Flip order"))))
-
-(defvar magit-submodule-list-format-path-functions nil)
-
-(defcustom magit-submodule-remove-trash-gitdirs nil
-  "Whether `magit-submodule-remove' offers to trash module gitdirs.
-
-If this is nil, then that command does not offer to do so unless
-a prefix argument is used.  When this is t, then it does offer to
-do so even without a prefix argument.
-
-In both cases the action still has to be confirmed unless that is
-disabled using the option `magit-no-confirm'.  Doing the latter
-and also setting this variable to t will lead to tears."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-commands
-  :type 'boolean)
-
-;;; Popup
-
-;;;###autoload (autoload 'magit-submodule "magit-submodule" nil t)
-(transient-define-prefix magit-submodule ()
-  "Act on a submodule."
-  :man-page "git-submodule"
-  ["Arguments"
-   ("-f" "Force"            ("-f" "--force"))
-   ("-r" "Recursive"        "--recursive")
-   ("-N" "Do not fetch"     ("-N" "--no-fetch"))
-   ("-C" "Checkout tip"     "--checkout")
-   ("-R" "Rebase onto tip"  "--rebase")
-   ("-M" "Merge tip"        "--merge")
-   ("-U" "Use upstream tip" "--remote")]
-  ["One module actions"
-   ("a" magit-submodule-add)
-   ("r" magit-submodule-register)
-   ("p" magit-submodule-populate)
-   ("u" magit-submodule-update)
-   ("s" magit-submodule-synchronize)
-   ("d" magit-submodule-unpopulate)
-   ("k" "Remove" magit-submodule-remove)]
-  ["Populated modules actions"
-   ("l" "List modules"  magit-list-submodules)
-   ("f" "Fetch modules" magit-fetch-modules)])
-
-(defun magit-submodule-arguments (&rest filters)
-  (--filter (and (member it filters) it)
-            (transient-args 'magit-submodule)))
-
-(defclass magit--git-submodule-suffix (transient-suffix)
-  ())
-
-(cl-defmethod transient-format-description ((obj magit--git-submodule-suffix))
-  (let ((value (delq nil (mapcar #'transient-infix-value transient--suffixes))))
-    (replace-regexp-in-string
-     "\\[--[^]]+\\]"
-     (lambda (match)
-       (format (propertize "[%s]" 'face 'transient-inactive-argument)
-               (mapconcat (lambda (arg)
-                            (propertize arg 'face
-                                        (if (member arg value)
-                                            'transient-argument
-                                          'transient-inactive-argument)))
-                          (save-match-data
-                            (split-string (substring match 1 -1) "|"))
-                          (propertize "|" 'face 'transient-inactive-argument))))
-     (cl-call-next-method obj))))
-
-;;;###autoload (autoload 'magit-submodule-add "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-add (url &optional path name args)
-  "Add the repository at URL as a module.
-
-Optional PATH is the path to the module relative to the root of
-the superproject.  If it is nil, then the path is determined
-based on the URL.  Optional NAME is the name of the module.  If
-it is nil, then PATH also becomes the name."
-  :class 'magit--git-submodule-suffix
-  :description "Add            git submodule add [--force]"
-  (interactive
-   (magit-with-toplevel
-     (let* ((url (magit-read-string-ns "Add submodule (remote url)"))
-            (path (let ((read-file-name-function
-                         (if (or (eq read-file-name-function 'ido-read-file-name)
-                                 (advice-function-member-p
-                                  'ido-read-file-name
-                                  read-file-name-function))
-                             ;; The Ido variant doesn't work properly here.
-                             #'read-file-name-default
-                           read-file-name-function)))
-                    (directory-file-name
-                     (file-relative-name
-                      (read-directory-name
-                       "Add submodules at path: " nil nil nil
-                       (and (string-match "\\([^./]+\\)\\(\\.git\\)?$" url)
-                            (match-string 1 url))))))))
-       (list url
-             (directory-file-name path)
-             (magit-submodule-read-name-for-path path)
-             (magit-submodule-arguments "--force")))))
-  (magit-submodule-add-1 url path name args))
-
-(defun magit-submodule-add-1 (url &optional path name args)
-  (magit-with-toplevel
-    (magit-submodule--maybe-reuse-gitdir name path)
-    (magit-run-git-async "submodule" "add"
-                         (and name (list "--name" name))
-                         args "--" url path)
-    (set-process-sentinel
-     magit-this-process
-     (lambda (process event)
-       (when (memq (process-status process) '(exit signal))
-         (if (> (process-exit-status process) 0)
-             (magit-process-sentinel process event)
-           (process-put process 'inhibit-refresh t)
-           (magit-process-sentinel process event)
-           (when (magit-git-version>= "2.12.0")
-             (magit-call-git "submodule" "absorbgitdirs" path))
-           (magit-refresh)))))))
-
-;;;###autoload
-(defun magit-submodule-read-name-for-path (path &optional prefer-short)
-  (let* ((path (directory-file-name (file-relative-name path)))
-         (name (file-name-nondirectory path)))
-    (push (if prefer-short path name) minibuffer-history)
-    (magit-read-string-ns
-     "Submodule name" nil (cons 'minibuffer-history 2)
-     (or (--keep (pcase-let ((`(,var ,val) (split-string it "=")))
-                   (and (equal val path)
-                        (cadr (split-string var "\\."))))
-                 (magit-git-lines "config" "--list" "-f" ".gitmodules"))
-         (if prefer-short name path)))))
-
-;;;###autoload (autoload 'magit-submodule-register "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-register (modules)
-  "Register MODULES.
-
-With a prefix argument act on all suitable modules.  Otherwise,
-if the region selects modules, then act on those.  Otherwise, if
-there is a module at point, then act on that.  Otherwise read a
-single module from the user."
-  ;; This command and the underlying "git submodule init" do NOT
-  ;; "initialize" modules.  They merely "register" modules in the
-  ;; super-projects $GIT_DIR/config file, the purpose of which is to
-  ;; allow users to change such values before actually initializing
-  ;; the modules.
-  :description "Register       git submodule init"
-  (interactive
-   (list (magit-module-confirm "Register" 'magit-module-no-worktree-p)))
-  (magit-with-toplevel
-    (magit-run-git-async "submodule" "init" "--" modules)))
-
-;;;###autoload (autoload 'magit-submodule-populate "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-populate (modules)
-  "Create MODULES working directories, checking out the recorded commits.
-
-With a prefix argument act on all suitable modules.  Otherwise,
-if the region selects modules, then act on those.  Otherwise, if
-there is a module at point, then act on that.  Otherwise read a
-single module from the user."
-  ;; This is the command that actually "initializes" modules.
-  ;; A module is initialized when it has a working directory,
-  ;; a gitlink, and a .gitmodules entry.
-  :description "Populate       git submodule update --init"
-  (interactive
-   (list (magit-module-confirm "Populate" 'magit-module-no-worktree-p)))
-  (magit-with-toplevel
-    (magit-run-git-async "submodule" "update" "--init" "--" modules)))
-
-;;;###autoload (autoload 'magit-submodule-update "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-update (modules args)
-  "Update MODULES by checking out the recorded commits.
-
-With a prefix argument act on all suitable modules.  Otherwise,
-if the region selects modules, then act on those.  Otherwise, if
-there is a module at point, then act on that.  Otherwise read a
-single module from the user."
-  ;; Unlike `git-submodule's `update' command ours can only update
-  ;; "initialized" modules by checking out other commits but not
-  ;; "initialize" modules by creating the working directories.
-  ;; To do the latter we provide the "setup" command.
-  :class 'magit--git-submodule-suffix
-  :description "Update         git submodule update [--force] [--no-fetch]
-                     [--remote] [--recursive] [--checkout|--rebase|--merge]"
-  (interactive
-   (list (magit-module-confirm "Update" 'magit-module-worktree-p)
-         (magit-submodule-arguments
-          "--force" "--remote" "--recursive" "--checkout" "--rebase" "--merge"
-          "--no-fetch")))
-  (magit-with-toplevel
-    (magit-run-git-async "submodule" "update" args "--" modules)))
-
-;;;###autoload (autoload 'magit-submodule-synchronize "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-synchronize (modules args)
-  "Synchronize url configuration of MODULES.
-
-With a prefix argument act on all suitable modules.  Otherwise,
-if the region selects modules, then act on those.  Otherwise, if
-there is a module at point, then act on that.  Otherwise read a
-single module from the user."
-  :class 'magit--git-submodule-suffix
-  :description "Synchronize    git submodule sync [--recursive]"
-  (interactive
-   (list (magit-module-confirm "Synchronize" 'magit-module-worktree-p)
-         (magit-submodule-arguments "--recursive")))
-  (magit-with-toplevel
-    (magit-run-git-async "submodule" "sync" args "--" modules)))
-
-;;;###autoload (autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
-(transient-define-suffix magit-submodule-unpopulate (modules args)
-  "Remove working directories of MODULES.
-
-With a prefix argument act on all suitable modules.  Otherwise,
-if the region selects modules, then act on those.  Otherwise, if
-there is a module at point, then act on that.  Otherwise read a
-single module from the user."
-  ;; Even though a package is "uninitialized" (it has no worktree)
-  ;; the super-projects $GIT_DIR/config may never-the-less set the
-  ;; module's url.  This may happen if you `deinit' and then `init'
-  ;; to register (NOT initialize).  Because the purpose of `deinit'
-  ;; is to remove the working directory AND to remove the url, this
-  ;; command does not limit itself to modules that have no working
-  ;; directory.
-  :class 'magit--git-submodule-suffix
-  :description "Unpopulate     git submodule deinit [--force]"
-  (interactive
-   (list (magit-module-confirm "Unpopulate")
-         (magit-submodule-arguments "--force")))
-  (magit-with-toplevel
-    (magit-run-git-async "submodule" "deinit" args "--" modules)))
-
-;;;###autoload
-(defun magit-submodule-remove (modules args trash-gitdirs)
-  "Unregister MODULES and remove their working directories.
-
-For safety reasons, do not remove the gitdirs and if a module has
-uncommitted changes, then do not remove it at all.  If a module's
-gitdir is located inside the working directory, then move it into
-the gitdir of the superproject first.
-
-With the \"--force\" argument offer to remove dirty working
-directories and with a prefix argument offer to delete gitdirs.
-Both actions are very dangerous and have to be confirmed.  There
-are additional safety precautions in place, so you might be able
-to recover from making a mistake here, but don't count on it."
-  (interactive
-   (list (if-let ((modules (magit-region-values 'magit-module-section t)))
-             (magit-confirm 'remove-modules nil "Remove %d modules" nil modules)
-           (list (magit-read-module-path "Remove module")))
-         (magit-submodule-arguments "--force")
-         current-prefix-arg))
-  (when (magit-git-version< "2.12.0")
-    (error "This command requires Git v2.12.0"))
-  (when magit-submodule-remove-trash-gitdirs
-    (setq trash-gitdirs t))
-  (magit-with-toplevel
-    (when-let
-        ((modified
-          (seq-filter (lambda (module)
-                        (let ((default-directory (file-name-as-directory
-                                                  (expand-file-name module))))
-                          (and (cddr (directory-files default-directory))
-                               (magit-anything-modified-p))))
-                      modules)))
-      (if (member "--force" args)
-          (if (magit-confirm 'remove-dirty-modules
-                "Remove dirty module %s"
-                "Remove %d dirty modules"
-                t modified)
-              (dolist (module modified)
-                (let ((default-directory (file-name-as-directory
-                                          (expand-file-name module))))
-                  (magit-git "stash" "push"
-                             "-m" "backup before removal of this module")))
-            (setq modules (cl-set-difference modules modified :test #'equal)))
-        (if (cdr modified)
-            (message "Omitting %s modules with uncommitted changes: %s"
-                     (length modified)
-                     (mapconcat #'identity modified ", "))
-          (message "Omitting module %s, it has uncommitted changes"
-                   (car modified)))
-        (setq modules (cl-set-difference modules modified :test #'equal))))
-    (when modules
-      (let ((alist
-             (and trash-gitdirs
-                  (--map (split-string it "\0")
-                         (magit-git-lines "submodule" "foreach" "-q"
-                                          "printf \"$sm_path\\0$name\n\"")))))
-        (magit-git "submodule" "absorbgitdirs" "--" modules)
-        (magit-git "submodule" "deinit" args "--" modules)
-        (magit-git "rm" args "--" modules)
-        (when (and trash-gitdirs
-                   (magit-confirm 'trash-module-gitdirs
-                     "Trash gitdir of module %s"
-                     "Trash gitdirs of %d modules"
-                     t modules))
-          (dolist (module modules)
-            (if-let ((name (cadr (assoc module alist))))
-                ;; Disregard if `magit-delete-by-moving-to-trash'
-                ;; is nil.  Not doing so would be too dangerous.
-                (delete-directory (convert-standard-filename
-                                   (expand-file-name
-                                    (concat "modules/" name)
-                                    (magit-gitdir)))
-                                  t t)
-              (error "BUG: Weird module name and/or path for %s" module)))))
-      (magit-refresh))))
-
-;;; Sections
-
-;;;###autoload
-(defun 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."
-  (when-let ((modules (magit-list-module-paths)))
-    (if magit-module-sections-nested
-        (magit-insert-section (modules nil t)
-          (magit-insert-heading
-            (format "%s (%s)"
-                    (propertize "Modules"
-                                'font-lock-face 'magit-section-heading)
-                    (length modules)))
-          (magit-insert-section-body
-            (magit--insert-modules)))
-      (magit--insert-modules))))
-
-(defun magit--insert-modules (&optional _section)
-  (magit-run-section-hook 'magit-module-sections-hook))
-
-;;;###autoload
-(defun magit-insert-modules-overview ()
-  "Insert sections for all modules.
-For each section insert the path and the output of `git describe --tags',
-or, failing that, the abbreviated HEAD commit hash."
-  (when-let ((modules (magit-list-module-paths)))
-    (magit-insert-section (modules nil t)
-      (magit-insert-heading
-        (format "%s (%s)"
-                (propertize "Modules overview"
-                            'font-lock-face 'magit-section-heading)
-                (length modules)))
-      (magit-insert-section-body
-        (magit--insert-modules-overview)))))
-
-(defvar magit-modules-overview-align-numbers t)
-
-(defun magit--insert-modules-overview (&optional _section)
-  (magit-with-toplevel
-    (let* ((modules (magit-list-module-paths))
-           (path-format (format "%%-%ds "
-                                (min (apply #'max (mapcar #'length modules))
-                                     (/ (window-width) 2))))
-           (branch-format (format "%%-%ds " (min 25 (/ (window-width) 3)))))
-      (dolist (module modules)
-        (let ((default-directory
-               (expand-file-name (file-name-as-directory module))))
-          (magit-insert-section (magit-module-section module t)
-            (insert (propertize (format path-format module)
-                                'font-lock-face 'magit-diff-file-heading))
-            (if (not (file-exists-p ".git"))
-                (insert "(unpopulated)")
-              (insert
-               (format
-                branch-format
-                (if-let ((branch (magit-get-current-branch)))
-                    (propertize branch 'font-lock-face 'magit-branch-local)
-                  (propertize "(detached)" 'font-lock-face 'warning))))
-              (if-let ((desc (magit-git-string "describe" "--tags")))
-                  (progn (when (and magit-modules-overview-align-numbers
-                                    (string-match-p "\\`[0-9]" desc))
-                           (insert ?\s))
-                         (insert (propertize desc 'font-lock-face 'magit-tag)))
-                (when-let ((abbrev (magit-rev-format "%h")))
-                  (insert (propertize abbrev 'font-lock-face 'magit-hash)))))
-            (insert ?\n))))))
-  (insert ?\n))
-
-(defvar-keymap magit-modules-section-map
-  :doc "Keymap for `modules' sections."
-  "<remap> <magit-visit-thing>" #'magit-list-submodules
-  "<1>" (magit-menu-item "List %t" #'magit-list-submodules))
-
-(defvar-keymap magit-module-section-map
-  :doc "Keymap for `module' sections."
-  "C-j"        #'magit-submodule-visit
-  "C-<return>" #'magit-submodule-visit
-  "<remap> <magit-unstage-file>" #'magit-unstage
-  "<remap> <magit-stage-file>"   #'magit-stage
-  "<remap> <magit-visit-thing>"  #'magit-submodule-visit
-  "<5>" (magit-menu-item "Module commands..." #'magit-submodule)
-  "<4>" '(menu-item "--")
-  "<3>" (magit-menu-item "Unstage %T" #'magit-unstage
-                         '(:visible (eq (magit-diff-type) 'staged)))
-  "<2>" (magit-menu-item "Stage %T" #'magit-stage
-                         '(:visible (eq (magit-diff-type) 'unstaged)))
-  "<1>" (magit-menu-item "Visit %s" #'magit-submodule-visit))
-
-(defun magit-submodule-visit (module &optional other-window)
-  "Visit MODULE by calling `magit-status' on it.
-Offer to initialize MODULE if it's not checked out yet.
-With a prefix argument, visit in another window."
-  (interactive (list (or (magit-section-value-if 'module)
-                         (magit-read-module-path "Visit module"))
-                     current-prefix-arg))
-  (magit-with-toplevel
-    (let ((path (expand-file-name module)))
-      (cond
-       ((file-exists-p (expand-file-name ".git" module))
-        (magit-diff-visit-directory path other-window))
-       ((y-or-n-p (format "Initialize submodule '%s' first?" module))
-        (magit-run-git-async "submodule" "update" "--init" "--" module)
-        (set-process-sentinel
-         magit-this-process
-         (lambda (process event)
-           (let ((magit-process-raise-error t))
-             (magit-process-sentinel process event))
-           (when (and (eq (process-status      process) 'exit)
-                      (=  (process-exit-status process) 0))
-             (magit-diff-visit-directory path other-window)))))
-       ((file-exists-p path)
-        (dired-jump other-window (concat path "/.")))))))
-
-;;;###autoload
-(defun magit-insert-modules-unpulled-from-upstream ()
-  "Insert sections for modules that haven't been pulled from the upstream.
-These sections can be expanded to show the respective commits."
-  (magit--insert-modules-logs "Modules unpulled from @{upstream}"
-                              'modules-unpulled-from-upstream
-                              "HEAD..@{upstream}"))
-
-;;;###autoload
-(defun magit-insert-modules-unpulled-from-pushremote ()
-  "Insert sections for modules that haven't been pulled from the push-remote.
-These sections can be expanded to show the respective commits."
-  (magit--insert-modules-logs "Modules unpulled from @{push}"
-                              'modules-unpulled-from-pushremote
-                              "HEAD..@{push}"))
-
-;;;###autoload
-(defun magit-insert-modules-unpushed-to-upstream ()
-  "Insert sections for modules that haven't been pushed to the upstream.
-These sections can be expanded to show the respective commits."
-  (magit--insert-modules-logs "Modules unmerged into @{upstream}"
-                              'modules-unpushed-to-upstream
-                              "@{upstream}..HEAD"))
-
-;;;###autoload
-(defun magit-insert-modules-unpushed-to-pushremote ()
-  "Insert sections for modules that haven't been pushed to the push-remote.
-These sections can be expanded to show the respective commits."
-  (magit--insert-modules-logs "Modules unpushed to @{push}"
-                              'modules-unpushed-to-pushremote
-                              "@{push}..HEAD"))
-
-(defun magit--insert-modules-logs (heading type range)
-  "For internal use, don't add to a hook."
-  (unless (magit-ignore-submodules-p)
-    (when-let ((modules (magit-list-module-paths)))
-      (magit-insert-section ((eval type) nil t)
-        (string-match "\\`\\(.+\\) \\([^ ]+\\)\\'" heading)
-        (magit-insert-heading
-          (propertize (match-string 1 heading)
-                      'font-lock-face 'magit-section-heading)
-          " "
-          (propertize (match-string 2 heading)
-                      'font-lock-face 'magit-branch-remote)
-          ":")
-        (magit-with-toplevel
-          (dolist (module modules)
-            (when (magit-module-worktree-p module)
-              (let ((default-directory
-                     (expand-file-name (file-name-as-directory module))))
-                (when (file-accessible-directory-p default-directory)
-                  (magit-insert-section sec (magit-module-section module t)
-                    (magit-insert-heading
-                      (propertize module
-                                  'font-lock-face 'magit-diff-file-heading)
-                      ":")
-                    (oset sec range range)
-                    (magit-git-wash
-                        (apply-partially #'magit-log-wash-log 'module)
-                      "-c" "push.default=current" "log" "--oneline" range)
-                    (when (> (point)
-                             (oref sec content))
-                      (delete-char -1))))))))
-        (magit-cancel-section 'if-empty)
-        (insert ?\n)))))
-
-;;; List
-
-;;;###autoload
-(defun magit-list-submodules ()
-  "Display a list of the current repository's populated submodules."
-  (interactive)
-  (magit-submodule-list-setup magit-submodule-list-columns))
-
-(defvar-keymap magit-submodule-list-mode-map
-  :doc "Local keymap for Magit-Submodule-List mode buffers."
-  :parent magit-repolist-mode-map)
-
-(define-derived-mode magit-submodule-list-mode tabulated-list-mode "Modules"
-  "Major mode for browsing a list of Git submodules."
-  :group 'magit-repolist-mode
-  (setq-local x-stretch-cursor nil)
-  (setq tabulated-list-padding 0)
-  (add-hook 'tabulated-list-revert-hook #'magit-submodule-list-refresh nil t)
-  (setq imenu-prev-index-position-function
-        #'magit-repolist--imenu-prev-index-position)
-  (setq imenu-extract-index-name-function #'tabulated-list-get-id))
-
-(defvar-local magit-submodule-list-predicate nil)
-
-(defun magit-submodule-list-setup (columns &optional predicate)
-  (magit-display-buffer
-   (or (magit-get-mode-buffer 'magit-submodule-list-mode)
-       (magit-generate-new-buffer 'magit-submodule-list-mode)))
-  (magit-submodule-list-mode)
-  (setq-local magit-repolist-columns columns)
-  (setq-local magit-repolist-sort-key magit-submodule-list-sort-key)
-  (setq-local magit-submodule-list-predicate predicate)
-  (magit-repolist-setup-1)
-  (magit-submodule-list-refresh))
-
-(defun magit-submodule-list-refresh ()
-  (setq tabulated-list-entries
-        (seq-keep
-         (lambda (module)
-           (let ((default-directory
-                  (expand-file-name (file-name-as-directory module))))
-             (and (file-exists-p ".git")
-                  (or (not magit-submodule-list-predicate)
-                      (funcall magit-submodule-list-predicate module))
-                  (list module
-                        (vconcat
-                         (mapcar (pcase-lambda (`(,title ,width ,fn ,props))
-                                   (or (funcall fn `((:path  ,module)
-                                                     (:title ,title)
-                                                     (:width ,width)
-                                                     ,@props))
-                                       ""))
-                                 magit-repolist-columns))))))
-         (magit-list-module-paths)))
-  (message "Listing submodules...")
-  (tabulated-list-init-header)
-  (tabulated-list-print t)
-  (message "Listing submodules...done"))
-
-(defun magit-modulelist-column-path (spec)
-  "Insert the relative path of the submodule."
-  (let ((path (cadr (assq :path spec))))
-    (or (run-hook-with-args-until-success
-         'magit-submodule-list-format-path-functions path)
-        path)))
-
-;;; Utilities
-
-(defun magit-submodule--maybe-reuse-gitdir (name path)
-  (let ((gitdir (convert-standard-filename
-                 (expand-file-name (concat "modules/" name)
-                                   (magit-gitdir)))))
-    (when (and (file-exists-p gitdir)
-               (not (file-exists-p path)))
-      (pcase (read-char-choice
-              (concat
-               gitdir " already exists.\n"
-               "Type [u] to use the existing gitdir and create the working tree\n"
-               "     [r] to rename the existing gitdir and clone again\n"
-               "     [t] to trash the existing gitdir and clone again\n"
-               "   [C-g] to abort ")
-              '(?u ?r ?t))
-        (?u (magit-submodule--restore-worktree (expand-file-name path) gitdir))
-        (?r (rename-file gitdir (concat gitdir "-"
-                                        (format-time-string "%F-%T"))))
-        (?t (delete-directory gitdir t t))))))
-
-(defun magit-submodule--restore-worktree (worktree gitdir)
-  (make-directory worktree t)
-  (with-temp-file (expand-file-name ".git" worktree)
-    (insert "gitdir: " (file-relative-name gitdir worktree) "\n"))
-  (let ((default-directory worktree))
-    (magit-call-git "reset" "--hard" "HEAD" "--")))
-
-;;; _
-(provide 'magit-submodule)
-;;; magit-submodule.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-submodule.elc b/emacs/elpa/magit-20240426.2118/magit-submodule.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-tag.el b/emacs/elpa/magit-20240426.2118/magit-tag.el
@@ -1,245 +0,0 @@
-;;; magit-tag.el --- Tag 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 tag commands.
-
-;;; Code:
-
-(require 'magit)
-
-;; For `magit-tag-delete'.
-(defvar helm-comp-read-use-marked)
-
-;;; Commands
-
-;;;###autoload (autoload 'magit-tag "magit" nil t)
-(transient-define-prefix magit-tag ()
-  "Create or delete a tag."
-  :man-page "git-tag"
-  ["Arguments"
-   ("-f" "Force"    ("-f" "--force"))
-   ("-a" "Annotate" ("-a" "--annotate"))
-   ("-s" "Sign"     ("-s" "--sign"))
-   (magit-tag:--local-user)]
-  [["Create"
-    ("t"  "tag"     magit-tag-create)
-    ("r"  "release" magit-tag-release)]
-   ["Do"
-    ("k"  "delete"  magit-tag-delete)
-    ("p"  "prune"   magit-tag-prune)]])
-
-(defun magit-tag-arguments ()
-  (transient-args 'magit-tag))
-
-(transient-define-argument magit-tag:--local-user ()
-  :description "Sign as"
-  :class 'transient-option
-  :shortarg "-u"
-  :argument "--local-user="
-  :reader #'magit-read-gpg-signing-key
-  :history-key 'magit:--gpg-sign)
-
-;;;###autoload
-(defun magit-tag-create (name rev &optional args)
-  "Create a new tag with the given NAME at REV.
-With a prefix argument annotate the tag.
-\n(git tag [--annotate] NAME REV)"
-  (interactive (list (magit-read-tag "Tag name")
-                     (magit-read-branch-or-commit "Place tag on")
-                     (let ((args (magit-tag-arguments)))
-                       (when current-prefix-arg
-                         (cl-pushnew "--annotate" args :test #'equal))
-                       args)))
-  (magit-run-git-with-editor "tag" args name rev))
-
-;;;###autoload
-(defun magit-tag-delete (tags)
-  "Delete one or more tags.
-If the region marks multiple tags (and nothing else), then offer
-to delete those, otherwise prompt for a single tag to be deleted,
-defaulting to the tag at point.
-\n(git tag -d TAGS)"
-  (interactive (list (if-let ((tags (magit-region-values 'tag)))
-                         (magit-confirm t nil "Delete %d tags" nil tags)
-                       (let ((helm-comp-read-use-marked t))
-                         (magit-read-tag "Delete tag" t)))))
-  (magit-run-git "tag" "-d" tags))
-
-;;;###autoload
-(defun magit-tag-prune (tags remote-tags remote)
-  "Offer to delete tags missing locally from REMOTE, and vice versa."
-  (interactive
-   (let* ((remote (magit-read-remote "Prune tags using remote"))
-          (tags   (magit-list-tags))
-          (rtags  (prog2 (message "Determining remote tags...")
-                      (magit-remote-list-tags remote)
-                    (message "Determining remote tags...done")))
-          (ltags  (cl-set-difference tags rtags :test #'equal))
-          (rtags  (cl-set-difference rtags tags :test #'equal)))
-     (unless (or ltags rtags)
-       (message "Same tags exist locally and remotely"))
-     (unless (magit-confirm t
-               "Delete %s locally"
-               "Delete %d tags locally"
-               'noabort ltags)
-       (setq ltags nil))
-     (unless (magit-confirm t
-               "Delete %s from remote"
-               "Delete %d tags from remote"
-               'noabort rtags)
-       (setq rtags nil))
-     (list ltags rtags remote)))
-  (when tags
-    (magit-call-git "tag" "-d" tags))
-  (when remote-tags
-    (magit-run-git-async "push" remote (--map (concat ":" it) remote-tags))))
-
-(defvar magit-tag-version-regexp-alist
-  '(("^[-._+ ]?snapshot\\.?$" . -4)
-    ("^[-._+]$" . -4)
-    ("^[-._+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)\\.?$" . -4)
-    ("^[-._+ ]?unknown\\.?$" . -4)
-    ("^[-._+ ]?alpha\\.?$" . -3)
-    ("^[-._+ ]?beta\\.?$" . -2)
-    ("^[-._+ ]?\\(pre\\|rc\\)\\.?$" . -1))
-  "Overrides `version-regexp-alist' for `magit-tag-release'.
-See also `magit-release-tag-regexp'.")
-
-(defvar magit-release-tag-regexp "\\`\
-\\(?1:\\(?:v\\(?:ersion\\)?\\|r\\(?:elease\\)?\\)[-_]?\\)?\
-\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\
-\\(?:-[a-zA-Z0-9-]+\\(?:\\.[a-zA-Z0-9-]+\\)*\\)?\\)\\'"
-  "Regexp used by `magit-tag-release' to parse release tags.
-
-The first submatch must match the prefix, if any.  The second
-submatch must match the version string.
-
-If this matches versions that are not dot separated numbers,
-then `magit-tag-version-regexp-alist' has to contain entries
-for the separators allowed here.")
-
-(defvar magit-release-commit-regexp "\\`Release version \\(.+\\)\\'"
-  "Regexp used by `magit-tag-release' to parse release commit messages.
-The first submatch must match the version string.")
-
-;;;###autoload
-(defun magit-tag-release (tag msg &optional args)
-  "Create a release tag for `HEAD'.
-
-Assume that release tags match `magit-release-tag-regexp'.
-
-If `HEAD's message matches `magit-release-commit-regexp', then
-base the tag on the version string specified by that.  Otherwise
-prompt 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 `--annotate' is enabled, then prompt for the message of the
-new tag.  Base the proposed tag message on the message of the
-highest tag, provided that that contains the corresponding
-version string and substituting the new version string for that.
-Otherwise propose 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\"."
-  (interactive
-   (save-match-data
-     (pcase-let*
-         ((`(,pver ,ptag ,pmsg) (car (magit--list-releases)))
-          (msg (magit-rev-format "%s"))
-          (ver (and (string-match magit-release-commit-regexp msg)
-                    (match-string 1 msg)))
-          (_   (and (not ver)
-                    (require (quote sisyphus) nil t)
-                    (string-match magit-release-commit-regexp
-                                  (magit-rev-format "%s" ptag))
-                    (user-error "Use `sisyphus-create-release' first")))
-          (tag (cond
-                ((not ptag)
-                 (read-string "Create first release tag: "
-                              (if (and ver (string-match-p "\\`[0-9]" ver))
-                                  (concat "v" ver)
-                                ver)))
-                (ver
-                 (concat (and (string-match magit-release-tag-regexp ptag)
-                              (match-string 1 ptag))
-                         ver))
-                (t
-                 (read-string
-                  (format "Create release tag (previous was %s): " ptag)
-                  ptag))))
-          (ver (and (string-match magit-release-tag-regexp tag)
-                    (match-string 2 tag)))
-          (args (magit-tag-arguments)))
-       (list tag
-             (and (member "--annotate" args)
-                  (read-string
-                   (format "Message for %S: " tag)
-                   (cond ((and pver (string-match (regexp-quote pver) pmsg))
-                          (replace-match ver t t pmsg))
-                         ((and ptag (string-match (regexp-quote ptag) pmsg))
-                          (replace-match tag t t pmsg))
-                         (t (format "%s %s"
-                                    (capitalize
-                                     (file-name-nondirectory
-                                      (directory-file-name (magit-toplevel))))
-                                    ver)))))
-             args))))
-  (magit-run-git-with-editor "tag" args (and msg (list "-m" msg)) tag)
-  (set-process-sentinel
-   magit-this-process
-   (lambda (process event)
-     (when (memq (process-status process) '(exit signal))
-       (magit-process-sentinel process event)
-       (magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))))
-
-(defun magit--list-releases ()
-  "Return a list of releases.
-The list is ordered, beginning with the highest release.
-Each release element has the form (VERSION TAG MESSAGE).
-`magit-release-tag-regexp' is used to determine whether
-a tag qualifies as a release tag."
-  (save-match-data
-    (mapcar
-     #'cdr
-     (nreverse
-      (cl-sort (cl-mapcan
-                (lambda (line)
-                  (and (string-match " +" line)
-                       (let ((tag (substring line 0 (match-beginning 0)))
-                             (msg (substring line (match-end 0))))
-                         (and (string-match magit-release-tag-regexp tag)
-                              (let ((ver (match-string 2 tag))
-                                    (version-regexp-alist
-                                     magit-tag-version-regexp-alist))
-                                (list (list (version-to-list ver)
-                                            ver tag msg)))))))
-                ;; Cannot rely on "--sort=-version:refname" because
-                ;; that gets confused if the version prefix has changed.
-                (magit-git-lines "tag" "-n"))
-               ;; The inverse of this function does not exist.
-               #'version-list-< :key #'car)))))
-
-;;; _
-(provide 'magit-tag)
-;;; magit-tag.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-wip.el b/emacs/elpa/magit-20240426.2118/magit-wip.el
@@ -1,476 +0,0 @@
-;;; magit-wip.el --- Commit snapshots to work-in-progress refs  -*- 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 defines tree global modes which automatically commit
-;; snapshots to branch-specific work-in-progress refs before and after
-;; making changes, and two commands which can be used to do so on
-;; demand.
-
-;;; Code:
-
-(require 'magit-core)
-(require 'magit-log)
-
-;;; Options
-
-(defgroup magit-wip nil
-  "Automatically commit to work-in-progress refs."
-  :link '(info-link "(magit)Wip Modes")
-  :group 'magit-modes
-  :group 'magit-essentials)
-
-(defgroup magit-wip-legacy nil
-  "It is better to not use these modes individually."
-  :link '(info-link "(magit)Legacy Wip Modes")
-  :group 'magit-wip)
-
-(defcustom magit-wip-mode-lighter " Wip"
-  "Lighter for Magit-Wip mode."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-wip
-  :type 'string)
-
-(defcustom magit-wip-after-save-local-mode-lighter ""
-  "Lighter for Magit-Wip-After-Save-Local mode."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip-legacy
-  :type 'string)
-
-(defcustom magit-wip-after-apply-mode-lighter ""
-  "Lighter for Magit-Wip-After-Apply mode."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip-legacy
-  :type 'string)
-
-(defcustom magit-wip-before-change-mode-lighter ""
-  "Lighter for Magit-Wip-Before-Change mode."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip-legacy
-  :type 'string)
-
-(defcustom magit-wip-initial-backup-mode-lighter ""
-  "Lighter for Magit-Wip-Initial Backup mode."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip-legacy
-  :type 'string)
-
-(defcustom magit-wip-merge-branch nil
-  "Whether to merge the current branch into its wip ref.
-
-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.  This is currently the default."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-wip
-  :type 'boolean)
-
-(defcustom magit-wip-namespace "refs/wip/"
-  "Namespace used for work-in-progress refs.
-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 as `branch-ref'."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip
-  :type 'string)
-
-;;; Modes
-
-(defvar magit--wip-activation-cache nil)
-(defvar magit--wip-inhibit-autosave nil)
-
-;;;###autoload
-(define-minor-mode magit-wip-mode
-  "Save uncommitted changes to work-in-progress refs.
-
-Whenever appropriate (i.e., when dataloss would be a possibility
-otherwise) this mode causes uncommitted changes to be committed
-to dedicated work-in-progress refs.
-
-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."
-  :package-version '(magit . "2.90.0")
-  :lighter magit-wip-mode-lighter
-  :global t
-  (let ((arg (if magit-wip-mode 1 -1)))
-    (let ((magit--wip-activation-cache (list t)))
-      (magit-wip-after-save-mode arg))
-    (magit-wip-after-apply-mode arg)
-    (magit-wip-before-change-mode arg)
-    (magit-wip-initial-backup-mode arg)))
-
-(define-minor-mode magit-wip-after-save-local-mode
-  "After saving, also commit to a worktree work-in-progress ref.
-
-After saving the current file-visiting buffer this mode also
-commits the changes to the worktree work-in-progress ref for
-the current branch.
-
-This mode should be enabled globally by turning on the globalized
-variant `magit-wip-after-save-mode'."
-  :package-version '(magit . "2.1.0")
-  :lighter magit-wip-after-save-local-mode-lighter
-  (if magit-wip-after-save-local-mode
-      (if (and buffer-file-name (magit-inside-worktree-p t))
-          (add-hook 'after-save-hook #'magit-wip-commit-buffer-file t t)
-        (setq magit-wip-after-save-local-mode nil)
-        (user-error "Need a worktree and a file"))
-    (remove-hook 'after-save-hook #'magit-wip-commit-buffer-file t)))
-
-(defun magit-wip-after-save-local-mode-turn-on ()
-  (when (and buffer-file-name
-             (if magit--wip-activation-cache
-                 (if-let ((elt (assoc default-directory
-                                      magit--wip-activation-cache)))
-                     (and-let* ((top (cadr elt)))
-                       (member (file-relative-name buffer-file-name top)
-                               (cddr elt)))
-                   (if-let ((top (magit-toplevel)))
-                       (let (files)
-                         (if-let ((elt (assoc top magit--wip-activation-cache)))
-                             (setq files (cddr elt))
-                           (progn
-                             (setq files (let ((default-directory top))
-                                           (magit-tracked-files)))
-                             (push `(,top ,top ,@files)
-                                   magit--wip-activation-cache)
-                             (unless (eq default-directory top)
-                               (push `(,default-directory ,top ,@files)
-                                     magit--wip-activation-cache))))
-                         (member (file-relative-name buffer-file-name) files))
-                     (push (list default-directory nil)
-                           magit--wip-activation-cache)
-                     nil))
-               (and (magit-inside-worktree-p t)
-                    (magit-file-tracked-p buffer-file-name))))
-    (magit-wip-after-save-local-mode)))
-
-;;;###autoload
-(define-globalized-minor-mode magit-wip-after-save-mode
-  magit-wip-after-save-local-mode magit-wip-after-save-local-mode-turn-on
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip)
-
-(defun magit-wip-commit-buffer-file (&optional msg)
-  "Commit visited file to a worktree work-in-progress ref.
-
-Also see `magit-wip-after-save-mode' which calls this function
-automatically whenever a buffer visiting a tracked file is saved."
-  (interactive (list "wip-save %s after save"))
-  (unless magit--wip-inhibit-autosave
-    (when-let ((ref (magit-wip-get-ref)))
-      (magit-with-toplevel
-        (let ((file (file-relative-name buffer-file-name)))
-          (magit-wip-commit-worktree
-           ref (list file)
-           (format (or msg "autosave %s after save") file)))))))
-
-;;;###autoload
-(define-minor-mode magit-wip-after-apply-mode
-  "Commit to work-in-progress refs.
-
-After applying a change using any \"apply variant\"
-command (apply, stage, unstage, discard, and reverse) commit the
-affected files to the current wip refs.  For each branch there
-may be two wip refs; one contains snapshots of the files as found
-in the worktree and the other contains snapshots of the entries
-in the index."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip
-  :lighter magit-wip-after-apply-mode-lighter
-  :global t)
-
-(defun magit-wip-commit-after-apply (&optional files msg)
-  (when magit-wip-after-apply-mode
-    (magit-wip-commit files msg)))
-
-;;;###autoload
-(define-minor-mode magit-wip-before-change-mode
-  "Commit to work-in-progress refs before certain destructive changes.
-
-Before invoking a revert command or an \"apply variant\"
-command (apply, stage, unstage, discard, and reverse) commit the
-affected tracked files to the current wip refs.  For each branch
-there may be two wip refs; one contains snapshots of the files
-as found in the worktree and the other contains snapshots of the
-entries in the index.
-
-Only changes to files which could potentially be affected by the
-command which is about to be called are committed."
-  :package-version '(magit . "2.1.0")
-  :group 'magit-wip
-  :lighter magit-wip-before-change-mode-lighter
-  :global t)
-
-(defun magit-wip-commit-before-change (&optional files msg)
-  (when magit-wip-before-change-mode
-    (magit-with-toplevel
-      (magit-wip-commit files msg))))
-
-(define-minor-mode magit-wip-initial-backup-mode
-  "Before saving a buffer for the first time, commit to a wip ref."
-  :package-version '(magit . "2.90.0")
-  :group 'magit-wip
-  :lighter magit-wip-initial-backup-mode-lighter
-  :global t
-  (if magit-wip-initial-backup-mode
-      (add-hook  'before-save-hook #'magit-wip-commit-initial-backup)
-    (remove-hook 'before-save-hook #'magit-wip-commit-initial-backup)))
-
-(defun magit--any-wip-mode-enabled-p ()
-  "Return non-nil if any global wip mode is enabled."
-  (or magit-wip-mode
-      magit-wip-after-save-mode
-      magit-wip-after-apply-mode
-      magit-wip-before-change-mode
-      magit-wip-initial-backup-mode))
-
-(defvar-local magit-wip-buffer-backed-up nil)
-(put 'magit-wip-buffer-backed-up 'permanent-local t)
-
-;;;###autoload
-(defun magit-wip-commit-initial-backup ()
-  "Before saving, commit current file to a worktree wip ref.
-
-The user has to add this function to `before-save-hook'.
-
-Commit the current state of the visited file before saving the
-current buffer to that file.  This backs up the same version of
-the file as `backup-buffer' would, but stores the backup in the
-worktree wip ref, which is also used by the various Magit Wip
-modes, instead of in a backup file as `backup-buffer' would.
-
-This function ignores the variables that affect `backup-buffer'
-and can be used along-side that function, which is recommended
-because this function only backs up files that are tracked in
-a Git repository."
-  (when (and (not magit-wip-buffer-backed-up)
-             buffer-file-name
-             (magit-inside-worktree-p t)
-             (magit-file-tracked-p buffer-file-name))
-    (let ((magit-save-repository-buffers nil))
-      (magit-wip-commit-buffer-file "autosave %s before save"))
-    (setq magit-wip-buffer-backed-up t)))
-
-;;; Core
-
-(defun magit-wip-commit (&optional files msg)
-  "Commit all tracked files to the work-in-progress refs.
-
-Interactively, commit all changes to all tracked files using
-a generic commit message.  With a prefix-argument the commit
-message is read in the minibuffer.
-
-Non-interactively, only commit changes to FILES using MSG as
-commit message."
-  (interactive (list nil (if current-prefix-arg
-                             (magit-read-string "Wip commit message")
-                           "wip-save tracked files")))
-  (when-let ((ref (magit-wip-get-ref)))
-    (magit-wip-commit-index ref files msg)
-    (magit-wip-commit-worktree ref files msg)))
-
-(defun magit-wip-commit-index (ref files msg)
-  (let* ((wipref (magit--wip-index-ref ref))
-         (parent (magit-wip-get-parent ref wipref))
-         (tree   (magit-git-string "write-tree")))
-    (magit-wip-update-wipref ref wipref tree parent files msg "index")))
-
-(defun magit-wip-commit-worktree (ref files msg)
-  (when (or (not files)
-            ;; `update-index' will either ignore (before Git v2.32.0)
-            ;; or fail when passed directories (relevant for the
-            ;; untracked files code paths).
-            (setq files (seq-remove #'file-directory-p files)))
-    (let* ((wipref (magit--wip-wtree-ref ref))
-           (parent (magit-wip-get-parent ref wipref))
-           (tree (magit-with-temp-index parent (list "--reset" "-i")
-                   (if files
-                       ;; Note: `update-index' is used instead of `add'
-                       ;; because `add' will fail if a file is already
-                       ;; deleted in the temporary index.
-                       (magit-call-git
-                        "update-index" "--add" "--remove"
-                        (and (magit-git-version>= "2.25.0")
-                             "--ignore-skip-worktree-entries")
-                        "--" files)
-                     (magit-with-toplevel
-                       (magit-call-git "add" "-u" ".")))
-                   (magit-git-string "write-tree"))))
-      (magit-wip-update-wipref ref wipref tree parent files msg "worktree"))))
-
-(defun magit-wip-update-wipref (ref wipref tree parent files msg start-msg)
-  (cond
-   ((and (not (equal parent wipref))
-         (or (not magit-wip-merge-branch)
-             (not (magit-rev-verify wipref))))
-    (setq start-msg (concat "start autosaving " start-msg))
-    (magit-update-ref wipref start-msg
-                      (magit-git-string "commit-tree" "--no-gpg-sign"
-                                        "-p" parent "-m" start-msg
-                                        (concat parent "^{tree}")))
-    (setq parent wipref))
-   ((and magit-wip-merge-branch
-         (or (not (magit-rev-ancestor-p ref wipref))
-             (not (magit-rev-ancestor-p
-                   (concat (magit-git-string "log" "--format=%H"
-                                             "-1" "--merges" wipref)
-                           "^2")
-                   ref))))
-    (setq start-msg (format "merge %s into %s" ref start-msg))
-    (magit-update-ref wipref start-msg
-                      (magit-git-string "commit-tree" "--no-gpg-sign"
-                                        "-p" wipref "-p" ref
-                                        "-m" start-msg
-                                        (concat ref "^{tree}")))
-    (setq parent wipref)))
-  (when (magit-git-failure "diff-tree" "--quiet" parent tree "--" files)
-    (unless (and msg (not (= (aref msg 0) ?\s)))
-      (let ((len (length files)))
-        (setq msg (concat
-                   (cond ((= len 0) "autosave tracked files")
-                         ((> len 1) (format "autosave %s files" len))
-                         (t (concat "autosave "
-                                    (file-relative-name (car files)
-                                                        (magit-toplevel)))))
-                   msg))))
-    (magit-update-ref wipref msg
-                      (magit-git-string "commit-tree" "--no-gpg-sign"
-                                        "-p" parent "-m" msg tree))))
-
-(defun magit-wip-get-ref ()
-  (let ((ref (or (magit-git-string "symbolic-ref" "HEAD") "HEAD")))
-    (and (magit-rev-verify ref)
-         ref)))
-
-(defun magit-wip-get-parent (ref wipref)
-  (if (and (magit-rev-verify wipref)
-           (equal (magit-git-string "merge-base" wipref ref)
-                  (magit-rev-verify ref)))
-      wipref
-    ref))
-
-(defun magit--wip-index-ref (&optional ref)
-  (magit--wip-ref "index/" ref))
-
-(defun magit--wip-wtree-ref (&optional ref)
-  (magit--wip-ref "wtree/" ref))
-
-(defun magit--wip-ref (namespace &optional ref)
-  (concat magit-wip-namespace namespace
-          (or (and ref (string-prefix-p "refs/" ref) ref)
-              (and-let* ((branch (and (not (equal ref "HEAD"))
-                                      (or ref (magit-get-current-branch)))))
-                (concat "refs/heads/" branch))
-              "HEAD")))
-
-(defun magit-wip-maybe-add-commit-hook ()
-  (when (and magit-wip-merge-branch
-             (magit-wip-any-enabled-p))
-    (add-hook 'git-commit-post-finish-hook #'magit-wip-commit nil t)))
-
-(defun magit-wip-any-enabled-p ()
-  (or magit-wip-mode
-      magit-wip-after-save-local-mode
-      magit-wip-after-save-mode
-      magit-wip-after-apply-mode
-      magit-wip-before-change-mode
-      magit-wip-initial-backup-mode))
-
-;;; Log
-
-(defun magit-wip-log-index (args files)
-  "Show log for the index wip ref of the current branch."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (list (magit--wip-index-ref)) args files))
-
-(defun magit-wip-log-worktree (args files)
-  "Show log for the worktree wip ref of the current branch."
-  (interactive (magit-log-arguments))
-  (magit-log-setup-buffer (list (magit--wip-wtree-ref)) args files))
-
-(defun magit-wip-log-current (branch args files count)
-  "Show log for the current branch and its wip refs.
-With a negative prefix argument only show the worktree wip ref.
-The absolute numeric value of the prefix argument controls how
-many \"branches\" of each wip ref are shown."
-  (interactive
-   (nconc (list (or (magit-get-current-branch) "HEAD"))
-          (magit-log-arguments)
-          (list (prefix-numeric-value current-prefix-arg))))
-  (magit-wip-log branch args files count))
-
-(defun magit-wip-log (branch args files count)
-  "Show log for a branch and its wip refs.
-With a negative prefix argument only show the worktree wip ref.
-The absolute numeric value of the prefix argument controls how
-many \"branches\" of each wip ref are shown."
-  (interactive
-   (nconc (list (magit-completing-read
-                 "Log branch and its wip refs"
-                 (nconc (magit-list-local-branch-names)
-                        (list "HEAD"))
-                 nil t nil 'magit-revision-history
-                 (or (magit-branch-at-point)
-                     (magit-get-current-branch)
-                     "HEAD")))
-          (magit-log-arguments)
-          (list (prefix-numeric-value current-prefix-arg))))
-  (magit-log-setup-buffer (nconc (list branch)
-                                 (magit-wip-log-get-tips
-                                  (magit--wip-wtree-ref branch)
-                                  (abs count))
-                                 (and (>= count 0)
-                                      (magit-wip-log-get-tips
-                                       (magit--wip-index-ref branch)
-                                       (abs count))))
-                          args files))
-
-(defun magit-wip-log-get-tips (wipref count)
-  (and-let* ((reflog (magit-git-lines "reflog" wipref)))
-    (let (tips)
-      (while (and reflog (> count 1))
-        ;; "start autosaving ..." is the current message, but it used
-        ;; to be "restart autosaving ...", and those messages may
-        ;; still be around (e.g., if gc.reflogExpire is to "never").
-        (setq reflog (cl-member "^[^ ]+ [^:]+: \\(?:re\\)?start autosaving"
-                                reflog :test #'string-match-p))
-        (when (and (cadr reflog)
-                   (string-match "^[^ ]+ \\([^:]+\\)" (cadr reflog)))
-          (push (match-string 1 (cadr reflog)) tips))
-        (setq reflog (cddr reflog))
-        (cl-decf count))
-      (cons wipref (nreverse tips)))))
-
-;;; _
-(provide 'magit-wip)
-;;; magit-wip.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-worktree.elc b/emacs/elpa/magit-20240426.2118/magit-worktree.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit.el b/emacs/elpa/magit-20240426.2118/magit.el
@@ -1,778 +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: 3.3.0.50-git
-;; Package-Requires: (
-;;     (emacs "25.1")
-;;     (compat "29.1.4.4")
-;;     (dash "2.19.1")
-;;     (git-commit "3.3.0")
-;;     (magit-section "3.3.0")
-;;     (seq "2.24")
-;;     (transient "0.5.3")
-;;     (with-editor "3.3.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)
-  "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--straight-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--straight-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, 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)")
-                      (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 (equal (getenv "CI") "true")
-        ;; The repository is a sparse clone.
-        (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))
-    (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-20240426.2118/magit.info b/emacs/elpa/magit-20240426.2118/magit.info
@@ -1,11596 +0,0 @@
-This is magit.info, produced by makeinfo version 6.7 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 3.3.0.50-git.
-
-     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 strickly
-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’.
-
-        • ": " is appended to PROMPT.
-
-        • PROMPT is modified to end with \" (default DEF|FALLBACK): \"
-          provided that DEF or FALLBACK is non-nil, that neither
-          ‘ivy-mode’ nor ‘helm-mode’ is enabled, and that
-          ‘magit-completing-read-function’ is set to its default value
-          of ‘magit-builtin-completing-read’.
-
-
-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-changes’ 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
-     began 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-submodule-fetch’)
-     This command fetches all submodules.  With a prefix argument it
-     fetches all remotes of all submodules.
-
- -- 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.
-
-     Option ‘magit-fetch-modules-jobs’ controls how many submodules are
-     being fetched in parallel.  Also fetch the super-repository,
-     because ‘git fetch’ does not support not doing that.  With a prefix
-     argument fetch all remotes.
-
-
-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 stricktly 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‘ 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 <1>:                               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  30)
-* 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  61)
-* l b:                                   Logging.             (line  58)
-* L d:                                   Log Margin.          (line  66)
-* L g:                                   Refreshing Logs.     (line  17)
-* l h:                                   Logging.             (line  40)
-* l H:                                   Reflog.              (line  18)
-* l l:                                   Logging.             (line  35)
-* l L:                                   Logging.             (line  55)
-* L L:                                   Refreshing Logs.     (line  34)
-* L L <1>:                               Log Margin.          (line  60)
-* L l:                                   Log Margin.          (line  63)
-* l o:                                   Logging.             (line  49)
-* l O:                                   Reflog.              (line  15)
-* l r:                                   Reflog.              (line  12)
-* L s:                                   Refreshing Logs.     (line  21)
-* l u:                                   Logging.             (line  43)
-* 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:                   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  30)
-* 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  61)
-* magit-log-all-branches:                Logging.             (line  58)
-* magit-log-branches:                    Logging.             (line  55)
-* 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  35)
-* magit-log-double-commit-limit:         Log Buffer.          (line  64)
-* magit-log-half-commit-limit:           Log Buffer.          (line  67)
-* magit-log-head:                        Logging.             (line  40)
-* 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  49)
-* 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  43)
-* 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-fetch:                 Fetching.            (line  48)
-* 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 109)
-* 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  51)
-* 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: Introduction6566
-Node: Installation11282
-Node: Installing from Melpa11612
-Node: Installing from the Git Repository12687
-Node: Post-Installation Tasks15501
-Node: Getting Started16786
-Node: Interface Concepts22597
-Node: Modes and Buffers22976
-Node: Switching Buffers24687
-Node: Naming Buffers29426
-Node: Quitting Windows32501
-Node: Automatic Refreshing of Magit Buffers34436
-Node: Automatic Saving of File-Visiting Buffers37317
-Node: Automatic Reverting of File-Visiting Buffers38501
-Node: Risk of Reverting Automatically43486
-Node: Sections45868
-Node: Section Movement46794
-Node: Section Visibility51668
-Node: Section Hooks58355
-Node: Section Types and Values60761
-Node: Section Options62176
-Node: Transient Commands62647
-Node: Transient Arguments and Buffer Variables64123
-Node: Completion Confirmation and the Selection71140
-Node: Action Confirmation71586
-Node: Completion and Confirmation80091
-Node: The Selection83276
-Node: The hunk-internal region86174
-Node: Support for Completion Frameworks87263
-Node: Additional Completion Options92166
-Node: Mouse Support92764
-Node: Running Git93340
-Node: Viewing Git Output93585
-Node: Git Process Status96289
-Node: Running Git Manually97254
-Node: Git Executable99944
-Node: Global Git Arguments102952
-Node: Inspecting103757
-Node: Status Buffer104914
-Node: Status Sections109925
-Node: Status Header Sections115452
-Node: Status Module Sections118071
-Node: Status Options120568
-Node: Repository List121931
-Node: Logging126709
-Node: Refreshing Logs129551
-Node: Log Buffer130972
-Node: Log Margin135795
-Node: Select from Log138948
-Node: Reflog141158
-Node: Cherries142795
-Node: Diffing144633
-Node: Refreshing Diffs147667
-Node: Commands Available in Diffs151356
-Node: Diff Options153869
-Node: Revision Buffer159332
-Node: Ediffing162652
-Node: References Buffer168702
-Node: References Sections179296
-Node: Bisecting180153
-Node: Visiting Files and Blobs182464
-Node: General-Purpose Visit Commands182992
-Node: Visiting Files and Blobs from a Diff183945
-Node: Blaming187389
-Node: Manipulating194377
-Node: Creating Repository194719
-Node: Cloning Repository195256
-Node: Staging and Unstaging201697
-Node: Staging from File-Visiting Buffers205678
-Node: Applying206784
-Node: Committing208857
-Node: Initiating a Commit209440
-Node: Editing Commit Messages214630
-Node: Using the Revision Stack217403
-Node: Commit Pseudo Headers220448
-Node: Commit Mode and Hooks221743
-Node: Commit Message Conventions224601
-Node: Branching226588
-Node: The Two Remotes226814
-Node: Branch Commands229467
-Node: Branch Git Variables242317
-Node: Auxiliary Branch Commands247691
-Node: Merging248807
-Node: Resolving Conflicts252963
-Node: Rebasing258337
-Node: Editing Rebase Sequences263126
-Node: Information About In-Progress Rebase267342
-Ref: Information About In-Progress Rebase-Footnote-1276455
-Node: Cherry Picking277051
-Node: Reverting281385
-Node: Resetting282804
-Node: Stashing284630
-Node: Transferring291011
-Node: Remotes291233
-Node: Remote Commands291385
-Node: Remote Git Variables295424
-Node: Fetching296695
-Node: Pulling299141
-Node: Pushing300167
-Node: Plain Patches304458
-Node: Maildir Patches305929
-Node: Miscellaneous307408
-Node: Tagging307754
-Node: Notes309647
-Node: Submodules311982
-Node: Listing Submodules312200
-Node: Submodule Transient314348
-Node: Subtree316835
-Node: Worktree318766
-Node: Sparse checkouts319842
-Node: Bundle322618
-Node: Common Commands322993
-Node: Wip Modes325621
-Node: Wip Graph330512
-Node: Legacy Wip Modes332825
-Node: Commands for Buffers Visiting Files335712
-Node: Minor Mode for Buffers Visiting Blobs343940
-Node: Customizing344738
-Node: Per-Repository Configuration346334
-Node: Essential Settings348588
-Node: Safety348934
-Node: Performance350695
-Ref: Log Performance353658
-Ref: Diff Performance354963
-Ref: Refs Buffer Performance356304
-Ref: Committing Performance356879
-Node: Microsoft Windows Performance357861
-Node: MacOS Performance359052
-Ref: MacOS Performance-Footnote-1360075
-Node: Global Bindings360157
-Node: Plumbing362385
-Node: Calling Git363214
-Node: Getting a Value from Git364739
-Node: Calling Git for Effect368467
-Node: Section Plumbing374361
-Node: Creating Sections374589
-Node: Section Selection378485
-Node: Matching Sections380281
-Node: Refreshing Buffers386202
-Node: Conventions389346
-Node: Theming Faces389538
-Node: FAQ397643
-Node: FAQ - How to ...?398081
-Node: How to pronounce Magit?398438
-Node: How to show git's output?399241
-Node: How to install the gitman info manual?400027
-Node: How to show diffs for gpg-encrypted files?400997
-Node: How does branching and pushing work?401593
-Node: Should I disable VC?401926
-Node: FAQ - Issues and Errors402529
-Node: Magit is slow403474
-Node: I changed several thousand files at once and now Magit is unusable403767
-Node: I am having problems committing404493
-Node: I am using MS Windows and cannot push with Magit404974
-Node: I am using macOS and SOMETHING works in shell but not in Magit405592
-Node: Expanding a file to show the diff causes it to disappear406426
-Node: Point is wrong in the COMMIT_EDITMSG buffer407014
-Node: The mode-line information isn't always up-to-date408059
-Node: A branch and tag sharing the same name breaks SOMETHING409122
-Node: My Git hooks work on the command-line but not inside Magit410009
-Node: git-commit-mode isn't used when committing from the command-line410855
-Node: Point ends up inside invisible text when jumping to a file-visiting buffer413126
-Node: I am no longer able to save popup defaults413975
-Node: Debugging Tools414956
-Node: Keystroke Index418130
-Node: Function and Command Index459744
-Node: Variable Index517945
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
diff --git a/emacs/elpa/magit-20240426.2118/AUTHORS.md b/emacs/elpa/magit-20240514.1843/AUTHORS.md
diff --git a/emacs/elpa/magit-20240426.2118/LICENSE b/emacs/elpa/magit-20240514.1843/LICENSE
diff --git a/emacs/elpa/magit-20240426.2118/dir b/emacs/elpa/magit-20240514.1843/dir
diff --git a/emacs/elpa/magit-20240514.1843/git-rebase.el b/emacs/elpa/magit-20240514.1843/git-rebase.el
@@ -0,0 +1,873 @@
+;;; git-rebase.el --- Edit Git rebase files  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2008-2024 The Magit Project Contributors
+
+;; Author: Phil Jackson <phil@shellarchive.co.uk>
+;; 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 package assists the user in editing the list of commits to be
+;; rewritten during an interactive rebase.
+
+;; When the user initiates an interactive rebase, e.g., using "r e" in
+;; a Magit buffer or on the command line using "git rebase -i REV",
+;; Git invokes the `$GIT_SEQUENCE_EDITOR' (or if that is undefined
+;; `$GIT_EDITOR' or even `$EDITOR') letting the user rearrange, drop,
+;; reword, edit, and squash commits.
+
+;; This package provides the major-mode `git-rebase-mode' which makes
+;; doing so much more fun, by making the buffer more colorful and
+;; providing the following commands:
+;;
+;;   C-c C-c  Tell Git to make it happen.
+;;   C-c C-k  Tell Git that you changed your mind, i.e., abort.
+;;
+;;   p        Move point to previous line.
+;;   n        Move point to next line.
+;;
+;;   M-p      Move the commit at point up.
+;;   M-n      Move the commit at point down.
+;;
+;;   k        Drop the commit at point.
+;;   c        Don't drop the commit at point.
+;;   r        Change the message of the commit at point.
+;;   e        Edit the commit at point.
+;;   s        Squash the commit at point, into the one above.
+;;   f        Like "s" but don't also edit the commit message.
+;;   b        Break for editing at this point in the sequence.
+;;   x        Add a script to be run with the commit at point
+;;            being checked out.
+;;   z        Add noop action at point.
+;;
+;;   SPC      Show the commit at point in another buffer.
+;;   RET      Show the commit at point in another buffer and
+;;            select its window.
+;;   C-/      Undo last change.
+;;
+;;   Commands for --rebase-merges:
+;;   l        Associate label with current HEAD in sequence.
+;;   MM       Merge specified revisions into HEAD.
+;;   Mt       Toggle whether the merge will invoke an editor
+;;            before committing.
+;;   t        Reset HEAD to the specified label.
+
+;; You should probably also read the `git-rebase' manpage.
+
+;;; Code:
+
+(require 'magit)
+
+(require 'easymenu)
+(require 'server)
+(require 'with-editor)
+
+(defvar recentf-exclude)
+
+;;; Options
+;;;; Variables
+
+(defgroup git-rebase nil
+  "Edit Git rebase sequences."
+  :link '(info-link "(magit)Editing Rebase Sequences")
+  :group 'tools)
+
+(defcustom git-rebase-auto-advance t
+  "Whether to move to next line after changing a line."
+  :group 'git-rebase
+  :type 'boolean)
+
+(defcustom git-rebase-show-instructions t
+  "Whether to show usage instructions inside the rebase buffer."
+  :group 'git-rebase
+  :type 'boolean)
+
+(defcustom git-rebase-confirm-cancel t
+  "Whether confirmation is required to cancel."
+  :group 'git-rebase
+  :type 'boolean)
+
+;;;; Faces
+
+(defgroup git-rebase-faces nil
+  "Faces used by Git-Rebase mode."
+  :group 'faces
+  :group 'git-rebase)
+
+(defface git-rebase-hash '((t :inherit magit-hash))
+  "Face for commit hashes."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-label '((t :inherit magit-refname))
+  "Face for labels in label, merge, and reset lines."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-description '((t nil))
+  "Face for commit descriptions."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-action
+  '((t :inherit font-lock-keyword-face))
+  "Face for action keywords."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-killed-action
+  '((t :inherit font-lock-comment-face :strike-through t))
+  "Face for commented commit action lines."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-comment-hash
+  '((t :inherit git-rebase-hash :weight bold))
+  "Face for commit hashes in commit message comments."
+  :group 'git-rebase-faces)
+
+(defface git-rebase-comment-heading
+  '((t :inherit font-lock-keyword-face))
+  "Face for headings in rebase message comments."
+  :group 'git-rebase-faces)
+
+;;; Keymaps
+
+(defvar-keymap git-rebase-mode-map
+  :doc "Keymap for Git-Rebase mode."
+  :parent special-mode-map
+  "C-m" #'git-rebase-show-commit
+  "p"   #'git-rebase-backward-line
+  "n"   #'forward-line
+  "M-p" #'git-rebase-move-line-up
+  "M-n" #'git-rebase-move-line-down
+  "c"   #'git-rebase-pick
+  "k"   #'git-rebase-kill-line
+  "C-k" #'git-rebase-kill-line
+  "b"   #'git-rebase-break
+  "e"   #'git-rebase-edit
+  "l"   #'git-rebase-label
+  "M M" #'git-rebase-merge
+  "M t" #'git-rebase-merge-toggle-editmsg
+  "m"   #'git-rebase-edit
+  "f"   #'git-rebase-fixup
+  "q"   #'undefined
+  "r"   #'git-rebase-reword
+  "w"   #'git-rebase-reword
+  "s"   #'git-rebase-squash
+  "t"   #'git-rebase-reset
+  "u"   #'git-rebase-update-ref
+  "x"   #'git-rebase-exec
+  "y"   #'git-rebase-insert
+  "z"   #'git-rebase-noop
+  "SPC" #'git-rebase-show-or-scroll-up
+  "DEL" #'git-rebase-show-or-scroll-down
+  "C-x C-t"        #'git-rebase-move-line-up
+  "M-<up>"         #'git-rebase-move-line-up
+  "M-<down>"       #'git-rebase-move-line-down
+  "<remap> <undo>" #'git-rebase-undo)
+(put 'git-rebase-reword       :advertised-binding (kbd "r"))
+(put 'git-rebase-move-line-up :advertised-binding (kbd "M-p"))
+(put 'git-rebase-kill-line    :advertised-binding (kbd "k"))
+
+(easy-menu-define git-rebase-mode-menu git-rebase-mode-map
+  "Git-Rebase mode menu"
+  '("Rebase"
+    ["Pick" git-rebase-pick t]
+    ["Reword" git-rebase-reword t]
+    ["Edit" git-rebase-edit t]
+    ["Squash" git-rebase-squash t]
+    ["Fixup" git-rebase-fixup t]
+    ["Kill" git-rebase-kill-line t]
+    ["Noop" git-rebase-noop t]
+    ["Execute" git-rebase-exec t]
+    ["Move Down" git-rebase-move-line-down t]
+    ["Move Up" git-rebase-move-line-up t]
+    "---"
+    ["Cancel" with-editor-cancel t]
+    ["Finish" with-editor-finish t]))
+
+(defvar git-rebase-command-descriptions
+  '((with-editor-finish           . "tell Git to make it happen")
+    (with-editor-cancel           . "tell Git that you changed your mind, i.e., abort")
+    (git-rebase-backward-line     . "move point to previous line")
+    (forward-line                 . "move point to next line")
+    (git-rebase-move-line-up      . "move the commit at point up")
+    (git-rebase-move-line-down    . "move the commit at point down")
+    (git-rebase-show-or-scroll-up . "show the commit at point in another buffer")
+    (git-rebase-show-commit
+     . "show the commit at point in another buffer and select its window")
+    (undo                         . "undo last change")
+    (git-rebase-kill-line         . "drop the commit at point")
+    (git-rebase-insert            . "insert a line for an arbitrary commit")
+    (git-rebase-noop              . "add noop action at point")))
+
+;;; Commands
+
+(defun git-rebase-pick ()
+  "Use commit on current line.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action "pick"))
+
+(defun git-rebase-reword ()
+  "Edit message of commit on current line.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action "reword"))
+
+(defun git-rebase-edit ()
+  "Stop at the commit on the current line.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action "edit"))
+
+(defun git-rebase-squash ()
+  "Meld commit on current line into previous commit, edit message.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action "squash"))
+
+(defun git-rebase-fixup ()
+  "Meld commit on current line into previous commit, discard its message.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action "fixup"))
+
+(defvar-local git-rebase-comment-re nil)
+
+(defvar git-rebase-short-options
+  '((?b . "break")
+    (?e . "edit")
+    (?f . "fixup")
+    (?l . "label")
+    (?m . "merge")
+    (?p . "pick")
+    (?r . "reword")
+    (?s . "squash")
+    (?t . "reset")
+    (?u . "update-ref")
+    (?x . "exec"))
+  "Alist mapping single key of an action to the full name.")
+
+(defclass git-rebase-action ()
+  (;; action-type: commit, exec, bare, label, merge
+   (action-type    :initarg :action-type    :initform nil)
+   ;; Examples for each action type:
+   ;; | action | action options | target  | trailer |
+   ;; |--------+----------------+---------+---------|
+   ;; | pick   |                | hash    | subject |
+   ;; | exec   |                | command |         |
+   ;; | noop   |                |         |         |
+   ;; | reset  |                | name    | subject |
+   ;; | merge  | -C hash        | name    | subject |
+   (action         :initarg :action         :initform nil)
+   (action-options :initarg :action-options :initform nil)
+   (target         :initarg :target         :initform nil)
+   (trailer        :initarg :trailer        :initform nil)
+   (comment-p      :initarg :comment-p      :initform nil)))
+
+(defvar git-rebase-line-regexps
+  `((commit . ,(concat
+                (regexp-opt '("e" "edit"
+                              "f" "fixup"
+                              "p" "pick"
+                              "r" "reword"
+                              "s" "squash")
+                            "\\(?1:")
+                " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
+    (exec . "\\(?1:x\\|exec\\) \\(?3:.*\\)")
+    (bare . ,(concat (regexp-opt '("b" "break" "noop") "\\(?1:")
+                     " *$"))
+    (label . ,(concat (regexp-opt '("l" "label"
+                                    "t" "reset"
+                                    "u" "update-ref")
+                                  "\\(?1:")
+                      " \\(?3:[^ \n]+\\) ?\\(?4:.*\\)"))
+    (merge . ,(concat "\\(?1:m\\|merge\\) "
+                      "\\(?:\\(?2:-[cC] [^ \n]+\\) \\)?"
+                      "\\(?3:[^ \n]+\\)"
+                      " ?\\(?4:.*\\)"))))
+
+;;;###autoload
+(defun git-rebase-current-line ()
+  "Parse current line into a `git-rebase-action' instance.
+If the current line isn't recognized as a rebase line, an
+instance with all nil values is returned."
+  (save-excursion
+    (goto-char (line-beginning-position))
+    (if-let ((re-start (concat "^\\(?5:" (regexp-quote comment-start)
+                               "\\)? *"))
+             (type (seq-some (lambda (arg)
+                               (let ((case-fold-search nil))
+                                 (and (looking-at (concat re-start (cdr arg)))
+                                      (car arg))))
+                             git-rebase-line-regexps)))
+        (git-rebase-action
+         :action-type    type
+         :action         (and-let* ((action (match-string-no-properties 1)))
+                           (or (cdr (assoc action git-rebase-short-options))
+                               action))
+         :action-options (match-string-no-properties 2)
+         :target         (match-string-no-properties 3)
+         :trailer        (match-string-no-properties 4)
+         :comment-p      (and (match-string 5) t))
+      ;; Use default empty class rather than nil to ease handling.
+      (git-rebase-action))))
+
+(defun git-rebase-set-action (action)
+  "Set action of commit line to ACTION.
+If the region is active, operate on all lines that it touches.
+Otherwise, operate on the current line.  As a special case, an
+ACTION of nil comments the rebase line, regardless of its action
+type."
+  (pcase (git-rebase-region-bounds t)
+    (`(,beg ,end)
+     (let ((end-marker (copy-marker end))
+           (pt-below-p (and mark-active (< (mark) (point)))))
+       (set-marker-insertion-type end-marker t)
+       (goto-char beg)
+       (while (< (point) end-marker)
+         (with-slots (action-type target trailer comment-p)
+             (git-rebase-current-line)
+           (cond
+            ((and action (eq action-type 'commit))
+             (let ((inhibit-read-only t))
+               (magit-delete-line)
+               (insert (concat action " " target " " trailer "\n"))))
+            ((and action-type (not (or action comment-p)))
+             (let ((inhibit-read-only t))
+               (insert comment-start " "))
+             (forward-line))
+            (t
+             ;; In the case of --rebase-merges, commit lines may have
+             ;; other lines with other action types, empty lines, and
+             ;; "Branch" comments interspersed.  Move along.
+             (forward-line)))))
+       (goto-char
+        (if git-rebase-auto-advance
+            end-marker
+          (if pt-below-p (1- end-marker) beg)))
+       (goto-char (line-beginning-position))))
+    (_ (ding))))
+
+(defun git-rebase-line-p (&optional pos)
+  (save-excursion
+    (when pos (goto-char pos))
+    (and (oref (git-rebase-current-line) action-type)
+         t)))
+
+(defun git-rebase-region-bounds (&optional fallback)
+  "Return region bounds if both ends touch rebase lines.
+Each bound is extended to include the entire line touched by the
+point or mark.  If the region isn't active and FALLBACK is
+non-nil, return the beginning and end of the current rebase line,
+if any."
+  (cond
+   ((use-region-p)
+    (let ((beg (save-excursion (goto-char (region-beginning))
+                               (line-beginning-position)))
+          (end (save-excursion (goto-char (region-end))
+                               (line-end-position))))
+      (when (and (git-rebase-line-p beg)
+                 (git-rebase-line-p end))
+        (list beg (1+ end)))))
+   ((and fallback (git-rebase-line-p))
+    (list (line-beginning-position)
+          (1+ (line-end-position))))))
+
+(defun git-rebase-move-line-down (n)
+  "Move the current commit (or command) N lines down.
+If N is negative, move the commit up instead.  With an active
+region, move all the lines that the region touches, not just the
+current line."
+  (interactive "p")
+  (pcase-let* ((`(,beg ,end)
+                (or (git-rebase-region-bounds)
+                    (list (line-beginning-position)
+                          (1+ (line-end-position)))))
+               (pt-offset (- (point) beg))
+               (mark-offset (and mark-active (- (mark) beg))))
+    (save-restriction
+      (narrow-to-region
+       (point-min)
+       (1-
+        (if git-rebase-show-instructions
+            (save-excursion
+              (goto-char (point-min))
+              (while (or (git-rebase-line-p)
+                         ;; The output for --rebase-merges has empty
+                         ;; lines and "Branch" comments interspersed.
+                         (looking-at-p "^$")
+                         (looking-at-p (concat git-rebase-comment-re
+                                               " Branch")))
+                (forward-line))
+              (line-beginning-position))
+          (point-max))))
+      (if (or (and (< n 0) (= beg (point-min)))
+              (and (> n 0) (= end (point-max)))
+              (> end (point-max)))
+          (ding)
+        (goto-char (if (< n 0) beg end))
+        (forward-line n)
+        (atomic-change-group
+          (let ((inhibit-read-only t))
+            (insert (delete-and-extract-region beg end)))
+          (let ((new-beg (- (point) (- end beg))))
+            (when (use-region-p)
+              (setq deactivate-mark nil)
+              (set-mark (+ new-beg mark-offset)))
+            (goto-char (+ new-beg pt-offset))))))))
+
+(defun git-rebase-move-line-up (n)
+  "Move the current commit (or command) N lines up.
+If N is negative, move the commit down instead.  With an active
+region, move all the lines that the region touches, not just the
+current line."
+  (interactive "p")
+  (git-rebase-move-line-down (- n)))
+
+(defun git-rebase-highlight-region (start end window rol)
+  (let ((inhibit-read-only t)
+        (deactivate-mark nil)
+        (bounds (git-rebase-region-bounds)))
+    (mapc #'delete-overlay magit-section-highlight-overlays)
+    (when bounds
+      (magit-section-make-overlay (car bounds) (cadr bounds)
+                                  'magit-section-heading-selection))
+    (if (and bounds (not magit-section-keep-region-overlay))
+        (funcall (default-value 'redisplay-unhighlight-region-function) rol)
+      (funcall (default-value 'redisplay-highlight-region-function)
+               start end window rol))))
+
+(defun git-rebase-unhighlight-region (rol)
+  (mapc #'delete-overlay magit-section-highlight-overlays)
+  (funcall (default-value 'redisplay-unhighlight-region-function) rol))
+
+(defun git-rebase-kill-line ()
+  "Kill the current action line.
+If the region is active, act on all lines touched by the region."
+  (interactive)
+  (git-rebase-set-action nil))
+
+(defun git-rebase-insert (rev)
+  "Read an arbitrary commit and insert it below current line."
+  (interactive (list (magit-read-branch-or-commit "Insert revision")))
+  (forward-line)
+  (if-let ((info (magit-rev-format "%h %s" rev)))
+      (let ((inhibit-read-only t))
+        (insert "pick " info ?\n))
+    (user-error "Unknown revision")))
+
+(defun git-rebase-set-noncommit-action (action value-fn arg)
+  (goto-char (line-beginning-position))
+  (pcase-let* ((inhibit-read-only t)
+               (`(,initial ,trailer ,comment-p)
+                (and (not arg)
+                     (with-slots ((ln-action action)
+                                  target trailer comment-p)
+                         (git-rebase-current-line)
+                       (and (equal ln-action action)
+                            (list target trailer comment-p)))))
+               (value (funcall value-fn initial)))
+    (pcase (list value initial comment-p)
+      (`("" nil ,_)
+       (ding))
+      (`(""  ,_ ,_)
+       (magit-delete-line))
+      (_
+       (if initial
+           (magit-delete-line)
+         (forward-line))
+       (insert (concat action " " value
+                       (and (equal value initial)
+                            trailer
+                            (concat " " trailer))
+                       "\n"))
+       (unless git-rebase-auto-advance
+         (forward-line -1))))))
+
+(defun git-rebase-exec (arg)
+  "Insert a shell command to be run after the current 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."
+  (interactive "P")
+  (git-rebase-set-noncommit-action
+   "exec"
+   (lambda (initial) (read-shell-command "Execute: " initial))
+   arg))
+
+(defun git-rebase-label (arg)
+  "Add a label after the current commit.
+If there already is a label on the current line, then edit that
+instead.  With a prefix argument, insert a new label even when
+there is already a label on the current line.  With empty input,
+remove the label on the current line, if any."
+  (interactive "P")
+  (git-rebase-set-noncommit-action
+   "label"
+   (lambda (initial)
+     (read-from-minibuffer
+      "Label: " initial magit-minibuffer-local-ns-map))
+   arg))
+
+(defun git-rebase-buffer-labels ()
+  (let (labels)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "^\\(?:l\\|label\\) \\([^ \n]+\\)" nil t)
+        (push (match-string-no-properties 1) labels)))
+    (nreverse labels)))
+
+(defun git-rebase-reset (arg)
+  "Reset the current HEAD to a label.
+If there already is a reset command on the current line, then
+edit that instead.  With a prefix argument, insert a new reset
+line even when point is already on a reset line.  With empty
+input, remove the reset command on the current line, if any."
+  (interactive "P")
+  (git-rebase-set-noncommit-action
+   "reset"
+   (lambda (initial)
+     (or (magit-completing-read "Label" (git-rebase-buffer-labels)
+                                nil t initial)
+         ""))
+   arg))
+
+(defun git-rebase-update-ref (arg)
+  "Insert an update-ref action after the current line.
+If there is already an update-ref action on the current line,
+then edit that instead.  With a prefix argument, insert a new
+action even when there is already one on the current line.  With
+empty input, remove the action on the current line, if any."
+  (interactive "P")
+  (git-rebase-set-noncommit-action
+   "update-ref"
+   (lambda (initial)
+     (or (magit-completing-read "Ref" (magit-list-refs) nil nil initial)
+         ""))
+   arg))
+
+(defun git-rebase-merge (arg)
+  "Add a merge command after the current commit.
+If there is already a merge command on the current line, then
+replace that command instead.  With a prefix argument, insert a
+new merge command even when there is already one on the current
+line.  With empty input, remove the merge command on the current
+line, if any."
+  (interactive "P")
+  (git-rebase-set-noncommit-action
+   "merge"
+   (lambda (_)
+     (or (magit-completing-read "Merge" (git-rebase-buffer-labels))
+         ""))
+   arg))
+
+(defun git-rebase-merge-toggle-editmsg ()
+  "Toggle whether an editor is invoked when performing the merge at point.
+When a merge command uses a lower-case -c, the message for the
+specified commit will be opened in an editor before creating the
+commit.  For an upper-case -C, the message will be used as is."
+  (interactive)
+  (with-slots (action-type target action-options trailer)
+      (git-rebase-current-line)
+    (if (eq action-type 'merge)
+        (let ((inhibit-read-only t))
+          (magit-delete-line)
+          (insert
+           (format "merge %s %s %s\n"
+                   (replace-regexp-in-string
+                    "-[cC]" (lambda (c)
+                              (if (equal c "-c") "-C" "-c"))
+                    action-options t t)
+                   target
+                   trailer)))
+      (ding))))
+
+(defun git-rebase-set-bare-action (action arg)
+  (goto-char (line-beginning-position))
+  (with-slots ((ln-action action) comment-p)
+      (git-rebase-current-line)
+    (let ((same-action-p (equal action ln-action))
+          (inhibit-read-only t))
+      (when (or arg
+                (not ln-action)
+                (not same-action-p)
+                (and same-action-p comment-p))
+        (unless (or arg (not same-action-p))
+          (magit-delete-line))
+        (insert action ?\n)
+        (unless git-rebase-auto-advance
+          (forward-line -1))))))
+
+(defun git-rebase-noop (&optional arg)
+  "Add noop action at point.
+
+If the current line already contains a noop action, leave it
+unchanged.  If there is a commented noop action present, remove
+the comment.  Otherwise add a new noop action.  With a prefix
+argument insert a new noop action regardless of what is already
+present on the current line.
+
+A noop action can be used to make git perform a rebase even if
+no commits are selected.  Without the noop action present, git
+would see an empty file and therefore do nothing."
+  (interactive "P")
+  (git-rebase-set-bare-action "noop" arg))
+
+(defun git-rebase-break (&optional arg)
+  "Add break action at point.
+
+If there is a commented break action present, remove the comment.
+If the current line already contains a break action, add another
+break action only if a prefix argument is given.
+
+A break action can be used to interrupt the rebase at the
+specified point.  It is particularly useful for pausing before
+the first commit in the sequence.  For other cases, the
+equivalent behavior can be achieved with `git-rebase-edit'."
+  (interactive "P")
+  (git-rebase-set-bare-action "break" arg))
+
+(defun git-rebase-undo (&optional arg)
+  "Undo some previous changes.
+Like `undo' but works in read-only buffers."
+  (interactive "P")
+  (let ((inhibit-read-only t))
+    (undo arg)))
+
+(defun git-rebase--show-commit (&optional scroll)
+  (let ((magit--disable-save-buffers t))
+    (save-excursion
+      (goto-char (line-beginning-position))
+      (if-let ((rev (with-slots (action-type target)
+                        (git-rebase-current-line)
+                      (and (eq action-type 'commit)
+                           target))))
+          (pcase scroll
+            ('up   (magit-diff-show-or-scroll-up))
+            ('down (magit-diff-show-or-scroll-down))
+            (_     (apply #'magit-show-commit rev
+                          (magit-diff-arguments 'magit-revision-mode))))
+        (ding)))))
+
+(defun git-rebase-show-commit ()
+  "Show the commit on the current line if any."
+  (interactive)
+  (git-rebase--show-commit))
+
+(defun git-rebase-show-or-scroll-up ()
+  "Update the commit buffer for commit on current line.
+
+Either show the commit at point in the appropriate buffer, or if
+that buffer is already being displayed in the current frame and
+contains information about that commit, then instead scroll the
+buffer up."
+  (interactive)
+  (git-rebase--show-commit 'up))
+
+(defun git-rebase-show-or-scroll-down ()
+  "Update the commit buffer for commit on current line.
+
+Either show the commit at point in the appropriate buffer, or if
+that buffer is already being displayed in the current frame and
+contains information about that commit, then instead scroll the
+buffer down."
+  (interactive)
+  (git-rebase--show-commit 'down))
+
+(defun git-rebase-backward-line (&optional n)
+  "Move N lines backward (forward if N is negative).
+Like `forward-line' but go into the opposite direction."
+  (interactive "p")
+  (forward-line (- (or n 1))))
+
+;;; Mode
+
+;;;###autoload
+(define-derived-mode git-rebase-mode special-mode "Git Rebase"
+  "Major mode for editing of a Git rebase file.
+
+Rebase files are generated when you run \"git rebase -i\" or run
+`magit-interactive-rebase'.  They describe how Git should perform
+the rebase.  See the documentation for git-rebase (e.g., by
+running \"man git-rebase\" at the command line) for details."
+  :group 'git-rebase
+  (setq comment-start (or (magit-get "core.commentChar") "#"))
+  (setq git-rebase-comment-re (concat "^" (regexp-quote comment-start)))
+  (setq font-lock-defaults (list (git-rebase-mode-font-lock-keywords) t t))
+  (unless git-rebase-show-instructions
+    (let ((inhibit-read-only t))
+      (flush-lines git-rebase-comment-re)))
+  (unless with-editor-mode
+    ;; Maybe already enabled when using `shell-command' or an Emacs shell.
+    (with-editor-mode 1))
+  (when git-rebase-confirm-cancel
+    (add-hook 'with-editor-cancel-query-functions
+              #'git-rebase-cancel-confirm nil t))
+  (setq-local redisplay-highlight-region-function
+              #'git-rebase-highlight-region)
+  (setq-local redisplay-unhighlight-region-function
+              #'git-rebase-unhighlight-region)
+  (add-hook 'with-editor-pre-cancel-hook  #'git-rebase-autostash-save  nil t)
+  (add-hook 'with-editor-post-cancel-hook #'git-rebase-autostash-apply nil t)
+  (setq imenu-prev-index-position-function
+        #'magit-imenu--rebase-prev-index-position-function)
+  (setq imenu-extract-index-name-function
+        #'magit-imenu--rebase-extract-index-name-function)
+  (when (boundp 'save-place)
+    (setq save-place nil)))
+
+(defun git-rebase-cancel-confirm (force)
+  (or (not (buffer-modified-p))
+      force
+      (magit-confirm 'abort-rebase "Abort this rebase" nil 'noabort)))
+
+(defun git-rebase-autostash-save ()
+  (when-let ((rev (magit-file-line
+                   (expand-file-name "rebase-merge/autostash" (magit-gitdir)))))
+    (push (cons 'stash rev) with-editor-cancel-alist)))
+
+(defun git-rebase-autostash-apply ()
+  (when-let ((rev (cdr (assq 'stash with-editor-cancel-alist))))
+    (magit-stash-apply rev)))
+
+(defun git-rebase-match-comment-line (limit)
+  (re-search-forward (concat git-rebase-comment-re ".*") limit t))
+
+(defun git-rebase-mode-font-lock-keywords ()
+  "Font lock keywords for Git-Rebase mode."
+  `((,(concat "^" (cdr (assq 'commit git-rebase-line-regexps)))
+     (1 'git-rebase-action)
+     (3 'git-rebase-hash)
+     (4 'git-rebase-description))
+    (,(concat "^" (cdr (assq 'exec git-rebase-line-regexps)))
+     (1 'git-rebase-action)
+     (3 'git-rebase-description))
+    (,(concat "^" (cdr (assq 'bare git-rebase-line-regexps)))
+     (1 'git-rebase-action))
+    (,(concat "^" (cdr (assq 'label git-rebase-line-regexps)))
+     (1 'git-rebase-action)
+     (3 'git-rebase-label)
+     (4 'font-lock-comment-face))
+    ("^\\(m\\(?:erge\\)?\\) -[Cc] \\([^ \n]+\\) \\([^ \n]+\\)\\( #.*\\)?"
+     (1 'git-rebase-action)
+     (2 'git-rebase-hash)
+     (3 'git-rebase-label)
+     (4 'font-lock-comment-face))
+    ("^\\(m\\(?:erge\\)?\\) \\([^ \n]+\\)"
+     (1 'git-rebase-action)
+     (2 'git-rebase-label))
+    (,(concat git-rebase-comment-re " *"
+              (cdr (assq 'commit git-rebase-line-regexps)))
+     0 'git-rebase-killed-action t)
+    (git-rebase-match-comment-line 0 'font-lock-comment-face)
+    ("\\[[^[]*\\]"
+     0 'magit-keyword t)
+    ("\\(?:fixup!\\|squash!\\)"
+     0 'magit-keyword-squash t)
+    (,(format "^%s Rebase \\([^ ]*\\) onto \\([^ ]*\\)" comment-start)
+     (1 'git-rebase-comment-hash t)
+     (2 'git-rebase-comment-hash t))
+    (,(format "^%s \\(Commands:\\)" comment-start)
+     (1 'git-rebase-comment-heading t))
+    (,(format "^%s Branch \\(.*\\)" comment-start)
+     (1 'git-rebase-label t))))
+
+(defun git-rebase-mode-show-keybindings ()
+  "Modify the \"Commands:\" section of the comment Git generates
+at the bottom of the file so that in place of the one-letter
+abbreviation for the command, it shows the command's keybinding.
+By default, this is the same except for the \"pick\" command."
+  (let ((inhibit-read-only t))
+    (save-excursion
+      (goto-char (point-min))
+      (when (and git-rebase-show-instructions
+                 (re-search-forward
+                  (concat git-rebase-comment-re "\\s-+p, pick")
+                  nil t))
+        (goto-char (line-beginning-position))
+        (pcase-dolist (`(,cmd . ,desc) git-rebase-command-descriptions)
+          (insert (format (propertize "%s %s %s\n"
+                                      'font-lock-face 'font-lock-comment-face)
+                          comment-start
+                          (string-pad
+                           (substitute-command-keys (format "\\[%s]" cmd)) 8)
+                          desc)))
+        (while (re-search-forward
+                (concat git-rebase-comment-re "\\(?:"
+                        "\\( \\.?     *\\)\\|"
+                        "\\( +\\)\\([^\n,],\\) \\([^\n ]+\\) \\)")
+                nil t)
+          (if (match-string 1)
+              (replace-match (make-string 10 ?\s) t t nil 1)
+            (let ((cmd (intern (concat "git-rebase-" (match-string 4)))))
+              (if (not (fboundp cmd))
+                  (delete-region (line-beginning-position)
+                                 (1+ (line-end-position)))
+                (add-text-properties (line-beginning-position)
+                                     (1+ (line-end-position))
+                                     '(font-lock-face font-lock-comment-face))
+                (replace-match " " t t nil 2)
+                (replace-match
+                 (string-pad
+                  (save-match-data
+                    (substitute-command-keys (format "\\[%s]" cmd)))
+                  8)
+                 t t nil 3)))))))))
+
+(add-hook 'git-rebase-mode-hook #'git-rebase-mode-show-keybindings t)
+
+(defun git-rebase-mode-disable-before-save-hook ()
+  (setq-local before-save-hook nil))
+
+(add-hook 'git-rebase-mode-hook #'git-rebase-mode-disable-before-save-hook)
+
+;;;###autoload
+(defconst git-rebase-filename-regexp "/git-rebase-todo\\'")
+;;;###autoload
+(add-to-list 'auto-mode-alist
+             (cons git-rebase-filename-regexp #'git-rebase-mode))
+
+(add-to-list 'with-editor-server-window-alist
+             (cons git-rebase-filename-regexp #'switch-to-buffer))
+
+(with-eval-after-load 'recentf
+  (add-to-list 'recentf-exclude git-rebase-filename-regexp))
+
+(add-to-list 'with-editor-file-name-history-exclude git-rebase-filename-regexp)
+
+;;; Imenu Support
+
+(defun magit-imenu--rebase-prev-index-position-function ()
+  "Move point to previous commit in git-rebase buffer.
+Used as a value for `imenu-prev-index-position-function'."
+  (catch 'found
+    (while (not (bobp))
+      (git-rebase-backward-line)
+      (when (git-rebase-line-p)
+        (throw 'found t)))))
+
+(defun magit-imenu--rebase-extract-index-name-function ()
+  "Return imenu name for line at point.
+Point should be at the beginning of the line.  This function
+is used as a value for `imenu-extract-index-name-function'."
+  (buffer-substring-no-properties (line-beginning-position)
+                                  (line-end-position)))
+
+;;; _
+(provide 'git-rebase)
+;;; git-rebase.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/git-rebase.elc b/emacs/elpa/magit-20240514.1843/git-rebase.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-apply.el b/emacs/elpa/magit-20240514.1843/magit-apply.el
@@ -0,0 +1,856 @@
+;;; magit-apply.el --- Apply Git diffs  -*- 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 commands for applying Git diffs or parts
+;; of such a diff.  The supported "apply variants" are apply, stage,
+;; unstage, discard, and reverse - more than Git itself knows about,
+;; at least at the porcelain level.
+
+;;; Code:
+
+(require 'magit-core)
+(require 'magit-diff)
+(require 'magit-wip)
+
+(require 'transient) ; See #3732.
+
+;; For `magit-apply'
+(declare-function magit-am "magit-sequence" () t)
+(declare-function magit-patch-apply "magit-patch" () t)
+;; For `magit-discard-files'
+(declare-function magit-checkout-stage "magit-merge" (file arg))
+(declare-function magit-checkout-read-stage "magit-merge" (file))
+(defvar auto-revert-verbose)
+;; For `magit-stage-untracked'
+(declare-function magit-submodule-add-1 "magit-submodule"
+                  (url &optional path name args))
+(declare-function magit-submodule-read-name-for-path "magit-submodule"
+                  (path &optional prefer-short))
+(defvar borg-user-emacs-directory)
+
+;;; Options
+
+(defcustom magit-delete-by-moving-to-trash t
+  "Whether Magit uses the system's trash can.
+
+You should absolutely not disable this and also remove `discard'
+from `magit-no-confirm'.  You shouldn't do that even if you have
+all of the Magit-Wip modes enabled, because those modes do not
+track any files that are not tracked in the proper branch."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-essentials
+  :type 'boolean)
+
+(defcustom magit-unstage-committed t
+  "Whether unstaging a committed change reverts it instead.
+
+A committed change cannot be unstaged, because staging and
+unstaging are actions that are concerned with the differences
+between the index and the working tree, not with committed
+changes.
+
+If this option is non-nil (the default), then typing \"u\"
+\(`magit-unstage') on a committed change, causes it to be
+reversed in the index but not the working tree.  For more
+information see command `magit-reverse-in-index'."
+  :package-version '(magit . "2.4.1")
+  :group 'magit-commands
+  :type 'boolean)
+
+(defcustom magit-reverse-atomically nil
+  "Whether to reverse changes atomically.
+
+If some changes can be reversed while others cannot, then nothing
+is reversed if the value of this option is non-nil.  But when it
+is nil, then the changes that can be reversed are reversed and
+for the other changes diff files are created that contain the
+rejected reversals."
+  :package-version '(magit . "2.7.0")
+  :group 'magit-commands
+  :type 'boolean)
+
+(defcustom magit-post-stage-hook nil
+  "Hook run after staging changes.
+This hook is run by `magit-refresh' if `this-command'
+is a member of `magit-post-stage-hook-commands'."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-commands
+  :type 'hook)
+
+(defcustom magit-post-unstage-hook nil
+  "Hook run after unstaging changes.
+This hook is run by `magit-refresh' if `this-command'
+is a member of `magit-post-unstage-hook-commands'."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-commands
+  :type 'hook)
+
+;;; Commands
+;;;; Apply
+
+(defun magit-apply (&rest args)
+  "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."
+  (interactive (and current-prefix-arg (list "--3way")))
+  (when-let ((s (magit-apply--get-selection)))
+    (pcase (list (magit-diff-type) (magit-diff-scope))
+      (`(,(or 'unstaged 'staged) ,_)
+       (user-error "Change is already in the working tree"))
+      (`(untracked ,(or 'file 'files))
+       (call-interactively #'magit-am))
+      (`(,_ region) (magit-apply-region s args))
+      (`(,_   hunk) (magit-apply-hunk   s args))
+      (`(,_  hunks) (magit-apply-hunks  s args))
+      (`(rebase-sequence file)
+       (call-interactively #'magit-patch-apply))
+      (`(,_   file) (magit-apply-diff   s args))
+      (`(,_  files) (magit-apply-diffs  s args)))))
+
+(defun magit-apply--section-content (section)
+  (buffer-substring-no-properties (if (magit-hunk-section-p section)
+                                      (oref section start)
+                                    (oref section content))
+                                  (oref section end)))
+
+(defun magit-apply-diffs (sections &rest args)
+  (setq sections (magit-apply--get-diffs sections))
+  (magit-apply-patch sections args
+                     (mapconcat
+                      (lambda (s)
+                        (concat (magit-diff-file-header s)
+                                (magit-apply--section-content s)))
+                      sections "")))
+
+(defun magit-apply-diff (section &rest args)
+  (setq section (car (magit-apply--get-diffs (list section))))
+  (magit-apply-patch section args
+                     (concat (magit-diff-file-header section)
+                             (magit-apply--section-content section))))
+
+(defun magit-apply--adjust-hunk-new-starts (hunks)
+  "Adjust new line numbers in headers of HUNKS for partial application.
+HUNKS should be a list of ordered, contiguous hunks to be applied
+from a file.  For example, if there is a sequence of hunks with
+the headers
+
+  @@ -2,6 +2,7 @@
+  @@ -10,6 +11,7 @@
+  @@ -18,6 +20,7 @@
+
+and only the second and third are to be applied, they would be
+adjusted as \"@@ -10,6 +10,7 @@\" and \"@@ -18,6 +19,7 @@\"."
+  (let* ((first-hunk (car hunks))
+         (offset (if (string-match diff-hunk-header-re-unified first-hunk)
+                     (- (string-to-number (match-string 3 first-hunk))
+                        (string-to-number (match-string 1 first-hunk)))
+                   (error "Header hunks have to be applied individually"))))
+    (if (= offset 0)
+        hunks
+      (mapcar (lambda (hunk)
+                (if (string-match diff-hunk-header-re-unified hunk)
+                    (replace-match (number-to-string
+                                    (- (string-to-number (match-string 3 hunk))
+                                       offset))
+                                   t t hunk 3)
+                  (error "Hunk does not have expected header")))
+              hunks))))
+
+(defun magit-apply--adjust-hunk-new-start (hunk)
+  (car (magit-apply--adjust-hunk-new-starts (list hunk))))
+
+(defun magit-apply-hunks (hunks &rest args)
+  (let ((file (oref (car hunks) parent)))
+    (when (magit-diff--combined-p file)
+      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
+    (magit-apply-patch
+     file args
+     (concat (oref file header)
+             (mapconcat #'identity
+                        (magit-apply--adjust-hunk-new-starts
+                         (mapcar #'magit-apply--section-content hunks))
+                        "")))))
+
+(defun magit-apply-hunk (hunk &rest args)
+  (let ((file (oref hunk parent)))
+    (when (magit-diff--combined-p file)
+      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
+    (let* ((header (car (oref hunk value)))
+           (header (and (symbolp header) header))
+           (content (magit-apply--section-content hunk)))
+      (magit-apply-patch
+       file args
+       (concat (magit-diff-file-header hunk (not (eq header 'rename)))
+               (if header
+                   content
+                 (magit-apply--adjust-hunk-new-start content)))))))
+
+(defun magit-apply-region (hunk &rest args)
+  (let ((file (oref hunk parent)))
+    (when (magit-diff--combined-p file)
+      (user-error "Cannot un-/stage resolution hunks.  Stage the whole file"))
+    (magit-apply-patch
+     file args
+     (concat (magit-diff-file-header hunk)
+             (magit-apply--adjust-hunk-new-start
+              (magit-diff-hunk-region-patch hunk args))))))
+
+(defun magit-apply-patch (section:s args patch)
+  (let* ((files (if (atom section:s)
+                    (list (oref section:s value))
+                  (--map (oref it value) section:s)))
+         (command (symbol-name this-command))
+         (command (if (and command (string-match "^magit-\\([^-]+\\)" command))
+                      (match-string 1 command)
+                    "apply"))
+         (ignore-context (magit-diff-ignore-any-space-p)))
+    (unless (magit-diff-context-p)
+      (user-error "Not enough context to apply patch.  Increase the context"))
+    (when (and magit-wip-before-change-mode (not magit-inhibit-refresh))
+      (magit-wip-commit-before-change files (concat " before " command)))
+    (with-temp-buffer
+      (insert patch)
+      (magit-run-git-with-input
+       "apply" args "-p0"
+       (and ignore-context "-C0")
+       "--ignore-space-change" "-"))
+    (unless magit-inhibit-refresh
+      (when magit-wip-after-apply-mode
+        (magit-wip-commit-after-apply files (concat " after " command)))
+      (magit-refresh))))
+
+(defun magit-apply--get-selection ()
+  (or (magit-region-sections '(hunk file module) t)
+      (let ((section (magit-current-section)))
+        (pcase (oref section type)
+          ((or 'hunk 'file 'module) section)
+          ((or 'staged 'unstaged 'untracked
+               'stashed-index 'stashed-worktree 'stashed-untracked)
+           (oref section children))
+          (_ (user-error "Cannot apply this, it's not a change"))))))
+
+(defun magit-apply--get-diffs (sections)
+  (magit-section-case
+    ([file diffstat]
+     (--map (or (magit-get-section
+                 (append `((file . ,(oref it value)))
+                         (magit-section-ident magit-root-section)))
+                (error "Cannot get required diff headers"))
+            sections))
+    (t sections)))
+
+(defun magit-apply--ignore-whitespace-p (selection type scope)
+  "Return t if it is necessary and possible to ignore whitespace.
+It is necessary to do so when the diff ignores whitespace changes
+and whole files are being applied.  It is possible when no binary
+files are involved.  If it is both necessary and impossible, then
+return nil, possibly causing whitespace changes to be applied."
+  (and (memq type  '(unstaged staged))
+       (memq scope '(file files list))
+       (cl-find-if (lambda (arg)
+                     (member arg '("--ignore-space-at-eol"
+                                   "--ignore-space-change"
+                                   "--ignore-all-space"
+                                   "--ignore-blank-lines")))
+                   magit-buffer-diff-args)
+       (not (cl-find-if (lambda (section)
+                          (oref section binary))
+                        (ensure-list selection)))))
+
+;;;; Stage
+
+(defun magit-stage (&optional intent)
+  "Add the change at point to the staging area.
+With a prefix argument, INTENT, and an untracked file (or files)
+at point, stage the file but not its content."
+  (interactive "P")
+  (if-let ((s (and (derived-mode-p 'magit-mode)
+                   (magit-apply--get-selection)))
+           (type (magit-diff-type))
+           (scope (magit-diff-scope)))
+      (pcase (list type scope
+                   (magit-apply--ignore-whitespace-p s type scope))
+        (`(untracked     ,_  ,_) (magit-stage-untracked intent))
+        (`(unstaged  region  ,_) (magit-apply-region s "--cached"))
+        (`(unstaged    hunk  ,_) (magit-apply-hunk   s "--cached"))
+        (`(unstaged   hunks  ,_) (magit-apply-hunks  s "--cached"))
+        ('(unstaged    file   t) (magit-apply-diff   s "--cached"))
+        ('(unstaged   files   t) (magit-apply-diffs  s "--cached"))
+        ('(unstaged    list   t) (magit-apply-diffs  s "--cached"))
+        ('(unstaged    file nil) (magit-stage-1 "-u" (list (oref s value))))
+        ('(unstaged   files nil) (magit-stage-1 "-u" (magit-region-values nil t)))
+        ('(unstaged    list nil) (magit-stage-modified))
+        (`(staged        ,_  ,_) (user-error "Already staged"))
+        (`(committed     ,_  ,_) (user-error "Cannot stage committed changes"))
+        (`(undefined     ,_  ,_) (user-error "Cannot stage this change")))
+    (call-interactively #'magit-stage-file)))
+
+;;;###autoload
+(defun magit-stage-buffer-file ()
+  "Stage all changes to the file being visited in the current buffer."
+  (interactive)
+  (unless buffer-file-name
+    (user-error "Not visiting a file"))
+  (magit-with-toplevel
+    (magit-stage-1 (and (magit-file-ignored-p buffer-file-name)
+                        (if (y-or-n-p "Visited file is ignored; stage anyway?")
+                            "--force"
+                          (user-error "Abort")))
+                   (list (magit-file-relative-name)))))
+
+;;;###autoload
+(defun magit-stage-file (files &optional force)
+  "Read one or more files and stage all changes in those files.
+With prefix argument FORCE, offer ignored files for completion."
+  (interactive
+   (let* ((choices (if current-prefix-arg
+                       (magit-ignored-files)
+                     (nconc (magit-unstaged-files)
+                            (magit-untracked-files))))
+          (default (or (magit-section-value-if 'file)
+                       (magit-file-relative-name)))
+          (default (car (member default choices))))
+     (list (magit-completing-read-multiple
+            (if current-prefix-arg "Stage ignored file,s: " "Stage file,s: ")
+            choices nil t nil nil default)
+           current-prefix-arg)))
+  (magit-with-toplevel
+    ;; For backward compatibility, and because of
+    ;; the function's name, don't require a list.
+    (magit-stage-1 (and force "--force")
+                   (if (listp files) files (list files)))))
+
+;;;###autoload
+(defun magit-stage-modified (&optional all)
+  "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."
+  (interactive "P")
+  (when (magit-anything-staged-p)
+    (magit-confirm 'stage-all-changes))
+  (magit-with-toplevel
+    (magit-stage-1 (if all "--all" "-u") magit-buffer-diff-files)))
+
+(defun magit-stage-1 (arg &optional files)
+  (magit-wip-commit-before-change files " before stage")
+  (magit-run-git "add" arg (if files (cons "--" files) "."))
+  (when magit-auto-revert-mode
+    (mapc #'magit-turn-on-auto-revert-mode-if-desired files))
+  (magit-wip-commit-after-apply files " after stage"))
+
+(defun magit-stage-untracked (&optional intent)
+  (let* ((section (magit-current-section))
+         (files (pcase (magit-diff-scope)
+                  ('file  (list (oref section value)))
+                  ('files (magit-region-values nil t))
+                  ('list  (magit-untracked-files))))
+         plain repos)
+    (dolist (file files)
+      (if (and (not (file-symlink-p file))
+               (magit-git-repo-p file t))
+          (push file repos)
+        (push file plain)))
+    (magit-wip-commit-before-change files " before stage")
+    (when plain
+      (magit-run-git "add" (and intent "--intent-to-add")
+                     "--" plain)
+      (when magit-auto-revert-mode
+        (mapc #'magit-turn-on-auto-revert-mode-if-desired plain)))
+    (dolist (repo repos)
+      (save-excursion
+        (goto-char (oref (magit-get-section
+                          `((file . ,repo) (untracked) (status)))
+                         start))
+        (when (and (fboundp 'borg-assimilate)
+                   (fboundp 'borg--maybe-absorb-gitdir)
+                   (fboundp 'borg--sort-submodule-sections))
+          (let* ((topdir (magit-toplevel))
+                 (url (let ((default-directory
+                             (file-name-as-directory (expand-file-name repo))))
+                        (or (magit-get "remote" (magit-get-some-remote) "url")
+                            (concat (file-name-as-directory ".") repo))))
+                 (package
+                  (and (equal borg-user-emacs-directory topdir)
+                       (file-name-nondirectory (directory-file-name repo)))))
+            (if (and package
+                     (y-or-n-p (format "Also assimilate `%s' drone?" package)))
+                (borg-assimilate package url)
+              (magit-submodule-add-1
+               url repo (magit-submodule-read-name-for-path repo package))
+              (when package
+                (borg--sort-submodule-sections
+                 (expand-file-name ".gitmodules" topdir))
+                (let ((default-directory borg-user-emacs-directory))
+                  (borg--maybe-absorb-gitdir package))))))))
+    (magit-wip-commit-after-apply files " after stage")))
+
+(defvar magit-post-stage-hook-commands
+  '(magit-stage
+    magit-stage-buffer-file
+    magit-stage-file
+    magit-stage-modified))
+
+(defun magit-run-post-stage-hook ()
+  (when (memq this-command magit-post-stage-hook-commands)
+    (magit-run-hook-with-benchmark 'magit-post-stage-hook)))
+
+;;;; Unstage
+
+(defun magit-unstage ()
+  "Remove the change at point from the staging area."
+  (interactive)
+  (when-let ((s (magit-apply--get-selection))
+             (type (magit-diff-type))
+             (scope (magit-diff-scope)))
+    (pcase (list type scope
+                 (magit-apply--ignore-whitespace-p s type scope))
+      (`(untracked     ,_  ,_) (user-error "Cannot unstage untracked changes"))
+      (`(unstaged    file  ,_) (magit-unstage-intent (list (oref s value))))
+      (`(unstaged   files  ,_) (magit-unstage-intent (magit-region-values nil t)))
+      (`(unstaged      ,_  ,_) (user-error "Already unstaged"))
+      (`(staged    region  ,_) (magit-apply-region s "--reverse" "--cached"))
+      (`(staged      hunk  ,_) (magit-apply-hunk   s "--reverse" "--cached"))
+      (`(staged     hunks  ,_) (magit-apply-hunks  s "--reverse" "--cached"))
+      ('(staged      file   t) (magit-apply-diff   s "--reverse" "--cached"))
+      ('(staged     files   t) (magit-apply-diffs  s "--reverse" "--cached"))
+      ('(staged      list   t) (magit-apply-diffs  s "--reverse" "--cached"))
+      ('(staged      file nil) (magit-unstage-1 (list (oref s value))))
+      ('(staged     files nil) (magit-unstage-1 (magit-region-values nil t)))
+      ('(staged      list nil) (magit-unstage-all))
+      (`(committed     ,_  ,_) (if magit-unstage-committed
+                                   (magit-reverse-in-index)
+                                 (user-error "Cannot unstage committed changes")))
+      (`(undefined     ,_  ,_) (user-error "Cannot unstage this change")))))
+
+;;;###autoload
+(defun magit-unstage-buffer-file ()
+  "Unstage all changes to the file being visited in the current buffer."
+  (interactive)
+  (unless buffer-file-name
+    (user-error "Not visiting a file"))
+  (magit-with-toplevel
+    (magit-unstage-1 (list (magit-file-relative-name)))))
+
+;;;###autoload
+(defun magit-unstage-file (files)
+  "Read one or more files and unstage all changes to those files."
+  (interactive
+   (let* ((choices (magit-staged-files))
+          (default (or (magit-section-value-if 'file)
+                       (magit-file-relative-name)))
+          (default (car (member default choices))))
+     (list (magit-completing-read-multiple "Unstage file,s: " choices
+                                           nil t nil nil default))))
+  (magit-with-toplevel
+    ;; For backward compatibility, and because of
+    ;; the function's name, don't require a list.
+    (magit-unstage-1 (if (listp files) files (list files)))))
+
+(defun magit-unstage-1 (files)
+  (magit-wip-commit-before-change files " before unstage")
+  (if (magit-no-commit-p)
+      (magit-run-git "rm" "--cached" "--" files)
+    (magit-run-git "reset" "HEAD" "--" files))
+  (magit-wip-commit-after-apply files " after unstage"))
+
+(defun magit-unstage-intent (files)
+  (if-let ((staged (magit-staged-files))
+           (intent (--filter (member it staged) files)))
+      (magit-unstage-1 intent)
+    (user-error "Already unstaged")))
+
+;;;###autoload
+(defun magit-unstage-all ()
+  "Remove all changes from the staging area."
+  (interactive)
+  (unless (magit-anything-staged-p)
+    (user-error "Nothing to unstage"))
+  (when (or (magit-anything-unstaged-p)
+            (magit-untracked-files))
+    (magit-confirm 'unstage-all-changes))
+  (magit-wip-commit-before-change nil " before unstage")
+  (magit-run-git "reset" "HEAD" "--" magit-buffer-diff-files)
+  (magit-wip-commit-after-apply nil " after unstage"))
+
+(defvar magit-post-unstage-hook-commands
+  '(magit-unstage
+    magit-unstage-buffer-file
+    magit-unstage-file
+    magit-unstage-all))
+
+(defun magit-run-post-unstage-hook ()
+  (when (memq this-command magit-post-unstage-hook-commands)
+    (magit-run-hook-with-benchmark 'magit-post-unstage-hook)))
+
+;;;; Discard
+
+(defun magit-discard ()
+  "Remove the change at point.
+
+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."
+  (interactive)
+  (when-let ((s (magit-apply--get-selection)))
+    (pcase (list (magit-diff-type) (magit-diff-scope))
+      (`(committed ,_) (user-error "Cannot discard committed changes"))
+      (`(undefined ,_) (user-error "Cannot discard this change"))
+      (`(,_    region) (magit-discard-region s))
+      (`(,_      hunk) (magit-discard-hunk   s))
+      (`(,_     hunks) (magit-discard-hunks  s))
+      (`(,_      file) (magit-discard-file   s))
+      (`(,_     files) (magit-discard-files  s))
+      (`(,_      list) (magit-discard-files  s)))))
+
+(defun magit-discard-region (section)
+  (magit-confirm 'discard "Discard region")
+  (magit-discard-apply section 'magit-apply-region))
+
+(defun magit-discard-hunk (section)
+  (magit-confirm 'discard "Discard hunk")
+  (let ((file (magit-section-parent-value section)))
+    (pcase (cddr (car (magit-file-status file)))
+      ('(?U ?U) (magit-smerge-keep-current))
+      (_ (magit-discard-apply section #'magit-apply-hunk)))))
+
+(defun magit-discard-apply (section apply)
+  (if (eq (magit-diff-type section) 'unstaged)
+      (funcall apply section "--reverse")
+    (if (magit-anything-unstaged-p
+         nil (if (magit-file-section-p section)
+                 (oref section value)
+               (magit-section-parent-value section)))
+        (progn (let ((magit-inhibit-refresh t))
+                 (funcall apply section "--reverse" "--cached")
+                 (funcall apply section "--reverse" "--reject"))
+               (magit-refresh))
+      (funcall apply section "--reverse" "--index"))))
+
+(defun magit-discard-hunks (sections)
+  (magit-confirm 'discard (format "Discard %s hunks from %s"
+                                  (length sections)
+                                  (magit-section-parent-value (car sections))))
+  (magit-discard-apply-n sections #'magit-apply-hunks))
+
+(defun magit-discard-apply-n (sections apply)
+  (let ((section (car sections)))
+    (if (eq (magit-diff-type section) 'unstaged)
+        (funcall apply sections "--reverse")
+      (if (magit-anything-unstaged-p
+           nil (if (magit-file-section-p section)
+                   (oref section value)
+                 (magit-section-parent-value section)))
+          (progn (let ((magit-inhibit-refresh t))
+                   (funcall apply sections "--reverse" "--cached")
+                   (funcall apply sections "--reverse" "--reject"))
+                 (magit-refresh))
+        (funcall apply sections "--reverse" "--index")))))
+
+(defun magit-discard-file (section)
+  (magit-discard-files (list section)))
+
+(defun magit-discard-files (sections)
+  (let ((auto-revert-verbose nil)
+        (type (magit-diff-type (car sections)))
+        (status (magit-file-status))
+        files delete resurrect rename discard discard-new resolve)
+    (dolist (section sections)
+      (let ((file (oref section value)))
+        (push file files)
+        (pcase (cons (pcase type
+                       (`staged ?X)
+                       (`unstaged ?Y)
+                       (`untracked ?Z))
+                     (cddr (assoc file status)))
+          ('(?Z) (dolist (f (magit-untracked-files nil file))
+                   (push f delete)))
+          ((or '(?Z ?? ??) '(?Z ?! ?!)) (push file delete))
+          ('(?Z ?D ? )                  (push file delete))
+          (`(,_ ?D ?D)                  (push file resolve))
+          ((or `(,_ ?U ,_) `(,_ ,_ ?U)) (push file resolve))
+          (`(,_ ?A ?A)                  (push file resolve))
+          (`(?X ?M ,(or ?  ?M ?D)) (push section discard))
+          (`(?Y ,_         ?M    ) (push section discard))
+          ('(?X ?A         ?M    ) (push file discard-new))
+          ('(?X ?C         ?M    ) (push file discard-new))
+          (`(?X ?A ,(or ?     ?D)) (push file delete))
+          (`(?X ?C ,(or ?     ?D)) (push file delete))
+          (`(?X ?D ,(or ?  ?M   )) (push file resurrect))
+          (`(?Y ,_            ?D ) (push file resurrect))
+          (`(?X ?R ,(or ?  ?M ?D)) (push file rename)))))
+    (unwind-protect
+        (let ((magit-inhibit-refresh t))
+          (magit-wip-commit-before-change files " before discard")
+          (when resolve
+            (magit-discard-files--resolve (nreverse resolve)))
+          (when resurrect
+            (magit-discard-files--resurrect (nreverse resurrect)))
+          (when delete
+            (magit-discard-files--delete (nreverse delete) status))
+          (when rename
+            (magit-discard-files--rename (nreverse rename) status))
+          (when (or discard discard-new)
+            (magit-discard-files--discard (nreverse discard)
+                                          (nreverse discard-new)))
+          (magit-wip-commit-after-apply files " after discard"))
+      (magit-refresh))))
+
+(defun magit-discard-files--resolve (files)
+  (if-let ((arg (and (cdr files)
+                     (magit-read-char-case
+                         (format "For these %d files\n%s\ncheckout:\n"
+                                 (length files)
+                                 (mapconcat (lambda (file)
+                                              (concat "  " file))
+                                            files "\n"))
+                         t
+                       (?o "[o]ur stage"   "--ours")
+                       (?t "[t]heir stage" "--theirs")
+                       (?c "[c]onflict"    "--merge")
+                       (?i "decide [i]ndividually" nil)))))
+      (dolist (file files)
+        (magit-checkout-stage file arg))
+    (dolist (file files)
+      (magit-checkout-stage file (magit-checkout-read-stage file)))))
+
+(defun magit-discard-files--resurrect (files)
+  (magit-confirm-files 'resurrect files)
+  (if (eq (magit-diff-type) 'staged)
+      (magit-call-git "reset"  "--" files)
+    (magit-call-git "checkout" "--" files)))
+
+(defun magit-discard-files--delete (files status)
+  (magit-confirm-files (if magit-delete-by-moving-to-trash 'trash 'delete)
+                       files)
+  (let ((delete-by-moving-to-trash magit-delete-by-moving-to-trash))
+    (dolist (file files)
+      (when (string-match-p "\\`\\\\?~" file)
+        (error "Refusing to delete %S, too dangerous" file))
+      (pcase (nth 3 (assoc file status))
+        ((guard (memq (magit-diff-type) '(unstaged untracked)))
+         (dired-delete-file file dired-recursive-deletes
+                            magit-delete-by-moving-to-trash)
+         (dired-clean-up-after-deletion file))
+        (?\s (delete-file file t)
+             (magit-call-git "rm" "--cached" "--" file))
+        (?M  (let ((temp (magit-git-string "checkout-index" "--temp" file)))
+               (string-match
+                (format "\\(.+?\\)\t%s" (regexp-quote file)) temp)
+               (rename-file (match-string 1 temp)
+                            (setq temp (concat file ".~{index}~")))
+               (delete-file temp t))
+             (magit-call-git "rm" "--cached" "--force" "--" file))
+        (?D  (magit-call-git "checkout" "--" file)
+             (delete-file file t)
+             (magit-call-git "rm" "--cached" "--force" "--" file))))))
+
+(defun magit-discard-files--rename (files status)
+  (magit-confirm 'rename "Undo rename %s" "Undo %d renames" nil
+    (mapcar (lambda (file)
+              (setq file (assoc file status))
+              (format "%s -> %s" (cadr file) (car file)))
+            files))
+  (dolist (file files)
+    (let ((orig (cadr (assoc file status))))
+      (if (file-exists-p file)
+          (progn
+            (when-let ((path (file-name-directory orig)))
+              (make-directory path t))
+            (magit-call-git "mv" file orig))
+        (magit-call-git "rm" "--cached" "--" file)
+        (magit-call-git "reset" "--" orig)))))
+
+(defun magit-discard-files--discard (sections new-files)
+  (let ((files (--map (oref it value) sections)))
+    (magit-confirm-files 'discard (append files new-files)
+                         (format "Discard %s changes in" (magit-diff-type)))
+    (if (eq (magit-diff-type (car sections)) 'unstaged)
+        (magit-call-git "checkout" "--" files)
+      (when new-files
+        (magit-call-git "add"   "--" new-files)
+        (magit-call-git "reset" "--" new-files))
+      (let ((binaries (magit-binary-files "--cached")))
+        (when binaries
+          (setq sections
+                (--remove (member (oref it value) binaries)
+                          sections)))
+        (cond ((length= sections 1)
+               (magit-discard-apply (car sections) 'magit-apply-diff))
+              (sections
+               (magit-discard-apply-n sections #'magit-apply-diffs)))
+        (when binaries
+          (let ((modified (magit-unstaged-files t)))
+            (setq binaries (--separate (member it modified) binaries)))
+          (when (cadr binaries)
+            (magit-call-git "reset" "--" (cadr binaries)))
+          (when (car binaries)
+            (user-error
+             (concat
+              "Cannot discard staged changes to binary files, "
+              "which also have unstaged changes.  Unstage instead."))))))))
+
+;;;; Reverse
+
+(defun magit-reverse (&rest args)
+  "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."
+  (interactive (and current-prefix-arg (list "--3way")))
+  (when-let ((s (magit-apply--get-selection)))
+    (pcase (list (magit-diff-type) (magit-diff-scope))
+      (`(untracked ,_) (user-error "Cannot reverse untracked changes"))
+      (`(unstaged  ,_) (user-error "Cannot reverse unstaged changes"))
+      (`(,_    region) (magit-reverse-region s args))
+      (`(,_      hunk) (magit-reverse-hunk   s args))
+      (`(,_     hunks) (magit-reverse-hunks  s args))
+      (`(,_      file) (magit-reverse-file   s args))
+      (`(,_     files) (magit-reverse-files  s args))
+      (`(,_      list) (magit-reverse-files  s args)))))
+
+(defun magit-reverse-region (section args)
+  (magit-confirm 'reverse "Reverse region")
+  (magit-reverse-apply section #'magit-apply-region args))
+
+(defun magit-reverse-hunk (section args)
+  (magit-confirm 'reverse "Reverse hunk")
+  (magit-reverse-apply section #'magit-apply-hunk args))
+
+(defun magit-reverse-hunks (sections args)
+  (magit-confirm 'reverse
+    (format "Reverse %s hunks from %s"
+            (length sections)
+            (magit-section-parent-value (car sections))))
+  (magit-reverse-apply sections #'magit-apply-hunks args))
+
+(defun magit-reverse-file (section args)
+  (magit-reverse-files (list section) args))
+
+(defun magit-reverse-files (sections args)
+  (pcase-let ((`(,binaries ,sections)
+               (let ((bs (magit-binary-files
+                          (cond ((derived-mode-p 'magit-revision-mode)
+                                 magit-buffer-range)
+                                ((derived-mode-p 'magit-diff-mode)
+                                 magit-buffer-range)
+                                (t
+                                 "--cached")))))
+                 (--separate (member (oref it value) bs)
+                             sections))))
+    (magit-confirm-files 'reverse (--map (oref it value) sections))
+    (cond ((length= sections 1)
+           (magit-reverse-apply (car sections) #'magit-apply-diff args))
+          (sections
+           (magit-reverse-apply sections #'magit-apply-diffs args)))
+    (when binaries
+      (user-error "Cannot reverse binary files"))))
+
+(defun magit-reverse-apply (section:s apply args)
+  (funcall apply section:s "--reverse" args
+           (and (not magit-reverse-atomically)
+                (not (member "--3way" args))
+                "--reject")))
+
+(defun magit-reverse-in-index (&rest args)
+  "Reverse the change at point in the index but not the working tree.
+
+Use this command to extract 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:
+
+0. Optionally make sure that there are no uncommitted changes.
+1. Visit the `HEAD' commit and navigate to the change that should
+   not have been included in that commit.
+2. Type \"u\" (`magit-unstage') to reverse it in the index.
+   This assumes that `magit-unstage-committed-changes' is non-nil.
+3. Type \"c e\" to extend `HEAD' with the staged changes,
+   including those that were already staged before.
+4. Optionally stage the remaining changes using \"s\" or \"S\"
+   and then type \"c c\" to create a new commit."
+  (interactive)
+  (magit-reverse (cons "--cached" args)))
+
+;;; Smerge Support
+
+(defun magit-smerge-keep-current ()
+  "Keep the current version of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-current))
+
+(defun magit-smerge-keep-upper ()
+  "Keep the upper/our version of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-upper))
+
+(defun magit-smerge-keep-base ()
+  "Keep the base version of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-base))
+
+(defun magit-smerge-keep-lower ()
+  "Keep the lower/their version of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-lower))
+
+(defun magit-smerge-keep-all ()
+  "Keep all versions of the conflict at point."
+  (interactive)
+  (magit-call-smerge #'smerge-keep-all))
+
+(defun magit-call-smerge (fn)
+  (pcase-let* ((file (magit-file-at-point t t))
+               (keep (get-file-buffer file))
+               (`(,buf ,pos)
+                (let ((magit-diff-visit-jump-to-change nil))
+                  (magit-diff-visit-file--noselect file))))
+    (with-current-buffer buf
+      (save-excursion
+        (save-restriction
+          (unless (<= (point-min) pos (point-max))
+            (widen))
+          (goto-char pos)
+          (condition-case nil
+              (smerge-match-conflict)
+            (error
+             (if (eq fn #'smerge-keep-current)
+                 (when (eq this-command #'magit-discard)
+                   (re-search-forward smerge-begin-re nil t)
+                   (setq fn
+                         (magit-read-char-case "Keep side: " t
+                           (?o "[o]urs/upper"   #'smerge-keep-upper)
+                           (?b "[b]ase"         #'smerge-keep-base)
+                           (?t "[t]heirs/lower" #'smerge-keep-lower))))
+               (re-search-forward smerge-begin-re nil t))))
+          (funcall fn)))
+      (when (and keep (magit-anything-unmerged-p file))
+        (smerge-start-session))
+      (save-buffer))
+    (unless keep
+      (kill-buffer buf))
+    (magit-refresh)))
+
+;;; _
+(provide 'magit-apply)
+;;; magit-apply.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-apply.elc b/emacs/elpa/magit-20240514.1843/magit-apply.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-autoloads.el b/emacs/elpa/magit-20240514.1843/magit-autoloads.el
@@ -0,0 +1,2244 @@
+;;; magit-autoloads.el --- automatically extracted autoloads (do not edit)   -*- lexical-binding: t -*-
+;; Generated by the `loaddefs-generate' function.
+
+;; This file is part of GNU Emacs.
+
+;;; Code:
+
+(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path)))
+
+
+
+;;; Generated autoloads from git-rebase.el
+
+(autoload 'git-rebase-current-line "git-rebase" "\
+Parse current line into a `git-rebase-action' instance.
+If the current line isn't recognized as a rebase line, an
+instance with all nil values is returned.")
+(autoload 'git-rebase-mode "git-rebase" "\
+Major mode for editing of a Git rebase file.
+
+Rebase files are generated when you run \"git rebase -i\" or run
+`magit-interactive-rebase'.  They describe how Git should perform
+the rebase.  See the documentation for git-rebase (e.g., by
+running \"man git-rebase\" at the command line) for details.
+
+(fn)" t)
+(defconst git-rebase-filename-regexp "/git-rebase-todo\\'")
+(add-to-list 'auto-mode-alist (cons git-rebase-filename-regexp #'git-rebase-mode))
+(register-definition-prefixes "git-rebase" '("git-rebase-" "magit-imenu--rebase-"))
+
+
+;;; Generated autoloads from magit.el
+
+(defvar 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.")
+(custom-autoload 'magit-define-global-key-bindings "magit" t)
+(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))))) (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))
+ (autoload 'magit-dispatch "magit" nil t)
+ (autoload 'magit-run "magit" nil t)
+(autoload 'magit-git-command "magit" "\
+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'.
+
+(fn COMMAND)" t)
+(autoload 'magit-git-command-topdir "magit" "\
+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.
+
+(fn COMMAND)" t)
+(autoload 'magit-shell-command "magit" "\
+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'.
+
+(fn COMMAND)" t)
+(autoload 'magit-shell-command-topdir "magit" "\
+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.
+
+(fn COMMAND)" t)
+(autoload 'magit-version "magit" "\
+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.
+
+(fn &optional PRINT-DEST)" t)
+(register-definition-prefixes "magit" '("magit-"))
+
+
+;;; Generated autoloads from magit-apply.el
+
+(autoload 'magit-stage-buffer-file "magit-apply" "\
+Stage all changes to the file being visited in the current buffer." t)
+(autoload 'magit-stage-file "magit-apply" "\
+Read one or more files and stage all changes in those files.
+With prefix argument FORCE, offer ignored files for completion.
+
+(fn FILES &optional FORCE)" t)
+(autoload 'magit-stage-modified "magit-apply" "\
+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.
+
+(fn &optional ALL)" t)
+(autoload 'magit-unstage-buffer-file "magit-apply" "\
+Unstage all changes to the file being visited in the current buffer." t)
+(autoload 'magit-unstage-file "magit-apply" "\
+Read one or more files and unstage all changes to those files.
+
+(fn FILES)" t)
+(autoload 'magit-unstage-all "magit-apply" "\
+Remove all changes from the staging area." t)
+(register-definition-prefixes "magit-apply" '("magit-"))
+
+
+;;; Generated autoloads from magit-autorevert.el
+
+(put 'magit-auto-revert-mode 'globalized-minor-mode t)
+(defvar magit-auto-revert-mode (not (or global-auto-revert-mode noninteractive)) "\
+Non-nil if Magit-Auto-Revert mode is enabled.
+See the `magit-auto-revert-mode' command
+for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `magit-auto-revert-mode'.")
+(custom-autoload 'magit-auto-revert-mode "magit-autorevert" nil)
+(autoload 'magit-auto-revert-mode "magit-autorevert" "\
+Toggle Auto-Revert mode in all buffers.
+With prefix ARG, enable Magit-Auto-Revert mode if ARG is positive; otherwise,
+disable it.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.
+Enable the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+Auto-Revert mode is enabled in all buffers where
+`magit-turn-on-auto-revert-mode-if-desired' would do it.
+
+See `auto-revert-mode' for more information on Auto-Revert mode.
+
+(fn &optional ARG)" t)
+(register-definition-prefixes "magit-autorevert" '("auto-revert-buffer" "magit-"))
+
+
+;;; Generated autoloads from magit-base.el
+
+(autoload 'magit-emacs-Q-command "magit-base" "\
+Show a shell command that runs an uncustomized Emacs with only Magit loaded.
+See info node `(magit)Debugging Tools' for more information." t)
+(autoload 'Info-follow-nearest-node--magit-gitman "magit-base" "\
+
+
+(fn FN &optional FORK)")
+(advice-add 'Info-follow-nearest-node :around #'Info-follow-nearest-node--magit-gitman)
+(advice-add 'org-man-export :around #'org-man-export--magit-gitman)
+(autoload 'org-man-export--magit-gitman "magit-base" "\
+
+
+(fn FN LINK DESCRIPTION FORMAT)")
+(register-definition-prefixes "magit-base" '("magit-"))
+
+
+;;; Generated autoloads from magit-bisect.el
+
+ (autoload 'magit-bisect "magit-bisect" nil t)
+(autoload 'magit-bisect-start "magit-bisect" "\
+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 and a known bad commit.  To move the session forward use the
+other actions from the bisect transient command (\\<magit-status-mode-map>\\[magit-bisect]).
+
+(fn BAD GOOD ARGS)" t)
+(autoload 'magit-bisect-reset "magit-bisect" "\
+After bisecting, cleanup bisection state and return to original `HEAD'." t)
+(autoload 'magit-bisect-good "magit-bisect" "\
+While bisecting, mark the current commit as good.
+Use this after you have asserted that the commit does not contain
+the bug in question." t)
+(autoload 'magit-bisect-bad "magit-bisect" "\
+While bisecting, mark the current commit as bad.
+Use this after you have asserted that the commit does contain the
+bug in question." t)
+(autoload 'magit-bisect-mark "magit-bisect" "\
+While bisecting, mark the current commit with a bisect term.
+During a bisect using alternate terms, commits can still be
+marked with `magit-bisect-good' and `magit-bisect-bad', as those
+commands map to the correct term (\"good\" to --term-old's value
+and \"bad\" to --term-new's).  However, in some cases, it can be
+difficult to keep that mapping straight in your head; this
+command provides an interface that exposes the underlying terms." t)
+(autoload 'magit-bisect-skip "magit-bisect" "\
+While bisecting, 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." t)
+(autoload 'magit-bisect-run "magit-bisect" "\
+Bisect automatically by running commands after each step.
+
+Unlike `git bisect run' this can be used before bisecting has
+begun.  In that case it behaves like `git bisect start; git
+bisect run'.
+
+(fn CMDLINE &optional BAD GOOD ARGS)" t)
+(register-definition-prefixes "magit-bisect" '("magit-"))
+
+
+;;; Generated autoloads from magit-blame.el
+
+ (autoload 'magit-blame-echo "magit-blame" nil t)
+ (autoload 'magit-blame-addition "magit-blame" nil t)
+ (autoload 'magit-blame-removal "magit-blame" nil t)
+ (autoload 'magit-blame-reverse "magit-blame" nil t)
+ (autoload 'magit-blame "magit-blame" nil t)
+(register-definition-prefixes "magit-blame" '("magit-"))
+
+
+;;; Generated autoloads from magit-branch.el
+
+ (autoload 'magit-branch "magit" nil t)
+(autoload 'magit-checkout "magit-branch" "\
+Checkout REVISION, updating the index and the working tree.
+If 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.
+
+(git checkout REVISION).
+
+(fn REVISION &optional ARGS)" t)
+(function-put 'magit-checkout 'interactive-only 'magit--checkout)
+(autoload 'magit-branch-create "magit-branch" "\
+Create BRANCH at branch or revision START-POINT.
+
+(fn BRANCH START-POINT)" t)
+(function-put 'magit-branch-create 'interactive-only 'magit-call-git)
+(autoload 'magit-branch-and-checkout "magit-branch" "\
+Create and checkout BRANCH at branch or revision START-POINT.
+
+(fn BRANCH START-POINT &optional ARGS)" t)
+(function-put 'magit-branch-and-checkout 'interactive-only 'magit-call-git)
+(autoload 'magit-branch-or-checkout "magit-branch" "\
+Hybrid between `magit-checkout' and `magit-branch-and-checkout'.
+
+Ask the user for an existing branch or revision.  If the user
+input actually can be resolved as a branch or revision, then
+check that out, just like `magit-checkout' would.
+
+Otherwise create and checkout a new branch using the input as
+its name.  Before doing so read the starting-point for the new
+branch.  This is similar to what `magit-branch-and-checkout'
+does.
+
+(fn ARG &optional START-POINT)" t)
+(function-put 'magit-branch-or-checkout 'interactive-only 'magit-call-git)
+(autoload 'magit-branch-checkout "magit-branch" "\
+Checkout an existing or new local branch.
+
+Read a branch name from the user offering all local branches and
+a subset of remote branches as candidates.  Omit remote branches
+for which a local branch by the same name exists from the list
+of candidates.  The user can also enter a completely new branch
+name.
+
+- If the user selects an existing local branch, then check that
+  out.
+
+- If the user selects a remote branch, then create and checkout
+  a new local branch with the same name.  Configure the selected
+  remote branch as push target.
+
+- If the user enters a new branch name, then create and check
+  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 START-POINT or something else depends on the
+value of `magit-branch-adjust-remote-upstream-alist', just like
+when using `magit-branch-and-checkout'.
+
+(fn BRANCH &optional START-POINT)" t)
+(function-put 'magit-branch-checkout 'interactive-only 'magit-call-git)
+(autoload 'magit-branch-orphan "magit-branch" "\
+Create and checkout an orphan BRANCH with contents from revision START-POINT.
+
+(fn BRANCH START-POINT)" t)
+(autoload 'magit-branch-spinout "magit-branch" "\
+Create new branch from the unpushed commits.
+Like `magit-branch-spinoff' but remain on the current branch.
+If there are any uncommitted changes, then behave exactly like
+`magit-branch-spinoff'.
+
+(fn BRANCH &optional FROM)" t)
+(autoload 'magit-branch-spinoff "magit-branch" "\
+Create new branch from the unpushed commits.
+
+Create and checkout 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
+began 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.
+
+(fn BRANCH &optional FROM)" t)
+(autoload 'magit-branch-reset "magit-branch" "\
+Reset a branch to the tip of another branch or any other commit.
+
+When the branch being reset is the current branch, then do a
+hard reset.  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 also set the target branch as the upstream of the branch
+that is being reset.
+
+(fn BRANCH TO &optional SET-UPSTREAM)" t)
+(autoload 'magit-branch-delete "magit-branch" "\
+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.
+
+(fn BRANCHES &optional FORCE)" t)
+(autoload 'magit-branch-rename "magit-branch" "\
+Rename the branch named OLD to NEW.
+
+With a prefix argument FORCE, rename even if a branch named NEW
+already exists.
+
+If `branch.OLD.pushRemote' is set, then unset it.  Depending on
+the value of `magit-branch-rename-push-target' (which see) maybe
+set `branch.NEW.pushRemote' and maybe rename the push-target on
+the remote.
+
+(fn OLD NEW &optional FORCE)" t)
+(autoload 'magit-branch-shelve "magit-branch" "\
+Shelve a BRANCH.
+Rename \"refs/heads/BRANCH\" to \"refs/shelved/BRANCH\",
+and also rename the respective reflog file.
+
+(fn BRANCH)" t)
+(autoload 'magit-branch-unshelve "magit-branch" "\
+Unshelve a BRANCH
+Rename \"refs/shelved/BRANCH\" to \"refs/heads/BRANCH\",
+and also rename the respective reflog file.
+
+(fn BRANCH)" t)
+ (autoload 'magit-branch-configure "magit-branch" nil t)
+(register-definition-prefixes "magit-branch" '("magit-"))
+
+
+;;; Generated autoloads from magit-bundle.el
+
+ (autoload 'magit-bundle "magit-bundle" nil t)
+ (autoload 'magit-bundle-import "magit-bundle" nil t)
+(autoload 'magit-bundle-create-tracked "magit-bundle" "\
+Create and track a new bundle.
+
+(fn FILE TAG BRANCH REFS ARGS)" t)
+(autoload 'magit-bundle-update-tracked "magit-bundle" "\
+Update a bundle that is being tracked using TAG.
+
+(fn TAG)" t)
+(autoload 'magit-bundle-verify "magit-bundle" "\
+Check whether FILE is valid and applies to the current repository.
+
+(fn FILE)" t)
+(autoload 'magit-bundle-list-heads "magit-bundle" "\
+List the refs in FILE.
+
+(fn FILE)" t)
+(register-definition-prefixes "magit-bundle" '("magit-"))
+
+
+;;; Generated autoloads from magit-clone.el
+
+ (autoload 'magit-clone "magit-clone" nil t)
+(autoload 'magit-clone-regular "magit-clone" "\
+Create a clone of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+
+(fn REPOSITORY DIRECTORY ARGS)" t)
+(autoload 'magit-clone-shallow "magit-clone" "\
+Create a shallow clone of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+With a prefix argument read the DEPTH of the clone;
+otherwise use 1.
+
+(fn REPOSITORY DIRECTORY ARGS DEPTH)" t)
+(autoload 'magit-clone-shallow-since "magit-clone" "\
+Create a shallow clone of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+Exclude commits before DATE, which is read from the
+user.
+
+(fn REPOSITORY DIRECTORY ARGS DATE)" t)
+(autoload 'magit-clone-shallow-exclude "magit-clone" "\
+Create a shallow clone of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+Exclude commits reachable from EXCLUDE, which is a
+branch or tag read from the user.
+
+(fn REPOSITORY DIRECTORY ARGS EXCLUDE)" t)
+(autoload 'magit-clone-bare "magit-clone" "\
+Create a bare clone of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+
+(fn REPOSITORY DIRECTORY ARGS)" t)
+(autoload 'magit-clone-mirror "magit-clone" "\
+Create a mirror of REPOSITORY in DIRECTORY.
+Then show the status buffer for the new repository.
+
+(fn REPOSITORY DIRECTORY ARGS)" t)
+(autoload 'magit-clone-sparse "magit-clone" "\
+Clone REPOSITORY into DIRECTORY and create a sparse checkout.
+
+(fn REPOSITORY DIRECTORY ARGS)" t)
+(register-definition-prefixes "magit-clone" '("magit-"))
+
+
+;;; Generated autoloads from magit-commit.el
+
+ (autoload 'magit-commit "magit-commit" nil t)
+(autoload 'magit-commit-create "magit-commit" "\
+Create a new commit on `HEAD'.
+With a prefix argument, amend to the commit at `HEAD' instead.
+
+(git commit [--amend] ARGS)
+
+(fn &optional ARGS)" t)
+(autoload 'magit-commit-amend "magit-commit" "\
+Amend the last commit.
+
+(git commit --amend ARGS)
+
+(fn &optional ARGS)" t)
+(autoload 'magit-commit-extend "magit-commit" "\
+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.
+
+(git commit --amend --no-edit)
+
+(fn &optional ARGS OVERRIDE-DATE)" t)
+(autoload 'magit-commit-reword "magit-commit" "\
+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.
+
+(git commit --amend --only)
+
+(fn &optional ARGS OVERRIDE-DATE)" t)
+(autoload 'magit-commit-fixup "magit-commit" "\
+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'.
+
+(fn &optional COMMIT ARGS)" t)
+(autoload 'magit-commit-squash "magit-commit" "\
+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'.
+
+If you want to immediately add a message to the squash commit,
+then use `magit-commit-augment' instead of this command.
+
+(fn &optional COMMIT ARGS)" t)
+(autoload 'magit-commit-augment "magit-commit" "\
+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'.
+
+(fn &optional COMMIT ARGS)" t)
+(autoload 'magit-commit-instant-fixup "magit-commit" "\
+Create a fixup commit targeting COMMIT and instantly rebase.
+
+(fn &optional COMMIT ARGS)" t)
+(autoload 'magit-commit-instant-squash "magit-commit" "\
+Create a squash commit targeting COMMIT and instantly rebase.
+
+(fn &optional COMMIT ARGS)" t)
+(autoload 'magit-commit-reshelve "magit-commit" "\
+Change the committer date and possibly the author date of `HEAD'.
+
+The current time is used as the initial minibuffer input and the
+original author or committer date is available as the previous
+history element.
+
+Both the author and the committer dates are changed, unless one
+of the following is true, in which case only the committer date
+is updated:
+- You are not the author of the commit that is being reshelved.
+- The command was invoked with a prefix argument.
+- Non-interactively if UPDATE-AUTHOR is nil.
+
+(fn DATE UPDATE-AUTHOR &optional ARGS)" t)
+(autoload 'magit-commit-absorb-modules "magit-commit" "\
+Spread modified modules across recent commits.
+
+(fn PHASE COMMIT)" t)
+ (autoload 'magit-commit-absorb "magit-commit" nil t)
+ (autoload 'magit-commit-autofixup "magit-commit" nil t)
+(register-definition-prefixes "magit-commit" '("magit-"))
+
+
+;;; Generated autoloads from magit-diff.el
+
+ (autoload 'magit-diff "magit-diff" nil t)
+ (autoload 'magit-diff-refresh "magit-diff" nil t)
+(autoload 'magit-diff-dwim "magit-diff" "\
+Show changes for the thing at point.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-diff-range "magit-diff" "\
+Show differences between two commits.
+
+REV-OR-RANGE should be a range or a single revision.  If it is a
+revision, then show changes in the working tree relative to that
+revision.  If it is a range, but one side is omitted, then show
+changes relative to `HEAD'.
+
+If the region is active, use the revisions on the first and last
+line of the region as the two sides of the range.  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).
+
+(fn REV-OR-RANGE &optional ARGS FILES)" t)
+(autoload 'magit-diff-working-tree "magit-diff" "\
+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.
+
+(fn &optional REV ARGS FILES)" t)
+(autoload 'magit-diff-staged "magit-diff" "\
+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.
+
+(fn &optional REV ARGS FILES)" t)
+(autoload 'magit-diff-unstaged "magit-diff" "\
+Show changes between the working tree and the index.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-diff-unmerged "magit-diff" "\
+Show changes that are being merged.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-diff-while-committing "magit-diff" "\
+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." t)
+(autoload 'magit-diff-buffer-file "magit-diff" "\
+Show diff for the blob or file visited in the current buffer.
+
+When the buffer visits a blob, then show the respective commit.
+When the buffer visits a file, then show the differences between
+`HEAD' and the working tree.  In both cases limit the diff to
+the file or blob." t)
+(autoload 'magit-diff-paths "magit-diff" "\
+Show changes between any two files on disk.
+
+(fn A B)" t)
+(autoload 'magit-show-commit "magit-diff" "\
+Visit the revision at point in another buffer.
+If there is no revision at point or with a prefix argument prompt
+for a revision.
+
+(fn REV &optional ARGS FILES MODULE)" t)
+(register-definition-prefixes "magit-diff" '("magit-"))
+
+
+;;; Generated autoloads from magit-ediff.el
+
+ (autoload 'magit-ediff "magit-ediff" nil)
+(autoload 'magit-ediff-resolve-all "magit-ediff" "\
+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 prompt for a file.
+
+See info node `(magit) Ediffing' for more information about this
+and alternative commands.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-resolve-rest "magit-ediff" "\
+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 prompt for a file.
+
+See info node `(magit) Ediffing' for more information about this
+and alternative commands.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-stage "magit-ediff" "\
+Stage and unstage changes to FILE using Ediff.
+FILE has to be relative to the top directory of the repository.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-compare "magit-ediff" "\
+Compare REVA:FILEA with REVB:FILEB using Ediff.
+
+FILEA and FILEB have to be relative to the top directory of the
+repository.  If REVA or REVB is nil, then this stands for the
+working tree state.
+
+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).
+
+(fn REVA REVB FILEA FILEB)" t)
+(autoload 'magit-ediff-dwim "magit-ediff" "\
+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 or 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." t)
+(autoload 'magit-ediff-show-staged "magit-ediff" "\
+Show staged changes using Ediff.
+
+This only allows looking at the changes; to stage, unstage,
+and discard changes using Ediff, use `magit-ediff-stage'.
+
+FILE must be relative to the top directory of the repository.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-show-unstaged "magit-ediff" "\
+Show unstaged changes using Ediff.
+
+This only allows looking at the changes; to stage, unstage,
+and discard changes using Ediff, use `magit-ediff-stage'.
+
+FILE must be relative to the top directory of the repository.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-show-working-tree "magit-ediff" "\
+Show changes between `HEAD' and working tree using Ediff.
+FILE must be relative to the top directory of the repository.
+
+(fn FILE)" t)
+(autoload 'magit-ediff-show-commit "magit-ediff" "\
+Show changes introduced by COMMIT using Ediff.
+
+(fn COMMIT)" t)
+(autoload 'magit-ediff-show-stash "magit-ediff" "\
+Show changes introduced by STASH using Ediff.
+`magit-ediff-show-stash-with-index' controls whether a
+three-buffer Ediff is used in order to distinguish changes in the
+stash that were staged.
+
+(fn STASH)" t)
+(register-definition-prefixes "magit-ediff" '("magit-ediff-"))
+
+
+;;; Generated autoloads from magit-extras.el
+
+ (autoload 'magit-git-mergetool "magit-extras" nil t)
+(autoload 'magit-run-git-gui-blame "magit-extras" "\
+Run `git gui blame' on the given FILENAME and COMMIT.
+Interactively run it for the current file and the `HEAD', with a
+prefix or when the current file cannot be determined let the user
+choose.  When the current buffer is visiting FILENAME instruct
+blame to center around the line point is on.
+
+(fn COMMIT FILENAME &optional LINENUM)" t)
+(autoload 'magit-run-git-gui "magit-extras" "\
+Run `git gui' for the current git repository." t)
+(autoload 'magit-run-gitk "magit-extras" "\
+Run `gitk' in the current repository." t)
+(autoload 'magit-run-gitk-branches "magit-extras" "\
+Run `gitk --branches' in the current repository." t)
+(autoload 'magit-run-gitk-all "magit-extras" "\
+Run `gitk --all' in the current repository." t)
+(autoload 'ido-enter-magit-status "magit-extras" "\
+Drop into `magit-status' from file switching.
+
+To make this command available use something like:
+
+  (keymap-set ido-common-completion-map
+              \"C-x g\" \\='ido-enter-magit-status)
+
+This command does not work in Emacs 26.1.
+See https://github.com/magit/magit/issues/3634
+and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707." t)
+(autoload 'magit-project-status "magit-extras" "\
+Run `magit-status' in the current project's root." t)
+(autoload 'magit-dired-jump "magit-extras" "\
+Visit file at point using Dired.
+With a prefix argument, visit in another window.  If there
+is no file at point, then instead visit `default-directory'.
+
+(fn &optional OTHER-WINDOW)" t)
+(autoload 'magit-dired-log "magit-extras" "\
+Show log for all marked files, or the current file.
+
+(fn &optional FOLLOW)" t)
+(autoload 'magit-dired-am-apply-patches "magit-extras" "\
+In Dired, apply the marked (or next ARG) files as patches.
+If inside a repository, then apply in that.  Otherwise prompt
+for a repository.
+
+(fn REPO &optional ARG)" t)
+(autoload 'magit-do-async-shell-command "magit-extras" "\
+Open FILE with `dired-do-async-shell-command'.
+Interactively, open the file at point.
+
+(fn FILE)" t)
+(autoload 'magit-previous-line "magit-extras" "\
+Like `previous-line' but with Magit-specific shift-selection.
+
+Magit's selection mechanism is based on the region but selects an
+area that is larger than the region.  This causes `previous-line'
+when invoked while holding the shift key to move up one line and
+thereby select two lines.  When invoked inside a hunk body this
+command does not move point on the first invocation and thereby
+it only selects a single line.  Which inconsistency you prefer
+is a matter of preference.
+
+(fn &optional ARG TRY-VSCROLL)" t)
+(function-put 'magit-previous-line 'interactive-only '"use `forward-line' with negative argument instead.")
+(autoload 'magit-next-line "magit-extras" "\
+Like `next-line' but with Magit-specific shift-selection.
+
+Magit's selection mechanism is based on the region but selects
+an area that is larger than the region.  This causes `next-line'
+when invoked while holding the shift key to move down one line
+and thereby select two lines.  When invoked inside a hunk body
+this command does not move point on the first invocation and
+thereby it only selects a single line.  Which inconsistency you
+prefer is a matter of preference.
+
+(fn &optional ARG TRY-VSCROLL)" t)
+(function-put 'magit-next-line 'interactive-only 'forward-line)
+(autoload 'magit-clean "magit-extras" "\
+Remove untracked files from the working tree.
+With a prefix argument also remove ignored files,
+with two prefix arguments remove ignored files only.
+
+(git clean -f -d [-x|-X])
+
+(fn &optional ARG)" t)
+(autoload 'magit-generate-changelog "magit-extras" "\
+Insert ChangeLog entries into the current buffer.
+
+The entries are generated from the diff being committed.
+If prefix argument, AMENDING, is non-nil, include changes
+in HEAD as well as staged changes in the diff to check.
+
+(fn &optional AMENDING)" t)
+(autoload 'magit-add-change-log-entry "magit-extras" "\
+Find change log file and add date entry and item for current change.
+This differs from `add-change-log-entry' (which see) in that
+it acts on the current hunk in a Magit buffer instead of on
+a position in a file-visiting buffer.
+
+(fn &optional WHOAMI FILE-NAME OTHER-WINDOW)" t)
+(autoload 'magit-add-change-log-entry-other-window "magit-extras" "\
+Find change log file in other window and add entry and item.
+This differs from `add-change-log-entry-other-window' (which see)
+in that it acts on the current hunk in a Magit buffer instead of
+on a position in a file-visiting buffer.
+
+(fn &optional WHOAMI FILE-NAME)" t)
+(autoload 'magit-edit-line-commit "magit-extras" "\
+Edit the commit that added the current line.
+
+With a prefix argument edit the commit 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.
+
+(fn &optional TYPE)" t)
+(autoload 'magit-diff-edit-hunk-commit "magit-extras" "\
+From a hunk, edit the respective commit and visit the file.
+
+First visit 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 invoke `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.
+
+(fn FILE)" t)
+(autoload 'magit-reshelve-since "magit-extras" "\
+Change the author and committer dates of the commits since REV.
+
+Ask the user for the first reachable commit whose dates should
+be changed.  Then read the new date for that commit.  The initial
+minibuffer input and the previous history element offer good
+values.  The next commit will be created one minute later and so
+on.
+
+This command is only intended for interactive use and should only
+be used on highly rearranged and unpublished history.
+
+If KEYID is non-nil, then use that to sign all reshelved commits.
+Interactively use the value of the \"--gpg-sign\" option in the
+list returned by `magit-rebase-arguments'.
+
+(fn REV KEYID)" t)
+(autoload 'magit-pop-revision-stack "magit-extras" "\
+Insert a representation of a revision into the current buffer.
+
+Pop a revision from the `magit-revision-stack' and insert 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, instead read 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.
+
+(fn REV TOPLEVEL)" t)
+(autoload 'magit-copy-section-value "magit-extras" "\
+Save the value of the current section for later use.
+
+Save the section value to the `kill-ring', and, provided that
+the current section is a commit, branch, or tag section, push
+the (referenced) revision to the `magit-revision-stack' for use
+with `magit-pop-revision-stack'.
+
+When `magit-copy-revision-abbreviated' is non-nil, save the
+abbreviated revision to the `kill-ring' and the
+`magit-revision-stack'.
+
+When the current section is a branch or a tag, and a prefix
+argument is used, then save the revision at its tip to the
+`kill-ring' instead of the reference name.
+
+When the region is active, then save 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 strip the diff marker column and keep only either
+the added or removed lines, depending on the sign of the prefix
+argument.
+
+(fn ARG)" t)
+(autoload 'magit-copy-buffer-revision "magit-extras" "\
+Save the revision of the current buffer for later use.
+
+Save the revision shown in the current buffer to the `kill-ring'
+and push it to the `magit-revision-stack'.
+
+This command 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.
+
+In such buffers it is often more useful to save the value of
+the current section instead, using `magit-copy-section-value'.
+
+When the region is active, then save that to the `kill-ring',
+like `kill-ring-save' would, instead of behaving as described
+above.
+
+When `magit-copy-revision-abbreviated' is non-nil, save the
+abbreviated revision to the `kill-ring' and the
+`magit-revision-stack'." t)
+(autoload 'magit-display-repository-buffer "magit-extras" "\
+Display a Magit buffer belonging to the current Git repository.
+The buffer is displayed using `magit-display-buffer', which see.
+
+(fn BUFFER)" t)
+(autoload 'magit-switch-to-repository-buffer "magit-extras" "\
+Switch to a Magit buffer belonging to the current Git repository.
+
+(fn BUFFER)" t)
+(autoload 'magit-switch-to-repository-buffer-other-window "magit-extras" "\
+Switch to a Magit buffer belonging to the current Git repository.
+
+(fn BUFFER)" t)
+(autoload 'magit-switch-to-repository-buffer-other-frame "magit-extras" "\
+Switch to a Magit buffer belonging to the current Git repository.
+
+(fn BUFFER)" t)
+(autoload 'magit-abort-dwim "magit-extras" "\
+Abort current operation.
+Depending on the context, this will abort a merge, a rebase, a
+patch application, a cherry-pick, a revert, or a bisect." t)
+(register-definition-prefixes "magit-extras" '("magit-"))
+
+
+;;; Generated autoloads from magit-fetch.el
+
+ (autoload 'magit-fetch "magit-fetch" nil t)
+ (autoload 'magit-fetch-from-pushremote "magit-fetch" nil t)
+ (autoload 'magit-fetch-from-upstream "magit-fetch" nil t)
+(autoload 'magit-fetch-other "magit-fetch" "\
+Fetch from another repository.
+
+(fn REMOTE ARGS)" t)
+(autoload 'magit-fetch-branch "magit-fetch" "\
+Fetch a BRANCH from a REMOTE.
+
+(fn REMOTE BRANCH ARGS)" t)
+(autoload 'magit-fetch-refspec "magit-fetch" "\
+Fetch a REFSPEC from a REMOTE.
+
+(fn REMOTE REFSPEC ARGS)" t)
+(autoload 'magit-fetch-all "magit-fetch" "\
+Fetch from all remotes.
+
+(fn ARGS)" t)
+(autoload 'magit-fetch-all-prune "magit-fetch" "\
+Fetch from all remotes, and prune.
+Prune remote tracking branches for branches that have been
+removed on the respective remote." t)
+(autoload 'magit-fetch-all-no-prune "magit-fetch" "\
+Fetch from all remotes." t)
+ (autoload 'magit-fetch-modules "magit-fetch" nil t)
+(register-definition-prefixes "magit-fetch" '("magit-"))
+
+
+;;; Generated autoloads from magit-files.el
+
+(autoload 'magit-find-file "magit-files" "\
+View FILE from REV.
+Switch to a buffer visiting blob REV:FILE, creating one if none
+already exists.  If prior to calling this command the current
+buffer and/or cursor position is about the same file, then go
+to the line and column corresponding to that location.
+
+(fn REV FILE)" t)
+(autoload 'magit-find-file-other-window "magit-files" "\
+View FILE from REV, in another window.
+Switch to a buffer visiting blob REV:FILE, creating one if none
+already exists.  If prior to calling this command the current
+buffer and/or cursor position is about the same file, then go to
+the line and column corresponding to that location.
+
+(fn REV FILE)" t)
+(autoload 'magit-find-file-other-frame "magit-files" "\
+View FILE from REV, in another frame.
+Switch to a buffer visiting blob REV:FILE, creating one if none
+already exists.  If prior to calling this command the current
+buffer and/or cursor position is about the same file, then go to
+the line and column corresponding to that location.
+
+(fn REV FILE)" t)
+ (autoload 'magit-file-dispatch "magit" nil t)
+(autoload 'magit-blob-visit-file "magit-files" "\
+View the file from the worktree corresponding to the current blob.
+When visiting a blob or the version from the index, then go to
+the same location in the respective file in the working tree." t)
+(autoload 'magit-file-checkout "magit-files" "\
+Checkout FILE from REV.
+
+(fn REV FILE)" t)
+(register-definition-prefixes "magit-files" '("magit-"))
+
+
+;;; Generated autoloads from magit-git.el
+
+(register-definition-prefixes "magit-git" '("magit-"))
+
+
+;;; Generated autoloads from magit-gitignore.el
+
+ (autoload 'magit-gitignore "magit-gitignore" nil t)
+(autoload 'magit-gitignore-in-topdir "magit-gitignore" "\
+Add the Git ignore RULE to the top-level \".gitignore\" file.
+Since this file is tracked, it is shared with other clones of the
+repository.  Also stage the file.
+
+(fn RULE)" t)
+(autoload 'magit-gitignore-in-subdir "magit-gitignore" "\
+Add the Git ignore RULE to a \".gitignore\" file in DIRECTORY.
+Prompt the user for a directory and add the rule to the
+\".gitignore\" file in that directory.  Since such files are
+tracked, they are shared with other clones of the repository.
+Also stage the file.
+
+(fn RULE DIRECTORY)" t)
+(autoload 'magit-gitignore-in-gitdir "magit-gitignore" "\
+Add the Git ignore RULE to \"$GIT_DIR/info/exclude\".
+Rules in that file only affects this clone of the repository.
+
+(fn RULE)" t)
+(autoload 'magit-gitignore-on-system "magit-gitignore" "\
+Add the Git ignore RULE to the file specified by `core.excludesFile'.
+Rules that are defined in that file affect all local repositories.
+
+(fn RULE)" t)
+(autoload 'magit-skip-worktree "magit-gitignore" "\
+Call \"git update-index --skip-worktree -- FILE\".
+
+(fn FILE)" t)
+(autoload 'magit-no-skip-worktree "magit-gitignore" "\
+Call \"git update-index --no-skip-worktree -- FILE\".
+
+(fn FILE)" t)
+(autoload 'magit-assume-unchanged "magit-gitignore" "\
+Call \"git update-index --assume-unchanged -- FILE\".
+
+(fn FILE)" t)
+(autoload 'magit-no-assume-unchanged "magit-gitignore" "\
+Call \"git update-index --no-assume-unchanged -- FILE\".
+
+(fn FILE)" t)
+(register-definition-prefixes "magit-gitignore" '("magit-"))
+
+
+;;; Generated autoloads from magit-log.el
+
+ (autoload 'magit-log "magit-log" nil t)
+ (autoload 'magit-log-refresh "magit-log" nil t)
+(autoload 'magit-log-current "magit-log" "\
+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.
+
+(fn REVS &optional ARGS FILES)" t)
+(autoload 'magit-log-head "magit-log" "\
+Show log for `HEAD'.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-log-related "magit-log" "\
+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.
+
+(fn REVS &optional ARGS FILES)" t)
+(autoload 'magit-log-other "magit-log" "\
+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 and tags, and a
+representation of the commit at point, are available as
+completion candidates.
+
+(fn REVS &optional ARGS FILES)" t)
+(autoload 'magit-log-branches "magit-log" "\
+Show log for all local branches and `HEAD'.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-log-matching-branches "magit-log" "\
+Show log for all branches matching PATTERN and `HEAD'.
+
+(fn PATTERN &optional ARGS FILES)" t)
+(autoload 'magit-log-matching-tags "magit-log" "\
+Show log for all tags matching PATTERN and `HEAD'.
+
+(fn PATTERN &optional ARGS FILES)" t)
+(autoload 'magit-log-all-branches "magit-log" "\
+Show log for all local and remote branches and `HEAD'.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-log-all "magit-log" "\
+Show log for all references and `HEAD'.
+
+(fn &optional ARGS FILES)" t)
+(autoload 'magit-log-buffer-file "magit-log" "\
+Show log for the blob or file visited in the current buffer.
+With a prefix argument or when `--follow' is an active log
+argument, then follow renames.  When the region is active,
+restrict the log to the lines that the region touches.
+
+(fn &optional FOLLOW BEG END)" t)
+(autoload 'magit-log-trace-definition "magit-log" "\
+Show log for the definition at point.
+
+(fn FILE FN REV)" t)
+(autoload 'magit-log-merged "magit-log" "\
+Show log for the merge of COMMIT into BRANCH.
+
+More precisely, find merge commit M that brought COMMIT into
+BRANCH, and show the log of the range \"M^1..M\". If COMMIT is
+directly on BRANCH, then show approximately
+`magit-log-merged-commit-count' surrounding commits instead.
+
+This command requires git-when-merged, which is available from
+https://github.com/mhagger/git-when-merged.
+
+(fn COMMIT BRANCH &optional ARGS FILES)" t)
+(autoload 'magit-log-move-to-parent "magit-log" "\
+Move to the Nth parent of the current commit.
+
+(fn &optional N)" t)
+ (autoload 'magit-shortlog "magit-log" nil t)
+(autoload 'magit-shortlog-since "magit-log" "\
+Show a history summary for commits since REV.
+
+(fn REV ARGS)" t)
+(autoload 'magit-shortlog-range "magit-log" "\
+Show a history summary for commit or range REV-OR-RANGE.
+
+(fn REV-OR-RANGE ARGS)" t)
+(autoload 'magit-cherry "magit-log" "\
+Show commits in a branch that are not merged in the upstream branch.
+
+(fn HEAD UPSTREAM)" t)
+(register-definition-prefixes "magit-log" '("magit-"))
+
+
+;;; Generated autoloads from magit-margin.el
+
+(register-definition-prefixes "magit-margin" '("magit-"))
+
+
+;;; Generated autoloads from magit-merge.el
+
+ (autoload 'magit-merge "magit" nil t)
+(autoload 'magit-merge-plain "magit-merge" "\
+Merge commit REV into the current branch; using default message.
+
+Unless there are conflicts or a prefix argument is used create a
+merge commit using a generic commit message and without letting
+the user inspect the result.  With a prefix argument pretend the
+merge failed to give the user the opportunity to inspect the
+merge.
+
+(git merge --no-edit|--no-commit [ARGS] REV)
+
+(fn REV &optional ARGS NOCOMMIT)" t)
+(autoload 'magit-merge-editmsg "magit-merge" "\
+Merge commit REV into the current branch; and edit message.
+Perform the merge and prepare a commit message but let the user
+edit it.
+
+(git merge --edit --no-ff [ARGS] REV)
+
+(fn REV &optional ARGS)" t)
+(autoload 'magit-merge-nocommit "magit-merge" "\
+Merge commit REV into the current branch; pretending it failed.
+Pretend the merge failed to give the user the opportunity to
+inspect the merge and change the commit message.
+
+(git merge --no-commit --no-ff [ARGS] REV)
+
+(fn REV &optional ARGS)" t)
+(autoload 'magit-merge-into "magit-merge" "\
+Merge the current branch into BRANCH and remove the former.
+
+Before merging, force push the source branch to its push-remote,
+provided the respective remote branch already exists, ensuring
+that the respective pull-request (if any) won't get stuck on some
+obsolete version of the commits that are being merged.  Finally
+if `forge-branch-pullreq' was used to create the merged branch,
+then also remove the respective remote branch.
+
+(fn BRANCH &optional ARGS)" t)
+(autoload 'magit-merge-absorb "magit-merge" "\
+Merge BRANCH into the current branch and remove the former.
+
+Before merging, force push the source branch to its push-remote,
+provided the respective remote branch already exists, ensuring
+that the respective pull-request (if any) won't get stuck on some
+obsolete version of the commits that are being merged.  Finally
+if `forge-branch-pullreq' was used to create the merged branch,
+then also remove the respective remote branch.
+
+(fn BRANCH &optional ARGS)" t)
+(autoload 'magit-merge-squash "magit-merge" "\
+Squash commit REV into the current branch; don't create a commit.
+
+(git merge --squash REV)
+
+(fn REV)" t)
+(autoload 'magit-merge-preview "magit-merge" "\
+Preview result of merging REV into the current branch.
+
+(fn REV)" t)
+(autoload 'magit-merge-abort "magit-merge" "\
+Abort the current merge operation.
+
+(git merge --abort)" t)
+(register-definition-prefixes "magit-merge" '("magit-"))
+
+
+;;; Generated autoloads from magit-mode.el
+
+(autoload 'magit-info "magit-mode" "\
+Visit the Magit manual." t)
+(register-definition-prefixes "magit-mode" '("magit-"))
+
+
+;;; Generated autoloads from magit-notes.el
+
+ (autoload 'magit-notes "magit" nil t)
+(register-definition-prefixes "magit-notes" '("magit-notes-"))
+
+
+;;; Generated autoloads from magit-patch.el
+
+ (autoload 'magit-patch "magit-patch" nil t)
+ (autoload 'magit-patch-create "magit-patch" nil t)
+ (autoload 'magit-patch-apply "magit-patch" nil t)
+(autoload 'magit-patch-save "magit-patch" "\
+Write current diff into patch FILE.
+
+What arguments are used to create the patch depends on the value
+of `magit-patch-save-arguments' and whether a prefix argument is
+used.
+
+If the value is the symbol `buffer', then use the same arguments
+as the buffer.  With a prefix argument use no arguments.
+
+If the value is a list beginning with the symbol `exclude', then
+use the same arguments as the buffer except for those matched by
+entries in the cdr of the list.  The comparison is done using
+`string-prefix-p'.  With a prefix argument use the same arguments
+as the buffer.
+
+If the value is a list of strings (including the empty list),
+then use those arguments.  With a prefix argument use the same
+arguments as the buffer.
+
+Of course the arguments that are required to actually show the
+same differences as those shown in the buffer are always used.
+
+(fn FILE &optional ARG)" t)
+(autoload 'magit-request-pull "magit-patch" "\
+Request upstream to pull from your public repository.
+
+URL is the url of your publicly accessible repository.
+START is a commit that already is in the upstream repository.
+END is the last commit, usually a branch name, which upstream
+is asked to pull.  START has to be reachable from that commit.
+
+(fn URL START END)" t)
+(register-definition-prefixes "magit-patch" '("magit-"))
+
+
+;;; Generated autoloads from magit-process.el
+
+(register-definition-prefixes "magit-process" '("magit-" "tramp-sh-handle-"))
+
+
+;;; Generated autoloads from magit-pull.el
+
+ (autoload 'magit-pull "magit-pull" nil t)
+ (autoload 'magit-pull-from-pushremote "magit-pull" nil t)
+ (autoload 'magit-pull-from-upstream "magit-pull" nil t)
+(autoload 'magit-pull-branch "magit-pull" "\
+Pull from a branch read in the minibuffer.
+
+(fn SOURCE ARGS)" t)
+(register-definition-prefixes "magit-pull" '("magit-pull-"))
+
+
+;;; Generated autoloads from magit-push.el
+
+ (autoload 'magit-push "magit-push" nil t)
+ (autoload 'magit-push-current-to-pushremote "magit-push" nil t)
+ (autoload 'magit-push-current-to-upstream "magit-push" nil t)
+(autoload 'magit-push-current "magit-push" "\
+Push the current branch to a branch read in the minibuffer.
+
+(fn TARGET ARGS)" t)
+(autoload 'magit-push-other "magit-push" "\
+Push an arbitrary branch or commit somewhere.
+Both the source and the target are read in the minibuffer.
+
+(fn SOURCE TARGET ARGS)" t)
+(autoload 'magit-push-refspecs "magit-push" "\
+Push one or multiple REFSPECS to a REMOTE.
+Both the REMOTE and the REFSPECS 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.
+
+(fn REMOTE REFSPECS ARGS)" t)
+(autoload 'magit-push-matching "magit-push" "\
+Push all matching branches to another repository.
+If multiple remotes exist, then read one from the user.
+If just one exists, use that without requiring confirmation.
+
+(fn REMOTE &optional ARGS)" t)
+(autoload 'magit-push-tags "magit-push" "\
+Push 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.
+
+(fn REMOTE &optional ARGS)" t)
+(autoload 'magit-push-tag "magit-push" "\
+Push a tag to another repository.
+
+(fn TAG REMOTE &optional ARGS)" t)
+(autoload 'magit-push-notes-ref "magit-push" "\
+Push a notes ref to another repository.
+
+(fn REF REMOTE &optional ARGS)" t)
+ (autoload 'magit-push-implicitly "magit-push" nil t)
+ (autoload 'magit-push-to-remote "magit-push" nil t)
+(register-definition-prefixes "magit-push" '("magit-"))
+
+
+;;; Generated autoloads from magit-reflog.el
+
+(autoload 'magit-reflog-current "magit-reflog" "\
+Display the reflog of the current branch.
+If `HEAD' is detached, then show the reflog for that instead." t)
+(autoload 'magit-reflog-other "magit-reflog" "\
+Display the reflog of a branch or another ref.
+
+(fn REF)" t)
+(autoload 'magit-reflog-head "magit-reflog" "\
+Display the `HEAD' reflog." t)
+(register-definition-prefixes "magit-reflog" '("magit-reflog-"))
+
+
+;;; Generated autoloads from magit-refs.el
+
+ (autoload 'magit-show-refs "magit-refs" nil t)
+(autoload 'magit-show-refs-head "magit-refs" "\
+List and compare references in a dedicated buffer.
+Compared with `HEAD'.
+
+(fn &optional ARGS)" t)
+(autoload 'magit-show-refs-current "magit-refs" "\
+List and compare references in a dedicated buffer.
+Compare with the current branch or `HEAD' if it is detached.
+
+(fn &optional ARGS)" t)
+(autoload 'magit-show-refs-other "magit-refs" "\
+List and compare references in a dedicated buffer.
+Compared with a branch read from the user.
+
+(fn &optional REF ARGS)" t)
+(register-definition-prefixes "magit-refs" '("magit-"))
+
+
+;;; Generated autoloads from magit-remote.el
+
+ (autoload 'magit-remote "magit-remote" nil t)
+(autoload 'magit-remote-add "magit-remote" "\
+Add a remote named REMOTE and fetch it.
+
+(fn REMOTE URL &optional ARGS)" t)
+(autoload 'magit-remote-rename "magit-remote" "\
+Rename the remote named OLD to NEW.
+
+(fn OLD NEW)" t)
+(autoload 'magit-remote-remove "magit-remote" "\
+Delete the remote named REMOTE.
+
+(fn REMOTE)" t)
+(autoload 'magit-remote-prune "magit-remote" "\
+Remove stale remote-tracking branches for REMOTE.
+
+(fn REMOTE)" t)
+(autoload 'magit-remote-prune-refspecs "magit-remote" "\
+Remove stale refspecs for REMOTE.
+
+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 offer to either delete the
+remote or to replace the stale refspecs with the default refspec.
+
+Also remove the remote-tracking branches that were created due to
+the now stale refspecs.  Other stale branches are not removed.
+
+(fn REMOTE)" t)
+(autoload 'magit-remote-set-head "magit-remote" "\
+Set the local representation of REMOTE's default branch.
+Query REMOTE and set the symbolic-ref refs/remotes/<remote>/HEAD
+accordingly.  With a prefix argument query for the branch to be
+used, which allows you to select an incorrect value if you fancy
+doing that.
+
+(fn REMOTE &optional BRANCH)" t)
+(autoload 'magit-remote-unset-head "magit-remote" "\
+Unset the local representation of REMOTE's default branch.
+Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\".
+
+(fn REMOTE)" t)
+ (autoload 'magit-update-default-branch "magit-remote" nil t)
+(autoload 'magit-remote-unshallow "magit-remote" "\
+Convert a shallow remote into a full one.
+If only a single refspec is set and it does not contain a
+wildcard, then also offer to replace it with the standard
+refspec.
+
+(fn REMOTE)" t)
+ (autoload 'magit-remote-configure "magit-remote" nil t)
+(register-definition-prefixes "magit-remote" '("magit-"))
+
+
+;;; Generated autoloads from magit-repos.el
+
+(autoload 'magit-list-repositories "magit-repos" "\
+Display a list of repositories.
+
+Use the option `magit-repository-directories' to control which
+repositories are displayed." t)
+(register-definition-prefixes "magit-repos" '("magit-"))
+
+
+;;; Generated autoloads from magit-reset.el
+
+ (autoload 'magit-reset "magit" nil t)
+(autoload 'magit-reset-mixed "magit-reset" "\
+Reset the `HEAD' and index to COMMIT, but not the working tree.
+
+(git reset --mixed COMMIT)
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-soft "magit-reset" "\
+Reset the `HEAD' to COMMIT, but not the index and working tree.
+
+(git reset --soft REVISION)
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-hard "magit-reset" "\
+Reset the `HEAD', index, and working tree to COMMIT.
+
+(git reset --hard REVISION)
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-keep "magit-reset" "\
+Reset the `HEAD' and index to COMMIT, while keeping uncommitted changes.
+
+(git reset --keep REVISION)
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-index "magit-reset" "\
+Reset the index to COMMIT.
+Keep the `HEAD' and working tree as-is, so if COMMIT refers to the
+head this effectively unstages all changes.
+
+(git reset COMMIT .)
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-worktree "magit-reset" "\
+Reset the worktree to COMMIT.
+Keep the `HEAD' and index as-is.
+
+(fn COMMIT)" t)
+(autoload 'magit-reset-quickly "magit-reset" "\
+Reset the `HEAD' and index to COMMIT, and possibly the working tree.
+With a prefix argument reset the working tree otherwise don't.
+
+(git reset --mixed|--hard COMMIT)
+
+(fn COMMIT &optional HARD)" t)
+(register-definition-prefixes "magit-reset" '("magit-reset-"))
+
+
+;;; Generated autoloads from magit-sequence.el
+
+(autoload 'magit-sequencer-continue "magit-sequence" "\
+Resume the current cherry-pick or revert sequence." t)
+(autoload 'magit-sequencer-skip "magit-sequence" "\
+Skip the stopped at commit during a cherry-pick or revert sequence." t)
+(autoload 'magit-sequencer-abort "magit-sequence" "\
+Abort the current cherry-pick or revert sequence.
+This discards all changes made since the sequence started." t)
+ (autoload 'magit-cherry-pick "magit-sequence" nil t)
+(autoload 'magit-cherry-copy "magit-sequence" "\
+Copy COMMITS from another branch onto the current branch.
+Prompt for a commit, defaulting to the commit at point.  If
+the region selects multiple commits, then pick all of them,
+without prompting.
+
+(fn COMMITS &optional ARGS)" t)
+(autoload 'magit-cherry-apply "magit-sequence" "\
+Apply the changes in COMMITS but do not commit them.
+Prompt for a commit, defaulting to the commit at point.  If
+the region selects multiple commits, then apply all of them,
+without prompting.
+
+(fn COMMITS &optional ARGS)" t)
+(autoload 'magit-cherry-harvest "magit-sequence" "\
+Move COMMITS from another BRANCH onto the current branch.
+Remove the COMMITS from BRANCH and stay on the current branch.
+If a conflict occurs, then you have to fix that and finish the
+process manually.
+
+(fn COMMITS BRANCH &optional ARGS)" t)
+(autoload 'magit-cherry-donate "magit-sequence" "\
+Move COMMITS from the current branch onto another existing BRANCH.
+Remove COMMITS from the current branch and stay on that branch.
+If a conflict occurs, then you have to fix that and finish the
+process manually.  `HEAD' is allowed to be detached initially.
+
+(fn COMMITS BRANCH &optional ARGS)" t)
+(autoload 'magit-cherry-spinout "magit-sequence" "\
+Move COMMITS from the current branch onto a new BRANCH.
+Remove COMMITS from the current branch and stay on that branch.
+If a conflict occurs, then you have to fix that and finish the
+process manually.
+
+(fn COMMITS BRANCH START-POINT &optional ARGS)" t)
+(autoload 'magit-cherry-spinoff "magit-sequence" "\
+Move COMMITS from the current branch onto a new BRANCH.
+Remove COMMITS from the current branch and checkout BRANCH.
+If a conflict occurs, then you have to fix that and finish
+the process manually.
+
+(fn COMMITS BRANCH START-POINT &optional ARGS)" t)
+ (autoload 'magit-revert "magit-sequence" nil t)
+(autoload 'magit-revert-and-commit "magit-sequence" "\
+Revert 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.
+
+(fn COMMIT &optional ARGS)" t)
+(autoload 'magit-revert-no-commit "magit-sequence" "\
+Revert COMMIT by applying it in reverse to the worktree.
+Prompt for a commit, defaulting to the commit at point.  If
+the region selects multiple commits, then revert all of them,
+without prompting.
+
+(fn COMMIT &optional ARGS)" t)
+ (autoload 'magit-am "magit-sequence" nil t)
+(autoload 'magit-am-apply-patches "magit-sequence" "\
+Apply the patches FILES.
+
+(fn &optional FILES ARGS)" t)
+(autoload 'magit-am-apply-maildir "magit-sequence" "\
+Apply the patches from MAILDIR.
+
+(fn &optional MAILDIR ARGS)" t)
+(autoload 'magit-am-continue "magit-sequence" "\
+Resume the current patch applying sequence." t)
+(autoload 'magit-am-skip "magit-sequence" "\
+Skip the stopped at patch during a patch applying sequence." t)
+(autoload 'magit-am-abort "magit-sequence" "\
+Abort the current patch applying sequence.
+This discards all changes made since the sequence started." t)
+ (autoload 'magit-rebase "magit-sequence" nil t)
+ (autoload 'magit-rebase-onto-pushremote "magit-sequence" nil t)
+ (autoload 'magit-rebase-onto-upstream "magit-sequence" nil t)
+(autoload 'magit-rebase-branch "magit-sequence" "\
+Rebase 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.
+
+(fn TARGET ARGS)" t)
+(autoload 'magit-rebase-subset "magit-sequence" "\
+Rebase a subset of the current branch's history onto a new base.
+Rebase commits from START to `HEAD' onto NEWBASE.
+START has to be selected from a list of recent commits.
+
+(fn NEWBASE START ARGS)" t)
+(autoload 'magit-rebase-interactive "magit-sequence" "\
+Start an interactive rebase sequence.
+
+(fn COMMIT ARGS)" t)
+(autoload 'magit-rebase-autosquash "magit-sequence" "\
+Combine squash and fixup commits with their intended targets.
+
+(fn ARGS)" t)
+(autoload 'magit-rebase-edit-commit "magit-sequence" "\
+Edit a single older commit using rebase.
+
+(fn COMMIT ARGS)" t)
+(autoload 'magit-rebase-reword-commit "magit-sequence" "\
+Reword a single older commit using rebase.
+
+(fn COMMIT ARGS)" t)
+(autoload 'magit-rebase-remove-commit "magit-sequence" "\
+Remove a single older commit using rebase.
+
+(fn COMMIT ARGS)" t)
+(autoload 'magit-rebase-continue "magit-sequence" "\
+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.
+
+(fn &optional NOEDIT)" t)
+(autoload 'magit-rebase-skip "magit-sequence" "\
+Skip the current commit and restart the current rebase operation." t)
+(autoload 'magit-rebase-edit "magit-sequence" "\
+Edit the todo list of the current rebase operation." t)
+(autoload 'magit-rebase-abort "magit-sequence" "\
+Abort the current rebase operation, restoring the original branch." t)
+(register-definition-prefixes "magit-sequence" '("magit-"))
+
+
+;;; Generated autoloads from magit-sparse-checkout.el
+
+ (autoload 'magit-sparse-checkout "magit-sparse-checkout" nil t)
+(autoload 'magit-sparse-checkout-enable "magit-sparse-checkout" "\
+Convert the working tree to a sparse checkout.
+
+(fn &optional ARGS)" t)
+(autoload 'magit-sparse-checkout-set "magit-sparse-checkout" "\
+Restrict working tree to DIRECTORIES.
+To extend rather than override the currently configured
+directories, call `magit-sparse-checkout-add' instead.
+
+(fn DIRECTORIES)" t)
+(autoload 'magit-sparse-checkout-add "magit-sparse-checkout" "\
+Add DIRECTORIES to the working tree.
+To override rather than extend the currently configured
+directories, call `magit-sparse-checkout-set' instead.
+
+(fn DIRECTORIES)" t)
+(autoload 'magit-sparse-checkout-reapply "magit-sparse-checkout" "\
+Reapply the sparse checkout rules to the working tree.
+Some operations such as merging or rebasing may need to check out
+files that aren't included in the sparse checkout.  Call this
+command to reset to the sparse checkout state." t)
+(autoload 'magit-sparse-checkout-disable "magit-sparse-checkout" "\
+Convert sparse checkout to full checkout.
+Note that disabling the sparse checkout does not clear the
+configured directories.  Call `magit-sparse-checkout-enable' to
+restore the previous sparse checkout." t)
+(register-definition-prefixes "magit-sparse-checkout" '("magit-sparse-checkout-"))
+
+
+;;; Generated autoloads from magit-stash.el
+
+ (autoload 'magit-stash "magit-stash" nil t)
+(autoload 'magit-stash-both "magit-stash" "\
+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'.
+
+(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
+(autoload 'magit-stash-index "magit-stash" "\
+Create a stash of the index only.
+Unstaged and untracked changes are not stashed.  The stashed
+changes are applied in reverse to both the index and the
+worktree.  This command can fail when the worktree is not clean.
+Applying the resulting stash has the inverse effect.
+
+(fn MESSAGE)" t)
+(autoload 'magit-stash-worktree "magit-stash" "\
+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'.
+
+(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
+(autoload 'magit-stash-keep-index "magit-stash" "\
+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'.
+
+(fn MESSAGE &optional INCLUDE-UNTRACKED)" t)
+(autoload 'magit-snapshot-both "magit-stash" "\
+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'.
+
+(fn &optional INCLUDE-UNTRACKED)" t)
+(autoload 'magit-snapshot-index "magit-stash" "\
+Create a snapshot of the index only.
+Unstaged and untracked changes are not stashed." t)
+(autoload 'magit-snapshot-worktree "magit-stash" "\
+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'.
+
+(fn &optional INCLUDE-UNTRACKED)" t)
+ (autoload 'magit-stash-push "magit-stash" nil t)
+(autoload 'magit-stash-apply "magit-stash" "\
+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\".
+
+(fn STASH)" t)
+(autoload 'magit-stash-pop "magit-stash" "\
+Apply a stash to the working tree, on success remove it 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\".
+
+(fn STASH)" t)
+(autoload 'magit-stash-drop "magit-stash" "\
+Remove a stash from the stash list.
+When the region is active offer to drop all contained stashes.
+
+(fn STASH)" t)
+(autoload 'magit-stash-clear "magit-stash" "\
+Remove all stashes saved in REF's reflog by deleting REF.
+
+(fn REF)" t)
+(autoload 'magit-stash-branch "magit-stash" "\
+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.  If the stash applies cleanly, then drop it.
+
+(fn STASH BRANCH)" t)
+(autoload 'magit-stash-branch-here "magit-stash" "\
+Create and checkout a new BRANCH from an existing STASH.
+Use the current branch or `HEAD' as the starting-point of BRANCH.
+Then apply STASH, dropping it if it applies cleanly.
+
+(fn STASH BRANCH)" t)
+(autoload 'magit-stash-format-patch "magit-stash" "\
+Create a patch from STASH
+
+(fn STASH)" t)
+(autoload 'magit-stash-list "magit-stash" "\
+List all stashes in a buffer." t)
+(autoload 'magit-stash-show "magit-stash" "\
+Show all diffs of a stash in a buffer.
+
+(fn STASH &optional ARGS FILES)" t)
+(register-definition-prefixes "magit-stash" '("magit-"))
+
+
+;;; Generated autoloads from magit-status.el
+
+(autoload 'magit-init "magit-status" "\
+Initialize a Git repository, then show its status.
+
+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.
+
+Non-interactively DIRECTORY is (re-)initialized unconditionally.
+
+(fn DIRECTORY)" t)
+(autoload 'magit-status "magit-status" "\
+Show the status of the current Git repository in a buffer.
+
+If the current directory isn't located within a Git repository,
+then prompt for an existing repository or an arbitrary directory,
+depending on option `magit-repository-directories', and show the
+status of the selected repository instead.
+
+* If that option specifies any existing repositories, then offer
+  those for completion and show the status buffer for the
+  selected one.
+
+* Otherwise read an arbitrary directory using regular file-name
+  completion.  If the selected directory is the top-level of an
+  existing working tree, then show the status buffer for that.
+
+* Otherwise offer to initialize the selected directory as a new
+  repository.  After creating the repository show its status
+  buffer.
+
+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) read an arbitrary directory and act on
+  it as described above.  The same could be accomplished using
+  the command `magit-init'.
+
+* With a single prefix argument read an existing repository, or
+  if none can be found based on `magit-repository-directories',
+  then fall back to the same behavior as with two prefix
+  arguments.
+
+(fn &optional DIRECTORY CACHE)" t)
+(defalias 'magit #'magit-status "\
+Begin using Magit.
+
+This alias for `magit-status' exists for better discoverability.
+
+Instead of invoking this alias for `magit-status' using
+\"M-x magit RET\", you should bind a key to `magit-status'
+and read the info node `(magit)Getting Started', which
+also contains other useful hints.")
+(autoload 'magit-status-here "magit-status" "\
+Like `magit-status' but with non-nil `magit-status-goto-file-position'." t)
+(autoload 'magit-status-quick "magit-status" "\
+Show the status of the current Git repository, maybe without refreshing.
+
+If the status buffer of the current Git repository exists but
+isn't being displayed in the selected frame, then display it
+without refreshing it.
+
+If the status buffer is being displayed in the selected frame,
+then also refresh it.
+
+Prefix arguments have the same meaning as for `magit-status',
+and additionally cause the buffer to be refresh.
+
+To use this function instead of `magit-status', add this to your
+init file: (global-set-key (kbd \"C-x g\") \\='magit-status-quick)." t)
+(autoload 'magit-status-setup-buffer "magit-status" "\
+
+
+(fn &optional DIRECTORY)")
+(register-definition-prefixes "magit-status" '("magit-"))
+
+
+;;; Generated autoloads from magit-submodule.el
+
+ (autoload 'magit-submodule "magit-submodule" nil t)
+ (autoload 'magit-submodule-add "magit-submodule" nil t)
+(autoload 'magit-submodule-read-name-for-path "magit-submodule" "\
+
+
+(fn PATH &optional PREFER-SHORT)")
+ (autoload 'magit-submodule-register "magit-submodule" nil t)
+ (autoload 'magit-submodule-populate "magit-submodule" nil t)
+ (autoload 'magit-submodule-update "magit-submodule" nil t)
+ (autoload 'magit-submodule-synchronize "magit-submodule" nil t)
+ (autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
+(autoload 'magit-submodule-remove "magit-submodule" "\
+Unregister MODULES and remove their working directories.
+
+For safety reasons, do not remove the gitdirs and if a module has
+uncommitted changes, then do not remove it at all.  If a module's
+gitdir is located inside the working directory, then move it into
+the gitdir of the superproject first.
+
+With the \"--force\" argument offer to remove dirty working
+directories and with a prefix argument offer to delete gitdirs.
+Both actions are very dangerous and have to be confirmed.  There
+are additional safety precautions in place, so you might be able
+to recover from making a mistake here, but don't count on it.
+
+(fn MODULES ARGS TRASH-GITDIRS)" t)
+(autoload 'magit-insert-modules "magit-submodule" "\
+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.")
+(autoload 'magit-insert-modules-overview "magit-submodule" "\
+Insert sections for all modules.
+For each section insert the path and the output of `git describe --tags',
+or, failing that, the abbreviated HEAD commit hash.")
+(autoload 'magit-insert-modules-unpulled-from-upstream "magit-submodule" "\
+Insert sections for modules that haven't been pulled from the upstream.
+These sections can be expanded to show the respective commits.")
+(autoload 'magit-insert-modules-unpulled-from-pushremote "magit-submodule" "\
+Insert sections for modules that haven't been pulled from the push-remote.
+These sections can be expanded to show the respective commits.")
+(autoload 'magit-insert-modules-unpushed-to-upstream "magit-submodule" "\
+Insert sections for modules that haven't been pushed to the upstream.
+These sections can be expanded to show the respective commits.")
+(autoload 'magit-insert-modules-unpushed-to-pushremote "magit-submodule" "\
+Insert sections for modules that haven't been pushed to the push-remote.
+These sections can be expanded to show the respective commits.")
+(autoload 'magit-list-submodules "magit-submodule" "\
+Display a list of the current repository's populated submodules." t)
+(register-definition-prefixes "magit-submodule" '("magit-"))
+
+
+;;; Generated autoloads from magit-subtree.el
+
+ (autoload 'magit-subtree "magit-subtree" nil t)
+ (autoload 'magit-subtree-import "magit-subtree" nil t)
+ (autoload 'magit-subtree-export "magit-subtree" nil t)
+(autoload 'magit-subtree-add "magit-subtree" "\
+Add REF from REPOSITORY as a new subtree at PREFIX.
+
+(fn PREFIX REPOSITORY REF ARGS)" t)
+(autoload 'magit-subtree-add-commit "magit-subtree" "\
+Add COMMIT as a new subtree at PREFIX.
+
+(fn PREFIX COMMIT ARGS)" t)
+(autoload 'magit-subtree-merge "magit-subtree" "\
+Merge COMMIT into the PREFIX subtree.
+
+(fn PREFIX COMMIT ARGS)" t)
+(autoload 'magit-subtree-pull "magit-subtree" "\
+Pull REF from REPOSITORY into the PREFIX subtree.
+
+(fn PREFIX REPOSITORY REF ARGS)" t)
+(autoload 'magit-subtree-push "magit-subtree" "\
+Extract the history of the subtree PREFIX and push it to REF on REPOSITORY.
+
+(fn PREFIX REPOSITORY REF ARGS)" t)
+(autoload 'magit-subtree-split "magit-subtree" "\
+Extract the history of the subtree PREFIX.
+
+(fn PREFIX COMMIT ARGS)" t)
+(register-definition-prefixes "magit-subtree" '("magit-"))
+
+
+;;; Generated autoloads from magit-tag.el
+
+ (autoload 'magit-tag "magit" nil t)
+(autoload 'magit-tag-create "magit-tag" "\
+Create a new tag with the given NAME at REV.
+With a prefix argument annotate the tag.
+
+(git tag [--annotate] NAME REV)
+
+(fn NAME REV &optional ARGS)" t)
+(autoload 'magit-tag-delete "magit-tag" "\
+Delete one or more tags.
+If the region marks multiple tags (and nothing else), then offer
+to delete those, otherwise prompt for a single tag to be deleted,
+defaulting to the tag at point.
+
+(git tag -d TAGS)
+
+(fn TAGS)" t)
+(autoload 'magit-tag-prune "magit-tag" "\
+Offer to delete tags missing locally from REMOTE, and vice versa.
+
+(fn TAGS REMOTE-TAGS REMOTE)" t)
+(autoload 'magit-tag-release "magit-tag" "\
+Create a release tag for `HEAD'.
+
+Assume that release tags match `magit-release-tag-regexp'.
+
+If `HEAD's message matches `magit-release-commit-regexp', then
+base the tag on the version string specified by that.  Otherwise
+prompt 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 `--annotate' is enabled, then prompt for the message of the
+new tag.  Base the proposed tag message on the message of the
+highest tag, provided that that contains the corresponding
+version string and substituting the new version string for that.
+Otherwise propose 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\".
+
+(fn TAG MSG &optional ARGS)" t)
+(register-definition-prefixes "magit-tag" '("magit-"))
+
+
+;;; Generated autoloads from magit-transient.el
+
+(register-definition-prefixes "magit-transient" '("magit-"))
+
+
+;;; Generated autoloads from magit-wip.el
+
+(defvar magit-wip-mode nil "\
+Non-nil if Magit-Wip mode is enabled.
+See the `magit-wip-mode' command
+for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `magit-wip-mode'.")
+(custom-autoload 'magit-wip-mode "magit-wip" nil)
+(autoload 'magit-wip-mode "magit-wip" "\
+Save uncommitted changes to work-in-progress refs.
+
+Whenever appropriate (i.e., when dataloss would be a possibility
+otherwise) this mode causes uncommitted changes to be committed
+to dedicated work-in-progress refs.
+
+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.
+
+This is a global minor mode.  If called interactively, toggle the
+`Magit-Wip mode' mode.  If the prefix argument is positive,
+enable the mode, and if it is zero or negative, disable the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `(default-value \\='magit-wip-mode)'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(put 'magit-wip-after-save-mode 'globalized-minor-mode t)
+(defvar magit-wip-after-save-mode nil "\
+Non-nil if Magit-Wip-After-Save mode is enabled.
+See the `magit-wip-after-save-mode' command
+for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `magit-wip-after-save-mode'.")
+(custom-autoload 'magit-wip-after-save-mode "magit-wip" nil)
+(autoload 'magit-wip-after-save-mode "magit-wip" "\
+Toggle Magit-Wip-After-Save-Local mode in all buffers.
+With prefix ARG, enable Magit-Wip-After-Save mode if ARG is positive; otherwise,
+disable it.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.
+Enable the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+Magit-Wip-After-Save-Local mode is enabled in all buffers where
+`magit-wip-after-save-local-mode-turn-on' would do it.
+
+See `magit-wip-after-save-local-mode' for more information on
+Magit-Wip-After-Save-Local mode.
+
+(fn &optional ARG)" t)
+(defvar magit-wip-after-apply-mode nil "\
+Non-nil if Magit-Wip-After-Apply mode is enabled.
+See the `magit-wip-after-apply-mode' command
+for a description of this minor mode.")
+(custom-autoload 'magit-wip-after-apply-mode "magit-wip" nil)
+(autoload 'magit-wip-after-apply-mode "magit-wip" "\
+Commit to work-in-progress refs.
+
+After applying a change using any \"apply variant\"
+command (apply, stage, unstage, discard, and reverse) commit the
+affected files to the current wip refs.  For each branch there
+may be two wip refs; one contains snapshots of the files as found
+in the worktree and the other contains snapshots of the entries
+in the index.
+
+This is a global minor mode.  If called interactively, toggle the
+`Magit-Wip-After-Apply mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `(default-value \\='magit-wip-after-apply-mode)'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(defvar magit-wip-before-change-mode nil "\
+Non-nil if Magit-Wip-Before-Change mode is enabled.
+See the `magit-wip-before-change-mode' command
+for a description of this minor mode.")
+(custom-autoload 'magit-wip-before-change-mode "magit-wip" nil)
+(autoload 'magit-wip-before-change-mode "magit-wip" "\
+Commit to work-in-progress refs before certain destructive changes.
+
+Before invoking a revert command or an \"apply variant\"
+command (apply, stage, unstage, discard, and reverse) commit the
+affected tracked files to the current wip refs.  For each branch
+there may be two wip refs; one contains snapshots of the files
+as found in the worktree and the other contains snapshots of the
+entries in the index.
+
+Only changes to files which could potentially be affected by the
+command which is about to be called are committed.
+
+This is a global minor mode.  If called interactively, toggle the
+`Magit-Wip-Before-Change mode' mode.  If the prefix argument is
+positive, enable the mode, and if it is zero or negative, disable
+the mode.
+
+If called from Lisp, toggle the mode if ARG is `toggle'.  Enable
+the mode if ARG is nil, omitted, or is a positive number.
+Disable the mode if ARG is a negative number.
+
+To check whether the minor mode is enabled in the current buffer,
+evaluate `(default-value \\='magit-wip-before-change-mode)'.
+
+The mode's hook is called both when the mode is enabled and when
+it is disabled.
+
+(fn &optional ARG)" t)
+(autoload 'magit-wip-commit-initial-backup "magit-wip" "\
+Before saving, commit current file to a worktree wip ref.
+
+The user has to add this function to `before-save-hook'.
+
+Commit the current state of the visited file before saving the
+current buffer to that file.  This backs up the same version of
+the file as `backup-buffer' would, but stores the backup in the
+worktree wip ref, which is also used by the various Magit Wip
+modes, instead of in a backup file as `backup-buffer' would.
+
+This function ignores the variables that affect `backup-buffer'
+and can be used along-side that function, which is recommended
+because this function only backs up files that are tracked in
+a Git repository.")
+(register-definition-prefixes "magit-wip" '("magit-"))
+
+
+;;; Generated autoloads from magit-worktree.el
+
+ (autoload 'magit-worktree "magit-worktree" nil t)
+(autoload 'magit-worktree-checkout "magit-worktree" "\
+Checkout BRANCH in a new worktree at PATH.
+
+(fn PATH BRANCH)" t)
+(autoload 'magit-worktree-branch "magit-worktree" "\
+Create a new BRANCH and check it out in a new worktree at PATH.
+
+(fn PATH BRANCH START-POINT &optional FORCE)" t)
+(autoload 'magit-worktree-move "magit-worktree" "\
+Move WORKTREE to PATH.
+
+(fn WORKTREE PATH)" t)
+(register-definition-prefixes "magit-worktree" '("magit-"))
+
+;;; End of scraped data
+
+(provide 'magit-autoloads)
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; no-native-compile: t
+;; coding: utf-8-emacs-unix
+;; End:
+
+;;; magit-autoloads.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-autorevert.el b/emacs/elpa/magit-20240514.1843/magit-autorevert.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-autorevert.elc b/emacs/elpa/magit-20240514.1843/magit-autorevert.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-base.el b/emacs/elpa/magit-20240514.1843/magit-base.el
@@ -0,0 +1,1264 @@
+;;; magit-base.el --- Early birds  -*- 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>
+
+;; 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/>.
+
+;; This file contains code taken from GNU Emacs, which is
+;; Copyright (C) 1976-2023 Free Software Foundation, Inc.
+
+;;; Commentary:
+
+;; This library defines utility functions, options and other things that
+;; have to be available early on because they are used by several other
+;; libraries, which cannot depend on one another, because that would lead
+;; to circular dependencies.
+
+;;; Code:
+
+(defconst magit--minimal-git "2.2.0")
+(defconst magit--minimal-emacs "26.1")
+
+(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 already
+;; have required `seq', before `package' had a chance to put the more
+;; recent version earlier on the `load-path'.
+(when (and (featurep 'seq)
+           (not (fboundp 'seq-keep)))
+  (unload-feature 'seq 'force))
+(require 'seq)
+
+(require 'crm)
+
+(require 'magit-section)
+
+(eval-when-compile (require 'info))
+(declare-function Info-get-token "info" (pos start all &optional errorstring))
+
+(eval-when-compile (require 'vc-git))
+(declare-function vc-git--run-command-string "vc-git" (file &rest args))
+
+(eval-when-compile (require 'which-func))
+(declare-function which-function "which-func" ())
+
+;;; Options
+
+(defcustom magit-completing-read-function #'magit-builtin-completing-read
+  "Function to be called when requesting input from the user.
+
+If you have enabled `ivy-mode' or `helm-mode', then you don't
+have to customize this option; `magit-builtin-completing-read'
+will work just fine.  However, if you use Ido completion, then
+you do have to use `magit-ido-completing-read', because Ido is
+less well behaved than the former, more modern alternatives.
+
+If you would like to use Ivy or Helm completion with Magit but
+not enable the respective modes globally, then customize this
+option to use `ivy-completing-read' or
+`helm--completing-read-default'.  If you choose to use
+`ivy-completing-read', note that the items may always be shown in
+alphabetical order, depending on your version of Ivy."
+  :group 'magit-essentials
+  :type '(radio (function-item magit-builtin-completing-read)
+                (function-item magit-ido-completing-read)
+                (function-item ivy-completing-read)
+                (function-item helm--completing-read-default)
+                (function :tag "Other function")))
+
+(defcustom magit-dwim-selection
+  '((magit-stash-apply        nil t)
+    (magit-ediff-resolve-all  nil t)
+    (magit-ediff-resolve-rest nil t)
+    (magit-stash-branch       nil t)
+    (magit-stash-branch-here  nil t)
+    (magit-stash-format-patch nil t)
+    (magit-stash-drop         nil ask)
+    (magit-stash-pop          nil ask))
+  "When not to offer alternatives and ask for confirmation.
+
+Many commands by default ask the user to select from a list of
+possible candidates.  They do so even when there is a thing at
+point that they can act on, which is then offered as the default.
+
+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."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-commands
+  :type '(repeat
+          (list (symbol :tag "Command") ; It might not be fboundp yet.
+                (choice (const  :tag "for all prompts" nil)
+                        (regexp :tag "for prompts matching regexp"))
+                (choice (const  :tag "offer other choices" nil)
+                        (const  :tag "require confirmation" ask)
+                        (const  :tag "use default without confirmation" t)))))
+
+(defconst magit--confirm-actions
+  '((const discard)
+    (const reverse)
+    (const stage-all-changes)
+    (const unstage-all-changes)
+    (const delete)
+    (const trash)
+    (const resurrect)
+    (const untrack)
+    (const rename)
+    (const reset-bisect)
+    (const abort-cherry-pick)
+    (const abort-revert)
+    (const abort-rebase)
+    (const abort-merge)
+    (const merge-dirty)
+    (const delete-unmerged-branch)
+    (const delete-branch-on-remote)
+    (const delete-pr-remote)
+    (const drop-stashes)
+    (const set-and-push)
+    (const amend-published)
+    (const rebase-published)
+    (const edit-published)
+    (const remove-modules)
+    (const remove-dirty-modules)
+    (const trash-module-gitdirs)
+    (const stash-apply-3way)
+    (const kill-process)
+    (const safe-with-wip)))
+
+(defcustom magit-no-confirm '(set-and-push)
+  "A list of symbols for actions Magit should not confirm, or t.
+
+Many potentially dangerous commands by default 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 has already been carried out by the
+  user.
+
+  `abort-revert' Aborting a revert throws away all conflict
+  resolutions which has 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 has 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-branch-on-remote' Deleting a \"remote branch\" may mean
+  deleting the (local) \"remote-tracking\" branch only, or also
+  removing it from the remote itself.  The latter often makes more
+  sense because otherwise simply fetching from the remote would
+  restore the remote-tracking branch, but doing that can be
+  surprising and hard to recover from, so we ask.
+
+  `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 popup 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.
+
+Removing modules:
+
+  `remove-modules' When you remove the working directory of a
+  module that does not contain uncommitted changes, then that is
+  safer than doing so when there are uncommitted changes and/or
+  when you also remove the gitdir.  Still, you don't want to do
+  that by accident.
+
+  `remove-dirty-modules' When you remove the working directory of
+  a module that contains uncommitted changes, then those changes
+  are gone for good.  It is better to go to the module, inspect
+  these changes and only if appropriate discard them manually.
+
+  `trash-module-gitdirs' When you remove the gitdir of a module,
+  then all unpushed changes are gone for good.  It is very easy
+  to forget that you have some unfinished work on an unpublished
+  feature branch or even in a stash.
+
+  Actually there are some safety precautions in place, that might
+  help you out if you make an unwise choice here, but don't count
+  on it.  In case of emergency, stay calm and check the stash and
+  the `trash-directory' for traces of lost work.
+
+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 these actions
+  can fairly easily be undone: `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."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-essentials
+  :group 'magit-commands
+  :type `(choice (const :tag "Always require confirmation" nil)
+                 (const :tag "Never require confirmation" t)
+                 (set   :tag "Require confirmation except for"
+                        ;; `remove-dirty-modules' and
+                        ;; `trash-module-gitdirs' intentionally
+                        ;; omitted.
+                        ,@magit--confirm-actions)))
+
+(defcustom magit-slow-confirm '(drop-stashes)
+  "Whether to ask user \"y or n\" or \"yes or no\" questions.
+
+When this is nil, then `y-or-n-p' is used when the user has to
+confirm a potentially destructive action.  When this is t, then
+`yes-or-no-p' is used instead.  If this is a list of symbols
+identifying actions, then `yes-or-no-p' is used for those,
+`y-or-no-p' for all others.  The list of actions is the same as
+for `magit-no-confirm' (which see)."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-miscellaneous
+  :type `(choice (const :tag "Always ask \"yes or no\" questions" t)
+                 (const :tag "Always ask \"y or n\" questions" nil)
+                 (set   :tag "Ask \"yes or no\" questions only for"
+                        ,@magit--confirm-actions)))
+
+(defcustom magit-no-message nil
+  "A list of messages Magit should not display.
+
+Magit displays most echo area messages using `message', but a few
+are displayed using `magit-message' instead, which takes the same
+arguments as the former, FORMAT-STRING and ARGS.  `magit-message'
+forgoes printing a message if any member of this list is a prefix
+of the respective FORMAT-STRING.
+
+If Magit prints a message which causes you grief, then please
+first investigate whether there is another option which can be
+used to suppress it.  If that is not the case, then ask the Magit
+maintainers to start using `magit-message' instead of `message'
+in that case.  We are not proactively replacing all uses of
+`message' with `magit-message', just in case someone *might* find
+some of these messages useless.
+
+Messages which can currently be suppressed using this option are:
+* \"Turning on magit-auto-revert-mode...\""
+  :package-version '(magit . "2.8.0")
+  :group 'magit-miscellaneous
+  :type '(repeat string))
+
+(defcustom magit-verbose-messages nil
+  "Whether to make certain prompts and messages more verbose.
+
+Occasionally a user suggests that a certain prompt or message
+should be more verbose, but I would prefer to keep it as-is
+because I don't think that the fact that that one user did not
+understand the existing prompt/message means that a large number
+of users would have the same difficulty, and that making it more
+verbose would actually do a disservice to users who understand
+the shorter prompt well enough.
+
+Going forward I will start offering both messages when I feel the
+suggested longer message is reasonable enough, and the value of
+this option decides which will be used.  Note that changing the
+value of this option affects all such messages and that I do not
+intend to add an option per prompt."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-miscellaneous
+  :type 'boolean)
+
+(defcustom magit-ellipsis
+  '((margin (?… . ">"))
+    (t      (?… . "...")))
+  "Characters or strings used to abbreviate text in some buffers.
+
+Each element has the form (WHERE (FANCY . UNIVERSAL)).
+
+FANCY is a single character or nil whereas UNIVERSAL is a string
+of any length.  The ellipsis produced by `magit--ellipsis' will
+be FANCY if it's a non-nil character that can be displayed with
+the available fonts, otherwise UNIVERSAL will be used.  FANCY is
+meant to be a rich character like a horizontal ellipsis symbol or
+an emoji whereas UNIVERSAL something simpler available in a less
+rich environment like the CLI.  WHERE determines the use-case for
+the ellipsis definition.  Currently the only acceptable values
+for WHERE are `margin' or t (representing the default).
+
+Whether collapsed sections are indicated using ellipsis is
+controlled by `magit-section-visibility-indicator'."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-miscellaneous
+  :type '(repeat (list (symbol :tag "Where")
+                       (cons (choice :tag "Fancy" character (const nil))
+                             (string :tag "Universal")))))
+
+(defcustom magit-update-other-window-delay 0.2
+  "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."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-miscellaneous
+  :type 'number)
+
+(defcustom magit-view-git-manual-method 'info
+  "How links to Git documentation are followed from Magit's Info manuals.
+
+`info'  Follow the link to the node in the `gitman' Info manual
+        as usual.  Unfortunately that manual is not installed by
+        default on some platforms, and when it is then the nodes
+        look worse than the actual manpages.
+
+`man'   View the respective man-page using the `man' package.
+
+`woman' View the respective man-page using the `woman' package."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-miscellaneous
+  :type '(choice (const :tag "view info manual" info)
+                 (const :tag "view manpage using `man'" man)
+                 (const :tag "view manpage using `woman'" woman)))
+
+;;; Section Classes
+
+(defclass magit-commit-section (magit-section)
+  ((keymap :initform 'magit-commit-section-map)))
+
+(setf (alist-get 'commit magit--section-type-alist) 'magit-commit-section)
+
+(defclass magit-diff-section (magit-section)
+  ((keymap :initform 'magit-diff-section-map))
+  :abstract t)
+
+(defclass magit-file-section (magit-diff-section)
+  ((keymap :initform 'magit-file-section-map)
+   (source :initform nil :initarg :source)
+   (header :initform nil :initarg :header)
+   (binary :initform nil :initarg :binary)))
+
+(defclass magit-module-section (magit-file-section)
+  ((keymap :initform 'magit-module-section-map)
+   (range  :initform nil :initarg :range)))
+
+(defclass magit-hunk-section (magit-diff-section)
+  ((keymap      :initform 'magit-hunk-section-map)
+   (refined     :initform nil)
+   (combined    :initform nil :initarg :combined)
+   (from-range  :initform nil :initarg :from-range)
+   (from-ranges :initform nil)
+   (to-range    :initform nil :initarg :to-range)
+   (about       :initform nil :initarg :about)))
+
+(setf (alist-get 'file   magit--section-type-alist) 'magit-file-section)
+(setf (alist-get 'module magit--section-type-alist) 'magit-module-section)
+(setf (alist-get 'hunk   magit--section-type-alist) 'magit-hunk-section)
+
+(defclass magit-log-section (magit-section)
+  ((keymap :initform 'magit-log-section-map))
+  :abstract t)
+(defclass magit-unpulled-section (magit-log-section) ())
+(defclass magit-unpushed-section (magit-log-section) ())
+(defclass magit-unmerged-section (magit-log-section) ())
+
+(setf (alist-get 'unpulled magit--section-type-alist) 'magit-unpulled-section)
+(setf (alist-get 'unpushed magit--section-type-alist) 'magit-unpushed-section)
+(setf (alist-get 'unmerged magit--section-type-alist) 'magit-unmerged-section)
+
+;;; User Input
+
+(defvar helm-completion-in-region-default-sort-fn)
+(defvar helm-crm-default-separator)
+(defvar ivy-sort-functions-alist)
+(defvar ivy-sort-matches-functions-alist)
+(defvar vertico-sort-function)
+
+(defvar magit-completing-read--silent-default nil)
+
+(defvar magit-completing-read-default-prompt-predicate
+  (lambda ()
+    (and (eq magit-completing-read-function
+             'magit-builtin-completing-read)
+         (not (or (bound-and-true-p helm-mode)
+                  (bound-and-true-p ivy-mode)
+                  (bound-and-true-p selectrum-mode)
+                  (bound-and-true-p vertico-mode)))))
+  "Function used to determine whether to add default to prompt.
+
+This is used by `magit-completing-read' (which see).
+
+The default function returns nil, when a completion frameworks is used
+for which this is undesirable.  More precisely, it returns nil, when
+`magit-completing-read-function' is not `magit-builtin-completing-read',
+or one of `helm-mode', `ivy-mode', `selectrum-mode' or `vertico-mode'
+is enabled.  When this function returns nil, then nil is passed to
+`format-prompt' (which see), instead of the default (DEF or FALLBACK).")
+
+(defun magit-completing-read ( prompt collection &optional
+                               predicate require-match initial-input
+                               hist def fallback)
+  "Read a choice in the minibuffer, or use the default choice.
+
+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 instead 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 use the default without the user even having to
+confirm that, then `magit-completing-read--silent-default' is set
+to t, otherwise nil.
+
+If it does read a value in the minibuffer, then this function
+acts similarly 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 user exits without a
+  choice, `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'."
+  (setq magit-completing-read--silent-default nil)
+  (if-let ((dwim (and def
+                      (nth 2 (seq-find (pcase-lambda (`(,cmd ,re ,_))
+                                         (and (eq this-command cmd)
+                                              (or (not re)
+                                                  (string-match-p re prompt))))
+                                       magit-dwim-selection)))))
+      (if (eq dwim 'ask)
+          (if (y-or-n-p (format "%s %s? " prompt def))
+              def
+            (user-error "Abort"))
+        (setq magit-completing-read--silent-default t)
+        def)
+    (unless def
+      (setq def fallback))
+    (let ((command this-command)
+          (reply (funcall
+                  magit-completing-read-function
+                  (format-prompt
+                   prompt
+                   (and (funcall magit-completing-read-default-prompt-predicate)
+                        def))
+                  (if (and (not (functionp collection))
+                           def
+                           (not (member def collection)))
+                      (cons def collection)
+                    collection)
+                  predicate
+                  require-match initial-input hist def)))
+      (setq this-command command)
+      ;; Note: Avoid `string=' to support `helm-comp-read-use-marked'.
+      (if (equal reply "")
+          (if require-match
+              (user-error "Nothing selected")
+            nil)
+        reply))))
+
+(defun magit--completion-table (collection)
+  (lambda (string pred action)
+    (if (eq action 'metadata)
+        '(metadata (display-sort-function . identity))
+      (complete-with-action action collection string pred))))
+
+(defun magit-builtin-completing-read
+    (prompt choices &optional predicate require-match initial-input hist def)
+  "Magit wrapper for standard `completing-read' function."
+  (unless (or (bound-and-true-p helm-mode)
+              (bound-and-true-p ivy-mode))
+    (setq choices (magit--completion-table choices)))
+  (let ((ivy-sort-functions-alist nil)
+        (vertico-sort-function nil))
+    (completing-read prompt choices
+                     predicate require-match
+                     initial-input hist def)))
+
+(define-obsolete-function-alias 'magit-completing-read-multiple*
+  'magit-completing-read-multiple "Magit-Section 4.0.0")
+
+(defun magit-completing-read-multiple
+    ( prompt table &optional predicate require-match initial-input
+      hist def inherit-input-method
+      no-split)
+  "Read multiple strings in the minibuffer, with completion.
+Like `completing-read-multiple' but don't mess with order of
+TABLE and take an additional argument NO-SPLIT, which causes
+the user input to be returned as a single unmodified string.
+Also work around various incompatible features of various
+third-party completion frameworks."
+  (cl-letf*
+      (;; To implement NO-SPLIT we have to manipulate the respective
+       ;; `split-string' invocation.  We cannot simply advice it to
+       ;; return the input string because `SELECTRUM' would choke on
+       ;; that string.  Use a variable to pass along the raw user
+       ;; input string. aa5f098ab
+       (input nil)
+       (split-string (symbol-function #'split-string))
+       ((symbol-function #'split-string)
+        (lambda (string &optional separators omit-nulls trim)
+          (when (and no-split
+                     (equal separators crm-separator)
+                     (equal omit-nulls t))
+            (setq input string))
+          (funcall split-string string separators omit-nulls trim)))
+       ;; Prevent `BUILT-IN' completion from messing up our existing
+       ;; order of the completion candidates. aa5f098ab
+       (table (magit--completion-table table))
+       ;; Prevent `IVY' from messing up our existing order. c7af78726
+       (ivy-sort-matches-functions-alist nil)
+       ;; Prevent `HELM' from messing up our existing order.  6fcf994bd
+       (helm-completion-in-region-default-sort-fn nil)
+       ;; Prevent `HELM' from automatically appending the separator,
+       ;; which is counterproductive when NO-SPLIT is non-nil and/or
+       ;; when reading commit ranges. 798aff564
+       (helm-crm-default-separator
+        (if no-split nil (bound-and-true-p helm-crm-default-separator)))
+       ;; And now, the moment we have all been waiting for...
+       (values (completing-read-multiple
+                prompt table predicate require-match initial-input
+                hist def inherit-input-method)))
+    (if no-split input values)))
+
+(defun magit-ido-completing-read
+    (prompt choices &optional predicate require-match initial-input hist def)
+  "Ido-based `completing-read' almost-replacement.
+
+Unfortunately `ido-completing-read' is not suitable as a
+drop-in replacement for `completing-read', instead we use
+`ido-completing-read+' from the third-party package by the
+same name."
+  (if (and (require 'ido-completing-read+ nil t)
+           (fboundp 'ido-completing-read+))
+      (ido-completing-read+ prompt choices predicate require-match
+                            initial-input hist
+                            (or def (and require-match (car choices))))
+    (display-warning 'magit "ido-completing-read+ is not installed
+
+To use Ido completion with Magit you need to install the
+third-party `ido-completing-read+' packages.  Falling
+back to built-in `completing-read' for now." :error)
+    (magit-builtin-completing-read prompt choices predicate require-match
+                                   initial-input hist def)))
+
+(defvar-keymap magit-minibuffer-local-ns-map
+  :parent minibuffer-local-map
+  "SPC" #'magit-whitespace-disallowed
+  "TAB" #'magit-whitespace-disallowed)
+
+(defun magit-whitespace-disallowed ()
+  "Beep to tell the user that whitespace is not allowed."
+  (interactive)
+  (ding)
+  (message "Whitespace isn't allowed here")
+  (setq defining-kbd-macro nil)
+  (force-mode-line-update))
+
+(defun magit-read-string ( prompt &optional initial-input history default-value
+                           inherit-input-method no-whitespace)
+  "Read a string from the minibuffer, prompting with string PROMPT.
+
+This is similar to `read-string', but
+* empty input is only allowed if DEFAULT-VALUE is non-nil in
+  which case that is returned,
+* whitespace is not allowed and leading and trailing whitespace is
+  removed automatically if NO-WHITESPACE is non-nil,
+* `format-prompt' is used internally.
+* an invalid DEFAULT-VALUE is silently ignored."
+  (when default-value
+    (when (consp default-value)
+      (setq default-value (car default-value)))
+    (unless (stringp default-value)
+      (setq default-value nil)))
+  (let* ((minibuffer-completion-table nil)
+         (val (read-from-minibuffer
+               (format-prompt prompt default-value)
+               initial-input (and no-whitespace magit-minibuffer-local-ns-map)
+               nil history default-value inherit-input-method))
+         (trim (lambda (regexp string)
+                 (save-match-data
+                   (if (string-match regexp string)
+                       (replace-match "" t t string)
+                     string)))))
+    (when (and (string= val "") default-value)
+      (setq val default-value))
+    (when no-whitespace
+      (setq val (funcall trim "\\`\\(?:[ \t\n\r]+\\)"
+                         (funcall trim "\\(?:[ \t\n\r]+\\)\\'" val))))
+    (cond ((string= val "")
+           (user-error "Need non-empty input"))
+          ((and no-whitespace (string-match-p "[\s\t\n]" val))
+           (user-error "Input contains whitespace"))
+          (t val))))
+
+(defun magit-read-string-ns ( prompt &optional initial-input history
+                              default-value inherit-input-method)
+  "Call `magit-read-string' with non-nil NO-WHITESPACE."
+  (magit-read-string prompt initial-input history default-value
+                     inherit-input-method t))
+
+(defmacro magit-read-char-case (prompt verbose &rest clauses)
+  (declare (indent 2)
+           (debug (form form &rest (characterp form body))))
+  `(prog1 (pcase (read-char-choice
+                  (let ((parts (nconc (list ,@(mapcar #'cadr clauses))
+                                      ,(and verbose '(list "[C-g] to abort")))))
+                    (concat ,prompt
+                            (mapconcat #'identity (butlast parts) ", ")
+                            ", or "  (car (last parts)) " "))
+                  ',(mapcar #'car clauses))
+            ,@(--map `(,(car it) ,@(cddr it)) clauses))
+     (message "")))
+
+(defun magit-y-or-n-p (prompt &optional action)
+  "Ask user a \"y or n\" or a \"yes or no\" question using PROMPT.
+Which kind of question is used depends on whether
+ACTION is a member of option `magit-slow-confirm'."
+  (if (or (eq magit-slow-confirm t)
+          (and action (member action magit-slow-confirm)))
+      (yes-or-no-p prompt)
+    (y-or-n-p prompt)))
+
+(defvar magit--no-confirm-alist
+  '((safe-with-wip magit-wip-before-change-mode
+                   discard reverse stage-all-changes unstage-all-changes)))
+
+(cl-defun magit-confirm ( action &optional prompt prompt-n noabort
+                          (items nil sitems) prompt-suffix)
+  (declare (indent defun))
+  (setq prompt-n (format (concat (or prompt-n prompt) "? ") (length items)))
+  (setq prompt   (format (concat (or prompt (magit-confirm-make-prompt action))
+                                 "? ")
+                         (car items)))
+  (when prompt-suffix
+    (setq prompt (concat prompt prompt-suffix)))
+  (or (cond ((and (not (eq action t))
+                  (or (eq magit-no-confirm t)
+                      (memq action magit-no-confirm)
+                      (cl-member-if (pcase-lambda (`(,key ,var . ,sub))
+                                      (and (memq key magit-no-confirm)
+                                           (memq action sub)
+                                           (or (not var)
+                                               (and (boundp var)
+                                                    (symbol-value var)))))
+                                    magit--no-confirm-alist)))
+             (or (not sitems) items))
+            ((not sitems)
+             (magit-y-or-n-p prompt action))
+            ((length= items 1)
+             (and (magit-y-or-n-p prompt action) items))
+            ((length> items 1)
+             (and (magit-y-or-n-p (concat (mapconcat #'identity items "\n")
+                                          "\n\n" prompt-n)
+                                  action)
+                  items)))
+      (if noabort nil (user-error "Abort"))))
+
+(defun magit-confirm-files (action files &optional prompt prompt-suffix noabort)
+  (when files
+    (unless prompt
+      (setq prompt (magit-confirm-make-prompt action)))
+    (magit-confirm action
+      (concat prompt " \"%s\"")
+      (concat prompt " %d files")
+      noabort files prompt-suffix)))
+
+(defun magit-confirm-make-prompt (action)
+  (let ((prompt (symbol-name action)))
+    (string-replace "-" " "
+                    (concat (upcase (substring prompt 0 1))
+                            (substring prompt 1)))))
+
+(defun magit-read-number-string (prompt &optional default _history)
+  "Like `read-number' but return value is a string.
+DEFAULT may be a number or a numeric string."
+  (number-to-string
+   (read-number prompt (if (stringp default)
+                           (string-to-number default)
+                         default))))
+
+;;; Debug Utilities
+
+;;;###autoload
+(defun magit-emacs-Q-command ()
+  "Show a shell command that runs an uncustomized Emacs with only Magit loaded.
+See info node `(magit)Debugging Tools' for more information."
+  (interactive)
+  (let ((cmd (mapconcat
+              #'shell-quote-argument
+              `(,(concat invocation-directory invocation-name)
+                "-Q" "--eval" "(setq debug-on-error t)"
+                ,@(cl-mapcan
+                   (lambda (dir) (list "-L" dir))
+                   (delete-dups
+                    (cl-mapcan
+                     (lambda (lib)
+                       (let ((path (locate-library lib)))
+                         (cond
+                          (path
+                           (list (file-name-directory path)))
+                          ((not (equal lib "libgit"))
+                           (error "Cannot find mandatory dependency %s" lib)))))
+                     '(;; Like `LOAD_PATH' in `default.mk'.
+                       "compat"
+                       "dash"
+                       "libgit"
+                       "transient"
+                       "with-editor"
+                       ;; Obviously `magit' itself is needed too.
+                       "magit"
+                       ;; While these are part of the Magit repository,
+                       ;; they are distributed as separate packages.
+                       "magit-section"
+                       "git-commit"
+                       ))))
+                ;; Avoid Emacs bug#16406 by using full path.
+                "-l" ,(file-name-sans-extension (locate-library "magit")))
+              " ")))
+    (message "Uncustomized Magit command saved to kill-ring, %s"
+             "please run it in a terminal.")
+    (kill-new cmd)))
+
+;;; Text Utilities
+
+(defmacro magit-bind-match-strings (varlist string &rest body)
+  "Bind variables to submatches according to VARLIST then evaluate BODY.
+Bind the symbols in VARLIST to submatches of the current match
+data, starting with 1 and incrementing by 1 for each symbol.  If
+the last match was against a string, then that has to be provided
+as STRING."
+  (declare (indent 2) (debug (listp form body)))
+  (let ((s (cl-gensym "string"))
+        (i 0))
+    `(let ((,s ,string))
+       (let ,(save-match-data
+               (cl-mapcan (lambda (sym)
+                            (cl-incf i)
+                            (and (not (eq (aref (symbol-name sym) 0) ?_))
+                                 (list (list sym (list 'match-string i s)))))
+                          varlist))
+         ,@body))))
+
+(defun magit-delete-line ()
+  "Delete the rest of the current line."
+  (delete-region (point) (1+ (line-end-position))))
+
+(defun magit-delete-match (&optional num)
+  "Delete text matched by last search.
+If optional NUM is specified, only delete that subexpression."
+  (delete-region (match-beginning (or num 0))
+                 (match-end (or num 0))))
+
+(defun magit-file-line (file)
+  "Return the first line of FILE as a string."
+  (when (file-regular-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (buffer-substring-no-properties (point-min)
+                                      (line-end-position)))))
+
+(defun magit-file-lines (file &optional keep-empty-lines)
+  "Return a list of strings containing one element per line in FILE.
+Unless optional argument KEEP-EMPTY-LINES is t, trim all empty lines."
+  (when (file-regular-p file)
+    (with-temp-buffer
+      (insert-file-contents file)
+      (split-string (buffer-string) "\n" (not keep-empty-lines)))))
+
+(defun magit-set-header-line-format (string)
+  "Set `header-line-format' in the current buffer based on STRING.
+Pad the left side of STRING so that it aligns with the text area."
+  (setq header-line-format
+        (concat (propertize " " 'display '(space :align-to 0))
+                string)))
+
+(defun magit--format-spec (format specification)
+  "Like `format-spec' but preserve text properties in SPECIFICATION."
+  (with-temp-buffer
+    (insert format)
+    (goto-char (point-min))
+    (while (search-forward "%" nil t)
+      (cond
+       ;; Quoted percent sign.
+       ((eq (char-after) ?%)
+        (delete-char 1))
+       ;; Valid format spec.
+       ((looking-at "\\([-0-9.]*\\)\\([a-zA-Z]\\)")
+        (let* ((num (match-string 1))
+               (spec (string-to-char (match-string 2)))
+               (val (assq spec specification)))
+          (unless val
+            (error "Invalid format character: `%%%c'" spec))
+          (setq val (cdr val))
+          ;; Pad result to desired length.
+          (let ((text (format (concat "%" num "s") val)))
+            ;; Insert first, to preserve text properties.
+            (if (next-property-change 0 (concat " " text))
+                ;; If the inserted text has properties, then preserve those.
+                (insert text)
+              ;; Otherwise preserve FORMAT's properties, like `format-spec'.
+              (insert-and-inherit text))
+            ;; Delete the specifier body.
+            (delete-region (+ (match-beginning 0) (length text))
+                           (+ (match-end 0) (length text)))
+            ;; Delete the percent sign.
+            (delete-region (1- (match-beginning 0)) (match-beginning 0)))))
+       ;; Signal an error on bogus format strings.
+       (t
+        (error "Invalid format string"))))
+    (buffer-string)))
+
+;;; Missing from Emacs
+
+(defun magit-kill-this-buffer ()
+  "Kill the current buffer."
+  (interactive)
+  (kill-buffer (current-buffer)))
+
+(defun magit--buffer-string (&optional min max trim)
+  "Like `buffer-substring-no-properties' but the arguments are optional.
+
+This combines the benefits of `buffer-string', `buffer-substring'
+and `buffer-substring-no-properties' into one function that is
+not as painful to use as the latter.  I.e., you can write
+  (magit--buffer-string)
+instead of
+  (buffer-substring-no-properties (point-min)
+                                  (point-max))
+
+Optional MIN defaults to the value of `point-min'.
+Optional MAX defaults to the value of `point-max'.
+
+If optional TRIM is non-nil, then all leading and trailing
+whitespace is remove.  If it is the newline character, then
+one trailing newline is added."
+  ;; Lets write that one last time and be done with it:
+  (let ((str (buffer-substring-no-properties (or min (point-min))
+                                             (or max (point-max)))))
+    (if trim
+        (concat (string-trim str)
+                (and (eq trim ?\n) "\n"))
+      str)))
+
+(defun magit--version> (v1 v2)
+  "Return t if version V1 is higher (younger) than V2.
+This function should be named `version>' and be part of Emacs."
+  (version-list-< (version-to-list v2) (version-to-list v1)))
+
+(defun magit--version>= (v1 v2)
+  "Return t if version V1 is higher (younger) than or equal to V2.
+This function should be named `version>=' and be part of Emacs."
+  (version-list-<= (version-to-list v2) (version-to-list v1)))
+
+;;; Kludges for Emacs Bugs
+
+(when (< emacs-major-version 27)
+  ;; Work around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559.
+  ;; Fixed by cb55ccae8be946f1562d74718086a4c8c8308ee5 in Emacs 27.1.
+  (with-eval-after-load 'vc-git
+    (defun vc-git-conflicted-files (directory)
+      "Return the list of files with conflicts in DIRECTORY."
+      (let* ((status
+              (vc-git--run-command-string directory "diff-files"
+                                          "--name-status"))
+             (lines (when status (split-string status "\n" 'omit-nulls)))
+             files)
+        (dolist (line lines files)
+          (when (string-match "\\([ MADRCU?!]\\)[ \t]+\\(.+\\)" line)
+            (let ((state (match-string 1 line))
+                  (file (match-string 2 line)))
+              (when (equal state "U")
+                (push (expand-file-name file directory) files)))))))))
+
+(when (< emacs-major-version 27)
+  (defun vc-git--call@bug21559 (fn buffer command &rest args)
+    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
+    (let ((process-environment process-environment))
+      (when revert-buffer-in-progress-p
+        (push "GIT_OPTIONAL_LOCKS=0" process-environment))
+      (apply fn buffer command args)))
+  (advice-add 'vc-git--call :around 'vc-git--call@bug21559)
+
+  (defun vc-git-command@bug21559
+      (fn buffer okstatus file-or-list &rest flags)
+    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
+    (let ((process-environment process-environment))
+      (when revert-buffer-in-progress-p
+        (push "GIT_OPTIONAL_LOCKS=0" process-environment))
+      (apply fn buffer okstatus file-or-list flags)))
+  (advice-add 'vc-git-command :around 'vc-git-command@bug21559)
+
+  (defun auto-revert-handler@bug21559 (fn)
+    "Backport https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21559."
+    (let ((revert-buffer-in-progress-p t))
+      (funcall fn)))
+  (advice-add 'auto-revert-handler :around 'auto-revert-handler@bug21559)
+  )
+
+(defun magit-which-function ()
+  "Return current function name based on point.
+
+This is a simple wrapper around `which-function', that resets
+Imenu's potentially outdated and therefore unreliable cache by
+setting `imenu--index-alist' to nil before calling that function."
+  (setq imenu--index-alist nil)
+  (which-function))
+
+;;; Kludges for Custom
+
+(defun magit-custom-initialize-reset (symbol exp)
+  "Initialize SYMBOL based on EXP.
+Set the value of the variable SYMBOL, using `set-default'
+\(unlike `custom-initialize-reset', which uses the `:set'
+function if any).  The value is either the symbol's current
+value (as obtained using the `:get' function), if any, or
+the value in the symbol's `saved-value' property if any, or
+\(last of all) the value of EXP."
+  (set-default-toplevel-value
+   symbol
+   (condition-case nil
+       (let ((def (default-toplevel-value symbol))
+             (getter (get symbol 'custom-get)))
+         (if getter (funcall getter symbol) def))
+     (error
+      (eval (let ((sv (get symbol 'saved-value)))
+              (if sv (car sv) exp)))))))
+
+(defun magit-hook-custom-get (symbol)
+  (if (symbol-file symbol 'defvar)
+      (default-toplevel-value symbol)
+    ;;
+    ;; Called by `custom-initialize-reset' on behalf of `symbol's
+    ;; `defcustom', which is being evaluated for the first time to
+    ;; set the initial value, but there's already a default value,
+    ;; which most likely was established by one or more `add-hook'
+    ;; calls.
+    ;;
+    ;; We combine the `standard-value' and the current value, while
+    ;; preserving the order established by `:options', and return
+    ;; the result of that to be used as the "initial" default value.
+    ;;
+    (let ((standard (eval (car (get symbol 'standard-value))))
+          (current (default-toplevel-value symbol))
+          (value nil))
+      (dolist (fn (get symbol 'custom-options))
+        (when (or (memq fn standard)
+                  (memq fn current))
+          (push fn value)))
+      (dolist (fn current)
+        (unless (memq fn value)
+          (push fn value)))
+      (nreverse value))))
+
+;;; Kludges for Info Manuals
+
+;;;###autoload
+(defun Info-follow-nearest-node--magit-gitman (fn &optional fork)
+  (let ((node (Info-get-token
+               (point) "\\*note[ \n\t]+"
+               "\\*note[ \n\t]+\\([^:]*\\):\\(:\\|[ \n\t]*(\\)?")))
+    (if (and node (string-match "^(gitman)\\(.+\\)" node))
+        (pcase magit-view-git-manual-method
+          ('info  (funcall fn fork))
+          ('man   (require 'man)
+                  (man (match-string 1 node)))
+          ('woman (require 'woman)
+                  (woman (match-string 1 node)))
+          (_
+           (user-error "Invalid value for `magit-view-git-manual-method'")))
+      (funcall fn fork))))
+
+;;;###autoload
+(advice-add 'Info-follow-nearest-node :around
+            #'Info-follow-nearest-node--magit-gitman)
+
+;; When making changes here, then also adjust the copy in docs/Makefile.
+;;;###autoload
+(advice-add 'org-man-export :around #'org-man-export--magit-gitman)
+;;;###autoload
+(defun org-man-export--magit-gitman (fn link description format)
+  (if (and (eq format 'texinfo)
+           (string-prefix-p "git" link))
+      (string-replace "%s" link "
+@ifinfo
+@ref{%s,,,gitman,}.
+@end ifinfo
+@ifhtml
+@html
+the <a href=\"http://git-scm.com/docs/%s\">%s(1)</a> manpage.
+@end html
+@end ifhtml
+@iftex
+the %s(1) manpage.
+@end iftex
+")
+    (funcall fn link description format)))
+
+;;; Kludges for Package Managers
+
+(defun magit--straight-chase-links (filename)
+  "Chase links in FILENAME until a name that is not a link.
+
+This is the same as `file-chase-links', except that it also
+handles fake symlinks that are created by the package manager
+straight.el on Windows.
+
+See <https://github.com/raxod502/straight.el/issues/520>."
+  (when (and (bound-and-true-p straight-symlink-emulation-mode)
+             (fboundp 'straight-chase-emulated-symlink))
+    (when-let ((target (straight-chase-emulated-symlink filename)))
+      (unless (eq target 'broken)
+        (setq filename target))))
+  (file-chase-links filename))
+
+;;; Kludges for older Emacs versions
+
+(if (fboundp 'with-connection-local-variables)
+    (defalias 'magit--with-connection-local-variables
+      #'with-connection-local-variables)
+  (defmacro magit--with-connection-local-variables (&rest body)
+    "Abridged `with-connection-local-variables' for pre Emacs 27 compatibility.
+Bind shell file name and switch for remote execution.
+`with-connection-local-variables' isn't available until Emacs 27.
+This kludge provides the minimal functionality required by
+Magit."
+    `(if (file-remote-p default-directory)
+         (pcase-let ((`(,shell-file-name ,shell-command-switch)
+                      (with-no-warnings ; about unknown tramp functions
+                        (require 'tramp)
+                        (let ((vec (tramp-dissect-file-name
+                                    default-directory)))
+                          (list (tramp-get-method-parameter
+                                 vec 'tramp-remote-shell)
+                                (mapconcat #'identity
+                                           (tramp-get-method-parameter
+                                            vec 'tramp-remote-shell-args)
+                                           " "))))))
+           ,@body)
+       ,@body)))
+
+(put 'magit--with-connection-local-variables 'lisp-indent-function 'defun)
+
+;;; Miscellaneous
+
+(defun magit-message (format-string &rest args)
+  "Display a message at the bottom of the screen, or not.
+Like `message', except that if the users configured option
+`magit-no-message' to prevent the message corresponding to
+FORMAT-STRING to be displayed, then don't."
+  (unless (--first (string-prefix-p it format-string) magit-no-message)
+    (apply #'message format-string args)))
+
+(defun magit-msg (format-string &rest args)
+  "Display a message at the bottom of the screen, but don't log it.
+Like `message', except that `message-log-max' is bound to nil."
+  (let ((message-log-max nil))
+    (apply #'message format-string args)))
+
+(defmacro magit--with-temp-position (buf pos &rest body)
+  (declare (indent 2))
+  `(with-current-buffer ,buf
+     (save-excursion
+       (save-restriction
+         (widen)
+         (goto-char (or ,pos 1))
+         ,@body))))
+
+(defun magit--ellipsis (&optional where)
+  "Build an ellipsis always as string, depending on WHERE."
+  (if (stringp magit-ellipsis)
+      magit-ellipsis
+    (if-let ((pair (car (or
+                         (alist-get (or where t) magit-ellipsis)
+                         (alist-get t magit-ellipsis)))))
+        (pcase-let ((`(,fancy . ,universal) pair))
+          (let ((ellipsis (if (and fancy (char-displayable-p fancy))
+                              fancy
+                            universal)))
+            (if (characterp ellipsis)
+                (char-to-string ellipsis)
+              ellipsis)))
+      (user-error "Variable magit-ellipsis is invalid"))))
+
+(defun magit--ext-regexp-quote (str)
+  "Like `reqexp-quote', but for Extended Regular Expressions."
+  (let ((special (string-to-list "[*.\\?+^$({"))
+        (quoted nil))
+    (mapc (lambda (c)
+            (when (memq c special)
+              (push ?\\ quoted))
+            (push c quoted))
+          str)
+    (concat (nreverse quoted))))
+
+;;; _
+(provide 'magit-base)
+;;; magit-base.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-base.elc b/emacs/elpa/magit-20240514.1843/magit-base.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-bisect.el b/emacs/elpa/magit-20240514.1843/magit-bisect.el
diff --git a/emacs/elpa/magit-20240514.1843/magit-bisect.elc b/emacs/elpa/magit-20240514.1843/magit-bisect.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-blame.el b/emacs/elpa/magit-20240514.1843/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))
+      (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 to 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-20240426.2118/magit-blame.elc b/emacs/elpa/magit-20240514.1843/magit-blame.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-bookmark.el b/emacs/elpa/magit-20240514.1843/magit-bookmark.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-bookmark.elc b/emacs/elpa/magit-20240514.1843/magit-bookmark.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-branch.el b/emacs/elpa/magit-20240514.1843/magit-branch.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-branch.elc b/emacs/elpa/magit-20240514.1843/magit-branch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-bundle.el b/emacs/elpa/magit-20240514.1843/magit-bundle.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-bundle.elc b/emacs/elpa/magit-20240514.1843/magit-bundle.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-clone.el b/emacs/elpa/magit-20240514.1843/magit-clone.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-clone.elc b/emacs/elpa/magit-20240514.1843/magit-clone.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-commit.el b/emacs/elpa/magit-20240514.1843/magit-commit.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-commit.elc b/emacs/elpa/magit-20240514.1843/magit-commit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-core.el b/emacs/elpa/magit-20240514.1843/magit-core.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-core.elc b/emacs/elpa/magit-20240514.1843/magit-core.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-diff.el b/emacs/elpa/magit-20240514.1843/magit-diff.el
@@ -0,0 +1,3567 @@
+;;; magit-diff.el --- Inspect Git diffs  -*- 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 support for looking at Git diffs and
+;; commits.
+
+;;; Code:
+
+(require 'magit-core)
+(require 'git-commit)
+
+(eval-when-compile (require 'ansi-color))
+(require 'diff-mode)
+(require 'image)
+(require 'smerge-mode)
+
+;; For `magit-diff-popup'
+(declare-function magit-stash-show "magit-stash" (stash &optional args files))
+;; For `magit-diff-visit-file'
+(declare-function magit-find-file-noselect "magit-files" (rev file))
+(declare-function magit-status-setup-buffer "magit-status" (&optional directory))
+;; For `magit-diff-while-committing'
+(declare-function magit-commit-diff-1 "magit-commit" ())
+(declare-function magit-commit-message-buffer "magit-commit" ())
+;; For `magit-insert-revision-gravatar'
+(defvar gravatar-size)
+;; For `magit-show-commit' and `magit-diff-show-or-scroll'
+(declare-function magit-current-blame-chunk "magit-blame" (&optional type noerror))
+(declare-function magit-blame-mode "magit-blame" (&optional arg))
+(defvar magit-blame-mode)
+;; For `magit-diff-show-or-scroll'
+(declare-function git-rebase-current-line "git-rebase" ())
+;; For `magit-diff-unmerged'
+(declare-function magit-merge-in-progress-p "magit-merge" ())
+(declare-function magit--merge-range "magit-merge" (&optional head))
+;; For `magit-diff--dwim'
+(declare-function forge--pullreq-range "forge-pullreq"
+                  (pullreq &optional endpoints))
+(declare-function forge--pullreq-ref "forge-pullreq" (pullreq))
+;; For `magit-diff-wash-diff'
+(declare-function ansi-color-apply-on-region "ansi-color")
+;; For `magit-diff-wash-submodule'
+(declare-function magit-log-wash-log "magit-log" (style args))
+;; For keymaps and menus
+(declare-function magit-apply "magit-apply" (&rest args))
+(declare-function magit-stage "magit-apply" (&optional indent))
+(declare-function magit-unstage "magit-apply" ())
+(declare-function magit-discard "magit-apply" ())
+(declare-function magit-reverse "magit-apply" (&rest args))
+(declare-function magit-file-rename "magit-files" (file newname))
+(declare-function magit-file-untrack "magit-files" (files &optional force))
+(declare-function magit-commit-add-log "magit-commit" ())
+(declare-function magit-diff-trace-definition "magit-log" ())
+(declare-function magit-patch-save "magit-patch" (files &optional arg))
+(declare-function magit-do-async-shell-command "magit-extras" (file))
+(declare-function magit-add-change-log-entry "magit-extras"
+                  (&optional whoami file-name other-window))
+(declare-function magit-add-change-log-entry-other-window "magit-extras"
+                  (&optional whoami file-name))
+(declare-function magit-diff-edit-hunk-commit "magit-extras" (file))
+(declare-function magit-smerge-keep-current "magit-apply" ())
+(declare-function magit-smerge-keep-upper "magit-apply" ())
+(declare-function magit-smerge-keep-base "magit-apply" ())
+(declare-function magit-smerge-keep-lower "magit-apply" ())
+
+(eval-when-compile
+  (cl-pushnew 'orig-rev eieio--known-slot-names)
+  (cl-pushnew 'action-type eieio--known-slot-names)
+  (cl-pushnew 'target eieio--known-slot-names))
+
+;;; Options
+;;;; Diff Mode
+
+(defgroup magit-diff nil
+  "Inspect and manipulate Git diffs."
+  :link '(info-link "(magit)Diffing")
+  :group 'magit-commands
+  :group 'magit-modes)
+
+(defcustom magit-diff-mode-hook nil
+  "Hook run after entering Magit-Diff mode."
+  :group 'magit-diff
+  :type 'hook)
+
+(defcustom magit-diff-sections-hook
+  '(magit-insert-diff
+    magit-insert-xref-buttons)
+  "Hook run to insert sections into a `magit-diff-mode' buffer."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-diff
+  :type 'hook)
+
+(defcustom magit-diff-expansion-threshold 60
+  "After how many seconds not to expand anymore diffs.
+
+Except in status buffers, diffs usually start out fully expanded.
+Because that can take a long time, all diffs that haven't been
+fontified during a refresh before the threshold defined here are
+instead displayed with their bodies collapsed.
+
+Note that this can cause sections that were previously expanded
+to be collapsed.  So you should not pick a very low value here.
+
+The hook function `magit-diff-expansion-threshold' has to be a
+member of `magit-section-set-visibility-hook' for this option
+to have any effect."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-diff
+  :type 'float)
+
+(defcustom magit-diff-highlight-hunk-body t
+  "Whether to highlight bodies of selected hunk sections.
+This only has an effect if `magit-diff-highlight' is a
+member of `magit-section-highlight-hook', which see."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+(defcustom magit-diff-highlight-hunk-region-functions
+  '(magit-diff-highlight-hunk-region-dim-outside
+    magit-diff-highlight-hunk-region-using-overlays)
+  "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.
+The underline variant was implemented because Eli said that is
+how we should do it.  However the overlay variant actually works
+better.  Also see https://github.com/magit/magit/issues/2758.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :set-after '(magit-diff-show-lines-boundaries)
+  :group 'magit-diff
+  :type 'hook
+  :options '(magit-diff-highlight-hunk-region-dim-outside
+             magit-diff-highlight-hunk-region-using-underline
+             magit-diff-highlight-hunk-region-using-overlays
+             magit-diff-highlight-hunk-region-using-face))
+
+(defcustom magit-diff-unmarked-lines-keep-foreground t
+  "Whether `magit-diff-highlight-hunk-region-dim-outside' preserves foreground.
+When this is set to nil, then that function only adjusts the
+foreground color but added and removed lines outside the region
+keep their distinct foreground colors."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+(defcustom magit-diff-refine-hunk nil
+  "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."
+  :group 'magit-diff
+  :safe (lambda (val) (memq val '(nil t all)))
+  :type '(choice (const :tag "Never" nil)
+                 (const :tag "Current" t)
+                 (const :tag "All" all)))
+
+(defcustom magit-diff-refine-ignore-whitespace smerge-refine-ignore-whitespace
+  "Whether to ignore whitespace changes in word-granularity differences."
+  :package-version '(magit . "3.0.0")
+  :set-after '(smerge-refine-ignore-whitespace)
+  :group 'magit-diff
+  :safe 'booleanp
+  :type 'boolean)
+
+(put 'magit-diff-refine-hunk 'permanent-local t)
+
+(defcustom magit-diff-adjust-tab-width nil
+  "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."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-diff
+  :type '(choice (const   :tag "Never" nil)
+                 (const   :tag "If file-visiting buffer exists" t)
+                 (integer :tag "If file isn't larger than N bytes")
+                 (const   :tag "Always" always)))
+
+(defcustom magit-diff-paint-whitespace t
+  "Specify where to highlight whitespace errors.
+
+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
+for `uncommitted'.
+
+The option `magit-diff-paint-whitespace-lines' controls for
+what lines (added/remove/context) errors are highlighted.
+
+The options `magit-diff-highlight-trailing' and
+`magit-diff-highlight-indentation' control what kind of
+whitespace errors are highlighted."
+  :group 'magit-diff
+  :safe (lambda (val) (memq val '(t nil uncommitted status)))
+  :type '(choice (const :tag "In all diffs" t)
+                 (const :tag "Only in uncommitted changes" uncommitted)
+                 (const :tag "Never" nil)))
+
+(defcustom magit-diff-paint-whitespace-lines t
+  "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."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-diff
+  :safe (lambda (val) (memq val '(t both all)))
+  :type '(choice (const :tag "in added lines" t)
+                 (const :tag "in added and removed lines" both)
+                 (const :tag "in added, removed and context lines" all)))
+
+(defcustom magit-diff-highlight-trailing t
+  "Whether to highlight whitespace at the end of a line in diffs.
+Used only when `magit-diff-paint-whitespace' is non-nil."
+  :group 'magit-diff
+  :safe 'booleanp
+  :type 'boolean)
+
+(defcustom magit-diff-highlight-indentation nil
+  "Highlight the \"wrong\" indentation style.
+Used only when `magit-diff-paint-whitespace' is 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."
+  :group 'magit-diff
+  :type `(repeat (cons (string :tag "Directory regexp")
+                       (choice (const :tag "Tabs" tabs)
+                               (integer :tag "Spaces" :value ,tab-width)
+                               (const :tag "Neither" nil)))))
+
+(defcustom magit-diff-hide-trailing-cr-characters
+  (and (memq system-type '(ms-dos windows-nt)) t)
+  "Whether to hide ^M characters at the end of a line in diffs."
+  :package-version '(magit . "2.6.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+(defcustom magit-diff-highlight-keywords t
+  "Whether to highlight bracketed keywords in commit messages."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+(defcustom magit-diff-extra-stat-arguments nil
+  "Additional arguments to be used alongside `--stat'.
+
+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'.  See the git-diff(1) manpage."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-diff
+  :type '(radio (function-item magit-diff-use-window-width-as-stat-width)
+                function
+                (list string)
+                (const :tag "None" nil)))
+
+;;;; File Diff
+
+(defcustom magit-diff-buffer-file-locked t
+  "Whether `magit-diff-buffer-file' uses a dedicated buffer."
+  :package-version '(magit . "2.7.0")
+  :group 'magit-commands
+  :group 'magit-diff
+  :type 'boolean)
+
+;;;; Revision Mode
+
+(defgroup magit-revision nil
+  "Inspect and manipulate Git commits."
+  :link '(info-link "(magit)Revision Buffer")
+  :group 'magit-modes)
+
+(defcustom magit-revision-mode-hook
+  '(bug-reference-mode
+    goto-address-mode)
+  "Hook run after entering Magit-Revision mode."
+  :group 'magit-revision
+  :type 'hook
+  :options '(bug-reference-mode
+             goto-address-mode))
+
+(defcustom magit-revision-sections-hook
+  '(magit-insert-revision-tag
+    magit-insert-revision-headers
+    magit-insert-revision-message
+    magit-insert-revision-notes
+    magit-insert-revision-diff
+    magit-insert-xref-buttons)
+  "Hook run to insert sections into a `magit-revision-mode' buffer."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-revision
+  :type 'hook)
+
+(defcustom magit-revision-headers-format "\
+Author:     %aN <%aE>
+AuthorDate: %ad
+Commit:     %cN <%cE>
+CommitDate: %cd
+"
+  "Format string used to insert headers in revision buffers.
+
+All headers in revision buffers are inserted by the section
+inserter `magit-insert-revision-headers'.  Some of the headers
+are created by calling `git show --format=FORMAT' where FORMAT
+is the format specified here.  Other headers are hard coded or
+subject to option `magit-revision-insert-related-refs'."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-revision
+  :type 'string)
+
+(defcustom magit-revision-insert-related-refs t
+  "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.
+
+See user option `magit-revision-insert-related-refs-display-alist'
+to hide specific sets of related branches."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-revision
+  :type '(choice (const :tag "don't" nil)
+                 (const :tag "local only" t)
+                 (const :tag "all related" all)
+                 (const :tag "all containing, local merged" mixed)))
+
+(defcustom magit-revision-insert-related-refs-display-alist nil
+  "How `magit-insert-revision-headers' displays related branch types.
+
+This is an alist, with recognised keys being the symbols
+`parents', `merged', `contained', `follows', and `precedes';
+and the supported values for each key being:
+
+`nil'   Hide these related branches.
+`t'     Show these related branches.
+
+Keys which are not present in the alist have an implicit value `t'
+\(so the default alist value of nil means all related branch types
+will be shown.)
+
+The types to be shown are additionally subject to user option
+`magit-revision-insert-related-refs'."
+  :package-version '(magit . "3.3.1")
+  :group 'magit-revision
+  :type '(alist :key-type (symbol :tag "Type of related branch")
+                :value-type (boolean :tag "Display"))
+  :options (mapcar (lambda (sym)
+                     `(,sym (choice (const :tag "Hide" nil)
+                                    (const :tag "Show" t))))
+                   '(parents merged contained follows precedes)))
+
+(defcustom magit-revision-use-hash-sections 'quicker
+  "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\"."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-revision
+  :type '(choice (const :tag "Use sections, quickest" quickest)
+                 (const :tag "Use sections, quicker" quicker)
+                 (const :tag "Use sections, quick" quick)
+                 (const :tag "Use sections, slow" slow)
+                 (const :tag "Don't use sections" nil)))
+
+(defcustom magit-revision-show-gravatars nil
+  "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-header-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."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-revision
+  :type '(choice
+          (const :tag "Don't show gravatars" nil)
+          (const :tag "Show gravatars" t)
+          (const :tag "Show author gravatar" author)
+          (const :tag "Show committer gravatar" committer)
+          (cons  :tag "Show gravatars using custom regexps"
+                 (choice (const  :tag "No author image" nil)
+                         (regexp :tag "Author regexp"    "^Author:     "))
+                 (choice (const  :tag "No committer image" nil)
+                         (regexp :tag "Committer regexp" "^Commit:     ")))))
+
+(defcustom magit-revision-fill-summary-line nil
+  "Whether to fill excessively long summary lines.
+
+If this is an integer, then the summary line is filled if it is
+longer than either the limit specified here or `window-width'.
+
+You may want to only set this locally in \".dir-locals-2.el\" for
+repositories known to contain bad commit messages.
+
+The body of the message is left alone because (a) most people who
+write excessively long summary lines usually don't add a body and
+\(b) even people who have the decency to wrap their lines may have
+a good reason to include a long line in the body sometimes."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-revision
+  :type '(choice (const   :tag "Don't fill" nil)
+                 (integer :tag "Fill if longer than")))
+
+(defcustom magit-revision-filter-files-on-follow nil
+  "Whether to honor file filter if log arguments include --follow.
+
+When a commit is displayed from a log buffer, the resulting
+revision buffer usually shares the log's file arguments,
+restricting the diff to those files.  However, there's a
+complication when the log arguments include --follow: if the log
+follows a file across a rename event, keeping the file
+restriction would mean showing an empty diff in revision buffers
+for commits before the rename event.
+
+When this option is nil, the revision buffer ignores the log's
+filter if the log arguments include --follow.  If non-nil, the
+log's file filter is always honored."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-revision
+  :type 'boolean)
+
+;;;; Visit Commands
+
+(defcustom magit-diff-visit-previous-blob t
+  "Whether `magit-diff-visit-file' may visit the previous blob.
+
+When this is t 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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+(defcustom magit-diff-visit-avoid-head-blob nil
+  "Whether `magit-diff-visit-file' avoids visiting a blob from `HEAD'.
+
+By default `magit-diff-visit-file' always visits the blob that
+added the current line, while `magit-diff-visit-worktree-file'
+visits the respective file in the working tree.  For the `HEAD'
+commit, the former command used to visit the worktree file too,
+but that made it impossible to visit a blob from `HEAD'.
+
+When point is on a removed line and that change has not been
+committed yet, then `magit-diff-visit-file' now visits the last
+blob that still had that line, which is a blob from `HEAD'.
+Previously this function used to visit the worktree file not
+only for added lines but also for such removed lines.
+
+If you prefer the old behaviors, then set this to t."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-diff
+  :type 'boolean)
+
+;;; Faces
+
+(defface magit-diff-file-heading
+  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
+       :weight bold))
+  "Face for diff file headings."
+  :group 'magit-faces)
+
+(defface magit-diff-file-heading-highlight
+  `((t ,@(and (>= emacs-major-version 27) '(:extend t))
+       :inherit magit-section-highlight))
+  "Face for current diff file headings."
+  :group 'magit-faces)
+
+(defface magit-diff-file-heading-selection
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-file-heading-highlight
+     :foreground "salmon4")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-file-heading-highlight
+     :foreground "LightSalmon3"))
+  "Face for selected diff file headings."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-heading
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey90"
+     :foreground "grey20")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey25"
+     :foreground "grey95"))
+  "Face for diff hunk headings."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-heading-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey80"
+     :foreground "grey20")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey35"
+     :foreground "grey95"))
+  "Face for current diff hunk headings."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-heading-selection
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-hunk-heading-highlight
+     :foreground "salmon4")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-hunk-heading-highlight
+     :foreground "LightSalmon3"))
+  "Face for selected diff hunk headings."
+  :group 'magit-faces)
+
+(defface magit-diff-hunk-region
+  `((t :inherit bold
+       ,@(and (>= emacs-major-version 27)
+              (list :extend (ignore-errors (face-attribute 'region :extend))))))
+  "Face used by `magit-diff-highlight-hunk-region-using-face'.
+
+This face is overlaid over text that uses other hunk faces,
+and those normally set the foreground and background colors.
+The `:foreground' and especially the `:background' properties
+should be avoided here.  Setting the latter would cause the
+loss of information.  Good properties to set here are `:weight'
+and `:slant'."
+  :group 'magit-faces)
+
+(defface magit-diff-revision-summary
+  '((t :inherit magit-diff-hunk-heading))
+  "Face for commit message summaries."
+  :group 'magit-faces)
+
+(defface magit-diff-revision-summary-highlight
+  '((t :inherit magit-diff-hunk-heading-highlight))
+  "Face for highlighted commit message summaries."
+  :group 'magit-faces)
+
+(defface magit-diff-lines-heading
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-hunk-heading-highlight
+     :background "LightSalmon3")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :inherit magit-diff-hunk-heading-highlight
+     :foreground "grey80"
+     :background "salmon4"))
+  "Face for diff hunk heading when lines are marked."
+  :group 'magit-faces)
+
+(defface magit-diff-lines-boundary
+  `((t ,@(and (>= emacs-major-version 27) '(:extend t)) ; !important
+       :inherit magit-diff-lines-heading))
+  "Face for boundary of marked lines in diff hunk."
+  :group 'magit-faces)
+
+(defface magit-diff-conflict-heading
+  '((t :inherit magit-diff-hunk-heading))
+  "Face for conflict markers."
+  :group 'magit-faces)
+
+(defface magit-diff-added
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#ddffdd"
+     :foreground "#22aa22")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#335533"
+     :foreground "#ddffdd"))
+  "Face for lines in a diff that have been added."
+  :group 'magit-faces)
+
+(defface magit-diff-removed
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#ffdddd"
+     :foreground "#aa2222")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#553333"
+     :foreground "#ffdddd"))
+  "Face for lines in a diff that have been removed."
+  :group 'magit-faces)
+
+(defface magit-diff-our
+  '((t :inherit magit-diff-removed))
+  "Face for lines in a diff for our side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-base
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#ffffcc"
+     :foreground "#aaaa11")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#555522"
+     :foreground "#ffffcc"))
+  "Face for lines in a diff for the base side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-their
+  '((t :inherit magit-diff-added))
+  "Face for lines in a diff for their side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-context
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "grey50")
+    (((class color) (background  dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :foreground "grey70"))
+  "Face for lines in a diff that are unchanged."
+  :group 'magit-faces)
+
+(defface magit-diff-added-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#cceecc"
+     :foreground "#22aa22")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#336633"
+     :foreground "#cceecc"))
+  "Face for lines in a diff that have been added."
+  :group 'magit-faces)
+
+(defface magit-diff-removed-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#eecccc"
+     :foreground "#aa2222")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#663333"
+     :foreground "#eecccc"))
+  "Face for lines in a diff that have been removed."
+  :group 'magit-faces)
+
+(defface magit-diff-our-highlight
+  '((t :inherit magit-diff-removed-highlight))
+  "Face for lines in a diff for our side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-base-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#eeeebb"
+     :foreground "#aaaa11")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "#666622"
+     :foreground "#eeeebb"))
+  "Face for lines in a diff for the base side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-their-highlight
+  '((t :inherit magit-diff-added-highlight))
+  "Face for lines in a diff for their side in a conflict."
+  :group 'magit-faces)
+
+(defface magit-diff-context-highlight
+  `((((class color) (background light))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey95"
+     :foreground "grey50")
+    (((class color) (background dark))
+     ,@(and (>= emacs-major-version 27) '(:extend t))
+     :background "grey20"
+     :foreground "grey70"))
+  "Face for lines in the current context in a diff."
+  :group 'magit-faces)
+
+(defface magit-diff-whitespace-warning
+  '((t :inherit trailing-whitespace))
+  "Face for highlighting whitespace errors added lines."
+  :group 'magit-faces)
+
+(defface magit-diffstat-added
+  '((((class color) (background light)) :foreground "#22aa22")
+    (((class color) (background  dark)) :foreground "#448844"))
+  "Face for plus sign in diffstat."
+  :group 'magit-faces)
+
+(defface magit-diffstat-removed
+  '((((class color) (background light)) :foreground "#aa2222")
+    (((class color) (background  dark)) :foreground "#aa4444"))
+  "Face for minus sign in diffstat."
+  :group 'magit-faces)
+
+;;; Arguments
+;;;; Prefix Classes
+
+(defclass magit-diff-prefix (transient-prefix)
+  ((history-key :initform 'magit-diff)
+   (major-mode  :initform 'magit-diff-mode)))
+
+(defclass magit-diff-refresh-prefix (magit-diff-prefix)
+  ((history-key :initform 'magit-diff)
+   (major-mode  :initform nil)))
+
+;;;; Prefix Methods
+
+(cl-defmethod transient-init-value ((obj magit-diff-prefix))
+  (pcase-let ((`(,args ,files)
+               (magit-diff--get-value 'magit-diff-mode
+                                      magit-prefix-use-buffer-arguments)))
+    (unless (eq transient-current-command 'magit-dispatch)
+      (when-let ((file (magit-file-relative-name)))
+        (setq files (list file))))
+    (oset obj value (if files `(("--" ,@files) ,args) args))))
+
+(cl-defmethod transient-init-value ((obj magit-diff-refresh-prefix))
+  (oset obj value (if magit-buffer-diff-files
+                      `(("--" ,@magit-buffer-diff-files)
+                        ,magit-buffer-diff-args)
+                    magit-buffer-diff-args)))
+
+(cl-defmethod transient-set-value ((obj magit-diff-prefix))
+  (magit-diff--set-value obj))
+
+(cl-defmethod transient-save-value ((obj magit-diff-prefix))
+  (magit-diff--set-value obj 'save))
+
+;;;; Argument Access
+
+(defun magit-diff-arguments (&optional mode)
+  "Return the current diff arguments."
+  (if (memq transient-current-command '(magit-diff magit-diff-refresh))
+      (magit--transient-args-and-files)
+    (magit-diff--get-value (or mode 'magit-diff-mode))))
+
+(defun magit-diff--get-value (mode &optional use-buffer-args)
+  (unless use-buffer-args
+    (setq use-buffer-args magit-direct-use-buffer-arguments))
+  (let (args files)
+    (cond
+     ((and (memq use-buffer-args '(always selected current))
+           (eq major-mode mode))
+      (setq args  magit-buffer-diff-args)
+      (setq files magit-buffer-diff-files))
+     ((and (memq use-buffer-args '(always selected))
+           (when-let ((buffer (magit-get-mode-buffer
+                               mode nil
+                               (eq use-buffer-args 'selected))))
+             (setq args  (buffer-local-value 'magit-buffer-diff-args buffer))
+             (setq files (buffer-local-value 'magit-buffer-diff-files buffer))
+             t)))
+     ((plist-member (symbol-plist mode) 'magit-diff-current-arguments)
+      (setq args (get mode 'magit-diff-current-arguments)))
+     ((when-let ((elt (assq (intern (format "magit-diff:%s" mode))
+                            transient-values)))
+        (setq args (cdr elt))
+        t))
+     (t
+      (setq args (get mode 'magit-diff-default-arguments))))
+    (list args files)))
+
+(defun magit-diff--set-value (obj &optional save)
+  (pcase-let* ((obj  (oref obj prototype))
+               (mode (or (oref obj major-mode) major-mode))
+               (key  (intern (format "magit-diff:%s" mode)))
+               (`(,args ,files) (magit--transient-args-and-files)))
+    (put mode 'magit-diff-current-arguments args)
+    (when save
+      (setf (alist-get key transient-values) args)
+      (transient-save-values))
+    (transient--history-push obj)
+    (setq magit-buffer-diff-args args)
+    (setq magit-buffer-diff-files files)
+    (magit-refresh)))
+
+;;; Commands
+;;;; Prefix Commands
+
+;;;###autoload (autoload 'magit-diff "magit-diff" nil t)
+(transient-define-prefix magit-diff ()
+  "Show changes between different versions."
+  :man-page "git-diff"
+  :class 'magit-diff-prefix
+  ["Limit arguments"
+   (magit:--)
+   (magit-diff:--ignore-submodules)
+   ("-b" "Ignore whitespace changes"      ("-b" "--ignore-space-change"))
+   ("-w" "Ignore all whitespace"          ("-w" "--ignore-all-space"))
+   (5 "-D" "Omit preimage for deletes"    ("-D" "--irreversible-delete"))]
+  ["Context arguments"
+   (magit-diff:-U)
+   ("-W" "Show surrounding functions"     ("-W" "--function-context"))]
+  ["Tune arguments"
+   (magit-diff:--diff-algorithm)
+   (magit-diff:--diff-merges)
+   (magit-diff:-M)
+   (magit-diff:-C)
+   (5 "-R" "Reverse sides"                "-R")
+   (5 magit-diff:--color-moved)
+   (5 magit-diff:--color-moved-ws)
+   ("-x" "Disallow external diff drivers" "--no-ext-diff")
+   ("-s" "Show stats"                     "--stat")
+   ("=g" "Show signature"                 "--show-signature")]
+  ["Actions"
+   [("d" "Dwim"          magit-diff-dwim)
+    ("r" "Diff range"    magit-diff-range)
+    ("p" "Diff paths"    magit-diff-paths)]
+   [("u" "Diff unstaged" magit-diff-unstaged)
+    ("s" "Diff staged"   magit-diff-staged)
+    ("w" "Diff worktree" magit-diff-working-tree)]
+   [("c" "Show commit"   magit-show-commit)
+    ("t" "Show stash"    magit-stash-show)]])
+
+;;;###autoload (autoload 'magit-diff-refresh "magit-diff" nil t)
+(transient-define-prefix magit-diff-refresh ()
+  "Change the arguments used for the diff(s) in the current buffer."
+  :man-page "git-diff"
+  :class 'magit-diff-refresh-prefix
+  ["Limit arguments"
+   (magit:--)
+   (magit-diff:--ignore-submodules)
+   ("-b" "Ignore whitespace changes"      ("-b" "--ignore-space-change"))
+   ("-w" "Ignore all whitespace"          ("-w" "--ignore-all-space"))
+   (5 "-D" "Omit preimage for deletes"    ("-D" "--irreversible-delete"))]
+  ["Context arguments"
+   (magit-diff:-U)
+   ("-W" "Show surrounding functions"     ("-W" "--function-context"))]
+  ["Tune arguments"
+   (magit-diff:--diff-algorithm)
+   (magit-diff:--diff-merges)
+   (magit-diff:-M)
+   (magit-diff:-C)
+   (5 "-R" "Reverse sides"                "-R"
+      :if-derived magit-diff-mode)
+   (5 magit-diff:--color-moved)
+   (5 magit-diff:--color-moved-ws)
+   ("-x" "Disallow external diff drivers" "--no-ext-diff")
+   ("-s" "Show stats"                     "--stat"
+    :if-derived magit-diff-mode)
+   ("=g" "Show signature"                 "--show-signature"
+    :if-derived magit-diff-mode)]
+  [["Refresh"
+    ("g" "buffer"                   magit-diff-refresh)
+    ("s" "buffer and set defaults"  transient-set-and-exit)
+    ("w" "buffer and save defaults" transient-save-and-exit)]
+   ["Toggle"
+    ("t" "hunk refinement"          magit-diff-toggle-refine-hunk)
+    ("F" "file filter"              magit-diff-toggle-file-filter)
+    ("b" "buffer lock"              magit-toggle-buffer-lock
+     :if-mode (magit-diff-mode magit-revision-mode magit-stash-mode))]
+   [:if-mode magit-diff-mode
+    :description "Do"
+    ("r" "switch range type"        magit-diff-switch-range-type)
+    ("f" "flip revisions"           magit-diff-flip-revs)]]
+  (interactive)
+  (when (derived-mode-p 'magit-merge-preview-mode)
+    (user-error "Cannot use %s in %s" this-command major-mode))
+  (if (not (eq transient-current-command 'magit-diff-refresh))
+      (transient-setup 'magit-diff-refresh)
+    (pcase-let ((`(,args ,files) (magit-diff-arguments)))
+      (setq magit-buffer-diff-args args)
+      (setq magit-buffer-diff-files files))
+    (magit-refresh)))
+
+;;;; Infix Commands
+
+(transient-define-argument magit:-- ()
+  :description "Limit to files"
+  :class 'transient-files
+  :key "--"
+  :argument "--"
+  :prompt "Limit to file,s: "
+  :reader #'magit-read-files
+  :multi-value t)
+
+(defun magit-read-files (prompt initial-input history &optional list-fn)
+  (magit-with-toplevel
+    (magit-completing-read-multiple prompt
+                                    (funcall (or list-fn #'magit-list-files))
+                                    nil nil
+                                    (or initial-input (magit-file-at-point))
+                                    history)))
+
+(transient-define-argument magit-diff:-U ()
+  :description "Context lines"
+  :class 'transient-option
+  :argument "-U"
+  :reader #'transient-read-number-N0)
+
+(transient-define-argument magit-diff:-M ()
+  :description "Detect renames"
+  :class 'transient-option
+  :argument "-M"
+  :allow-empty t
+  :reader #'transient-read-number-N+)
+
+(transient-define-argument magit-diff:-C ()
+  :description "Detect copies"
+  :class 'transient-option
+  :argument "-C"
+  :allow-empty t
+  :reader #'transient-read-number-N+)
+
+(transient-define-argument magit-diff:--diff-algorithm ()
+  :description "Diff algorithm"
+  :class 'transient-option
+  :key "-A"
+  :argument "--diff-algorithm="
+  :reader #'magit-diff-select-algorithm
+  :always-read t)
+
+(defun magit-diff-select-algorithm (&rest _ignore)
+  (magit-read-char-case nil t
+    (?u "[u]nspecified" nil)
+    (?d "[d]efault"     "default")
+    (?m "[m]inimal"     "minimal")
+    (?p "[p]atience"    "patience")
+    (?h "[h]istogram"   "histogram")))
+
+(transient-define-argument magit-diff:--diff-merges ()
+  :description "Diff merges"
+  :class 'transient-option
+  :key "-X"
+  :argument "--diff-merges="
+  :reader #'magit-diff-select-merges
+  :always-read t)
+
+(defun magit-diff-select-merges (&rest _ignore)
+  (magit-read-char-case nil t
+    (?u "[u]nspecified"    nil)
+    (?o "[o]ff"            "off")
+    (?f "[f]irst-parent"   "first-parent")
+    (?c "[c]ombined"       "combined")
+    (?d "[d]ense-combined" "dense-combined")))
+
+(transient-define-argument magit-diff:--ignore-submodules ()
+  :description "Ignore submodules"
+  :class 'transient-option
+  :key "-i"
+  :argument "--ignore-submodules="
+  :reader #'magit-diff-select-ignore-submodules)
+
+(defun magit-diff-select-ignore-submodules (&rest _ignored)
+  (magit-read-char-case "Ignore submodules " t
+    (?u "[u]ntracked" "untracked")
+    (?d "[d]irty"     "dirty")
+    (?a "[a]ll"       "all")))
+
+(transient-define-argument magit-diff:--color-moved ()
+  :description "Color moved lines"
+  :class 'transient-option
+  :key "-m"
+  :argument "--color-moved="
+  :reader #'magit-diff-select-color-moved-mode)
+
+(defun magit-diff-select-color-moved-mode (&rest _ignore)
+  (magit-read-char-case "Color moved " t
+    (?d "[d]efault" "default")
+    (?p "[p]lain"   "plain")
+    (?b "[b]locks"  "blocks")
+    (?z "[z]ebra"   "zebra")
+    (?Z "[Z] dimmed-zebra" "dimmed-zebra")))
+
+(transient-define-argument magit-diff:--color-moved-ws ()
+  :description "Whitespace treatment for --color-moved"
+  :class 'transient-option
+  :key "=w"
+  :argument "--color-moved-ws="
+  :reader #'magit-diff-select-color-moved-ws-mode)
+
+(defun magit-diff-select-color-moved-ws-mode (&rest _ignore)
+  (magit-read-char-case "Ignore whitespace " t
+    (?i "[i]ndentation"  "allow-indentation-change")
+    (?e "[e]nd of line"  "ignore-space-at-eol")
+    (?s "[s]pace change" "ignore-space-change")
+    (?a "[a]ll space"    "ignore-all-space")
+    (?n "[n]o"           "no")))
+
+;;;; Setup Commands
+
+;;;###autoload
+(defun magit-diff-dwim (&optional args files)
+  "Show changes for the thing at point."
+  (interactive (magit-diff-arguments))
+  (let ((default-directory default-directory)
+        (section (magit-current-section)))
+    (cond
+     ((magit-section-match 'module section)
+      (setq default-directory
+            (expand-file-name
+             (file-name-as-directory (oref section value))))
+      (magit-diff-range (oref section range)))
+     (t
+      (when (magit-section-match 'module-commit section)
+        (setq args nil)
+        (setq files nil)
+        (setq default-directory
+              (expand-file-name
+               (file-name-as-directory (magit-section-parent-value section)))))
+      (pcase (magit-diff--dwim)
+        ('unmerged (magit-diff-unmerged args files))
+        ('unstaged (magit-diff-unstaged args files))
+        ('staged
+         (let ((file (magit-file-at-point)))
+           (if (and file (equal (cddr (car (magit-file-status file))) '(?D ?U)))
+               ;; File was deleted by us and modified by them.  Show the latter.
+               (magit-diff-unmerged args (list file))
+             (magit-diff-staged nil args files))))
+        (`(stash . ,value) (magit-stash-show value args))
+        (`(commit . ,value)
+         (magit-diff-range (format "%s^..%s" value value) args files))
+        ((and range (pred stringp))
+         (magit-diff-range range args files))
+        (_ (call-interactively #'magit-diff-range)))))))
+
+(defun magit-diff--dwim ()
+  "Return information for performing DWIM diff.
+
+The information can be in three forms:
+1. TYPE
+   A symbol describing a type of diff where no additional information
+   is needed to generate the diff.  Currently, this includes `staged',
+   `unstaged' and `unmerged'.
+2. (TYPE . VALUE)
+   Like #1 but the diff requires additional information, which is
+   given by VALUE.  Currently, this includes `commit' and `stash',
+   where VALUE is the given commit or stash, respectively.
+3. RANGE
+   A string indicating a diff range.
+
+If no DWIM context is found, nil is returned."
+  (cond
+   ((and-let* ((commits (magit-region-values '(commit branch) t)))
+      (progn
+        (deactivate-mark)
+        (concat (car (last commits)) ".." (car commits)))))
+   (magit-buffer-refname
+    (cons 'commit magit-buffer-refname))
+   ((derived-mode-p 'magit-stash-mode)
+    (cons 'commit
+          (magit-section-case
+            (commit (oref it value))
+            (file (thread-first it
+                    (oref parent)
+                    (oref value)))
+            (hunk (thread-first it
+                    (oref parent)
+                    (oref parent)
+                    (oref value))))))
+   ((derived-mode-p 'magit-revision-mode)
+    (cons 'commit magit-buffer-revision))
+   ((derived-mode-p 'magit-diff-mode)
+    magit-buffer-range)
+   (t
+    (magit-section-case
+      ([* unstaged] 'unstaged)
+      ([* staged] 'staged)
+      (unmerged 'unmerged)
+      (unpushed (magit-diff--range-to-endpoints (oref it value)))
+      (unpulled (magit-diff--range-to-endpoints (oref it value)))
+      (branch (let ((current (magit-get-current-branch))
+                    (atpoint (oref it value)))
+                (if (equal atpoint current)
+                    (if-let ((upstream (magit-get-upstream-branch)))
+                        (format "%s...%s" upstream current)
+                      (if (magit-anything-modified-p)
+                          current
+                        (cons 'commit current)))
+                  (format "%s...%s"
+                          (or current "HEAD")
+                          atpoint))))
+      (commit (cons 'commit (oref it value)))
+      ([file commit] (cons 'commit (oref (oref it parent) value)))
+      ([hunk file commit]
+       (cons 'commit (oref (oref (oref it parent) parent) value)))
+      (stash (cons 'stash (oref it value)))
+      (pullreq (forge--pullreq-range (oref it value) t))))))
+
+(defun magit-diff--range-to-endpoints (range)
+  (cond ((string-match "\\.\\.\\." range) (replace-match ".."  nil nil range))
+        ((string-match "\\.\\."    range) (replace-match "..." nil nil range))
+        (t range)))
+
+(defun magit-diff--region-range (&optional interactive mbase)
+  (and-let* ((commits (magit-region-values '(commit branch) t))
+             (revA (car (last commits)))
+             (revB (car commits)))
+    (progn
+      (when interactive
+        (deactivate-mark))
+      (if mbase
+          (let ((base (magit-git-string "merge-base" revA revB)))
+            (cond
+             ((string= (magit-rev-parse revA) base)
+              (format "%s..%s" revA revB))
+             ((string= (magit-rev-parse revB) base)
+              (format "%s..%s" revB revA))
+             (interactive
+              (let ((main (magit-completing-read "View changes along"
+                                                 (list revA revB)
+                                                 nil t nil nil revB)))
+                (format "%s...%s"
+                        (if (string= main revB) revA revB) main)))
+             (t "%s...%s" revA revB)))
+        (format "%s..%s" revA revB)))))
+
+(defun magit-diff-read-range-or-commit (prompt &optional secondary-default mbase)
+  "Read range or revision with special diff range treatment.
+If MBASE is non-nil, prompt for which rev to place at the end of
+a \"revA...revB\" range.  Otherwise, always construct
+\"revA..revB\" range."
+  (or (magit-diff--region-range t mbase)
+      (magit-read-range prompt
+                        (or (pcase (magit-diff--dwim)
+                              (`(commit . ,value)
+                               (format "%s^..%s" value value))
+                              ((and range (pred stringp))
+                               range))
+                            secondary-default
+                            (magit-get-current-branch)))))
+
+;;;###autoload
+(defun magit-diff-range (rev-or-range &optional args files)
+  "Show differences between two commits.
+
+REV-OR-RANGE should be a range or a single revision.  If it is a
+revision, then show changes in the working tree relative to that
+revision.  If it is a range, but one side is omitted, then show
+changes relative to `HEAD'.
+
+If the region is active, use the revisions on the first and last
+line of the region as the two sides of the range.  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)."
+  (interactive (cons (magit-diff-read-range-or-commit "Diff for range"
+                                                      nil current-prefix-arg)
+                     (magit-diff-arguments)))
+  (magit-diff-setup-buffer rev-or-range nil args files 'committed))
+
+;;;###autoload
+(defun magit-diff-working-tree (&optional rev args files)
+  "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."
+  (interactive
+   (cons (and current-prefix-arg
+              (magit-read-branch-or-commit "Diff working tree and commit"))
+         (magit-diff-arguments)))
+  (magit-diff-setup-buffer (or rev "HEAD") nil args files 'unstaged))
+
+;;;###autoload
+(defun magit-diff-staged (&optional rev args files)
+  "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."
+  (interactive
+   (cons (and current-prefix-arg
+              (magit-read-branch-or-commit "Diff index and commit"))
+         (magit-diff-arguments)))
+  (magit-diff-setup-buffer rev "--cached" args files 'staged))
+
+;;;###autoload
+(defun magit-diff-unstaged (&optional args files)
+  "Show changes between the working tree and the index."
+  (interactive (magit-diff-arguments))
+  (magit-diff-setup-buffer nil nil args files 'unstaged))
+
+;;;###autoload
+(defun magit-diff-unmerged (&optional args files)
+  "Show changes that are being merged."
+  (interactive (magit-diff-arguments))
+  (unless (magit-merge-in-progress-p)
+    (user-error "No merge is in progress"))
+  (magit-diff-setup-buffer (magit--merge-range) nil args files 'committed))
+
+;;;###autoload
+(defun 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."
+  (interactive)
+  (unless (magit-commit-message-buffer)
+    (user-error "No commit in progress"))
+  (magit-commit-diff-1))
+
+(keymap-set git-commit-mode-map "C-c C-d" #'magit-diff-while-committing)
+
+;;;###autoload
+(defun magit-diff-buffer-file ()
+  "Show diff for the blob or file visited in the current buffer.
+
+When the buffer visits a blob, then show the respective commit.
+When the buffer visits a file, then show the differences between
+`HEAD' and the working tree.  In both cases limit the diff to
+the file or blob."
+  (interactive)
+  (require 'magit)
+  (if-let ((file (magit-file-relative-name)))
+      (if magit-buffer-refname
+          (magit-show-commit magit-buffer-refname
+                             (car (magit-show-commit--arguments))
+                             (list file))
+        (save-buffer)
+        (let ((line (line-number-at-pos))
+              (col (current-column)))
+          (with-current-buffer
+              (magit-diff-setup-buffer (or (magit-get-current-branch) "HEAD")
+                                       nil
+                                       (car (magit-diff-arguments))
+                                       (list file)
+                                       'unstaged
+                                       magit-diff-buffer-file-locked)
+            (magit-diff--goto-position file line col))))
+    (user-error "Buffer isn't visiting a file")))
+
+;;;###autoload
+(defun magit-diff-paths (a b)
+  "Show changes between any two files on disk."
+  (interactive (list (read-file-name "First file: " nil nil t)
+                     (read-file-name "Second file: " nil nil t)))
+  (magit-diff-setup-buffer nil "--no-index" nil
+                           (list (magit-convert-filename-for-git
+                                  (expand-file-name a))
+                                 (magit-convert-filename-for-git
+                                  (expand-file-name b)))
+                           'undefined))
+
+(defun magit-show-commit--arguments ()
+  (pcase-let ((`(,args ,diff-files)
+               (magit-diff-arguments 'magit-revision-mode)))
+    (list args (if (derived-mode-p 'magit-log-mode)
+                   (and (or magit-revision-filter-files-on-follow
+                            (not (member "--follow" magit-buffer-log-args)))
+                        magit-buffer-log-files)
+                 diff-files))))
+
+;;;###autoload
+(defun magit-show-commit (rev &optional args files module)
+  "Visit the revision at point in another buffer.
+If there is no revision at point or with a prefix argument prompt
+for a revision."
+  (interactive
+   (pcase-let* ((mcommit (magit-section-value-if 'module-commit))
+                (atpoint (or mcommit
+                             (magit-thing-at-point 'git-revision t)
+                             (magit-branch-or-commit-at-point)))
+                (`(,args ,files) (magit-show-commit--arguments)))
+     (list (or (and (not current-prefix-arg) atpoint)
+               (magit-read-branch-or-commit "Show commit" atpoint))
+           args
+           files
+           (and mcommit
+                (magit-section-parent-value (magit-current-section))))))
+  (require 'magit)
+  (let* ((file (magit-file-relative-name))
+         (ln (and file (line-number-at-pos))))
+    (magit-with-toplevel
+      (when module
+        (setq default-directory
+              (expand-file-name (file-name-as-directory module))))
+      (unless (magit-commit-p rev)
+        (user-error "%s is not a commit" rev))
+      (when file
+        (save-buffer))
+      (let ((buf (magit-revision-setup-buffer rev args files)))
+        (when file
+          (let ((line (magit-diff-visit--offset file (list "-R" rev) ln))
+                (col (current-column)))
+            (with-current-buffer buf
+              (magit-diff--goto-position file line col))))))))
+
+(defun magit-diff--locate-hunk (file line &optional parent)
+  (and-let* ((diff (cl-find-if (lambda (section)
+                                 (and (cl-typep section 'magit-file-section)
+                                      (equal (oref section value) file)))
+                               (oref (or parent magit-root-section) children))))
+    (let ((hunks (oref diff children)))
+      (cl-block nil
+        (while-let ((hunk (pop hunks)))
+          (when-let ((range (oref hunk to-range)))
+            (pcase-let* ((`(,beg ,len) range)
+                         (end (+ beg len)))
+              (cond ((>  beg line)     (cl-return (list diff nil)))
+                    ((<= beg line end) (cl-return (list hunk t)))
+                    ((null hunks)      (cl-return (list hunk nil)))))))))))
+
+(defun magit-diff--goto-position (file line column &optional parent)
+  (when-let ((pos (magit-diff--locate-hunk file line parent)))
+    (pcase-let ((`(,section ,exact) pos))
+      (cond ((cl-typep section 'magit-file-section)
+             (goto-char (oref section start)))
+            (exact
+             (goto-char (oref section content))
+             (let ((pos (car (oref section to-range))))
+               (while (or (< pos line)
+                          (= (char-after) ?-))
+                 (unless (= (char-after) ?-)
+                   (cl-incf pos))
+                 (forward-line)))
+             (forward-char (1+ column)))
+            (t
+             (goto-char (oref section start))
+             (setq section (oref section parent))))
+      (while section
+        (when (oref section hidden)
+          (magit-section-show section))
+        (setq section (oref section parent))))
+    (magit-section-update-highlight)
+    t))
+
+;;;; Setting Commands
+
+(defun magit-diff-switch-range-type ()
+  "Convert diff range type.
+Change \"revA..revB\" to \"revA...revB\", or vice versa."
+  (interactive)
+  (if (and magit-buffer-range
+           (derived-mode-p 'magit-diff-mode)
+           (string-match magit-range-re magit-buffer-range))
+      (setq magit-buffer-range
+            (replace-match (if (string= (match-string 2 magit-buffer-range) "..")
+                               "..."
+                             "..")
+                           t t magit-buffer-range 2))
+    (user-error "No range to change"))
+  (magit-refresh))
+
+(defun magit-diff-flip-revs ()
+  "Swap revisions in diff range.
+Change \"revA..revB\" to \"revB..revA\"."
+  (interactive)
+  (if (and magit-buffer-range
+           (derived-mode-p 'magit-diff-mode)
+           (string-match magit-range-re magit-buffer-range))
+      (progn
+        (setq magit-buffer-range
+              (concat (match-string 3 magit-buffer-range)
+                      (match-string 2 magit-buffer-range)
+                      (match-string 1 magit-buffer-range)))
+        (magit-refresh))
+    (user-error "No range to swap")))
+
+(defun magit-diff-toggle-file-filter ()
+  "Toggle the file restriction of the current buffer's diffs.
+If the current buffer's mode is derived from `magit-log-mode',
+toggle the file restriction in the repository's revision buffer
+instead."
+  (interactive)
+  (cl-flet ((toggle ()
+              (if (or magit-buffer-diff-files
+                      magit-buffer-diff-files-suspended)
+                  (cl-rotatef magit-buffer-diff-files
+                              magit-buffer-diff-files-suspended)
+                (setq magit-buffer-diff-files
+                      (transient-infix-read 'magit:--)))
+              (magit-refresh)))
+    (cond
+     ((derived-mode-p 'magit-log-mode
+                      'magit-cherry-mode
+                      'magit-reflog-mode)
+      (if-let ((buffer (magit-get-mode-buffer 'magit-revision-mode)))
+          (with-current-buffer buffer (toggle))
+        (message "No revision buffer")))
+     ((local-variable-p 'magit-buffer-diff-files)
+      (toggle))
+     (t
+      (user-error "Cannot toggle file filter in this buffer")))))
+
+(defun magit-diff-less-context (&optional count)
+  "Decrease the context for diff hunks by COUNT lines."
+  (interactive "p")
+  (magit-diff-set-context (lambda (cur) (max 0 (- (or cur 0) count)))))
+
+(defun magit-diff-more-context (&optional count)
+  "Increase the context for diff hunks by COUNT lines."
+  (interactive "p")
+  (magit-diff-set-context (lambda (cur) (+ (or cur 0) count))))
+
+(defun magit-diff-default-context ()
+  "Reset context for diff hunks to the default height."
+  (interactive)
+  (magit-diff-set-context #'ignore))
+
+(defun magit-diff-set-context (fn)
+  (when (derived-mode-p 'magit-merge-preview-mode)
+    (user-error "Cannot use %s in %s" this-command major-mode))
+  (let* ((def (if-let ((context (magit-get "diff.context")))
+                  (string-to-number context)
+                3))
+         (val magit-buffer-diff-args)
+         (arg (--first (string-match "^-U\\([0-9]+\\)?$" it) val))
+         (num (if-let ((str (and arg (match-string 1 arg))))
+                  (string-to-number str)
+                def))
+         (val (delete arg val))
+         (num (funcall fn num))
+         (arg (and num (not (= num def)) (format "-U%d" num)))
+         (val (if arg (cons arg val) val)))
+    (setq magit-buffer-diff-args val))
+  (magit-refresh))
+
+(defun magit-diff-context-p ()
+  (if-let ((arg (--first (string-match "^-U\\([0-9]+\\)$" it)
+                         magit-buffer-diff-args)))
+      (not (equal arg "-U0"))
+    t))
+
+(defun magit-diff-ignore-any-space-p ()
+  (--any-p (member it magit-buffer-diff-args)
+           '("--ignore-cr-at-eol"
+             "--ignore-space-at-eol"
+             "--ignore-space-change" "-b"
+             "--ignore-all-space" "-w"
+             "--ignore-blank-space")))
+
+(defun magit-diff-toggle-refine-hunk (&optional style)
+  "Turn diff-hunk refining on or off.
+
+If hunk refining is currently on, then hunk refining is turned off.
+If hunk refining is off, then hunk refining is turned on, in
+`selected' mode (only the currently selected hunk is refined).
+
+With a prefix argument, the \"third choice\" is used instead:
+If hunk refining is currently on, then refining is kept on, but
+the refining mode (`selected' or `all') is switched.
+If hunk refining is off, then hunk refining is turned on, in
+`all' mode (all hunks refined).
+
+Customize variable `magit-diff-refine-hunk' to change the default mode."
+  (interactive "P")
+  (setq-local magit-diff-refine-hunk
+              (if style
+                  (if (eq magit-diff-refine-hunk 'all) t 'all)
+                (not magit-diff-refine-hunk)))
+  (magit-diff-update-hunk-refinement))
+
+;;;; Visit Commands
+;;;;; Dwim Variants
+
+(defun magit-diff-visit-file (file &optional other-window)
+  "From a diff visit the appropriate version of FILE.
+
+Display the buffer in the selected window.  With a prefix
+argument OTHER-WINDOW display the buffer in another window
+instead.
+
+Visit 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., stage 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 also go to the line that corresponds
+to the line that point is on in the diff.
+
+Note that this command only works if point is inside a diff.
+In other cases `magit-find-file' (which see) has to be used."
+  (interactive (list (magit-diff--file-at-point t t) current-prefix-arg))
+  (magit-diff-visit-file--internal file nil
+                                   (if other-window
+                                       #'switch-to-buffer-other-window
+                                     #'pop-to-buffer-same-window)))
+
+(defun magit-diff-visit-file-other-window (file)
+  "From a diff visit the appropriate version of FILE in another window.
+Like `magit-diff-visit-file' but use
+`switch-to-buffer-other-window'."
+  (interactive (list (magit-diff--file-at-point t t)))
+  (magit-diff-visit-file--internal file nil #'switch-to-buffer-other-window))
+
+(defun magit-diff-visit-file-other-frame (file)
+  "From a diff visit the appropriate version of FILE in another frame.
+Like `magit-diff-visit-file' but use
+`switch-to-buffer-other-frame'."
+  (interactive (list (magit-diff--file-at-point t t)))
+  (magit-diff-visit-file--internal file nil #'switch-to-buffer-other-frame))
+
+;;;;; Worktree Variants
+
+(defun magit-diff-visit-worktree-file (file &optional other-window)
+  "From a diff visit the worktree version of FILE.
+
+Display the buffer in the selected window.  With a prefix
+argument OTHER-WINDOW display the buffer in another window
+instead.
+
+Visit 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' always visits the \"real\" file in
+the working tree, i.e the \"current version\" of the file.
+
+In the file-visiting buffer also go 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."
+  (interactive (list (magit-file-at-point t t) current-prefix-arg))
+  (magit-diff-visit-file--internal file t
+                                   (if other-window
+                                       #'switch-to-buffer-other-window
+                                     #'pop-to-buffer-same-window)))
+
+(defun magit-diff-visit-worktree-file-other-window (file)
+  "From a diff visit the worktree version of FILE in another window.
+Like `magit-diff-visit-worktree-file' but use
+`switch-to-buffer-other-window'."
+  (interactive (list (magit-file-at-point t t)))
+  (magit-diff-visit-file--internal file t #'switch-to-buffer-other-window))
+
+(defun magit-diff-visit-worktree-file-other-frame (file)
+  "From a diff visit the worktree version of FILE in another frame.
+Like `magit-diff-visit-worktree-file' but use
+`switch-to-buffer-other-frame'."
+  (interactive (list (magit-file-at-point t t)))
+  (magit-diff-visit-file--internal file t #'switch-to-buffer-other-frame))
+
+;;;;; Internal
+
+(defun magit-diff-visit-file--internal (file force-worktree fn)
+  "From a diff visit the appropriate version of FILE.
+If FORCE-WORKTREE is non-nil, then visit the worktree version of
+the file, even if the diff is about a committed change.  Use FN
+to display the buffer in some window."
+  (if (file-accessible-directory-p file)
+      (magit-diff-visit-directory file force-worktree)
+    (pcase-let ((`(,buf ,pos)
+                 (magit-diff-visit-file--noselect file force-worktree)))
+      (funcall fn buf)
+      (magit-diff-visit-file--setup buf pos)
+      buf)))
+
+(defun magit-diff-visit-directory (directory &optional other-window)
+  "Visit DIRECTORY in some window.
+Display the buffer in the selected window unless OTHER-WINDOW is
+non-nil.  If DIRECTORY is the top-level directory of the current
+repository, then visit the containing directory using Dired and
+in the Dired buffer put point on DIRECTORY.  Otherwise display
+the Magit-Status buffer for DIRECTORY."
+  (if (equal (magit-toplevel directory)
+             (magit-toplevel))
+      (dired-jump other-window (concat directory "/."))
+    (let ((display-buffer-overriding-action
+           (if other-window
+               '(nil (inhibit-same-window . t))
+             '(display-buffer-same-window))))
+      (magit-status-setup-buffer directory))))
+
+(defun magit-diff-visit-file--setup (buf pos)
+  (if-let ((win (get-buffer-window buf 'visible)))
+      (with-selected-window win
+        (when pos
+          (unless (<= (point-min) pos (point-max))
+            (widen))
+          (goto-char pos))
+        (when (and buffer-file-name
+                   (magit-anything-unmerged-p buffer-file-name))
+          (smerge-start-session))
+        (run-hooks 'magit-diff-visit-file-hook))
+    (error "File buffer is not visible")))
+
+(defun magit-diff-visit-file--noselect (&optional file goto-worktree)
+  (unless file
+    (setq file (magit-diff--file-at-point t t)))
+  (let* ((hunk (magit-diff-visit--hunk))
+         (goto-from (and hunk
+                         (magit-diff-visit--goto-from-p hunk goto-worktree)))
+         (line (and hunk (magit-diff-hunk-line   hunk goto-from)))
+         (col  (and hunk (magit-diff-hunk-column hunk goto-from)))
+         (spec (magit-diff--dwim))
+         (rev  (if goto-from
+                   (magit-diff-visit--range-from spec)
+                 (magit-diff-visit--range-to spec)))
+         (buf  (if (or goto-worktree
+                       (and (not (stringp rev))
+                            (or magit-diff-visit-avoid-head-blob
+                                (not goto-from))))
+                   (or (get-file-buffer file)
+                       (find-file-noselect file))
+                 (magit-find-file-noselect (if (stringp rev) rev "HEAD")
+                                           file))))
+    (if line
+        (with-current-buffer buf
+          (cond ((eq rev 'staged)
+                 (setq line (magit-diff-visit--offset file nil line)))
+                ((and goto-worktree
+                      (stringp rev))
+                 (setq line (magit-diff-visit--offset file rev line))))
+          (list buf (save-restriction
+                      (widen)
+                      (goto-char (point-min))
+                      (forward-line (1- line))
+                      (move-to-column col)
+                      (point))))
+      (list buf nil))))
+
+(defun magit-diff--file-at-point (&optional expand assert)
+  ;; This is a variation of magit-file-at-point.
+  (if-let* ((file-section (magit-section-case
+                            (file it)
+                            (hunk (oref it parent))))
+            (file (or (and (magit-section-match 'hunk)
+                           (magit-diff-visit--goto-from-p
+                            (magit-current-section) nil)
+                           (oref file-section source))
+                      (oref file-section value))))
+      (if expand
+          (expand-file-name file (magit-toplevel))
+        file)
+    (when assert
+      (user-error "No file at point"))))
+
+(defun magit-diff-visit--hunk ()
+  (and-let* ((scope (magit-diff-scope))
+             (section (magit-current-section)))
+    (progn
+      (cl-case scope
+        ((file files)
+         (setq section (car (oref section children))))
+        (list
+         (setq section (car (oref section children)))
+         (when section
+           (setq section (car (oref section children))))))
+      (and
+       ;; Unmerged files appear in the list of staged changes
+       ;; but unlike in the list of unstaged changes no diffs
+       ;; are shown here.  In that case `section' is nil.
+       section
+       ;; Currently the `hunk' type is also abused for file
+       ;; mode changes, which we are not interested in here.
+       (not (equal (oref section value) '(chmod)))
+       section))))
+
+(defun magit-diff-visit--goto-from-p (section in-worktree)
+  (and magit-diff-visit-previous-blob
+       (not in-worktree)
+       (not (oref section combined))
+       (not (< (magit-point) (oref section content)))
+       (= (char-after (line-beginning-position)) ?-)))
+
+(defvar magit-diff-visit-jump-to-change t)
+
+(defun magit-diff-hunk-line (section goto-from)
+  (save-excursion
+    (goto-char (line-beginning-position))
+    (with-slots (content combined from-ranges from-range to-range) section
+      (when (or from-range to-range)
+        (when (and magit-diff-visit-jump-to-change (< (point) content))
+          (goto-char content)
+          (re-search-forward "^[-+]"))
+        (+ (car (if goto-from from-range to-range))
+           (let ((prefix (if combined (length from-ranges) 1))
+                 (target (point))
+                 (offset 0))
+             (goto-char content)
+             (while (< (point) target)
+               (unless (string-search
+                        (if goto-from "+" "-")
+                        (buffer-substring (point) (+ (point) prefix)))
+                 (cl-incf offset))
+               (forward-line))
+             offset))))))
+
+(defun magit-diff-hunk-column (section goto-from)
+  (if (or (< (magit-point)
+             (oref section content))
+          (and (not goto-from)
+               (= (char-after (line-beginning-position)) ?-)))
+      0
+    (max 0 (- (+ (current-column) 2)
+              (length (oref section value))))))
+
+(defun magit-diff-visit--range-from (spec)
+  (cond ((consp spec)
+         (concat (cdr spec) "^"))
+        ((stringp spec)
+         (car (magit-split-range spec)))
+        (t
+         spec)))
+
+(defun magit-diff-visit--range-to (spec)
+  (if (symbolp spec)
+      spec
+    (let ((rev (if (consp spec)
+                   (cdr spec)
+                 (cdr (magit-split-range spec)))))
+      (if (and magit-diff-visit-avoid-head-blob
+               (magit-rev-head-p rev))
+          'unstaged
+        rev))))
+
+(defun magit-diff-visit--offset (file rev line)
+  (let ((offset 0))
+    (with-temp-buffer
+      (save-excursion
+        (magit-with-toplevel
+          (magit-git-insert "diff" rev "--" file)))
+      (catch 'found
+        (while (re-search-forward
+                "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@.*\n"
+                nil t)
+          (let ((from-beg (string-to-number (match-string 1)))
+                (from-len (string-to-number (match-string 2)))
+                (  to-len (string-to-number (match-string 4))))
+            (if (<= from-beg line)
+                (if (< (+ from-beg from-len) line)
+                    (cl-incf offset (- to-len from-len))
+                  (let ((rest (- line from-beg)))
+                    (while (> rest 0)
+                      (pcase (char-after)
+                        (?\s                  (cl-decf rest))
+                        (?-  (cl-decf offset) (cl-decf rest))
+                        (?+  (cl-incf offset)))
+                      (forward-line))))
+              (throw 'found nil))))))
+    (+ line offset)))
+
+;;;; Scroll Commands
+
+(defun 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."
+  (interactive)
+  (magit-diff-show-or-scroll #'scroll-up))
+
+(defun 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."
+  (interactive)
+  (magit-diff-show-or-scroll #'scroll-down))
+
+(defun magit-diff-show-or-scroll (fn)
+  (let (rev cmd buf win)
+    (cond
+     ((and (bound-and-true-p magit-blame-mode)
+           (fboundp 'magit-current-blame-chunk))
+      (setq rev (oref (magit-current-blame-chunk) orig-rev))
+      (setq cmd #'magit-show-commit)
+      (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
+     ((derived-mode-p 'git-rebase-mode)
+      (with-slots (action-type target)
+          (git-rebase-current-line)
+        (if (not (eq action-type 'commit))
+            (user-error "No commit on this line")
+          (setq rev target)
+          (setq cmd #'magit-show-commit)
+          (setq buf (magit-get-mode-buffer 'magit-revision-mode)))))
+     (t
+      (magit-section-case
+        (branch
+         (setq rev (magit-ref-maybe-qualify (oref it value)))
+         (setq cmd #'magit-show-commit)
+         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
+        (commit
+         (setq rev (oref it value))
+         (setq cmd #'magit-show-commit)
+         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
+        (tag
+         (setq rev (magit-rev-hash (oref it value)))
+         (setq cmd #'magit-show-commit)
+         (setq buf (magit-get-mode-buffer 'magit-revision-mode)))
+        (stash
+         (setq rev (oref it value))
+         (setq cmd #'magit-stash-show)
+         (setq buf (magit-get-mode-buffer 'magit-stash-mode))))))
+    (if rev
+        (if (and buf
+                 (setq win (get-buffer-window buf))
+                 (with-current-buffer buf
+                   (and (equal rev magit-buffer-revision)
+                        (equal (magit-rev-parse rev)
+                               magit-buffer-revision-hash))))
+            (with-selected-window win
+              (condition-case nil
+                  (funcall fn)
+                (error
+                 (goto-char (pcase fn
+                              ('scroll-up   (point-min))
+                              ('scroll-down (point-max)))))))
+          (let ((magit-display-buffer-noselect t))
+            (if (eq cmd #'magit-show-commit)
+                (apply #'magit-show-commit rev (magit-show-commit--arguments))
+              (funcall cmd rev))))
+      (call-interactively #'magit-show-commit))))
+
+;;;; Section Commands
+
+(defun magit-section-cycle-diffs ()
+  "Cycle visibility of diff-related sections in the current buffer."
+  (interactive)
+  (when-let ((sections
+              (cond ((derived-mode-p 'magit-status-mode)
+                     (--mapcat
+                      (when it
+                        (when (oref it hidden)
+                          (magit-section-show it))
+                        (oref it children))
+                      (list (magit-get-section '((staged)   (status)))
+                            (magit-get-section '((unstaged) (status))))))
+                    ((derived-mode-p 'magit-diff-mode)
+                     (seq-filter #'magit-file-section-p
+                                 (oref magit-root-section children))))))
+    (if (--any-p (oref it hidden) sections)
+        (dolist (s sections)
+          (magit-section-show s)
+          (magit-section-hide-children s))
+      (let ((children (--mapcat (oref it children) sections)))
+        (cond ((and (--any-p (oref it hidden)   children)
+                    (--any-p (oref it children) children))
+               (mapc #'magit-section-show-headings sections))
+              ((seq-some #'magit-section-hidden-body children)
+               (mapc #'magit-section-show-children sections))
+              (t
+               (mapc #'magit-section-hide sections)))))))
+
+;;; Diff Mode
+
+(defvar-keymap magit-diff-mode-map
+  :doc "Keymap for `magit-diff-mode'."
+  :parent magit-mode-map
+  "C-c C-d" #'magit-diff-while-committing
+  "C-c C-b" #'magit-go-backward
+  "C-c C-f" #'magit-go-forward
+  "SPC"     #'scroll-up
+  "DEL"     #'scroll-down
+  "j"       #'magit-jump-to-diffstat-or-diff
+  "<remap> <write-file>" #'magit-patch-save)
+
+(define-derived-mode magit-diff-mode magit-mode "Magit Diff"
+  "Mode for looking at a Git diff.
+
+This mode is documented in info node `(magit)Diff Buffer'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-section-toggle] to expand or hide the section at point.
+Type \\[magit-visit-thing] to visit the hunk or file at point.
+
+Staging and applying changes is documented in info node
+`(magit)Staging and Unstaging' and info node `(magit)Applying'.
+
+\\<magit-hunk-section-map>Type \
+\\[magit-apply] to apply the change at point, \
+\\[magit-stage] to stage,
+\\[magit-unstage] to unstage, \
+\\[magit-discard] to discard, or \
+\\[magit-reverse] to reverse it.
+
+\\{magit-diff-mode-map}"
+  :group 'magit-diff
+  (hack-dir-local-variables-non-file-buffer)
+  (setq magit--imenu-item-types 'file))
+
+(put 'magit-diff-mode 'magit-diff-default-arguments
+     '("--stat" "--no-ext-diff"))
+
+(defun magit-diff-setup-buffer ( range typearg args files
+                                 &optional type locked)
+  (require 'magit)
+  (magit-setup-buffer #'magit-diff-mode locked
+    (magit-buffer-range range)
+    (magit-buffer-typearg typearg)
+    (magit-buffer-diff-type type)
+    (magit-buffer-diff-args args)
+    (magit-buffer-diff-files files)
+    (magit-buffer-diff-files-suspended nil)))
+
+(defun magit-diff-refresh-buffer ()
+  "Refresh the current `magit-diff-mode' buffer."
+  (magit-set-header-line-format
+   (if (equal magit-buffer-typearg "--no-index")
+       (apply #'format "Differences between %s and %s" magit-buffer-diff-files)
+     (concat (if magit-buffer-range
+                 (if (string-match-p "\\(\\.\\.\\|\\^-\\)"
+                                     magit-buffer-range)
+                     (format "Changes in %s" magit-buffer-range)
+                   (let ((msg "Changes from %s to %s")
+                         (end (if (equal magit-buffer-typearg "--cached")
+                                  "index"
+                                "working tree")))
+                     (if (member "-R" magit-buffer-diff-args)
+                         (format msg end magit-buffer-range)
+                       (format msg magit-buffer-range end))))
+               (cond ((equal magit-buffer-typearg "--cached")
+                      "Staged changes")
+                     ((and (magit-repository-local-get 'this-commit-command)
+                           (not (magit-anything-staged-p)))
+                      "Uncommitting changes")
+                     (t "Unstaged changes")))
+             (pcase (length magit-buffer-diff-files)
+               (0)
+               (1 (concat " in file " (car magit-buffer-diff-files)))
+               (_ (concat " in files "
+                          (mapconcat #'identity magit-buffer-diff-files
+                                     ", ")))))))
+  (setq magit-buffer-range-hashed
+        (and magit-buffer-range (magit-hash-range magit-buffer-range)))
+  (magit-insert-section (diffbuf)
+    (magit-run-section-hook 'magit-diff-sections-hook)))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-diff-mode))
+  (nconc (cond (magit-buffer-range
+                (delq nil (list magit-buffer-range magit-buffer-typearg)))
+               ((equal magit-buffer-typearg "--cached")
+                (list 'staged))
+               (t
+                (list 'unstaged magit-buffer-typearg)))
+         (and magit-buffer-diff-files (cons "--" magit-buffer-diff-files))))
+
+(cl-defmethod magit-menu-common-value ((_section magit-diff-section))
+  (magit-diff-scope))
+
+(define-obsolete-variable-alias 'magit-diff-section-base-map
+  'magit-diff-section-map "Magit-Section 4.0.0")
+
+(defvar-keymap magit-diff-section-map
+  :doc "Keymap for diff sections.
+The classes `magit-file-section' and `magit-hunk-section' derive
+from the abstract `magit-diff-section' class.  Accordingly this
+keymap is the parent of their keymaps."
+  "C-j"            #'magit-diff-visit-worktree-file
+  "C-<return>"     #'magit-diff-visit-worktree-file
+  "C-x 4 <return>" #'magit-diff-visit-file-other-window
+  "C-x 5 <return>" #'magit-diff-visit-file-other-frame
+  "&"              #'magit-do-async-shell-command
+  "C"              #'magit-commit-add-log
+  "C-x a"          #'magit-add-change-log-entry
+  "C-x 4 a"        #'magit-add-change-log-entry-other-window
+  "C-c C-t"        #'magit-diff-trace-definition
+  "C-c C-e"        #'magit-diff-edit-hunk-commit
+  "<remap> <magit-file-rename>"      #'magit-file-rename
+  "<remap> <magit-file-untrack>"     #'magit-file-untrack
+  "<remap> <magit-visit-thing>"      #'magit-diff-visit-file
+  "<remap> <magit-revert-no-commit>" #'magit-reverse
+  "<remap> <magit-delete-thing>"     #'magit-discard
+  "<remap> <magit-unstage-file>"     #'magit-unstage
+  "<remap> <magit-stage-file>"       #'magit-stage
+  "<remap> <magit-cherry-apply>"     #'magit-apply
+  "<8>" (magit-menu-item "Rename file" #'magit-file-rename
+                         '(:enable (eq (magit-diff-scope) 'file)))
+  "<7>" (magit-menu-item "Untrack %x" #'magit-file-untrack)
+  "<6>" (magit-menu-item "Visit file" #'magit-diff-visit-file
+                         '(:enable (memq (magit-diff-scope) '(file files))))
+  "<5>" (magit-menu-item "Reverse %x" #'magit-reverse
+                         '(:enable (not (memq (magit-diff-type)
+                                              '(untracked unstaged)))))
+  "<4>" (magit-menu-item "Discard %x" #'magit-discard
+                         '(:enable (not (memq (magit-diff-type)
+                                              '(committed undefined)))))
+  "<3>" (magit-menu-item "Unstage %x" #'magit-unstage
+                         '(:enable (eq (magit-diff-type) 'staged)))
+  "<2>" (magit-menu-item "Stage %x"   #'magit-stage
+                         '(:enable (eq (magit-diff-type) 'unstaged)))
+  "<1>" (magit-menu-item "Apply %x" #'magit-apply
+                         '(:enable (not (memq (magit-diff-type)
+                                              '(unstaged staged))))))
+
+(defvar-keymap magit-file-section-map
+  ;; Even though this derived map doesn't add any bindings by default,
+  ;; it is quite possible that some users would want to add their own.
+  :doc "Keymap for `file' sections."
+  :parent magit-diff-section-base-map)
+
+(defvar-keymap magit-hunk-section-smerge-map
+  :doc "Keymap bound to `smerge-command-prefix' in `magit-hunk-section-map'."
+  "RET" #'magit-smerge-keep-current
+  "u"   #'magit-smerge-keep-upper
+  "b"   #'magit-smerge-keep-base
+  "l"   #'magit-smerge-keep-lower)
+
+(defvar-keymap magit-hunk-section-map
+  :doc "Keymap for `hunk' sections."
+  :parent magit-diff-section-base-map
+  (key-description smerge-command-prefix) magit-hunk-section-smerge-map)
+
+(defconst magit-diff-conflict-headline-re
+  (concat "^" (regexp-opt
+               ;; Defined in merge-tree.c in this order.
+               '("merged"
+                 "added in remote"
+                 "added in both"
+                 "added in local"
+                 "removed in both"
+                 "changed in both"
+                 "removed in local"
+                 "removed in remote"))))
+
+(defconst magit-diff-headline-re
+  (concat "^\\(@@@?\\|diff\\|Submodule\\|"
+          "\\* Unmerged path\\|"
+          (substring magit-diff-conflict-headline-re 1)
+          "\\)"))
+
+(defconst magit-diff-statline-re
+  (concat "^ ?"
+          "\\(.*\\)"     ; file
+          "\\( +| +\\)"  ; separator
+          "\\([0-9]+\\|Bin\\(?: +[0-9]+ -> [0-9]+ bytes\\)?$\\) ?"
+          "\\(\\+*\\)"   ; add
+          "\\(-*\\)$"))  ; del
+
+(defvar magit-diff--reset-non-color-moved
+  (list
+   "-c" "color.diff.context=normal"
+   "-c" "color.diff.plain=normal" ; historical synonym for context
+   "-c" "color.diff.meta=normal"
+   "-c" "color.diff.frag=normal"
+   "-c" "color.diff.func=normal"
+   "-c" "color.diff.old=normal"
+   "-c" "color.diff.new=normal"
+   "-c" "color.diff.commit=normal"
+   "-c" "color.diff.whitespace=normal"
+   ;; "git-range-diff" does not support "--color-moved", so we don't
+   ;; need to reset contextDimmed, oldDimmed, newDimmed, contextBold,
+   ;; oldBold, and newBold.
+   ))
+
+(defun magit-insert-diff ()
+  "Insert the diff into this `magit-diff-mode' buffer."
+  (magit--insert-diff t
+    "diff" magit-buffer-range "-p" "--no-prefix"
+    (and (member "--stat" magit-buffer-diff-args) "--numstat")
+    magit-buffer-typearg
+    magit-buffer-diff-args "--"
+    magit-buffer-diff-files))
+
+(defun magit--insert-diff (keep-error &rest args)
+  (declare (indent 1))
+  (pcase-let ((`(,cmd . ,args)
+               (flatten-tree args))
+              (magit-git-global-arguments
+               (remove "--literal-pathspecs" magit-git-global-arguments)))
+    ;; As of Git 2.19.0, we need to generate diffs with
+    ;; --ita-visible-in-index so that `magit-stage' can work with
+    ;; intent-to-add files (see #4026).
+    (when (and (not (equal cmd "merge-tree"))
+               (magit-git-version>= "2.19.0"))
+      (push "--ita-visible-in-index" args))
+    (setq args (magit-diff--maybe-add-stat-arguments args))
+    (when (cl-member-if (lambda (arg) (string-prefix-p "--color-moved" arg)) args)
+      (push "--color=always" args)
+      (setq magit-git-global-arguments
+            (append magit-diff--reset-non-color-moved
+                    magit-git-global-arguments)))
+    (magit--git-wash #'magit-diff-wash-diffs
+        (if (member "--no-index" args) 'wash-anyway keep-error)
+      cmd args)))
+
+(defun magit-diff--maybe-add-stat-arguments (args)
+  (if (member "--stat" args)
+      (append (if (functionp magit-diff-extra-stat-arguments)
+                  (funcall magit-diff-extra-stat-arguments)
+                magit-diff-extra-stat-arguments)
+              args)
+    args))
+
+(defun magit-diff-use-window-width-as-stat-width ()
+  "Use the `window-width' as the value of `--stat-width'."
+  (and-let* ((window (get-buffer-window (current-buffer) 'visible)))
+    (list (format "--stat-width=%d" (window-width window)))))
+
+(defun magit-diff-wash-diffs (args &optional limit)
+  (run-hooks 'magit-diff-wash-diffs-hook)
+  (when (member "--show-signature" args)
+    (magit-diff-wash-signature magit-buffer-revision-hash))
+  (when (member "--stat" args)
+    (magit-diff-wash-diffstat))
+  (when (re-search-forward magit-diff-headline-re limit t)
+    (goto-char (line-beginning-position))
+    (magit-wash-sequence (apply-partially #'magit-diff-wash-diff args))
+    (insert ?\n)))
+
+(defun magit-jump-to-diffstat-or-diff ()
+  "Jump 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."
+  (interactive)
+  (if-let ((section (magit-get-section
+                     (append (magit-section-case
+                               ([file diffstat] `((file . ,(oref it value))))
+                               (file `((file . ,(oref it value)) (diffstat)))
+                               (t '((diffstat))))
+                             (magit-section-ident magit-root-section)))))
+      (magit-section-goto section)
+    (user-error "No diffstat in this buffer")))
+
+(defun magit-diff-wash-signature (object)
+  (cond
+   ((looking-at "^No signature")
+    (delete-line))
+   ((looking-at "^gpg: ")
+    (let (title end)
+      (save-excursion
+        (while (looking-at "^gpg: ")
+          (cond
+           ((looking-at "^gpg: Good signature from")
+            (setq title (propertize
+                         (buffer-substring (point) (line-end-position))
+                         'face 'magit-signature-good)))
+           ((looking-at "^gpg: Can't check signature")
+            (setq title (propertize
+                         (buffer-substring (point) (line-end-position))
+                         'face '(italic bold)))))
+          (forward-line))
+        (setq end (point-marker)))
+      (magit-insert-section (signature object title)
+        (when title
+          (magit-insert-heading title))
+        (goto-char end)
+        (set-marker end nil)
+        (insert "\n"))))))
+
+(defun magit-diff-wash-diffstat ()
+  (let (heading (beg (point)))
+    (when (re-search-forward "^ ?\\([0-9]+ +files? change[^\n]*\n\\)" nil t)
+      (setq heading (match-string 1))
+      (magit-delete-match)
+      (goto-char beg)
+      (magit-insert-section (diffstat)
+        (insert (propertize heading 'font-lock-face 'magit-diff-file-heading))
+        (magit-insert-heading)
+        (let (files)
+          (while (looking-at "^[-0-9]+\t[-0-9]+\t\\(.+\\)$")
+            (push (magit-decode-git-path
+                   (let ((f (match-string 1)))
+                     (cond
+                      ((string-match "{.* => \\(.*\\)}" f)
+                       (replace-match (match-string 1 f) nil t f))
+                      ((string-match " => " f)
+                       (substring f (match-end 0)))
+                      (t f))))
+                  files)
+            (magit-delete-line))
+          (setq files (nreverse files))
+          (while (looking-at magit-diff-statline-re)
+            (magit-bind-match-strings (file sep cnt add del) nil
+              (magit-delete-line)
+              (when (string-match " +$" file)
+                (setq sep (concat (match-string 0 file) sep))
+                (setq file (substring file 0 (match-beginning 0))))
+              (let ((le (length file)) ld)
+                (setq file (magit-decode-git-path file))
+                (setq ld (length file))
+                (when (> le ld)
+                  (setq sep (concat (make-string (- le ld) ?\s) sep))))
+              (magit-insert-section (file (pop files))
+                (insert (propertize file 'font-lock-face 'magit-filename)
+                        sep cnt " ")
+                (when add
+                  (insert (propertize add 'font-lock-face
+                                      'magit-diffstat-added)))
+                (when del
+                  (insert (propertize del 'font-lock-face
+                                      'magit-diffstat-removed)))
+                (insert "\n")))))
+        (if (looking-at "^$") (forward-line) (insert "\n"))))))
+
+(defun magit-diff-wash-diff (args)
+  (when (cl-member-if (lambda (arg) (string-prefix-p "--color-moved" arg)) args)
+    (require 'ansi-color)
+    (ansi-color-apply-on-region (point-min) (point-max)))
+  (cond
+   ((looking-at "^Submodule")
+    (magit-diff-wash-submodule))
+   ((looking-at "^\\* Unmerged path \\(.*\\)")
+    (let ((file (magit-decode-git-path (match-string 1))))
+      (magit-delete-line)
+      (unless (and (derived-mode-p 'magit-status-mode)
+                   (not (member "--cached" args)))
+        (magit-insert-section (file file)
+          (insert (propertize
+                   (format "unmerged   %s%s" file
+                           (pcase (cddr (car (magit-file-status file)))
+                             ('(?D ?D) " (both deleted)")
+                             ('(?D ?U) " (deleted by us)")
+                             ('(?U ?D) " (deleted by them)")
+                             ('(?A ?A) " (both added)")
+                             ('(?A ?U) " (added by us)")
+                             ('(?U ?A) " (added by them)")
+                             ('(?U ?U) "")))
+                   'font-lock-face 'magit-diff-file-heading))
+          (insert ?\n))))
+    t)
+   ((looking-at magit-diff-conflict-headline-re)
+    (let ((long-status (match-string 0))
+          (status "BUG")
+          file orig base)
+      (if (equal long-status "merged")
+          (progn (setq status long-status)
+                 (setq long-status nil))
+        (setq status (pcase-exhaustive long-status
+                       ("added in remote"   "new file")
+                       ("added in both"     "new file")
+                       ("added in local"    "new file")
+                       ("removed in both"   "removed")
+                       ("changed in both"   "changed")
+                       ("removed in local"  "removed")
+                       ("removed in remote" "removed"))))
+      (magit-delete-line)
+      (while (looking-at
+              "^  \\([^ ]+\\) +[0-9]\\{6\\} \\([a-z0-9]\\{40,\\}\\) \\(.+\\)$")
+        (magit-bind-match-strings (side _blob name) nil
+          (pcase side
+            ("result" (setq file name))
+            ("our"    (setq orig name))
+            ("their"  (setq file name))
+            ("base"   (setq base name))))
+        (magit-delete-line))
+      (when orig (setq orig (magit-decode-git-path orig)))
+      (when file (setq file (magit-decode-git-path file)))
+      (magit-diff-insert-file-section
+       (or file base) orig status nil nil nil nil long-status)))
+   ;; The files on this line may be ambiguous due to whitespace.
+   ;; That's okay. We can get their names from subsequent headers.
+   ((looking-at "^diff --\
+\\(?:\\(?1:git\\) \\(?:\\(?2:.+?\\) \\2\\)?\
+\\|\\(?:cc\\|combined\\) \\(?3:.+\\)\\)")
+    (let ((status (cond ((equal (match-string 1) "git")        "modified")
+                        ((derived-mode-p 'magit-revision-mode) "resolved")
+                        (t                                     "unmerged")))
+          (orig nil)
+          (file (or (match-string 2) (match-string 3)))
+          (header (list (buffer-substring-no-properties
+                         (line-beginning-position) (1+ (line-end-position)))))
+          (modes nil)
+          (rename nil)
+          (binary nil))
+      (magit-delete-line)
+      (while (not (or (eobp) (looking-at magit-diff-headline-re)))
+        (cond
+         ((looking-at "old mode \\(?:[^\n]+\\)\nnew mode \\(?:[^\n]+\\)\n")
+          (setq modes (match-string 0)))
+         ((looking-at "deleted file .+\n")
+          (setq status "deleted"))
+         ((looking-at "new file .+\n")
+          (setq status "new file"))
+         ((looking-at "rename from \\(.+\\)\nrename to \\(.+\\)\n")
+          (setq rename (match-string 0))
+          (setq orig (match-string 1))
+          (setq file (match-string 2))
+          (setq status "renamed"))
+         ((looking-at "copy from \\(.+\\)\ncopy to \\(.+\\)\n")
+          (setq orig (match-string 1))
+          (setq file (match-string 2))
+          (setq status "new file"))
+         ((looking-at "similarity index .+\n"))
+         ((looking-at "dissimilarity index .+\n"))
+         ((looking-at "index .+\n"))
+         ((looking-at "--- \\(.+?\\)\t?\n")
+          (unless (equal (match-string 1) "/dev/null")
+            (setq orig (match-string 1))))
+         ((looking-at "\\+\\+\\+ \\(.+?\\)\t?\n")
+          (unless (equal (match-string 1) "/dev/null")
+            (setq file (match-string 1))))
+         ((looking-at "Binary files .+ and .+ differ\n")
+          (setq binary t))
+         ((looking-at "Binary files differ\n")
+          (setq binary t))
+         ;; TODO Use all combined diff extended headers.
+         ((looking-at "mode .+\n"))
+         ((error "BUG: Unknown extended header: %S"
+                 (buffer-substring (point) (line-end-position)))))
+        ;; These headers are treated as some sort of special hunk.
+        (unless (or (string-prefix-p "old mode" (match-string 0))
+                    (string-prefix-p "rename"   (match-string 0)))
+          (push (match-string 0) header))
+        (magit-delete-match))
+      (when orig
+        (setq orig (magit-decode-git-path orig)))
+      (setq file (magit-decode-git-path file))
+      (setq header (nreverse header))
+      ;; KLUDGE `git-log' ignores `--no-prefix' when `-L' is used.
+      (when (and (derived-mode-p 'magit-log-mode)
+                 (seq-some (lambda (arg) (string-prefix-p "-L" arg))
+                           magit-buffer-log-args))
+        (when orig
+          (setq orig (substring orig 2)))
+        (setq file (substring file 2))
+        (setq header (list (save-excursion
+                             (string-match "diff [^ ]+" (car header))
+                             (format "%s %s %s\n"
+                                     (match-string 0 (car header))
+                                     (or orig file)
+                                     (or file orig)))
+                           (format "--- %s\n" (or orig "/dev/null"))
+                           (format "+++ %s\n" (or file "/dev/null")))))
+      (setq header (mapconcat #'identity header ""))
+      (magit-diff-insert-file-section
+       file orig status modes rename header binary nil)))))
+
+(defun magit-diff-insert-file-section
+    (file orig status modes rename header binary long-status)
+  (magit-insert-section
+      ( file file
+        (or (equal status "deleted") (derived-mode-p 'magit-status-mode))
+        :source (and (not (equal orig file)) orig)
+        :header header
+        :binary binary)
+    (insert (propertize (format "%-10s %s" status
+                                (if (or (not orig) (equal orig file))
+                                    file
+                                  (format "%s -> %s" orig file)))
+                        'font-lock-face 'magit-diff-file-heading))
+    (cond ((and binary long-status)
+           (insert (format " (%s, binary)" long-status)))
+          ((or binary long-status)
+           (insert (format " (%s)" (if binary "binary" long-status)))))
+    (magit-insert-heading)
+    (when modes
+      (magit-insert-section (hunk '(chmod))
+        (insert modes)
+        (magit-insert-heading)))
+    (when rename
+      (magit-insert-section (hunk '(rename))
+        (insert rename)
+        (magit-insert-heading)))
+    (magit-wash-sequence #'magit-diff-wash-hunk)))
+
+(defun magit-diff-wash-submodule ()
+  ;; See `show_submodule_summary' in submodule.c and "this" commit.
+  (when (looking-at "^Submodule \\([^ ]+\\)")
+    (let ((module (match-string 1))
+          untracked modified)
+      (when (looking-at "^Submodule [^ ]+ contains untracked content$")
+        (magit-delete-line)
+        (setq untracked t))
+      (when (looking-at "^Submodule [^ ]+ contains modified content$")
+        (magit-delete-line)
+        (setq modified t))
+      (cond
+       ((and (looking-at "^Submodule \\([^ ]+\\) \\([^ :]+\\)\\( (rewind)\\)?:$")
+             (equal (match-string 1) module))
+        (magit-bind-match-strings (_module range rewind) nil
+          (magit-delete-line)
+          (while (looking-at "^  \\([<>]\\) \\(.*\\)$")
+            (magit-delete-line))
+          (when rewind
+            (setq range (replace-regexp-in-string "[^.]\\(\\.\\.\\)[^.]"
+                                                  "..." range t t 1)))
+          (magit-insert-section (module module t)
+            (magit-insert-heading
+              (propertize (concat "modified   " module)
+                          'font-lock-face 'magit-diff-file-heading)
+              " ("
+              (cond (rewind "rewind")
+                    ((string-search "..." range) "non-ff")
+                    (t "new commits"))
+              (and (or modified untracked)
+                   (concat ", "
+                           (and modified "modified")
+                           (and modified untracked " and ")
+                           (and untracked "untracked")
+                           " content"))
+              ")")
+            (magit-insert-section-body
+              (let ((default-directory
+                     (file-name-as-directory
+                      (expand-file-name module (magit-toplevel)))))
+                (magit-git-wash (apply-partially #'magit-log-wash-log 'module)
+                  "log" "--oneline" "--left-right" range)
+                (delete-char -1))))))
+       ((and (looking-at "^Submodule \\([^ ]+\\) \\([^ ]+\\) (\\([^)]+\\))$")
+             (equal (match-string 1) module))
+        (magit-bind-match-strings (_module _range msg) nil
+          (magit-delete-line)
+          (magit-insert-section (module module)
+            (magit-insert-heading
+              (propertize (concat "submodule  " module)
+                          'font-lock-face 'magit-diff-file-heading)
+              " (" msg ")"))))
+       (t
+        (magit-insert-section (module module)
+          (magit-insert-heading
+            (propertize (concat "modified   " module)
+                        'font-lock-face 'magit-diff-file-heading)
+            " ("
+            (and modified "modified")
+            (and modified untracked " and ")
+            (and untracked "untracked")
+            " content)")))))))
+
+(defun magit-diff-wash-hunk ()
+  (when (looking-at "^@\\{2,\\} \\(.+?\\) @\\{2,\\}\\(?: \\(.*\\)\\)?")
+    (let* ((heading  (match-string 0))
+           (ranges   (mapcar
+                      (lambda (str)
+                        (let ((range
+                               (mapcar #'string-to-number
+                                       (split-string (substring str 1) ","))))
+                          ;; A single line is +1 rather than +1,1.
+                          (if (length= range 1)
+                              (nconc range (list 1))
+                            range)))
+                      (split-string (match-string 1))))
+           (about    (match-string 2))
+           (combined (length= ranges 3))
+           (value    (cons about ranges)))
+      (magit-delete-line)
+      (magit-insert-section
+          ( hunk value nil
+            :washer #'magit-diff-paint-hunk
+            :combined combined
+            :from-range (if combined (butlast ranges) (car ranges))
+            :to-range (car (last ranges))
+            :about about)
+        (insert (propertize (concat heading "\n")
+                            'font-lock-face 'magit-diff-hunk-heading))
+        (magit-insert-heading)
+        (while (not (or (eobp) (looking-at "^[^-+\s\\]")))
+          (forward-line))))
+    t))
+
+(defun magit-diff-expansion-threshold (section)
+  "Keep new diff sections collapsed if washing takes too long."
+  (and (magit-file-section-p section)
+       (> (float-time (time-subtract (current-time) magit-refresh-start-time))
+          magit-diff-expansion-threshold)
+       'hide))
+
+(add-hook 'magit-section-set-visibility-hook #'magit-diff-expansion-threshold)
+
+;;; Revision Mode
+
+(define-derived-mode magit-revision-mode magit-diff-mode "Magit Rev"
+  "Mode for looking at a Git commit.
+
+This mode is documented in info node `(magit)Revision Buffer'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-section-toggle] to expand or hide the section at point.
+Type \\[magit-visit-thing] to visit the hunk or file at point.
+
+Staging and applying changes is documented in info node
+`(magit)Staging and Unstaging' and info node `(magit)Applying'.
+
+\\<magit-hunk-section-map>Type \
+\\[magit-apply] to apply the change at point, \
+\\[magit-stage] to stage,
+\\[magit-unstage] to unstage, \
+\\[magit-discard] to discard, or \
+\\[magit-reverse] to reverse it.
+
+\\{magit-revision-mode-map}"
+  :group 'magit-revision
+  (hack-dir-local-variables-non-file-buffer))
+
+(put 'magit-revision-mode 'magit-diff-default-arguments
+     '("--stat" "--no-ext-diff"))
+
+(defun magit-revision-setup-buffer (rev args files)
+  (magit-setup-buffer #'magit-revision-mode nil
+    (magit-buffer-revision rev)
+    (magit-buffer-range (format "%s^..%s" rev rev))
+    (magit-buffer-diff-type 'committed)
+    (magit-buffer-diff-args args)
+    (magit-buffer-diff-files files)
+    (magit-buffer-diff-files-suspended nil)))
+
+(defun magit-revision-refresh-buffer ()
+  (setq magit-buffer-revision-hash (magit-rev-hash magit-buffer-revision))
+  (magit-set-header-line-format
+   (concat (magit-object-type magit-buffer-revision-hash)
+           " "  magit-buffer-revision
+           (pcase (length magit-buffer-diff-files)
+             (0)
+             (1 (concat " limited to file " (car magit-buffer-diff-files)))
+             (_ (concat " limited to files "
+                        (mapconcat #'identity magit-buffer-diff-files ", "))))))
+  (magit-insert-section (commitbuf)
+    (magit-run-section-hook 'magit-revision-sections-hook)))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-revision-mode))
+  (cons magit-buffer-revision magit-buffer-diff-files))
+
+(defun magit-insert-revision-diff ()
+  "Insert the diff into this `magit-revision-mode' buffer."
+  (magit--insert-diff t
+    "show" "-p" "--format=" "--no-prefix"
+    (and (member "--stat" magit-buffer-diff-args) "--numstat")
+    magit-buffer-diff-args
+    (magit--rev-dereference magit-buffer-revision)
+    "--" magit-buffer-diff-files))
+
+(defun magit-insert-revision-tag ()
+  "Insert tag message and headers into a revision buffer.
+This function only inserts anything when `magit-show-commit' is
+called with a tag as argument, when that is called with a commit
+or a ref which is not a branch, then it inserts nothing."
+  (when (equal (magit-object-type magit-buffer-revision) "tag")
+    (magit-insert-section (taginfo)
+      (let ((beg (point)))
+        ;; "git verify-tag -v" would output what we need, but the gpg
+        ;; output is send to stderr and we have no control over the
+        ;; order in which stdout and stderr are inserted, which would
+        ;; make parsing hard.  We are forced to use "git cat-file tag"
+        ;; instead, which inserts the signature instead of verifying
+        ;; it.  We remove that later and then insert the verification
+        ;; output using "git verify-tag" (without the "-v").
+        (magit-git-insert "cat-file" "tag" magit-buffer-revision)
+        (goto-char beg)
+        (forward-line 3)
+        (delete-region beg (point)))
+      (looking-at "^tagger \\([^<]+\\) <\\([^>]+\\)")
+      (let ((heading (format "Tagger: %s <%s>"
+                             (match-string 1)
+                             (match-string 2))))
+        (magit-delete-line)
+        (insert (propertize heading 'font-lock-face
+                            'magit-section-secondary-heading)))
+      (magit-insert-heading)
+      (forward-line)
+      (magit-insert-section
+          ( message nil nil
+            :heading-highlight-face 'magit-diff-revision-summary-highlight)
+        (let ((beg (point)))
+          (forward-line)
+          (magit--add-face-text-property
+           beg (point) 'magit-diff-revision-summary))
+        (magit-insert-heading)
+        (if (re-search-forward "-----BEGIN PGP SIGNATURE-----" nil t)
+            (goto-char (match-beginning 0))
+          (goto-char (point-max)))
+        (insert ?\n))
+      (if (re-search-forward "-----BEGIN PGP SIGNATURE-----" nil t)
+          (progn
+            (let ((beg (match-beginning 0)))
+              (re-search-forward "-----END PGP SIGNATURE-----\n")
+              (delete-region beg (point)))
+            (save-excursion
+              (magit-process-git t "verify-tag" magit-buffer-revision))
+            (magit-diff-wash-signature magit-buffer-revision))
+        (goto-char (point-max)))
+      (insert ?\n))))
+
+(defvar-keymap magit-commit-message-section-map
+  :doc "Keymap for `commit-message' sections."
+  "<remap> <magit-visit-thing>"  #'magit-show-commit
+  "<1>" (magit-menu-item "Visit %t" #'magit-show-commit
+                         '(:enable (magit-thing-at-point 'git-revision t))))
+
+(defun magit-insert-revision-message ()
+  "Insert the commit message into a revision buffer."
+  (magit-insert-section
+      ( commit-message nil nil
+        :heading-highlight-face 'magit-diff-revision-summary-highlight)
+    (let ((beg (point))
+          (rev magit-buffer-revision))
+      (insert (with-temp-buffer
+                (magit-rev-insert-format "%B" rev)
+                (magit-revision--wash-message)))
+      (if (= (point) (+ beg 2))
+          (progn (delete-char -2)
+                 (insert "(no message)\n"))
+        (goto-char beg)
+        (save-excursion
+          (while (search-forward "\r\n" nil t) ; Remove trailing CRs.
+            (delete-region (match-beginning 0) (1+ (match-beginning 0)))))
+        (when magit-revision-fill-summary-line
+          (let ((fill-column (min magit-revision-fill-summary-line
+                                  (window-width (get-buffer-window nil t)))))
+            (fill-region (point) (line-end-position))))
+        (when magit-revision-use-hash-sections
+          (save-excursion
+            ;; Start after beg to prevent a (commit text) section from
+            ;; starting at the same point as the (commit-message)
+            ;; section.
+            (goto-char (1+ beg))
+            (while (not (eobp))
+              (re-search-forward "\\_<" nil 'move)
+              (let ((beg (point)))
+                (re-search-forward "\\_>" nil t)
+                (when (> (point) beg)
+                  (let ((text (buffer-substring-no-properties beg (point))))
+                    (when (pcase magit-revision-use-hash-sections
+                            ('quickest ; false negatives and positives
+                             (and (>= (length text) 7)
+                                  (string-match-p "[0-9]" text)
+                                  (string-match-p "[a-z]" text)))
+                            ('quicker  ; false negatives (number-less hashes)
+                             (and (>= (length text) 7)
+                                  (string-match-p "[0-9]" text)
+                                  (magit-commit-p text)))
+                            ('quick    ; false negatives (short hashes)
+                             (and (>= (length text) 7)
+                                  (magit-commit-p text)))
+                            ('slow
+                             (magit-commit-p text)))
+                      (put-text-property beg (point)
+                                         'font-lock-face 'magit-hash)
+                      (let ((end (point)))
+                        (goto-char beg)
+                        (magit-insert-section (commit text)
+                          (goto-char end))))))))))
+        (save-excursion
+          (forward-line)
+          (magit--add-face-text-property
+           beg (point) 'magit-diff-revision-summary)
+          (magit-insert-heading))
+        (when magit-diff-highlight-keywords
+          (save-excursion
+            (while (re-search-forward "\\[[^[]*\\]" nil t)
+              (let ((beg (match-beginning 0))
+                    (end (match-end 0)))
+                (put-text-property
+                 beg end 'font-lock-face
+                 (if-let ((face (get-text-property beg 'font-lock-face)))
+                     (list face 'magit-keyword)
+                   'magit-keyword))))))
+        (goto-char (point-max))))))
+
+(defun magit-insert-revision-notes ()
+  "Insert commit notes into a revision buffer."
+  (let* ((var "core.notesRef")
+         (def (or (magit-get var) "refs/notes/commits")))
+    (dolist (ref (magit-list-active-notes-refs))
+      (magit-insert-section
+          ( notes ref (not (equal ref def))
+            :heading-highlight-face 'magit-diff-hunk-heading-highlight)
+        (let ((beg (point))
+              (rev magit-buffer-revision))
+          (insert (with-temp-buffer
+                    (magit-git-insert "-c" (concat "core.notesRef=" ref)
+                                      "notes" "show" rev)
+                    (magit-revision--wash-message)))
+          (if (= (point) beg)
+              (magit-cancel-section)
+            (goto-char beg)
+            (end-of-line)
+            (insert (format " (%s)"
+                            (propertize (if (string-prefix-p "refs/notes/" ref)
+                                            (substring ref 11)
+                                          ref)
+                                        'font-lock-face 'magit-refname)))
+            (forward-char)
+            (magit--add-face-text-property beg (point) 'magit-diff-hunk-heading)
+            (magit-insert-heading)
+            (goto-char (point-max))
+            (insert ?\n)))))))
+
+(defun magit-revision--wash-message ()
+  (let ((major-mode 'git-commit-mode))
+    (hack-dir-local-variables)
+    (hack-local-variables-apply))
+  (unless (memq git-commit-major-mode '(nil text-mode))
+    (funcall git-commit-major-mode)
+    (font-lock-ensure))
+  (buffer-string))
+
+(defun magit-insert-revision-headers ()
+  "Insert headers about the commit into a revision buffer."
+  (magit-insert-section (headers)
+    (when-let ((string (magit-rev-format "%D" magit-buffer-revision
+                                         "--decorate=full")))
+      (insert (magit-format-ref-labels string) ?\s))
+    (insert (propertize
+             (magit-rev-parse (magit--rev-dereference magit-buffer-revision))
+             'font-lock-face 'magit-hash))
+    (magit-insert-heading)
+    (let ((beg (point)))
+      (magit-rev-insert-format magit-revision-headers-format
+                               magit-buffer-revision)
+      (magit-insert-revision-gravatars magit-buffer-revision beg))
+    (when magit-revision-insert-related-refs
+      (when (magit-revision-insert-related-refs-display-p 'parents)
+        (dolist (parent (magit-commit-parents magit-buffer-revision))
+          (magit-insert-section (commit parent)
+            (let ((line (magit-rev-format "%h %s" parent)))
+              (string-match "^\\([^ ]+\\) \\(.*\\)" line)
+              (magit-bind-match-strings (hash msg) line
+                (insert "Parent:     ")
+                (insert (propertize hash 'font-lock-face 'magit-hash))
+                (insert " " msg "\n"))))))
+      (when (magit-revision-insert-related-refs-display-p 'merged)
+        (magit--insert-related-refs
+         magit-buffer-revision "--merged" "Merged"
+         (eq magit-revision-insert-related-refs 'all)))
+      (when (magit-revision-insert-related-refs-display-p 'contained)
+        (magit--insert-related-refs
+         magit-buffer-revision "--contains" "Contained"
+         (memq magit-revision-insert-related-refs '(all mixed))))
+      (when (magit-revision-insert-related-refs-display-p 'follows)
+        (when-let ((follows (magit-get-current-tag magit-buffer-revision t)))
+          (let ((tag (car  follows))
+                (cnt (cadr follows)))
+            (magit-insert-section (tag tag)
+              (insert
+               (format "Follows:    %s (%s)\n"
+                       (propertize tag 'font-lock-face 'magit-tag)
+                       (propertize (number-to-string cnt)
+                                   'font-lock-face 'magit-branch-local)))))))
+      (when (magit-revision-insert-related-refs-display-p 'precedes)
+        (when-let ((precedes (magit-get-next-tag magit-buffer-revision t)))
+          (let ((tag (car  precedes))
+                (cnt (cadr precedes)))
+            (magit-insert-section (tag tag)
+              (insert (format "Precedes:   %s (%s)\n"
+                              (propertize tag 'font-lock-face 'magit-tag)
+                              (propertize (number-to-string cnt)
+                                          'font-lock-face 'magit-tag)))))))
+      (insert ?\n))))
+
+(defun magit-revision-insert-related-refs-display-p (sym)
+  "Whether to display related branches of type SYM.
+Refer to user option `magit-revision-insert-related-refs-display-alist'."
+  (if-let ((elt (assq sym magit-revision-insert-related-refs-display-alist)))
+      (cdr elt)
+    t))
+
+(defun magit--insert-related-refs (rev arg title remote)
+  (when-let ((refs (magit-list-related-branches arg rev (and remote "-a"))))
+    (insert title ":" (make-string (- 10 (length title)) ?\s))
+    (dolist (branch refs)
+      (if (<= (+ (current-column) 1 (length branch))
+              (window-width))
+          (insert ?\s)
+        (insert ?\n (make-string 12 ?\s)))
+      (magit-insert-section (branch branch)
+        (insert (propertize branch 'font-lock-face
+                            (if (string-prefix-p "remotes/" branch)
+                                'magit-branch-remote
+                              'magit-branch-local)))))
+    (insert ?\n)))
+
+(defun magit-insert-revision-gravatars (rev beg)
+  (when (and magit-revision-show-gravatars
+             (window-system))
+    (require 'gravatar)
+    (pcase-let ((`(,author . ,committer)
+                 (pcase magit-revision-show-gravatars
+                   ('t '("^Author:     " . "^Commit:     "))
+                   ('author '("^Author:     " . nil))
+                   ('committer '(nil . "^Commit:     "))
+                   (_ magit-revision-show-gravatars))))
+      (when-let ((email (and author (magit-rev-format "%aE" rev))))
+        (magit-insert-revision-gravatar beg rev email author))
+      (when-let ((email (and committer (magit-rev-format "%cE" rev))))
+        (magit-insert-revision-gravatar beg rev email committer)))))
+
+(defun magit-insert-revision-gravatar (beg rev email regexp)
+  (save-excursion
+    (goto-char beg)
+    (when (re-search-forward regexp nil t)
+      (when-let ((window (get-buffer-window)))
+        (let* ((column   (length (match-string 0)))
+               (font-obj (query-font (font-at (point) window)))
+               (size     (* 2 (+ (aref font-obj 4)
+                                 (aref font-obj 5))))
+               (align-to (+ column
+                            (ceiling (/ size (aref font-obj 7) 1.0))
+                            1))
+               (gravatar-size (- size 2)))
+          (ignore-errors ; service may be unreachable
+            (gravatar-retrieve email #'magit-insert-revision-gravatar-cb
+                               (list gravatar-size rev
+                                     (point-marker)
+                                     align-to column))))))))
+
+(defun magit-insert-revision-gravatar-cb (image size rev marker align-to column)
+  (unless (eq image 'error)
+    (when-let ((buffer (marker-buffer marker)))
+      (with-current-buffer buffer
+        (save-excursion
+          (goto-char marker)
+          ;; The buffer might display another revision by now or
+          ;; it might have been refreshed, in which case another
+          ;; process might already have inserted the image.
+          (when (and (equal rev magit-buffer-revision)
+                     (not (eq (car-safe
+                               (car-safe
+                                (get-text-property (point) 'display)))
+                              'image)))
+            (setf (image-property image :ascent) 'center)
+            (setf (image-property image :relief) 1)
+            (setf (image-property image :scale)  1)
+            (setf (image-property image :height) size)
+            (let ((top (list image '(slice 0.0 0.0 1.0 0.5)))
+                  (bot (list image '(slice 0.0 0.5 1.0 1.0)))
+                  (align `((space :align-to ,align-to))))
+              (let ((inhibit-read-only t))
+                (insert (propertize " " 'display top))
+                (insert (propertize " " 'display align))
+                (forward-line)
+                (forward-char column)
+                (insert (propertize " " 'display bot))
+                (insert (propertize " " 'display align))))))))))
+
+;;; Merge-Preview Mode
+
+(define-derived-mode magit-merge-preview-mode magit-diff-mode "Magit Merge"
+  "Mode for previewing a merge."
+  :group 'magit-diff
+  (hack-dir-local-variables-non-file-buffer))
+
+(put 'magit-merge-preview-mode 'magit-diff-default-arguments
+     '("--no-ext-diff"))
+
+(defun magit-merge-preview-setup-buffer (rev)
+  (magit-setup-buffer #'magit-merge-preview-mode nil
+    (magit-buffer-revision rev)
+    (magit-buffer-range (format "%s^..%s" rev rev))))
+
+(defun magit-merge-preview-refresh-buffer ()
+  (let* ((branch (magit-get-current-branch))
+         (head (or branch (magit-rev-verify "HEAD"))))
+    (magit-set-header-line-format (format "Preview merge of %s into %s"
+                                          magit-buffer-revision
+                                          (or branch "HEAD")))
+    (magit-insert-section (diffbuf)
+      (magit--insert-diff t
+        "merge-tree" (magit-git-string "merge-base" head magit-buffer-revision)
+        head magit-buffer-revision))))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-merge-preview-mode))
+  magit-buffer-revision)
+
+;;; Hunk Section
+
+(defun magit-hunk-set-window-start (section)
+  "When SECTION is a `hunk', ensure that its beginning is visible.
+It the SECTION has a different type, then do nothing."
+  (when (magit-hunk-section-p section)
+    (magit-section-set-window-start section)))
+
+(add-hook 'magit-section-movement-hook #'magit-hunk-set-window-start)
+
+(cl-defmethod magit-section-get-relative-position ((_section magit-hunk-section))
+  (nconc (cl-call-next-method)
+         (and (region-active-p)
+              (progn
+                (goto-char (line-beginning-position))
+                (when  (looking-at "^[-+]") (forward-line))
+                (while (looking-at "^[ @]") (forward-line))
+                (let ((beg (magit-point)))
+                  (list (cond
+                         ((looking-at "^[-+]")
+                          (forward-line)
+                          (while (looking-at "^[-+]") (forward-line))
+                          (while (looking-at "^ ")    (forward-line))
+                          (forward-line -1)
+                          (regexp-quote (buffer-substring-no-properties
+                                         beg (line-end-position))))
+                         (t t))))))))
+
+(cl-defmethod magit-section-goto-successor ((section magit-hunk-section)
+                                            line char &optional arg)
+  (or (magit-section-goto-successor--same section line char)
+      (and-let* ((parent (magit-get-section
+                          (magit-section-ident
+                           (oref section parent)))))
+        (let* ((children (oref parent children))
+               (siblings (magit-section-siblings section 'prev))
+               (previous (nth (length siblings) children)))
+          (if (not arg)
+              (when-let ((sibling (or previous (car (last children)))))
+                (magit-section-goto sibling)
+                t)
+            (when previous
+              (magit-section-goto previous))
+            (if (and (stringp arg)
+                     (re-search-forward arg (oref parent end) t))
+                (goto-char (match-beginning 0))
+              (goto-char (oref (car (last children)) end))
+              (forward-line -1)
+              (while (looking-at "^ ")    (forward-line -1))
+              (while (looking-at "^[-+]") (forward-line -1))
+              (forward-line)))))
+      (magit-section-goto-successor--related section)))
+
+;;; Diff Sections
+
+(defvar-keymap magit-unstaged-section-map
+  :doc "Keymap for the `unstaged' section."
+  "<remap> <magit-visit-thing>"  #'magit-diff-unstaged
+  "<remap> <magit-stage-file>"   #'magit-stage
+  "<remap> <magit-delete-thing>" #'magit-discard
+  "<3>" (magit-menu-item "Discard all" #'magit-discard)
+  "<2>" (magit-menu-item "Stage all"   #'magit-stage)
+  "<1>" (magit-menu-item "Visit diff"  #'magit-diff-unstaged))
+
+(magit-define-section-jumper magit-jump-to-unstaged "Unstaged changes" unstaged)
+
+(defun magit-insert-unstaged-changes ()
+  "Insert section showing unstaged changes."
+  (magit-insert-section (unstaged)
+    (magit-insert-heading "Unstaged changes:")
+    (magit--insert-diff nil
+      "diff" magit-buffer-diff-args "--no-prefix"
+      "--" magit-buffer-diff-files)))
+
+(defvar-keymap magit-staged-section-map
+  :doc "Keymap for the `staged' section."
+  "<remap> <magit-revert-no-commit>" #'magit-reverse
+  "<remap> <magit-delete-thing>"     #'magit-discard
+  "<remap> <magit-unstage-file>"     #'magit-unstage
+  "<remap> <magit-visit-thing>"      #'magit-diff-staged
+  "<4>" (magit-menu-item "Reverse all" #'magit-reverse)
+  "<3>" (magit-menu-item "Discard all" #'magit-discard)
+  "<2>" (magit-menu-item "Unstage all" #'magit-unstage)
+  "<1>" (magit-menu-item "Visit diff"  #'magit-diff-staged))
+
+(magit-define-section-jumper magit-jump-to-staged "Staged changes" staged)
+
+(defun magit-insert-staged-changes ()
+  "Insert section showing staged changes."
+  ;; Avoid listing all files as deleted when visiting a bare repo.
+  (unless (magit-bare-repo-p)
+    (magit-insert-section (staged)
+      (magit-insert-heading "Staged changes:")
+      (magit--insert-diff nil
+        "diff" "--cached" magit-buffer-diff-args "--no-prefix"
+        "--" magit-buffer-diff-files))))
+
+;;; Diff Type
+
+(defvar magit--diff-use-recorded-type-p t)
+
+(defun 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 everywhere they
+should be and 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'.
+
+Do not confuse this with `magit-diff-scope' (which see)."
+  (when-let ((section (or section (magit-current-section))))
+    (cond ((derived-mode-p 'magit-revision-mode 'magit-stash-mode) 'committed)
+          ((derived-mode-p 'magit-diff-mode)
+           (let ((range magit-buffer-range)
+                 (const magit-buffer-typearg))
+             (cond ((and magit--diff-use-recorded-type-p
+                         magit-buffer-diff-type))
+                   ((equal const "--no-index") 'undefined)
+                   ((or (not range)
+                        (equal range "HEAD")
+                        (magit-rev-eq range "HEAD"))
+                    (if (equal const "--cached")
+                        'staged
+                      'unstaged))
+                   ((equal const "--cached")
+                    (if (magit-rev-head-p range)
+                        'staged
+                      'undefined)) ; i.e., committed and staged
+                   (t 'committed))))
+          ((derived-mode-p 'magit-status-mode)
+           (let ((stype (oref section type)))
+             (if (memq stype '(staged unstaged tracked untracked))
+                 stype
+               (pcase stype
+                 ((or 'file 'module)
+                  (let* ((parent (oref section parent))
+                         (type   (oref parent type)))
+                    (if (memq type '(file module))
+                        (magit-diff-type parent)
+                      type)))
+                 ('hunk (thread-first section
+                          (oref parent)
+                          (oref parent)
+                          (oref type)))))))
+          ((derived-mode-p 'magit-log-mode)
+           (if (or (and (magit-section-match 'commit section)
+                        (oref section children))
+                   (magit-section-match [* file commit] section))
+               'committed
+             'undefined))
+          (t 'undefined))))
+
+(cl-defun magit-diff-scope (&optional (section nil ssection) 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 that is nil
+the current section, is a `hunk' section; and the region region
+starts and ends inside the body of a that section, then the type
+is `region'.  If the region is empty after a mouse click, then
+`hunk' is returned instead of `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."
+  (let ((siblings (and (not ssection) (magit-region-sections nil t))))
+    (setq section (or section (car siblings) (magit-current-section)))
+    (when (and section
+               (or (not strict)
+                   (and (not (eq (magit-diff-type section) 'untracked))
+                        (not (eq (and-let* ((parent (oref section parent)))
+                                   (oref parent type))
+                                 'diffstat)))))
+      (pcase (list (oref section type)
+                   (and siblings t)
+                   (magit-diff-use-hunk-region-p)
+                   ssection)
+        (`(hunk nil   t  ,_)
+         (if (magit-section-internal-region-p section) 'region 'hunk))
+        ('(hunk   t   t nil) 'hunks)
+        (`(hunk  ,_  ,_  ,_) 'hunk)
+        ('(file   t   t nil) 'files)
+        (`(file  ,_  ,_  ,_) 'file)
+        ('(module   t   t nil) 'files)
+        (`(module  ,_  ,_  ,_) 'file)
+        (`(,(or 'staged 'unstaged 'untracked) nil ,_ ,_) 'list)))))
+
+(defun magit-diff-use-hunk-region-p ()
+  (and (region-active-p)
+       ;; TODO implement this from first principals
+       ;; currently it's trial-and-error
+       (not (and (or (eq this-command #'mouse-drag-region)
+                     (eq last-command #'mouse-drag-region)
+                     ;; When another window was previously
+                     ;; selected then the last-command is
+                     ;; some byte-code function.
+                     (byte-code-function-p last-command))
+                 (eq (region-end) (region-beginning))))))
+
+;;; Diff Highlight
+
+(add-hook 'magit-section-unhighlight-hook #'magit-diff-unhighlight)
+(add-hook 'magit-section-highlight-hook #'magit-diff-highlight)
+
+(defun magit-diff-unhighlight (section selection)
+  "Remove the highlighting of the diff-related SECTION."
+  (when (magit-hunk-section-p section)
+    (magit-diff-paint-hunk section selection nil)
+    t))
+
+(defun magit-diff-highlight (section selection)
+  "Highlight the diff-related SECTION.
+If SECTION is not a diff-related section, then do nothing and
+return nil.  If SELECTION is non-nil, then it is a list of sections
+selected by the region, including SECTION.  All of these sections
+are highlighted."
+  (if (and (magit-section-match 'commit section)
+           (oref section children))
+      (progn (if selection
+                 (dolist (section selection)
+                   (magit-diff-highlight-list section selection))
+               (magit-diff-highlight-list section))
+             t)
+    (when-let ((scope (magit-diff-scope section t)))
+      (cond ((eq scope 'region)
+             (magit-diff-paint-hunk section selection t))
+            (selection
+             (dolist (section selection)
+               (magit-diff-highlight-recursive section selection)))
+            (t
+             (magit-diff-highlight-recursive section)))
+      t)))
+
+(defun magit-diff-highlight-recursive (section &optional selection)
+  (pcase (magit-diff-scope section)
+    ('list (magit-diff-highlight-list section selection))
+    ('file (magit-diff-highlight-file section selection))
+    ('hunk (magit-diff-highlight-heading section selection)
+           (magit-diff-paint-hunk section selection t))
+    (_     (magit-section-highlight section nil))))
+
+(defun magit-diff-highlight-list (section &optional selection)
+  (let ((beg (oref section start))
+        (cnt (oref section content))
+        (end (oref section end)))
+    (when (or (eq this-command #'mouse-drag-region)
+              (not selection))
+      (unless (and (region-active-p)
+                   (<= (region-beginning) beg))
+        (magit-section-make-overlay beg cnt 'magit-section-highlight))
+      (if (oref section hidden)
+          (oset section washer #'ignore)
+        (dolist (child (oref section children))
+          (when (or (eq this-command #'mouse-drag-region)
+                    (not (and (region-active-p)
+                              (<= (region-beginning)
+                                  (oref child start)))))
+            (magit-diff-highlight-recursive child selection)))))
+    (when magit-diff-highlight-hunk-body
+      (magit-section-make-overlay (1- end) end 'magit-section-highlight))))
+
+(defun magit-diff-highlight-file (section &optional selection)
+  (magit-diff-highlight-heading section selection)
+  (when (or (not (oref section hidden))
+            (cl-typep section 'magit-module-section))
+    (dolist (child (oref section children))
+      (magit-diff-highlight-recursive child selection))))
+
+(defun magit-diff-highlight-heading (section &optional selection)
+  (magit-section-make-overlay
+   (oref section start)
+   (or (oref section content)
+       (oref section end))
+   (pcase (list (oref section type)
+                (and (member section selection)
+                     (not (eq this-command #'mouse-drag-region))))
+     ('(file     t) 'magit-diff-file-heading-selection)
+     ('(file   nil) 'magit-diff-file-heading-highlight)
+     ('(module   t) 'magit-diff-file-heading-selection)
+     ('(module nil) 'magit-diff-file-heading-highlight)
+     ('(hunk     t) 'magit-diff-hunk-heading-selection)
+     ('(hunk   nil) 'magit-diff-hunk-heading-highlight))))
+
+;;; Hunk Paint
+
+(cl-defun magit-diff-paint-hunk
+    (section &optional selection
+             (highlight (magit-section-selected-p section selection)))
+  (let (paint)
+    (unless magit-diff-highlight-hunk-body
+      (setq highlight nil))
+    (cond (highlight
+           (unless (oref section hidden)
+             (add-to-list 'magit-section-highlighted-sections section)
+             (cond ((memq section magit-section-unhighlight-sections)
+                    (setq magit-section-unhighlight-sections
+                          (delq section magit-section-unhighlight-sections)))
+                   (magit-diff-highlight-hunk-body
+                    (setq paint t)))))
+          (t
+           (cond ((and (oref section hidden)
+                       (memq section magit-section-unhighlight-sections))
+                  (add-to-list 'magit-section-highlighted-sections section)
+                  (setq magit-section-unhighlight-sections
+                        (delq section magit-section-unhighlight-sections)))
+                 (t
+                  (setq paint t)))))
+    (when paint
+      (save-excursion
+        (goto-char (oref section start))
+        (let ((end (oref section end))
+              (merging (looking-at "@@@"))
+              (diff-type (magit-diff-type))
+              (stage nil)
+              (tab-width (magit-diff-tab-width
+                          (magit-section-parent-value section))))
+          (forward-line)
+          (while (< (point) end)
+            (when (and magit-diff-hide-trailing-cr-characters
+                       (char-equal ?\r (char-before (line-end-position))))
+              (put-text-property (1- (line-end-position)) (line-end-position)
+                                 'invisible t))
+            (put-text-property
+             (point) (1+ (line-end-position)) 'font-lock-face
+             (cond
+              ((looking-at "^\\+\\+?\\([<=|>]\\)\\{7\\}")
+               (setq stage (pcase (list (match-string 1) highlight)
+                             ('("<" nil) 'magit-diff-our)
+                             ('("<"   t) 'magit-diff-our-highlight)
+                             ('("|" nil) 'magit-diff-base)
+                             ('("|"   t) 'magit-diff-base-highlight)
+                             ('("=" nil) 'magit-diff-their)
+                             ('("="   t) 'magit-diff-their-highlight)
+                             ('(">" nil) nil)))
+               'magit-diff-conflict-heading)
+              ((looking-at (if merging "^\\(\\+\\| \\+\\)" "^\\+"))
+               (magit-diff-paint-tab merging tab-width)
+               (magit-diff-paint-whitespace merging 'added diff-type)
+               (or stage
+                   (if highlight 'magit-diff-added-highlight 'magit-diff-added)))
+              ((looking-at (if merging "^\\(-\\| -\\)" "^-"))
+               (magit-diff-paint-tab merging tab-width)
+               (magit-diff-paint-whitespace merging 'removed diff-type)
+               (if highlight 'magit-diff-removed-highlight 'magit-diff-removed))
+              (t
+               (magit-diff-paint-tab merging tab-width)
+               (magit-diff-paint-whitespace merging 'context diff-type)
+               (if highlight 'magit-diff-context-highlight 'magit-diff-context))))
+            (forward-line))))))
+  (magit-diff-update-hunk-refinement section))
+
+(defvar magit-diff--tab-width-cache nil)
+
+(defun magit-diff-tab-width (file)
+  (setq file (expand-file-name file))
+  (cl-flet ((cache (value)
+              (let ((elt (assoc file magit-diff--tab-width-cache)))
+                (if elt
+                    (setcdr elt value)
+                  (setq magit-diff--tab-width-cache
+                        (cons (cons file value)
+                              magit-diff--tab-width-cache))))
+              value))
+    (cond
+     ((not magit-diff-adjust-tab-width)
+      tab-width)
+     ((and-let* ((buffer (find-buffer-visiting file)))
+        (cache (buffer-local-value 'tab-width buffer))))
+     ((and-let* ((elt (assoc file magit-diff--tab-width-cache)))
+        (or (cdr elt)
+            tab-width)))
+     ((or (eq magit-diff-adjust-tab-width 'always)
+          (and (numberp magit-diff-adjust-tab-width)
+               (>= magit-diff-adjust-tab-width
+                   (nth 7 (file-attributes file)))))
+      (cache (buffer-local-value 'tab-width (find-file-noselect file))))
+     (t
+      (cache nil)
+      tab-width))))
+
+(defun magit-diff-paint-tab (merging width)
+  (save-excursion
+    (forward-char (if merging 2 1))
+    (while (= (char-after) ?\t)
+      (put-text-property (point) (1+ (point))
+                         'display (list (list 'space :width width)))
+      (forward-char))))
+
+(defun magit-diff-paint-whitespace (merging line-type diff-type)
+  (when (and magit-diff-paint-whitespace
+             (or (not (memq magit-diff-paint-whitespace '(uncommitted status)))
+                 (memq diff-type '(staged unstaged)))
+             (cl-case line-type
+               (added   t)
+               (removed (memq magit-diff-paint-whitespace-lines '(all both)))
+               (context (memq magit-diff-paint-whitespace-lines '(all)))))
+    (let ((prefix (if merging "^[-\\+\s]\\{2\\}" "^[-\\+\s]"))
+          (indent
+           (if (local-variable-p 'magit-diff-highlight-indentation)
+               magit-diff-highlight-indentation
+             (setq-local
+              magit-diff-highlight-indentation
+              (cdr (--first (string-match-p (car it) default-directory)
+                            (nreverse
+                             (default-value
+                              'magit-diff-highlight-indentation))))))))
+      (when (and magit-diff-highlight-trailing
+                 (looking-at (concat prefix ".*?\\([ \t]+\\)?$")))
+        (let ((ov (make-overlay (match-beginning 1) (match-end 1) nil t)))
+          (overlay-put ov 'font-lock-face 'magit-diff-whitespace-warning)
+          (overlay-put ov 'priority 2)
+          (overlay-put ov 'evaporate t)))
+      (when (or (and (eq indent 'tabs)
+                     (looking-at (concat prefix "\\( *\t[ \t]*\\)")))
+                (and (integerp indent)
+                     (looking-at (format "%s\\([ \t]* \\{%s,\\}[ \t]*\\)"
+                                         prefix indent))))
+        (let ((ov (make-overlay (match-beginning 1) (match-end 1) nil t)))
+          (overlay-put ov 'font-lock-face 'magit-diff-whitespace-warning)
+          (overlay-put ov 'priority 2)
+          (overlay-put ov 'evaporate t))))))
+
+(defun magit-diff-update-hunk-refinement (&optional section)
+  (if section
+      (unless (oref section hidden)
+        (pcase (list magit-diff-refine-hunk
+                     (oref section refined)
+                     (eq section (magit-current-section)))
+          ((or `(all nil ,_) '(t nil t))
+           (oset section refined t)
+           (save-excursion
+             (goto-char (oref section start))
+             ;; `diff-refine-hunk' does not handle combined diffs.
+             (unless (looking-at "@@@")
+               (let ((smerge-refine-ignore-whitespace
+                      magit-diff-refine-ignore-whitespace)
+                     ;; Avoid fsyncing many small temp files
+                     (write-region-inhibit-fsync t))
+                 (diff-refine-hunk)))))
+          ((or `(nil t ,_) '(t t nil))
+           (oset section refined nil)
+           (remove-overlays (oref section start)
+                            (oref section end)
+                            'diff-mode 'fine))))
+    (cl-labels ((recurse (section)
+                  (if (magit-section-match 'hunk section)
+                      (magit-diff-update-hunk-refinement section)
+                    (dolist (child (oref section children))
+                      (recurse child)))))
+      (recurse magit-root-section))))
+
+
+;;; Hunk Region
+
+(defun magit-diff-hunk-region-beginning ()
+  (save-excursion (goto-char (region-beginning))
+                  (line-beginning-position)))
+
+(defun magit-diff-hunk-region-end ()
+  (save-excursion (goto-char (region-end))
+                  (line-end-position)))
+
+(defun magit-diff-update-hunk-region (section)
+  "Highlight the hunk-internal region if any."
+  (when (and (eq (oref section type) 'hunk)
+             (eq (magit-diff-scope section t) 'region))
+    (magit-diff--make-hunk-overlay
+     (oref section start)
+     (1- (oref section content))
+     'font-lock-face 'magit-diff-lines-heading
+     'display (magit-diff-hunk-region-header section)
+     'after-string (magit-diff--hunk-after-string 'magit-diff-lines-heading))
+    (run-hook-with-args 'magit-diff-highlight-hunk-region-functions section)
+    t))
+
+(defun magit-diff-highlight-hunk-region-dim-outside (section)
+  "Dim the parts of the hunk that are outside the hunk-internal region.
+This is done by using the same foreground and background color
+for added and removed lines as for context lines."
+  (let ((face (if magit-diff-highlight-hunk-body
+                  'magit-diff-context-highlight
+                'magit-diff-context)))
+    (when magit-diff-unmarked-lines-keep-foreground
+      (setq face `(,@(and (>= emacs-major-version 27) '(:extend t))
+                   :background ,(face-attribute face :background))))
+    (magit-diff--make-hunk-overlay (oref section content)
+                                   (magit-diff-hunk-region-beginning)
+                                   'font-lock-face face
+                                   'priority 2)
+    (magit-diff--make-hunk-overlay (1+ (magit-diff-hunk-region-end))
+                                   (oref section end)
+                                   'font-lock-face face
+                                   'priority 2)))
+
+(defun magit-diff-highlight-hunk-region-using-face (_section)
+  "Highlight the hunk-internal region by making it bold.
+Or rather highlight using the face `magit-diff-hunk-region', though
+changing only the `:weight' and/or `:slant' is recommended for that
+face."
+  (magit-diff--make-hunk-overlay (magit-diff-hunk-region-beginning)
+                                 (1+ (magit-diff-hunk-region-end))
+                                 'font-lock-face 'magit-diff-hunk-region))
+
+(defun magit-diff-highlight-hunk-region-using-overlays (section)
+  "Emphasize the hunk-internal region using delimiting horizontal lines.
+This is implemented as single-pixel newlines places inside overlays."
+  (if (window-system)
+      (let ((beg (magit-diff-hunk-region-beginning))
+            (end (magit-diff-hunk-region-end))
+            (str (propertize
+                  (concat (propertize "\s" 'display '(space :height (1)))
+                          (propertize "\n" 'line-height t))
+                  'font-lock-face 'magit-diff-lines-boundary)))
+        (magit-diff--make-hunk-overlay beg (1+ beg) 'before-string str)
+        (magit-diff--make-hunk-overlay end (1+ end) 'after-string  str))
+    (magit-diff-highlight-hunk-region-using-face section)))
+
+(defun magit-diff-highlight-hunk-region-using-underline (section)
+  "Emphasize the hunk-internal region using delimiting horizontal lines.
+This is implemented by overlining and underlining the first and
+last (visual) lines of the region."
+  (if (window-system)
+      (let* ((beg (magit-diff-hunk-region-beginning))
+             (end (magit-diff-hunk-region-end))
+             (beg-eol (save-excursion (goto-char beg)
+                                      (end-of-visual-line)
+                                      (point)))
+             (end-bol (save-excursion (goto-char end)
+                                      (beginning-of-visual-line)
+                                      (point)))
+             (color (face-background 'magit-diff-lines-boundary nil t)))
+        (cl-flet ((ln (b e &rest face)
+                    (magit-diff--make-hunk-overlay
+                     b e 'font-lock-face face 'after-string
+                     (magit-diff--hunk-after-string face))))
+          (if (= beg end-bol)
+              (ln beg beg-eol :overline color :underline color)
+            (ln beg beg-eol :overline color)
+            (ln end-bol end :underline color))))
+    (magit-diff-highlight-hunk-region-using-face section)))
+
+(defun magit-diff--make-hunk-overlay (start end &rest args)
+  (let ((ov (make-overlay start end nil t)))
+    (overlay-put ov 'evaporate t)
+    (while args (overlay-put ov (pop args) (pop args)))
+    (push ov magit-section--region-overlays)
+    ov))
+
+(defun magit-diff--hunk-after-string (face)
+  (propertize "\s"
+              'font-lock-face face
+              'display (list 'space :align-to
+                             `(+ (0 . right)
+                                 ,(min (window-hscroll)
+                                       (- (line-end-position)
+                                          (line-beginning-position)))))
+              ;; This prevents the cursor from being rendered at the
+              ;; edge of the window.
+              'cursor t))
+
+;;; Utilities
+
+(defun magit-diff-inside-hunk-body-p ()
+  "Return non-nil if point is inside the body of a hunk."
+  (and (magit-section-match 'hunk)
+       (and-let* ((content (oref (magit-current-section) content)))
+         (> (magit-point) content))))
+
+(defun magit-diff--combined-p (section)
+  (cl-assert (cl-typep section 'magit-file-section))
+  (string-match-p "\\`diff --\\(combined\\|cc\\)" (oref section value)))
+
+;;; Diff Extract
+
+(defun magit-diff-file-header (section &optional no-rename)
+  (when (magit-hunk-section-p section)
+    (setq section (oref section parent)))
+  (and (magit-file-section-p section)
+       (let ((header (oref section header)))
+         (if no-rename
+             (replace-regexp-in-string
+              "^--- \\(.+\\)" (oref section value) header t t 1)
+           header))))
+
+(defun magit-diff-hunk-region-header (section)
+  (let ((patch (magit-diff-hunk-region-patch section)))
+    (string-match "\n" patch)
+    (substring patch 0 (1- (match-end 0)))))
+
+(defun magit-diff-hunk-region-patch (section &optional args)
+  (let ((op (if (member "--reverse" args) "+" "-"))
+        (sbeg (oref section start))
+        (rbeg (magit-diff-hunk-region-beginning))
+        (rend (region-end))
+        (send (oref section end))
+        (patch nil))
+    (save-excursion
+      (goto-char sbeg)
+      (while (< (point) send)
+        (looking-at "\\(.\\)\\([^\n]*\n\\)")
+        (cond ((or (string-match-p "[@ ]" (match-string-no-properties 1))
+                   (and (>= (point) rbeg)
+                        (<= (point) rend)))
+               (push (match-string-no-properties 0) patch))
+              ((equal op (match-string-no-properties 1))
+               (push (concat " " (match-string-no-properties 2)) patch)))
+        (forward-line)))
+    (let ((buffer-list-update-hook nil)) ; #3759
+      (with-temp-buffer
+        (insert (mapconcat #'identity (reverse patch) ""))
+        (diff-fixup-modifs (point-min) (point-max))
+        (setq patch (buffer-string))))
+    patch))
+
+;;; _
+(provide 'magit-diff)
+;;; magit-diff.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-diff.elc b/emacs/elpa/magit-20240514.1843/magit-diff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-ediff.el b/emacs/elpa/magit-20240514.1843/magit-ediff.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-ediff.elc b/emacs/elpa/magit-20240514.1843/magit-ediff.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-extras.el b/emacs/elpa/magit-20240514.1843/magit-extras.el
@@ -0,0 +1,910 @@
+;;; magit-extras.el --- Additional functionality 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:
+
+;; Additional functionality for Magit.
+
+;;; Code:
+
+(require 'magit)
+
+;; For `magit-do-async-shell-command'.
+(declare-function dired-read-shell-command "dired-aux" (prompt arg files))
+;; For `magit-project-status'.
+(declare-function vc-git-command "vc-git"
+                  (buffer okstatus file-or-list &rest flags))
+
+(defvar ido-exit)
+(defvar ido-fallback)
+(defvar project-prefix-map)
+(defvar project-switch-commands)
+
+(defgroup magit-extras nil
+  "Additional functionality for Magit."
+  :group 'magit-extensions)
+
+;;; Git Tools
+;;;; Git-Mergetool
+
+;;;###autoload (autoload 'magit-git-mergetool "magit-extras" nil t)
+(transient-define-prefix magit-git-mergetool (file args &optional transient)
+  "Resolve conflicts in FILE using \"git mergetool --gui\".
+With a prefix argument allow changing ARGS using a transient
+popup.  See info node `(magit) Ediffing' for information about
+alternative commands."
+  :man-page "git-mergetool"
+  ["Settings"
+   ("-t" magit-git-mergetool:--tool)
+   ("=t" magit-merge.guitool)
+   ("=T" magit-merge.tool)
+   ("-r" magit-mergetool.hideResolved)
+   ("-b" magit-mergetool.keepBackup)
+   ("-k" magit-mergetool.keepTemporaries)
+   ("-w" magit-mergetool.writeToTemp)]
+  ["Actions"
+   (" m" "Invoke mergetool" magit-git-mergetool)]
+  (interactive
+   (if (and (not (eq transient-current-prefix 'magit-git-mergetool))
+            current-prefix-arg)
+       (list nil nil t)
+     (list (magit-read-unmerged-file "Resolve")
+           (transient-args 'magit-git-mergetool))))
+  (if transient
+      (transient-setup 'magit-git-mergetool)
+    (magit-run-git-async "mergetool" "--gui" args "--" file)))
+
+(transient-define-infix magit-git-mergetool:--tool ()
+  :description "Override mergetool"
+  :class 'transient-option
+  :shortarg "-t"
+  :argument "--tool="
+  :reader #'magit--read-mergetool)
+
+(transient-define-infix magit-merge.guitool ()
+  :class 'magit--git-variable
+  :variable "merge.guitool"
+  :global t
+  :reader #'magit--read-mergetool)
+
+(transient-define-infix magit-merge.tool ()
+  :class 'magit--git-variable
+  :variable "merge.tool"
+  :global t
+  :reader #'magit--read-mergetool)
+
+(defun magit--read-mergetool (prompt _initial-input history)
+  (let ((choices nil)
+        (lines (cdr (magit-git-lines "mergetool" "--tool-help"))))
+    (while (string-prefix-p "\t\t" (car lines))
+      (push (substring (pop lines) 2) choices))
+    (setq choices (nreverse choices))
+    (magit-completing-read (or prompt "Select mergetool")
+                           choices nil t nil history)))
+
+(transient-define-infix magit-mergetool.hideResolved ()
+  :class 'magit--git-variable:boolean
+  :variable "mergetool.hideResolved"
+  :default "false"
+  :global t)
+
+(transient-define-infix magit-mergetool.keepBackup ()
+  :class 'magit--git-variable:boolean
+  :variable "mergetool.keepBackup"
+  :default "true"
+  :global t)
+
+(transient-define-infix magit-mergetool.keepTemporaries ()
+  :class 'magit--git-variable:boolean
+  :variable "mergetool.keepTemporaries"
+  :default "false"
+  :global t)
+
+(transient-define-infix magit-mergetool.writeToTemp ()
+  :class 'magit--git-variable:boolean
+  :variable "mergetool.writeToTemp"
+  :default "false"
+  :global t)
+
+;;;; Git-Gui
+
+;;;###autoload
+(defun magit-run-git-gui-blame (commit filename &optional linenum)
+  "Run `git gui blame' on the given FILENAME and COMMIT.
+Interactively run it for the current file and the `HEAD', with a
+prefix or when the current file cannot be determined let the user
+choose.  When the current buffer is visiting FILENAME instruct
+blame to center around the line point is on."
+  (interactive
+   (let (revision filename)
+     (when (or current-prefix-arg
+               (progn
+                 (setq revision "HEAD")
+                 (not (setq filename (magit-file-relative-name nil 'tracked)))))
+       (setq revision (magit-read-branch-or-commit "Blame from revision"))
+       (setq filename (magit-read-file-from-rev revision "Blame file")))
+     (list revision filename
+           (and (equal filename
+                       (ignore-errors
+                         (magit-file-relative-name buffer-file-name)))
+                (line-number-at-pos)))))
+  (magit-with-toplevel
+    (magit-process-git 0 "gui" "blame"
+                       (and linenum (list (format "--line=%d" linenum)))
+                       commit
+                       filename)))
+
+;;;; Gitk
+
+(defcustom magit-gitk-executable
+  (or (and (eq system-type 'windows-nt)
+           (let ((exe (magit-git-string
+                       "-c" "alias.X=!x() { which \"$1\" | cygpath -mf -; }; x"
+                       "X" "gitk.exe")))
+             (and exe (file-executable-p exe) exe)))
+      (executable-find "gitk") "gitk")
+  "The Gitk executable."
+  :group 'magit-extras
+  :set-after '(magit-git-executable)
+  :type 'string)
+
+;;;###autoload
+(defun magit-run-git-gui ()
+  "Run `git gui' for the current git repository."
+  (interactive)
+  (magit-with-toplevel (magit-process-git 0 "gui")))
+
+;;;###autoload
+(defun magit-run-gitk ()
+  "Run `gitk' in the current repository."
+  (interactive)
+  (magit-process-file magit-gitk-executable nil 0))
+
+;;;###autoload
+(defun magit-run-gitk-branches ()
+  "Run `gitk --branches' in the current repository."
+  (interactive)
+  (magit-process-file magit-gitk-executable nil 0 nil "--branches"))
+
+;;;###autoload
+(defun magit-run-gitk-all ()
+  "Run `gitk --all' in the current repository."
+  (interactive)
+  (magit-process-file magit-gitk-executable nil 0 nil "--all"))
+
+;;; Emacs Tools
+
+;;;###autoload
+(defun ido-enter-magit-status ()
+  "Drop into `magit-status' from file switching.
+
+To make this command available use something like:
+
+  (keymap-set ido-common-completion-map
+              \"C-x g\" \\='ido-enter-magit-status)
+
+This command does not work in Emacs 26.1.
+See https://github.com/magit/magit/issues/3634
+and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=31707."
+  (interactive)
+  (setq ido-exit 'fallback)
+  (setq ido-fallback #'magit-status)
+  (exit-minibuffer))
+
+;;;###autoload
+(defun magit-project-status ()
+  "Run `magit-status' in the current project's root."
+  (interactive)
+  (if (fboundp 'project-root)
+      (magit-status-setup-buffer (project-root (project-current t)))
+    (user-error "`magit-project-status' requires `project' 0.3.0 or greater")))
+
+(defvar magit-bind-magit-project-status t
+  "Whether to bind \"m\" to `magit-project-status' in `project-prefix-map'.
+If so, then an entry is added to `project-switch-commands' as
+well.  If you want to use another key, then you must set this
+to nil before loading Magit to prevent \"m\" from being bound.")
+
+(with-eval-after-load 'project
+  (when (and magit-bind-magit-project-status
+             ;; Added in Emacs 28.1.
+             (boundp 'project-prefix-map)
+             (boundp 'project-switch-commands)
+             ;; Only modify if it hasn't already been modified.
+             (equal project-switch-commands
+                    (eval (car (get 'project-switch-commands 'standard-value))
+                          t)))
+    (keymap-set project-prefix-map "m" #'magit-project-status)
+    (add-to-list 'project-switch-commands '(magit-project-status "Magit") t)))
+
+;;;###autoload
+(defun magit-dired-jump (&optional other-window)
+  "Visit file at point using Dired.
+With a prefix argument, visit in another window.  If there
+is no file at point, then instead visit `default-directory'."
+  (interactive "P")
+  (dired-jump other-window
+              (and-let* ((file (magit-file-at-point)))
+                (expand-file-name (if (file-directory-p file)
+                                      (file-name-as-directory file)
+                                    file)))))
+
+;;;###autoload
+(defun magit-dired-log (&optional follow)
+  "Show log for all marked files, or the current file."
+  (interactive "P")
+  (if-let ((topdir (magit-toplevel default-directory)))
+      (let ((args (car (magit-log-arguments)))
+            (files (dired-get-marked-files nil nil #'magit-file-tracked-p)))
+        (unless files
+          (user-error "No marked file is being tracked by Git"))
+        (when (and follow
+                   (not (member "--follow" args))
+                   (not (cdr files)))
+          (push "--follow" args))
+        (magit-log-setup-buffer
+         (list (or (magit-get-current-branch) "HEAD"))
+         args
+         (let ((default-directory topdir))
+           (mapcar #'file-relative-name files))
+         magit-log-buffer-file-locked))
+    (magit--not-inside-repository-error)))
+
+;;;###autoload
+(defun magit-dired-am-apply-patches (repo &optional arg)
+  "In Dired, apply the marked (or next ARG) files as patches.
+If inside a repository, then apply in that.  Otherwise prompt
+for a repository."
+  (interactive (list (or (magit-toplevel)
+                         (magit-read-repository t))
+                     current-prefix-arg))
+  ;; Note: The ERROR argument of `dired-get-marked-files' isn't
+  ;; available until Emacs 27.
+  (let ((files (or (dired-get-marked-files nil arg)
+                   (user-error "No files specified"))))
+    (magit-status-setup-buffer repo)
+    (magit-am-apply-patches files)))
+
+;;;###autoload
+(defun magit-do-async-shell-command (file)
+  "Open FILE with `dired-do-async-shell-command'.
+Interactively, open the file at point."
+  (interactive (list (or (magit-file-at-point)
+                         (magit-read-file "Act on file"))))
+  (require 'dired-aux)
+  (dired-do-async-shell-command
+   (dired-read-shell-command "& on %s: " current-prefix-arg (list file))
+   nil (list file)))
+
+;;; Shift Selection
+
+(defun magit--turn-on-shift-select-mode-p ()
+  (and shift-select-mode
+       this-command-keys-shift-translated
+       (not mark-active)
+       (not (eq (car-safe transient-mark-mode) 'only))))
+
+;;;###autoload
+(defun magit-previous-line (&optional arg try-vscroll)
+  "Like `previous-line' but with Magit-specific shift-selection.
+
+Magit's selection mechanism is based on the region but selects an
+area that is larger than the region.  This causes `previous-line'
+when invoked while holding the shift key to move up one line and
+thereby select two lines.  When invoked inside a hunk body this
+command does not move point on the first invocation and thereby
+it only selects a single line.  Which inconsistency you prefer
+is a matter of preference."
+  (declare (interactive-only
+            "use `forward-line' with negative argument instead."))
+  (interactive "p\np")
+  (unless arg (setq arg 1))
+  (let ((stay (or (magit-diff-inside-hunk-body-p)
+                  (magit-section-position-in-heading-p))))
+    (if (and stay (= arg 1) (magit--turn-on-shift-select-mode-p))
+        (push-mark nil nil t)
+      (with-no-warnings
+        (handle-shift-selection)
+        (previous-line (if stay (max (1- arg) 1) arg) try-vscroll)))))
+
+;;;###autoload
+(defun magit-next-line (&optional arg try-vscroll)
+  "Like `next-line' but with Magit-specific shift-selection.
+
+Magit's selection mechanism is based on the region but selects
+an area that is larger than the region.  This causes `next-line'
+when invoked while holding the shift key to move down one line
+and thereby select two lines.  When invoked inside a hunk body
+this command does not move point on the first invocation and
+thereby it only selects a single line.  Which inconsistency you
+prefer is a matter of preference."
+  (declare (interactive-only forward-line))
+  (interactive "p\np")
+  (unless arg (setq arg 1))
+  (let ((stay (or (magit-diff-inside-hunk-body-p)
+                  (magit-section-position-in-heading-p))))
+    (if (and stay (= arg 1) (magit--turn-on-shift-select-mode-p))
+        (push-mark nil nil t)
+      (with-no-warnings
+        (handle-shift-selection)
+        (next-line (if stay (max (1- arg) 1) arg) try-vscroll)))))
+
+;;; Clean
+
+;;;###autoload
+(defun magit-clean (&optional arg)
+  "Remove untracked files from the working tree.
+With a prefix argument also remove ignored files,
+with two prefix arguments remove ignored files only.
+\n(git clean -f -d [-x|-X])"
+  (interactive "p")
+  (when (yes-or-no-p (format "Remove %s files? "
+                             (pcase arg
+                               (1 "untracked")
+                               (4 "untracked and ignored")
+                               (_ "ignored"))))
+    (magit-wip-commit-before-change)
+    (magit-run-git "clean" "-f" "-d" (pcase arg (4 "-x") (16 "-X")))))
+
+(put 'magit-clean 'disabled t)
+
+;;; ChangeLog
+
+;;;###autoload
+(defun magit-generate-changelog (&optional amending)
+  "Insert ChangeLog entries into the current buffer.
+
+The entries are generated from the diff being committed.
+If prefix argument, AMENDING, is non-nil, include changes
+in HEAD as well as staged changes in the diff to check."
+  (interactive "P")
+  (unless (magit-commit-message-buffer)
+    (user-error "No commit in progress"))
+  (require 'diff-mode) ; `diff-add-log-current-defuns'.
+  (require 'vc-git)    ; `vc-git-diff'.
+  (require 'add-log)   ; `change-log-insert-entries'.
+  (cond
+   ((and (fboundp 'change-log-insert-entries)
+         (fboundp 'diff-add-log-current-defuns))
+    (setq default-directory
+          (if (and (file-regular-p "gitdir")
+                   (not (magit-git-true "rev-parse" "--is-inside-work-tree"))
+                   (magit-git-true "rev-parse" "--is-inside-git-dir"))
+              (file-name-directory (magit-file-line "gitdir"))
+            (magit-toplevel)))
+    (let ((rev1 (if amending "HEAD^1" "HEAD"))
+          (rev2 nil))
+      ;; Magit may have updated the files without notifying vc, but
+      ;; `diff-add-log-current-defuns' relies on vc being up-to-date.
+      (mapc #'vc-file-clearprops (magit-staged-files))
+      (change-log-insert-entries
+       (with-temp-buffer
+         (vc-git-command (current-buffer) 1 nil
+                         "diff-index" "--exit-code" "--patch"
+                         (and (magit-anything-staged-p) "--cached")
+                         rev1 "--")
+         ;; `diff-find-source-location' consults these vars.
+         (defvar diff-vc-revisions)
+         (setq-local diff-vc-revisions (list rev1 rev2))
+         (setq-local diff-vc-backend 'Git)
+         (diff-add-log-current-defuns)))))
+   ((user-error "`magit-generate-changelog' requires Emacs 27 or greater"))))
+
+;;;###autoload
+(defun magit-add-change-log-entry (&optional whoami file-name other-window)
+  "Find change log file and add date entry and item for current change.
+This differs from `add-change-log-entry' (which see) in that
+it acts on the current hunk in a Magit buffer instead of on
+a position in a file-visiting buffer."
+  (interactive (list current-prefix-arg
+                     (prompt-for-change-log-name)))
+  (pcase-let ((`(,buf ,pos) (magit-diff-visit-file--noselect)))
+    (magit--with-temp-position buf pos
+      (let ((add-log-buffer-file-name-function
+             (lambda ()
+               (or magit-buffer-file-name
+                   (buffer-file-name)))))
+        (add-change-log-entry whoami file-name other-window)))))
+
+;;;###autoload
+(defun magit-add-change-log-entry-other-window (&optional whoami file-name)
+  "Find change log file in other window and add entry and item.
+This differs from `add-change-log-entry-other-window' (which see)
+in that it acts on the current hunk in a Magit buffer instead of
+on a position in a file-visiting buffer."
+  (interactive (and current-prefix-arg
+                    (list current-prefix-arg
+                          (prompt-for-change-log-name))))
+  (magit-add-change-log-entry whoami file-name t))
+
+;;; Edit Line Commit
+
+;;;###autoload
+(defun magit-edit-line-commit (&optional type)
+  "Edit the commit that added the current line.
+
+With a prefix argument edit the commit 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."
+  (interactive (list (and current-prefix-arg 'removal)))
+  (let* ((chunk (magit-current-blame-chunk (or type 'addition)))
+         (rev   (oref chunk orig-rev)))
+    (if (string-match-p "\\`0\\{40,\\}\\'" rev)
+        (message "This line has not been committed yet")
+      (let ((rebase (magit-rev-ancestor-p rev "HEAD"))
+            (file   (expand-file-name (oref chunk orig-file)
+                                      (magit-toplevel))))
+        (if rebase
+            (let ((magit--rebase-published-symbol 'edit-published))
+              (magit-rebase-edit-commit rev (magit-rebase-arguments)))
+          (magit--checkout (or (magit-rev-branch rev) rev)))
+        (unless (and buffer-file-name
+                     (file-equal-p file buffer-file-name))
+          (let ((blame-type (and magit-blame-mode magit-blame-type)))
+            (if rebase
+                (set-process-sentinel
+                 magit-this-process
+                 (lambda (process event)
+                   (magit-sequencer-process-sentinel process event)
+                   (when (eq (process-status process) 'exit)
+                     (find-file file)
+                     (when blame-type
+                       (magit-blame--pre-blame-setup blame-type)
+                       (magit-blame--run (magit-blame-arguments))))))
+              (find-file file)
+              (when blame-type
+                (magit-blame--pre-blame-setup blame-type)
+                (magit-blame--run (magit-blame-arguments))))))))))
+
+(put 'magit-edit-line-commit 'disabled t)
+
+;;;###autoload
+(defun magit-diff-edit-hunk-commit (file)
+  "From a hunk, edit the respective commit and visit the file.
+
+First visit 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 invoke `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."
+  (interactive (list (magit-file-at-point t t)))
+  (let ((magit-diff-visit-previous-blob nil))
+    (with-current-buffer
+        (magit-diff-visit-file--internal file nil #'pop-to-buffer-same-window)
+      (magit-edit-line-commit))))
+
+(put 'magit-diff-edit-hunk-commit 'disabled t)
+
+;;; Reshelve
+
+(defcustom magit-reshelve-since-committer-only nil
+  "Whether `magit-reshelve-since' changes only the committer dates.
+Otherwise the author dates are also changed."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-commands
+  :type 'boolean)
+
+;;;###autoload
+(defun magit-reshelve-since (rev keyid)
+  "Change the author and committer dates of the commits since REV.
+
+Ask the user for the first reachable commit whose dates should
+be changed.  Then read the new date for that commit.  The initial
+minibuffer input and the previous history element offer good
+values.  The next commit will be created one minute later and so
+on.
+
+This command is only intended for interactive use and should only
+be used on highly rearranged and unpublished history.
+
+If KEYID is non-nil, then use that to sign all reshelved commits.
+Interactively use the value of the \"--gpg-sign\" option in the
+list returned by `magit-rebase-arguments'."
+  (interactive (list nil
+                     (transient-arg-value "--gpg-sign="
+                                          (magit-rebase-arguments))))
+  (let* ((current (or (magit-get-current-branch)
+                      (user-error "Refusing to reshelve detached head")))
+         (backup (concat "refs/original/refs/heads/" current)))
+    (cond
+     ((not rev)
+      (when (and (magit-ref-p backup)
+                 (not (magit-y-or-n-p
+                       (format "Backup ref %s already exists.  Override? "
+                               backup))))
+        (user-error "Abort"))
+      (magit-log-select
+        (lambda (rev)
+          (magit-reshelve-since rev keyid))
+        "Type %p on a commit to reshelve it and the commits above it,"))
+     (t
+      (cl-flet ((adjust (time offset)
+                  (format-time-string
+                   "%F %T %z"
+                   (+ (floor time)
+                      (* offset 60)
+                      (- (car (decode-time time)))))))
+        (let* ((start (concat rev "^"))
+               (range (concat start ".." current))
+               (time-rev (adjust (float-time (string-to-number
+                                              (magit-rev-format "%at" start)))
+                                 1))
+               (time-now (adjust (float-time)
+                                 (- (string-to-number
+                                     (magit-git-string "rev-list" "--count"
+                                                       range))))))
+          (push time-rev magit--reshelve-history)
+          (let ((date (floor
+                       (float-time
+                        (date-to-time
+                         (read-string "Date for first commit: "
+                                      time-now 'magit--reshelve-history))))))
+            (with-environment-variables (("FILTER_BRANCH_SQUELCH_WARNING" "1"))
+              (magit-with-toplevel
+                (magit-run-git-async
+                 "filter-branch" "--force" "--env-filter"
+                 (format
+                  "case $GIT_COMMIT in %s\nesac"
+                  (mapconcat
+                   (lambda (rev)
+                     (prog1
+                         (concat
+                          (format "%s) " rev)
+                          (and (not magit-reshelve-since-committer-only)
+                               (format "export GIT_AUTHOR_DATE=\"%s\"; " date))
+                          (format "export GIT_COMMITTER_DATE=\"%s\";;" date))
+                       (cl-incf date 60)))
+                   (magit-git-lines "rev-list" "--reverse" range)
+                   " "))
+                 (and keyid
+                      (list "--commit-filter"
+                            (format "git commit-tree --gpg-sign=%s \"$@\";"
+                                    keyid)))
+                 range "--"))
+              (set-process-sentinel
+               magit-this-process
+               (lambda (process event)
+                 (when (memq (process-status process) '(exit signal))
+                   (if (> (process-exit-status process) 0)
+                       (magit-process-sentinel process event)
+                     (process-put process 'inhibit-refresh t)
+                     (magit-process-sentinel process event)
+                     (magit-run-git "update-ref" "-d" backup)))))))))))))
+
+;;; Revision Stack
+
+(defvar magit-revision-stack nil)
+
+(defcustom magit-pop-revision-stack-format
+  '("[%N: %h] "
+    "%N: %cs %H\n   %s\n"
+    "\\[\\([0-9]+\\)[]:]")
+  "Control how `magit-pop-revision-stack' inserts a revision.
+
+The command `magit-pop-revision-stack' inserts a representation
+of the revision last pushed to the `magit-revision-stack' into
+the current buffer.  It inserts text at point and/or near the end
+of the buffer, and removes the consumed revision from the stack.
+
+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)."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-commands
+  :type '(list (choice (string :tag "Insert at point format")
+                       (cons (string :tag "Insert at point format")
+                             (repeat (string :tag "Argument to git show")))
+                       (const :tag "Don't insert at point" nil))
+               (choice (string :tag "Insert at eob format")
+                       (cons (string :tag "Insert at eob format")
+                             (repeat (string :tag "Argument to git show")))
+                       (const :tag "Don't insert at eob" nil))
+               (choice (regexp :tag "Find index regexp")
+                       (const :tag "Don't number entries" nil))))
+
+(defcustom magit-copy-revision-abbreviated nil
+  "Whether to save abbreviated revision to `kill-ring' and `magit-revision-stack'."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-miscellaneous
+  :type 'boolean)
+
+;;;###autoload
+(defun magit-pop-revision-stack (rev toplevel)
+  "Insert a representation of a revision into the current buffer.
+
+Pop a revision from the `magit-revision-stack' and insert 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, instead read 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."
+  (interactive
+   (if (or current-prefix-arg (not magit-revision-stack))
+       (let ((default-directory
+              (or (and (not (= (prefix-numeric-value current-prefix-arg) 16))
+                       (or (magit-toplevel)
+                           (cadr (car magit-revision-stack))))
+                  (magit-read-repository))))
+         (list (magit-read-branch-or-commit "Insert revision")
+               default-directory))
+     (push (caar magit-revision-stack) magit-revision-history)
+     (pop magit-revision-stack)))
+  (if rev
+      (pcase-let ((`(,pnt-format ,eob-format ,idx-format)
+                   magit-pop-revision-stack-format))
+        (let ((default-directory toplevel)
+              (idx (and idx-format
+                        (save-excursion
+                          (if (re-search-backward idx-format nil t)
+                              (number-to-string
+                               (1+ (string-to-number (match-string 1))))
+                            "1"))))
+              pnt-args eob-args)
+          (when (listp pnt-format)
+            (setq pnt-args (cdr pnt-format))
+            (setq pnt-format (car pnt-format)))
+          (when (listp eob-format)
+            (setq eob-args (cdr eob-format))
+            (setq eob-format (car eob-format)))
+          (when pnt-format
+            (when idx-format
+              (setq pnt-format
+                    (string-replace "%N" idx pnt-format)))
+            (magit-rev-insert-format pnt-format rev pnt-args)
+            (delete-char -1))
+          (when eob-format
+            (when idx-format
+              (setq eob-format
+                    (string-replace "%N" idx eob-format)))
+            (save-excursion
+              (goto-char (point-max))
+              (skip-syntax-backward ">-")
+              (beginning-of-line)
+              (if (and comment-start (looking-at comment-start))
+                  (while (looking-at comment-start)
+                    (forward-line -1))
+                (forward-line)
+                (unless (= (current-column) 0)
+                  (insert ?\n)))
+              (insert ?\n)
+              (magit-rev-insert-format eob-format rev eob-args)
+              (delete-char -1)))))
+    (user-error "Revision stack is empty")))
+
+(keymap-set git-commit-mode-map "C-c C-w" #'magit-pop-revision-stack)
+
+;;;###autoload
+(defun magit-copy-section-value (arg)
+  "Save the value of the current section for later use.
+
+Save the section value to the `kill-ring', and, provided that
+the current section is a commit, branch, or tag section, push
+the (referenced) revision to the `magit-revision-stack' for use
+with `magit-pop-revision-stack'.
+
+When `magit-copy-revision-abbreviated' is non-nil, save the
+abbreviated revision to the `kill-ring' and the
+`magit-revision-stack'.
+
+When the current section is a branch or a tag, and a prefix
+argument is used, then save the revision at its tip to the
+`kill-ring' instead of the reference name.
+
+When the region is active, then save 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 strip the diff marker column and keep only either
+the added or removed lines, depending on the sign of the prefix
+argument."
+  (interactive "P")
+  (cond
+   ((and arg
+         (magit-section-internal-region-p)
+         (magit-section-match 'hunk))
+    (kill-new
+     (thread-last (buffer-substring-no-properties
+                   (region-beginning)
+                   (region-end))
+       (replace-regexp-in-string
+        (format "^\\%c.*\n?" (if (< (prefix-numeric-value arg) 0) ?+ ?-))
+        "")
+       (replace-regexp-in-string "^[ +-]" "")))
+    (deactivate-mark))
+   ((use-region-p)
+    (call-interactively #'copy-region-as-kill))
+   (t
+    (when-let* ((section (magit-current-section))
+                (value (oref section value)))
+      (magit-section-case
+        ((branch commit module-commit tag)
+         (let ((default-directory default-directory) ref)
+           (magit-section-case
+             ((branch tag)
+              (setq ref value))
+             (module-commit
+              (setq default-directory
+                    (file-name-as-directory
+                     (expand-file-name (magit-section-parent-value section)
+                                       (magit-toplevel))))))
+           (setq value (magit-rev-parse
+                        (and magit-copy-revision-abbreviated "--short")
+                        value))
+           (push (list value default-directory) magit-revision-stack)
+           (kill-new (message "%s" (or (and current-prefix-arg ref)
+                                       value)))))
+        ((kill-new (message "%s" value))))))))
+
+;;;###autoload
+(defun magit-copy-buffer-revision ()
+  "Save the revision of the current buffer for later use.
+
+Save the revision shown in the current buffer to the `kill-ring'
+and push it to the `magit-revision-stack'.
+
+This command 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.
+
+In such buffers it is often more useful to save the value of
+the current section instead, using `magit-copy-section-value'.
+
+When the region is active, then save that to the `kill-ring',
+like `kill-ring-save' would, instead of behaving as described
+above.
+
+When `magit-copy-revision-abbreviated' is non-nil, save the
+abbreviated revision to the `kill-ring' and the
+`magit-revision-stack'."
+  (interactive)
+  (if (use-region-p)
+      (call-interactively #'copy-region-as-kill)
+    (when-let ((rev (or magit-buffer-revision
+                        (cl-case major-mode
+                          (magit-diff-mode
+                           (if (string-match "\\.\\.\\.?\\(.+\\)"
+                                             magit-buffer-range)
+                               (match-string 1 magit-buffer-range)
+                             magit-buffer-range))
+                          (magit-status-mode "HEAD")))))
+      (when (magit-commit-p rev)
+        (setq rev (magit-rev-parse
+                   (and magit-copy-revision-abbreviated "--short")
+                   rev))
+        (push (list rev default-directory) magit-revision-stack)
+        (kill-new (message "%s" rev))))))
+
+;;; Buffer Switching
+
+;;;###autoload
+(defun magit-display-repository-buffer (buffer)
+  "Display a Magit buffer belonging to the current Git repository.
+The buffer is displayed using `magit-display-buffer', which see."
+  (interactive (list (magit--read-repository-buffer
+                      "Display magit buffer: ")))
+  (magit-display-buffer (get-buffer buffer)))
+
+;;;###autoload
+(defun magit-switch-to-repository-buffer (buffer)
+  "Switch to a Magit buffer belonging to the current Git repository."
+  (interactive (list (magit--read-repository-buffer
+                      "Switch to magit buffer: ")))
+  (switch-to-buffer buffer))
+
+;;;###autoload
+(defun magit-switch-to-repository-buffer-other-window (buffer)
+  "Switch to a Magit buffer belonging to the current Git repository."
+  (interactive (list (magit--read-repository-buffer
+                      "Switch to magit buffer in another window: ")))
+  (switch-to-buffer-other-window buffer))
+
+;;;###autoload
+(defun magit-switch-to-repository-buffer-other-frame (buffer)
+  "Switch to a Magit buffer belonging to the current Git repository."
+  (interactive (list (magit--read-repository-buffer
+                      "Switch to magit buffer in another frame: ")))
+  (switch-to-buffer-other-frame buffer))
+
+(defun magit--read-repository-buffer (prompt)
+  (if-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
+      (read-buffer
+       prompt (magit-get-mode-buffer 'magit-status-mode) t
+       (pcase-lambda (`(,_ . ,buf))
+         (and buf
+              (with-current-buffer buf
+                (and (or (derived-mode-p 'magit-mode
+                                         'magit-repolist-mode
+                                         'magit-submodule-list-mode
+                                         'git-rebase-mode)
+                         (and buffer-file-name
+                              (string-match-p git-commit-filename-regexp
+                                              buffer-file-name)))
+                     (equal (magit-rev-parse-safe "--show-toplevel")
+                            topdir))))))
+    (user-error "Not inside a Git repository")))
+
+;;; Miscellaneous
+
+;;;###autoload
+(defun magit-abort-dwim ()
+  "Abort current operation.
+Depending on the context, this will abort a merge, a rebase, a
+patch application, a cherry-pick, a revert, or a bisect."
+  (interactive)
+  (cond ((magit-merge-in-progress-p)     (magit-merge-abort))
+        ((magit-rebase-in-progress-p)    (magit-rebase-abort))
+        ((magit-am-in-progress-p)        (magit-am-abort))
+        ((magit-sequencer-in-progress-p) (magit-sequencer-abort))
+        ((magit-bisect-in-progress-p)    (magit-bisect-reset))))
+
+;;; _
+(provide 'magit-extras)
+;;; magit-extras.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-extras.elc b/emacs/elpa/magit-20240514.1843/magit-extras.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-fetch.el b/emacs/elpa/magit-20240514.1843/magit-fetch.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-fetch.elc b/emacs/elpa/magit-20240514.1843/magit-fetch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-files.el b/emacs/elpa/magit-20240514.1843/magit-files.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-files.elc b/emacs/elpa/magit-20240514.1843/magit-files.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-git.el b/emacs/elpa/magit-20240514.1843/magit-git.el
@@ -0,0 +1,2903 @@
+;;; 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))
+
+;;; Git implementations
+
+(defvar magit-inhibit-libgit t
+  "Whether to inhibit the use of libgit.
+Use of libgit is inhibited by default because support for libgit
+in magit is only a stub for now.  There is no benefit in using
+it.")
+
+(defvar magit--libgit-available-p 'unknown
+  "Whether libgit is available.
+Use the function by the same name instead of this variable.")
+
+(defun magit--libgit-available-p ()
+  (if (eq magit--libgit-available-p 'unknown)
+      (setq magit--libgit-available-p
+            (and module-file-suffix
+                 (let ((libgit (locate-library "libgit")))
+                   (and libgit
+                        (or (locate-library "libegit2")
+                            (let ((load-path
+                                   (cons (expand-file-name
+                                          (convert-standard-filename "build")
+                                          (file-name-directory libgit))
+                                         load-path)))
+                              (locate-library "libegit2")))))))
+    magit--libgit-available-p))
+
+(defun magit-gitimpl ()
+  "Return the Git implementation used in this repository."
+  (if (and (not magit-inhibit-libgit)
+           (not (file-remote-p default-directory))
+           (magit--libgit-available-p))
+      'libgit
+    'git))
+
+;;; 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 (mapconcat #'identity keys ".")))
+    (if (and magit--refresh-cache (not arg))
+        (magit-config-get-from-cached-list key)
+      (magit-git-items "config" arg "-z" "--get-all" 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 (mapconcat #'identity keys ".")))
+    (equal (if magit--refresh-cache
+               (car (last (magit-config-get-from-cached-list key)))
+             (magit-git-str "config" arg "--bool" 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 (mapconcat #'identity 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 (mapconcat #'identity 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
+  "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)
+  (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"
+                   (and nomodules "--ignore-submodules")
+                   (magit-headish) "--" files))
+
+(defun magit-unstaged-files (&optional nomodules files)
+  (magit-git-items "diff-files" "-z" "--name-only" "--diff-filter=u"
+                   (and nomodules "--ignore-submodules")
+                   "--" files))
+
+(defun magit-staged-files (&optional nomodules files)
+  (magit-git-items "diff-index" "-z" "--name-only" "--cached"
+                   (and nomodules "--ignore-submodules")
+                   (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"
+                     (and ignore-submodules "--ignore-submodules")
+                     "--" 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"
+                     (and ignore-submodules "--ignore-submodules")
+                     "--" 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))))))
+        (mapconcat #'identity
+                   (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)))
+
+(defvar magit-tramp-process-environment nil)
+
+(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)))
+             (if (file-remote-p default-directory)
+                 (let ((magit-tramp-process-environment
+                        (cons (concat "GIT_INDEX_FILE=" ,file)
+                              magit-tramp-process-environment)))
+                   ,@body)
+               (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)
+  (let ((minibuffer-default-add-function (magit--minibuf-default-add-commit)))
+    (or (magit-completing-read prompt (magit-list-refnames nil t)
+                               nil nil nil 'magit-revision-history
+                               (or (magit-branch-or-commit-at-point)
+                                   secondary-default
+                                   (magit-get-current-branch)))
+        (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
+                                    (concat remote "/" 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-20240514.1843/magit-git.elc b/emacs/elpa/magit-20240514.1843/magit-git.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-gitignore.el b/emacs/elpa/magit-20240514.1843/magit-gitignore.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-gitignore.elc b/emacs/elpa/magit-20240514.1843/magit-gitignore.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-log.el b/emacs/elpa/magit-20240514.1843/magit-log.el
@@ -0,0 +1,2009 @@
+;;; magit-log.el --- Inspect Git history  -*- 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>
+
+;; 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 support for looking at Git logs, including
+;; special logs like cherry-logs, as well as for selecting a commit
+;; from a log.
+
+;;; Code:
+
+(require 'magit-core)
+(require 'magit-diff)
+
+(declare-function magit-blob-visit "magit-files" (blob-or-file))
+(declare-function magit-cherry-apply "magit-sequence" (commit &optional args))
+(declare-function magit-insert-head-branch-header "magit-status"
+                  (&optional branch))
+(declare-function magit-insert-upstream-branch-header "magit-status"
+                  (&optional branch pull keyword))
+(declare-function magit-read-file-from-rev "magit-files"
+                  (rev prompt &optional default))
+(declare-function magit-rebase--get-state-lines "magit-sequence"
+                  (file))
+(declare-function magit-show-commit "magit-diff"
+                  (arg1 &optional arg2 arg3 arg4))
+(declare-function magit-reflog-format-subject "magit-reflog" (subject))
+(defvar magit-refs-focus-column-width)
+(defvar magit-refs-margin)
+(defvar magit-refs-show-commit-count)
+(defvar magit-buffer-margin)
+(defvar magit-status-margin)
+(defvar magit-status-sections-hook)
+
+(require 'ansi-color)
+(require 'crm)
+(require 'which-func)
+
+;;; Options
+;;;; Log Mode
+
+(defgroup magit-log nil
+  "Inspect and manipulate Git history."
+  :link '(info-link "(magit)Logging")
+  :group 'magit-commands
+  :group 'magit-modes)
+
+(defcustom magit-log-mode-hook nil
+  "Hook run after entering Magit-Log mode."
+  :group 'magit-log
+  :type 'hook)
+
+(defcustom magit-log-remove-graph-args '("--follow" "--grep" "-G" "-S" "-L")
+  "The log arguments that cause the `--graph' argument to be dropped.
+
+The default value lists the arguments that are incompatible with
+`--graph' and therefore must be dropped when that is used.  You
+can add additional arguments that are available in `magit-log',
+but I recommend that you don't do that.  Nowadays I would define
+this as a constant, but I am preserving it as an option, in case
+someone actually customized it."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-log
+  :type '(repeat (string :tag "Argument"))
+  :options '("--follow" "--grep" "-G" "-S" "-L"))
+
+(defcustom magit-log-revision-headers-format "\
+%+b%+N
+Author:    %aN <%aE>
+Committer: %cN <%cE>"
+  "Additional format string used with the `++header' argument."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-log
+  :type 'string)
+
+(defcustom magit-log-auto-more nil
+  "Insert more log entries automatically when moving past the last entry.
+Only considered when moving past the last entry with
+`magit-goto-*-section' commands."
+  :group 'magit-log
+  :type 'boolean)
+
+(defcustom magit-log-margin '(t age magit-log-margin-width t 18)
+  "Format of the margin in `magit-log-mode' buffers.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-log
+  :group 'magit-margin
+  :type magit-log-margin--custom-type
+  :initialize #'magit-custom-initialize-reset
+  :set (apply-partially #'magit-margin-set-variable 'magit-log-mode))
+
+(defcustom magit-log-margin-show-committer-date nil
+  "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."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-log
+  :group 'magit-margin
+  :type 'boolean)
+
+(defcustom magit-log-show-refname-after-summary nil
+  "Whether to show refnames after commit summaries.
+This is useful if you use really long branch names."
+  :package-version '(magit . "2.2.0")
+  :group 'magit-log
+  :type 'boolean)
+
+(defcustom magit-log-highlight-keywords t
+  "Whether to highlight bracketed keywords in commit summaries."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-log
+  :type 'boolean)
+
+(defcustom magit-log-header-line-function #'magit-log-header-line-sentence
+  "Function used to generate text shown in header line of log buffers."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-log
+  :type '(choice (function-item magit-log-header-line-arguments)
+                 (function-item magit-log-header-line-sentence)
+                 function))
+
+(defcustom magit-log-trace-definition-function #'magit-which-function
+  "Function used to determine the function at point.
+This is used by the command `magit-log-trace-definition'.
+You should prefer `magit-which-function' over `which-function'
+because the latter may make use of Imenu's outdated cache."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-log
+  :type '(choice (function-item magit-which-function)
+                 (function-item which-function)
+                 (function-item add-log-current-defun)
+                 function))
+
+(defcustom magit-log-color-graph-limit 256
+  "Number of commits over which log graphs are not colored.
+When showing more commits than specified, then the `--color'
+argument is silently dropped.  This is necessary because the
+`ansi-color' library, which is used to turn control sequences
+into faces, is just too slow."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-log
+  :type 'number)
+
+(defcustom magit-log-show-signatures-limit 256
+  "Number of commits over which signatures are not verified.
+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."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-log
+  :type 'number)
+
+(defface magit-log-graph
+  '((((class color) (background light)) :foreground "grey30")
+    (((class color) (background  dark)) :foreground "grey80"))
+  "Face for the graph part of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-author
+  '((((class color) (background light))
+     :foreground "firebrick"
+     :slant normal
+     :weight normal)
+    (((class color) (background  dark))
+     :foreground "tomato"
+     :slant normal
+     :weight normal))
+  "Face for the author part of the log output."
+  :group 'magit-faces)
+
+(defface magit-log-date
+  '((((class color) (background light))
+     :foreground "grey30"
+     :slant normal
+     :weight normal)
+    (((class color) (background  dark))
+     :foreground "grey80"
+     :slant normal
+     :weight normal))
+  "Face for the date part of the log output."
+  :group 'magit-faces)
+
+(defface magit-header-line-log-select
+  '((t :inherit bold))
+  "Face for the `header-line' in `magit-log-select-mode'."
+  :group 'magit-faces)
+
+;;;; File Log
+
+(defcustom magit-log-buffer-file-locked t
+  "Whether `magit-log-buffer-file-quick' uses a dedicated buffer."
+  :package-version '(magit . "2.7.0")
+  :group 'magit-commands
+  :group 'magit-log
+  :type 'boolean)
+
+;;;; Select Mode
+
+(defcustom magit-log-select-show-usage 'both
+  "Whether to show usage information when selecting a commit from a log.
+The message can be shown in the `echo-area' or the `header-line', or in
+`both' places.  If the value isn't one of these symbols, then it should
+be nil, in which case no usage information is shown."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-log
+  :type '(choice (const :tag "in echo-area" echo-area)
+                 (const :tag "in header-line" header-line)
+                 (const :tag "in both places" both)
+                 (const :tag "nowhere")))
+
+(defcustom magit-log-select-margin
+  (list (nth 0 magit-log-margin)
+        (nth 1 magit-log-margin)
+        'magit-log-margin-width t
+        (nth 4 magit-log-margin))
+  "Format of the margin in `magit-log-select-mode' buffers.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-log
+  :group 'magit-margin
+  :type magit-log-margin--custom-type
+  :initialize #'magit-custom-initialize-reset
+  :set-after '(magit-log-margin)
+  :set (apply-partially #'magit-margin-set-variable 'magit-log-select-mode))
+
+;;;; Cherry Mode
+
+(defcustom magit-cherry-sections-hook
+  '(magit-insert-cherry-headers
+    magit-insert-cherry-commits)
+  "Hook run to insert sections into the cherry buffer."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-log
+  :type 'hook)
+
+(defcustom magit-cherry-margin
+  (list (nth 0 magit-log-margin)
+        (nth 1 magit-log-margin)
+        'magit-log-margin-width t
+        (nth 4 magit-log-margin))
+  "Format of the margin in `magit-cherry-mode' buffers.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-log
+  :group 'magit-margin
+  :type magit-log-margin--custom-type
+  :initialize #'magit-custom-initialize-reset
+  :set-after '(magit-log-margin)
+  :set (apply-partially #'magit-margin-set-variable 'magit-cherry-mode))
+
+;;;; Log Sections
+
+(defcustom magit-log-section-commit-count 10
+  "How many recent commits to show in certain log sections.
+How many recent commits `magit-insert-recent-commits' and
+`magit-insert-unpulled-from-upstream-or-recent' (provided
+the upstream isn't ahead of the current branch) show."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-status
+  :type 'number)
+
+(defcustom magit-log-merged-commit-count 20
+  "How many surrounding commits to show for `magit-log-merged'.
+`magit-log-merged' will shows approximately half of this number
+commits before and half after."
+  :package-version '(magit . "3.3.0")
+  :group 'magit-log
+  :type 'integer)
+
+;;; Arguments
+;;;; Prefix Classes
+
+(defclass magit-log-prefix (transient-prefix)
+  ((history-key :initform 'magit-log)
+   (major-mode  :initform 'magit-log-mode)))
+
+(defclass magit-log-refresh-prefix (magit-log-prefix)
+  ((history-key :initform 'magit-log)
+   (major-mode  :initform nil)))
+
+;;;; Prefix Methods
+
+(cl-defmethod transient-init-value ((obj magit-log-prefix))
+  (pcase-let ((`(,args ,files)
+               (magit-log--get-value 'magit-log-mode
+                                     magit-prefix-use-buffer-arguments)))
+    (unless (eq transient-current-command 'magit-dispatch)
+      (when-let ((file (magit-file-relative-name)))
+        (setq files (list file))))
+    (oset obj value (if files `(("--" ,@files) ,args) args))))
+
+(cl-defmethod transient-init-value ((obj magit-log-refresh-prefix))
+  (oset obj value (if magit-buffer-log-files
+                      `(("--" ,@magit-buffer-log-files)
+                        ,magit-buffer-log-args)
+                    magit-buffer-log-args)))
+
+(cl-defmethod transient-set-value ((obj magit-log-prefix))
+  (magit-log--set-value obj))
+
+(cl-defmethod transient-save-value ((obj magit-log-prefix))
+  (magit-log--set-value obj 'save))
+
+;;;; Argument Access
+
+(defun magit-log-arguments (&optional mode)
+  "Return the current log arguments."
+  (if (memq transient-current-command '(magit-log magit-log-refresh))
+      (magit--transient-args-and-files)
+    (magit-log--get-value (or mode 'magit-log-mode))))
+
+(defun magit-log--get-value (mode &optional use-buffer-args)
+  (unless use-buffer-args
+    (setq use-buffer-args magit-direct-use-buffer-arguments))
+  (let (args files)
+    (cond
+     ((and (memq use-buffer-args '(always selected current))
+           (eq major-mode mode))
+      (setq args  magit-buffer-log-args)
+      (setq files magit-buffer-log-files))
+     ((and (memq use-buffer-args '(always selected))
+           (when-let ((buffer (magit-get-mode-buffer
+                               mode nil
+                               (eq use-buffer-args 'selected))))
+             (setq args  (buffer-local-value 'magit-buffer-log-args buffer))
+             (setq files (buffer-local-value 'magit-buffer-log-files buffer))
+             t)))
+     ((plist-member (symbol-plist mode) 'magit-log-current-arguments)
+      (setq args (get mode 'magit-log-current-arguments)))
+     ((when-let ((elt (assq (intern (format "magit-log:%s" mode))
+                            transient-values)))
+        (setq args (cdr elt))
+        t))
+     (t
+      (setq args (get mode 'magit-log-default-arguments))))
+    (list args files)))
+
+(defun magit-log--set-value (obj &optional save)
+  (pcase-let* ((obj  (oref obj prototype))
+               (mode (or (oref obj major-mode) major-mode))
+               (key  (intern (format "magit-log:%s" mode)))
+               (`(,args ,files) (magit--transient-args-and-files)))
+    (put mode 'magit-log-current-arguments args)
+    (when save
+      (setf (alist-get key transient-values) args)
+      (transient-save-values))
+    (transient--history-push obj)
+    (setq magit-buffer-log-args args)
+    (unless (derived-mode-p 'magit-log-select-mode)
+      (setq magit-buffer-log-files files))
+    (magit-refresh)))
+
+;;; Commands
+;;;; Prefix Commands
+
+;;;###autoload (autoload 'magit-log "magit-log" nil t)
+(transient-define-prefix magit-log ()
+  "Show a commit or reference log."
+  :man-page "git-log"
+  :class 'magit-log-prefix
+  ;; The grouping in git-log(1) appears to be guided by implementation
+  ;; details, so our logical grouping only follows it to an extend.
+  ;; Arguments that are "misplaced" here:
+  ;;   1. From "Commit Formatting".
+  ;;   2. From "Common Diff Options".
+  ;;   3. From unnamed first group.
+  ;;   4. Implemented by Magit.
+  ["Commit limiting"
+   (magit-log:-n)
+   (magit:--author)
+   (7 magit-log:--since)
+   (7 magit-log:--until)
+   (magit-log:--grep)
+   (7 "-i" "Search case-insensitive" ("-i" "--regexp-ignore-case"))
+   (7 "-I" "Invert search pattern"   "--invert-grep")
+   (magit-log:-G)     ;2
+   (magit-log:-S)     ;2
+   (magit-log:-L)     ;2
+   (7 "=m" "Omit merges"            "--no-merges")
+   (7 "=p" "First parent"           "--first-parent")]
+  ["History simplification"
+   (  "-D" "Simplify by decoration"                  "--simplify-by-decoration")
+   (magit:--)
+   (  "-f" "Follow renames when showing single-file log"     "--follow") ;3
+   (6 "/s" "Only commits changing given paths"               "--sparse")
+   (7 "/d" "Only selected commits plus meaningful history"   "--dense")
+   (7 "/a" "Only commits existing directly on ancestry path" "--ancestry-path")
+   (6 "/f" "Do not prune history"                            "--full-history")
+   (7 "/m" "Prune some history"                              "--simplify-merges")]
+  ["Commit ordering"
+   (magit-log:--*-order)
+   ("-r" "Reverse order" "--reverse")]
+  ["Formatting"
+   ("-g" "Show graph"          "--graph")          ;1
+   ("-c" "Show graph in color" "--color")          ;2
+   ("-d" "Show refnames"       "--decorate")       ;3
+   ("=S" "Show signatures"     "--show-signature") ;1
+   ("-h" "Show header"         "++header")         ;4
+   ("-p" "Show diffs"          ("-p" "--patch"))   ;2
+   ("-s" "Show diffstats"      "--stat")]          ;2
+  [["Log"
+    ("l" "current"             magit-log-current)
+    ("h" "HEAD"                magit-log-head)
+    ("u" "related"             magit-log-related)
+    ("o" "other"               magit-log-other)]
+   [""
+    ("L" "local branches"      magit-log-branches)
+    ("b" "all branches"        magit-log-all-branches)
+    ("a" "all references"      magit-log-all)
+    (7 "B" "matching branches" magit-log-matching-branches)
+    (7 "T" "matching tags"     magit-log-matching-tags)
+    (7 "m" "merged"            magit-log-merged)]
+   ["Reflog"
+    ("r" "current"             magit-reflog-current)
+    ("H" "HEAD"                magit-reflog-head)
+    ("O" "other"               magit-reflog-other)]
+   [:if (lambda ()
+          (and (fboundp 'magit--any-wip-mode-enabled-p)
+               (magit--any-wip-mode-enabled-p)))
+    :description "Wiplog"
+    ("i" "index"          magit-wip-log-index)
+    ("w" "worktree"       magit-wip-log-worktree)]
+   ["Other"
+    (5 "s" "shortlog"    magit-shortlog)]])
+
+;;;###autoload (autoload 'magit-log-refresh "magit-log" nil t)
+(transient-define-prefix magit-log-refresh ()
+  "Change the arguments used for the log(s) in the current buffer."
+  :man-page "git-log"
+  :class 'magit-log-refresh-prefix
+  [:if-mode magit-log-mode
+   :class transient-subgroups
+   ["Commit limiting"
+    (magit-log:-n)
+    (magit:--author)
+    (magit-log:--grep)
+    (7 "-i" "Search case-insensitive" ("-i" "--regexp-ignore-case"))
+    (7 "-I" "Invert search pattern"   "--invert-grep")
+    (magit-log:-G)
+    (magit-log:-S)
+    (magit-log:-L)]
+   ["History simplification"
+    (  "-D" "Simplify by decoration"                  "--simplify-by-decoration")
+    (magit:--)
+    (  "-f" "Follow renames when showing single-file log"     "--follow") ;3
+    (6 "/s" "Only commits changing given paths"               "--sparse")
+    (7 "/d" "Only selected commits plus meaningful history"   "--dense")
+    (7 "/a" "Only commits existing directly on ancestry path" "--ancestry-path")
+    (6 "/f" "Do not prune history"                            "--full-history")
+    (7 "/m" "Prune some history"                              "--simplify-merges")]
+   ["Commit ordering"
+    (magit-log:--*-order)
+    ("-r" "Reverse order" "--reverse")]
+   ["Formatting"
+    ("-g" "Show graph"              "--graph")
+    ("-c" "Show graph in color"     "--color")
+    ("-d" "Show refnames"           "--decorate")
+    ("=S" "Show signatures"         "--show-signature")
+    ("-h" "Show header"             "++header")
+    ("-p" "Show diffs"              ("-p" "--patch"))
+    ("-s" "Show diffstats"          "--stat")]]
+  [:if-not-mode magit-log-mode
+   :description "Arguments"
+   (magit-log:-n)
+   (magit-log:--*-order)
+   ("-g" "Show graph"               "--graph")
+   ("-c" "Show graph in color"      "--color")
+   ("-d" "Show refnames"            "--decorate")]
+  [["Refresh"
+    ("g" "buffer"                   magit-log-refresh)
+    ("s" "buffer and set defaults"  transient-set-and-exit)
+    ("w" "buffer and save defaults" transient-save-and-exit)]
+   ["Margin"
+    (magit-toggle-margin)
+    (magit-cycle-margin-style)
+    (magit-toggle-margin-details)
+    (magit-toggle-log-margin-style)]
+   [:if-mode magit-log-mode
+    :description "Toggle"
+    ("b" "buffer lock"              magit-toggle-buffer-lock)]]
+  (interactive)
+  (cond
+   ((not (eq transient-current-command 'magit-log-refresh))
+    (pcase major-mode
+      ('magit-reflog-mode
+       (user-error "Cannot change log arguments in reflog buffers"))
+      ('magit-cherry-mode
+       (user-error "Cannot change log arguments in cherry buffers")))
+    (transient-setup 'magit-log-refresh))
+   (t
+    (pcase-let ((`(,args ,files) (magit-log-arguments)))
+      (setq magit-buffer-log-args args)
+      (unless (derived-mode-p 'magit-log-select-mode)
+        (setq magit-buffer-log-files files)))
+    (magit-refresh))))
+
+;;;; Infix Commands
+
+(transient-define-argument magit-log:-n ()
+  :description "Limit number of commits"
+  :class 'transient-option
+  ;; For historic reasons (and because it easy to guess what "-n"
+  ;; stands for) this is the only argument where we do not use the
+  ;; long argument ("--max-count").
+  :shortarg "-n"
+  :argument "-n"
+  :reader #'transient-read-number-N+)
+
+(transient-define-argument magit:--author ()
+  :description "Limit to author"
+  :class 'transient-option
+  :key "-A"
+  :argument "--author="
+  :reader #'magit-transient-read-person)
+
+(transient-define-argument magit-log:--since ()
+  :description "Limit to commits since"
+  :class 'transient-option
+  :key "=s"
+  :argument "--since="
+  :reader #'transient-read-date)
+
+(transient-define-argument magit-log:--until ()
+  :description "Limit to commits until"
+  :class 'transient-option
+  :key "=u"
+  :argument "--until="
+  :reader #'transient-read-date)
+
+(transient-define-argument magit-log:--*-order ()
+  :description "Order commits by"
+  :class 'transient-switches
+  :key "-o"
+  :argument-format "--%s-order"
+  :argument-regexp "\\(--\\(topo\\|author-date\\|date\\)-order\\)"
+  :choices '("topo" "author-date" "date"))
+
+(transient-define-argument magit-log:--grep ()
+  :description "Search messages"
+  :class 'transient-option
+  :key "-F"
+  :argument "--grep=")
+
+(transient-define-argument magit-log:-G ()
+  :description "Search changes"
+  :class 'transient-option
+  :argument "-G")
+
+(transient-define-argument magit-log:-S ()
+  :description "Search occurrences"
+  :class 'transient-option
+  :argument "-S")
+
+(transient-define-argument magit-log:-L ()
+  :description "Trace line evolution"
+  :class 'transient-option
+  :argument "-L"
+  :reader #'magit-read-file-trace)
+
+(defun magit-read-file-trace (&rest _ignored)
+  (let ((file  (magit-read-file-from-rev "HEAD" "File"))
+        (trace (magit-read-string "Trace")))
+    (concat trace ":" file)))
+
+;;;; Setup Commands
+
+(defvar-keymap magit-log-read-revs-map
+  :parent crm-local-completion-map
+  "SPC" #'self-insert-command)
+
+(defun magit-log-read-revs (&optional use-current)
+  (or (and use-current (and-let* ((buf (magit-get-current-branch))) (list buf)))
+      (let ((crm-separator "\\(\\.\\.\\.?\\|[, ]\\)")
+            (crm-local-completion-map magit-log-read-revs-map))
+        (split-string (magit-completing-read-multiple
+                       "Log rev,s: "
+                       (magit-list-refnames nil t)
+                       nil nil nil 'magit-revision-history
+                       (or (magit-branch-or-commit-at-point)
+                           (and (not use-current)
+                                (magit-get-previous-branch)))
+                       nil t)
+                      "[, ]" t))))
+
+(defun magit-log-read-pattern (option)
+  "Read a string from the user to pass as parameter to OPTION."
+  (magit-read-string (format "Type a pattern to pass to %s" option)))
+
+;;;###autoload
+(defun magit-log-current (revs &optional args files)
+  "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."
+  (interactive (cons (magit-log-read-revs t)
+                     (magit-log-arguments)))
+  (magit-log-setup-buffer revs args files))
+
+;;;###autoload
+(defun magit-log-head (&optional args files)
+  "Show log for `HEAD'."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (list "HEAD") args files))
+
+;;;###autoload
+(defun magit-log-related (revs &optional args files)
+  "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."
+  (interactive
+   (cons (let ((current (magit-get-current-branch))
+               head rebase target upstream upup)
+           (unless current
+             (setq rebase (magit-rebase--get-state-lines "head-name"))
+             (cond (rebase
+                    (setq rebase (magit-ref-abbrev rebase))
+                    (setq current rebase)
+                    (setq head "HEAD"))
+                   ((setq current (magit-get-previous-branch)))))
+           (cond (current
+                  (setq current
+                        (magit--propertize-face current 'magit-branch-local))
+                  (setq target (magit-get-push-branch current t))
+                  (setq upstream (magit-get-upstream-branch current))
+                  (when upstream
+                    (setq upup (and (magit-local-branch-p upstream)
+                                    (magit-get-upstream-branch upstream)))))
+                 ((setq head "HEAD")))
+           (delq nil (list current head target upstream upup)))
+         (magit-log-arguments)))
+  (magit-log-setup-buffer revs args files))
+
+;;;###autoload
+(defun magit-log-other (revs &optional args files)
+  "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 and tags, and a
+representation of the commit at point, are available as
+completion candidates."
+  (interactive (cons (magit-log-read-revs)
+                     (magit-log-arguments)))
+  (magit-log-setup-buffer revs args files))
+
+;;;###autoload
+(defun magit-log-branches (&optional args files)
+  "Show log for all local branches and `HEAD'."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (if (magit-get-current-branch)
+                              (list "--branches")
+                            (list "HEAD" "--branches"))
+                          args files))
+
+;;;###autoload
+(defun magit-log-matching-branches (pattern &optional args files)
+  "Show log for all branches matching PATTERN and `HEAD'."
+  (interactive (cons (magit-log-read-pattern "--branches") (magit-log-arguments)))
+  (magit-log-setup-buffer
+   (list "HEAD" (format "--branches=%s" pattern))
+   args files))
+
+;;;###autoload
+(defun magit-log-matching-tags (pattern &optional args files)
+  "Show log for all tags matching PATTERN and `HEAD'."
+  (interactive (cons (magit-log-read-pattern "--tags") (magit-log-arguments)))
+  (magit-log-setup-buffer
+   (list "HEAD" (format "--tags=%s" pattern))
+   args files))
+
+;;;###autoload
+(defun magit-log-all-branches (&optional args files)
+  "Show log for all local and remote branches and `HEAD'."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (if (magit-get-current-branch)
+                              (list "--branches" "--remotes")
+                            (list "HEAD" "--branches" "--remotes"))
+                          args files))
+
+;;;###autoload
+(defun magit-log-all (&optional args files)
+  "Show log for all references and `HEAD'."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (if (magit-get-current-branch)
+                              (list "--all")
+                            (list "HEAD" "--all"))
+                          args files))
+
+;;;###autoload
+(defun magit-log-buffer-file (&optional follow beg end)
+  "Show log for the blob or file visited in the current buffer.
+With a prefix argument or when `--follow' is an active log
+argument, then follow renames.  When the region is active,
+restrict the log to the lines that the region touches."
+  (interactive
+   (cons current-prefix-arg
+         (and (region-active-p)
+              (magit-file-relative-name)
+              (save-restriction
+                (widen)
+                (list (line-number-at-pos (region-beginning))
+                      (line-number-at-pos
+                       (let ((end (region-end)))
+                         (if (char-after end)
+                             end
+                           ;; Ensure that we don't get the line number
+                           ;; of a trailing newline.
+                           (1- end)))))))))
+  (require 'magit)
+  (if-let ((file (magit-file-relative-name)))
+      (magit-log-setup-buffer
+       (list (or magit-buffer-refname
+                 (magit-get-current-branch)
+                 "HEAD"))
+       (let ((args (car (magit-log-arguments))))
+         (when (and follow (not (member "--follow" args)))
+           (push "--follow" args))
+         (when (and (file-regular-p
+                     (expand-file-name file (magit-toplevel)))
+                    beg end)
+           (setq args (cons (format "-L%s,%s:%s" beg end file)
+                            (cl-delete "-L" args :test
+                                       #'string-prefix-p)))
+           (setq file nil))
+         args)
+       (and file (list file))
+       magit-log-buffer-file-locked)
+    (user-error "Buffer isn't visiting a file")))
+
+;;;###autoload
+(defun magit-log-trace-definition (file fn rev)
+  "Show log for the definition at point."
+  (interactive (list (or (magit-file-relative-name)
+                         (user-error "Buffer isn't visiting a file"))
+                     (or (funcall magit-log-trace-definition-function)
+                         (user-error "No function at point found"))
+                     (or magit-buffer-refname
+                         (magit-get-current-branch)
+                         "HEAD")))
+  (require 'magit)
+  (magit-log-setup-buffer
+   (list rev)
+   (cons (format "-L:%s%s:%s"
+                 (string-replace ":" "\\:" (regexp-quote fn))
+                 (if (derived-mode-p 'lisp-mode 'emacs-lisp-mode)
+                     ;; Git doesn't treat "-" the same way as
+                     ;; "_", leading to false-positives such as
+                     ;; "foo-suffix" being considered a match
+                     ;; for "foo".  Wing it.
+                     "\\( \\|$\\)"
+                   ;; We could use "\\b" here, but since Git
+                   ;; already does something equivalent, that
+                   ;; isn't necessary.
+                   "")
+                 file)
+         (cl-delete "-L" (car (magit-log-arguments))
+                    :test #'string-prefix-p))
+   nil magit-log-buffer-file-locked))
+
+(defun magit-diff-trace-definition ()
+  "Show log for the definition at point in a diff."
+  (interactive)
+  (pcase-let ((`(,buf ,pos) (magit-diff-visit-file--noselect)))
+    (magit--with-temp-position buf pos
+      (call-interactively #'magit-log-trace-definition))))
+
+;;;###autoload
+(defun magit-log-merged (commit branch &optional args files)
+  "Show log for the merge of COMMIT into BRANCH.
+
+More precisely, find merge commit M that brought COMMIT into
+BRANCH, and show the log of the range \"M^1..M\". If COMMIT is
+directly on BRANCH, then show approximately
+`magit-log-merged-commit-count' surrounding commits instead.
+
+This command requires git-when-merged, which is available from
+https://github.com/mhagger/git-when-merged."
+  (interactive
+   (append (let ((commit (magit-read-branch-or-commit "Log merge of commit")))
+             (list commit
+                   (magit-read-other-branch "Merged into" commit)))
+           (magit-log-arguments)))
+  (unless (magit-git-executable-find "git-when-merged")
+    (user-error "This command requires git-when-merged (%s)"
+                "https://github.com/mhagger/git-when-merged"))
+  (let (exit m)
+    (with-temp-buffer
+      (save-excursion
+        (setq exit (magit-process-git t "when-merged" "-c"
+                                      (magit-abbrev-arg)
+                                      commit branch)))
+      (setq m (buffer-substring-no-properties (point) (line-end-position))))
+    (if (zerop exit)
+        (magit-log-setup-buffer (list (format "%s^1..%s" m m))
+                                args files nil commit)
+      ;; Output: "<ref><lots of spaces><message>".
+      ;; This is not the same as `string-trim'.
+      (setq m (string-trim-left (substring m (string-match " " m))))
+      (if (equal m "Commit is directly on this branch.")
+          (let* ((from (format "%s~%d" commit
+                               (/ magit-log-merged-commit-count 2)))
+                 (to (- (car (magit-rev-diff-count branch commit t))
+                        (/ magit-log-merged-commit-count 2)))
+                 (to (if (<= to 0)
+                         branch
+                       (format "%s~%s" branch to))))
+            (unless (magit-rev-verify-commit from)
+              (setq from (magit-git-string "rev-list" "--max-parents=0"
+                                           commit)))
+            (magit-log-setup-buffer (list (concat from ".." to))
+                                    (cons "--first-parent" args)
+                                    files nil commit))
+        (user-error "Could not find when %s was merged into %s: %s"
+                    commit branch m)))))
+
+;;;; Limit Commands
+
+(defun 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."
+  (interactive)
+  (magit-log-set-commit-limit (lambda (&rest _) nil)))
+
+(defun magit-log-double-commit-limit ()
+  "Double the number of commits the current log buffer is limited to."
+  (interactive)
+  (magit-log-set-commit-limit '*))
+
+(defun magit-log-half-commit-limit ()
+  "Half the number of commits the current log buffer is limited to."
+  (interactive)
+  (magit-log-set-commit-limit '/))
+
+(defun magit-log-set-commit-limit (fn)
+  (let* ((val magit-buffer-log-args)
+         (arg (--first (string-match "^-n\\([0-9]+\\)?$" it) val))
+         (num (and arg (string-to-number (match-string 1 arg))))
+         (num (if num (funcall fn num 2) 256)))
+    (setq val (remove arg val))
+    (setq magit-buffer-log-args
+          (if (and num (> num 0))
+              (cons (format "-n%d" num) val)
+            val)))
+  (magit-refresh))
+
+(defun magit-log-get-commit-limit (&optional args)
+  (and-let* ((str (--first (string-match "^-n\\([0-9]+\\)?$" it)
+                           (or args magit-buffer-log-args))))
+    (string-to-number (match-string 1 str))))
+
+;;;; Mode Commands
+
+(defun magit-log-bury-buffer (&optional arg)
+  "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."
+  (interactive "p")
+  (if (< arg 0)
+      (let* ((buf (magit-get-mode-buffer 'magit-revision-mode))
+             (win (and buf (get-buffer-window buf (selected-frame)))))
+        (if win
+            (with-selected-window win
+              (with-current-buffer buf
+                (magit-mode-bury-buffer (> (abs arg) 1))))
+          (user-error "No revision buffer in this frame")))
+    (magit-mode-bury-buffer (> arg 1))))
+
+;;;###autoload
+(defun magit-log-move-to-parent (&optional n)
+  "Move to the Nth parent of the current commit."
+  (interactive "p")
+  (when (derived-mode-p 'magit-log-mode)
+    (when (magit-section-match 'commit)
+      (let* ((section (magit-current-section))
+             (parent-rev (format "%s^%s" (oref section value) (or n 1))))
+        (if-let ((parent-hash (magit-rev-parse "--short" parent-rev)))
+            (if-let ((parent (--first (equal (oref it value)
+                                             parent-hash)
+                                      (magit-section-siblings section 'next))))
+                (magit-section-goto parent)
+              (user-error
+               (substitute-command-keys
+                (concat "Parent " parent-hash " not found.  Try typing "
+                        "\\[magit-log-double-commit-limit] first"))))
+          (user-error "Parent %s does not exist" parent-rev))))))
+
+(defun magit-log-move-to-revision (rev)
+  "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."
+  (interactive
+   (list (or (magit-completing-read
+              "In log, jump to"
+              (magit-list-refnames nil t)
+              nil nil nil 'magit-revision-history
+              (or (and-let* ((rev (magit-commit-at-point)))
+                    (magit-rev-fixup-target rev))
+                  (magit-get-current-branch)))
+             (user-error "Nothing selected"))))
+  (with-current-buffer
+      (cond ((derived-mode-p 'magit-log-mode)
+             (current-buffer))
+            ((and-let* ((buf (magit-get-mode-buffer 'magit-log-mode)))
+               (pop-to-buffer-same-window buf)))
+            (t
+             (apply #'magit-log-all-branches (magit-log-arguments))))
+    (unless (magit-log-goto-commit-section (magit-rev-abbrev rev))
+      (user-error "%s isn't visible in the current log buffer" rev))))
+
+;;;; Shortlog Commands
+
+;;;###autoload (autoload 'magit-shortlog "magit-log" nil t)
+(transient-define-prefix magit-shortlog ()
+  "Show a history summary."
+  :man-page "git-shortlog"
+  :value '("--numbered" "--summary")
+  ["Arguments"
+   ("-n" "Sort by number of commits"      ("-n" "--numbered"))
+   ("-s" "Show commit count summary only" ("-s" "--summary"))
+   ("-e" "Show email addresses"           ("-e" "--email"))
+   ("-g" "Group commits by" "--group="
+    :choices ("author" "committer" "trailer:"))
+   (7 "-f" "Format string" "--format=")
+   (7 "-w" "Linewrap" "-w" :class transient-option)]
+  ["Shortlog"
+   ("s" "since" magit-shortlog-since)
+   ("r" "range" magit-shortlog-range)])
+
+(defun magit-git-shortlog (rev args)
+  (let ((dir default-directory))
+    (with-current-buffer (get-buffer-create "*magit-shortlog*")
+      (setq default-directory dir)
+      (setq buffer-read-only t)
+      (let ((inhibit-read-only t))
+        (erase-buffer)
+        (save-excursion
+          (magit-git-insert "shortlog" args rev))
+        (switch-to-buffer-other-window (current-buffer))))))
+
+;;;###autoload
+(defun magit-shortlog-since (rev args)
+  "Show a history summary for commits since REV."
+  (interactive
+   (list (magit-read-branch-or-commit "Shortlog since" (magit-get-current-tag))
+         (transient-args 'magit-shortlog)))
+  (magit-git-shortlog (concat rev "..") args))
+
+;;;###autoload
+(defun magit-shortlog-range (rev-or-range args)
+  "Show a history summary for commit or range REV-OR-RANGE."
+  (interactive
+   (list (magit-read-range-or-commit "Shortlog for revision or range")
+         (transient-args 'magit-shortlog)))
+  (magit-git-shortlog rev-or-range args))
+
+;;; Log Mode
+
+(defvar magit-log-disable-graph-hack-args
+  '("-G" "--grep" "--author")
+  "Arguments which disable the graph speedup hack.")
+
+(defvar-keymap magit-log-mode-map
+  :doc "Keymap for `magit-log-mode'."
+  :parent magit-mode-map
+  "C-c C-b" #'magit-go-backward
+  "C-c C-f" #'magit-go-forward
+  "C-c C-n" #'magit-log-move-to-parent
+  "j" #'magit-log-move-to-revision
+  "=" #'magit-log-toggle-commit-limit
+  "+" #'magit-log-double-commit-limit
+  "-" #'magit-log-half-commit-limit
+  "q" #'magit-log-bury-buffer)
+
+(define-derived-mode magit-log-mode magit-mode "Magit Log"
+  "Mode for looking at Git log.
+
+This mode is documented in info node `(magit)Log Buffer'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
+to visit the commit at point.
+
+Type \\[magit-branch] to see available branch commands.
+Type \\[magit-merge] to merge the branch or commit at point.
+Type \\[magit-cherry-pick] to apply the commit at point.
+Type \\[magit-reset] to reset `HEAD' to the commit at point.
+
+\\{magit-log-mode-map}"
+  :group 'magit-log
+  (hack-dir-local-variables-non-file-buffer)
+  (setq magit--imenu-item-types 'commit))
+
+(put 'magit-log-mode 'magit-log-default-arguments
+     '("--graph" "-n256" "--decorate"))
+
+(defun magit-log-setup-buffer (revs args files &optional locked focus)
+  (require 'magit)
+  (with-current-buffer
+      (magit-setup-buffer #'magit-log-mode locked
+        (magit-buffer-revisions revs)
+        (magit-buffer-log-args args)
+        (magit-buffer-log-files files))
+    (when (if focus
+              (magit-log-goto-commit-section focus)
+            (magit-log-goto-same-commit))
+      (magit-section-update-highlight))
+    (current-buffer)))
+
+(defun magit-log-refresh-buffer ()
+  (let ((revs  magit-buffer-revisions)
+        (args  magit-buffer-log-args)
+        (files magit-buffer-log-files)
+        (limit (magit-log-get-commit-limit)))
+    (magit-set-header-line-format
+     (funcall magit-log-header-line-function revs args files))
+    (unless (length= files 1)
+      (setq args (remove "--follow" args)))
+    (when (and (car magit-log-remove-graph-args)
+               (--any-p (string-match-p
+                         (concat "^" (regexp-opt magit-log-remove-graph-args)) it)
+                        args))
+      (setq args (remove "--graph" args)))
+    (setq args (magit-log--maybe-drop-color-graph args limit))
+    (when-let* ((limit limit)
+                (limit (* 2 limit)) ; increase odds for complete graph
+                (count (and (length= revs 1)
+                            (> limit 1024) ; otherwise it's fast enough
+                            (setq revs (car revs))
+                            (not (string-search ".." revs))
+                            (not (member revs '("--all" "--branches")))
+                            (not (seq-some
+                                  (lambda (arg)
+                                    (--any-p (string-prefix-p it arg)
+                                             magit-log-disable-graph-hack-args))
+                                  args))
+                            (magit-git-string "rev-list" "--count"
+                                              "--first-parent" args revs))))
+      (setq revs (if (< (string-to-number count) limit)
+                     revs
+                   (format "%s~%s..%s" revs limit revs))))
+    (let ((delay (cl-find-if (lambda (arg)
+                               (member arg '("++header" "--patch" "--stat")))
+                             args)))
+      (setq magit-section-inhibit-markers (if delay 'delay t))
+      (setq magit-section-insert-in-reverse (not delay)))
+    (magit-insert-section (logbuf)
+      (magit--insert-log t revs args files))))
+
+(defvar-local magit-log--color-graph nil)
+
+(defun magit-log--maybe-drop-color-graph (args limit)
+  (if (member "--color" args)
+      (if (cond ((not (member "--graph" args)))
+                ((not magit-log-color-graph-limit) nil)
+                ((not limit)
+                 (message "Dropping --color because -n isn't set (see %s)"
+                          'magit-log-color-graph-limit))
+                ((> limit magit-log-color-graph-limit)
+                 (message "Dropping --color because -n is larger than %s"
+                          'magit-log-color-graph-limit)))
+          (progn (setq args (remove "--color" args))
+                 (setq magit-log--color-graph nil))
+        (setq magit-log--color-graph t))
+    (setq magit-log--color-graph nil))
+  args)
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-log-mode))
+  (append magit-buffer-revisions
+          (if (and magit-buffer-revisions magit-buffer-log-files)
+              (cons "--" magit-buffer-log-files)
+            magit-buffer-log-files)))
+
+(defun magit-log-header-line-arguments (revs args files)
+  "Return string describing some of the used arguments."
+  (mapconcat (lambda (arg)
+               (if (string-search " " arg)
+                   (prin1 arg)
+                 arg))
+             `("git" "log" ,@args ,@revs "--" ,@files)
+             " "))
+
+(defun magit-log-header-line-sentence (revs args files)
+  "Return string containing all arguments."
+  (concat "Commits in "
+          (mapconcat #'identity revs " ")
+          (and (member "--reverse" args)
+               " in reverse")
+          (and files (concat " touching "
+                             (mapconcat #'identity files " ")))
+          (--some (and (string-prefix-p "-L" it)
+                       (concat " " it))
+                  args)))
+
+(defun magit-insert-log (revs &optional args files)
+  (declare (obsolete magit--insert-log "Magit 4.0.0"))
+  (magit--insert-log nil revs args files))
+
+(defun magit--insert-log (keep-error revs &optional args files)
+  "Insert a log section.
+Do not add this to a hook variable."
+  (declare (indent defun))
+  (setq magit-section-preserve-visibility t) ; TODO do it here?
+  (let ((magit-git-global-arguments
+         (remove "--literal-pathspecs" magit-git-global-arguments)))
+    (magit--git-wash (apply-partially #'magit-log-wash-log 'log) keep-error
+      "log"
+      (format "--format=%s%%h%%x0c%s%%x0c%s%%x0c%%aN%%x0c%s%%x0c%%s%s"
+              (if (and (member "--left-right" args)
+                       (not (member "--graph" args)))
+                  "%m "
+                "")
+              (if (member "--decorate" args) "%D" "")
+              (if (not (member "--show-signature" args))
+                  ""
+                (setq args (remove "--show-signature" args))
+                (let ((limit (magit-log-get-commit-limit args)))
+                  (cond
+                   ((not limit)
+                    (message
+                     "Dropping --show-signature because -n isn't set (see %s)"
+                     'magit-log-show-signatures-limit)
+                    "")
+                   ((> limit magit-log-show-signatures-limit)
+                    (message
+                     "Dropping --show-signature because -n is larger than %s"
+                     'magit-log-show-signatures-limit)
+                    "")
+                   ("%G?"))))
+              (if magit-log-margin-show-committer-date "%ct" "%at")
+              (if (member "++header" args)
+                  (if (member "--graph" (setq args (remove "++header" args)))
+                      (concat "\n" magit-log-revision-headers-format "\n")
+                    (concat "\n" magit-log-revision-headers-format "\n"))
+                ""))
+      (progn
+        (when-let ((order (--first (string-match "^\\+\\+order=\\(.+\\)$" it)
+                                   args)))
+          (setq args (cons (format "--%s-order" (match-string 1 order))
+                           (remove order args))))
+        (when (member "--decorate" args)
+          (setq args (cons "--decorate=full" (remove "--decorate" args))))
+        (when (member "--reverse" args)
+          (setq args (remove "--graph" args)))
+        (setq args (magit-diff--maybe-add-stat-arguments args))
+        args)
+      "--use-mailmap" "--no-prefix" revs "--" files)))
+
+(cl-defmethod magit-menu-common-value ((_section magit-commit-section))
+  (or (magit-diff--region-range)
+      (oref (magit-current-section) value)))
+
+(defvar-keymap magit-commit-section-map
+  :doc "Keymap for `commit' sections."
+  "<remap> <magit-visit-thing>" #'magit-show-commit
+  "<3>" (magit-menu-item "Apply %x" #'magit-cherry-apply)
+  "<2>" (magit-menu-item "Show commit %x" #'magit-show-commit
+                         '(:visible (not (region-active-p))))
+  "<1>" (magit-menu-item "Diff %x" #'magit-diff-range
+                         '(:visible (region-active-p))))
+
+(defvar-keymap magit-module-commit-section-map
+  :doc "Keymap for `module-commit' sections."
+  :parent magit-commit-section-map)
+
+(defconst magit-log-heading-re
+  ;; Note: A form feed instead of a null byte is used as the delimiter
+  ;; because using the latter interferes with the graph prefix when
+  ;; ++header is used.
+  (concat "^"
+          "\\(?4:[-_/|\\*o<>. ]*\\)"               ; graph
+          "\\(?1:[0-9a-fA-F]+\\)?"               ; hash
+          "\\(?3:[^\n]+\\)?"                   ; refs
+          "\\(?7:[BGUXYREN]\\)?"                 ; gpg
+          "\\(?5:[^\n]*\\)"                    ; author
+          ;; Note: Date is optional because, prior to Git v2.19.0,
+          ;; `git rebase -i --root` corrupts the root's author date.
+          "\\(?6:[^\n]*\\)"                    ; date
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-cherry-re
+  (concat "^"
+          "\\(?8:[-+]\\) "                         ; cherry
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; hash
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-module-re
+  (concat "^"
+          "\\(?:\\(?11:[<>]\\) \\)?"               ; side
+          "\\(?1:[0-9a-fA-F]+\\) "                 ; hash
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-bisect-vis-re
+  (concat "^"
+          "\\(?4:[-_/|\\*o<>. ]*\\)"               ; graph
+          "\\(?1:[0-9a-fA-F]+\\)?\0"               ; hash
+          "\\(?3:[^\0\n]+\\)?\0"                   ; refs
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-bisect-log-re
+  (concat "^# "
+          "\\(?3:[^: \n]+:\\) "                    ; "refs"
+          "\\[\\(?1:[^]\n]+\\)\\] "                ; hash
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defconst magit-log-reflog-re
+  (concat "^"
+          "\\(?1:[^\0\n]+\\)\0"                    ; hash
+          "\\(?5:[^\0\n]*\\)\0"                    ; author
+          "\\(?:\\(?:[^@\n]+@{\\(?6:[^}\n]+\\)}\0" ; date
+                                                 ;;; refsub
+          "\\(?10:merge \\|autosave \\|restart \\|rewritten \\|[^:\n]+: \\)?"
+          "\\(?2:.*\\)\\)\\|\0\\)$"))              ; msg
+
+(defconst magit-reflog-subject-re
+  (concat "\\(?1:[^ ]+\\) ?"                       ; command
+          "\\(?2:\\(?: ?-[^ ]+\\)+\\)?"            ; option
+          "\\(?: ?(\\(?3:[^)]+\\))\\)?"))          ; type
+
+(defconst magit-log-stash-re
+  (concat "^"
+          "\\(?1:[^\0\n]+\\)\0"                    ; "hash"
+          "\\(?5:[^\0\n]*\\)\0"                    ; author
+          "\\(?6:[^\0\n]+\\)\0"                    ; date
+          "\\(?2:.*\\)$"))                         ; msg
+
+(defvar magit-log-count nil)
+
+(defvar magit-log-format-message-function #'magit-log-propertize-keywords)
+
+(defun magit-log-wash-log (style args)
+  (setq args (flatten-tree args))
+  (when (if (derived-mode-p 'magit-log-mode)
+            magit-log--color-graph
+          (and (member "--graph" args)
+               (member "--color" args)))
+    (let ((ansi-color-apply-face-function
+           (lambda (beg end face)
+             (put-text-property beg end 'font-lock-face
+                                (or face 'magit-log-graph)))))
+      (ansi-color-apply-on-region (point-min) (point-max))))
+  (when (eq style 'cherry)
+    (reverse-region (point-min) (point-max)))
+  (let ((magit-log-count 0))
+    (when (looking-at "^\\.\\.\\.")
+      (magit-delete-line))
+    (magit-wash-sequence (apply-partially #'magit-log-wash-rev style
+                                          (magit-abbrev-length)))
+    (if (derived-mode-p 'magit-log-mode 'magit-reflog-mode)
+        (when (eq magit-log-count (magit-log-get-commit-limit))
+          (magit-insert-section (longer)
+            (insert-text-button
+             (substitute-command-keys
+              (format "Type \\<%s>\\[%s] to show more history"
+                      'magit-log-mode-map
+                      'magit-log-double-commit-limit))
+             'action (lambda (_button)
+                       (magit-log-double-commit-limit))
+             'follow-link t
+             'mouse-face 'magit-section-highlight)))
+      (insert ?\n))))
+
+(cl-defun magit-log-wash-rev (style abbrev)
+  (when (derived-mode-p 'magit-log-mode 'magit-reflog-mode)
+    (cl-incf magit-log-count))
+  (looking-at (pcase style
+                ('log        magit-log-heading-re)
+                ('cherry     magit-log-cherry-re)
+                ('module     magit-log-module-re)
+                ('reflog     magit-log-reflog-re)
+                ('stash      magit-log-stash-re)
+                ('bisect-vis magit-log-bisect-vis-re)
+                ('bisect-log magit-log-bisect-log-re)))
+  (magit-bind-match-strings
+      (hash msg refs graph author date gpg cherry _ refsub side) nil
+    (setq msg (substring-no-properties msg))
+    (when refs
+      (setq refs (substring-no-properties refs)))
+    (let ((align (or (eq style 'cherry)
+                     (not (member "--stat" magit-buffer-log-args))))
+          (non-graph-re (if (eq style 'bisect-vis)
+                            magit-log-bisect-vis-re
+                          magit-log-heading-re)))
+      (magit-delete-line)
+      ;; If the reflog entries have been pruned, the output of `git
+      ;; reflog show' includes a partial line that refers to the hash
+      ;; of the youngest expired reflog entry.
+      (when (and (eq style 'reflog) (not date))
+        (cl-return-from magit-log-wash-rev t))
+      (magit-insert-section
+          ((eval (pcase style
+                   ('stash  'stash)
+                   ('module 'module-commit)
+                   (_       'commit)))
+           hash)
+        (setq hash (propertize (if (eq style 'bisect-log)
+                                   (magit-rev-parse "--short" hash)
+                                 hash)
+                               'font-lock-face
+                               (pcase (and gpg (aref gpg 0))
+                                 (?G 'magit-signature-good)
+                                 (?B 'magit-signature-bad)
+                                 (?U 'magit-signature-untrusted)
+                                 (?X 'magit-signature-expired)
+                                 (?Y 'magit-signature-expired-key)
+                                 (?R 'magit-signature-revoked)
+                                 (?E 'magit-signature-error)
+                                 (?N 'magit-hash)
+                                 (_  'magit-hash))))
+        (when cherry
+          (when (and (derived-mode-p 'magit-refs-mode)
+                     magit-refs-show-commit-count)
+            (insert (make-string (1- magit-refs-focus-column-width) ?\s)))
+          (insert (propertize cherry 'font-lock-face
+                              (if (string= cherry "-")
+                                  'magit-cherry-equivalent
+                                'magit-cherry-unmatched)))
+          (insert ?\s))
+        (when side
+          (insert (propertize side 'font-lock-face
+                              (if (string= side "<")
+                                  'magit-cherry-equivalent
+                                'magit-cherry-unmatched)))
+          (insert ?\s))
+        (when align
+          (insert hash ?\s))
+        (when graph
+          (insert graph))
+        (unless align
+          (insert hash ?\s))
+        (when (and refs (not magit-log-show-refname-after-summary))
+          (insert (magit-format-ref-labels refs) ?\s))
+        (when (eq style 'reflog)
+          (insert (format "%-2s " (1- magit-log-count)))
+          (when refsub
+            (insert (magit-reflog-format-subject
+                     (substring refsub 0
+                                (if (string-search ":" refsub) -2 -1))))))
+        (insert (funcall magit-log-format-message-function hash msg))
+        (when (and refs magit-log-show-refname-after-summary)
+          (insert ?\s)
+          (insert (magit-format-ref-labels refs)))
+        (insert ?\n)
+        (when (memq style '(log reflog stash))
+          (goto-char (line-beginning-position))
+          (when (and refsub
+                     (string-match "\\`\\([^ ]\\) \\+\\(..\\)\\(..\\)" date))
+            (setq date (+ (string-to-number (match-string 1 date))
+                          (* (string-to-number (match-string 2 date)) 60 60)
+                          (* (string-to-number (match-string 3 date)) 60))))
+          (save-excursion
+            (backward-char)
+            (magit-log-format-margin hash author date)))
+        (when (and (eq style 'cherry)
+                   (magit-buffer-margin-p))
+          (save-excursion
+            (backward-char)
+            (apply #'magit-log-format-margin hash
+                   (split-string (magit-rev-format "%aN%x00%ct" hash) "\0"))))
+        (when (and graph
+                   (not (eobp))
+                   (not (looking-at non-graph-re)))
+          (when (looking-at "")
+            (magit-insert-heading)
+            (delete-char 1)
+            (magit-insert-section (commit-header)
+              (forward-line)
+              (magit-insert-heading)
+              (re-search-forward "")
+              (delete-char -1)
+              (forward-char)
+              (insert ?\n))
+            (delete-char 1))
+          (if (looking-at "^\\(---\\|\n\s\\|\ndiff\\)")
+              (let ((limit (save-excursion
+                             (and (re-search-forward non-graph-re nil t)
+                                  (match-beginning 0)))))
+                (unless (oref magit-insert-section--current content)
+                  (magit-insert-heading))
+                (delete-char (if (looking-at "\n") 1 4))
+                (magit-diff-wash-diffs (list "--stat") limit))
+            (when align
+              (setq align (make-string (1+ abbrev) ? )))
+            (when (and (not (eobp)) (not (looking-at non-graph-re)))
+              (when align
+                (setq align (make-string (1+ abbrev) ? )))
+              (while (and (not (eobp)) (not (looking-at non-graph-re)))
+                (when align
+                  (save-excursion (insert align)))
+                (magit-make-margin-overlay)
+                (forward-line))
+              ;; When `--format' is used and its value isn't one of the
+              ;; predefined formats, then `git-log' does not insert a
+              ;; separator line.
+              (save-excursion
+                (forward-line -1)
+                (looking-at "[-_/|\\*o<>. ]*"))
+              (setq graph (match-string 0))
+              (unless (string-match-p "[/\\.]" graph)
+                (insert graph ?\n))))))))
+  t)
+
+(defun magit-log-propertize-keywords (_rev msg)
+  (let ((boundary 0))
+    (when (string-match "^\\(?:squash\\|fixup\\)! " msg boundary)
+      (setq boundary (match-end 0))
+      (magit--put-face (match-beginning 0) (1- boundary)
+                       'magit-keyword-squash msg))
+    (when magit-log-highlight-keywords
+      (while (string-match "\\[[^][]*]" msg boundary)
+        (setq boundary (match-end 0))
+        (magit--put-face (match-beginning 0) boundary
+                         'magit-keyword msg))))
+  msg)
+
+(defun magit-log-maybe-show-more-commits (section)
+  "When point is at the end of a log buffer, insert more commits.
+
+Log buffers end with a button \"Type + to show more history\".
+When the use of a section movement command puts point on that
+button, then automatically show more commits, without the user
+having to press \"+\".
+
+This function is called by `magit-section-movement-hook' and
+exists mostly for backward compatibility reasons."
+  (when (and (eq (oref section type) 'longer)
+             magit-log-auto-more)
+    (magit-log-double-commit-limit)
+    (forward-line -1)
+    (magit-section-forward)))
+
+(add-hook 'magit-section-movement-hook #'magit-log-maybe-show-more-commits)
+
+(defvar magit--update-revision-buffer nil)
+
+(defun magit-log-maybe-update-revision-buffer (&optional _)
+  "When moving in a log or cherry buffer, update the revision buffer.
+If there is no revision buffer in the same frame, then do nothing."
+  (when (derived-mode-p 'magit-log-mode 'magit-cherry-mode 'magit-reflog-mode)
+    (magit--maybe-update-revision-buffer)))
+
+(add-hook 'magit-section-movement-hook #'magit-log-maybe-update-revision-buffer)
+
+(defun magit--maybe-update-revision-buffer ()
+  (when-let* ((commit (magit-section-value-if 'commit))
+              (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
+       (let ((args (let ((magit-direct-use-buffer-arguments 'selected))
+                     (magit-show-commit--arguments))))
+         (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 args))))
+           (setq magit--update-revision-buffer nil)))))))
+
+(defvar magit--update-blob-buffer nil)
+
+(defun magit-log-maybe-update-blob-buffer (&optional _)
+  "When moving in a log or cherry buffer, update the blob buffer.
+If there is no blob buffer in the same frame, then do nothing."
+  (when (derived-mode-p 'magit-log-mode 'magit-cherry-mode 'magit-reflog-mode)
+    (magit--maybe-update-blob-buffer)))
+
+(defun magit--maybe-update-blob-buffer ()
+  (when-let* ((commit (magit-section-value-if 'commit))
+              (buffer (--first (with-current-buffer it
+                                 (eq revert-buffer-function
+                                     'magit-revert-rev-file-buffer))
+                               (mapcar #'window-buffer (window-list)))))
+    (if magit--update-blob-buffer
+        (setq magit--update-blob-buffer (list commit buffer))
+      (setq magit--update-blob-buffer (list commit buffer))
+      (run-with-idle-timer
+       magit-update-other-window-delay nil
+       (lambda ()
+         (pcase-let ((`(,rev ,buf) magit--update-blob-buffer))
+           (setq magit--update-blob-buffer nil)
+           (when (buffer-live-p buf)
+             (with-selected-window (get-buffer-window buf)
+               (with-current-buffer buf
+                 (save-excursion
+                   (magit-blob-visit (list (magit-rev-parse rev)
+                                           (magit-file-relative-name
+                                            magit-buffer-file-name)))))))))))))
+
+(defun magit-log-goto-commit-section (rev)
+  (let ((abbrev (magit-rev-format "%h" rev)))
+    (when-let ((section (--first (equal (oref it value) abbrev)
+                                 (oref magit-root-section children))))
+      (goto-char (oref section start)))))
+
+(defun magit-log-goto-same-commit ()
+  (when (and magit-previous-section
+             (magit-section-match '(commit branch)
+                                  magit-previous-section))
+    (magit-log-goto-commit-section (oref magit-previous-section value))))
+
+;;; Log Margin
+
+(defvar-local magit-log-margin-show-shortstat nil)
+
+(transient-define-suffix magit-toggle-log-margin-style ()
+  "Toggle between the regular and the shortstat margin style.
+The shortstat style is experimental and rather slow."
+  :description "Toggle shortstat"
+  :key "x"
+  :transient t
+  (interactive)
+  (setq magit-log-margin-show-shortstat
+        (not magit-log-margin-show-shortstat))
+  (magit-set-buffer-margin nil t))
+
+(defun magit-log-format-margin (rev author date)
+  (when (magit-margin-option)
+    (if magit-log-margin-show-shortstat
+        (magit-log-format-shortstat-margin rev)
+      (magit-log-format-author-margin author date))))
+
+(defun magit-log-format-author-margin (author date &optional previous-line)
+  (pcase-let ((`(,_ ,style ,width ,details ,details-width)
+               (or magit-buffer-margin
+                   (symbol-value (magit-margin-option))
+                   (error "No margin format specified for %s" major-mode))))
+    (magit-make-margin-overlay
+     (concat (and details
+                  (concat (magit--propertize-face
+                           (truncate-string-to-width
+                            (or author "")
+                            details-width
+                            nil ?\s
+                            (magit--ellipsis 'margin))
+                           'magit-log-author)
+                          " "))
+             (magit--propertize-face
+              (if (stringp style)
+                  (format-time-string
+                   style
+                   (seconds-to-time (string-to-number date)))
+                (pcase-let* ((abbr (eq style 'age-abbreviated))
+                             (`(,cnt ,unit) (magit--age date abbr)))
+                  (format (format (if abbr "%%2d%%-%dc" "%%2d %%-%ds")
+                                  (- width (if details (1+ details-width) 0)))
+                          cnt unit)))
+              'magit-log-date))
+     previous-line)))
+
+(defun magit-log-format-shortstat-margin (rev)
+  (magit-make-margin-overlay
+   (if-let ((line (and rev (magit-git-string
+                            "show" "--format=" "--shortstat" rev))))
+       (if (string-match "\
+\\([0-9]+\\) files? changed, \
+\\(?:\\([0-9]+\\) insertions?(\\+)\\)?\
+\\(?:\\(?:, \\)?\\([0-9]+\\) deletions?(-)\\)?\\'" line)
+           (magit-bind-match-strings (files add del) line
+             (format
+              "%5s %5s%4s"
+              (if add
+                  (magit--propertize-face (format "%s+" add)
+                                          'magit-diffstat-added)
+                "")
+              (if del
+                  (magit--propertize-face (format "%s-" del)
+                                          'magit-diffstat-removed)
+                "")
+              files))
+         "")
+     "")))
+
+(defun magit-log-margin-width (style details details-width)
+  (if magit-log-margin-show-shortstat
+      16
+    (+ (if details (1+ details-width) 0)
+       (if (stringp style)
+           (length (format-time-string style))
+         (+ 2 ; two digits
+            1 ; trailing space
+            (if (eq style 'age-abbreviated)
+                1  ; single character
+              (+ 1 ; gap after digits
+                 (apply #'max (--map (max (length (nth 1 it))
+                                          (length (nth 2 it)))
+                                     magit--age-spec)))))))))
+
+;;; Select Mode
+
+(defvar-keymap magit-log-select-mode-map
+  :doc "Keymap for `magit-log-select-mode'."
+  :parent magit-log-mode-map
+  "C-c C-b" #'undefined
+  "C-c C-f" #'undefined
+  "."       #'magit-log-select-pick
+  "e"       #'magit-log-select-pick
+  "C-c C-c" #'magit-log-select-pick
+  "q"       #'magit-log-select-quit
+  "C-c C-k" #'magit-log-select-quit)
+(put 'magit-log-select-pick :advertised-binding [?\C-c ?\C-c])
+(put 'magit-log-select-quit :advertised-binding [?\C-c ?\C-k])
+
+(define-derived-mode magit-log-select-mode magit-log-mode "Magit Select"
+  "Mode for selecting a commit from history.
+
+This mode is documented in info node `(magit)Select from Log'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
+to visit the commit at point.
+
+\\<magit-log-select-mode-map>\
+Type \\[magit-log-select-pick] to select the commit at point.
+Type \\[magit-log-select-quit] to abort without selecting a commit."
+  :group 'magit-log
+  (hack-dir-local-variables-non-file-buffer))
+
+(put 'magit-log-select-mode 'magit-log-default-arguments
+     '("--graph" "-n256" "--decorate"))
+
+(defun magit-log-select-setup-buffer (revs args)
+  (magit-setup-buffer #'magit-log-select-mode nil
+    (magit-buffer-revisions revs)
+    (magit-buffer-log-args args)))
+
+(defun magit-log-select-refresh-buffer ()
+  (setq magit-section-inhibit-markers t)
+  (setq magit-section-insert-in-reverse t)
+  (magit-insert-section (logbuf)
+    (magit--insert-log t magit-buffer-revisions
+      (magit-log--maybe-drop-color-graph
+       magit-buffer-log-args
+       (magit-log-get-commit-limit)))))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-log-select-mode))
+  magit-buffer-revisions)
+
+(defvar-local magit-log-select-pick-function nil)
+(defvar-local magit-log-select-quit-function nil)
+
+(defun magit-log-select (pick &optional msg quit branch args initial)
+  (declare (indent defun))
+  (unless initial
+    (setq initial (magit-commit-at-point)))
+  (magit-log-select-setup-buffer
+   (or branch (magit-get-current-branch) "HEAD")
+   (append args
+           (car (magit-log--get-value 'magit-log-select-mode
+                                      magit-direct-use-buffer-arguments))))
+  (when initial
+    (magit-log-goto-commit-section initial))
+  (setq magit-log-select-pick-function pick)
+  (setq magit-log-select-quit-function quit)
+  (when magit-log-select-show-usage
+    (let ((pick (propertize (substitute-command-keys
+                             "\\[magit-log-select-pick]")
+                            'font-lock-face
+                            'magit-header-line-key))
+          (quit (propertize (substitute-command-keys
+                             "\\[magit-log-select-quit]")
+                            'font-lock-face
+                            'magit-header-line-key)))
+      (setq msg (format-spec
+                 (if msg
+                     (if (string-suffix-p "," msg)
+                         (concat msg " or %q to abort")
+                       msg)
+                   "Type %p to select commit at point, or %q to abort")
+                 `((?p . ,pick)
+                   (?q . ,quit)))))
+    (magit--add-face-text-property
+     0 (length msg) 'magit-header-line-log-select t msg)
+    (when (memq magit-log-select-show-usage '(both header-line))
+      (magit-set-header-line-format msg))
+    (when (memq magit-log-select-show-usage '(both echo-area))
+      (message "%s" (substring-no-properties msg)))))
+
+(defun 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."
+  (interactive)
+  (let ((fun magit-log-select-pick-function)
+        (rev (magit-commit-at-point)))
+    (magit-mode-bury-buffer 'kill)
+    (funcall fun rev)))
+
+(defun magit-log-select-quit ()
+  "Abort selecting a commit, don't act on any commit.
+Call `magit-log-select-quit-function' if set."
+  (interactive)
+  (let ((fun magit-log-select-quit-function))
+    (magit-mode-bury-buffer 'kill)
+    (when fun (funcall fun))))
+
+;;; Cherry Mode
+
+(defvar-keymap magit-cherry-mode-map
+  :doc "Keymap for `magit-cherry-mode'."
+  :parent magit-mode-map
+  "q" #'magit-log-bury-buffer
+  "L" #'magit-margin-settings)
+
+(define-derived-mode magit-cherry-mode magit-mode "Magit Cherry"
+  "Mode for looking at commits not merged upstream.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
+to visit the commit at point.
+
+Type \\[magit-cherry-pick] to apply the commit at point.
+
+\\{magit-cherry-mode-map}"
+  :group 'magit-log
+  (hack-dir-local-variables-non-file-buffer)
+  (setq magit--imenu-group-types 'cherries))
+
+(defun magit-cherry-setup-buffer (head upstream)
+  (magit-setup-buffer #'magit-cherry-mode nil
+    (magit-buffer-refname head)
+    (magit-buffer-upstream upstream)
+    (magit-buffer-range (concat upstream ".." head))))
+
+(defun magit-cherry-refresh-buffer ()
+  (setq magit-section-insert-in-reverse t)
+  (magit-insert-section (cherry)
+    (magit-run-section-hook 'magit-cherry-sections-hook)))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-cherry-mode))
+  magit-buffer-range)
+
+;;;###autoload
+(defun magit-cherry (head upstream)
+  "Show commits in a branch that are not merged in the upstream branch."
+  (interactive
+   (let  ((head (magit-read-branch "Cherry head")))
+     (list head (magit-read-other-branch "Cherry upstream" head
+                                         (magit-get-upstream-branch head)))))
+  (require 'magit)
+  (magit-cherry-setup-buffer head upstream))
+
+(defun magit-insert-cherry-headers ()
+  "Insert headers appropriate for `magit-cherry-mode' buffers."
+  (let ((branch (propertize magit-buffer-refname
+                            'font-lock-face 'magit-branch-local))
+        (upstream (propertize magit-buffer-upstream 'font-lock-face
+                              (if (magit-local-branch-p magit-buffer-upstream)
+                                  'magit-branch-local
+                                'magit-branch-remote))))
+    (magit-insert-head-branch-header branch)
+    (magit-insert-upstream-branch-header branch upstream "Upstream: ")
+    (insert ?\n)))
+
+(defun magit-insert-cherry-commits ()
+  "Insert commit sections into a `magit-cherry-mode' buffer."
+  (magit-insert-section (cherries)
+    (magit-insert-heading "Cherry commits:")
+    (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
+      "cherry" "-v" "--abbrev"
+      magit-buffer-upstream
+      magit-buffer-refname)))
+
+;;; Log Sections
+;;;; Standard Log Sections
+
+(defvar-keymap magit-log-section-map
+  :doc "Keymap for log sections.
+The classes `magit-{unpulled,unpushed,unmerged}-section' derive
+from the abstract `magit-log-section' class.  Accordingly this
+keymap is the parent of their keymaps."
+  "<remap> <magit-visit-thing>" #'magit-diff-dwim
+  "<1>" (magit-menu-item "Visit diff" #'magit-diff-dwim))
+
+(cl-defmethod magit-section-ident-value ((section magit-unpulled-section))
+  "\"..@{push}\" cannot be used as the value because that is
+ambiguous if `push.default' does not allow a 1:1 mapping, and
+many commands would fail because of that.  But here that does
+not matter and we need an unique value so we use that string
+in the pushremote case."
+  (let ((value (oref section value)))
+    (if (equal value "..@{upstream}") value "..@{push}")))
+
+(magit-define-section-jumper magit-jump-to-unpulled-from-upstream
+  "Unpulled from @{upstream}" unpulled "..@{upstream}")
+
+(defun magit-insert-unpulled-from-upstream ()
+  "Insert commits that haven't been pulled from the upstream yet."
+  (when-let ((upstream (magit-get-upstream-branch)))
+    (magit-insert-section (unpulled "..@{upstream}" t)
+      (magit-insert-heading
+        (format (propertize "Unpulled from %s."
+                            'font-lock-face 'magit-section-heading)
+                upstream))
+      (magit--insert-log nil "..@{upstream}" magit-buffer-log-args)
+      (magit-log-insert-child-count))))
+
+(magit-define-section-jumper magit-jump-to-unpulled-from-pushremote
+  "Unpulled from <push-remote>" unpulled "..@{push}")
+
+(defun magit-insert-unpulled-from-pushremote ()
+  "Insert commits that haven't been pulled from the push-remote yet."
+  (when-let* ((target (magit-get-push-branch))
+              (range  (concat ".." target)))
+    (when (magit--insert-pushremote-log-p)
+      (magit-insert-section (unpulled range t)
+        (magit-insert-heading
+          (format (propertize "Unpulled from %s."
+                              'font-lock-face 'magit-section-heading)
+                  (propertize target 'font-lock-face 'magit-branch-remote)))
+        (magit--insert-log nil range magit-buffer-log-args)
+        (magit-log-insert-child-count)))))
+
+(cl-defmethod magit-section-ident-value ((section magit-unpushed-section))
+  "\"..@{push}\" cannot be used as the value because that is
+ambiguous if `push.default' does not allow a 1:1 mapping, and
+many commands would fail because of that.  But here that does
+not matter and we need an unique value so we use that string
+in the pushremote case."
+  (let ((value (oref section value)))
+    (if (equal value "@{upstream}..") value "@{push}..")))
+
+(magit-define-section-jumper magit-jump-to-unpushed-to-upstream
+  "Unpushed to @{upstream}" unpushed "@{upstream}..")
+
+(defun magit-insert-unpushed-to-upstream-or-recent ()
+  "Insert section showing unpushed or other recent commits.
+If an upstream is configured for the current branch and it is
+behind of the current branch, then show the commits that have
+not yet been pushed into the upstream branch.  If no upstream is
+configured or if the upstream is not behind of the current branch,
+then show the last `magit-log-section-commit-count' commits."
+  (let ((upstream (magit-get-upstream-branch)))
+    (if (or (not upstream)
+            (magit-rev-ancestor-p "HEAD" upstream))
+        (magit-insert-recent-commits 'unpushed "@{upstream}..")
+      (magit-insert-unpushed-to-upstream))))
+
+(defun magit-insert-unpushed-to-upstream ()
+  "Insert commits that haven't been pushed to the upstream yet."
+  (when (magit-git-success "rev-parse" "@{upstream}")
+    (magit-insert-section (unpushed "@{upstream}..")
+      (magit-insert-heading
+        (format (propertize "Unmerged into %s."
+                            'font-lock-face 'magit-section-heading)
+                (magit-get-upstream-branch)))
+      (magit--insert-log nil "@{upstream}.." magit-buffer-log-args)
+      (magit-log-insert-child-count))))
+
+(defun magit-insert-recent-commits (&optional type value)
+  "Insert section showing recent commits.
+Show the last `magit-log-section-commit-count' commits."
+  (let* ((start (format "HEAD~%s" magit-log-section-commit-count))
+         (range (and (magit-rev-verify start)
+                     (concat start "..HEAD"))))
+    (magit-insert-section ((eval (or type 'recent))
+                           (or value range)
+                           t)
+      (magit-insert-heading "Recent commits")
+      (magit--insert-log nil range
+        (cons (format "-n%d" magit-log-section-commit-count)
+              (--remove (string-prefix-p "-n" it)
+                        magit-buffer-log-args))))))
+
+(magit-define-section-jumper magit-jump-to-unpushed-to-pushremote
+  "Unpushed to <push-remote>" unpushed "@{push}..")
+
+(defun magit-insert-unpushed-to-pushremote ()
+  "Insert commits that haven't been pushed to the push-remote yet."
+  (when-let* ((target (magit-get-push-branch))
+              (range  (concat target "..")))
+    (when (magit--insert-pushremote-log-p)
+      (magit-insert-section (unpushed range t)
+        (magit-insert-heading
+          (format (propertize "Unpushed to %s."
+                              'font-lock-face 'magit-section-heading)
+                  (propertize target 'font-lock-face 'magit-branch-remote)))
+        (magit--insert-log nil range magit-buffer-log-args)
+        (magit-log-insert-child-count)))))
+
+(defun magit--insert-pushremote-log-p ()
+  (magit--with-refresh-cache
+      (cons default-directory 'magit--insert-pushremote-log-p)
+    (not (and (equal (magit-get-push-branch)
+                     (magit-get-upstream-branch))
+              (or (memq 'magit-insert-unpulled-from-upstream
+                        magit-status-sections-hook)
+                  (memq 'magit-insert-unpulled-from-upstream-or-recent
+                        magit-status-sections-hook))))))
+
+(defun magit-log-insert-child-count ()
+  (when magit-section-show-child-count
+    (let ((count (length (oref magit-insert-section--current children))))
+      (when (> count 0)
+        (when (eq count (magit-log-get-commit-limit))
+          (setq count (format "%s+" count)))
+        (save-excursion
+          (goto-char (- (oref magit-insert-section--current content) 2))
+          (insert (format " (%s)" count))
+          (delete-char 1))))))
+
+;;;; Auxiliary Log Sections
+
+(defun magit-insert-unpulled-cherries ()
+  "Insert section showing unpulled commits.
+Like `magit-insert-unpulled-from-upstream' but prefix each commit
+which has not been applied yet (i.e., a commit with a patch-id
+not shared with any local commit) with \"+\", and all others with
+\"-\"."
+  (when (magit-git-success "rev-parse" "@{upstream}")
+    (magit-insert-section (unpulled "..@{upstream}")
+      (magit-insert-heading "Unpulled commits:")
+      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
+        "cherry" "-v" (magit-abbrev-arg)
+        (magit-get-current-branch) "@{upstream}"))))
+
+(defun magit-insert-unpushed-cherries ()
+  "Insert section showing unpushed commits.
+Like `magit-insert-unpushed-to-upstream' 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 \"-\"."
+  (when (magit-git-success "rev-parse" "@{upstream}")
+    (magit-insert-section (unpushed "@{upstream}..")
+      (magit-insert-heading "Unpushed commits:")
+      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
+        "cherry" "-v" (magit-abbrev-arg) "@{upstream}"))))
+
+;;; _
+(provide 'magit-log)
+;;; magit-log.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-log.elc b/emacs/elpa/magit-20240514.1843/magit-log.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-margin.el b/emacs/elpa/magit-20240514.1843/magit-margin.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-margin.elc b/emacs/elpa/magit-20240514.1843/magit-margin.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-merge.el b/emacs/elpa/magit-20240514.1843/magit-merge.el
@@ -0,0 +1,315 @@
+;;; magit-merge.el --- Merge 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 merge commands.
+
+;;; Code:
+
+(require 'magit)
+(require 'magit-diff)
+
+(declare-function magit-git-push "magit-push" (branch target args))
+
+;;; Commands
+
+;;;###autoload (autoload 'magit-merge "magit" nil t)
+(transient-define-prefix magit-merge ()
+  "Merge branches."
+  :man-page "git-merge"
+  :incompatible '(("--ff-only" "--no-ff"))
+  ["Arguments"
+   :if-not magit-merge-in-progress-p
+   ("-f" "Fast-forward only" "--ff-only")
+   ("-n" "No fast-forward"   "--no-ff")
+   (magit-merge:--strategy)
+   (5 magit-merge:--strategy-option)
+   (5 "-b" "Ignore changes in amount of whitespace" "-Xignore-space-change")
+   (5 "-w" "Ignore whitespace when comparing lines" "-Xignore-all-space")
+   (5 magit-diff:--diff-algorithm :argument "-Xdiff-algorithm=")
+   (5 magit:--gpg-sign)]
+  ["Actions"
+   :if-not magit-merge-in-progress-p
+   [("m" "Merge"                  magit-merge-plain)
+    ("e" "Merge and edit message" magit-merge-editmsg)
+    ("n" "Merge but don't commit" magit-merge-nocommit)
+    ("a" "Absorb"                 magit-merge-absorb)]
+   [("p" "Preview merge"          magit-merge-preview)
+    ""
+    ("s" "Squash merge"           magit-merge-squash)
+    ("i" "Dissolve"               magit-merge-into)]]
+  ["Actions"
+   :if magit-merge-in-progress-p
+   ("m" "Commit merge" magit-commit-create)
+   ("a" "Abort merge"  magit-merge-abort)])
+
+(defun magit-merge-arguments ()
+  (transient-args 'magit-merge))
+
+(transient-define-argument magit-merge:--strategy ()
+  :description "Strategy"
+  :class 'transient-option
+  ;; key for merge and rebase: "-s"
+  ;; key for cherry-pick and revert: "=s"
+  ;; shortarg for merge and rebase: "-s"
+  ;; shortarg for cherry-pick and revert: none
+  :key "-s"
+  :argument "--strategy="
+  :choices '("resolve" "recursive" "octopus" "ours" "subtree"))
+
+(transient-define-argument magit-merge:--strategy-option ()
+  :description "Strategy Option"
+  :class 'transient-option
+  :key "-X"
+  :argument "--strategy-option="
+  :choices '("ours" "theirs" "patience"))
+
+;;;###autoload
+(defun magit-merge-plain (rev &optional args nocommit)
+  "Merge commit REV into the current branch; using default message.
+
+Unless there are conflicts or a prefix argument is used create a
+merge commit using a generic commit message and without letting
+the user inspect the result.  With a prefix argument pretend the
+merge failed to give the user the opportunity to inspect the
+merge.
+
+\(git merge --no-edit|--no-commit [ARGS] REV)"
+  (interactive (list (magit-read-other-branch-or-commit "Merge")
+                     (magit-merge-arguments)
+                     current-prefix-arg))
+  (magit-merge-assert)
+  (magit-run-git-async "merge" (if nocommit "--no-commit" "--no-edit") args rev))
+
+;;;###autoload
+(defun magit-merge-editmsg (rev &optional args)
+  "Merge commit REV into the current branch; and edit message.
+Perform the merge and prepare a commit message but let the user
+edit it.
+\n(git merge --edit --no-ff [ARGS] REV)"
+  (interactive (list (magit-read-other-branch-or-commit "Merge")
+                     (magit-merge-arguments)))
+  (magit-merge-assert)
+  (cl-pushnew "--no-ff" args :test #'equal)
+  (apply #'magit-run-git-with-editor "merge" "--edit"
+         (append (delete "--ff-only" args)
+                 (list rev))))
+
+;;;###autoload
+(defun magit-merge-nocommit (rev &optional args)
+  "Merge commit REV into the current branch; pretending it failed.
+Pretend the merge failed to give the user the opportunity to
+inspect the merge and change the commit message.
+\n(git merge --no-commit --no-ff [ARGS] REV)"
+  (interactive (list (magit-read-other-branch-or-commit "Merge")
+                     (magit-merge-arguments)))
+  (magit-merge-assert)
+  (cl-pushnew "--no-ff" args :test #'equal)
+  (magit-run-git-async "merge" "--no-commit" args rev))
+
+;;;###autoload
+(defun magit-merge-into (branch &optional args)
+  "Merge the current branch into BRANCH and remove the former.
+
+Before merging, force push the source branch to its push-remote,
+provided the respective remote branch already exists, ensuring
+that the respective pull-request (if any) won't get stuck on some
+obsolete version of the commits that are being merged.  Finally
+if `forge-branch-pullreq' was used to create the merged branch,
+then also remove the respective remote branch."
+  (interactive
+   (list (magit-read-other-local-branch
+          (format "Merge `%s' into"
+                  (or (magit-get-current-branch)
+                      (magit-rev-parse "HEAD")))
+          nil
+          (and-let* ((upstream (magit-get-upstream-branch))
+                     (upstream (cdr (magit-split-branch-name upstream))))
+            (and (magit-branch-p upstream) upstream)))
+         (magit-merge-arguments)))
+  (let ((current (magit-get-current-branch))
+        (head (magit-rev-parse "HEAD")))
+    (when (zerop (magit-call-git "checkout" branch))
+      (if current
+          (magit--merge-absorb current args)
+        (magit-run-git-with-editor "merge" args head)))))
+
+;;;###autoload
+(defun magit-merge-absorb (branch &optional args)
+  "Merge BRANCH into the current branch and remove the former.
+
+Before merging, force push the source branch to its push-remote,
+provided the respective remote branch already exists, ensuring
+that the respective pull-request (if any) won't get stuck on some
+obsolete version of the commits that are being merged.  Finally
+if `forge-branch-pullreq' was used to create the merged branch,
+then also remove the respective remote branch."
+  (interactive (list (magit-read-other-local-branch "Absorb branch")
+                     (magit-merge-arguments)))
+  (magit--merge-absorb branch args))
+
+(defun magit--merge-absorb (branch args)
+  (when (equal branch (magit-main-branch))
+    (unless (yes-or-no-p
+             (format "Do you really want to merge `%s' into another branch? "
+                     branch))
+      (user-error "Abort")))
+  (if-let ((target (magit-get-push-branch branch t)))
+      (progn
+        (magit-git-push branch target (list "--force-with-lease"))
+        (set-process-sentinel
+         magit-this-process
+         (lambda (process event)
+           (when (memq (process-status process) '(exit signal))
+             (if (not (zerop (process-exit-status process)))
+                 (magit-process-sentinel process event)
+               (process-put process 'inhibit-refresh t)
+               (magit-process-sentinel process event)
+               (magit--merge-absorb-1 branch args))))))
+    (magit--merge-absorb-1 branch args)))
+
+(defun magit--merge-absorb-1 (branch args)
+  (if-let ((pr (magit-get "branch" branch "pullRequest")))
+      (magit-run-git-async
+       "merge" args "-m"
+       (format "Merge branch '%s'%s [#%s]"
+               branch
+               (let ((current (magit-get-current-branch)))
+                 (if (equal current (magit-main-branch))
+                     ""
+                   (format " into %s" current)))
+               pr)
+       branch)
+    (magit-run-git-async "merge" args "--no-edit" branch))
+  (set-process-sentinel
+   magit-this-process
+   (lambda (process event)
+     (when (memq (process-status process) '(exit signal))
+       (if (> (process-exit-status process) 0)
+           (magit-process-sentinel process event)
+         (process-put process 'inhibit-refresh t)
+         (magit-process-sentinel process event)
+         (magit-branch-maybe-delete-pr-remote branch)
+         (magit-branch-unset-pushRemote branch)
+         (magit-run-git "branch" "-D" branch))))))
+
+;;;###autoload
+(defun magit-merge-squash (rev)
+  "Squash commit REV into the current branch; don't create a commit.
+\n(git merge --squash REV)"
+  (interactive (list (magit-read-other-branch-or-commit "Squash")))
+  (magit-merge-assert)
+  (magit-run-git-async "merge" "--squash" rev))
+
+;;;###autoload
+(defun magit-merge-preview (rev)
+  "Preview result of merging REV into the current branch."
+  (interactive (list (magit-read-other-branch-or-commit "Preview merge")))
+  (magit-merge-preview-setup-buffer rev))
+
+;;;###autoload
+(defun magit-merge-abort ()
+  "Abort the current merge operation.
+\n(git merge --abort)"
+  (interactive)
+  (unless (file-exists-p (expand-file-name "MERGE_HEAD" (magit-gitdir)))
+    (user-error "No merge in progress"))
+  (magit-confirm 'abort-merge)
+  (magit-run-git-async "merge" "--abort"))
+
+(defun magit-checkout-stage (file arg)
+  "During a conflict checkout and stage side, or restore conflict."
+  (interactive
+   (let ((file (magit-completing-read "Checkout file"
+                                      (magit-tracked-files) nil nil nil
+                                      'magit-read-file-hist
+                                      (magit-current-file))))
+     (cond ((member file (magit-unmerged-files))
+            (list file (magit-checkout-read-stage file)))
+           ((yes-or-no-p (format "Restore conflicts in %s? " file))
+            (list file "--merge"))
+           (t
+            (user-error "Quit")))))
+  (pcase (cons arg (cddr (car (magit-file-status file))))
+    ((or `("--ours"   ?D ,_)
+         '("--ours"   ?U ?A)
+         `("--theirs" ,_ ?D)
+         '("--theirs" ?A ?U))
+     (magit-run-git "rm" "--" file))
+    (_ (if (equal arg "--merge")
+           ;; This fails if the file was deleted on one
+           ;; side.  And we cannot do anything about it.
+           (magit-run-git "checkout" "--merge" "--" file)
+         (magit-call-git "checkout" arg "--" file)
+         (magit-run-git "add" "-u" "--" file)))))
+
+;;; Utilities
+
+(defun magit-merge-in-progress-p ()
+  (file-exists-p (expand-file-name "MERGE_HEAD" (magit-gitdir))))
+
+(defun magit--merge-range (&optional head)
+  (unless head
+    (setq head (magit-get-shortname
+                (car (magit-file-lines
+                      (expand-file-name "MERGE_HEAD" (magit-gitdir)))))))
+  (and head
+       (concat (magit-git-string "merge-base" "--octopus" "HEAD" head)
+               ".." head)))
+
+(defun magit-merge-assert ()
+  (or (not (magit-anything-modified-p t))
+      (magit-confirm 'merge-dirty
+        "Merging with dirty worktree is risky.  Continue")))
+
+(defun magit-checkout-read-stage (file)
+  (magit-read-char-case (format "For %s checkout: " file) t
+    (?o "[o]ur stage"   "--ours")
+    (?t "[t]heir stage" "--theirs")
+    (?c (if magit-verbose-messages "restore [c]onflict" "[c]onflict")
+        "--merge")))
+
+;;; Sections
+
+(defun 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."
+  (when (magit-merge-in-progress-p)
+    (let* ((heads (mapcar #'magit-get-shortname
+                          (magit-file-lines
+                           (expand-file-name "MERGE_HEAD" (magit-gitdir)))))
+           (range (magit--merge-range (car heads))))
+      (magit-insert-section (unmerged range)
+        (magit-insert-heading
+          (format "Merging %s:" (mapconcat #'identity heads ", ")))
+        (magit--insert-log nil
+          range
+          (let ((args magit-buffer-log-args))
+            (unless (member "--decorate=full" magit-buffer-log-args)
+              (push "--decorate=full" args))
+            args))))))
+
+;;; _
+(provide 'magit-merge)
+;;; magit-merge.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-merge.elc b/emacs/elpa/magit-20240514.1843/magit-merge.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-mode.el b/emacs/elpa/magit-20240514.1843/magit-mode.el
@@ -0,0 +1,1467 @@
+;;; magit-mode.el --- Create and refresh Magit buffers  -*- 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 the abstract major-mode `magit-mode' from
+;; which almost all other Magit major-modes derive.  The code in here
+;; is mostly concerned with creating and refreshing Magit buffers.
+
+;;; Code:
+
+(require 'magit-base)
+(require 'magit-git)
+
+(require 'browse-url)
+(require 'format-spec)
+(require 'help-mode)
+
+(require 'transient)
+
+(defvar bookmark-make-record-function)
+(defvar magit--wip-inhibit-autosave)
+(defvar magit-wip-after-save-local-mode)
+(declare-function magit-wip-get-ref "magit-wip" ())
+(declare-function magit-wip-commit-worktree "magit-wip" (ref files msg))
+
+;;; Options
+
+(defcustom magit-mode-hook
+  '(magit-load-config-extensions)
+  "Hook run when entering a mode derived from Magit mode."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-modes
+  :type 'hook
+  :options '(magit-load-config-extensions
+             bug-reference-mode))
+
+(defcustom magit-setup-buffer-hook
+  '(magit-maybe-save-repository-buffers
+    magit-set-buffer-margin)
+  "Hook run by `magit-setup-buffer'.
+
+This is run right after displaying the buffer and right before
+generating or updating its content.  `magit-mode-hook' and other,
+more specific, `magit-mode-*-hook's on the other hand are run
+right before displaying the buffer.  Usually one of these hooks
+should be used instead of this one."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-modes
+  :type 'hook
+  :options '(magit-maybe-save-repository-buffers
+             magit-set-buffer-margin))
+
+(defcustom magit-pre-refresh-hook '(magit-maybe-save-repository-buffers)
+  "Hook run before refreshing in `magit-refresh'.
+
+This hook, or `magit-post-refresh-hook', should be used
+for functions that are not tied to a particular buffer.
+
+To run a function with a particular buffer current, use
+`magit-refresh-buffer-hook' and use `derived-mode-p'
+inside your function."
+  :package-version '(magit . "2.4.0")
+  :group 'magit-refresh
+  :type 'hook
+  :options '(magit-maybe-save-repository-buffers))
+
+(defcustom magit-post-refresh-hook
+  '(magit-auto-revert-buffers
+    magit-run-post-commit-hook
+    magit-run-post-stage-hook
+    magit-run-post-unstage-hook)
+  "Hook run after refreshing in `magit-refresh'.
+
+This hook, or `magit-pre-refresh-hook', should be used
+for functions that are not tied to a particular buffer.
+
+To run a function with a particular buffer current, use
+`magit-refresh-buffer-hook' and use `derived-mode-p'
+inside your function."
+  :package-version '(magit . "2.4.0")
+  :group 'magit-refresh
+  :type 'hook
+  :options '(magit-auto-revert-buffers
+             magit-run-post-commit-hook
+             magit-run-post-stage-hook
+             magit-run-post-unstage-hook))
+
+(defcustom magit-display-buffer-function #'magit-display-buffer-traditional
+  "The function used to display a Magit buffer.
+
+All Magit buffers (buffers whose major-modes derive from
+`magit-mode') are displayed using `magit-display-buffer',
+which in turn uses the function specified here."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-buffers
+  :type '(radio (function-item magit-display-buffer-traditional)
+                (function-item magit-display-buffer-same-window-except-diff-v1)
+                (function-item magit-display-buffer-fullframe-status-v1)
+                (function-item magit-display-buffer-fullframe-status-topleft-v1)
+                (function-item magit-display-buffer-fullcolumn-most-v1)
+                (function-item display-buffer)
+                (function :tag "Function")))
+
+(defcustom magit-pre-display-buffer-hook '(magit-save-window-configuration)
+  "Hook run by `magit-display-buffer' before displaying the buffer."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-buffers
+  :type 'hook
+  :get #'magit-hook-custom-get
+  :options '(magit-save-window-configuration))
+
+(defcustom magit-post-display-buffer-hook '(magit-maybe-set-dedicated)
+  "Hook run by `magit-display-buffer' after displaying the buffer."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-buffers
+  :type 'hook
+  :get #'magit-hook-custom-get
+  :options '(magit-maybe-set-dedicated))
+
+(defcustom magit-generate-buffer-name-function
+  #'magit-generate-buffer-name-default-function
+  "The function used to generate the name for a Magit buffer."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-buffers
+  :type '(radio (function-item magit-generate-buffer-name-default-function)
+                (function :tag "Function")))
+
+(defcustom magit-buffer-name-format "%x%M%v: %t%x"
+  "The format string used to name Magit buffers.
+
+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.
+
+This is used by `magit-generate-buffer-name-default-function'.
+If another `magit-generate-buffer-name-function' is used, then
+it may not respect this option, or on the contrary it may
+support additional %-sequences."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-buffers
+  :type 'string)
+
+(defcustom magit-uniquify-buffer-names t
+  "Whether to uniquify the names of Magit buffers."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-buffers
+  :type 'boolean)
+
+(defcustom magit-bury-buffer-function #'magit-mode-quit-window
+  "The function used to bury or kill the current Magit buffer."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-buffers
+  :type '(radio (function-item quit-window)
+                (function-item magit-mode-quit-window)
+                (function-item magit-restore-window-configuration)
+                (function :tag "Function")))
+
+(defcustom magit-prefix-use-buffer-arguments 'selected
+  "Whether certain prefix commands reuse arguments active in relevant buffer.
+
+This affects the transient prefix commands `magit-diff',
+`magit-log' and `magit-show-refs'.
+
+Valid values are:
+
+`always': Always use the set of arguments that is currently
+  active in the respective buffer, provided that buffer exists
+  of course.
+`selected': 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.
+`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.
+
+For more information see info node `(magit)Transient Arguments
+and Buffer Variables'."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-buffers
+  :group 'magit-commands
+  :group 'magit-diff
+  :group 'magit-log
+  :type '(choice
+          (const :tag "always use args from buffer" always)
+          (const :tag "use args from buffer if displayed in frame" selected)
+          (const :tag "use args from buffer if it is current" current)
+          (const :tag "never use args from buffer" never)))
+
+(defcustom magit-direct-use-buffer-arguments 'selected
+  "Whether certain commands reuse arguments active in relevant buffer.
+
+This affects certain commands such as `magit-show-commit' that
+are suffixes of the diff or log transient prefix commands, but
+only if they are invoked directly, i.e., *not* as a suffix.
+
+Valid values are:
+
+`always': Always use the set of arguments that is currently
+  active in the respective buffer, provided that buffer exists
+  of course.
+`selected': 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.
+`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.
+
+For more information see info node `(magit)Transient Arguments
+and Buffer Variables'."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-buffers
+  :group 'magit-commands
+  :group 'magit-diff
+  :group 'magit-log
+  :type '(choice
+          (const :tag "always use args from buffer" always)
+          (const :tag "use args from buffer if displayed in frame" selected)
+          (const :tag "use args from buffer if it is current" current)
+          (const :tag "never use args from buffer" never)))
+
+(defcustom magit-region-highlight-hook '(magit-diff-update-hunk-region)
+  "Functions used to highlight the region.
+
+Each function is run with the current section as only argument
+until one of them returns non-nil.  If all functions return nil,
+then fall back to regular region highlighting."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refresh
+  :type 'hook
+  :options '(magit-diff-update-hunk-region))
+
+(defcustom magit-create-buffer-hook nil
+  "Normal hook run while creating a new `magit-mode' buffer.
+Runs before the buffer is populated with sections.  Also see
+`magit-post-create-buffer-hook'."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-refresh
+  :type 'hook)
+
+(defcustom magit-post-create-buffer-hook nil
+  "Normal hook run after creating a new `magit-mode' buffer.
+Runs after the buffer is populated with sections for the first
+time.  Also see `magit-create-buffer-hook' (which runs earlier)
+and `magit-refresh-buffer-hook' (which runs on every refresh)."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-refresh
+  :type 'hook)
+
+(defcustom magit-refresh-buffer-hook nil
+  "Normal hook for `magit-refresh-buffer' to run after refreshing."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refresh
+  :type 'hook)
+
+(defcustom magit-refresh-status-buffer t
+  "Whether the status buffer is refreshed after running git.
+
+When this 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."
+  :package-version '(magit . "2.4.0")
+  :group 'magit-refresh
+  :group 'magit-status
+  :type 'boolean)
+
+(defcustom magit-refresh-verbose nil
+  "Whether to revert Magit buffers verbosely."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refresh
+  :type 'boolean)
+
+(defcustom magit-save-repository-buffers t
+  "Whether to save file-visiting buffers when appropriate.
+
+If non-nil, then all modified file-visiting buffers belonging
+to the current repository may be saved before running Magit
+commands and before creating or refreshing Magit buffers.
+If `dontask', then this is done without user intervention, for
+any other non-nil value the user has to confirm each save.
+
+The default is t to avoid surprises, but `dontask' is the
+recommended value."
+  :group 'magit-essentials
+  :group 'magit-buffers
+  :type '(choice (const :tag "Never" nil)
+                 (const :tag "Ask" t)
+                 (const :tag "Save without asking" dontask)))
+
+;;; Key Bindings
+
+(defvar-keymap magit-mode-map
+  :doc "Parent keymap for all keymaps of modes derived from `magit-mode'."
+  :parent magit-section-mode-map
+  ;; Don't function-quote but make sure all commands are autoloaded.
+  "C-<return>"  'magit-visit-thing
+  "RET"         'magit-visit-thing
+  "M-TAB"       'magit-dired-jump
+  "M-<tab>"     'magit-section-cycle-diffs
+  "SPC"         'magit-diff-show-or-scroll-up
+  "S-SPC"       'magit-diff-show-or-scroll-down
+  "DEL"         'magit-diff-show-or-scroll-down
+  "+"           'magit-diff-more-context
+  "-"           'magit-diff-less-context
+  "0"           'magit-diff-default-context
+  "a" 'magit-cherry-apply
+  "A" 'magit-cherry-pick
+  "b" 'magit-branch
+  "B" 'magit-bisect
+  "c" 'magit-commit
+  "C" 'magit-clone
+  "d" 'magit-diff
+  "D" 'magit-diff-refresh
+  "e" 'magit-ediff-dwim
+  "E" 'magit-ediff
+  "f" 'magit-fetch
+  "F" 'magit-pull
+  "g" 'magit-refresh
+  "G" 'magit-refresh-all
+  "h" 'magit-dispatch
+  "?" 'magit-dispatch
+  "H" 'magit-describe-section
+  "i" 'magit-gitignore
+  "I" 'magit-init
+  "j" 'magit-status-quick
+  "J" 'magit-display-repository-buffer
+  "k" 'magit-delete-thing
+  "K" 'magit-file-untrack
+  "l" 'magit-log
+  "L" 'magit-log-refresh
+  "m" 'magit-merge
+  "M" 'magit-remote
+  ;; "n" magit-section-forward in magit-section-mode-map
+  ;; "N" forge-dispatch, added by forge package
+  "o" 'magit-submodule
+  "O" 'magit-subtree
+  ;; "p" magit-section-backward in magit-section-mode-map
+  "P" 'magit-push
+  "q" 'magit-mode-bury-buffer
+  "Q" 'magit-git-command
+  ":" 'magit-git-command
+  "r" 'magit-rebase
+  "R" 'magit-file-rename
+  "s" 'magit-stage-file
+  "S" 'magit-stage-modified
+  "t" 'magit-tag
+  "T" 'magit-notes
+  "u" 'magit-unstage-file
+  "U" 'magit-unstage-all
+  "v" 'magit-revert-no-commit
+  "V" 'magit-revert
+  "w" 'magit-am
+  "W" 'magit-patch
+  "x" 'magit-reset-quickly
+  "X" 'magit-reset
+  "y" 'magit-show-refs
+  "Y" 'magit-cherry
+  "z" 'magit-stash
+  "Z" 'magit-worktree
+  "%" 'magit-worktree
+  "$" 'magit-process-buffer
+  "!" 'magit-run
+  ">" 'magit-sparse-checkout
+  "C-c C-c" 'magit-dispatch
+  "C-c C-e" 'magit-edit-thing
+  "C-c C-o" 'magit-browse-thing
+  "C-c C-w" 'magit-copy-thing
+  "C-w"     'magit-copy-section-value
+  "M-w"     'magit-copy-buffer-revision
+  "<remap> <previous-line>"      'magit-previous-line
+  "<remap> <next-line>"          'magit-next-line
+  "<remap> <evil-previous-line>" 'evil-previous-visual-line
+  "<remap> <evil-next-line>"     'evil-next-visual-line)
+
+(defun magit-delete-thing ()
+  "This is a placeholder command, which signals an error if called.
+Where applicable, other keymaps remap this command to another,
+which actually deletes the thing at point."
+  (interactive)
+  (user-error "There is no thing at point that could be deleted"))
+;; Starting with Emacs 28.1 we could use (declare (completion ignore)).
+(put 'magit-delete-thing 'completion-predicate #'ignore)
+
+(defun magit-visit-thing ()
+  "This is a placeholder command, which may signal an error if called.
+Where applicable, other keymaps remap this command to another,
+which actually visits the thing at point."
+  (interactive)
+  (if (eq transient-current-command 'magit-dispatch)
+      (call-interactively (key-binding (this-command-keys)))
+    (if-let ((url (browse-url-url-at-point)))
+        (browse-url url)
+      (user-error "There is no thing at point that could be visited"))))
+(put 'magit-visit-thing 'completion-predicate #'ignore)
+
+(defun magit-edit-thing ()
+  "This is a placeholder command, which may signal an error if called.
+Where applicable, other keymaps remap this command to another,
+which actually lets you edit the thing at point, likely in another
+buffer."
+  (interactive)
+  (if (eq transient-current-command 'magit-dispatch)
+      (call-interactively (key-binding (this-command-keys)))
+    (user-error "There is no thing at point that could be edited")))
+(put 'magit-edit-thing 'completion-predicate #'ignore)
+
+(defun magit-browse-thing ()
+  "This is a placeholder command, which may signal an error if called.
+Where applicable, other keymaps remap this command to another,
+which actually visits thing at point using `browse-url'."
+  (interactive)
+  (if-let ((url (browse-url-url-at-point)))
+      (browse-url url)
+    (user-error "There is no thing at point that could be browsed")))
+(put 'magit-browse-thing 'completion-predicate #'ignore)
+
+(defun magit-copy-thing ()
+  "This is a placeholder command, which signals an error if called.
+Where applicable, other keymaps remap this command to another,
+which actually copies some representation of the thing at point
+to the kill ring."
+  (interactive)
+  (user-error "There is no thing at point that we know how to copy"))
+(put 'magit-copy-thing 'completion-predicate #'ignore)
+
+;;;###autoload
+(defun magit-info ()
+  "Visit the Magit manual."
+  (interactive)
+  (info "magit"))
+
+(defvar bug-reference-map)
+(with-eval-after-load 'bug-reference
+  (keymap-set bug-reference-map "<remap> <magit-visit-thing>"
+              'bug-reference-push-button))
+
+(easy-menu-define magit-mode-menu magit-mode-map
+  "Magit menu"
+  ;; Similar to `magit-dispatch' but exclude:
+  ;; - commands that are available from context menus:
+  ;;   apply, reverse, discard, stage, unstage,
+  ;;   cherry-pick, revert, reset,
+  ;;   describe-section
+  ;; - commands that are available from submenus:
+  ;;   git-command, ediff-dwim
+  ;; - and: refresh-all, status-jump, status-quick.
+  '("Magit"
+    "---" "Inspect"
+    ["     Bisect..."             magit-bisect t]
+    ["     Cherries..."           magit-cherry t]
+    ["     Diff..."               magit-diff t]
+    ["     Ediff..."              magit-ediff t]
+    ["     Log..."                magit-log t]
+    ["     References..."         magit-show-refs t]
+    "---" "Manipulate"
+    ["     Commit..."             magit-commit t]
+    ["     Stash..."              magit-stash t]
+    ["     Tag..."                magit-tag t]
+    "---"
+    ["     Branch..."             magit-branch t]
+    ["     Remote..."             magit-remote t]
+    "---"
+    ["     Merge..."              magit-merge t]
+    ["     Rebase..."             magit-rebase t]
+    "---" "Transfer"
+    ["     Fetch..."              magit-fetch t]
+    ["     Pull..."               magit-pull t]
+    ["     Push..."               magit-push t]
+    "---" "Setup"
+    ["     Clone..."              magit-clone t]
+    ["     Ignore..."             magit-gitignore t]
+    ["     Init..."               magit-init t]
+    "---"
+    ("Advanced"
+     ["Run..."                    magit-run t]
+     "---"
+     ["Apply patches..."          magit-am t]
+     ["Format patches..."         magit-patch t]
+     "---"
+     ["Note..."                   magit-notes t]
+     "---"
+     ["Submodule..."              magit-submodule t]
+     ["Subtree..."                magit-subtree t]
+     ["Worktree..."               magit-worktree t])
+    "---"
+    ["Show command dispatcher..." magit-dispatch t]
+    ["Show manual"                magit-info t]
+    ["Show another buffer"        magit-display-repository-buffer t]
+    "---"
+    ("Change buffer arguments"
+     ["Diff arguments"            magit-diff-refresh t]
+     ["Log arguments"             magit-log-refresh t])
+    ["Refresh buffer"             magit-refresh t]
+    ["Bury buffer"                magit-mode-bury-buffer t]))
+
+;;; Mode
+
+(defun magit-load-config-extensions ()
+  "Load Magit extensions that are defined at the Git config layer."
+  (dolist (ext (magit-get-all "magit.extension"))
+    (let ((sym (intern (format "magit-%s-mode" ext))))
+      (when (fboundp sym)
+        (funcall sym 1)))))
+
+(define-derived-mode magit-mode magit-section-mode "Magit"
+  "Parent major mode from which Magit major modes inherit.
+
+Magit is documented in info node `(magit)'."
+  :group 'magit
+  (hack-dir-local-variables-non-file-buffer)
+  (face-remap-add-relative 'header-line 'magit-header-line)
+  (setq mode-line-process (magit-repository-local-get 'mode-line-process))
+  (setq-local revert-buffer-function #'magit-refresh-buffer)
+  (setq-local bookmark-make-record-function #'magit--make-bookmark)
+  (setq-local imenu-create-index-function #'magit--imenu-create-index)
+  (setq-local imenu-default-goto-function #'magit--imenu-goto-function)
+  (setq-local isearch-filter-predicate #'magit-section--open-temporarily))
+
+;;; Local Variables
+
+(defvar-local magit-buffer-arguments nil)
+(defvar-local magit-buffer-diff-type nil)
+(defvar-local magit-buffer-diff-args nil)
+(defvar-local magit-buffer-diff-files nil)
+(defvar-local magit-buffer-diff-files-suspended nil)
+(defvar-local magit-buffer-file-name nil)
+(defvar-local magit-buffer-files nil)
+(defvar-local magit-buffer-log-args nil)
+(defvar-local magit-buffer-log-files nil)
+(defvar-local magit-buffer-range nil)
+(defvar-local magit-buffer-range-hashed nil)
+(defvar-local magit-buffer-refname nil)
+(defvar-local magit-buffer-revision nil)
+(defvar-local magit-buffer-revision-hash nil)
+(defvar-local magit-buffer-revisions nil)
+(defvar-local magit-buffer-typearg nil)
+(defvar-local magit-buffer-upstream nil)
+
+;; These variables are also used in file-visiting buffers.
+;; Because the user may change the major-mode, they have
+;; to be permanent buffer-local.
+(put 'magit-buffer-file-name 'permanent-local t)
+(put 'magit-buffer-refname 'permanent-local t)
+(put 'magit-buffer-revision 'permanent-local t)
+(put 'magit-buffer-revision-hash 'permanent-local t)
+
+;; `magit-status' re-enables mode function but its refresher
+;; function does not reinstate this.
+(put 'magit-buffer-diff-files-suspended 'permanent-local t)
+
+(cl-defgeneric magit-buffer-value ()
+  "Return the value of the current buffer.
+The \"value\" identifies what is being displayed in the buffer.
+The buffer's major-mode should derive from `magit-section-mode'."
+  nil)
+
+(defvar-local magit-previous-section nil)
+(put 'magit-previous-section 'permanent-local t)
+
+;;; Setup Buffer
+
+(defmacro magit-setup-buffer (mode &optional locked &rest bindings)
+  (declare (indent 2))
+  `(magit-setup-buffer-internal
+    ,mode ,locked
+    ,(cons 'list (mapcar (pcase-lambda (`(,var ,form))
+                           `(list ',var ,form))
+                         bindings))))
+
+(defun magit-setup-buffer-internal ( mode locked bindings
+                                     &optional buffer-or-name)
+  (let* ((value   (and locked
+                       (with-temp-buffer
+                         (pcase-dolist (`(,var ,val) bindings)
+                           (set (make-local-variable var) val))
+                         (let ((major-mode mode))
+                           (magit-buffer-value)))))
+         (buffer  (if buffer-or-name
+                      (get-buffer-create buffer-or-name)
+                    (magit-get-mode-buffer mode value)))
+         (section (and buffer (magit-current-section)))
+         (created (not buffer)))
+    (unless buffer
+      (setq buffer (magit-generate-new-buffer mode value)))
+    (with-current-buffer buffer
+      (setq magit-previous-section section)
+      (funcall mode)
+      (magit-xref-setup #'magit-setup-buffer-internal bindings)
+      (pcase-dolist (`(,var ,val) bindings)
+        (set (make-local-variable var) val))
+      (when created
+        (run-hooks 'magit-create-buffer-hook)))
+    (magit-display-buffer buffer)
+    (with-current-buffer buffer
+      (run-hooks 'magit-setup-buffer-hook)
+      (magit-refresh-buffer)
+      (when created
+        (run-hooks 'magit-post-create-buffer-hook)))
+    buffer))
+
+;;; Display Buffer
+
+(defvar magit-display-buffer-noselect nil
+  "If non-nil, then `magit-display-buffer' doesn't call `select-window'.")
+
+(defun magit-display-buffer (buffer &optional display-function)
+  "Display BUFFER in some window and maybe select it.
+
+If optional DISPLAY-FUNCTION is non-nil, then use that to display
+the buffer.  Otherwise use `magit-display-buffer-function', which
+is the normal case.
+
+Then, unless `magit-display-buffer-noselect' is non-nil, select
+the window which was used to display the buffer.
+
+Also run the hooks `magit-pre-display-buffer-hook'
+and `magit-post-display-buffer-hook'."
+  (with-current-buffer buffer
+    (run-hooks 'magit-pre-display-buffer-hook))
+  (let ((window (funcall (or display-function magit-display-buffer-function)
+                         buffer)))
+    (unless magit-display-buffer-noselect
+      (let* ((old-frame (selected-frame))
+             (new-frame (window-frame window)))
+        (select-window window)
+        (unless (eq old-frame new-frame)
+          (select-frame-set-input-focus new-frame)))))
+  (with-current-buffer buffer
+    (run-hooks 'magit-post-display-buffer-hook)))
+
+(defun magit-display-buffer-traditional (buffer)
+  "Display BUFFER the way this has traditionally been done."
+  (display-buffer
+   buffer (if (and (derived-mode-p 'magit-mode)
+                   (not (memq (with-current-buffer buffer major-mode)
+                              '(magit-process-mode
+                                magit-revision-mode
+                                magit-diff-mode
+                                magit-stash-mode
+                                magit-status-mode))))
+              '(display-buffer-same-window)
+            nil))) ; display in another window
+
+(defun magit-display-buffer-same-window-except-diff-v1 (buffer)
+  "Display BUFFER in the selected window except for some modes.
+If a buffer's `major-mode' derives from `magit-diff-mode' or
+`magit-process-mode', display it in another window.  Display all
+other buffers in the selected window."
+  (display-buffer
+   buffer (if (with-current-buffer buffer
+                (derived-mode-p 'magit-diff-mode 'magit-process-mode))
+              '(nil (inhibit-same-window . t))
+            '(display-buffer-same-window))))
+
+(defun magit--display-buffer-fullframe (buffer alist)
+  (when-let ((window (or (display-buffer-reuse-window buffer alist)
+                         (display-buffer-same-window buffer alist)
+                         (display-buffer-pop-up-window buffer alist)
+                         (display-buffer-use-some-window buffer alist))))
+    (delete-other-windows window)
+    window))
+
+(defun magit-display-buffer-fullframe-status-v1 (buffer)
+  "Display BUFFER, filling entire frame if BUFFER is a status buffer.
+Otherwise, behave like `magit-display-buffer-traditional'."
+  (if (eq (with-current-buffer buffer major-mode)
+          'magit-status-mode)
+      (display-buffer buffer '(magit--display-buffer-fullframe))
+    (magit-display-buffer-traditional buffer)))
+
+(defun magit--display-buffer-topleft (buffer alist)
+  (or (display-buffer-reuse-window buffer alist)
+      (when-let ((window2 (display-buffer-pop-up-window buffer alist)))
+        (let ((window1 (get-buffer-window))
+              (buffer1 (current-buffer))
+              (buffer2 (window-buffer window2))
+              (w2-quit-restore (window-parameter window2 'quit-restore)))
+          (set-window-buffer window1 buffer2)
+          (set-window-buffer window2 buffer1)
+          (select-window window2)
+          ;; Swap some window state that `magit-mode-quit-window' and
+          ;; `quit-restore-window' inspect.
+          (set-window-prev-buffers window2 (cdr (window-prev-buffers window1)))
+          (set-window-prev-buffers window1 nil)
+          (set-window-parameter window2 'magit-dedicated
+                                (window-parameter window1 'magit-dedicated))
+          (set-window-parameter window1 'magit-dedicated t)
+          (set-window-parameter window1 'quit-restore
+                                (list 'window 'window
+                                      (nth 2 w2-quit-restore)
+                                      (nth 3 w2-quit-restore)))
+          (set-window-parameter window2 'quit-restore nil)
+          window1))))
+
+(defun magit-display-buffer-fullframe-status-topleft-v1 (buffer)
+  "Display BUFFER, filling entire frame if BUFFER is a status buffer.
+When BUFFER derives from `magit-diff-mode' or
+`magit-process-mode', try to display BUFFER to the top or left of
+the current buffer rather than to the bottom or right, as
+`magit-display-buffer-fullframe-status-v1' would.  Whether the
+split is made vertically or horizontally is determined by
+`split-window-preferred-function'."
+  (display-buffer
+   buffer
+   (cond ((eq (with-current-buffer buffer major-mode)
+              'magit-status-mode)
+          '(magit--display-buffer-fullframe))
+         ((with-current-buffer buffer
+            (derived-mode-p 'magit-diff-mode 'magit-process-mode))
+          '(magit--display-buffer-topleft))
+         (t
+          '(display-buffer-same-window)))))
+
+(defun magit--display-buffer-fullcolumn (buffer alist)
+  (when-let ((window (or (display-buffer-reuse-window buffer alist)
+                         (display-buffer-same-window buffer alist)
+                         (display-buffer-below-selected buffer alist))))
+    (delete-other-windows-vertically window)
+    window))
+
+(defun magit-display-buffer-fullcolumn-most-v1 (buffer)
+  "Display BUFFER using the full column except in some cases.
+For most cases where BUFFER's `major-mode' derives from
+`magit-mode', display it in the selected window and grow that
+window to the full height of the frame, deleting other windows in
+that column as necessary.  However, display BUFFER in another
+window if 1) BUFFER's mode derives from `magit-process-mode', or
+2) 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'."
+  (display-buffer
+   buffer
+   (cond ((and (or (bound-and-true-p git-commit-mode)
+                   (derived-mode-p 'magit-log-mode
+                                   'magit-cherry-mode
+                                   'magit-reflog-mode))
+               (with-current-buffer buffer
+                 (derived-mode-p 'magit-diff-mode)))
+          nil)
+         ((with-current-buffer buffer
+            (derived-mode-p 'magit-process-mode))
+          nil)
+         (t
+          '(magit--display-buffer-fullcolumn)))))
+
+(defun magit-maybe-set-dedicated ()
+  "Mark the selected window as dedicated if appropriate.
+
+If a new window was created to display the buffer, then remember
+that fact.  That information is used by `magit-mode-quit-window',
+to determine whether the window should be deleted when its last
+Magit buffer is buried."
+  (let ((window (get-buffer-window (current-buffer))))
+    (when (and (window-live-p window)
+               (not (window-prev-buffers window)))
+      (set-window-parameter window 'magit-dedicated t))))
+
+;;; Get Buffer
+
+(defvar-local magit--default-directory nil
+  "Value of `default-directory' when buffer is generated.
+This exists to prevent a let-bound `default-directory' from
+tricking `magit-get-mode-buffer' or `magit-mode-get-buffers'
+into thinking a buffer belongs to a repo that it doesn't.")
+(put 'magit--default-directory 'permanent-local t)
+
+(defun magit-mode-get-buffers ()
+  (let ((topdir (magit-toplevel)))
+    (--filter (with-current-buffer it
+                (and (derived-mode-p 'magit-mode)
+                     (equal magit--default-directory topdir)))
+              (buffer-list))))
+
+(defvar-local magit-buffer-locked-p nil)
+(put 'magit-buffer-locked-p 'permanent-local t)
+
+(defun magit-get-mode-buffer (mode &optional value frame)
+  "Return buffer belonging to the current repository whose major-mode is MODE.
+
+If no such buffer exists then return nil.  Multiple buffers with
+the same major-mode may exist for a repository but only one can
+exist that hasn't been locked to its value.  Return that buffer
+\(or nil if there is no such buffer) unless VALUE is non-nil, in
+which case return the buffer that has been locked to that value.
+
+If FRAME is nil or omitted, then consider all buffers.  Otherwise
+  only consider buffers that are displayed in some live window
+  on some frame.
+If `all', then consider all buffers on all frames.
+If `visible', then only consider buffers on all visible frames.
+If `selected' or t, then only consider buffers on the selected
+  frame.
+If a frame, then only consider buffers on that frame."
+  (let ((topdir (magit--toplevel-safe)))
+    (cl-flet* ((b (buffer)
+                 (with-current-buffer buffer
+                   (and (eq major-mode mode)
+                        (equal magit--default-directory topdir)
+                        (if value
+                            (and magit-buffer-locked-p
+                                 (equal (magit-buffer-value) value))
+                          (not magit-buffer-locked-p))
+                        buffer)))
+               (w (window)
+                 (b (window-buffer window)))
+               (f (frame)
+                 (seq-some #'w (window-list frame 'no-minibuf))))
+      (pcase-exhaustive frame
+        ('nil                   (seq-some #'b (buffer-list)))
+        ('all                   (seq-some #'f (frame-list)))
+        ('visible               (seq-some #'f (visible-frame-list)))
+        ((or 'selected 't)      (seq-some #'w (window-list (selected-frame))))
+        ((guard (framep frame)) (seq-some #'w (window-list frame)))))))
+
+(defun magit-generate-new-buffer (mode &optional value directory)
+  (let* ((default-directory (or directory (magit--toplevel-safe)))
+         (name (funcall magit-generate-buffer-name-function mode value))
+         (buffer (generate-new-buffer name)))
+    (with-current-buffer buffer
+      (setq magit--default-directory default-directory)
+      (setq magit-buffer-locked-p (and value t))
+      (magit-restore-section-visibility-cache mode))
+    (when magit-uniquify-buffer-names
+      (add-to-list 'uniquify-list-buffers-directory-modes mode)
+      (with-current-buffer buffer
+        (setq list-buffers-directory (abbreviate-file-name default-directory)))
+      (let ((uniquify-buffer-name-style
+             (if (memq uniquify-buffer-name-style '(nil forward))
+                 'post-forward-angle-brackets
+               uniquify-buffer-name-style)))
+        (uniquify-rationalize-file-buffer-names
+         name (file-name-directory (directory-file-name default-directory))
+         buffer)))
+    buffer))
+
+(defun magit-generate-buffer-name-default-function (mode &optional value)
+  "Generate buffer name for a MODE buffer in the current repository.
+The returned name is based on `magit-buffer-name-format' and
+takes `magit-uniquify-buffer-names' and VALUE, if non-nil, into
+account."
+  (let ((m (substring (symbol-name mode) 0 -5))
+        (v (and value (format "%s" (if (listp value) value (list value)))))
+        (n (if magit-uniquify-buffer-names
+               (file-name-nondirectory
+                (directory-file-name default-directory))
+             (abbreviate-file-name default-directory))))
+    (format-spec
+     magit-buffer-name-format
+     `((?m . ,m)
+       (?M . ,(if (eq mode 'magit-status-mode) "magit" m))
+       (?v . ,(or v ""))
+       (?V . ,(if v (concat " " v) ""))
+       (?t . ,n)
+       (?x . ,(if magit-uniquify-buffer-names "" "*"))))))
+
+;;; Buffer Lock
+
+(defun magit-toggle-buffer-lock ()
+  "Lock the current buffer to its value or unlock 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."
+  (interactive)
+  (if magit-buffer-locked-p
+      (if-let ((unlocked (magit-get-mode-buffer major-mode)))
+          (let ((locked (current-buffer)))
+            (switch-to-buffer unlocked nil t)
+            (kill-buffer locked))
+        (setq magit-buffer-locked-p nil)
+        (rename-buffer (funcall magit-generate-buffer-name-function
+                                major-mode)))
+    (if-let ((value (magit-buffer-value)))
+        (if-let ((locked (magit-get-mode-buffer major-mode value)))
+            (let ((unlocked (current-buffer)))
+              (switch-to-buffer locked nil t)
+              (kill-buffer unlocked))
+          (setq magit-buffer-locked-p t)
+          (rename-buffer (funcall magit-generate-buffer-name-function
+                                  major-mode value)))
+      (user-error "Buffer has no value it could be locked to"))))
+
+;;; Bury Buffer
+
+(defun magit-mode-bury-buffer (&optional kill-buffer)
+  "Bury or kill the current buffer.
+
+Use `magit-bury-buffer-function' to bury the buffer when called
+without a prefix argument or to kill it when called with a single
+prefix argument.
+
+With two prefix arguments, always kill the current and all other
+Magit buffers, associated with this repository."
+  (interactive "P")
+  (if (>= (prefix-numeric-value kill-buffer) 16)
+      (mapc #'kill-buffer (magit-mode-get-buffers))
+    (funcall magit-bury-buffer-function kill-buffer)))
+
+(defun magit-mode-quit-window (kill-buffer)
+  "Quit the selected window and bury its buffer.
+
+This behaves similar to `quit-window', but when the window
+was originally created to display a Magit buffer and the
+current buffer is the last remaining Magit buffer that was
+ever displayed in the selected window, then delete that
+window."
+  (if (or (one-window-p)
+          (--first (let ((buffer (car it)))
+                     (and (not (eq buffer (current-buffer)))
+                          (buffer-live-p buffer)
+                          (or (not (window-parameter nil 'magit-dedicated))
+                              (with-current-buffer buffer
+                                (derived-mode-p 'magit-mode
+                                                'magit-process-mode)))))
+                   (window-prev-buffers)))
+      (quit-window kill-buffer)
+    (let ((window (selected-window)))
+      (quit-window kill-buffer)
+      (when (window-live-p window)
+        (delete-window window)))))
+
+;;; Refresh Buffers
+
+(defvar magit-inhibit-refresh nil)
+
+(defun magit-refresh ()
+  "Refresh some buffers belonging to the current repository.
+
+Refresh the current buffer if its major mode derives from
+`magit-mode', and refresh the corresponding status buffer.
+
+Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
+  (interactive)
+  (unless magit-inhibit-refresh
+    (unwind-protect
+        (let ((start (current-time))
+              (magit--refresh-cache (or magit--refresh-cache
+                                        (list (cons 0 0)))))
+          (when magit-refresh-verbose
+            (message "Refreshing magit..."))
+          (magit-run-hook-with-benchmark 'magit-pre-refresh-hook)
+          (cond ((derived-mode-p 'magit-mode)
+                 (magit-refresh-buffer))
+                ((derived-mode-p 'tabulated-list-mode)
+                 (revert-buffer)))
+          (when-let ((buffer (and magit-refresh-status-buffer
+                                  (not (derived-mode-p 'magit-status-mode))
+                                  (magit-get-mode-buffer 'magit-status-mode))))
+            (with-current-buffer buffer
+              (magit-refresh-buffer)))
+          (magit-run-hook-with-benchmark 'magit-post-refresh-hook)
+          (when magit-refresh-verbose
+            (let* ((c (caar magit--refresh-cache))
+                   (a (+ c (cdar magit--refresh-cache))))
+              (message "Refreshing magit...done (%.3fs, cached %s/%s (%.0f%%))"
+                       (float-time (time-subtract (current-time) start))
+                       c a (* (/ c (* a 1.0)) 100)))))
+      (run-hooks 'magit-unwind-refresh-hook))))
+
+(defun magit-refresh-all ()
+  "Refresh all buffers belonging to the current repository.
+
+Refresh all Magit buffers belonging to the current repository,
+and revert buffers that visit files located inside the current
+repository.
+
+Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
+  (interactive)
+  (magit-run-hook-with-benchmark 'magit-pre-refresh-hook)
+  (dolist (buffer (magit-mode-get-buffers))
+    (with-current-buffer buffer (magit-refresh-buffer)))
+  (magit-run-hook-with-benchmark 'magit-post-refresh-hook))
+
+(defvar-local magit-refresh-start-time nil)
+
+(defun magit-refresh-buffer (&rest _ignore)
+  "Refresh the current Magit buffer."
+  (interactive)
+  (setq magit-refresh-start-time (current-time))
+  (let ((refresh (intern (format "%s-refresh-buffer"
+                                 (substring (symbol-name major-mode) 0 -5))))
+        (magit--refresh-cache (or magit--refresh-cache (list (cons 0 0)))))
+    (when (functionp refresh)
+      (when magit-refresh-verbose
+        (message "Refreshing buffer `%s'..." (buffer-name)))
+      (let* ((buffer (current-buffer))
+             (windows (cl-mapcan
+                       (lambda (window)
+                         (with-selected-window window
+                           (with-current-buffer buffer
+                             (and-let* ((section (magit-section-at)))
+                               `(( ,window
+                                   ,section
+                                   ,@(magit-section-get-relative-position
+                                      section)))))))
+                       ;; If it qualifies, then the selected window
+                       ;; comes first, but we want to handle it last
+                       ;; so that its `magit-section-movement-hook'
+                       ;; run can override the effects of other runs.
+                       (or (nreverse (get-buffer-window-list buffer nil t))
+                           (list (selected-window))))))
+        (deactivate-mark)
+        (setq magit-section-pre-command-section nil)
+        (setq magit-section-highlight-overlays nil)
+        (setq magit-section-highlighted-sections nil)
+        (setq magit-section-unhighlight-sections nil)
+        (let ((inhibit-read-only t))
+          (erase-buffer)
+          (save-excursion
+            (funcall refresh)))
+        (pcase-dolist (`(,window . ,args) windows)
+          (if (eq buffer (window-buffer window))
+              (with-selected-window window
+                (apply #'magit-section-goto-successor args))
+            (with-current-buffer buffer
+              (let ((magit-section-movement-hook nil))
+                (apply #'magit-section-goto-successor args)))))
+        (run-hooks 'magit-refresh-buffer-hook)
+        (magit-section-update-highlight)
+        (set-buffer-modified-p nil))
+      (when magit-refresh-verbose
+        (message "Refreshing buffer `%s'...done (%.3fs)" (buffer-name)
+                 (float-time (time-subtract (current-time)
+                                            magit-refresh-start-time)))))))
+
+(defun magit-profile-refresh-buffer ()
+  "Profile refreshing the current Magit buffer."
+  (interactive)
+  (require (quote elp))
+  (when (fboundp 'elp-reset-all)
+    (elp-reset-all)
+    (elp-instrument-package "magit-")
+    (elp-instrument-package "forge-")
+    (magit-refresh-buffer)
+    (elp-results)
+    (elp-reset-all)))
+
+;;; Save File-Visiting Buffers
+
+(defvar magit--disable-save-buffers nil)
+
+(defun magit-pre-command-hook ()
+  (setq magit--disable-save-buffers nil))
+(add-hook 'pre-command-hook #'magit-pre-command-hook)
+
+(defvar magit-after-save-refresh-buffers nil)
+
+(defun magit-after-save-refresh-buffers ()
+  (dolist (buffer magit-after-save-refresh-buffers)
+    (when (buffer-live-p buffer)
+      (with-current-buffer buffer
+        (magit-refresh-buffer))))
+  (setq magit-after-save-refresh-buffers nil)
+  (remove-hook 'post-command-hook #'magit-after-save-refresh-buffers))
+
+(defun magit-after-save-refresh-status ()
+  "Refresh the status buffer of the current repository.
+
+This function is intended to be added to `after-save-hook'.
+
+If the status buffer does not exist or the file being visited in
+the current buffer isn't inside the working tree of a repository,
+then do nothing.
+
+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."
+  (when (and (not magit--disable-save-buffers)
+             (magit-inside-worktree-p t))
+    (when-let ((buffer (ignore-errors
+                         (magit-get-mode-buffer 'magit-status-mode))))
+      (add-to-list 'magit-after-save-refresh-buffers buffer)
+      (add-hook 'post-command-hook #'magit-after-save-refresh-buffers))))
+
+(defun magit-maybe-save-repository-buffers ()
+  "Maybe save file-visiting buffers belonging to the current repository.
+Do so if `magit-save-repository-buffers' is non-nil.  You should
+not remove this from any hooks, instead set that variable to nil
+if you so desire."
+  (when (and magit-save-repository-buffers
+             (not magit--disable-save-buffers))
+    (setq magit--disable-save-buffers t)
+    (let ((msg (current-message)))
+      (magit-save-repository-buffers
+       (eq magit-save-repository-buffers 'dontask))
+      (when (and msg
+                 (current-message)
+                 (not (equal msg (current-message))))
+        (message "%s" msg)))))
+
+(add-hook 'magit-pre-refresh-hook #'magit-maybe-save-repository-buffers)
+(add-hook 'magit-pre-call-git-hook #'magit-maybe-save-repository-buffers)
+(add-hook 'magit-pre-start-git-hook #'magit-maybe-save-repository-buffers)
+
+(defvar-local magit-inhibit-refresh-save nil)
+
+(defun magit-save-repository-buffers (&optional arg)
+  "Save file-visiting buffers belonging to the current repository.
+After any buffer where `buffer-save-without-query' is non-nil
+is saved without asking, the user is asked about each modified
+buffer which visits a file in the current repository.  Optional
+argument (the prefix) non-nil means save all with no questions."
+  (interactive "P")
+  (when-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
+    (let ((remote (file-remote-p default-directory))
+          (save-some-buffers-action-alist
+           `((?Y (lambda (buffer)
+                   (with-current-buffer buffer
+                     (setq buffer-save-without-query t)
+                     (save-buffer)))
+                 "to save the current buffer and remember choice")
+             (?N (lambda (buffer)
+                   (with-current-buffer buffer
+                     (setq magit-inhibit-refresh-save t)))
+                 "to skip the current buffer and remember choice")
+             ,@save-some-buffers-action-alist))
+          (topdirs nil)
+          (unwiped nil)
+          (magit--wip-inhibit-autosave t))
+      (unwind-protect
+          (save-some-buffers
+           arg
+           (lambda ()
+             ;; If the current file is modified and resides inside
+             ;; a repository, and a let-binding is in effect, which
+             ;; places us in another repository, then this binding
+             ;; is needed to prevent that file from being saved.
+             (and-let* ((default-directory
+                         (and buffer-file-name
+                              (file-name-directory buffer-file-name))))
+               (and
+                ;; Check whether the repository still exists.
+                (file-exists-p default-directory)
+                ;; Check whether refreshing is disabled.
+                (not magit-inhibit-refresh-save)
+                ;; Check whether the visited file is either on the
+                ;; same remote as the repository, or both are on
+                ;; the local system.
+                (equal (file-remote-p buffer-file-name) remote)
+                ;; Delayed checks that are more expensive for remote
+                ;; repositories, due to the required network access.
+                ;;
+                ;; Check whether the file is inside the repository.
+                (equal (or (cdr (assoc default-directory topdirs))
+                           (let ((top (magit-rev-parse-safe "--show-toplevel")))
+                             (push (cons default-directory top) topdirs)
+                             top))
+                       topdir)
+                ;; Check whether the file is actually writable.
+                (file-writable-p buffer-file-name)
+                (prog1 t
+                  ;; Schedule for wip commit, if appropriate.
+                  (when magit-wip-after-save-local-mode
+                    (push (expand-file-name buffer-file-name) unwiped)))))))
+        (when unwiped
+          (let ((default-directory topdir))
+            (magit-wip-commit-worktree
+             (magit-wip-get-ref)
+             unwiped
+             (if (cdr unwiped)
+                 (format "autosave %s files after save" (length unwiped))
+               (format "autosave %s after save"
+                       (file-relative-name (car unwiped)))))))))))
+
+;;; Restore Window Configuration
+
+(defvar magit-inhibit-save-previous-winconf nil)
+
+(defvar-local magit-previous-window-configuration nil)
+(put 'magit-previous-window-configuration 'permanent-local t)
+
+(defun magit-save-window-configuration ()
+  "Save the current window configuration.
+
+Later, when the buffer is buried, it may be restored by
+`magit-restore-window-configuration'."
+  (if magit-inhibit-save-previous-winconf
+      (when (eq magit-inhibit-save-previous-winconf 'unset)
+        (setq magit-previous-window-configuration nil))
+    (unless (get-buffer-window (current-buffer) (selected-frame))
+      (setq magit-previous-window-configuration
+            (current-window-configuration)))))
+
+(defun magit-restore-window-configuration (&optional kill-buffer)
+  "Bury or kill the current buffer and restore previous window configuration."
+  (let ((winconf magit-previous-window-configuration)
+        (buffer (current-buffer))
+        (frame (selected-frame)))
+    (quit-window kill-buffer (selected-window))
+    (when (and winconf (equal frame (window-configuration-frame winconf)))
+      (set-window-configuration winconf)
+      (when (buffer-live-p buffer)
+        (with-current-buffer buffer
+          (setq magit-previous-window-configuration nil)))
+      (set-buffer (with-selected-window (selected-window)
+                    (current-buffer))))))
+
+;;; Buffer History
+
+(defun magit-go-backward ()
+  "Move backward in current buffer's history."
+  (interactive)
+  (if help-xref-stack
+      (help-xref-go-back (current-buffer))
+    (user-error "No previous entry in buffer's history")))
+
+(defun magit-go-forward ()
+  "Move forward in current buffer's history."
+  (interactive)
+  (if help-xref-forward-stack
+      (help-xref-go-forward (current-buffer))
+    (user-error "No next entry in buffer's history")))
+
+(defun magit-insert-xref-buttons ()
+  "Insert xref buttons."
+  (when (and (not magit-buffer-locked-p)
+             (or help-xref-stack help-xref-forward-stack))
+    (when help-xref-stack
+      (magit-xref-insert-button help-back-label 'magit-xref-backward))
+    (when help-xref-forward-stack
+      (when help-xref-stack
+        (insert " "))
+      (magit-xref-insert-button help-forward-label 'magit-xref-forward))))
+
+(defun magit-xref-insert-button (label type)
+  (magit-insert-section (button label)
+    (insert-text-button label 'type type
+                        'help-args (list (current-buffer)))))
+
+(define-button-type 'magit-xref-backward
+  :supertype 'help-back
+  'mouse-face 'magit-section-highlight
+  'help-echo (purecopy "mouse-2, RET: go back to previous history entry"))
+
+(define-button-type 'magit-xref-forward
+  :supertype 'help-forward
+  'mouse-face 'magit-section-highlight
+  'help-echo (purecopy "mouse-2, RET: go back to next history entry"))
+
+(defvar magit-xref-modes
+  '(magit-log-mode
+    magit-reflog-mode
+    magit-diff-mode
+    magit-revision-mode)
+  "List of modes for which to insert navigation buttons.")
+
+(defun magit-xref-setup (fn args)
+  (when (memq major-mode magit-xref-modes)
+    (when help-xref-stack-item
+      (push (cons (point) help-xref-stack-item) help-xref-stack)
+      (setq help-xref-forward-stack nil))
+    (when-let ((tail (nthcdr 30 help-xref-stack)))
+      (setcdr tail nil))
+    (setq help-xref-stack-item
+          (list 'magit-xref-restore fn default-directory args))))
+
+(defun magit-xref-restore (fn dir args)
+  (setq default-directory dir)
+  (funcall fn major-mode nil args)
+  (magit-refresh-buffer))
+
+;;; Repository-Local Cache
+
+(defvar magit-repository-local-cache nil
+  "Alist mapping `magit-toplevel' paths to alists of key/value pairs.")
+
+(defun magit-repository-local-repository ()
+  "Return the key for the current repository."
+  (or (bound-and-true-p magit--default-directory)
+      (magit-toplevel)))
+
+(defun magit-repository-local-set (key value &optional repository)
+  "Set the repository-local VALUE for KEY.
+
+Unless specified, REPOSITORY is the current buffer's repository.
+
+If REPOSITORY is nil (meaning there is no current repository),
+then the value is not cached, and we return nil."
+  (let* ((repokey (or repository (magit-repository-local-repository)))
+         (cache (assoc repokey magit-repository-local-cache)))
+    ;; Don't cache values for a nil REPOSITORY, as the 'set' and 'get'
+    ;; calls for some KEY may happen in unrelated contexts.
+    (when repokey
+      (if cache
+          (let ((keyvalue (assoc key (cdr cache))))
+            (if keyvalue
+                ;; Update pre-existing value for key.
+                (setcdr keyvalue value)
+              ;; No such key in repository-local cache.
+              (push (cons key value) (cdr cache))))
+        ;; No cache for this repository.
+        (push (cons repokey (list (cons key value)))
+              magit-repository-local-cache)))))
+
+(defun magit-repository-local-exists-p (key &optional repository)
+  "Non-nil when a repository-local value exists for KEY.
+
+Return a (KEY . VALUE) cons cell.
+
+The KEY is matched using `equal'.
+
+Unless specified, REPOSITORY is the current buffer's repository."
+  (and-let* ((cache (assoc (or repository
+                               (magit-repository-local-repository))
+                           magit-repository-local-cache)))
+    (assoc key (cdr cache))))
+
+(defun magit-repository-local-get (key &optional default repository)
+  "Return the repository-local value for KEY.
+
+Return DEFAULT if no value for KEY exists.
+
+The KEY is matched using `equal'.
+
+Unless specified, REPOSITORY is the current buffer's repository."
+  (if-let ((keyvalue (magit-repository-local-exists-p key repository)))
+      (cdr keyvalue)
+    default))
+
+(defun magit-repository-local-delete (key &optional repository)
+  "Delete the repository-local value for KEY.
+
+Unless specified, REPOSITORY is the current buffer's repository.
+If REPOSITORY is `all', then delete the value for KEY for all
+repositories."
+  (if (eq repository 'all)
+      (dolist (cache magit-repository-local-cache)
+        (setf cache (compat-call assoc-delete-all key cache)))
+    (when-let ((cache (assoc (or repository
+                                 (magit-repository-local-repository))
+                             magit-repository-local-cache)))
+      (setf cache (compat-call assoc-delete-all key cache)))))
+
+(defmacro magit--with-repository-local-cache (key &rest body)
+  (declare (indent 1) (debug (form body)))
+  (let ((k (cl-gensym)))
+    `(let ((,k ,key))
+       (if-let ((kv (magit-repository-local-exists-p ,k)))
+           (cdr kv)
+         (let ((v ,(macroexp-progn body)))
+           (magit-repository-local-set ,k v)
+           v)))))
+
+(defun magit-preserve-section-visibility-cache ()
+  (when (derived-mode-p 'magit-status-mode 'magit-refs-mode)
+    (magit-repository-local-set
+     (cons major-mode 'magit-section-visibility-cache)
+     magit-section-visibility-cache)))
+
+(defun magit-restore-section-visibility-cache (mode)
+  (setq magit-section-visibility-cache
+        (magit-repository-local-get
+         (cons mode 'magit-section-visibility-cache))))
+
+(defun magit-zap-caches (&optional all)
+  "Zap caches for the current repository.
+
+Remove the repository's entry from `magit-repository-local-cache',
+remove the host's entry from `magit--host-git-version-cache', set
+`magit-section-visibility-cache' to nil for all Magit buffers of
+the repository and set `magit--libgit-available-p' to `unknown'.
+
+With a prefix argument or if optional ALL is non-nil, discard the
+mentioned caches completely."
+  (interactive)
+  (cond (all
+         (setq magit-repository-local-cache nil)
+         (setq magit--host-git-version-cache nil)
+         (dolist (buffer (buffer-list))
+           (with-current-buffer buffer
+             (when (derived-mode-p 'magit-mode)
+               (setq magit-section-visibility-cache nil)))))
+        (t
+         (magit-with-toplevel
+           (setq magit-repository-local-cache
+                 (cl-delete default-directory
+                            magit-repository-local-cache
+                            :key #'car :test #'equal))
+           (setq magit--host-git-version-cache
+                 (cl-delete (file-remote-p default-directory)
+                            magit--host-git-version-cache
+                            :key #'car :test #'equal)))
+         (dolist (buffer (magit-mode-get-buffers))
+           (with-current-buffer buffer
+             (setq magit-section-visibility-cache nil)))))
+  (setq magit--libgit-available-p 'unknown))
+
+;;; Utilities
+
+(defun magit-toggle-verbose-refresh ()
+  "Toggle whether Magit refreshes buffers verbosely.
+Enabling this helps figuring out which sections are bottlenecks.
+The additional output can be found in the *Messages* buffer."
+  (interactive)
+  (setq magit-refresh-verbose (not magit-refresh-verbose))
+  (message "%s verbose refreshing"
+           (if magit-refresh-verbose "Enabled" "Disabled")))
+
+(defun magit-run-hook-with-benchmark (hook)
+  (when hook
+    (if magit-refresh-verbose
+        (let ((start (current-time)))
+          (message "Running %s..." hook)
+          (run-hooks hook)
+          (message "Running %s...done (%.3fs)" hook
+                   (float-time (time-subtract (current-time) start))))
+      (run-hooks hook))))
+
+;;; _
+(provide 'magit-mode)
+;;; magit-mode.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-mode.elc b/emacs/elpa/magit-20240514.1843/magit-mode.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-notes.el b/emacs/elpa/magit-20240514.1843/magit-notes.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-notes.elc b/emacs/elpa/magit-20240514.1843/magit-notes.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-patch.el b/emacs/elpa/magit-20240514.1843/magit-patch.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-patch.elc b/emacs/elpa/magit-20240514.1843/magit-patch.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-pkg.el b/emacs/elpa/magit-20240514.1843/magit-pkg.el
@@ -0,0 +1,20 @@
+(define-package "magit" "20240514.1843" "A Git porcelain inside Emacs."
+  '((emacs "26.1")
+    (compat "29.1.4.5")
+    (dash "20240405")
+    (git-commit "20240429")
+    (magit-section "20240429")
+    (seq "2.24")
+    (transient "20240421")
+    (with-editor "20240415"))
+  :commit "9cde118744151caca08b080e15f0c903f17d0f20" :authors
+  '(("Marius Vollmer" . "marius.vollmer@gmail.com")
+    ("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev"))
+  :maintainer
+  '("Jonas Bernoulli" . "emacs.magit@jonas.bernoulli.dev")
+  :keywords
+  '("git" "tools" "vc")
+  :url "https://github.com/magit/magit")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/magit-20240514.1843/magit-process.el b/emacs/elpa/magit-20240514.1843/magit-process.el
@@ -0,0 +1,1295 @@
+;;; magit-process.el --- Process 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 the tools used to run Git for side-effects.
+
+;; Note that the functions used to run Git and then consume its
+;; output, are defined in `magit-git.el'.  There's a bit of overlap
+;; though.
+
+;;; Code:
+
+(require 'magit-base)
+(require 'magit-git)
+(require 'magit-mode)
+
+(require 'ansi-color)
+(require 'auth-source)
+(require 'with-editor)
+
+(defvar y-or-n-p-map)
+
+;;; Options
+
+(defcustom magit-process-connection-type (not (eq system-type 'cygwin))
+  "Connection type used for the Git process.
+
+If nil, use pipes: this is usually more efficient, and works on Cygwin.
+If t, use ptys: this enables Magit to prompt for passphrases when needed."
+  :group 'magit-process
+  :type '(choice (const :tag "pipe" nil)
+                 (const :tag "pty" t)))
+
+(defcustom magit-need-cygwin-noglob
+  (and (eq system-type 'windows-nt)
+       (with-temp-buffer
+         (let ((process-environment
+                (append magit-git-environment process-environment)))
+           (condition-case e
+               (process-file magit-git-executable
+                             nil (current-buffer) nil
+                             "-c" "alias.echo=!echo" "echo" "x{0}")
+             (file-error
+              (lwarn 'magit-process :warning
+                     "Could not run Git: %S" e))))
+         (equal "x0\n" (buffer-string))))
+  "Whether to use a workaround for Cygwin's globbing behavior.
+
+If non-nil, add environment variables to `process-environment' to
+prevent the git.exe distributed by Cygwin and MSYS2 from
+attempting to perform glob expansion when called from a native
+Windows build of Emacs.  See #2246."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-process
+  :type '(choice (const :tag "Yes" t)
+                 (const :tag "No" nil)))
+
+(defcustom magit-process-popup-time -1
+  "Popup the process buffer if a command takes longer than this many seconds."
+  :group 'magit-process
+  :type '(choice (const :tag "Never" -1)
+                 (const :tag "Immediately" 0)
+                 (integer :tag "After this many seconds")))
+
+(defcustom magit-process-log-max 32
+  "Maximum number of sections to keep in a process log buffer.
+When adding a new section would go beyond the limit set here,
+then the older half of the sections are remove.  Sections that
+belong to processes that are still running are never removed.
+When this is nil, no sections are ever removed."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-process
+  :type '(choice (const :tag "Never remove old sections" nil) integer))
+
+(defvar magit-process-extreme-logging nil
+  "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.
+
+Also see `magit-git-debug'.")
+
+(defcustom magit-process-error-tooltip-max-lines 20
+  "The number of lines for `magit-process-error-lines' to return.
+
+These are displayed in a tooltip for `mode-line-process' errors.
+
+If `magit-process-error-tooltip-max-lines' is nil, the tooltip
+displays the text of `magit-process-error-summary' instead."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-process
+  :type '(choice (const :tag "Use summary line" nil)
+                 integer))
+
+(defcustom magit-credential-cache-daemon-socket
+  (--some (pcase-let ((`(,prog . ,args) (split-string it)))
+            (if (and prog
+                     (string-match-p
+                      "\\`\\(?:\\(?:/.*/\\)?git-credential-\\)?cache\\'" prog))
+                (or (cl-loop for (opt val) on args
+                             if (string= opt "--socket")
+                             return val)
+                    (expand-file-name "~/.git-credential-cache/socket"))))
+          ;; Note: `magit-process-file' is not yet defined when
+          ;; evaluating this form, so we use `process-lines'.
+          (ignore-errors
+            (let ((process-environment
+                   (append magit-git-environment process-environment)))
+              (process-lines magit-git-executable
+                             "config" "--get-all" "credential.helper"))))
+  "If non-nil, start a credential cache daemon using this socket.
+
+When using Git's cache credential helper in the normal way, Emacs
+sends a SIGHUP to the credential daemon after the git subprocess
+has exited, causing the daemon to also quit.  This can be avoided
+by starting the `git-credential-cache--daemon' process directly
+from Emacs.
+
+The function `magit-maybe-start-credential-cache-daemon' takes
+care of starting the daemon if necessary, using the value of this
+option as the socket.  If this option is nil, then it does not
+start any daemon.  Likewise if another daemon is already running,
+then it starts no new daemon.  This function has to be a member
+of the hook variable `magit-credential-hook' for this to work.
+If an error occurs while starting the daemon, most likely because
+the necessary executable is missing, then the function removes
+itself from the hook, to avoid further futile attempts."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-process
+  :type '(choice (file  :tag "Socket")
+                 (const :tag "Don't start a cache daemon" nil)))
+
+(defcustom magit-process-yes-or-no-prompt-regexp
+  (concat " [([]"
+          "\\([Yy]\\(?:es\\)?\\)"
+          "[/|]"
+          "\\([Nn]o?\\)"
+          ;; OpenSSH v8 prints this.  See #3969.
+          "\\(?:/\\[fingerprint\\]\\)?"
+          "[])] ?[?:]? ?$")
+  "Regexp matching Yes-or-No prompts of Git and its subprocesses."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-process
+  :type 'regexp)
+
+(defcustom magit-process-password-prompt-regexps
+  '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
+    ;; Match-group 99 is used to identify the "user@host" part.
+    "^\\(Enter \\|([^) ]+) \\)?\
+[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$"
+    "Please enter the passphrase for the ssh key"
+    "Please enter the passphrase to unlock the OpenPGP secret key"
+    "^.*'s password: ?$"
+    "^Token: $" ; For git-credential-manager-core (#4318).
+    "^Yubikey for .*: ?$"
+    "^Enter PIN for .*: ?$")
+  "List of regexps matching password prompts of Git and its subprocesses.
+Also see `magit-process-find-password-functions'."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-process
+  :type '(repeat (regexp)))
+
+(defcustom magit-process-find-password-functions nil
+  "List of functions to try in sequence to get a password.
+
+These functions may be called when git asks for a password, which
+is detected using `magit-process-password-prompt-regexps'.  They
+are called if and only if matching the prompt resulted in the
+value of the 99th submatch to be non-nil.  Therefore users can
+control for which prompts these functions should be called by
+putting the host name in the 99th submatch, or not.
+
+If the functions are called, then they are called in the order
+given, with the host name as only argument, until one of them
+returns non-nil.  If they are not called or none of them returns
+non-nil, then the password is read from the user instead."
+  :package-version '(magit . "2.3.0")
+  :group 'magit-process
+  :type 'hook
+  :options '(magit-process-password-auth-source))
+
+(defcustom magit-process-username-prompt-regexps
+  '("^Username for '.*': ?$")
+  "List of regexps matching username prompts of Git and its subprocesses."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-process
+  :type '(repeat (regexp)))
+
+(defcustom magit-process-prompt-functions nil
+  "List of functions used to forward arbitrary questions to the user.
+
+Magit has dedicated support for forwarding username and password
+prompts and Yes-or-No questions asked by Git and its subprocesses
+to the user.  This can be customized using other options in the
+`magit-process' customization group.
+
+If you encounter a new question that isn't handled by default,
+then those options should be used instead of this hook.
+
+However subprocesses may also ask questions that differ too much
+from what the code related to the above options assume, and this
+hook allows users to deal with such questions explicitly.
+
+Each function is called with the process and the output string
+as arguments until one of the functions returns non-nil.  The
+function is responsible for asking the user the appropriate
+question using, e.g., `read-char-choice' and then forwarding the
+answer to the process using `process-send-string'.
+
+While functions such as `magit-process-yes-or-no-prompt' may not
+be sufficient to handle some prompt, it may still be of benefit
+to look at the implementations to gain some insights on how to
+implement such functions."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-process
+  :type 'hook)
+
+(defcustom magit-process-ensure-unix-line-ending t
+  "Whether Magit should ensure a unix coding system when talking to Git."
+  :package-version '(magit . "2.6.0")
+  :group 'magit-process
+  :type 'boolean)
+
+(defcustom magit-process-display-mode-line-error t
+  "Whether Magit should retain and highlight process errors in the mode line."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-process
+  :type 'boolean)
+
+(defcustom magit-process-timestamp-format nil
+  "Format of timestamp for each process in the process buffer.
+If non-nil, pass this to `format-time-string' when creating a
+process section in the process buffer, and insert the returned
+string in the heading of its section."
+  :package-version '(magit . "4.0.0")
+  :group 'magit-process
+  :type '(choice (const :tag "none" nil) string))
+
+(defvar tramp-pipe-stty-settings)
+(defvar magit-tramp-pipe-stty-settings ""
+  "Override `tramp-pipe-stty-settings' in `magit-start-process'.
+
+The default for that Tramp variable is \"-icanon min 1 time 0\",
+which causes staging of individual hunks to hang.  Using \"\"
+prevents that, but apparently has other issues, which is why it
+isn't the default.
+
+This variable defaults to \"\" and is used to override the Tramp
+variable in `magit-start-process'.  This only has an effect when
+using Tramp 2.6.2 or greater.  This can also be set to `pty', in
+which case a pty is used instead of a pipe.  That also prevents
+the hanging, but comes with its own problems (see #20).  To fall
+back to the value of `tramp-pipe-stty-settings', set this
+variable to nil.
+
+Also see https://github.com/magit/magit/issues/4720
+and https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62093.")
+
+(defface magit-process-ok
+  '((t :inherit magit-section-heading :foreground "green"))
+  "Face for zero exit-status."
+  :group 'magit-faces)
+
+(defface magit-process-ng
+  '((t :inherit magit-section-heading :foreground "red"))
+  "Face for non-zero exit-status."
+  :group 'magit-faces)
+
+(defface magit-mode-line-process
+  '((t :inherit mode-line-emphasis))
+  "Face for `mode-line-process' status when Git is running for side-effects."
+  :group 'magit-faces)
+
+(defface magit-mode-line-process-error
+  '((t :inherit error))
+  "Face for `mode-line-process' error status.
+
+Used when `magit-process-display-mode-line-error' is non-nil."
+  :group 'magit-faces)
+
+;;; Process Mode
+
+(defvar-keymap magit-process-mode-map
+  :doc "Keymap for `magit-process-mode'."
+  :parent magit-mode-map
+  "<remap> <magit-delete-thing>" #'magit-process-kill)
+
+(define-derived-mode magit-process-mode magit-mode "Magit Process"
+  "Mode for looking at Git process output."
+  :group 'magit-process
+  (hack-dir-local-variables-non-file-buffer)
+  (setq magit--imenu-item-types 'process))
+
+(defun magit-process-buffer (&optional nodisplay)
+  "Display the current repository's process buffer.
+
+If that buffer doesn't exist yet, then create it.
+Non-interactively return the buffer and unless
+optional NODISPLAY is non-nil also display it."
+  (interactive)
+  (let ((topdir (magit-toplevel)))
+    (unless topdir
+      (magit--with-safe-default-directory nil
+        (setq topdir default-directory)
+        (let (prev)
+          (while (not (equal topdir prev))
+            (setq prev topdir)
+            (setq topdir (file-name-directory (directory-file-name topdir)))))))
+    (let ((buffer (or (--first (with-current-buffer it
+                                 (and (eq major-mode 'magit-process-mode)
+                                      (equal default-directory topdir)))
+                               (buffer-list))
+                      (magit-generate-new-buffer 'magit-process-mode
+                                                 nil topdir))))
+      (with-current-buffer buffer
+        (if magit-root-section
+            (when magit-process-log-max
+              (magit-process-truncate-log))
+          (magit-process-mode)
+          (let ((inhibit-read-only t)
+                (magit-insert-section--parent  nil)
+                (magit-insert-section--oldroot nil))
+            (make-local-variable 'text-property-default-nonsticky)
+            (magit-insert-section (processbuf)
+              (insert "\n")))))
+      (unless nodisplay
+        (magit-display-buffer buffer))
+      buffer)))
+
+(defun magit-process-kill ()
+  "Kill the process at point."
+  (interactive)
+  (when-let ((process (magit-section-value-if 'process)))
+    (unless (eq (process-status process) 'run)
+      (user-error "Process isn't running"))
+    (magit-confirm 'kill-process)
+    (kill-process process)))
+
+;;; Synchronous Processes
+
+(defvar magit-process-raise-error nil)
+
+(defun magit-git (&rest args)
+  "Call Git synchronously in a separate process, for side-effects.
+
+Option `magit-git-executable' specifies the Git executable.
+The arguments ARGS specify arguments to Git, they are flattened
+before use.
+
+Process output goes into a new section in the buffer returned by
+`magit-process-buffer'.  If Git exits with a non-zero status,
+then raise an error."
+  (let ((magit-process-raise-error t))
+    (magit-call-git args)))
+
+(defun magit-run-git (&rest args)
+  "Call Git synchronously in a separate process, and refresh.
+
+Function `magit-git-executable' specifies the Git executable and
+option `magit-git-global-arguments' specifies constant arguments.
+The arguments ARGS specify arguments to Git, they are flattened
+before use.
+
+After Git returns, the current buffer (if it is a Magit buffer)
+as well as the current repository's status buffer are refreshed.
+
+Process output goes into a new section in the buffer returned by
+`magit-process-buffer'."
+  (let ((magit--refresh-cache (list (cons 0 0))))
+    (magit-call-git args)
+    (when (member (car args) '("init" "clone"))
+      ;; Creating a new repository invalidates the cache.
+      (setq magit--refresh-cache nil))
+    (magit-refresh)))
+
+(defvar magit-pre-call-git-hook nil)
+
+(defun magit-call-git (&rest args)
+  "Call Git synchronously in a separate process.
+
+Function `magit-git-executable' specifies the Git executable and
+option `magit-git-global-arguments' specifies constant arguments.
+The arguments ARGS specify arguments to Git, they are flattened
+before use.
+
+Process output goes into a new section in the buffer returned by
+`magit-process-buffer'."
+  (run-hooks 'magit-pre-call-git-hook)
+  (let ((default-process-coding-system (magit--process-coding-system)))
+    (apply #'magit-call-process
+           (magit-git-executable)
+           (magit-process-git-arguments args))))
+
+(defun magit-call-process (program &rest args)
+  "Call PROGRAM synchronously in a separate process.
+Process output goes into a new section in the buffer returned by
+`magit-process-buffer'."
+  (pcase-let ((`(,process-buf . ,section)
+               (magit-process-setup program args)))
+    (magit-process-finish
+     (let ((inhibit-read-only t))
+       (apply #'magit-process-file program nil process-buf nil args))
+     process-buf (current-buffer) default-directory section)))
+
+(defun magit-process-git (destination &rest args)
+  "Call 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.
+Enable Cygwin's \"noglob\" option during the call and
+ensure unix eol conversion."
+  (apply #'magit-process-file
+         (magit-git-executable)
+         nil destination nil
+         (magit-process-git-arguments args)))
+
+(defun magit-process-file (process &optional infile buffer display &rest args)
+  "Process files synchronously in a separate process.
+Identical to `process-file' but temporarily enable Cygwin's
+\"noglob\" option during the call and ensure unix eol
+conversion."
+  (when magit-process-extreme-logging
+    (let ((inhibit-message t))
+      (message "$ %s" (magit-process--format-arguments process args))))
+  (let ((process-environment (magit-process-environment))
+        (default-process-coding-system (magit--process-coding-system)))
+    (apply #'process-file process infile buffer display args)))
+
+(defun magit-process-environment ()
+  ;; The various w32 hacks are only applicable when running on the local
+  ;; machine.  A local binding of process-environment different from the
+  ;; top-level value affects the environment used in
+  ;; tramp-sh-handle-{start-file-process,process-file}.
+  (let ((local (not (file-remote-p default-directory))))
+    (append magit-git-environment
+            (and local
+                 (cdr (assoc magit-git-executable magit-git-w32-path-hack)))
+            (and local magit-need-cygwin-noglob
+                 (mapcar (lambda (var)
+                           (concat var "=" (if-let ((val (getenv var)))
+                                               (concat val " noglob")
+                                             "noglob")))
+                         '("CYGWIN" "MSYS")))
+            process-environment)))
+
+(defvar magit-this-process nil)
+
+(defun magit-run-git-with-input (&rest args)
+  "Call Git in a separate process.
+ARGS is flattened and then used as arguments to Git.
+
+The current buffer's content is used as the process's standard
+input.  The buffer is assumed to be temporary and thus OK to
+modify.
+
+Function `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."
+  (when (eq system-type 'windows-nt)
+    ;; On w32, git expects UTF-8 encoded input, ignore any user
+    ;; configuration telling us otherwise (see #3250).
+    (encode-coding-region (point-min) (point-max) 'utf-8-unix))
+  (if (file-remote-p default-directory)
+      ;; We lack `process-file-region', so fall back to asynch +
+      ;; waiting in remote case.
+      (progn
+        (magit-start-git (current-buffer) args)
+        (while (and magit-this-process
+                    (eq (process-status magit-this-process) 'run))
+          (sleep-for 0.005)))
+    (run-hooks 'magit-pre-call-git-hook)
+    (pcase-let* ((process-environment (magit-process-environment))
+                 (default-process-coding-system (magit--process-coding-system))
+                 (flat-args (magit-process-git-arguments args))
+                 (`(,process-buf . ,section)
+                  (magit-process-setup (magit-git-executable) flat-args))
+                 (inhibit-read-only t))
+      (magit-process-finish
+       (apply #'call-process-region (point-min) (point-max)
+              (magit-git-executable) nil process-buf nil flat-args)
+       process-buf nil default-directory section))))
+
+;;; Asynchronous Processes
+
+(defun 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.
+
+See `magit-start-process' for more information."
+  (message "Running %s %s" (magit-git-executable)
+           (let ((m (mapconcat #'identity (flatten-tree args) " ")))
+             (remove-list-of-text-properties 0 (length m) '(face) m)
+             m))
+  (magit-start-git nil args))
+
+(defun 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.
+
+See `magit-start-process' and `with-editor' for more information."
+  (magit--record-separated-gitdir)
+  (magit-with-editor (magit-run-git-async args)))
+
+(defun magit-run-git-sequencer (&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.
+If the sequence stops at a commit, make the section representing
+that commit the current section by moving `point' there.
+
+See `magit-start-process' and `with-editor' for more information."
+  (apply #'magit-run-git-with-editor args)
+  (set-process-sentinel magit-this-process #'magit-sequencer-process-sentinel)
+  magit-this-process)
+
+(defvar magit-pre-start-git-hook nil)
+
+(defun 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.
+
+Function `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.
+
+See `magit-start-process' for more information."
+  (run-hooks 'magit-pre-start-git-hook)
+  (let ((default-process-coding-system (magit--process-coding-system)))
+    (apply #'magit-start-process (magit-git-executable) input
+           (magit-process-git-arguments args))))
+
+(defun magit-start-process (program &optional input &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."
+  (pcase-let*
+      ((`(,process-buf . ,section)
+        (magit-process-setup program args))
+       (process
+        (let ((process-connection-type ;t=pty nil=pipe
+               (or
+                ;; With Tramp, maybe force use a pty.  #4720
+                (and (file-remote-p default-directory)
+                     (eq magit-tramp-pipe-stty-settings 'pty))
+                ;; Without input, don't use a pty, because it would
+                ;; set icrnl, which would modify the input.  #20
+                (and (not input) magit-process-connection-type)))
+              (tramp-pipe-stty-settings
+               (or (and (not (eq magit-tramp-pipe-stty-settings 'pty))
+                        ;; Defaults to "", to allow staging hunks over
+                        ;; Tramp again.  #4720
+                        magit-tramp-pipe-stty-settings)
+                   tramp-pipe-stty-settings))
+              (process-environment (magit-process-environment))
+              (default-process-coding-system (magit--process-coding-system)))
+          (apply #'start-file-process
+                 (file-name-nondirectory program)
+                 process-buf program args))))
+    (with-editor-set-process-filter process #'magit-process-filter)
+    (set-process-sentinel process #'magit-process-sentinel)
+    (set-process-buffer   process process-buf)
+    (when (eq system-type 'windows-nt)
+      ;; On w32, git expects UTF-8 encoded input, ignore any user
+      ;; configuration telling us otherwise.
+      (set-process-coding-system process nil 'utf-8-unix))
+    (process-put process 'section section)
+    (process-put process 'command-buf (current-buffer))
+    (process-put process 'default-dir default-directory)
+    (when magit-inhibit-refresh
+      (process-put process 'inhibit-refresh t))
+    (oset section process process)
+    (with-current-buffer process-buf
+      (set-marker (process-mark process) (point)))
+    (when input
+      (with-current-buffer input
+        (process-send-region process (point-min) (point-max))
+        ;; `process-send-eof' appears to be broken over
+        ;;  Tramp from Windows. See #3624 and bug#43226.
+        (if (and (eq system-type 'windows-nt)
+                 (file-remote-p (process-get process 'default-dir) nil t))
+            (process-send-string process "")
+          (process-send-eof process))))
+    (setq magit-this-process process)
+    (oset section value process)
+    (magit-process-display-buffer process)
+    process))
+
+(defun magit-parse-git-async (&rest args)
+  (setq args (magit-process-git-arguments args))
+  (let ((command-buf (current-buffer))
+        (process-buf (generate-new-buffer " *temp*"))
+        (toplevel (magit-toplevel)))
+    (with-current-buffer process-buf
+      (setq default-directory toplevel)
+      (let ((process
+             (let ((process-connection-type nil)
+                   (process-environment (magit-process-environment))
+                   (default-process-coding-system
+                    (magit--process-coding-system)))
+               (apply #'start-file-process "git" process-buf
+                      (magit-git-executable) args))))
+        (process-put process 'command-buf command-buf)
+        (process-put process 'parsed (point))
+        (setq magit-this-process process)
+        process))))
+
+;;; Process Internals
+
+(defclass magit-process-section (magit-section)
+  ((process :initform nil)))
+
+(setf (alist-get 'process magit--section-type-alist) 'magit-process-section)
+
+(defun magit-process-setup (program args)
+  (magit-process-set-mode-line program args)
+  (let ((pwd default-directory)
+        (buf (magit-process-buffer t)))
+    (cons buf (with-current-buffer buf
+                (prog1 (magit-process-insert-section pwd program args nil nil)
+                  (backward-char 1))))))
+
+(defun magit-process-insert-section (pwd program args &optional errcode errlog)
+  (let ((inhibit-read-only t)
+        (magit-insert-section--parent magit-root-section)
+        (magit-insert-section--oldroot nil))
+    (goto-char (1- (point-max)))
+    (magit-insert-section (process)
+      (insert (if errcode
+                  (format "%3s " (propertize (number-to-string errcode)
+                                             'font-lock-face 'magit-process-ng))
+                "run "))
+      (when magit-process-timestamp-format
+        (insert (format-time-string magit-process-timestamp-format) " "))
+      (unless (equal (expand-file-name pwd)
+                     (expand-file-name default-directory))
+        (insert (file-relative-name pwd default-directory) ?\s))
+      (insert (magit-process--format-arguments program args))
+      (magit-insert-heading)
+      (when errlog
+        (if (bufferp errlog)
+            (insert (with-current-buffer errlog
+                      (buffer-substring-no-properties (point-min) (point-max))))
+          (insert-file-contents errlog)
+          (goto-char (1- (point-max)))))
+      (insert "\n"))))
+
+(defun magit-process--format-arguments (program args)
+  (cond
+   ((and args (equal program (magit-git-executable)))
+    (let ((global (length magit-git-global-arguments)))
+      (concat
+       (propertize (file-name-nondirectory program)
+                   'font-lock-face 'magit-section-heading)
+       " "
+       (propertize (magit--ellipsis)
+                   'font-lock-face 'magit-section-heading
+                   'help-echo (mapconcat #'identity (seq-take args global) " "))
+       " "
+       (propertize (mapconcat #'shell-quote-argument (seq-drop args global) " ")
+                   'font-lock-face 'magit-section-heading))))
+   ((and args (equal program shell-file-name))
+    (propertize (cadr args)
+                'font-lock-face 'magit-section-heading))
+   (t
+    (concat (propertize (file-name-nondirectory program)
+                        'font-lock-face 'magit-section-heading)
+            " "
+            (propertize (mapconcat #'shell-quote-argument args " ")
+                        'font-lock-face 'magit-section-heading)))))
+
+(defun magit-process-truncate-log ()
+  (let* ((head nil)
+         (tail (oref magit-root-section children))
+         (count (length tail)))
+    (when (> (1+ count) magit-process-log-max)
+      (while (and (cdr tail)
+                  (> count (/ magit-process-log-max 2)))
+        (let* ((inhibit-read-only t)
+               (section (car tail))
+               (process (oref section process)))
+          (cond ((not process))
+                ((memq (process-status process) '(exit signal))
+                 (delete-region (oref section start)
+                                (1+ (oref section end)))
+                 (cl-decf count))
+                (t
+                 (push section head))))
+        (pop tail))
+      (oset magit-root-section children
+            (nconc (reverse head) tail)))))
+
+(defun magit-process-sentinel (process event)
+  "Default sentinel used by `magit-start-process'."
+  (when (memq (process-status process) '(exit signal))
+    (setq event (substring event 0 -1))
+    (when (string-match "^finished" event)
+      (message (concat (capitalize (process-name process)) " finished")))
+    (magit-process-finish process)
+    (when (eq process magit-this-process)
+      (setq magit-this-process nil))
+    (unless (process-get process 'inhibit-refresh)
+      (let ((command-buf (process-get process 'command-buf)))
+        (if (buffer-live-p command-buf)
+            (with-current-buffer command-buf
+              (magit-refresh))
+          (with-temp-buffer
+            (setq default-directory (process-get process 'default-dir))
+            (magit-refresh)))))))
+
+(defun magit-sequencer-process-sentinel (process event)
+  "Special sentinel used by `magit-run-git-sequencer'."
+  (when (memq (process-status process) '(exit signal))
+    (magit-process-sentinel process event)
+    (when-let* ((process-buf (process-buffer process))
+                ((buffer-live-p process-buf))
+                (status-buf (with-current-buffer process-buf
+                              (magit-get-mode-buffer 'magit-status-mode))))
+      (with-current-buffer status-buf
+        (when-let ((section
+                    (magit-get-section
+                     `((commit . ,(magit-rev-parse "HEAD"))
+                       (,(pcase (car (seq-drop
+                                      (process-command process)
+                                      (1+ (length magit-git-global-arguments))))
+                           ((or "rebase" "am") 'rebase-sequence)
+                           ((or "cherry-pick" "revert") 'sequence)))
+                       (status)))))
+          (goto-char (oref section start))
+          (magit-section-update-highlight))))))
+
+(defun magit-process-filter (proc string)
+  "Default filter used by `magit-start-process'."
+  (with-current-buffer (process-buffer proc)
+    (let ((inhibit-read-only t))
+      (goto-char (process-mark proc))
+      ;; Find last ^M in string.  If one was found, ignore
+      ;; everything before it and delete the current line.
+      (when-let ((ret-pos (cl-position ?\r string :from-end t)))
+        (cl-callf substring string (1+ ret-pos))
+        (delete-region (line-beginning-position) (point)))
+      (setq string (magit-process-remove-bogus-errors string))
+      (insert (propertize string 'magit-section
+                          (process-get proc 'section)))
+      (set-marker (process-mark proc) (point))
+      ;; Make sure prompts are matched after removing ^M.
+      (magit-process-yes-or-no-prompt proc string)
+      (magit-process-username-prompt  proc string)
+      (magit-process-password-prompt  proc string)
+      (run-hook-with-args-until-success 'magit-process-prompt-functions
+                                        proc string))))
+
+(defun magit-process-make-keymap (process parent)
+  "Remap `abort-minibuffers' to a command that also kills PROCESS.
+PARENT is used as the parent of the returned keymap."
+  (let ((cmd (lambda ()
+               (interactive)
+               (ignore-errors (kill-process process))
+               (if (fboundp 'abort-minibuffers)
+                   (abort-minibuffers)
+                 (abort-recursive-edit)))))
+    (define-keymap :parent parent
+      "C-g" cmd
+      "<remap> <abort-minibuffers>" cmd
+      "<remap> <abort-recursive-edit>" cmd)))
+
+(defmacro magit-process-kill-on-abort (process &rest body)
+  (declare (indent 1)
+           (debug (form body))
+           (obsolete magit-process-make-keymap "Magit 4.0.0"))
+  `(let ((minibuffer-local-map
+          (magit-process-make-keymap ,process minibuffer-local-map)))
+     ,@body))
+
+(defun magit-process-remove-bogus-errors (str)
+  (save-match-data
+    (when (string-match "^\\(\\*ERROR\\*: \\)Canceled by user" str)
+      (setq str (replace-match "" nil nil str 1)))
+    (when (string-match "^error: There was a problem with the editor.*\n" str)
+      (setq str (replace-match "" nil nil str)))
+    (when (string-match
+           "^Please supply the message using either -m or -F option\\.\n" str)
+      (setq str (replace-match "" nil nil str))))
+  str)
+
+(defun magit-process-yes-or-no-prompt (process string)
+  "Forward Yes-or-No prompts to the user."
+  (when-let ((beg (string-match magit-process-yes-or-no-prompt-regexp string)))
+    (process-send-string
+     process
+     (if (save-match-data
+           (let ((max-mini-window-height 30)
+                 (minibuffer-local-map
+                  (magit-process-make-keymap process minibuffer-local-map))
+                 ;; In case yes-or-no-p is fset to that, but does
+                 ;; not cover use-dialog-box-p and y-or-n-p-read-key.
+                 (y-or-n-p-map
+                  (magit-process-make-keymap process y-or-n-p-map)))
+             (yes-or-no-p (substring string 0 beg))))
+         (concat (downcase (match-string 1 string)) "\n")
+       (concat (downcase (match-string 2 string)) "\n")))))
+
+(defun magit-process-password-auth-source (key)
+  "Use `auth-source-search' to get a password.
+If found, return the password.  Otherwise, return nil.
+
+To use this function add it to the appropriate hook
+  (add-hook \\='magit-process-find-password-functions
+            \\='magit-process-password-auth-source)
+
+KEY typically derives from a prompt such as:
+  Password for \\='https://yourname@github.com\\='
+in which case it would be the string
+  yourname@github.com
+which matches the ~/.authinfo.gpg entry
+  machine github.com login yourname password 12345
+or iff that is undefined, for backward compatibility
+  machine yourname@github.com password 12345
+
+On github.com you should not use your password but a
+personal access token, see [1].  For information about
+the peculiarities of other forges, please consult the
+respective documentation.
+
+After manually editing ~/.authinfo.gpg you must reset
+the cache using
+  M-x auth-source-forget-all-cached RET
+
+The above will save you from having to repeatedly type
+your token or password, but you might still repeatedly
+be asked for your username.  To prevent that, change an
+URL like
+  https://github.com/foo/bar.git
+to
+  https://yourname@github.com/foo/bar.git
+
+Instead of changing all such URLs manually, they can
+be translated on the fly by doing this once
+  git config --global \
+    url.https://yourname@github.com.insteadOf \
+    https://github.com
+
+[1]: https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token."
+  (require 'auth-source)
+  (and (fboundp 'auth-source-search)
+       (string-match "\\`\\(.+\\)@\\([^@]+\\)\\'" key)
+       (let* ((user (match-string 1 key))
+              (host (match-string 2 key))
+              (secret
+               (plist-get
+                (car (or (auth-source-search :max 1 :host host :user user)
+                         (auth-source-search :max 1 :host key)))
+                :secret)))
+         (if (functionp secret)
+             (funcall secret)
+           secret))))
+
+(defun magit-process-git-credential-manager-core (process string)
+  "Authenticate using `git-credential-manager-core'.
+
+To use this function add it to the appropriate hook
+  (add-hook \\='magit-process-prompt-functions
+            \\='magit-process-git-credential-manager-core)"
+  (and (string-match "^option (enter for default): $" string)
+       (progn
+         (magit-process-buffer)
+         (let ((option (format "%c\n"
+                               (read-char-choice "Option: " '(?\r ?\j ?1 ?2)))))
+           (insert-before-markers-and-inherit option)
+           (process-send-string process option)))))
+
+(defun magit-process-password-prompt (process string)
+  "Find a password based on prompt STRING and send it to git.
+Use `magit-process-password-prompt-regexps' to find a known
+prompt.  If and only if one is found, then call functions in
+`magit-process-find-password-functions' until one of them returns
+the password.  If all functions return nil, then read the password
+from the user."
+  (when-let ((prompt (magit-process-match-prompt
+                      magit-process-password-prompt-regexps string)))
+    (process-send-string
+     process
+     (concat (or (and-let* ((key (match-string 99 string)))
+                   (run-hook-with-args-until-success
+                    'magit-process-find-password-functions key))
+                 (let ((read-passwd-map
+                        (magit-process-make-keymap process read-passwd-map)))
+                   (read-passwd prompt)))
+             "\n"))))
+
+(defun magit-process-username-prompt (process string)
+  "Forward username prompts to the user."
+  (when-let ((prompt (magit-process-match-prompt
+                      magit-process-username-prompt-regexps string)))
+    (process-send-string
+     process
+     (let ((minibuffer-local-map
+            (magit-process-make-keymap process minibuffer-local-map)))
+       (concat (read-string prompt nil nil (user-login-name)) "\n")))))
+
+(defun magit-process-match-prompt (prompts string)
+  "Match STRING against PROMPTS and set match data.
+Return the matched string suffixed with \": \", if needed."
+  (when (--any-p (string-match it string) prompts)
+    (let ((prompt (match-string 0 string)))
+      (cond ((string-suffix-p ": " prompt) prompt)
+            ((string-suffix-p ":"  prompt) (concat prompt " "))
+            (t                             (concat prompt ": "))))))
+
+(defun magit--process-coding-system ()
+  (let ((fro (or magit-git-output-coding-system
+                 (car default-process-coding-system)))
+        (to (cdr default-process-coding-system)))
+    (if magit-process-ensure-unix-line-ending
+        (cons (coding-system-change-eol-conversion fro 'unix)
+              (coding-system-change-eol-conversion to 'unix))
+      (cons fro to))))
+
+(defvar magit-credential-hook nil
+  "Hook run before Git needs credentials.")
+
+(defvar magit-credential-cache-daemon-process nil)
+
+(defun magit-maybe-start-credential-cache-daemon ()
+  "Maybe start a `git-credential-cache--daemon' process.
+
+If such a process is already running or if the value of option
+`magit-credential-cache-daemon-socket' is nil, then do nothing.
+Otherwise start the process passing the value of that options
+as argument."
+  (unless (or (not magit-credential-cache-daemon-socket)
+              (process-live-p magit-credential-cache-daemon-process)
+              (memq magit-credential-cache-daemon-process
+                    (list-system-processes)))
+    (setq magit-credential-cache-daemon-process
+          (or (--first (let* ((attr (process-attributes it))
+                              (comm (cdr (assq 'comm attr)))
+                              (user (cdr (assq 'user attr))))
+                         (and (string= comm "git-credential-cache--daemon")
+                              (string= user user-login-name)))
+                       (list-system-processes))
+              (condition-case nil
+                  (start-process "git-credential-cache--daemon"
+                                 " *git-credential-cache--daemon*"
+                                 (magit-git-executable)
+                                 "credential-cache--daemon"
+                                 magit-credential-cache-daemon-socket)
+                ;; Some Git implementations (e.g., Windows) won't have
+                ;; this program; if we fail the first time, stop trying.
+                ((debug error)
+                 (remove-hook 'magit-credential-hook
+                              #'magit-maybe-start-credential-cache-daemon)))))))
+
+(add-hook 'magit-credential-hook #'magit-maybe-start-credential-cache-daemon)
+
+(defun tramp-sh-handle-start-file-process--magit-tramp-process-environment
+    (fn name buffer program &rest args)
+  (if magit-tramp-process-environment
+      (apply fn name buffer
+             (car magit-tramp-process-environment)
+             (append (cdr magit-tramp-process-environment)
+                     (cons program args)))
+    (apply fn name buffer program args)))
+
+(advice-add 'tramp-sh-handle-start-file-process :around
+            #'tramp-sh-handle-start-file-process--magit-tramp-process-environment)
+
+(defun tramp-sh-handle-process-file--magit-tramp-process-environment
+    (fn program &optional infile destination display &rest args)
+  (if magit-tramp-process-environment
+      (apply fn "env" infile destination display
+             (append magit-tramp-process-environment
+                     (cons program args)))
+    (apply fn program infile destination display args)))
+
+(advice-add 'tramp-sh-handle-process-file :around
+            #'tramp-sh-handle-process-file--magit-tramp-process-environment)
+
+(defvar-keymap magit-mode-line-process-map
+  :doc "Keymap for `mode-line-process'."
+  "<mode-line> <mouse-1>" ''magit-process-buffer)
+
+(defun magit-process-set-mode-line (program args)
+  "Display the git command (sans arguments) in the mode line."
+  (when (equal program (magit-git-executable))
+    (setq args (nthcdr (length magit-git-global-arguments) args)))
+  (let ((str (concat " " (propertize
+                          (concat (file-name-nondirectory program)
+                                  (and args (concat " " (car args))))
+                          'mouse-face 'highlight
+                          'keymap magit-mode-line-process-map
+                          'help-echo "mouse-1: Show process buffer"
+                          'font-lock-face 'magit-mode-line-process))))
+    (magit-repository-local-set 'mode-line-process str)
+    (dolist (buf (magit-mode-get-buffers))
+      (with-current-buffer buf
+        (setq mode-line-process str)))
+    (force-mode-line-update t)))
+
+(defun magit-process-set-mode-line-error-status (&optional error str)
+  "Apply an error face to the string set by `magit-process-set-mode-line'.
+
+If ERROR is supplied, include it in the `mode-line-process' tooltip.
+
+If STR is supplied, it replaces the `mode-line-process' text."
+  (setq str (or str (magit-repository-local-get 'mode-line-process)))
+  (when str
+    (setq error (format "%smouse-1: Show process buffer"
+                        (if (stringp error)
+                            (concat error "\n\n")
+                          "")))
+    (setq str (concat " " (propertize
+                           (substring-no-properties str 1)
+                           'mouse-face 'highlight
+                           'keymap magit-mode-line-process-map
+                           'help-echo error
+                           'font-lock-face 'magit-mode-line-process-error)))
+    (magit-repository-local-set 'mode-line-process str)
+    (dolist (buf (magit-mode-get-buffers))
+      (with-current-buffer buf
+        (setq mode-line-process str)))
+    (force-mode-line-update t)
+    ;; We remove any error status from the mode line when a magit
+    ;; buffer is refreshed (see `magit-refresh-buffer'), but we must
+    ;; ensure that we ignore any refreshes during the remainder of the
+    ;; current command -- otherwise a newly-set error status would be
+    ;; removed before it was seen.  We set a flag which prevents the
+    ;; status from being removed prior to the next command, so that
+    ;; the error status is guaranteed to remain visible until then.
+    (let ((repokey (magit-repository-local-repository)))
+      ;; The following closure captures the repokey value, and is
+      ;; added to `pre-command-hook'.
+      (cl-labels ((enable-magit-process-unset-mode-line ()
+                    ;; Remove ourself from the hook variable, so
+                    ;; that we only run once.
+                    (remove-hook 'pre-command-hook
+                                 #'enable-magit-process-unset-mode-line)
+                    ;; Clear the inhibit flag for the repository in
+                    ;; which we set it.
+                    (magit-repository-local-set
+                     'inhibit-magit-process-unset-mode-line nil repokey)))
+        ;; Set the inhibit flag until the next command is invoked.
+        (magit-repository-local-set
+         'inhibit-magit-process-unset-mode-line t repokey)
+        (add-hook 'pre-command-hook
+                  #'enable-magit-process-unset-mode-line)))))
+
+(defun magit-process-unset-mode-line-error-status ()
+  "Remove any current error status from the mode line."
+  (let ((status (or mode-line-process
+                    (magit-repository-local-get 'mode-line-process))))
+    (when (and status
+               (eq (get-text-property 1 'font-lock-face status)
+                   'magit-mode-line-process-error))
+      (magit-process-unset-mode-line))))
+
+(add-hook 'magit-refresh-buffer-hook
+          #'magit-process-unset-mode-line-error-status)
+
+(defun magit-process-unset-mode-line (&optional directory)
+  "Remove the git command from the mode line."
+  (let ((default-directory (or directory default-directory)))
+    (unless (magit-repository-local-get 'inhibit-magit-process-unset-mode-line)
+      (magit-repository-local-set 'mode-line-process nil)
+      (dolist (buf (magit-mode-get-buffers))
+        (with-current-buffer buf (setq mode-line-process nil)))
+      (force-mode-line-update t))))
+
+(defvar magit-process-error-message-regexps
+  (list "^\\*ERROR\\*: Canceled by user$"
+        "^\\(?:error\\|fatal\\|git\\): \\(.*\\)$"
+        "^\\(Cannot rebase:.*\\)$"))
+
+(define-error 'magit-git-error "Git error")
+
+(defun magit-process-error-summary (process-buf section)
+  "A one-line error summary from the given SECTION."
+  (or (and (buffer-live-p process-buf)
+           (with-current-buffer process-buf
+             (and (oref section content)
+                  (save-excursion
+                    (goto-char (oref section end))
+                    (run-hook-wrapped
+                     'magit-process-error-message-regexps
+                     (lambda (re)
+                       (save-excursion
+                         (and (re-search-backward
+                               re (oref section start) t)
+                              (or (match-string-no-properties 1)
+                                  (and (not magit-process-raise-error)
+                                       'suppressed))))))))))
+      "Git failed"))
+
+(defun magit-process-error-tooltip (process-buf section)
+  "Returns the text from SECTION of the PROCESS-BUF buffer.
+
+Limited by `magit-process-error-tooltip-max-lines'."
+  (and (integerp magit-process-error-tooltip-max-lines)
+       (> magit-process-error-tooltip-max-lines 0)
+       (buffer-live-p process-buf)
+       (with-current-buffer process-buf
+         (save-excursion
+           (goto-char (or (oref section content)
+                          (oref section start)))
+           (buffer-substring-no-properties
+            (point)
+            (save-excursion
+              (forward-line magit-process-error-tooltip-max-lines)
+              (goto-char
+               (if (> (point) (oref section end))
+                   (oref section end)
+                 (point)))
+              ;; Remove any trailing whitespace.
+              (when (re-search-backward "[^[:space:]\n]"
+                                        (oref section start) t)
+                (forward-char 1))
+              (point)))))))
+
+(defvar-local magit-this-error nil)
+
+(defvar magit-process-finish-apply-ansi-colors nil)
+
+(defun magit-process-finish (arg &optional process-buf command-buf
+                                 default-dir section)
+  (unless (integerp arg)
+    (setq process-buf (process-buffer arg))
+    (setq command-buf (process-get arg 'command-buf))
+    (setq default-dir (process-get arg 'default-dir))
+    (setq section     (process-get arg 'section))
+    (setq arg         (process-exit-status arg)))
+  (when (fboundp 'dired-uncache)
+    (dired-uncache default-dir))
+  (when (buffer-live-p process-buf)
+    (with-current-buffer process-buf
+      (let ((inhibit-read-only t)
+            (marker (oref section start)))
+        (goto-char marker)
+        (save-excursion
+          (delete-char 3)
+          (set-marker-insertion-type marker nil)
+          (insert (propertize (format "%3s" arg)
+                              'magit-section section
+                              'font-lock-face (if (= arg 0)
+                                                  'magit-process-ok
+                                                'magit-process-ng)))
+          (set-marker-insertion-type marker t))
+        (when magit-process-finish-apply-ansi-colors
+          (ansi-color-apply-on-region (oref section content)
+                                      (oref section end)))
+        (if (= (oref section end)
+               (+ (line-end-position) 2))
+            (save-excursion
+              (goto-char (1+ (line-end-position)))
+              (delete-char -1)
+              (oset section content nil))
+          (when (and (= arg 0)
+                     (not (--any-p (eq (window-buffer it) process-buf)
+                                   (window-list))))
+            (magit-section-hide section))))))
+  (if (= arg 0)
+      ;; Unset the `mode-line-process' value upon success.
+      (magit-process-unset-mode-line default-dir)
+    ;; Otherwise process the error.
+    (let ((msg (magit-process-error-summary process-buf section)))
+      ;; Change `mode-line-process' to an error face upon failure.
+      (if magit-process-display-mode-line-error
+          (magit-process-set-mode-line-error-status
+           (or (magit-process-error-tooltip process-buf section)
+               msg))
+        (magit-process-unset-mode-line default-dir))
+      ;; Either signal the error, or else display the error summary in
+      ;; the status buffer and with a message in the echo area.
+      (cond
+       (magit-process-raise-error
+        (signal 'magit-git-error (list (format "%s (in %s)" msg default-dir))))
+       ((not (eq msg 'suppressed))
+        (when (buffer-live-p process-buf)
+          (with-current-buffer process-buf
+            (when-let ((status-buf (magit-get-mode-buffer 'magit-status-mode)))
+              (with-current-buffer status-buf
+                (setq magit-this-error msg)))))
+        (message "%s ... [%s buffer %s for details]" msg
+                 (if-let ((key (and (buffer-live-p command-buf)
+                                    (with-current-buffer command-buf
+                                      (car (where-is-internal
+                                            'magit-process-buffer))))))
+                     (format "Hit %s to see" (key-description key))
+                   "See")
+                 (buffer-name process-buf))))))
+  arg)
+
+(defun magit-process-display-buffer (process)
+  (when (process-live-p process)
+    (let ((buf (process-buffer process)))
+      (cond ((not (buffer-live-p buf)))
+            ((= magit-process-popup-time 0)
+             (if (minibufferp)
+                 (switch-to-buffer-other-window buf)
+               (pop-to-buffer buf)))
+            ((> magit-process-popup-time 0)
+             (run-with-timer magit-process-popup-time nil
+                             (lambda (p)
+                               (when (eq (process-status p) 'run)
+                                 (let ((buf (process-buffer p)))
+                                   (when (buffer-live-p buf)
+                                     (if (minibufferp)
+                                         (switch-to-buffer-other-window buf)
+                                       (pop-to-buffer buf))))))
+                             process))))))
+
+(defun magit--log-action (summary line list)
+  (let (heading lines)
+    (if (cdr list)
+        (progn (setq heading (funcall summary list))
+               (setq lines (mapcar line list)))
+      (setq heading (funcall line (car list))))
+    (with-current-buffer (magit-process-buffer t)
+      (goto-char (1- (point-max)))
+      (let ((inhibit-read-only t))
+        (magit-insert-section (message)
+          (magit-insert-heading (concat "  * " heading))
+          (when lines
+            (dolist (line lines)
+              (insert line "\n"))
+            (insert "\n"))))
+      (let ((inhibit-message t))
+        (when heading
+          (setq lines (cons heading lines)))
+        (message (mapconcat #'identity lines "\n"))))))
+
+;;; _
+(provide 'magit-process)
+;;; magit-process.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-process.elc b/emacs/elpa/magit-20240514.1843/magit-process.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-pull.el b/emacs/elpa/magit-20240514.1843/magit-pull.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-pull.elc b/emacs/elpa/magit-20240514.1843/magit-pull.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-push.el b/emacs/elpa/magit-20240514.1843/magit-push.el
@@ -0,0 +1,377 @@
+;;; magit-push.el --- Update remote objects and refs  -*- 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 push commands.
+
+;;; Code:
+
+(require 'magit)
+
+;;; Commands
+
+;;;###autoload (autoload 'magit-push "magit-push" nil t)
+(transient-define-prefix magit-push ()
+  "Push to another repository."
+  :man-page "git-push"
+  ["Arguments"
+   ("-f" "Force with lease" (nil "--force-with-lease"))
+   ("-F" "Force"            ("-f" "--force"))
+   ("-h" "Disable hooks"    "--no-verify")
+   ("-n" "Dry run"          ("-n" "--dry-run"))
+   (5 "-u" "Set upstream"   "--set-upstream")
+   (7 "-t" "Follow tags"    "--follow-tags")]
+  [:if magit-get-current-branch
+   :description (lambda ()
+                  (format (propertize "Push %s to" 'face 'transient-heading)
+                          (propertize (magit-get-current-branch)
+                                      'face 'magit-branch-local)))
+   ("p" magit-push-current-to-pushremote)
+   ("u" magit-push-current-to-upstream)
+   ("e" "elsewhere" magit-push-current)]
+  ["Push"
+   [("o" "another branch"    magit-push-other)
+    ("r" "explicit refspecs" magit-push-refspecs)
+    ("m" "matching branches" magit-push-matching)]
+   [("T" "a tag"             magit-push-tag)
+    ("t" "all tags"          magit-push-tags)
+    (6 "n" "a note ref"      magit-push-notes-ref)]]
+  ["Configure"
+   ("C" "Set variables..."  magit-branch-configure)])
+
+(defun magit-push-arguments ()
+  (transient-args 'magit-push))
+
+(defun magit-git-push (branch target args)
+  (run-hooks 'magit-credential-hook)
+  ;; If the remote branch already exists, then we do not have to
+  ;; qualify the target, which we prefer to avoid doing because
+  ;; using the default namespace is wrong in obscure cases.
+  (pcase-let ((namespace (if (magit-get-tracked target) "" "refs/heads/"))
+              (`(,remote . ,target)
+               (magit-split-branch-name target)))
+    (magit-run-git-async "push" "-v" args remote
+                         (format "%s:%s%s" branch namespace target))))
+
+;;;###autoload (autoload 'magit-push-current-to-pushremote "magit-push" nil t)
+(transient-define-suffix magit-push-current-to-pushremote (args)
+  "Push the current branch to its push-remote.
+
+When the push-remote is not configured, then read the push-remote
+from the user, set it, and then push to it.  With a prefix
+argument the push-remote can be changed before pushed to it."
+  :if #'magit-get-current-branch
+  :description #'magit-push--pushbranch-description
+  (interactive (list (magit-push-arguments)))
+  (pcase-let ((`(,branch ,remote ,changed)
+               (magit--select-push-remote "push there")))
+    (when changed
+      (magit-confirm 'set-and-push
+        (string-replace
+         "%" "%%"
+         (format "Really use \"%s\" as push-remote and push \"%s\" there"
+                 remote branch))))
+    (run-hooks 'magit-credential-hook)
+    (magit-run-git-async "push" "-v" args remote
+                         (format "refs/heads/%s:refs/heads/%s"
+                                 branch branch)))) ; see #3847 and #3872
+
+(defun magit-push--pushbranch-description ()
+  (let* ((branch (magit-get-current-branch))
+         (target (magit-get-push-branch branch t))
+         (remote (magit-get-push-remote branch))
+         (v (magit--push-remote-variable branch t)))
+    (cond
+     (target)
+     ((member remote (magit-list-remotes))
+      (format "%s, creating it"
+              (magit--propertize-face (concat remote "/" branch)
+                                      'magit-branch-remote)))
+     (remote
+      (format "%s, replacing invalid" v))
+     (t
+      (format "%s, setting that" v)))))
+
+;;;###autoload (autoload 'magit-push-current-to-upstream "magit-push" nil t)
+(transient-define-suffix magit-push-current-to-upstream (args)
+  "Push 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."
+  :if #'magit-get-current-branch
+  :description #'magit-push--upstream-description
+  (interactive (list (magit-push-arguments)))
+  (let* ((branch (or (magit-get-current-branch)
+                     (user-error "No branch is checked out")))
+         (remote (magit-get "branch" branch "remote"))
+         (merge  (magit-get "branch" branch "merge")))
+    (when (or current-prefix-arg
+              (not (or (magit-get-upstream-branch branch)
+                       (magit--unnamed-upstream-p remote merge)
+                       (magit--valid-upstream-p remote merge))))
+      (let* ((branches (cl-union (--map (concat it "/" branch)
+                                        (magit-list-remotes))
+                                 (magit-list-remote-branch-names)
+                                 :test #'equal))
+             (upstream (magit-completing-read
+                        (format "Set upstream of %s and push there" branch)
+                        branches nil nil nil 'magit-revision-history
+                        (or (car (member (magit-remote-branch-at-point) branches))
+                            (car (member "origin/master" branches)))))
+             (upstream* (or (magit-get-tracked upstream)
+                            (magit-split-branch-name upstream))))
+        (setq remote (car upstream*))
+        (setq merge  (cdr upstream*))
+        (unless (string-prefix-p "refs/" merge)
+          ;; User selected a non-existent remote-tracking branch.
+          ;; It is very likely, but not certain, that this is the
+          ;; correct thing to do.  It is even more likely that it
+          ;; is what the user wants to happen.
+          (setq merge (concat "refs/heads/" merge)))
+        (magit-confirm 'set-and-push
+          (string-replace
+           "%" "%%"
+           (format "Really use \"%s\" as upstream and push \"%s\" there"
+                   upstream branch))))
+      (cl-pushnew "--set-upstream" args :test #'equal))
+    (run-hooks 'magit-credential-hook)
+    (magit-run-git-async "push" "-v" args remote (concat branch ":" merge))))
+
+(defun magit-push--upstream-description ()
+  (and-let* ((branch (magit-get-current-branch)))
+    (or (magit-get-upstream-branch branch)
+        (let ((remote (magit-get "branch" branch "remote"))
+              (merge  (magit-get "branch" branch "merge"))
+              (u (magit--propertize-face "@{upstream}" 'bold)))
+          (cond
+           ((magit--unnamed-upstream-p remote merge)
+            (format "%s as %s"
+                    (magit--propertize-face remote 'bold)
+                    (magit--propertize-face merge 'magit-branch-remote)))
+           ((magit--valid-upstream-p remote merge)
+            (format "%s creating %s"
+                    (magit--propertize-face remote 'magit-branch-remote)
+                    (magit--propertize-face merge 'magit-branch-remote)))
+           ((or remote merge)
+            (concat u ", creating it and replacing invalid"))
+           (t
+            (concat u ", creating it")))))))
+
+;;;###autoload
+(defun magit-push-current (target args)
+  "Push the current branch to a branch read in the minibuffer."
+  (interactive
+   (if-let ((current (magit-get-current-branch)))
+       (list (magit-read-remote-branch (format "Push %s to" current)
+                                       nil nil current 'confirm)
+             (magit-push-arguments))
+     (user-error "No branch is checked out")))
+  (magit-git-push (magit-get-current-branch) target args))
+
+;;;###autoload
+(defun magit-push-other (source target args)
+  "Push an arbitrary branch or commit somewhere.
+Both the source and the target are read in the minibuffer."
+  (interactive
+   (let ((source (magit-read-local-branch-or-commit "Push")))
+     (list source
+           (magit-read-remote-branch
+            (format "Push %s to" source) nil
+            (if (magit-local-branch-p source)
+                (or (magit-get-push-branch source)
+                    (magit-get-upstream-branch source))
+              (and (magit-rev-ancestor-p source "HEAD")
+                   (or (magit-get-push-branch)
+                       (magit-get-upstream-branch))))
+            source 'confirm)
+           (magit-push-arguments))))
+  (magit-git-push source target args))
+
+(defvar magit-push-refspecs-history nil)
+
+;;;###autoload
+(defun magit-push-refspecs (remote refspecs args)
+  "Push one or multiple REFSPECS to a REMOTE.
+Both the REMOTE and the REFSPECS 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."
+  (interactive
+   (list (magit-read-remote "Push to remote")
+         (magit-completing-read-multiple
+          "Push refspec,s: "
+          (cons "HEAD" (magit-list-local-branch-names))
+          nil nil nil 'magit-push-refspecs-history)
+         (magit-push-arguments)))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" "-v" args remote refspecs))
+
+;;;###autoload
+(defun magit-push-matching (remote &optional args)
+  "Push all matching branches to another repository.
+If multiple remotes exist, then read one from the user.
+If just one exists, use that without requiring confirmation."
+  (interactive (list (magit-read-remote "Push matching branches to" nil t)
+                     (magit-push-arguments)))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" "-v" args remote ":"))
+
+;;;###autoload
+(defun magit-push-tags (remote &optional args)
+  "Push 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."
+  (interactive (list (magit-read-remote "Push tags to remote" nil t)
+                     (magit-push-arguments)))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" remote "--tags" args))
+
+;;;###autoload
+(defun magit-push-tag (tag remote &optional args)
+  "Push a tag to another repository."
+  (interactive
+   (let  ((tag (magit-read-tag "Push tag")))
+     (list tag (magit-read-remote (format "Push %s to remote" tag) nil t)
+           (magit-push-arguments))))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" remote tag args))
+
+;;;###autoload
+(defun magit-push-notes-ref (ref remote &optional args)
+  "Push a notes ref to another repository."
+  (interactive
+   (let ((note (magit-notes-read-ref "Push notes" nil nil)))
+     (list note
+           (magit-read-remote (format "Push %s to remote" note) nil t)
+           (magit-push-arguments))))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" remote ref args))
+
+;;;###autoload (autoload 'magit-push-implicitly "magit-push" nil t)
+(transient-define-suffix magit-push-implicitly (args)
+  "Push somewhere without using an explicit refspec.
+
+This command simply runs \"git push -v [ARGS]\".  ARGS are the
+arguments specified in the popup buffer.  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.  To add it use something like:
+
+  (transient-insert-suffix \\='magit-push \"o\"
+    \\='(\"i\" magit-push-implicitly))"
+  :description #'magit-push-implicitly--desc
+  (interactive (list (magit-push-arguments)))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" "-v" args))
+
+(defun magit-push-implicitly--desc ()
+  ;; This implements the logic for git push as documented.
+  ;; First, we resolve a remote to use based on various remote and
+  ;; pushRemote options.
+  ;; Then, we resolve the refspec to use for the remote based on push
+  ;; and pushDefault options.
+  ;; Note that the remote and refspec to push are handled separately,
+  ;; so it doesn't make sense to talk about "pushing to upstream".
+  ;; Depending on the options, you could end up pushing to the
+  ;; "upstream" remote but not the "upstream" branch, and vice versa.
+  (let* ((branch (magit-get-current-branch))
+         (remote (or (magit-get-push-remote branch)
+                     ;; Note: Avoid `magit-get-remote' because it
+                     ;; filters out the local repo case (".").
+                     (magit-get "branch" branch "remote")
+                     (let ((remotes (magit-list-remotes)))
+                       (cond
+                        ((and (magit-git-version>= "2.27")
+                              (= (length remotes) 1))
+                         (car remotes))
+                        ((member "origin" remotes) "origin"))))))
+    (if (null remote)
+        "nothing (no remote)"
+      (let ((refspec (magit-get "remote" remote "push")))
+        (if refspec
+            (format "to %s with refspecs %s"
+                    (magit--propertize-face remote 'bold)
+                    (magit--propertize-face refspec 'bold))
+          (pcase (or (magit-get "push.default") "simple")
+            ("nothing" "nothing (due to push.default)")
+            ((or "current" "simple")
+             (format "%s to %s"
+                     (magit--propertize-face branch 'magit-branch-current)
+                     (magit--propertize-face (format "%s/%s" remote branch)
+                                             'magit-branch-remote)))
+            ((or "upstream" "tracking")
+             (let ((ref (magit-get "branch" branch "merge")))
+               (if ref
+                   (format "%s to %s"
+                           (magit--propertize-face branch 'magit-branch-current)
+                           (cond
+                            ((string-prefix-p "refs/heads/" ref)
+                             (magit--propertize-face
+                              (format "%s/%s" remote
+                                      (substring ref (length "refs/heads/")))
+                              'magit-branch-remote))
+                            ((not (string-match "/" ref))
+                             (magit--propertize-face (format "%s/%s" remote ref)
+                                                     'magit-branch-remote))
+                            ((format "%s as %s"
+                                     (magit--propertize-face remote 'bold)
+                                     (magit--propertize-face ref 'bold)))))
+                 "nothing (no upstream)")))
+            ("matching" (format "all matching to %s"
+                                (magit--propertize-face remote 'bold)))))))))
+
+;;;###autoload (autoload 'magit-push-to-remote "magit-push" nil t)
+(transient-define-suffix magit-push-to-remote (remote args)
+  "Push to 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 arguments specified in the popup buffer.  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'.
+
+You can add this command as a suffix using something like:
+
+  (transient-insert-suffix \\='magit-push \"o\"
+    \\='(\"x\" magit-push-to-remote))"
+  :description #'magit-push-to-remote--desc
+  (interactive (list (magit-read-remote "Push to remote")
+                     (magit-push-arguments)))
+  (run-hooks 'magit-credential-hook)
+  (magit-run-git-async "push" "-v" args remote))
+
+(defun magit-push-to-remote--desc ()
+  (format "using %s" (magit--propertize-face "git push <remote>" 'bold)))
+
+;;; _
+(provide 'magit-push)
+;;; magit-push.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-push.elc b/emacs/elpa/magit-20240514.1843/magit-push.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-reflog.el b/emacs/elpa/magit-20240514.1843/magit-reflog.el
diff --git a/emacs/elpa/magit-20240514.1843/magit-reflog.elc b/emacs/elpa/magit-20240514.1843/magit-reflog.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-refs.el b/emacs/elpa/magit-20240514.1843/magit-refs.el
@@ -0,0 +1,789 @@
+;;; magit-refs.el --- Listing references  -*- 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 support for listing references in a buffer.
+
+;;; Code:
+
+(require 'magit)
+
+;;; Options
+
+(defgroup magit-refs nil
+  "Inspect and manipulate Git branches and tags."
+  :link '(info-link "(magit)References Buffer")
+  :group 'magit-modes)
+
+(defcustom magit-refs-mode-hook nil
+  "Hook run after entering Magit-Refs mode."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refs
+  :type 'hook)
+
+(defcustom magit-refs-sections-hook
+  '(magit-insert-error-header
+    magit-insert-branch-description
+    magit-insert-local-branches
+    magit-insert-remote-branches
+    magit-insert-tags)
+  "Hook run to insert sections into a references buffer."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refs
+  :type 'hook)
+
+(defcustom magit-refs-show-commit-count nil
+  "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.
+
+To change the value in an existing buffer use the command
+`magit-refs-set-show-commit-count'."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-refs
+  :safe (lambda (val) (memq val '(all branch nil)))
+  :type '(choice (const :tag "For branches and tags" all)
+                 (const :tag "For branches only"     branch)
+                 (const :tag "Never"                 nil)))
+(put 'magit-refs-show-commit-count 'safe-local-variable 'symbolp)
+(put 'magit-refs-show-commit-count 'permanent-local t)
+
+(defcustom magit-refs-pad-commit-counts nil
+  "Whether to pad all 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."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-refs
+  :type 'boolean)
+
+(defvar magit-refs-show-push-remote nil
+  "Whether to show the push-remotes of local branches.
+Also show the commits that the local branch is ahead and behind
+the push-target.  Unfortunately there is a bug in Git that makes
+this useless (the commits ahead and behind the upstream are
+shown), so this isn't enabled yet.")
+
+(defcustom magit-refs-show-remote-prefix nil
+  "Whether to show the remote prefix in lists of remote branches.
+
+This is redundant because the name of the remote is already shown
+in the heading preceding the list of its branches."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-refs
+  :type 'boolean)
+
+(defcustom magit-refs-margin
+  (list nil
+        (nth 1 magit-log-margin)
+        'magit-log-margin-width nil
+        (nth 4 magit-log-margin))
+  "Format of the margin in `magit-refs-mode' buffers.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-refs
+  :group 'magit-margin
+  :safe (lambda (val) (memq val '(all branch nil)))
+  :type magit-log-margin--custom-type
+  :initialize #'magit-custom-initialize-reset
+  :set-after '(magit-log-margin)
+  :set (apply-partially #'magit-margin-set-variable 'magit-refs-mode))
+
+(defcustom magit-refs-margin-for-tags nil
+  "Whether to show information about tags in the margin.
+
+This is disabled by default because it is slow if there are many
+tags."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-refs
+  :group 'magit-margin
+  :type 'boolean)
+
+(defcustom magit-refs-primary-column-width (cons 16 32)
+  "Width of the focus 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.)"
+  :package-version '(magit . "2.12.0")
+  :group 'magit-refs
+  :type '(choice (integer :tag "Constant wide")
+                 (cons    :tag "Wide constrains"
+                          (integer :tag "Minimum")
+                          (integer :tag "Maximum"))))
+
+(defcustom magit-refs-focus-column-width 5
+  "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."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-refs
+  :type 'integer)
+
+(defcustom magit-refs-filter-alist nil
+  "Alist controlling which refs are omitted from `magit-refs-mode' buffers.
+
+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.
+
+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."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-refs
+  :type '(alist :key-type   (choice  :tag "Key" regexp function)
+                :value-type (boolean :tag "Value"
+                                     :on  "show (non-nil)"
+                                     :off "omit (nil)")))
+
+(defcustom magit-visit-ref-behavior nil
+  "Control 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 have grown accustomed
+to such inconsistent, but to you useful, behavior, then you can
+restore that 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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-refs
+  :group 'magit-commands
+  :options '(focus-on-ref create-branch checkout-any checkout-branch)
+  :type '(list :convert-widget custom-hook-convert-widget))
+
+;;; Mode
+
+(defvar-keymap magit-refs-mode-map
+  :doc "Keymap for `magit-refs-mode'."
+  :parent magit-mode-map
+  "C-y" #'magit-refs-set-show-commit-count
+  "L"   #'magit-margin-settings)
+
+(define-derived-mode magit-refs-mode magit-mode "Magit Refs"
+  "Mode which lists and compares references.
+
+This mode is documented in info node `(magit)References Buffer'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-section-toggle] to expand or hide the section at point.
+Type \\[magit-visit-thing] or \\[magit-diff-show-or-scroll-up] \
+to visit the commit or branch at point.
+
+Type \\[magit-branch] to see available branch commands.
+Type \\[magit-merge] to merge the branch or commit at point.
+Type \\[magit-cherry-pick] to apply the commit at point.
+Type \\[magit-reset] to reset `HEAD' to the commit at point.
+
+\\{magit-refs-mode-map}"
+  :group 'magit-refs
+  (hack-dir-local-variables-non-file-buffer)
+  (setq magit--imenu-group-types '(local remote tags)))
+
+(defun magit-refs-setup-buffer (ref args)
+  (magit-setup-buffer #'magit-refs-mode nil
+    (magit-buffer-upstream ref)
+    (magit-buffer-arguments args)))
+
+(defun magit-refs-refresh-buffer ()
+  (setq magit-set-buffer-margin-refresh (not (magit-buffer-margin-p)))
+  (unless (magit-rev-verify magit-buffer-upstream)
+    (setq magit-refs-show-commit-count nil))
+  (magit-set-header-line-format
+   (format "%s %s" magit-buffer-upstream
+           (mapconcat #'identity magit-buffer-arguments " ")))
+  (magit-insert-section (branchbuf)
+    (magit-run-section-hook 'magit-refs-sections-hook))
+  (add-hook 'kill-buffer-hook #'magit-preserve-section-visibility-cache))
+
+(cl-defmethod magit-buffer-value (&context (major-mode magit-refs-mode))
+  (cons magit-buffer-upstream magit-buffer-arguments))
+
+;;; Commands
+
+;;;###autoload (autoload 'magit-show-refs "magit-refs" nil t)
+(transient-define-prefix magit-show-refs (&optional transient)
+  "List and compare references in a dedicated buffer."
+  :man-page "git-branch"
+  :value (lambda ()
+           (magit-show-refs-arguments magit-prefix-use-buffer-arguments))
+  ["Arguments"
+   (magit-for-each-ref:--contains)
+   ("-M" "Merged"               "--merged=" magit-transient-read-revision)
+   ("-m" "Merged to HEAD"       "--merged")
+   ("-N" "Not merged"           "--no-merged=" magit-transient-read-revision)
+   ("-n" "Not merged to HEAD"   "--no-merged")
+   (magit-for-each-ref:--sort)]
+  ["Actions"
+   ("y" "Show refs, comparing them with HEAD"           magit-show-refs-head)
+   ("c" "Show refs, comparing them with current branch" magit-show-refs-current)
+   ("o" "Show refs, comparing them with other branch"   magit-show-refs-other)
+   ("r" "Show refs, changing commit count display"
+    magit-refs-set-show-commit-count)]
+  (interactive (list (or (derived-mode-p 'magit-refs-mode)
+                         current-prefix-arg)))
+  (if transient
+      (transient-setup 'magit-show-refs)
+    (magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))
+
+(defun magit-show-refs-arguments (&optional use-buffer-args)
+  (unless use-buffer-args
+    (setq use-buffer-args magit-direct-use-buffer-arguments))
+  (let (args)
+    (cond
+     ((eq transient-current-command 'magit-show-refs)
+      (setq args (transient-args 'magit-show-refs)))
+     ((eq major-mode 'magit-refs-mode)
+      (setq args magit-buffer-arguments))
+     ((and (memq use-buffer-args '(always selected))
+           (and-let* ((buffer (magit-get-mode-buffer
+                               'magit-refs-mode nil
+                               (eq use-buffer-args 'selected))))
+             (progn
+               (setq args (buffer-local-value 'magit-buffer-arguments buffer))
+               t))))
+     (t
+      (setq args (alist-get 'magit-show-refs transient-values))))
+    args))
+
+(transient-define-argument magit-for-each-ref:--contains ()
+  :description "Contains"
+  :class 'transient-option
+  :key "-c"
+  :argument "--contains="
+  :reader #'magit-transient-read-revision)
+
+(transient-define-argument magit-for-each-ref:--sort ()
+  :description "Sort"
+  :class 'transient-option
+  :key "-s"
+  :argument "--sort="
+  :reader #'magit-read-ref-sort)
+
+(defun magit-read-ref-sort (prompt initial-input _history)
+  (magit-completing-read prompt
+                         '("-committerdate" "-authordate"
+                           "committerdate" "authordate")
+                         nil nil initial-input))
+
+;;;###autoload
+(defun magit-show-refs-head (&optional args)
+  "List and compare references in a dedicated buffer.
+Compared with `HEAD'."
+  (interactive (list (magit-show-refs-arguments)))
+  (magit-refs-setup-buffer "HEAD" args))
+
+;;;###autoload
+(defun magit-show-refs-current (&optional args)
+  "List and compare references in a dedicated buffer.
+Compare with the current branch or `HEAD' if it is detached."
+  (interactive (list (magit-show-refs-arguments)))
+  (magit-refs-setup-buffer (magit-get-current-branch) args))
+
+;;;###autoload
+(defun magit-show-refs-other (&optional ref args)
+  "List and compare references in a dedicated buffer.
+Compared with a branch read from the user."
+  (interactive (list (magit-read-other-branch "Compare with")
+                     (magit-show-refs-arguments)))
+  (magit-refs-setup-buffer ref args))
+
+(transient-define-suffix magit-refs-set-show-commit-count ()
+  "Change for which refs the commit count is shown."
+  :description "Change verbosity"
+  :key "v"
+  :transient nil
+  :if-derived 'magit-refs-mode
+  (interactive)
+  (setq-local magit-refs-show-commit-count
+              (magit-read-char-case "Show commit counts for " nil
+                (?a "[a]ll refs" 'all)
+                (?b "[b]ranches only" t)
+                (?n "[n]othing" nil)))
+  (magit-refresh))
+
+(defun magit-visit-ref ()
+  "Visit the reference or revision at point in another buffer.
+If there is no revision at point or with a prefix argument prompt
+for a revision.
+
+This command behaves just like `magit-show-commit', except if
+point is on a reference in a `magit-refs-mode' buffer (a buffer
+listing branches and tags), in which case the behavior may be
+different, but only if you have customized the option
+`magit-visit-ref-behavior' (which see).  When invoked from a
+menu this command always behaves like `magit-show-commit'."
+  (interactive)
+  (if (and (derived-mode-p 'magit-refs-mode)
+           (magit-section-match '(branch tag))
+           (not (magit-menu-position)))
+      (let ((ref (oref (magit-current-section) value)))
+        (cond (current-prefix-arg
+               (cond ((memq 'focus-on-ref magit-visit-ref-behavior)
+                      (magit-refs-setup-buffer ref (magit-show-refs-arguments)))
+                     (magit-visit-ref-behavior
+                      ;; Don't prompt for commit to visit.
+                      (let ((current-prefix-arg nil))
+                        (call-interactively #'magit-show-commit)))))
+              ((and (memq 'create-branch magit-visit-ref-behavior)
+                    (magit-section-match [branch remote]))
+               (let ((branch (cdr (magit-split-branch-name ref))))
+                 (if (magit-branch-p branch)
+                     (if (magit-rev-eq branch ref)
+                         (magit-call-git "checkout" branch)
+                       (setq branch (propertize branch 'face 'magit-branch-local))
+                       (setq ref (propertize ref 'face 'magit-branch-remote))
+                       (pcase (prog1 (read-char-choice (format (propertize "\
+Branch %s already exists.
+  [c]heckout %s as-is
+  [r]reset %s to %s and checkout %s
+  [a]bort " 'face 'minibuffer-prompt) branch branch branch ref branch)
+                                                       '(?c ?r ?a))
+                                (message "")) ; otherwise prompt sticks
+                         (?c (magit-call-git "checkout" branch))
+                         (?r (magit-call-git "checkout" "-B" branch ref))
+                         (?a (user-error "Abort"))))
+                   (magit-call-git "checkout" "-b" branch ref))
+                 (setq magit-buffer-upstream branch)
+                 (magit-refresh)))
+              ((or (memq 'checkout-any magit-visit-ref-behavior)
+                   (and (memq 'checkout-branch magit-visit-ref-behavior)
+                        (magit-section-match [branch local])))
+               (magit-call-git "checkout" ref)
+               (setq magit-buffer-upstream ref)
+               (magit-refresh))
+              (t
+               (call-interactively #'magit-show-commit))))
+    (call-interactively #'magit-show-commit)))
+
+;;; Sections
+
+(defvar-keymap magit-remote-section-map
+  :doc "Keymap for `remote' sections."
+  "<remap> <magit-file-rename>"  #'magit-remote-rename
+  "<remap> <magit-delete-thing>" #'magit-remote-remove
+  "<2>" (magit-menu-item "Rename %s" #'magit-remote-rename)
+  "<1>" (magit-menu-item "Remove %m" #'magit-remote-remove))
+
+(defvar-keymap magit-branch-section-map
+  :doc "Keymap for `branch' sections."
+  "<remap> <magit-file-rename>"  #'magit-branch-rename
+  "<remap> <magit-delete-thing>" #'magit-branch-delete
+  "<remap> <magit-visit-thing>"  #'magit-visit-ref
+  "<3>" (magit-menu-item "Rename %s"    #'magit-branch-rename)
+  "<2>" (magit-menu-item "Delete %m"    #'magit-branch-delete)
+  "<1>" (magit-menu-item "Visit commit" #'magit-visit-ref))
+
+(defvar-keymap magit-tag-section-map
+  :doc "Keymap for `tag' sections."
+  "<remap> <magit-delete-thing>" #'magit-tag-delete
+  "<remap> <magit-visit-thing>"  #'magit-visit-ref
+  "<2>" (magit-menu-item "Delete %m" #'magit-tag-delete)
+  "<1>" (magit-menu-item "Visit %s"  #'magit-visit-ref))
+
+(defun magit--painted-branch-as-menu-section (section)
+  (and-let* ((branch (and (magit-section-match 'commit)
+                          (magit--painted-branch-at-point))))
+    (let ((dummy (magit-section :type 'branch :value branch)))
+      (oset dummy keymap magit-branch-section-map)
+      (dolist (slot '(start content hidden parent children))
+        (when (slot-boundp section slot)
+          (setf (eieio-oref dummy slot)
+                (eieio-oref section slot))))
+      dummy)))
+
+(add-hook 'magit-menu-alternative-section-hook
+          #'magit--painted-branch-as-menu-section)
+
+(defun magit-insert-branch-description ()
+  "Insert header containing the description of the current branch.
+Insert a header line with the name and description of the
+current branch.  The description is taken from the Git variable
+`branch.<NAME>.description'; if that is undefined then no header
+line is inserted at all."
+  (when-let* ((branch (magit-get-current-branch))
+              (desc (magit-get "branch" branch "description"))
+              (desc (split-string desc "\n")))
+    (when (equal (car (last desc)) "")
+      (setq desc (butlast desc)))
+    (magit-insert-section (branchdesc branch t)
+      (magit-insert-heading branch ": " (car desc))
+      (when (cdr desc)
+        (insert (mapconcat #'identity (cdr desc) "\n"))
+        (insert "\n\n")))))
+
+(defun magit-insert-tags ()
+  "Insert sections showing all tags."
+  (when-let ((tags (magit-git-lines "tag" "--list" "-n" magit-buffer-arguments)))
+    (let ((_head (magit-rev-parse "HEAD")))
+      (magit-insert-section (tags)
+        (magit-insert-heading "Tags:")
+        (dolist (tag tags)
+          (string-match "^\\([^ \t]+\\)[ \t]+\\([^ \t\n].*\\)?" tag)
+          (let ((tag (match-string 1 tag))
+                (msg (match-string 2 tag)))
+            (when (magit-refs--insert-refname-p tag)
+              (magit-insert-section (tag tag t)
+                (magit-insert-heading
+                  (magit-refs--format-focus-column tag 'tag)
+                  (propertize tag 'font-lock-face 'magit-tag)
+                  (make-string
+                   (max 1 (- (if (consp magit-refs-primary-column-width)
+                                 (car magit-refs-primary-column-width)
+                               magit-refs-primary-column-width)
+                             (length tag)))
+                   ?\s)
+                  (and msg (magit-log-propertize-keywords nil msg)))
+                (when (and magit-refs-margin-for-tags (magit-buffer-margin-p))
+                  (magit-refs--format-margin tag))
+                (magit-refs--insert-cherry-commits tag)))))
+        (insert ?\n)
+        (magit-make-margin-overlay nil t)))))
+
+(defun magit-insert-remote-branches ()
+  "Insert sections showing all remote-tracking branches."
+  (dolist (remote (magit-list-remotes))
+    (magit-insert-section (remote remote)
+      (magit-insert-heading
+        (let ((pull (magit-get "remote" remote "url"))
+              (push (magit-get "remote" remote "pushurl")))
+          (format (propertize "Remote %s (%s):"
+                              'font-lock-face 'magit-section-heading)
+                  (propertize remote 'font-lock-face 'magit-branch-remote)
+                  (concat pull (and pull push ", ") push))))
+      (let (head)
+        (dolist (line (magit-git-lines "for-each-ref" "--format=\
+%(symref:short)%00%(refname:short)%00%(refname)%00%(subject)"
+                                       (concat "refs/remotes/" remote)
+                                       magit-buffer-arguments))
+          (pcase-let ((`(,head-branch ,branch ,ref ,msg)
+                       (cl-substitute nil ""
+                                      (split-string line "\0")
+                                      :test #'equal)))
+            (cond
+             (head-branch
+              ;; Note: Use `ref' instead of `branch' for the check
+              ;; below because 'refname:short' shortens the remote
+              ;; HEAD to '<remote>' instead of '<remote>/HEAD' as of
+              ;; Git v2.40.0.
+              (cl-assert
+               (equal ref (concat "refs/remotes/" remote "/HEAD")))
+              (setq head head-branch))
+             ((not (equal ref (concat "refs/remotes/" remote "/HEAD")))
+              ;; ^ Skip mis-configured remotes where HEAD is not a
+              ;; symref.  See #5092.
+              (when (magit-refs--insert-refname-p branch)
+                (magit-insert-section (branch branch t)
+                  (let ((headp (equal branch head))
+                        (abbrev (if magit-refs-show-remote-prefix
+                                    branch
+                                  (substring branch (1+ (length remote))))))
+                    (magit-insert-heading
+                      (magit-refs--format-focus-column branch)
+                      (magit-refs--propertize-branch
+                       abbrev ref (and headp 'magit-branch-remote-head))
+                      (make-string
+                       (max 1 (- (if (consp magit-refs-primary-column-width)
+                                     (car magit-refs-primary-column-width)
+                                   magit-refs-primary-column-width)
+                                 (length abbrev)))
+                       ?\s)
+                      (and msg (magit-log-propertize-keywords nil msg))))
+                  (when (magit-buffer-margin-p)
+                    (magit-refs--format-margin branch))
+                  (magit-refs--insert-cherry-commits branch))))))))
+      (insert ?\n)
+      (magit-make-margin-overlay nil t))))
+
+(defun magit-insert-local-branches ()
+  "Insert sections showing all local branches."
+  (magit-insert-section (local nil)
+    (magit-insert-heading "Branches:")
+    (dolist (line (magit-refs--format-local-branches))
+      (pcase-let ((`(,branch . ,strings) line))
+        (magit-insert-section
+            ((eval (if branch 'branch 'commit))
+             (or branch (magit-rev-parse "HEAD"))
+             t)
+          (apply #'magit-insert-heading strings)
+          (when (magit-buffer-margin-p)
+            (magit-refs--format-margin branch))
+          (magit-refs--insert-cherry-commits branch))))
+    (insert ?\n)
+    (magit-make-margin-overlay nil t)))
+
+(defun magit-refs--format-local-branches ()
+  (let ((lines (seq-keep #'magit-refs--format-local-branch
+                         (magit-git-lines
+                          "for-each-ref"
+                          (concat "--format=\
+%(HEAD)%00%(refname:short)%00%(refname)%00\
+%(upstream:short)%00%(upstream)%00%(upstream:track)%00"
+                                  (if magit-refs-show-push-remote "\
+%(push:remotename)%00%(push)%00%(push:track)%00%(subject)"
+                                 "%00%00%00%(subject)"))
+                          "refs/heads"
+                          magit-buffer-arguments))))
+    (unless (magit-get-current-branch)
+      (push (magit-refs--format-local-branch
+             (concat "*\0\0\0\0\0\0\0\0" (magit-rev-format "%s")))
+            lines))
+    (setq-local magit-refs-primary-column-width
+                (let ((def (default-value 'magit-refs-primary-column-width)))
+                  (if (atom def)
+                      def
+                    (pcase-let ((`(,min . ,max) def))
+                      (min max (apply #'max min (mapcar #'car lines)))))))
+    (mapcar (pcase-lambda (`(,_ ,branch ,focus ,branch-desc ,u:ahead ,p:ahead
+                                ,u:behind ,upstream ,p:behind ,push ,msg))
+              (list branch focus branch-desc u:ahead p:ahead
+                    (make-string (max 1 (- magit-refs-primary-column-width
+                                           (length (concat branch-desc
+                                                           u:ahead
+                                                           p:ahead
+                                                           u:behind))))
+                                 ?\s)
+                    u:behind upstream p:behind push
+                    msg))
+            lines)))
+
+(defun magit-refs--format-local-branch (line)
+  (pcase-let ((`(,head ,branch ,ref ,upstream ,u:ref ,u:track
+                       ,push ,p:ref ,p:track ,msg)
+               (cl-substitute nil "" (split-string line "\0") :test #'equal)))
+    (when (or (not branch)
+              (magit-refs--insert-refname-p branch))
+      (let* ((headp (equal head "*"))
+             (pushp (and push
+                         magit-refs-show-push-remote
+                         (magit-rev-verify p:ref)
+                         (not (equal p:ref u:ref))))
+             (branch-desc
+              (if branch
+                  (magit-refs--propertize-branch
+                   branch ref (and headp 'magit-branch-current))
+                (magit--propertize-face "(detached)" 'magit-branch-warning)))
+             (u:ahead  (and u:track
+                            (string-match "ahead \\([0-9]+\\)" u:track)
+                            (magit--propertize-face
+                             (concat (and magit-refs-pad-commit-counts " ")
+                                     (match-string 1 u:track)
+                                     ">")
+                             'magit-dimmed)))
+             (u:behind (and u:track
+                            (string-match "behind \\([0-9]+\\)" u:track)
+                            (magit--propertize-face
+                             (concat "<"
+                                     (match-string 1 u:track)
+                                     (and magit-refs-pad-commit-counts " "))
+                             'magit-dimmed)))
+             (p:ahead  (and pushp p:track
+                            (string-match "ahead \\([0-9]+\\)" p:track)
+                            (magit--propertize-face
+                             (concat (match-string 1 p:track)
+                                     ">"
+                                     (and magit-refs-pad-commit-counts " "))
+                             'magit-branch-remote)))
+             (p:behind (and pushp p:track
+                            (string-match "behind \\([0-9]+\\)" p:track)
+                            (magit--propertize-face
+                             (concat "<"
+                                     (match-string 1 p:track)
+                                     (and magit-refs-pad-commit-counts " "))
+                             'magit-dimmed))))
+        (list (1+ (length (concat branch-desc u:ahead p:ahead u:behind)))
+              branch
+              (magit-refs--format-focus-column branch headp)
+              branch-desc u:ahead p:ahead u:behind
+              (and upstream
+                   (concat (if (equal u:track "[gone]")
+                               (magit--propertize-face upstream 'error)
+                             (magit-refs--propertize-branch upstream u:ref))
+                           " "))
+              (and pushp
+                   (concat p:behind
+                           (magit--propertize-face
+                            push 'magit-branch-remote)
+                           " "))
+              (and msg (magit-log-propertize-keywords nil msg)))))))
+
+(defun magit-refs--format-focus-column (ref &optional type)
+  (let ((focus magit-buffer-upstream)
+        (width (if magit-refs-show-commit-count
+                   magit-refs-focus-column-width
+                 1)))
+    (format
+     (format "%%%ss " width)
+     (cond ((or (equal ref focus)
+                (and (eq type t)
+                     (equal focus "HEAD")))
+            (magit--propertize-face (concat (if (equal focus "HEAD") "@" "*")
+                                            (make-string (1- width) ?\s))
+                                    'magit-section-heading))
+           ((if (eq type 'tag)
+                (eq magit-refs-show-commit-count 'all)
+              magit-refs-show-commit-count)
+            (pcase-let ((`(,behind ,ahead)
+                         (magit-rev-diff-count magit-buffer-upstream ref)))
+              (magit--propertize-face
+               (cond ((> ahead  0) (concat "<" (number-to-string ahead)))
+                     ((> behind 0) (concat (number-to-string behind) ">"))
+                     (t "="))
+               'magit-dimmed)))
+           (t "")))))
+
+(defun magit-refs--propertize-branch (branch ref &optional head-face)
+  (let ((face (cdr (cl-find-if (pcase-lambda (`(,re . ,_))
+                                 (string-match-p re ref))
+                               magit-ref-namespaces))))
+    (magit--propertize-face
+     branch (if head-face (list face head-face) face))))
+
+(defun magit-refs--insert-refname-p (refname)
+  (if-let ((entry (seq-find (pcase-lambda (`(,key . ,_))
+                              (if (functionp key)
+                                  (funcall key refname)
+                                (string-match-p key refname)))
+                            magit-refs-filter-alist)))
+      (cdr entry)
+    t))
+
+(defun magit-refs--insert-cherry-commits (ref)
+  (magit-insert-section-body
+    (let ((start (point))
+          (magit-insert-section--current nil))
+      (magit-git-wash (apply-partially #'magit-log-wash-log 'cherry)
+        "cherry" "-v" (magit-abbrev-arg) magit-buffer-upstream ref)
+      (if (= (point) start)
+          (message "No cherries for %s" ref)
+        (magit-make-margin-overlay nil t)))))
+
+(defun magit-refs--format-margin (commit)
+  (save-excursion
+    (goto-char (line-beginning-position 0))
+    (let ((line (magit-rev-format "%ct%cN" commit)))
+      (magit-log-format-margin commit
+                               (substring line 10)
+                               (substring line 0 10)))))
+
+;;; _
+(provide 'magit-refs)
+;;; magit-refs.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-refs.elc b/emacs/elpa/magit-20240514.1843/magit-refs.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-remote.el b/emacs/elpa/magit-20240514.1843/magit-remote.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-remote.elc b/emacs/elpa/magit-20240514.1843/magit-remote.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-repos.el b/emacs/elpa/magit-20240514.1843/magit-repos.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-repos.elc b/emacs/elpa/magit-20240514.1843/magit-repos.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-reset.el b/emacs/elpa/magit-20240514.1843/magit-reset.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-reset.elc b/emacs/elpa/magit-20240514.1843/magit-reset.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-sequence.el b/emacs/elpa/magit-20240514.1843/magit-sequence.el
diff --git a/emacs/elpa/magit-20240514.1843/magit-sequence.elc b/emacs/elpa/magit-20240514.1843/magit-sequence.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-sparse-checkout.el b/emacs/elpa/magit-20240514.1843/magit-sparse-checkout.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-sparse-checkout.elc b/emacs/elpa/magit-20240514.1843/magit-sparse-checkout.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-stash.el b/emacs/elpa/magit-20240514.1843/magit-stash.el
diff --git a/emacs/elpa/magit-20240514.1843/magit-stash.elc b/emacs/elpa/magit-20240514.1843/magit-stash.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-status.el b/emacs/elpa/magit-20240514.1843/magit-status.el
@@ -0,0 +1,823 @@
+;;; magit-status.el --- The grand overview  -*- 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 the status buffer.
+
+;;; Code:
+
+(require 'magit)
+
+;;; Options
+
+(defgroup magit-status nil
+  "Inspect and manipulate Git repositories."
+  :link '(info-link "(magit)Status Buffer")
+  :group 'magit-modes)
+
+(defcustom magit-status-mode-hook nil
+  "Hook run after entering Magit-Status mode."
+  :group 'magit-status
+  :type 'hook)
+
+(defcustom magit-status-headers-hook
+  '(magit-insert-error-header
+    magit-insert-diff-filter-header
+    magit-insert-head-branch-header
+    magit-insert-upstream-branch-header
+    magit-insert-push-branch-header
+    magit-insert-tags-header)
+  "Hook run to insert headers 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."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-status
+  :type 'hook
+  :options '(magit-insert-error-header
+             magit-insert-diff-filter-header
+             magit-insert-repo-header
+             magit-insert-remote-header
+             magit-insert-head-branch-header
+             magit-insert-upstream-branch-header
+             magit-insert-push-branch-header
+             magit-insert-tags-header))
+
+(defcustom magit-status-sections-hook
+  '(magit-insert-status-headers
+    magit-insert-merge-log
+    magit-insert-rebase-sequence
+    magit-insert-am-sequence
+    magit-insert-sequencer-sequence
+    magit-insert-bisect-output
+    magit-insert-bisect-rest
+    magit-insert-bisect-log
+    magit-insert-untracked-files
+    magit-insert-unstaged-changes
+    magit-insert-staged-changes
+    magit-insert-stashes
+    magit-insert-unpushed-to-pushremote
+    magit-insert-unpushed-to-upstream-or-recent
+    magit-insert-unpulled-from-pushremote
+    magit-insert-unpulled-from-upstream)
+  "Hook run to insert sections into a status buffer."
+  :package-version '(magit . "2.12.0")
+  :group 'magit-status
+  :type 'hook)
+
+(defcustom magit-status-initial-section '(1)
+  "The section point is placed on when a status buffer is created.
+
+When such a buffer is merely being refreshed or being shown again
+after it was merely buried, then this option has no effect.
+
+If this is nil, then point remains on the very first section as
+usual.  Otherwise it has to be a list of integers and section
+identity lists.  The members of that list are tried in order
+until a matching section is found.
+
+An integer means to jump to the nth section, 1 for example
+jumps over the headings.  To get a section's \"identity list\"
+use \\[universal-argument] \\[magit-describe-section-briefly].
+
+If, for example, you want to jump to the commits that haven't
+been pulled from the upstream, or else the second section, then
+use: (((unpulled . \"..@{upstream}\") (status)) 1).
+
+See option `magit-section-initial-visibility-alist' for how to
+control the initial visibility of the jumped to section."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-status
+  :type '(choice (const :tag "as usual" nil)
+                 (repeat (choice (number :tag "nth top-level section")
+                                 (sexp   :tag "section identity")))))
+
+(defcustom magit-status-goto-file-position nil
+  "Whether to go to position corresponding to file position.
+
+If this is non-nil and the current buffer is visiting a file,
+then `magit-status' tries to go to the position in the status
+buffer that corresponds to the position in the file-visiting
+buffer.  This jumps into either the diff of unstaged changes
+or the diff of staged changes.
+
+If the previously current buffer does not visit a file, or if
+the file has neither unstaged nor staged changes then this has
+no effect.
+
+The command `magit-status-here' tries to go to that position,
+regardless of the value of this option."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-status
+  :type 'boolean)
+
+(defcustom magit-status-show-hashes-in-headers nil
+  "Whether headers in the status buffer show hashes.
+The functions which respect this option are
+`magit-insert-head-branch-header',
+`magit-insert-upstream-branch-header', and
+`magit-insert-push-branch-header'."
+  :package-version '(magit . "2.4.0")
+  :group 'magit-status
+  :type 'boolean)
+
+(defcustom magit-status-margin
+  (list nil
+        (nth 1 magit-log-margin)
+        'magit-log-margin-width nil
+        (nth 4 magit-log-margin))
+  "Format of the margin in `magit-status-mode' buffers.
+
+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."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-status
+  :group 'magit-margin
+  :type magit-log-margin--custom-type
+  :initialize #'magit-custom-initialize-reset
+  :set-after '(magit-log-margin)
+  :set (apply-partially #'magit-margin-set-variable 'magit-status-mode))
+
+(defcustom magit-status-use-buffer-arguments 'selected
+  "Whether `magit-status' reuses arguments when the buffer already exists.
+
+This option has no effect when merely refreshing the status
+buffer using `magit-refresh'.
+
+Valid values are:
+
+`always': Always use the set of arguments that is currently
+  active in the status buffer, provided that buffer exists
+  of course.
+`selected': Use the set of arguments from the status
+  buffer, but only if it is displayed in a window of the
+  current frame.  This is the default.
+`current': Use the set of arguments from the status buffer,
+  but only if it is the current buffer.
+`never': Never use the set of arguments from the status
+  buffer."
+  :package-version '(magit . "3.0.0")
+  :group 'magit-buffers
+  :group 'magit-commands
+  :type '(choice
+          (const :tag "always use args from buffer" always)
+          (const :tag "use args from buffer if displayed in frame" selected)
+          (const :tag "use args from buffer if it is current" current)
+          (const :tag "never use args from buffer" never)))
+
+;;; Commands
+
+;;;###autoload
+(defun magit-init (directory)
+  "Initialize a Git repository, then show its status.
+
+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.
+
+Non-interactively DIRECTORY is (re-)initialized unconditionally."
+  (interactive
+   (let ((directory (file-name-as-directory
+                     (expand-file-name
+                      (read-directory-name "Create repository in: ")))))
+     (when-let ((toplevel (magit-toplevel directory)))
+       (setq toplevel (expand-file-name toplevel))
+       (unless (y-or-n-p (if (file-equal-p toplevel directory)
+                             (format "Reinitialize existing repository %s? "
+                                     directory)
+                           (format "%s is a repository.  Create another in %s? "
+                                   toplevel directory)))
+         (user-error "Abort")))
+     (list directory)))
+  ;; `git init' does not understand the meaning of "~"!
+  (magit-call-git "init" (magit-convert-filename-for-git
+                          (expand-file-name directory)))
+  (magit-status-setup-buffer directory))
+
+;;;###autoload
+(defun magit-status (&optional directory cache)
+  "Show the status of the current Git repository in a buffer.
+
+If the current directory isn't located within a Git repository,
+then prompt for an existing repository or an arbitrary directory,
+depending on option `magit-repository-directories', and show the
+status of the selected repository instead.
+
+* If that option specifies any existing repositories, then offer
+  those for completion and show the status buffer for the
+  selected one.
+
+* Otherwise read an arbitrary directory using regular file-name
+  completion.  If the selected directory is the top-level of an
+  existing working tree, then show the status buffer for that.
+
+* Otherwise offer to initialize the selected directory as a new
+  repository.  After creating the repository show its status
+  buffer.
+
+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) read an arbitrary directory and act on
+  it as described above.  The same could be accomplished using
+  the command `magit-init'.
+
+* With a single prefix argument read an existing repository, or
+  if none can be found based on `magit-repository-directories',
+  then fall back to the same behavior as with two prefix
+  arguments."
+  (interactive
+   (let ((magit--refresh-cache (list (cons 0 0))))
+     (list (and (or current-prefix-arg (not (magit-toplevel)))
+                (progn (magit--assert-usable-git)
+                       (magit-read-repository
+                        (>= (prefix-numeric-value current-prefix-arg) 16))))
+           magit--refresh-cache)))
+  (let ((magit--refresh-cache (or cache (list (cons 0 0)))))
+    (if directory
+        (let ((toplevel (magit-toplevel directory)))
+          (setq directory (file-name-as-directory
+                           (expand-file-name directory)))
+          (if (and toplevel (file-equal-p directory toplevel))
+              (magit-status-setup-buffer directory)
+            (when (y-or-n-p
+                   (if toplevel
+                       (format "%s is a repository.  Create another in %s? "
+                               toplevel directory)
+                     (format "Create repository in %s? " directory)))
+              ;; Creating a new repository invalidates cached values.
+              (setq magit--refresh-cache nil)
+              (magit-init directory))))
+      (magit-status-setup-buffer default-directory))))
+
+(put 'magit-status 'interactive-only 'magit-status-setup-buffer)
+
+;;;###autoload
+(defalias 'magit #'magit-status
+  "Begin using Magit.
+
+This alias for `magit-status' exists for better discoverability.
+
+Instead of invoking this alias for `magit-status' using
+\"M-x magit RET\", you should bind a key to `magit-status'
+and read the info node `(magit)Getting Started', which
+also contains other useful hints.")
+
+;;;###autoload
+(defun magit-status-here ()
+  "Like `magit-status' but with non-nil `magit-status-goto-file-position'."
+  (interactive)
+  (let ((magit-status-goto-file-position t))
+    (call-interactively #'magit-status)))
+
+(put 'magit-status-here 'interactive-only 'magit-status-setup-buffer)
+
+;;;###autoload
+(defun magit-status-quick ()
+  "Show the status of the current Git repository, maybe without refreshing.
+
+If the status buffer of the current Git repository exists but
+isn't being displayed in the selected frame, then display it
+without refreshing it.
+
+If the status buffer is being displayed in the selected frame,
+then also refresh it.
+
+Prefix arguments have the same meaning as for `magit-status',
+and additionally cause the buffer to be refresh.
+
+To use this function instead of `magit-status', add this to your
+init file: (global-set-key (kbd \"C-x g\") \\='magit-status-quick)."
+  (interactive)
+  (if-let ((buffer
+            (and (not current-prefix-arg)
+                 (not (magit-get-mode-buffer 'magit-status-mode nil 'selected))
+                 (magit-get-mode-buffer 'magit-status-mode))))
+      (magit-display-buffer buffer)
+    (call-interactively #'magit-status)))
+
+;;; Mode
+
+(defvar-keymap magit-status-mode-map
+  :doc "Keymap for `magit-status-mode'."
+  :parent magit-mode-map
+  "j" #'magit-status-jump
+  "<remap> <dired-jump>" #'magit-dired-jump)
+
+(transient-define-prefix magit-status-jump ()
+  "In a Magit-Status buffer, jump to a section."
+  ["Jump to"
+   [("z " "Stashes" magit-jump-to-stashes
+     :if (lambda () (memq 'magit-insert-stashes magit-status-sections-hook)))
+    ("t " "Tracked" magit-jump-to-tracked
+     :if (lambda () (memq 'magit-insert-tracked-files magit-status-sections-hook)))
+    ("n " "Untracked" magit-jump-to-untracked
+     :if (lambda () (memq 'magit-insert-untracked-files magit-status-sections-hook)))
+    ("u " "Unstaged" magit-jump-to-unstaged
+     :if (lambda () (memq 'magit-insert-unstaged-changes magit-status-sections-hook)))
+    ("s " "Staged" magit-jump-to-staged
+     :if (lambda () (memq 'magit-insert-staged-changes magit-status-sections-hook)))]
+   [("fu" "Unpulled from upstream" magit-jump-to-unpulled-from-upstream
+     :if (lambda () (memq 'magit-insert-unpulled-from-upstream magit-status-sections-hook)))
+    ("fp" "Unpulled from pushremote" magit-jump-to-unpulled-from-pushremote
+     :if (lambda () (memq 'magit-insert-unpulled-from-pushremote magit-status-sections-hook)))
+    ("pu" magit-jump-to-unpushed-to-upstream
+     :if (lambda ()
+           (or (memq 'magit-insert-unpushed-to-upstream-or-recent magit-status-sections-hook)
+               (memq 'magit-insert-unpushed-to-upstream magit-status-sections-hook)))
+     :description (lambda ()
+                    (let ((upstream (magit-get-upstream-branch)))
+                      (if (or (not upstream)
+                              (magit-rev-ancestor-p "HEAD" upstream))
+                          "Recent commits"
+                        "Unmerged into upstream"))))
+    ("pp" "Unpushed to pushremote" magit-jump-to-unpushed-to-pushremote
+     :if (lambda () (memq 'magit-insert-unpushed-to-pushremote magit-status-sections-hook)))
+    ("a " "Assumed unstaged" magit-jump-to-assume-unchanged
+     :if (lambda () (memq 'magit-insert-assume-unchanged-files magit-status-sections-hook)))
+    ("w " "Skip worktree" magit-jump-to-skip-worktree
+     :if (lambda () (memq 'magit-insert-skip-worktree-files magit-status-sections-hook)))]
+   [("i" "Using Imenu" imenu)]])
+
+(define-derived-mode magit-status-mode magit-mode "Magit"
+  "Mode for looking at Git status.
+
+This mode is documented in info node `(magit)Status Buffer'.
+
+\\<magit-mode-map>\
+Type \\[magit-refresh] to refresh the current buffer.
+Type \\[magit-section-toggle] to expand or hide the section at point.
+Type \\[magit-visit-thing] to visit the change or commit at point.
+
+Type \\[magit-dispatch] to invoke major commands.
+
+Staging and applying changes is documented in info node
+`(magit)Staging and Unstaging' and info node `(magit)Applying'.
+
+\\<magit-hunk-section-map>Type \
+\\[magit-apply] to apply the change at point, \
+\\[magit-stage] to stage,
+\\[magit-unstage] to unstage, \
+\\[magit-discard] to discard, or \
+\\[magit-reverse] to reverse it.
+
+\\<magit-status-mode-map>\
+Type \\[magit-commit] to create a commit.
+
+\\{magit-status-mode-map}"
+  :group 'magit-status
+  (hack-dir-local-variables-non-file-buffer)
+  (when magit-status-initial-section
+    (add-hook 'magit-post-create-buffer-hook
+              #'magit-status-goto-initial-section nil t))
+  (setq magit--imenu-group-types '(not branch commit)))
+
+(put 'magit-status-mode 'magit-diff-default-arguments
+     '("--no-ext-diff"))
+(put 'magit-status-mode 'magit-log-default-arguments
+     '("-n256" "--decorate"))
+
+;;;###autoload
+(defun magit-status-setup-buffer (&optional directory)
+  (unless directory
+    (setq directory default-directory))
+  (when (file-remote-p directory)
+    (magit-git-version-assert))
+  (let* ((default-directory directory)
+         (d (magit-diff--get-value 'magit-status-mode
+                                   magit-status-use-buffer-arguments))
+         (l (magit-log--get-value 'magit-status-mode
+                                  magit-status-use-buffer-arguments))
+         (file (and magit-status-goto-file-position
+                    (magit-file-relative-name)))
+         (line (and file (save-restriction (widen) (line-number-at-pos))))
+         (col  (and file (save-restriction (widen) (current-column))))
+         (buf  (magit-setup-buffer #'magit-status-mode nil
+                 (magit-buffer-diff-args  (nth 0 d))
+                 (magit-buffer-diff-files (nth 1 d))
+                 (magit-buffer-log-args   (nth 0 l))
+                 (magit-buffer-log-files  (nth 1 l)))))
+    (when file
+      (with-current-buffer buf
+        (let ((staged (magit-get-section '((staged) (status)))))
+          (if (and staged
+                   (cadr (magit-diff--locate-hunk file line staged)))
+              (magit-diff--goto-position file line col staged)
+            (let ((unstaged (magit-get-section '((unstaged) (status)))))
+              (unless (and unstaged
+                           (magit-diff--goto-position file line col unstaged))
+                (when staged
+                  (magit-diff--goto-position file line col staged))))))))
+    buf))
+
+(defun magit-status-refresh-buffer ()
+  (magit-git-exit-code "update-index" "--refresh")
+  (magit-insert-section (status)
+    (magit-run-section-hook 'magit-status-sections-hook)))
+
+(defun magit-status-goto-initial-section ()
+  "Jump to the section specified by `magit-status-initial-section'."
+  (when-let ((section
+              (--some (if (integerp it)
+                          (nth (1- it)
+                               (magit-section-siblings (magit-current-section)
+                                                       'next))
+                        (magit-get-section it))
+                      magit-status-initial-section)))
+    (goto-char (oref section start))
+    (when-let ((vis (cdr (assq 'magit-status-initial-section
+                               magit-section-initial-visibility-alist))))
+      (if (eq vis 'hide)
+          (magit-section-hide section)
+        (magit-section-show section)))))
+
+(defun magit-status-maybe-update-revision-buffer (&optional _)
+  "When moving in the status buffer, update the revision buffer.
+If there is no revision buffer in the same frame, then do nothing."
+  (when (derived-mode-p 'magit-status-mode)
+    (magit--maybe-update-revision-buffer)))
+
+(defun magit-status-maybe-update-stash-buffer (&optional _)
+  "When moving in the status buffer, update the stash buffer.
+If there is no stash buffer in the same frame, then do nothing."
+  (when (derived-mode-p 'magit-status-mode)
+    (magit--maybe-update-stash-buffer)))
+
+(defun magit-status-maybe-update-blob-buffer (&optional _)
+  "When moving in the status buffer, update the blob buffer.
+If there is no blob buffer in the same frame, then do nothing."
+  (when (derived-mode-p 'magit-status-mode)
+    (magit--maybe-update-blob-buffer)))
+
+;;; Sections
+;;;; Special Headers
+
+(defun magit-insert-status-headers ()
+  "Insert header sections appropriate for `magit-status-mode' buffers.
+The sections are inserted by running the functions on the hook
+`magit-status-headers-hook'."
+  (if (magit-rev-verify "HEAD")
+      (magit-insert-headers 'magit-status-headers-hook)
+    (insert "In the beginning there was darkness\n\n")))
+
+(defvar-keymap magit-error-section-map
+  :doc "Keymap for `error' sections."
+  "<remap> <magit-visit-thing>" #'magit-process-buffer
+  "<1>" (magit-menu-item "Visit process output" #'magit-process-buffer))
+
+(defun magit-insert-error-header ()
+  "Insert 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."
+  (when magit-this-error
+    (magit-insert-section (error 'git)
+      (insert (propertize (format "%-10s" "GitError! ")
+                          'font-lock-face 'magit-section-heading))
+      (insert (propertize magit-this-error 'font-lock-face 'error))
+      (when-let ((key (car (where-is-internal 'magit-process-buffer))))
+        (insert (format "  [Type `%s' for details]" (key-description key))))
+      (insert ?\n))
+    (setq magit-this-error nil)))
+
+(defun magit-insert-diff-filter-header ()
+  "Insert a header line showing the effective diff filters."
+  (let ((ignore-modules (magit-ignore-submodules-p)))
+    (when (or ignore-modules
+              magit-buffer-diff-files)
+      (insert (propertize (format "%-10s" "Filter! ")
+                          'font-lock-face 'magit-section-heading))
+      (when ignore-modules
+        (insert ignore-modules)
+        (when magit-buffer-diff-files
+          (insert " -- ")))
+      (when magit-buffer-diff-files
+        (insert (mapconcat #'identity magit-buffer-diff-files " ")))
+      (insert ?\n))))
+
+;;;; Reference Headers
+
+(defun magit-insert-head-branch-header (&optional branch)
+  "Insert a header line about the current branch.
+If `HEAD' is detached, then insert information about that commit
+instead.  The optional BRANCH argument is for internal use only."
+  (let ((branch (or branch (magit-get-current-branch)))
+        (output (magit-rev-format "%h %s" (or branch "HEAD"))))
+    (string-match "^\\([^ ]+\\) \\(.*\\)" output)
+    (magit-bind-match-strings (commit summary) output
+      (when (equal summary "")
+        (setq summary "(no commit message)"))
+      (if branch
+          (magit-insert-section (branch branch)
+            (insert (format "%-10s" "Head: "))
+            (when magit-status-show-hashes-in-headers
+              (insert (propertize commit 'font-lock-face 'magit-hash) ?\s))
+            (insert (propertize branch 'font-lock-face 'magit-branch-local))
+            (insert ?\s)
+            (insert (funcall magit-log-format-message-function branch summary))
+            (insert ?\n))
+        (magit-insert-section (commit commit)
+          (insert (format "%-10s" "Head: "))
+          (insert (propertize commit 'font-lock-face 'magit-hash))
+          (insert ?\s)
+          (insert (funcall magit-log-format-message-function nil summary))
+          (insert ?\n))))))
+
+(defun magit-insert-upstream-branch-header (&optional branch upstream keyword)
+  "Insert a header line about the upstream of the current branch.
+If no branch is checked out, then insert nothing.  The optional
+arguments are for internal use only."
+  (when-let ((branch (or branch (magit-get-current-branch))))
+    (let ((remote (magit-get "branch" branch "remote"))
+          (merge  (magit-get "branch" branch "merge"))
+          (rebase (magit-get "branch" branch "rebase")))
+      (when (or remote merge)
+        (unless upstream
+          (setq upstream (magit-get-upstream-branch branch)))
+        (magit-insert-section (branch upstream)
+          (pcase rebase
+            ("true")
+            ("false" (setq rebase nil))
+            (_       (setq rebase (magit-get-boolean "pull.rebase"))))
+          (insert (format "%-10s" (or keyword (if rebase "Rebase: " "Merge: "))))
+          (insert
+           (if upstream
+               (concat (and magit-status-show-hashes-in-headers
+                            (concat (propertize (magit-rev-format "%h" upstream)
+                                                'font-lock-face 'magit-hash)
+                                    " "))
+                       upstream " "
+                       (funcall magit-log-format-message-function upstream
+                                (funcall magit-log-format-message-function nil
+                                         (or (magit-rev-format "%s" upstream)
+                                             "(no commit message)"))))
+             (cond
+              ((magit--unnamed-upstream-p remote merge)
+               (concat (propertize merge  'font-lock-face 'magit-branch-remote)
+                       " from "
+                       (propertize remote 'font-lock-face 'bold)))
+              ((magit--valid-upstream-p remote merge)
+               (if (equal remote ".")
+                   (concat
+                    (propertize merge 'font-lock-face 'magit-branch-local) " "
+                    (propertize "does not exist"
+                                'font-lock-face 'magit-branch-warning))
+                 (format
+                  "%s %s %s"
+                  (propertize merge 'font-lock-face 'magit-branch-remote)
+                  (propertize "does not exist on"
+                              'font-lock-face 'magit-branch-warning)
+                  (propertize remote 'font-lock-face 'magit-branch-remote))))
+              (t
+               (propertize "invalid upstream configuration"
+                           'font-lock-face 'magit-branch-warning)))))
+          (insert ?\n))))))
+
+(defun magit-insert-push-branch-header ()
+  "Insert a header line about the branch the current branch is pushed to."
+  (when-let* ((branch (magit-get-current-branch))
+              (target (magit-get-push-branch branch)))
+    (magit-insert-section (branch target)
+      (insert (format "%-10s" "Push: "))
+      (insert
+       (if (magit-rev-verify target)
+           (concat (and magit-status-show-hashes-in-headers
+                        (concat (propertize (magit-rev-format "%h" target)
+                                            'font-lock-face 'magit-hash)
+                                " "))
+                   target " "
+                   (funcall magit-log-format-message-function target
+                            (funcall magit-log-format-message-function nil
+                                     (or (magit-rev-format "%s" target)
+                                         "(no commit message)"))))
+         (let ((remote (magit-get-push-remote branch)))
+           (if (magit-remote-p remote)
+               (concat target " "
+                       (propertize "does not exist"
+                                   'font-lock-face 'magit-branch-warning))
+             (concat remote " "
+                     (propertize "remote does not exist"
+                                 'font-lock-face 'magit-branch-warning))))))
+      (insert ?\n))))
+
+(defun magit-insert-tags-header ()
+  "Insert a header line about the current and/or next tag."
+  (let* ((this-tag (magit-get-current-tag nil t))
+         (next-tag (magit-get-next-tag nil t))
+         (this-cnt (cadr this-tag))
+         (next-cnt (cadr next-tag))
+         (this-tag (car this-tag))
+         (next-tag (car next-tag))
+         (both-tags (and this-tag next-tag t)))
+    (when (or this-tag next-tag)
+      (magit-insert-section (tag (or this-tag next-tag))
+        (insert (format "%-10s" (if both-tags "Tags: " "Tag: ")))
+        (cl-flet ((insert-count (tag count face)
+                    (insert (concat (propertize tag 'font-lock-face 'magit-tag)
+                                    (and (> count 0)
+                                         (format " (%s)"
+                                                 (propertize
+                                                  (format "%s" count)
+                                                  'font-lock-face face)))))))
+          (when this-tag  (insert-count this-tag this-cnt 'magit-branch-local))
+          (when both-tags (insert ", "))
+          (when next-tag  (insert-count next-tag next-cnt 'magit-tag)))
+        (insert ?\n)))))
+
+;;;; Auxiliary Headers
+
+(defun magit-insert-user-header ()
+  "Insert a header line about the current user."
+  (let ((name  (magit-get "user.name"))
+        (email (magit-get "user.email")))
+    (when (and name email)
+      (magit-insert-section (user name)
+        (insert (format "%-10s" "User: "))
+        (insert (propertize name 'font-lock-face 'magit-log-author))
+        (insert " <" email ">\n")))))
+
+(defun magit-insert-repo-header ()
+  "Insert a header line showing the path to the repository top-level."
+  (let ((topdir (magit-toplevel)))
+    (magit-insert-section (repo topdir)
+      (insert (format "%-10s%s\n" "Repo: " (abbreviate-file-name topdir))))))
+
+(defun 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."
+  (when-let* ((name (magit-get-some-remote))
+              ;; Under certain configurations it's possible for
+              ;; url to be nil, when name is not, see #2858.
+              (url (magit-get "remote" name "url")))
+    (magit-insert-section (remote name)
+      (insert (format "%-10s" "Remote: "))
+      (insert (propertize name 'font-lock-face 'magit-branch-remote) ?\s)
+      (insert url ?\n))))
+
+;;;; File Sections
+
+(defvar-keymap magit-untracked-section-map
+  :doc "Keymap for the `untracked' section."
+  "<remap> <magit-delete-thing>" #'magit-discard
+  "<remap> <magit-stage-file>"   #'magit-stage
+  "<2>" (magit-menu-item "Discard files" #'magit-discard)
+  "<1>" (magit-menu-item "Stage files"   #'magit-stage))
+
+(magit-define-section-jumper magit-jump-to-untracked
+  "Untracked files" untracked)
+
+(defun 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\".
+
+If the first element of `magit-buffer-diff-files' is a
+directory, then limit the list to files below that.  The value
+value of that variable can be set using \"D -- DIRECTORY RET g\"."
+  (let* ((show (or (magit-get "status.showUntrackedFiles") "normal"))
+         (base (car magit-buffer-diff-files))
+         (base (and base (file-directory-p base) base)))
+    (unless (equal show "no")
+      (if (equal show "all")
+          (when-let ((files (magit-untracked-files nil base)))
+            (magit-insert-section (untracked)
+              (magit-insert-heading "Untracked files:")
+              (magit-insert-files files base)
+              (insert ?\n)))
+        (when-let ((files
+                    (--mapcat (and (eq (aref it 0) ??)
+                                   (list (substring it 3)))
+                              (magit-git-items "status" "-z" "--porcelain"
+                                               (magit-ignore-submodules-p t)
+                                               "--" base))))
+          (magit-insert-section (untracked)
+            (magit-insert-heading "Untracked files:")
+            (dolist (file files)
+              (magit-insert-section (file file)
+                (insert (propertize file 'font-lock-face 'magit-filename) ?\n)))
+            (insert ?\n)))))))
+
+(magit-define-section-jumper magit-jump-to-tracked "Tracked files" tracked)
+
+(defun magit-insert-tracked-files ()
+  "Insert a tree of tracked files.
+
+If the first element of `magit-buffer-diff-files' is a
+directory, then limit the list to files below that.  The value
+value of that variable can be set using \"D -- DIRECTORY RET g\"."
+  (when-let ((files (magit-list-files)))
+    (let* ((base (car magit-buffer-diff-files))
+           (base (and base (file-directory-p base) base)))
+      (magit-insert-section (tracked nil t)
+        (magit-insert-heading "Tracked files:")
+        (magit-insert-files files base)
+        (insert ?\n)))))
+
+(defun magit-insert-ignored-files ()
+  "Insert a tree of ignored 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\"."
+  (when-let ((files (magit-ignored-files)))
+    (let* ((base (car magit-buffer-diff-files))
+           (base (and base (file-directory-p base) base)))
+      (magit-insert-section (tracked nil t)
+        (magit-insert-heading "Ignored files:")
+        (magit-insert-files files base)
+        (insert ?\n)))))
+
+(magit-define-section-jumper magit-jump-to-skip-worktree
+  "Skip-worktree files" skip-worktree)
+
+(defun 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\"."
+  (when-let ((files (magit-skip-worktree-files)))
+    (let* ((base (car magit-buffer-diff-files))
+           (base (and base (file-directory-p base) base)))
+      (magit-insert-section (skip-worktree nil t)
+        (magit-insert-heading "Skip-worktree files:")
+        (magit-insert-files files base)
+        (insert ?\n)))))
+
+(magit-define-section-jumper magit-jump-to-assume-unchanged
+  "Assume-unchanged files" assume-unchanged)
+
+(defun magit-insert-assume-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\"."
+  (when-let ((files (magit-assume-unchanged-files)))
+    (let* ((base (car magit-buffer-diff-files))
+           (base (and base (file-directory-p base) base)))
+      (magit-insert-section (assume-unchanged nil t)
+        (magit-insert-heading "Assume-unchanged files:")
+        (magit-insert-files files base)
+        (insert ?\n)))))
+
+(defun magit-insert-files (files directory)
+  (while (and files (string-prefix-p (or directory "") (car files)))
+    (let ((dir (file-name-directory (car files))))
+      (if (equal dir directory)
+          (let ((file (pop files)))
+            (magit-insert-section (file file)
+              (insert (propertize file 'font-lock-face 'magit-filename) ?\n)))
+        (magit-insert-section (file dir t)
+          (insert (propertize dir 'file 'magit-filename) ?\n)
+          (magit-insert-heading)
+          (setq files (magit-insert-files files dir))))))
+  files)
+
+;;; _
+(provide 'magit-status)
+;;; magit-status.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-status.elc b/emacs/elpa/magit-20240514.1843/magit-status.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-submodule.el b/emacs/elpa/magit-20240514.1843/magit-submodule.el
@@ -0,0 +1,720 @@
+;;; magit-submodule.el --- Submodule 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/>.
+
+;;; Code:
+
+(require 'magit)
+
+(defvar x-stretch-cursor)
+
+;;; Options
+
+(defcustom magit-module-sections-hook
+  '(magit-insert-modules-overview
+    magit-insert-modules-unpulled-from-upstream
+    magit-insert-modules-unpulled-from-pushremote
+    magit-insert-modules-unpushed-to-upstream
+    magit-insert-modules-unpushed-to-pushremote)
+  "Hook run by `magit-insert-modules'.
+
+That function isn't part of `magit-status-sections-hook's default
+value, so you have to add it yourself for this hook to have any
+effect."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-status
+  :type 'hook)
+
+(defcustom magit-module-sections-nested t
+  "Whether `magit-insert-modules' wraps inserted sections.
+
+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."
+  :package-version '(magit . "2.11.0")
+  :group 'magit-status
+  :type 'boolean)
+
+(defcustom magit-submodule-list-mode-hook '(hl-line-mode)
+  "Hook run after entering Magit-Submodule-List mode."
+  :package-version '(magit . "2.9.0")
+  :group 'magit-repolist
+  :type 'hook
+  :get 'magit-hook-custom-get
+  :options '(hl-line-mode))
+
+(defcustom magit-submodule-list-columns
+  '(("Path"     25 magit-modulelist-column-path   nil)
+    ("Version"  25 magit-repolist-column-version
+     ((:sort magit-repolist-version<)))
+    ("Branch"   20 magit-repolist-column-branch   nil)
+    ("B<U" 3 magit-repolist-column-unpulled-from-upstream
+     ((:right-align t)
+      (:sort <)))
+    ("B>U" 3 magit-repolist-column-unpushed-to-upstream
+     ((:right-align t)
+      (:sort <)))
+    ("B<P" 3 magit-repolist-column-unpulled-from-pushremote
+     ((:right-align t)
+      (:sort <)))
+    ("B>P" 3 magit-repolist-column-unpushed-to-pushremote
+     ((:right-align t)
+      (:sort <)))
+    ("B"   3 magit-repolist-column-branches
+     ((:right-align t)
+      (:sort <)))
+    ("S"   3 magit-repolist-column-stashes
+     ((:right-align t)
+      (:sort <))))
+  "List of columns displayed by `magit-list-submodules'.
+
+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 0.  \"+\" is substituted for numbers higher
+than 9."
+  :package-version '(magit . "2.8.0")
+  :group 'magit-repolist
+  :type `(repeat (list :tag "Column"
+                       (string   :tag "Header Label")
+                       (integer  :tag "Column Width")
+                       (function :tag "Inserter Function")
+                       (repeat   :tag "Properties"
+                                 (list (choice :tag "Property"
+                                               (const :right-align)
+                                               (const :pad-right)
+                                               (const :sort)
+                                               (symbol))
+                                       (sexp   :tag "Value"))))))
+
+(defcustom magit-submodule-list-sort-key '("Path" . nil)
+  "Initial sort key for buffer created by `magit-list-submodules'.
+If nil, no additional sorting is performed.  Otherwise, this
+should be a cons cell (NAME . FLIP).  NAME is a string matching
+one of the column names in `magit-submodule-list-columns'.  FLIP,
+if non-nil, means to invert the resulting sort."
+  :package-version '(magit . "3.2.0")
+  :group 'magit-repolist
+  :type '(choice (const nil)
+                 (cons (string :tag "Column name")
+                       (boolean :tag "Flip order"))))
+
+(defvar magit-submodule-list-format-path-functions nil)
+
+(defcustom magit-submodule-remove-trash-gitdirs nil
+  "Whether `magit-submodule-remove' offers to trash module gitdirs.
+
+If this is nil, then that command does not offer to do so unless
+a prefix argument is used.  When this is t, then it does offer to
+do so even without a prefix argument.
+
+In both cases the action still has to be confirmed unless that is
+disabled using the option `magit-no-confirm'.  Doing the latter
+and also setting this variable to t will lead to tears."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-commands
+  :type 'boolean)
+
+;;; Popup
+
+;;;###autoload (autoload 'magit-submodule "magit-submodule" nil t)
+(transient-define-prefix magit-submodule ()
+  "Act on a submodule."
+  :man-page "git-submodule"
+  ["Arguments"
+   ("-f" "Force"            ("-f" "--force"))
+   ("-r" "Recursive"        "--recursive")
+   ("-N" "Do not fetch"     ("-N" "--no-fetch"))
+   ("-C" "Checkout tip"     "--checkout")
+   ("-R" "Rebase onto tip"  "--rebase")
+   ("-M" "Merge tip"        "--merge")
+   ("-U" "Use upstream tip" "--remote")]
+  ["One module actions"
+   ("a" magit-submodule-add)
+   ("r" magit-submodule-register)
+   ("p" magit-submodule-populate)
+   ("u" magit-submodule-update)
+   ("s" magit-submodule-synchronize)
+   ("d" magit-submodule-unpopulate)
+   ("k" "Remove" magit-submodule-remove)]
+  ["Populated modules actions"
+   ("l" "List modules"  magit-list-submodules)
+   ("f" "Fetch modules" magit-fetch-modules)])
+
+(defun magit-submodule-arguments (&rest filters)
+  (--filter (and (member it filters) it)
+            (transient-args 'magit-submodule)))
+
+(defclass magit--git-submodule-suffix (transient-suffix)
+  ())
+
+(cl-defmethod transient-format-description ((obj magit--git-submodule-suffix))
+  (let ((value (delq nil (mapcar #'transient-infix-value transient--suffixes))))
+    (replace-regexp-in-string
+     "\\[--[^]]+\\]"
+     (lambda (match)
+       (format (propertize "[%s]" 'face 'transient-inactive-argument)
+               (mapconcat (lambda (arg)
+                            (propertize arg 'face
+                                        (if (member arg value)
+                                            'transient-argument
+                                          'transient-inactive-argument)))
+                          (save-match-data
+                            (split-string (substring match 1 -1) "|"))
+                          (propertize "|" 'face 'transient-inactive-argument))))
+     (cl-call-next-method obj))))
+
+;;;###autoload (autoload 'magit-submodule-add "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-add (url &optional path name args)
+  "Add the repository at URL as a module.
+
+Optional PATH is the path to the module relative to the root of
+the superproject.  If it is nil, then the path is determined
+based on the URL.  Optional NAME is the name of the module.  If
+it is nil, then PATH also becomes the name."
+  :class 'magit--git-submodule-suffix
+  :description "Add            git submodule add [--force]"
+  (interactive
+   (magit-with-toplevel
+     (let* ((url (magit-read-string-ns "Add submodule (remote url)"))
+            (path (let ((read-file-name-function
+                         (if (or (eq read-file-name-function 'ido-read-file-name)
+                                 (advice-function-member-p
+                                  'ido-read-file-name
+                                  read-file-name-function))
+                             ;; The Ido variant doesn't work properly here.
+                             #'read-file-name-default
+                           read-file-name-function)))
+                    (directory-file-name
+                     (file-relative-name
+                      (read-directory-name
+                       "Add submodules at path: " nil nil nil
+                       (and (string-match "\\([^./]+\\)\\(\\.git\\)?$" url)
+                            (match-string 1 url))))))))
+       (list url
+             (directory-file-name path)
+             (magit-submodule-read-name-for-path path)
+             (magit-submodule-arguments "--force")))))
+  (magit-submodule-add-1 url path name args))
+
+(defun magit-submodule-add-1 (url &optional path name args)
+  (magit-with-toplevel
+    (magit-submodule--maybe-reuse-gitdir name path)
+    (magit-run-git-async "submodule" "add"
+                         (and name (list "--name" name))
+                         args "--" url path)
+    (set-process-sentinel
+     magit-this-process
+     (lambda (process event)
+       (when (memq (process-status process) '(exit signal))
+         (if (> (process-exit-status process) 0)
+             (magit-process-sentinel process event)
+           (process-put process 'inhibit-refresh t)
+           (magit-process-sentinel process event)
+           (when (magit-git-version>= "2.12.0")
+             (magit-call-git "submodule" "absorbgitdirs" path))
+           (magit-refresh)))))))
+
+;;;###autoload
+(defun magit-submodule-read-name-for-path (path &optional prefer-short)
+  (let* ((path (directory-file-name (file-relative-name path)))
+         (name (file-name-nondirectory path)))
+    (push (if prefer-short path name) minibuffer-history)
+    (magit-read-string-ns
+     "Submodule name" nil (cons 'minibuffer-history 2)
+     (or (--keep (pcase-let ((`(,var ,val) (split-string it "=")))
+                   (and (equal val path)
+                        (cadr (split-string var "\\."))))
+                 (magit-git-lines "config" "--list" "-f" ".gitmodules"))
+         (if prefer-short name path)))))
+
+;;;###autoload (autoload 'magit-submodule-register "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-register (modules)
+  "Register MODULES.
+
+With a prefix argument act on all suitable modules.  Otherwise,
+if the region selects modules, then act on those.  Otherwise, if
+there is a module at point, then act on that.  Otherwise read a
+single module from the user."
+  ;; This command and the underlying "git submodule init" do NOT
+  ;; "initialize" modules.  They merely "register" modules in the
+  ;; super-projects $GIT_DIR/config file, the purpose of which is to
+  ;; allow users to change such values before actually initializing
+  ;; the modules.
+  :description "Register       git submodule init"
+  (interactive
+   (list (magit-module-confirm "Register" 'magit-module-no-worktree-p)))
+  (magit-with-toplevel
+    (magit-run-git-async "submodule" "init" "--" modules)))
+
+;;;###autoload (autoload 'magit-submodule-populate "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-populate (modules)
+  "Create MODULES working directories, checking out the recorded commits.
+
+With a prefix argument act on all suitable modules.  Otherwise,
+if the region selects modules, then act on those.  Otherwise, if
+there is a module at point, then act on that.  Otherwise read a
+single module from the user."
+  ;; This is the command that actually "initializes" modules.
+  ;; A module is initialized when it has a working directory,
+  ;; a gitlink, and a .gitmodules entry.
+  :description "Populate       git submodule update --init"
+  (interactive
+   (list (magit-module-confirm "Populate" 'magit-module-no-worktree-p)))
+  (magit-with-toplevel
+    (magit-run-git-async "submodule" "update" "--init" "--" modules)))
+
+;;;###autoload (autoload 'magit-submodule-update "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-update (modules args)
+  "Update MODULES by checking out the recorded commits.
+
+With a prefix argument act on all suitable modules.  Otherwise,
+if the region selects modules, then act on those.  Otherwise, if
+there is a module at point, then act on that.  Otherwise read a
+single module from the user."
+  ;; Unlike `git-submodule's `update' command ours can only update
+  ;; "initialized" modules by checking out other commits but not
+  ;; "initialize" modules by creating the working directories.
+  ;; To do the latter we provide the "setup" command.
+  :class 'magit--git-submodule-suffix
+  :description "Update         git submodule update [--force] [--no-fetch]
+                     [--remote] [--recursive] [--checkout|--rebase|--merge]"
+  (interactive
+   (list (magit-module-confirm "Update" 'magit-module-worktree-p)
+         (magit-submodule-arguments
+          "--force" "--remote" "--recursive" "--checkout" "--rebase" "--merge"
+          "--no-fetch")))
+  (magit-with-toplevel
+    (magit-run-git-async "submodule" "update" args "--" modules)))
+
+;;;###autoload (autoload 'magit-submodule-synchronize "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-synchronize (modules args)
+  "Synchronize url configuration of MODULES.
+
+With a prefix argument act on all suitable modules.  Otherwise,
+if the region selects modules, then act on those.  Otherwise, if
+there is a module at point, then act on that.  Otherwise read a
+single module from the user."
+  :class 'magit--git-submodule-suffix
+  :description "Synchronize    git submodule sync [--recursive]"
+  (interactive
+   (list (magit-module-confirm "Synchronize" 'magit-module-worktree-p)
+         (magit-submodule-arguments "--recursive")))
+  (magit-with-toplevel
+    (magit-run-git-async "submodule" "sync" args "--" modules)))
+
+;;;###autoload (autoload 'magit-submodule-unpopulate "magit-submodule" nil t)
+(transient-define-suffix magit-submodule-unpopulate (modules args)
+  "Remove working directories of MODULES.
+
+With a prefix argument act on all suitable modules.  Otherwise,
+if the region selects modules, then act on those.  Otherwise, if
+there is a module at point, then act on that.  Otherwise read a
+single module from the user."
+  ;; Even when a submodule is "uninitialized" (it has no worktree)
+  ;; the super-project's $GIT_DIR/config may never-the-less set the
+  ;; module's url.  This may happen if you `deinit' and then `init'
+  ;; to register (NOT initialize).  Because the purpose of `deinit'
+  ;; is to remove the working directory AND to remove the url, this
+  ;; command does not limit itself to modules that have no working
+  ;; directory.
+  :class 'magit--git-submodule-suffix
+  :description "Unpopulate     git submodule deinit [--force]"
+  (interactive
+   (list (magit-module-confirm "Unpopulate")
+         (magit-submodule-arguments "--force")))
+  (magit-with-toplevel
+    (magit-run-git-async "submodule" "deinit" args "--" modules)))
+
+;;;###autoload
+(defun magit-submodule-remove (modules args trash-gitdirs)
+  "Unregister MODULES and remove their working directories.
+
+For safety reasons, do not remove the gitdirs and if a module has
+uncommitted changes, then do not remove it at all.  If a module's
+gitdir is located inside the working directory, then move it into
+the gitdir of the superproject first.
+
+With the \"--force\" argument offer to remove dirty working
+directories and with a prefix argument offer to delete gitdirs.
+Both actions are very dangerous and have to be confirmed.  There
+are additional safety precautions in place, so you might be able
+to recover from making a mistake here, but don't count on it."
+  (interactive
+   (list (if-let ((modules (magit-region-values 'magit-module-section t)))
+             (magit-confirm 'remove-modules nil "Remove %d modules" nil modules)
+           (list (magit-read-module-path "Remove module")))
+         (magit-submodule-arguments "--force")
+         current-prefix-arg))
+  (when (magit-git-version< "2.12.0")
+    (error "This command requires Git v2.12.0"))
+  (when magit-submodule-remove-trash-gitdirs
+    (setq trash-gitdirs t))
+  (magit-with-toplevel
+    (when-let
+        ((modified
+          (seq-filter (lambda (module)
+                        (let ((default-directory (file-name-as-directory
+                                                  (expand-file-name module))))
+                          (and (cddr (directory-files default-directory))
+                               (magit-anything-modified-p))))
+                      modules)))
+      (if (member "--force" args)
+          (if (magit-confirm 'remove-dirty-modules
+                "Remove dirty module %s"
+                "Remove %d dirty modules"
+                t modified)
+              (dolist (module modified)
+                (let ((default-directory (file-name-as-directory
+                                          (expand-file-name module))))
+                  (magit-git "stash" "push"
+                             "-m" "backup before removal of this module")))
+            (setq modules (cl-set-difference modules modified :test #'equal)))
+        (if (cdr modified)
+            (message "Omitting %s modules with uncommitted changes: %s"
+                     (length modified)
+                     (mapconcat #'identity modified ", "))
+          (message "Omitting module %s, it has uncommitted changes"
+                   (car modified)))
+        (setq modules (cl-set-difference modules modified :test #'equal))))
+    (when modules
+      (let ((alist
+             (and trash-gitdirs
+                  (--map (split-string it "\0")
+                         (magit-git-lines "submodule" "foreach" "-q"
+                                          "printf \"$sm_path\\0$name\n\"")))))
+        (magit-git "submodule" "absorbgitdirs" "--" modules)
+        (magit-git "submodule" "deinit" args "--" modules)
+        (magit-git "rm" args "--" modules)
+        (when (and trash-gitdirs
+                   (magit-confirm 'trash-module-gitdirs
+                     "Trash gitdir of module %s"
+                     "Trash gitdirs of %d modules"
+                     t modules))
+          (dolist (module modules)
+            (if-let ((name (cadr (assoc module alist))))
+                ;; Disregard if `magit-delete-by-moving-to-trash'
+                ;; is nil.  Not doing so would be too dangerous.
+                (delete-directory (convert-standard-filename
+                                   (expand-file-name
+                                    (concat "modules/" name)
+                                    (magit-gitdir)))
+                                  t t)
+              (error "BUG: Weird module name and/or path for %s" module)))))
+      (magit-refresh))))
+
+;;; Sections
+
+;;;###autoload
+(defun 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."
+  (when-let ((modules (magit-list-module-paths)))
+    (if magit-module-sections-nested
+        (magit-insert-section (modules nil t)
+          (magit-insert-heading
+            (format "%s (%s)"
+                    (propertize "Modules"
+                                'font-lock-face 'magit-section-heading)
+                    (length modules)))
+          (magit-insert-section-body
+            (magit--insert-modules)))
+      (magit--insert-modules))))
+
+(defun magit--insert-modules (&optional _section)
+  (magit-run-section-hook 'magit-module-sections-hook))
+
+;;;###autoload
+(defun magit-insert-modules-overview ()
+  "Insert sections for all modules.
+For each section insert the path and the output of `git describe --tags',
+or, failing that, the abbreviated HEAD commit hash."
+  (when-let ((modules (magit-list-module-paths)))
+    (magit-insert-section (modules nil t)
+      (magit-insert-heading
+        (format "%s (%s)"
+                (propertize "Modules overview"
+                            'font-lock-face 'magit-section-heading)
+                (length modules)))
+      (magit-insert-section-body
+        (magit--insert-modules-overview)))))
+
+(defvar magit-modules-overview-align-numbers t)
+
+(defun magit--insert-modules-overview (&optional _section)
+  (magit-with-toplevel
+    (let* ((modules (magit-list-module-paths))
+           (path-format (format "%%-%ds "
+                                (min (apply #'max (mapcar #'length modules))
+                                     (/ (window-width) 2))))
+           (branch-format (format "%%-%ds " (min 25 (/ (window-width) 3)))))
+      (dolist (module modules)
+        (let ((default-directory
+               (expand-file-name (file-name-as-directory module))))
+          (magit-insert-section (module module t)
+            (insert (propertize (format path-format module)
+                                'font-lock-face 'magit-diff-file-heading))
+            (if (not (file-exists-p ".git"))
+                (insert "(unpopulated)")
+              (insert
+               (format
+                branch-format
+                (if-let ((branch (magit-get-current-branch)))
+                    (propertize branch 'font-lock-face 'magit-branch-local)
+                  (propertize "(detached)" 'font-lock-face 'warning))))
+              (if-let ((desc (magit-git-string "describe" "--tags")))
+                  (progn (when (and magit-modules-overview-align-numbers
+                                    (string-match-p "\\`[0-9]" desc))
+                           (insert ?\s))
+                         (insert (propertize desc 'font-lock-face 'magit-tag)))
+                (when-let ((abbrev (magit-rev-format "%h")))
+                  (insert (propertize abbrev 'font-lock-face 'magit-hash)))))
+            (insert ?\n))))))
+  (insert ?\n))
+
+(defvar-keymap magit-modules-section-map
+  :doc "Keymap for `modules' sections."
+  "<remap> <magit-visit-thing>" #'magit-list-submodules
+  "<1>" (magit-menu-item "List %t" #'magit-list-submodules))
+
+(defvar-keymap magit-module-section-map
+  :doc "Keymap for `module' sections."
+  "C-j"        #'magit-submodule-visit
+  "C-<return>" #'magit-submodule-visit
+  "<remap> <magit-unstage-file>" #'magit-unstage
+  "<remap> <magit-stage-file>"   #'magit-stage
+  "<remap> <magit-visit-thing>"  #'magit-submodule-visit
+  "<5>" (magit-menu-item "Module commands..." #'magit-submodule)
+  "<4>" '(menu-item "--")
+  "<3>" (magit-menu-item "Unstage %T" #'magit-unstage
+                         '(:visible (eq (magit-diff-type) 'staged)))
+  "<2>" (magit-menu-item "Stage %T" #'magit-stage
+                         '(:visible (eq (magit-diff-type) 'unstaged)))
+  "<1>" (magit-menu-item "Visit %s" #'magit-submodule-visit))
+
+(defun magit-submodule-visit (module &optional other-window)
+  "Visit MODULE by calling `magit-status' on it.
+Offer to initialize MODULE if it's not checked out yet.
+With a prefix argument, visit in another window."
+  (interactive (list (or (magit-section-value-if 'module)
+                         (magit-read-module-path "Visit module"))
+                     current-prefix-arg))
+  (magit-with-toplevel
+    (let ((path (expand-file-name module)))
+      (cond
+       ((file-exists-p (expand-file-name ".git" module))
+        (magit-diff-visit-directory path other-window))
+       ((y-or-n-p (format "Initialize submodule '%s' first?" module))
+        (magit-run-git-async "submodule" "update" "--init" "--" module)
+        (set-process-sentinel
+         magit-this-process
+         (lambda (process event)
+           (let ((magit-process-raise-error t))
+             (magit-process-sentinel process event))
+           (when (and (eq (process-status      process) 'exit)
+                      (=  (process-exit-status process) 0))
+             (magit-diff-visit-directory path other-window)))))
+       ((file-exists-p path)
+        (dired-jump other-window (concat path "/.")))))))
+
+;;;###autoload
+(defun magit-insert-modules-unpulled-from-upstream ()
+  "Insert sections for modules that haven't been pulled from the upstream.
+These sections can be expanded to show the respective commits."
+  (magit--insert-modules-logs "Modules unpulled from @{upstream}"
+                              'modules-unpulled-from-upstream
+                              "HEAD..@{upstream}"))
+
+;;;###autoload
+(defun magit-insert-modules-unpulled-from-pushremote ()
+  "Insert sections for modules that haven't been pulled from the push-remote.
+These sections can be expanded to show the respective commits."
+  (magit--insert-modules-logs "Modules unpulled from @{push}"
+                              'modules-unpulled-from-pushremote
+                              "HEAD..@{push}"))
+
+;;;###autoload
+(defun magit-insert-modules-unpushed-to-upstream ()
+  "Insert sections for modules that haven't been pushed to the upstream.
+These sections can be expanded to show the respective commits."
+  (magit--insert-modules-logs "Modules unmerged into @{upstream}"
+                              'modules-unpushed-to-upstream
+                              "@{upstream}..HEAD"))
+
+;;;###autoload
+(defun magit-insert-modules-unpushed-to-pushremote ()
+  "Insert sections for modules that haven't been pushed to the push-remote.
+These sections can be expanded to show the respective commits."
+  (magit--insert-modules-logs "Modules unpushed to @{push}"
+                              'modules-unpushed-to-pushremote
+                              "@{push}..HEAD"))
+
+(defun magit--insert-modules-logs (heading type range)
+  "For internal use, don't add to a hook."
+  (unless (magit-ignore-submodules-p)
+    (when-let ((modules (magit-list-module-paths)))
+      (magit-insert-section ((eval type) nil t)
+        (string-match "\\`\\(.+\\) \\([^ ]+\\)\\'" heading)
+        (magit-insert-heading
+          (propertize (match-string 1 heading)
+                      'font-lock-face 'magit-section-heading)
+          " "
+          (propertize (match-string 2 heading)
+                      'font-lock-face 'magit-branch-remote)
+          ":")
+        (magit-with-toplevel
+          (dolist (module modules)
+            (when (magit-module-worktree-p module)
+              (let ((default-directory
+                     (expand-file-name (file-name-as-directory module))))
+                (when (file-accessible-directory-p default-directory)
+                  (magit-insert-section
+                      ( module module t
+                        :range range)
+                    (magit-insert-heading
+                      (propertize module
+                                  'font-lock-face 'magit-diff-file-heading)
+                      ":")
+                    (let ((pos (point)))
+                      (magit-git-wash
+                          (apply-partially #'magit-log-wash-log 'module)
+                        "-c" "push.default=current" "log" "--oneline" range)
+                      (when (> (point) pos)
+                        (delete-char -1)))))))))
+        (magit-cancel-section 'if-empty)
+        (insert ?\n)))))
+
+;;; List
+
+;;;###autoload
+(defun magit-list-submodules ()
+  "Display a list of the current repository's populated submodules."
+  (interactive)
+  (magit-submodule-list-setup magit-submodule-list-columns))
+
+(defvar-keymap magit-submodule-list-mode-map
+  :doc "Local keymap for Magit-Submodule-List mode buffers."
+  :parent magit-repolist-mode-map)
+
+(define-derived-mode magit-submodule-list-mode tabulated-list-mode "Modules"
+  "Major mode for browsing a list of Git submodules."
+  :group 'magit-repolist-mode
+  (setq-local x-stretch-cursor nil)
+  (setq tabulated-list-padding 0)
+  (add-hook 'tabulated-list-revert-hook #'magit-submodule-list-refresh nil t)
+  (setq imenu-prev-index-position-function
+        #'magit-repolist--imenu-prev-index-position)
+  (setq imenu-extract-index-name-function #'tabulated-list-get-id))
+
+(defvar-local magit-submodule-list-predicate nil)
+
+(defun magit-submodule-list-setup (columns &optional predicate)
+  (magit-display-buffer
+   (or (magit-get-mode-buffer 'magit-submodule-list-mode)
+       (magit-generate-new-buffer 'magit-submodule-list-mode)))
+  (magit-submodule-list-mode)
+  (setq-local magit-repolist-columns columns)
+  (setq-local magit-repolist-sort-key magit-submodule-list-sort-key)
+  (setq-local magit-submodule-list-predicate predicate)
+  (magit-repolist-setup-1)
+  (magit-submodule-list-refresh))
+
+(defun magit-submodule-list-refresh ()
+  (setq tabulated-list-entries
+        (seq-keep
+         (lambda (module)
+           (let ((default-directory
+                  (expand-file-name (file-name-as-directory module))))
+             (and (file-exists-p ".git")
+                  (or (not magit-submodule-list-predicate)
+                      (funcall magit-submodule-list-predicate module))
+                  (list module
+                        (vconcat
+                         (mapcar (pcase-lambda (`(,title ,width ,fn ,props))
+                                   (or (funcall fn `((:path  ,module)
+                                                     (:title ,title)
+                                                     (:width ,width)
+                                                     ,@props))
+                                       ""))
+                                 magit-repolist-columns))))))
+         (magit-list-module-paths)))
+  (message "Listing submodules...")
+  (tabulated-list-init-header)
+  (tabulated-list-print t)
+  (message "Listing submodules...done"))
+
+(defun magit-modulelist-column-path (spec)
+  "Insert the relative path of the submodule."
+  (let ((path (cadr (assq :path spec))))
+    (or (run-hook-with-args-until-success
+         'magit-submodule-list-format-path-functions path)
+        path)))
+
+;;; Utilities
+
+(defun magit-submodule--maybe-reuse-gitdir (name path)
+  (let ((gitdir (convert-standard-filename
+                 (expand-file-name (concat "modules/" name)
+                                   (magit-gitdir)))))
+    (when (and (file-exists-p gitdir)
+               (not (file-exists-p path)))
+      (pcase (read-char-choice
+              (concat
+               gitdir " already exists.\n"
+               "Type [u] to use the existing gitdir and create the working tree\n"
+               "     [r] to rename the existing gitdir and clone again\n"
+               "     [t] to trash the existing gitdir and clone again\n"
+               "   [C-g] to abort ")
+              '(?u ?r ?t))
+        (?u (magit-submodule--restore-worktree (expand-file-name path) gitdir))
+        (?r (rename-file gitdir (concat gitdir "-"
+                                        (format-time-string "%F-%T"))))
+        (?t (delete-directory gitdir t t))))))
+
+(defun magit-submodule--restore-worktree (worktree gitdir)
+  (make-directory worktree t)
+  (with-temp-file (expand-file-name ".git" worktree)
+    (insert "gitdir: " (file-relative-name gitdir worktree) "\n"))
+  (let ((default-directory worktree))
+    (magit-call-git "reset" "--hard" "HEAD" "--")))
+
+;;; _
+(provide 'magit-submodule)
+;;; magit-submodule.el ends here
diff --git a/emacs/elpa/magit-20240514.1843/magit-submodule.elc b/emacs/elpa/magit-20240514.1843/magit-submodule.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-subtree.el b/emacs/elpa/magit-20240514.1843/magit-subtree.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-subtree.elc b/emacs/elpa/magit-20240514.1843/magit-subtree.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-tag.el b/emacs/elpa/magit-20240514.1843/magit-tag.el
@@ -0,0 +1,245 @@
+;;; magit-tag.el --- Tag 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 tag commands.
+
+;;; Code:
+
+(require 'magit)
+
+;; For `magit-tag-delete'.
+(defvar helm-comp-read-use-marked)
+
+;;; Commands
+
+;;;###autoload (autoload 'magit-tag "magit" nil t)
+(transient-define-prefix magit-tag ()
+  "Create or delete a tag."
+  :man-page "git-tag"
+  ["Arguments"
+   ("-f" "Force"    ("-f" "--force"))
+   ("-a" "Annotate" ("-a" "--annotate"))
+   ("-s" "Sign"     ("-s" "--sign"))
+   (magit-tag:--local-user)]
+  [["Create"
+    ("t"  "tag"     magit-tag-create)
+    ("r"  "release" magit-tag-release)]
+   ["Do"
+    ("k"  "delete"  magit-tag-delete)
+    ("p"  "prune"   magit-tag-prune)]])
+
+(defun magit-tag-arguments ()
+  (transient-args 'magit-tag))
+
+(transient-define-argument magit-tag:--local-user ()
+  :description "Sign as"
+  :class 'transient-option
+  :shortarg "-u"
+  :argument "--local-user="
+  :reader #'magit-read-gpg-signing-key
+  :history-key 'magit:--gpg-sign)
+
+;;;###autoload
+(defun magit-tag-create (name rev &optional args)
+  "Create a new tag with the given NAME at REV.
+With a prefix argument annotate the tag.
+\n(git tag [--annotate] NAME REV)"
+  (interactive (list (magit-read-tag "Tag name")
+                     (magit-read-branch-or-commit "Place tag on")
+                     (let ((args (magit-tag-arguments)))
+                       (when current-prefix-arg
+                         (cl-pushnew "--annotate" args :test #'equal))
+                       args)))
+  (magit-run-git-with-editor "tag" args name rev))
+
+;;;###autoload
+(defun magit-tag-delete (tags)
+  "Delete one or more tags.
+If the region marks multiple tags (and nothing else), then offer
+to delete those, otherwise prompt for a single tag to be deleted,
+defaulting to the tag at point.
+\n(git tag -d TAGS)"
+  (interactive (list (if-let ((tags (magit-region-values 'tag)))
+                         (magit-confirm t nil "Delete %d tags" nil tags)
+                       (let ((helm-comp-read-use-marked t))
+                         (magit-read-tag "Delete tag" t)))))
+  (magit-run-git "tag" "-d" tags))
+
+;;;###autoload
+(defun magit-tag-prune (tags remote-tags remote)
+  "Offer to delete tags missing locally from REMOTE, and vice versa."
+  (interactive
+   (let* ((remote (magit-read-remote "Prune tags using remote"))
+          (tags   (magit-list-tags))
+          (rtags  (prog2 (message "Determining remote tags...")
+                      (magit-remote-list-tags remote)
+                    (message "Determining remote tags...done")))
+          (ltags  (cl-set-difference tags rtags :test #'equal))
+          (rtags  (cl-set-difference rtags tags :test #'equal)))
+     (unless (or ltags rtags)
+       (message "Same tags exist locally and remotely"))
+     (unless (magit-confirm t
+               "Delete %s locally"
+               "Delete %d tags locally"
+               'noabort ltags)
+       (setq ltags nil))
+     (unless (magit-confirm t
+               "Delete %s from remote"
+               "Delete %d tags from remote"
+               'noabort rtags)
+       (setq rtags nil))
+     (list ltags rtags remote)))
+  (when tags
+    (magit-call-git "tag" "-d" tags))
+  (when remote-tags
+    (magit-run-git-async "push" remote (--map (concat ":" it) remote-tags))))
+
+(defvar magit-tag-version-regexp-alist
+  '(("^[-._+ ]?snapshot\\.?$" . -4)
+    ("^[-._+]$" . -4)
+    ("^[-._+ ]?\\(cvs\\|git\\|bzr\\|svn\\|hg\\|darcs\\)\\.?$" . -4)
+    ("^[-._+ ]?unknown\\.?$" . -4)
+    ("^[-._+ ]?alpha\\.?$" . -3)
+    ("^[-._+ ]?beta\\.?$" . -2)
+    ("^[-._+ ]?\\(pre\\|rc\\)\\.?$" . -1))
+  "Overrides `version-regexp-alist' for `magit-tag-release'.
+See also `magit-release-tag-regexp'.")
+
+(defvar magit-release-tag-regexp "\\`\
+\\(?1:\\(?:v\\(?:ersion\\)?\\|r\\(?:elease\\)?\\)[-_]?\\)?\
+\\(?2:[0-9]+\\(?:\\.[0-9]+\\)*\
+\\(?:-[a-zA-Z0-9-]+\\(?:\\.[a-zA-Z0-9-]+\\)*\\)?\\)\\'"
+  "Regexp used by `magit-tag-release' to parse release tags.
+
+The first submatch must match the prefix, if any.  The second
+submatch must match the version string.
+
+If this matches versions that are not dot separated numbers,
+then `magit-tag-version-regexp-alist' has to contain entries
+for the separators allowed here.")
+
+(defvar magit-release-commit-regexp "\\`Release version \\(.+\\)\\'"
+  "Regexp used by `magit-tag-release' to parse release commit messages.
+The first submatch must match the version string.")
+
+;;;###autoload
+(defun magit-tag-release (tag msg &optional args)
+  "Create a release tag for `HEAD'.
+
+Assume that release tags match `magit-release-tag-regexp'.
+
+If `HEAD's message matches `magit-release-commit-regexp', then
+base the tag on the version string specified by that.  Otherwise
+prompt 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 `--annotate' is enabled, then prompt for the message of the
+new tag.  Base the proposed tag message on the message of the
+highest tag, provided that that contains the corresponding
+version string and substituting the new version string for that.
+Otherwise propose 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\"."
+  (interactive
+   (save-match-data
+     (pcase-let*
+         ((`(,pver ,ptag ,pmsg) (car (magit--list-releases)))
+          (msg (magit-rev-format "%s"))
+          (ver (and (string-match magit-release-commit-regexp msg)
+                    (match-string 1 msg)))
+          (_   (and (not ver)
+                    (require (quote sisyphus) nil t)
+                    (string-match magit-release-commit-regexp
+                                  (magit-rev-format "%s" ptag))
+                    (user-error "Use `sisyphus-create-release' first")))
+          (tag (cond
+                ((not ptag)
+                 (read-string "Create first release tag: "
+                              (if (and ver (string-match-p "\\`[0-9]" ver))
+                                  (concat "v" ver)
+                                ver)))
+                (ver
+                 (concat (and (string-match magit-release-tag-regexp ptag)
+                              (match-string 1 ptag))
+                         ver))
+                (t
+                 (read-string
+                  (format "Create release tag (previous was %s): " ptag)
+                  ptag))))
+          (ver (and (string-match magit-release-tag-regexp tag)
+                    (match-string 2 tag)))
+          (args (magit-tag-arguments)))
+       (list tag
+             (and (member "--annotate" args)
+                  (read-string
+                   (format "Message for %S: " tag)
+                   (cond ((and pver (string-match (regexp-quote pver) pmsg))
+                          (replace-match ver t t pmsg))
+                         ((and ptag (string-match (regexp-quote ptag) pmsg))
+                          (replace-match tag t t pmsg))
+                         ((format "%s %s"
+                                  (capitalize
+                                   (file-name-nondirectory
+                                    (directory-file-name (magit-toplevel))))
+                                  ver)))))
+             args))))
+  (magit-run-git-with-editor "tag" args (and msg (list "-m" msg)) tag)
+  (set-process-sentinel
+   magit-this-process
+   (lambda (process event)
+     (when (memq (process-status process) '(exit signal))
+       (magit-process-sentinel process event)
+       (magit-refs-setup-buffer "HEAD" (magit-show-refs-arguments))))))
+
+(defun magit--list-releases ()
+  "Return a list of releases.
+The list is ordered, beginning with the highest release.
+Each release element has the form (VERSION TAG MESSAGE).
+`magit-release-tag-regexp' is used to determine whether
+a tag qualifies as a release tag."
+  (save-match-data
+    (mapcar
+     #'cdr
+     (nreverse
+      (cl-sort (cl-mapcan
+                (lambda (line)
+                  (and (string-match " +" line)
+                       (let ((tag (substring line 0 (match-beginning 0)))
+                             (msg (substring line (match-end 0))))
+                         (and (string-match magit-release-tag-regexp tag)
+                              (let ((ver (match-string 2 tag))
+                                    (version-regexp-alist
+                                     magit-tag-version-regexp-alist))
+                                (list (list (version-to-list ver)
+                                            ver tag msg)))))))
+                ;; Cannot rely on "--sort=-version:refname" because
+                ;; that gets confused if the version prefix has changed.
+                (magit-git-lines "tag" "-n"))
+               ;; The inverse of this function does not exist.
+               #'version-list-< :key #'car)))))
+
+;;; _
+(provide 'magit-tag)
+;;; magit-tag.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-tag.elc b/emacs/elpa/magit-20240514.1843/magit-tag.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-transient.el b/emacs/elpa/magit-20240514.1843/magit-transient.el
diff --git a/emacs/elpa/magit-20240426.2118/magit-transient.elc b/emacs/elpa/magit-20240514.1843/magit-transient.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit-wip.el b/emacs/elpa/magit-20240514.1843/magit-wip.el
@@ -0,0 +1,476 @@
+;;; magit-wip.el --- Commit snapshots to work-in-progress refs  -*- 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 defines tree global modes which automatically commit
+;; snapshots to branch-specific work-in-progress refs before and after
+;; making changes, and two commands which can be used to do so on
+;; demand.
+
+;;; Code:
+
+(require 'magit-core)
+(require 'magit-log)
+
+;;; Options
+
+(defgroup magit-wip nil
+  "Automatically commit to work-in-progress refs."
+  :link '(info-link "(magit)Wip Modes")
+  :group 'magit-modes
+  :group 'magit-essentials)
+
+(defgroup magit-wip-legacy nil
+  "It is better to not use these modes individually."
+  :link '(info-link "(magit)Legacy Wip Modes")
+  :group 'magit-wip)
+
+(defcustom magit-wip-mode-lighter " Wip"
+  "Lighter for Magit-Wip mode."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-wip
+  :type 'string)
+
+(defcustom magit-wip-after-save-local-mode-lighter ""
+  "Lighter for Magit-Wip-After-Save-Local mode."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip-legacy
+  :type 'string)
+
+(defcustom magit-wip-after-apply-mode-lighter ""
+  "Lighter for Magit-Wip-After-Apply mode."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip-legacy
+  :type 'string)
+
+(defcustom magit-wip-before-change-mode-lighter ""
+  "Lighter for Magit-Wip-Before-Change mode."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip-legacy
+  :type 'string)
+
+(defcustom magit-wip-initial-backup-mode-lighter ""
+  "Lighter for Magit-Wip-Initial Backup mode."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip-legacy
+  :type 'string)
+
+(defcustom magit-wip-merge-branch nil
+  "Whether to merge the current branch into its wip ref.
+
+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.  This is currently the default."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-wip
+  :type 'boolean)
+
+(defcustom magit-wip-namespace "refs/wip/"
+  "Namespace used for work-in-progress refs.
+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 as `branch-ref'."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip
+  :type 'string)
+
+;;; Modes
+
+(defvar magit--wip-activation-cache nil)
+(defvar magit--wip-inhibit-autosave nil)
+
+;;;###autoload
+(define-minor-mode magit-wip-mode
+  "Save uncommitted changes to work-in-progress refs.
+
+Whenever appropriate (i.e., when dataloss would be a possibility
+otherwise) this mode causes uncommitted changes to be committed
+to dedicated work-in-progress refs.
+
+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."
+  :package-version '(magit . "2.90.0")
+  :lighter magit-wip-mode-lighter
+  :global t
+  (let ((arg (if magit-wip-mode 1 -1)))
+    (let ((magit--wip-activation-cache (list t)))
+      (magit-wip-after-save-mode arg))
+    (magit-wip-after-apply-mode arg)
+    (magit-wip-before-change-mode arg)
+    (magit-wip-initial-backup-mode arg)))
+
+(define-minor-mode magit-wip-after-save-local-mode
+  "After saving, also commit to a worktree work-in-progress ref.
+
+After saving the current file-visiting buffer this mode also
+commits the changes to the worktree work-in-progress ref for
+the current branch.
+
+This mode should be enabled globally by turning on the globalized
+variant `magit-wip-after-save-mode'."
+  :package-version '(magit . "2.1.0")
+  :lighter magit-wip-after-save-local-mode-lighter
+  (if magit-wip-after-save-local-mode
+      (if (and buffer-file-name (magit-inside-worktree-p t))
+          (add-hook 'after-save-hook #'magit-wip-commit-buffer-file t t)
+        (setq magit-wip-after-save-local-mode nil)
+        (user-error "Need a worktree and a file"))
+    (remove-hook 'after-save-hook #'magit-wip-commit-buffer-file t)))
+
+(defun magit-wip-after-save-local-mode-turn-on ()
+  (when (and buffer-file-name
+             (if magit--wip-activation-cache
+                 (if-let ((elt (assoc default-directory
+                                      magit--wip-activation-cache)))
+                     (and-let* ((top (cadr elt)))
+                       (member (file-relative-name buffer-file-name top)
+                               (cddr elt)))
+                   (if-let ((top (magit-toplevel)))
+                       (let (files)
+                         (if-let ((elt (assoc top magit--wip-activation-cache)))
+                             (setq files (cddr elt))
+                           (progn
+                             (setq files (let ((default-directory top))
+                                           (magit-tracked-files)))
+                             (push `(,top ,top ,@files)
+                                   magit--wip-activation-cache)
+                             (unless (eq default-directory top)
+                               (push `(,default-directory ,top ,@files)
+                                     magit--wip-activation-cache))))
+                         (member (file-relative-name buffer-file-name) files))
+                     (push (list default-directory nil)
+                           magit--wip-activation-cache)
+                     nil))
+               (and (magit-inside-worktree-p t)
+                    (magit-file-tracked-p buffer-file-name))))
+    (magit-wip-after-save-local-mode)))
+
+;;;###autoload
+(define-globalized-minor-mode magit-wip-after-save-mode
+  magit-wip-after-save-local-mode magit-wip-after-save-local-mode-turn-on
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip)
+
+(defun magit-wip-commit-buffer-file (&optional msg)
+  "Commit visited file to a worktree work-in-progress ref.
+
+Also see `magit-wip-after-save-mode' which calls this function
+automatically whenever a buffer visiting a tracked file is saved."
+  (interactive (list "wip-save %s after save"))
+  (unless magit--wip-inhibit-autosave
+    (when-let ((ref (magit-wip-get-ref)))
+      (magit-with-toplevel
+        (let ((file (file-relative-name buffer-file-name)))
+          (magit-wip-commit-worktree
+           ref (list file)
+           (format (or msg "autosave %s after save") file)))))))
+
+;;;###autoload
+(define-minor-mode magit-wip-after-apply-mode
+  "Commit to work-in-progress refs.
+
+After applying a change using any \"apply variant\"
+command (apply, stage, unstage, discard, and reverse) commit the
+affected files to the current wip refs.  For each branch there
+may be two wip refs; one contains snapshots of the files as found
+in the worktree and the other contains snapshots of the entries
+in the index."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip
+  :lighter magit-wip-after-apply-mode-lighter
+  :global t)
+
+(defun magit-wip-commit-after-apply (&optional files msg)
+  (when magit-wip-after-apply-mode
+    (magit-wip-commit files msg)))
+
+;;;###autoload
+(define-minor-mode magit-wip-before-change-mode
+  "Commit to work-in-progress refs before certain destructive changes.
+
+Before invoking a revert command or an \"apply variant\"
+command (apply, stage, unstage, discard, and reverse) commit the
+affected tracked files to the current wip refs.  For each branch
+there may be two wip refs; one contains snapshots of the files
+as found in the worktree and the other contains snapshots of the
+entries in the index.
+
+Only changes to files which could potentially be affected by the
+command which is about to be called are committed."
+  :package-version '(magit . "2.1.0")
+  :group 'magit-wip
+  :lighter magit-wip-before-change-mode-lighter
+  :global t)
+
+(defun magit-wip-commit-before-change (&optional files msg)
+  (when magit-wip-before-change-mode
+    (magit-with-toplevel
+      (magit-wip-commit files msg))))
+
+(define-minor-mode magit-wip-initial-backup-mode
+  "Before saving a buffer for the first time, commit to a wip ref."
+  :package-version '(magit . "2.90.0")
+  :group 'magit-wip
+  :lighter magit-wip-initial-backup-mode-lighter
+  :global t
+  (if magit-wip-initial-backup-mode
+      (add-hook  'before-save-hook #'magit-wip-commit-initial-backup)
+    (remove-hook 'before-save-hook #'magit-wip-commit-initial-backup)))
+
+(defun magit--any-wip-mode-enabled-p ()
+  "Return non-nil if any global wip mode is enabled."
+  (or magit-wip-mode
+      magit-wip-after-save-mode
+      magit-wip-after-apply-mode
+      magit-wip-before-change-mode
+      magit-wip-initial-backup-mode))
+
+(defvar-local magit-wip-buffer-backed-up nil)
+(put 'magit-wip-buffer-backed-up 'permanent-local t)
+
+;;;###autoload
+(defun magit-wip-commit-initial-backup ()
+  "Before saving, commit current file to a worktree wip ref.
+
+The user has to add this function to `before-save-hook'.
+
+Commit the current state of the visited file before saving the
+current buffer to that file.  This backs up the same version of
+the file as `backup-buffer' would, but stores the backup in the
+worktree wip ref, which is also used by the various Magit Wip
+modes, instead of in a backup file as `backup-buffer' would.
+
+This function ignores the variables that affect `backup-buffer'
+and can be used along-side that function, which is recommended
+because this function only backs up files that are tracked in
+a Git repository."
+  (when (and (not magit-wip-buffer-backed-up)
+             buffer-file-name
+             (magit-inside-worktree-p t)
+             (magit-file-tracked-p buffer-file-name))
+    (let ((magit-save-repository-buffers nil))
+      (magit-wip-commit-buffer-file "autosave %s before save"))
+    (setq magit-wip-buffer-backed-up t)))
+
+;;; Core
+
+(defun magit-wip-commit (&optional files msg)
+  "Commit all tracked files to the work-in-progress refs.
+
+Interactively, commit all changes to all tracked files using
+a generic commit message.  With a prefix-argument the commit
+message is read in the minibuffer.
+
+Non-interactively, only commit changes to FILES using MSG as
+commit message."
+  (interactive (list nil (if current-prefix-arg
+                             (magit-read-string "Wip commit message")
+                           "wip-save tracked files")))
+  (when-let ((ref (magit-wip-get-ref)))
+    (magit-wip-commit-index ref files msg)
+    (magit-wip-commit-worktree ref files msg)))
+
+(defun magit-wip-commit-index (ref files msg)
+  (let* ((wipref (magit--wip-index-ref ref))
+         (parent (magit-wip-get-parent ref wipref))
+         (tree   (magit-git-string "write-tree")))
+    (magit-wip-update-wipref ref wipref tree parent files msg "index")))
+
+(defun magit-wip-commit-worktree (ref files msg)
+  (when (or (not files)
+            ;; `update-index' will either ignore (before Git v2.32.0)
+            ;; or fail when passed directories (relevant for the
+            ;; untracked files code paths).
+            (setq files (seq-remove #'file-directory-p files)))
+    (let* ((wipref (magit--wip-wtree-ref ref))
+           (parent (magit-wip-get-parent ref wipref))
+           (tree (magit-with-temp-index parent (list "--reset" "-i")
+                   (if files
+                       ;; Note: `update-index' is used instead of `add'
+                       ;; because `add' will fail if a file is already
+                       ;; deleted in the temporary index.
+                       (magit-call-git
+                        "update-index" "--add" "--remove"
+                        (and (magit-git-version>= "2.25.0")
+                             "--ignore-skip-worktree-entries")
+                        "--" files)
+                     (magit-with-toplevel
+                       (magit-call-git "add" "-u" ".")))
+                   (magit-git-string "write-tree"))))
+      (magit-wip-update-wipref ref wipref tree parent files msg "worktree"))))
+
+(defun magit-wip-update-wipref (ref wipref tree parent files msg start-msg)
+  (cond
+   ((and (not (equal parent wipref))
+         (or (not magit-wip-merge-branch)
+             (not (magit-rev-verify wipref))))
+    (setq start-msg (concat "start autosaving " start-msg))
+    (magit-update-ref wipref start-msg
+                      (magit-git-string "commit-tree" "--no-gpg-sign"
+                                        "-p" parent "-m" start-msg
+                                        (concat parent "^{tree}")))
+    (setq parent wipref))
+   ((and magit-wip-merge-branch
+         (or (not (magit-rev-ancestor-p ref wipref))
+             (not (magit-rev-ancestor-p
+                   (concat (magit-git-string "log" "--format=%H"
+                                             "-1" "--merges" wipref)
+                           "^2")
+                   ref))))
+    (setq start-msg (format "merge %s into %s" ref start-msg))
+    (magit-update-ref wipref start-msg
+                      (magit-git-string "commit-tree" "--no-gpg-sign"
+                                        "-p" wipref "-p" ref
+                                        "-m" start-msg
+                                        (concat ref "^{tree}")))
+    (setq parent wipref)))
+  (when (magit-git-failure "diff-tree" "--quiet" parent tree "--" files)
+    (unless (and msg (not (= (aref msg 0) ?\s)))
+      (let ((len (length files)))
+        (setq msg (concat
+                   (cond ((= len 0) "autosave tracked files")
+                         ((> len 1) (format "autosave %s files" len))
+                         ((concat "autosave "
+                                  (file-relative-name (car files)
+                                                      (magit-toplevel)))))
+                   msg))))
+    (magit-update-ref wipref msg
+                      (magit-git-string "commit-tree" "--no-gpg-sign"
+                                        "-p" parent "-m" msg tree))))
+
+(defun magit-wip-get-ref ()
+  (let ((ref (or (magit-git-string "symbolic-ref" "HEAD") "HEAD")))
+    (and (magit-rev-verify ref)
+         ref)))
+
+(defun magit-wip-get-parent (ref wipref)
+  (if (and (magit-rev-verify wipref)
+           (equal (magit-git-string "merge-base" wipref ref)
+                  (magit-rev-verify ref)))
+      wipref
+    ref))
+
+(defun magit--wip-index-ref (&optional ref)
+  (magit--wip-ref "index/" ref))
+
+(defun magit--wip-wtree-ref (&optional ref)
+  (magit--wip-ref "wtree/" ref))
+
+(defun magit--wip-ref (namespace &optional ref)
+  (concat magit-wip-namespace namespace
+          (or (and ref (string-prefix-p "refs/" ref) ref)
+              (and-let* ((branch (and (not (equal ref "HEAD"))
+                                      (or ref (magit-get-current-branch)))))
+                (concat "refs/heads/" branch))
+              "HEAD")))
+
+(defun magit-wip-maybe-add-commit-hook ()
+  (when (and magit-wip-merge-branch
+             (magit-wip-any-enabled-p))
+    (add-hook 'git-commit-post-finish-hook #'magit-wip-commit nil t)))
+
+(defun magit-wip-any-enabled-p ()
+  (or magit-wip-mode
+      magit-wip-after-save-local-mode
+      magit-wip-after-save-mode
+      magit-wip-after-apply-mode
+      magit-wip-before-change-mode
+      magit-wip-initial-backup-mode))
+
+;;; Log
+
+(defun magit-wip-log-index (args files)
+  "Show log for the index wip ref of the current branch."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (list (magit--wip-index-ref)) args files))
+
+(defun magit-wip-log-worktree (args files)
+  "Show log for the worktree wip ref of the current branch."
+  (interactive (magit-log-arguments))
+  (magit-log-setup-buffer (list (magit--wip-wtree-ref)) args files))
+
+(defun magit-wip-log-current (branch args files count)
+  "Show log for the current branch and its wip refs.
+With a negative prefix argument only show the worktree wip ref.
+The absolute numeric value of the prefix argument controls how
+many \"branches\" of each wip ref are shown."
+  (interactive
+   (nconc (list (or (magit-get-current-branch) "HEAD"))
+          (magit-log-arguments)
+          (list (prefix-numeric-value current-prefix-arg))))
+  (magit-wip-log branch args files count))
+
+(defun magit-wip-log (branch args files count)
+  "Show log for a branch and its wip refs.
+With a negative prefix argument only show the worktree wip ref.
+The absolute numeric value of the prefix argument controls how
+many \"branches\" of each wip ref are shown."
+  (interactive
+   (nconc (list (magit-completing-read
+                 "Log branch and its wip refs"
+                 (nconc (magit-list-local-branch-names)
+                        (list "HEAD"))
+                 nil t nil 'magit-revision-history
+                 (or (magit-branch-at-point)
+                     (magit-get-current-branch)
+                     "HEAD")))
+          (magit-log-arguments)
+          (list (prefix-numeric-value current-prefix-arg))))
+  (magit-log-setup-buffer (nconc (list branch)
+                                 (magit-wip-log-get-tips
+                                  (magit--wip-wtree-ref branch)
+                                  (abs count))
+                                 (and (>= count 0)
+                                      (magit-wip-log-get-tips
+                                       (magit--wip-index-ref branch)
+                                       (abs count))))
+                          args files))
+
+(defun magit-wip-log-get-tips (wipref count)
+  (and-let* ((reflog (magit-git-lines "reflog" wipref)))
+    (let (tips)
+      (while (and reflog (> count 1))
+        ;; "start autosaving ..." is the current message, but it used
+        ;; to be "restart autosaving ...", and those messages may
+        ;; still be around (e.g., if gc.reflogExpire is set to "never").
+        (setq reflog (cl-member "^[^ ]+ [^:]+: \\(?:re\\)?start autosaving"
+                                reflog :test #'string-match-p))
+        (when (and (cadr reflog)
+                   (string-match "^[^ ]+ \\([^:]+\\)" (cadr reflog)))
+          (push (match-string 1 (cadr reflog)) tips))
+        (setq reflog (cddr reflog))
+        (cl-decf count))
+      (cons wipref (nreverse tips)))))
+
+;;; _
+(provide 'magit-wip)
+;;; magit-wip.el ends here
diff --git a/emacs/elpa/magit-20240426.2118/magit-wip.elc b/emacs/elpa/magit-20240514.1843/magit-wip.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240426.2118/magit-worktree.el b/emacs/elpa/magit-20240514.1843/magit-worktree.el
diff --git a/emacs/elpa/magit-20240514.1843/magit-worktree.elc b/emacs/elpa/magit-20240514.1843/magit-worktree.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit.el b/emacs/elpa/magit-20240514.1843/magit.el
@@ -0,0 +1,778 @@
+;;; 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: 3.3.0.50-git
+;; Package-Requires: (
+;;     (emacs "26.1")
+;;     (compat "29.1.4.5")
+;;     (dash "2.19.1")
+;;     (git-commit "3.3.0")
+;;     (magit-section "3.3.0")
+;;     (seq "2.24")
+;;     (transient "0.6.0")
+;;     (with-editor "3.3.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)
+  "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--straight-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--straight-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, 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)")
+                      (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 (equal (getenv "CI") "true")
+        ;; The repository is a sparse clone.
+        (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))
+    (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-20240426.2118/magit.elc b/emacs/elpa/magit-20240514.1843/magit.elc
Binary files differ.
diff --git a/emacs/elpa/magit-20240514.1843/magit.info b/emacs/elpa/magit-20240514.1843/magit.info
@@ -0,0 +1,11594 @@
+This is magit.info, produced by makeinfo version 6.7 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 3.3.0.50-git.
+
+     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-changes’ 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
+     began 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-submodule-fetch’)
+     This command fetches all submodules.  With a prefix argument it
+     fetches all remotes of all submodules.
+
+ -- 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.
+
+     Option ‘magit-fetch-modules-jobs’ controls how many submodules are
+     being fetched in parallel.  Also fetch the super-repository,
+     because ‘git fetch’ does not support not doing that.  With a prefix
+     argument fetch all remotes.
+
+
+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‘ 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  30)
+* 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  61)
+* l b:                                   Logging.             (line  58)
+* L d:                                   Log Margin.          (line  66)
+* L g:                                   Refreshing Logs.     (line  17)
+* l h:                                   Logging.             (line  40)
+* l H:                                   Reflog.              (line  18)
+* l l:                                   Logging.             (line  35)
+* l L:                                   Logging.             (line  55)
+* L L:                                   Refreshing Logs.     (line  34)
+* L L <1>:                               Log Margin.          (line  60)
+* L l:                                   Log Margin.          (line  63)
+* l o:                                   Logging.             (line  49)
+* l O:                                   Reflog.              (line  15)
+* l r:                                   Reflog.              (line  12)
+* L s:                                   Refreshing Logs.     (line  21)
+* l u:                                   Logging.             (line  43)
+* 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:                   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  30)
+* 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  61)
+* magit-log-all-branches:                Logging.             (line  58)
+* magit-log-branches:                    Logging.             (line  55)
+* 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  35)
+* magit-log-double-commit-limit:         Log Buffer.          (line  64)
+* magit-log-half-commit-limit:           Log Buffer.          (line  67)
+* magit-log-head:                        Logging.             (line  40)
+* 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  49)
+* 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  43)
+* 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-fetch:                 Fetching.            (line  48)
+* 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 109)
+* 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  51)
+* 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: Introduction6566
+Node: Installation11282
+Node: Installing from Melpa11612
+Node: Installing from the Git Repository12687
+Node: Post-Installation Tasks15501
+Node: Getting Started16786
+Node: Interface Concepts22597
+Node: Modes and Buffers22976
+Node: Switching Buffers24687
+Node: Naming Buffers29426
+Node: Quitting Windows32501
+Node: Automatic Refreshing of Magit Buffers34436
+Node: Automatic Saving of File-Visiting Buffers37317
+Node: Automatic Reverting of File-Visiting Buffers38501
+Node: Risk of Reverting Automatically43486
+Node: Sections45868
+Node: Section Movement46794
+Node: Section Visibility51668
+Node: Section Hooks58355
+Node: Section Types and Values60761
+Node: Section Options62176
+Node: Transient Commands62647
+Node: Transient Arguments and Buffer Variables64123
+Node: Completion Confirmation and the Selection71140
+Node: Action Confirmation71586
+Node: Completion and Confirmation80091
+Node: The Selection83276
+Node: The hunk-internal region86174
+Node: Support for Completion Frameworks87263
+Node: Additional Completion Options92148
+Node: Mouse Support92746
+Node: Running Git93322
+Node: Viewing Git Output93567
+Node: Git Process Status96271
+Node: Running Git Manually97236
+Node: Git Executable99926
+Node: Global Git Arguments102934
+Node: Inspecting103739
+Node: Status Buffer104896
+Node: Status Sections109907
+Node: Status Header Sections115434
+Node: Status Module Sections118053
+Node: Status Options120550
+Node: Repository List121913
+Node: Logging126691
+Node: Refreshing Logs129533
+Node: Log Buffer130954
+Node: Log Margin135777
+Node: Select from Log138930
+Node: Reflog141140
+Node: Cherries142777
+Node: Diffing144615
+Node: Refreshing Diffs147649
+Node: Commands Available in Diffs151338
+Node: Diff Options153851
+Node: Revision Buffer159314
+Node: Ediffing162634
+Node: References Buffer168684
+Node: References Sections179278
+Node: Bisecting180135
+Node: Visiting Files and Blobs182446
+Node: General-Purpose Visit Commands182974
+Node: Visiting Files and Blobs from a Diff183927
+Node: Blaming187371
+Node: Manipulating194359
+Node: Creating Repository194701
+Node: Cloning Repository195238
+Node: Staging and Unstaging201679
+Node: Staging from File-Visiting Buffers205660
+Node: Applying206766
+Node: Committing208839
+Node: Initiating a Commit209422
+Node: Editing Commit Messages214612
+Node: Using the Revision Stack217385
+Node: Commit Pseudo Headers220430
+Node: Commit Mode and Hooks221725
+Node: Commit Message Conventions224583
+Node: Branching226570
+Node: The Two Remotes226796
+Node: Branch Commands229449
+Node: Branch Git Variables242299
+Node: Auxiliary Branch Commands247673
+Node: Merging248789
+Node: Resolving Conflicts252945
+Node: Rebasing258319
+Node: Editing Rebase Sequences263108
+Node: Information About In-Progress Rebase267324
+Ref: Information About In-Progress Rebase-Footnote-1276437
+Node: Cherry Picking277033
+Node: Reverting281367
+Node: Resetting282786
+Node: Stashing284612
+Node: Transferring290993
+Node: Remotes291215
+Node: Remote Commands291367
+Node: Remote Git Variables295406
+Node: Fetching296677
+Node: Pulling299123
+Node: Pushing300149
+Node: Plain Patches304440
+Node: Maildir Patches305911
+Node: Miscellaneous307390
+Node: Tagging307736
+Node: Notes309629
+Node: Submodules311964
+Node: Listing Submodules312182
+Node: Submodule Transient314330
+Node: Subtree316817
+Node: Worktree318748
+Node: Sparse checkouts319824
+Node: Bundle322600
+Node: Common Commands322975
+Node: Wip Modes325603
+Node: Wip Graph330494
+Node: Legacy Wip Modes332807
+Node: Commands for Buffers Visiting Files335694
+Node: Minor Mode for Buffers Visiting Blobs343921
+Node: Customizing344719
+Node: Per-Repository Configuration346315
+Node: Essential Settings348569
+Node: Safety348915
+Node: Performance350676
+Ref: Log Performance353639
+Ref: Diff Performance354944
+Ref: Refs Buffer Performance356285
+Ref: Committing Performance356860
+Node: Microsoft Windows Performance357842
+Node: MacOS Performance359033
+Ref: MacOS Performance-Footnote-1360056
+Node: Global Bindings360138
+Node: Plumbing362366
+Node: Calling Git363195
+Node: Getting a Value from Git364720
+Node: Calling Git for Effect368448
+Node: Section Plumbing374342
+Node: Creating Sections374570
+Node: Section Selection378466
+Node: Matching Sections380262
+Node: Refreshing Buffers386183
+Node: Conventions389327
+Node: Theming Faces389519
+Node: FAQ397624
+Node: FAQ - How to ...?398062
+Node: How to pronounce Magit?398419
+Node: How to show git's output?399222
+Node: How to install the gitman info manual?400008
+Node: How to show diffs for gpg-encrypted files?400978
+Node: How does branching and pushing work?401574
+Node: Should I disable VC?401907
+Node: FAQ - Issues and Errors402510
+Node: Magit is slow403455
+Node: I changed several thousand files at once and now Magit is unusable403748
+Node: I am having problems committing404474
+Node: I am using MS Windows and cannot push with Magit404955
+Node: I am using macOS and SOMETHING works in shell but not in Magit405573
+Node: Expanding a file to show the diff causes it to disappear406407
+Node: Point is wrong in the COMMIT_EDITMSG buffer406995
+Node: The mode-line information isn't always up-to-date408040
+Node: A branch and tag sharing the same name breaks SOMETHING409103
+Node: My Git hooks work on the command-line but not inside Magit409990
+Node: git-commit-mode isn't used when committing from the command-line410836
+Node: Point ends up inside invisible text when jumping to a file-visiting buffer413107
+Node: I am no longer able to save popup defaults413956
+Node: Debugging Tools414937
+Node: Keystroke Index418111
+Node: Function and Command Index459725
+Node: Variable Index517926
+
+End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/emacs/elpa/magit-section-20240426.1325/magit-section-pkg.el b/emacs/elpa/magit-section-20240426.1325/magit-section-pkg.el
@@ -1,14 +0,0 @@
-(define-package "magit-section" "20240426.1325" "Sections for read-only buffers."
-  '((emacs "25.1")
-    (compat "29.1.4.4")
-    (dash "20221013"))
-  :commit "fef45b274ecb4dc0448bd34dac26f7eaff621e59" :authors
-  '(("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-20240426.1325/magit-section.el b/emacs/elpa/magit-section-20240426.1325/magit-section.el
@@ -1,2478 +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: 3.3.0.50-git
-;; Package-Requires: (
-;;     (emacs "25.1")
-;;     (compat "29.1.4.4")
-;;     (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 ()
-  ((keymap   :initform nil)
-   (type     :initform nil :initarg :type)
-   (value    :initform nil :initarg :value)
-   (start    :initform nil :initarg :start)
-   (content  :initform nil)
-   (end      :initform nil)
-   (hidden   :initform nil)
-   (washer   :initform nil)
-   (process  :initform nil)
-   (heading-highlight-face :initform nil)
-   (inserter :initform (symbol-value 'magit--current-section-hook))
-   (parent   :initform nil :initarg :parent)
-   (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)'."
-  :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))
-  ;; (hack-dir-local-variables-non-file-buffer)
-  (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 object
-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)
-
-(advice-add 'context-menu-region :around
-            (lambda (fn menu click)
-              "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)
-  "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))
-  `(defun ,name (&optional expand)
-     ,(format "Jump to the section \"%s\".
-With a prefix argument also expand it." heading)
-     (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)
-          (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))
-        (t (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 defun)
-           (debug ([&optional symbolp]
-                   (&or [("eval" form) &optional form form]
-                        [symbolp &optional form form])
-                   body)))
-  (let ((tp (cl-gensym "type"))
-        (s* (and (symbolp (car args))
-                 (pop args)))
-        (s  (cl-gensym "section")))
-    `(let* ((,tp ,(let ((type (nth 0 (car args))))
-                    (if (eq (car-safe type) 'eval)
-                        (cadr type)
-                      `',type)))
-            (,s (funcall (if (class-p ,tp)
-                             ,tp
-                           (or (cdr (assq ,tp magit--section-type-alist))
-                               'magit-section))
-                         :type
-                         (or (and (class-p ,tp)
-                                  (car (rassq ,tp magit--section-type-alist)))
-                             ,tp)
-                         :value ,(nth 1 (car args))
-                         :start (if magit-section-inhibit-markers
-                                    (point)
-                                  (point-marker))
-                         :parent magit-insert-section--parent)))
-       (oset ,s hidden
-             (if-let ((value (run-hook-with-args-until-success
-                              'magit-section-set-visibility-hook ,s)))
-                 (eq value 'hide)
-               (if-let ((incarnation
-                         (and (not magit-section-preserve-visibility)
-                              magit-insert-section--oldroot
-                              (magit-get-section
-                               (magit-section-ident ,s)
-                               magit-insert-section--oldroot))))
-                   (oref incarnation hidden)
-                 (if-let ((value (magit-section-match-assoc
-                                  ,s magit-section-initial-visibility-alist)))
-                     (progn (when (functionp value)
-                              (setq value (funcall value ,s)))
-                            (eq value 'hide))
-                   ,(nth 2 (car args))))))
-       (let ((magit-insert-section--current ,s)
-             (magit-insert-section--parent  ,s)
-             (magit-insert-section--oldroot
-              (or magit-insert-section--oldroot
-                  (and (not magit-insert-section--parent)
-                       (prog1 magit-root-section
-                         (setq magit-root-section ,s))))))
-         (catch 'cancel-section
-           ,@(if s*
-                 `((let ((,s* ,s))
-                     ,@(cdr args)))
-               (cdr args))
-           ;; `magit-insert-section-hook' should *not* be run with
-           ;; `magit-run-section-hook' because it's a hook that runs
-           ;; on section insertion, not a section inserting hook.
-           (run-hooks 'magit-insert-section-hook)
-           (magit-insert-child-count ,s)
-           (unless magit-section-inhibit-markers
-             (set-marker-insertion-type (oref ,s start) t))
-           (let* ((end (oset ,s end
-                             (if magit-section-inhibit-markers
-                                 (point)
-                               (point-marker))))
-                  (class-map (oref ,s keymap))
-                  (magit-map (intern (format "magit-%s-section-map"
-                                             (oref ,s type))))
-                  (forge-map (intern (format "forge-%s-section-map"
-                                             (oref ,s type))))
-                  (map (and class-map (symbol-value class-map))))
-             (unless map
-               (setq map (or (and (boundp magit-map) (symbol-value magit-map))
-                             (and (boundp forge-map) (symbol-value forge-map))))
-               (oset ,s keymap map))
-             (save-excursion
-               (goto-char (oref ,s start))
-               (while (< (point) end)
-                 (let ((next (or (next-single-property-change
-                                  (point) 'magit-section)
-                                 end)))
-                   (unless (magit-section-at)
-                     (put-text-property (point) next 'magit-section ,s)
-                     (when map
-                       (put-text-property (point) next 'keymap map)))
-                   (magit-section-maybe-add-heading-map ,s)
-                   (goto-char next)))))
-           (cond
-            ((eq ,s 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 ,s)))
-            (magit-section-insert-in-reverse
-             (push ,s (oref (oref ,s parent) children)))
-            ((let ((parent (oref ,s parent)))
-               (oset parent children
-                     (nconc (oref parent children)
-                            (list ,s)))))))
-         (when magit-section-insert-in-reverse
-           (setq magit-section-insert-in-reverse nil)
-           (oset ,s children (nreverse (oref ,s children))))
-         ,s))))
-
-(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."
-  (declare (indent defun))
-  (when args
-    (let ((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)))))
-  (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))
-           (,s magit-insert-section--current))
-       (if (oref ,s hidden)
-           (oset ,s washer
-                 (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))
-                (if (listp magit-insert-section-hook)
-                    magit-insert-section-hook
-                  (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 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)
-    (when (and magit-section-show-child-count
-               (setq content (oref section content))
-               (setq count (length (oref section children)))
-               (> count 0)
-               (eq (char-before (1- content)) ?:))
-      (save-excursion
-        (goto-char (- content 2))
-        (insert (magit--propertize-face (format " (%s)" count)
-                                        'magit-section-child-count))
-        (delete-char 1)))))
-
-;;; 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 "\
-Emacs has enabled redisplay shortcuts
-in this buffer because there are lines whose length go beyond
-`long-line-treshold' \(%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." :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))))
-
-(defun isearch-clean-overlays@magit-mode (fn)
-  (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)))
-
-(advice-add 'isearch-clean-overlays :around
-            #'isearch-clean-overlays@magit-mode)
-
-;;; 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))))
-
-(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 (if (listp val) val (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)))
-
-(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'."
-  (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)
-  (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-20240426.1325/magit-section.elc b/emacs/elpa/magit-section-20240426.1325/magit-section.elc
Binary files differ.
diff --git a/emacs/elpa/magit-section-20240426.1325/dir b/emacs/elpa/magit-section-20240508.2349/dir
diff --git a/emacs/elpa/magit-section-20240426.1325/magit-section-autoloads.el b/emacs/elpa/magit-section-20240508.2349/magit-section-autoloads.el
diff --git a/emacs/elpa/magit-section-20240508.2349/magit-section-pkg.el b/emacs/elpa/magit-section-20240508.2349/magit-section-pkg.el
@@ -0,0 +1,14 @@
+(define-package "magit-section" "20240508.2349" "Sections for read-only buffers."
+  '((emacs "26.1")
+    (compat "29.1.4.5")
+    (dash "20240405"))
+  :commit "855d924969eb6231d62ab446f727c9f7ad5c4913" :authors
+  '(("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-20240508.2349/magit-section.el b/emacs/elpa/magit-section-20240508.2349/magit-section.el
@@ -0,0 +1,2475 @@
+;;; 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: 3.3.0.50-git
+;; Package-Requires: (
+;;     (emacs "26.1")
+;;     (compat "29.1.4.5")
+;;     (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)'."
+  :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))
+  ;; (hack-dir-local-variables-non-file-buffer)
+  (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 object
+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)
+
+(advice-add 'context-menu-region :around
+            (lambda (fn menu click)
+              "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)
+  "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))
+  `(defun ,name (&optional expand)
+     ,(format "Jump to the section \"%s\".
+With a prefix argument also expand it." heading)
+     (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."
+  (declare (indent defun))
+  (when args
+    (let ((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)))))
+  (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))
+                (if (listp magit-insert-section-hook)
+                    magit-insert-section-hook
+                  (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 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)
+    (when (and magit-section-show-child-count
+               (setq content (oref section content))
+               (setq count (length (oref section children)))
+               (> count 0)
+               (eq (char-before (1- content)) ?:))
+      (save-excursion
+        (goto-char (- content 2))
+        (insert (magit--propertize-face (format " (%s)" count)
+                                        'magit-section-child-count))
+        (delete-char 1)))))
+
+;;; 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 "\
+Emacs has enabled redisplay shortcuts
+in this buffer because there are lines whose length go beyond
+`long-line-treshold' \(%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." :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))))
+
+(defun isearch-clean-overlays@magit-mode (fn)
+  (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)))
+
+(advice-add 'isearch-clean-overlays :around
+            #'isearch-clean-overlays@magit-mode)
+
+;;; 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))))
+
+(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 (if (listp val) val (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)))
+
+(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'."
+  (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)
+  (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-20240508.2349/magit-section.elc b/emacs/elpa/magit-section-20240508.2349/magit-section.elc
Binary files differ.
diff --git a/emacs/elpa/magit-section-20240426.1325/magit-section.info b/emacs/elpa/magit-section-20240508.2349/magit-section.info
diff --git a/emacs/elpa/markdown-mode-20240318.1307/markdown-mode-pkg.el b/emacs/elpa/markdown-mode-20240318.1307/markdown-mode-pkg.el
@@ -1,14 +0,0 @@
-(define-package "markdown-mode" "20240318.1307" "Major mode for Markdown-formatted text"
-  '((emacs "27.1"))
-  :commit "fd6c5508f979ab526e024a591eaec963712cb211" :authors
-  '(("Jason R. Blevins" . "jblevins@xbeta.org"))
-  :maintainers
-  '(("Jason R. Blevins" . "jblevins@xbeta.org"))
-  :maintainer
-  '("Jason R. Blevins" . "jblevins@xbeta.org")
-  :keywords
-  '("markdown" "github flavored markdown" "itex")
-  :url "https://jblevins.org/projects/markdown-mode/")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/markdown-mode-20240318.1307/markdown-mode.el b/emacs/elpa/markdown-mode-20240318.1307/markdown-mode.el
@@ -1,10384 +0,0 @@
-;;; markdown-mode.el --- Major mode for Markdown-formatted text -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2007-2023 Jason R. Blevins and markdown-mode
-;; contributors (see the commit log for details).
-
-;; Author: Jason R. Blevins <jblevins@xbeta.org>
-;; Maintainer: Jason R. Blevins <jblevins@xbeta.org>
-;; Created: May 24, 2007
-;; Version: 2.7-alpha
-;; Package-Requires: ((emacs "27.1"))
-;; Keywords: Markdown, GitHub Flavored Markdown, itex
-;; URL: https://jblevins.org/projects/markdown-mode/
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; See the README.md file for details.
-
-
-;;; Code:
-
-(require 'easymenu)
-(require 'outline)
-(require 'thingatpt)
-(require 'cl-lib)
-(require 'url-parse)
-(require 'button)
-(require 'color)
-(require 'rx)
-(require 'subr-x)
-
-(defvar jit-lock-start)
-(defvar jit-lock-end)
-(defvar flyspell-generic-check-word-predicate)
-(defvar electric-pair-pairs)
-(defvar sh-ancestor-alist)
-
-(declare-function project-roots "project")
-(declare-function sh-set-shell "sh-script")
-(declare-function mailcap-file-name-to-mime-type "mailcap")
-(declare-function dnd-get-local-file-name "dnd")
-
-;; for older emacs<29
-(declare-function mailcap-mime-type-to-extension "mailcap")
-(declare-function file-name-with-extension "files")
-(declare-function yank-media-handler "yank-media")
-
-
-;;; Constants =================================================================
-
-(defconst markdown-mode-version "2.7-alpha"
-  "Markdown mode version number.")
-
-(defconst markdown-output-buffer-name "*markdown-output*"
-  "Name of temporary buffer for markdown command output.")
-
-
-;;; Global Variables ==========================================================
-
-(defvar markdown-reference-label-history nil
-  "History of used reference labels.")
-
-(defvar markdown-live-preview-mode nil
-  "Sentinel variable for command `markdown-live-preview-mode'.")
-
-(defvar markdown-gfm-language-history nil
-  "History list of languages used in the current buffer in GFM code blocks.")
-
-(defvar markdown-follow-link-functions nil
-  "Functions used to follow a link.
-Each function is called with one argument, the link's URL. It
-should return non-nil if it followed the link, or nil if not.
-Functions are called in order until one of them returns non-nil;
-otherwise the default link-following function is used.")
-
-
-;;; Customizable Variables ====================================================
-
-(defvar markdown-mode-hook nil
-  "Hook run when entering Markdown mode.")
-
-(defvar markdown-before-export-hook nil
-  "Hook run before running Markdown to export XHTML output.
-The hook may modify the buffer, which will be restored to it's
-original state after exporting is complete.")
-
-(defvar markdown-after-export-hook nil
-  "Hook run after XHTML output has been saved.
-Any changes to the output buffer made by this hook will be saved.")
-
-(defgroup markdown nil
-  "Major mode for editing text files in Markdown format."
-  :prefix "markdown-"
-  :group 'text
-  :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
-
-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown_py")
-                                                    when (executable-find cmd)
-                                                    return (file-name-nondirectory it))))
-                              (or command "markdown"))
-  "Command to run markdown."
-  :group 'markdown
-  :type '(choice (string :tag "Shell command") (repeat (string)) function))
-
-(defcustom markdown-command-needs-filename nil
-  "Set to non-nil if `markdown-command' does not accept input from stdin.
-Instead, it will be passed a filename as the final command line
-option.  As a result, you will only be able to run Markdown from
-buffers which are visiting a file."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-open-command nil
-  "Command used for opening Markdown files directly.
-For example, a standalone Markdown previewer.  This command will
-be called with a single argument: the filename of the current
-buffer.  It can also be a function, which will be called without
-arguments."
-  :group 'markdown
-  :type '(choice file function (const :tag "None" nil)))
-
-(defcustom markdown-open-image-command nil
-  "Command used for opening image files directly.
-This is used at `markdown-follow-link-at-point'."
-  :group 'markdown
-  :type '(choice file function (const :tag "None" nil)))
-
-(defcustom markdown-hr-strings
-  '("-------------------------------------------------------------------------------"
-    "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
-    "---------------------------------------"
-    "* * * * * * * * * * * * * * * * * * * *"
-    "---------"
-    "* * * * *")
-  "Strings to use when inserting horizontal rules.
-The first string in the list will be the default when inserting a
-horizontal rule.  Strings should be listed in decreasing order of
-prominence (as in headings from level one to six) for use with
-promotion and demotion functions."
-  :group 'markdown
-  :type '(repeat string))
-
-(defcustom markdown-bold-underscore nil
-  "Use two underscores when inserting bold text instead of two asterisks."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-italic-underscore nil
-  "Use underscores when inserting italic text instead of asterisks."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-marginalize-headers nil
-  "When non-nil, put opening atx header markup in a left margin.
-
-This setting goes well with `markdown-asymmetric-header'.  But
-sadly it conflicts with `linum-mode' since they both use the
-same margin."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-marginalize-headers-margin-width 6
-  "Character width of margin used for marginalized headers.
-The default value is based on there being six heading levels
-defined by Markdown and HTML.  Increasing this produces extra
-whitespace on the left.  Decreasing it may be preferred when
-fewer than six nested heading levels are used."
-  :group 'markdown
-  :type 'integer
-  :safe 'natnump
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-asymmetric-header nil
-  "Determines if atx header style will be asymmetric.
-Set to a non-nil value to use asymmetric header styling, placing
-header markup only at the beginning of the line. By default,
-balanced markup will be inserted at the beginning and end of the
-line around the header title."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-indent-function 'markdown-indent-line
-  "Function to use to indent."
-  :group 'markdown
-  :type 'function)
-
-(defcustom markdown-indent-on-enter t
-  "Determines indentation behavior when pressing \\[newline].
-Possible settings are nil, t, and \\='indent-and-new-item.
-
-When non-nil, pressing \\[newline] will call `newline-and-indent'
-to indent the following line according to the context using
-`markdown-indent-function'.  In this case, note that
-\\[electric-newline-and-maybe-indent] can still be used to insert
-a newline without indentation.
-
-When set to \\='indent-and-new-item and the point is in a list item
-when \\[newline] is pressed, the list will be continued on the next
-line, where a new item will be inserted.
-
-When set to nil, simply call `newline' as usual.  In this case,
-you can still indent lines using \\[markdown-cycle] and continue
-lists with \\[markdown-insert-list-item].
-
-Note that this assumes the variable `electric-indent-mode' is
-non-nil (enabled).  When it is *disabled*, the behavior of
-\\[newline] and `\\[electric-newline-and-maybe-indent]' are
-reversed."
-  :group 'markdown
-  :type '(choice (const :tag "Don't automatically indent" nil)
-                 (const :tag "Automatically indent" t)
-                 (const :tag "Automatically indent and insert new list items" indent-and-new-item)))
-
-(defcustom markdown-enable-wiki-links nil
-  "Syntax highlighting for wiki links.
-Set this to a non-nil value to turn on wiki link support by default.
-Support can be toggled later using the `markdown-toggle-wiki-links'
-function or \\[markdown-toggle-wiki-links]."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-wiki-link-alias-first t
-  "When non-nil, treat aliased wiki links like [[alias text|PageName]].
-Otherwise, they will be treated as [[PageName|alias text]]."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp)
-
-(defcustom markdown-wiki-link-search-subdirectories nil
-  "When non-nil, search for wiki link targets in subdirectories.
-This is the default search behavior for GitHub and is
-automatically set to t in `gfm-mode'."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-wiki-link-search-parent-directories nil
-  "When non-nil, search for wiki link targets in parent directories.
-This is the default search behavior of Ikiwiki."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-wiki-link-search-type nil
-  "Searching type for markdown wiki link.
-
-sub-directories: search for wiki link targets in sub directories
-parent-directories: search for wiki link targets in parent directories
-project: search for wiki link targets under project root"
-  :group 'markdown
-  :type '(set
-          (const :tag "search wiki link from subdirectories" sub-directories)
-          (const :tag "search wiki link from parent directories" parent-directories)
-          (const :tag "search wiki link under project root" project))
-  :package-version '(markdown-mode . "2.5"))
-
-(make-obsolete-variable 'markdown-wiki-link-search-subdirectories 'markdown-wiki-link-search-type "2.5")
-(make-obsolete-variable 'markdown-wiki-link-search-parent-directories 'markdown-wiki-link-search-type "2.5")
-
-(defcustom markdown-wiki-link-fontify-missing nil
-  "When non-nil, change wiki link face according to existence of target files.
-This is expensive because it requires checking for the file each time the buffer
-changes or the user switches windows.  It is disabled by default because it may
-cause lag when typing on slower machines."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-uri-types
-  '("acap" "cid" "data" "dav" "fax" "file" "ftp"
-    "geo" "gopher" "http" "https" "imap" "ldap" "mailto"
-    "mid" "message" "modem" "news" "nfs" "nntp"
-    "pop" "prospero" "rtsp" "service" "sip" "tel"
-    "telnet" "tip" "urn" "vemmi" "wais")
-  "Link types for syntax highlighting of URIs."
-  :group 'markdown
-  :type '(repeat (string :tag "URI scheme")))
-
-(defcustom markdown-url-compose-char
-  '(?∞ ?… ?⋯ ?# ?★ ?⚓)
-  "Placeholder character for hidden URLs.
-This may be a single character or a list of characters. In case
-of a list, the first one that satisfies `char-displayable-p' will
-be used."
-  :type '(choice
-          (character :tag "Single URL replacement character")
-          (repeat :tag "List of possible URL replacement characters"
-                  character))
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-blockquote-display-char
-  '("▌" "┃" ">")
-  "String to display when hiding blockquote markup.
-This may be a single string or a list of string. In case of a
-list, the first one that satisfies `char-displayable-p' will be
-used."
-  :type '(choice
-          (string :tag "Single blockquote display string")
-          (repeat :tag "List of possible blockquote display strings" string))
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-hr-display-char
-  '(?─ ?━ ?-)
-  "Character for hiding horizontal rule markup.
-This may be a single character or a list of characters.  In case
-of a list, the first one that satisfies `char-displayable-p' will
-be used."
-  :group 'markdown
-  :type '(choice
-          (character :tag "Single HR display character")
-          (repeat :tag "List of possible HR display characters" character))
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-definition-display-char
-  '(?⁘ ?⁙ ?≡ ?⌑ ?◊ ?:)
-  "Character for replacing definition list markup.
-This may be a single character or a list of characters.  In case
-of a list, the first one that satisfies `char-displayable-p' will
-be used."
-  :type '(choice
-          (character :tag "Single definition list character")
-          (repeat :tag "List of possible definition list characters" character))
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-enable-math nil
-  "Syntax highlighting for inline LaTeX and itex expressions.
-Set this to a non-nil value to turn on math support by default.
-Math support can be enabled, disabled, or toggled later using
-`markdown-toggle-math' or \\[markdown-toggle-math]."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp)
-(make-variable-buffer-local 'markdown-enable-math)
-
-(defcustom markdown-enable-html t
-  "Enable font-lock support for HTML tags and attributes."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-enable-highlighting-syntax nil
-  "Enable highlighting syntax."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-css-paths nil
-  "List of URLs of CSS files to link to in the output XHTML."
-  :group 'markdown
-  :type '(repeat (string :tag "CSS File Path")))
-
-(defcustom markdown-content-type "text/html"
-  "Content type string for the http-equiv header in XHTML output.
-When set to an empty string, this attribute is omitted.  Defaults to
-`text/html'."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-coding-system nil
-  "Character set string for the http-equiv header in XHTML output.
-Defaults to `buffer-file-coding-system' (and falling back to
-`utf-8' when not available).  Common settings are `iso-8859-1'
-and `iso-latin-1'.  Use `list-coding-systems' for more choices."
-  :group 'markdown
-  :type 'coding-system)
-
-(defcustom markdown-export-kill-buffer t
-  "Kill output buffer after HTML export.
-When non-nil, kill the HTML output buffer after
-exporting with `markdown-export'."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-xhtml-header-content ""
-  "Additional content to include in the XHTML <head> block."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-xhtml-body-preamble ""
-  "Content to include in the XHTML <body> block, before the output."
-  :group 'markdown
-  :type 'string
-  :safe 'stringp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-xhtml-body-epilogue ""
-  "Content to include in the XHTML <body> block, after the output."
-  :group 'markdown
-  :type 'string
-  :safe 'stringp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-xhtml-standalone-regexp
-  "^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"
-  "Regexp indicating whether `markdown-command' output is standalone XHTML."
-  :group 'markdown
-  :type 'regexp)
-
-(defcustom markdown-link-space-sub-char "_"
-  "Character to use instead of spaces when mapping wiki links to filenames."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-reference-location 'header
-  "Position where new reference definitions are inserted in the document."
-  :group 'markdown
-  :type '(choice (const :tag "At the end of the document" end)
-                 (const :tag "Immediately after the current block" immediately)
-                 (const :tag "At the end of the subtree" subtree)
-                 (const :tag "Before next header" header)))
-
-(defcustom markdown-footnote-location 'end
-  "Position where new footnotes are inserted in the document."
-  :group 'markdown
-  :type '(choice (const :tag "At the end of the document" end)
-                 (const :tag "Immediately after the current block" immediately)
-                 (const :tag "At the end of the subtree" subtree)
-                 (const :tag "Before next header" header)))
-
-(defcustom markdown-footnote-display '((raise 0.2) (height 0.8))
-  "Display specification for footnote markers and inline footnotes.
-By default, footnote text is reduced in size and raised.  Set to
-nil to disable this."
-  :group 'markdown
-  :type '(choice (sexp :tag "Display specification")
-                 (const :tag "Don't set display property" nil))
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-sub-superscript-display
-  '(((raise -0.3) (height 0.7)) . ((raise 0.3) (height 0.7)))
-  "Display specification for subscript and superscripts.
-The car is used for subscript, the cdr is used for superscripts."
-  :group 'markdown
-  :type '(cons (choice (sexp :tag "Subscript form")
-                       (const :tag "No lowering" nil))
-               (choice (sexp :tag "Superscript form")
-                       (const :tag "No raising" nil)))
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-unordered-list-item-prefix "  * "
-  "String inserted before unordered list items."
-  :group 'markdown
-  :type 'string)
-
-(defcustom markdown-ordered-list-enumeration t
-  "When non-nil, use enumerated numbers(1. 2. 3. etc.) for ordered list marker.
-While nil, always uses '1.' for the marker"
-  :group 'markdown
-  :type 'boolean
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-nested-imenu-heading-index t
-  "Use nested or flat imenu heading index.
-A nested index may provide more natural browsing from the menu,
-but a flat list may allow for faster keyboard navigation via tab
-completion."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-add-footnotes-to-imenu t
-  "Add footnotes to end of imenu heading index."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-make-gfm-checkboxes-buttons t
-  "When non-nil, make GFM checkboxes into buttons."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-use-pandoc-style-yaml-metadata nil
-  "When non-nil, allow YAML metadata anywhere in the document."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-split-window-direction 'any
-  "Preference for splitting windows for static and live preview.
-The default value is \\='any, which instructs Emacs to use
-`split-window-sensibly' to automatically choose how to split
-windows based on the values of `split-width-threshold' and
-`split-height-threshold' and the available windows.  To force
-vertically split (left and right) windows, set this to \\='vertical
-or \\='right.  To force horizontally split (top and bottom) windows,
-set this to \\='horizontal or \\='below.
-
-If this value is \\='any and `display-buffer-alist' is set then
-`display-buffer' is used for open buffer function"
-  :group 'markdown
-  :type '(choice (const :tag "Automatic" any)
-                 (const :tag "Right (vertical)" right)
-                 (const :tag "Below (horizontal)" below))
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-live-preview-window-function
-  #'markdown-live-preview-window-eww
-  "Function to display preview of Markdown output within Emacs.
-Function must update the buffer containing the preview and return
-the buffer."
-  :group 'markdown
-  :type 'function)
-
-(defcustom markdown-live-preview-delete-export 'delete-on-destroy
-  "Delete exported HTML file when using `markdown-live-preview-export'.
-If set to \\='delete-on-export, delete on every export. When set to
-\\='delete-on-destroy delete when quitting from command
-`markdown-live-preview-mode'. Never delete if set to nil."
-  :group 'markdown
-  :type '(choice
-          (const :tag "Delete on every export" delete-on-export)
-          (const :tag "Delete when quitting live preview" delete-on-destroy)
-          (const :tag "Never delete" nil)))
-
-(defcustom markdown-list-indent-width 4
-  "Depth of indentation for markdown lists.
-Used in `markdown-demote-list-item' and
-`markdown-promote-list-item'."
-  :group 'markdown
-  :type 'integer)
-
-(defcustom markdown-enable-prefix-prompts t
-  "Display prompts for certain prefix commands.
-Set to nil to disable these prompts."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-gfm-additional-languages nil
-  "Extra languages made available when inserting GFM code blocks.
-Language strings must have be trimmed of whitespace and not
-contain any curly braces. They may be of arbitrary
-capitalization, though."
-  :group 'markdown
-  :type '(repeat (string :validate markdown-validate-language-string)))
-
-(defcustom markdown-gfm-use-electric-backquote t
-  "Use `markdown-electric-backquote' when backquote is hit three times."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-gfm-downcase-languages t
-  "If non-nil, downcase suggested languages.
-This applies to insertions done with
-`markdown-electric-backquote'."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-edit-code-block-default-mode 'normal-mode
-  "Default mode to use for editing code blocks.
-This mode is used when automatic detection fails, such as for GFM
-code blocks with no language specified."
-  :group 'markdown
-  :type '(choice function (const :tag "None" nil))
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-gfm-uppercase-checkbox nil
-  "If non-nil, use [X] for completed checkboxes, [x] otherwise."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp)
-
-(defcustom markdown-hide-urls nil
-  "Hide URLs of inline links and reference tags of reference links.
-Such URLs will be replaced by a single customizable
-character, defined by `markdown-url-compose-char', but are still part
-of the buffer.  Links can be edited interactively with
-\\[markdown-insert-link] or, for example, by deleting the final
-parenthesis to remove the invisibility property. You can also
-hover your mouse pointer over the link text to see the URL.
-Set this to a non-nil value to turn this feature on by default.
-You can interactively set the value of this variable by calling
-`markdown-toggle-url-hiding', pressing \\[markdown-toggle-url-hiding],
-or from the menu Markdown > Links & Images menu."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.3"))
-(make-variable-buffer-local 'markdown-hide-urls)
-
-(defcustom markdown-translate-filename-function #'identity
-  "Function to use to translate filenames when following links.
-\\<markdown-mode-map>\\[markdown-follow-thing-at-point] and \\[markdown-follow-link-at-point]
-call this function with the filename as only argument whenever
-they encounter a filename (instead of a URL) to be visited and
-use its return value instead of the filename in the link.  For
-example, if absolute filenames are actually relative to a server
-root directory, you can set
-`markdown-translate-filename-function' to a function that
-prepends the root directory to the given filename."
-  :group 'markdown
-  :type 'function
-  :risky t
-  :package-version '(markdown-mode . "2.4"))
-
-(defcustom markdown-max-image-size nil
-  "Maximum width and height for displayed inline images.
-This variable may be nil or a cons cell (MAX-WIDTH . MAX-HEIGHT).
-When nil, use the actual size.  Otherwise, use ImageMagick to
-resize larger images to be of the given maximum dimensions.  This
-requires Emacs to be built with ImageMagick support."
-  :group 'markdown
-  :package-version '(markdown-mode . "2.4")
-  :type '(choice
-          (const :tag "Use actual image width" nil)
-          (cons (choice (sexp :tag "Maximum width in pixels")
-                        (const :tag "No maximum width" nil))
-                (choice (sexp :tag "Maximum height in pixels")
-                        (const :tag "No maximum height" nil)))))
-
-(defcustom markdown-mouse-follow-link t
-  "Non-nil means mouse on a link will follow the link.
-This variable must be set before loading markdown-mode."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-table-align-p t
-  "Non-nil means that table is aligned after table operation."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-fontify-whole-heading-line nil
-  "Non-nil means fontify the whole line for headings.
-This is useful when setting a background color for the
-markdown-header-face-* faces."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-special-ctrl-a/e nil
-  "Non-nil means `C-a' and `C-e' behave specially in headlines and items.
-
-When t, `C-a' will bring back the cursor to the beginning of the
-headline text. In an item, this will be the position after bullet
-and check-box, if any. When the cursor is already at that
-position, another `C-a' will bring it to the beginning of the
-line.
-
-`C-e' will jump to the end of the headline, ignoring the presence
-of closing tags in the headline. A second `C-e' will then jump to
-the true end of the line, after closing tags. This also means
-that, when this variable is non-nil, `C-e' also will never jump
-beyond the end of the heading of a folded section, i.e. not after
-the ellipses.
-
-When set to the symbol `reversed', the first `C-a' or `C-e' works
-normally, going to the true line boundary first.  Only a directly
-following, identical keypress will bring the cursor to the
-special positions.
-
-This may also be a cons cell where the behavior for `C-a' and
-`C-e' is set separately."
-  :group 'markdown
-  :type '(choice
-	  (const :tag "off" nil)
-	  (const :tag "on: after hashes/bullet and before closing tags first" t)
-	  (const :tag "reversed: true line boundary first" reversed)
-	  (cons :tag "Set C-a and C-e separately"
-		(choice :tag "Special C-a"
-			(const :tag "off" nil)
-			(const :tag "on: after hashes/bullet first" t)
-			(const :tag "reversed: before hashes/bullet first" reversed))
-		(choice :tag "Special C-e"
-			(const :tag "off" nil)
-			(const :tag "on: before closing tags first" t)
-			(const :tag "reversed: after closing tags first" reversed))))
-  :package-version '(markdown-mode . "2.7"))
-
-;;; Markdown-Specific `rx' Macro ==============================================
-
-;; Based on python-rx from python.el.
-(eval-and-compile
-  (defconst markdown-rx-constituents
-    `((newline . ,(rx "\n"))
-      ;; Note: #405 not consider markdown-list-indent-width however this is never used
-      (indent . ,(rx (or (repeat 4 " ") "\t")))
-      (block-end . ,(rx (and (or (one-or-more (zero-or-more blank) "\n") line-end))))
-      (numeral . ,(rx (and (one-or-more (any "0-9#")) ".")))
-      (bullet . ,(rx (any "*+:-")))
-      (list-marker . ,(rx (or (and (one-or-more (any "0-9#")) ".")
-                              (any "*+:-"))))
-      (checkbox . ,(rx "[" (any " xX") "]")))
-    "Markdown-specific sexps for `markdown-rx'")
-
-  (defun markdown-rx-to-string (form &optional no-group)
-    "Markdown mode specialized `rx-to-string' function.
-This variant supports named Markdown expressions in FORM.
-NO-GROUP non-nil means don't put shy groups around the result."
-    (let ((rx-constituents (append markdown-rx-constituents rx-constituents)))
-      (rx-to-string form no-group)))
-
-  (defmacro markdown-rx (&rest regexps)
-    "Markdown mode specialized rx macro.
-This variant of `rx' supports common Markdown named REGEXPS."
-    (cond ((null regexps)
-           (error "No regexp"))
-          ((cdr regexps)
-           (markdown-rx-to-string `(and ,@regexps) t))
-          (t
-           (markdown-rx-to-string (car regexps) t)))))
-
-
-;;; Regular Expressions =======================================================
-
-(defconst markdown-regex-comment-start
-  "<!--"
-  "Regular expression matches HTML comment opening.")
-
-(defconst markdown-regex-comment-end
-  "--[ \t]*>"
-  "Regular expression matches HTML comment closing.")
-
-(defconst markdown-regex-link-inline
-  "\\(?1:!\\)?\\(?2:\\[\\)\\(?3:\\^?\\(?:\\\\\\]\\|[^]]\\)*\\|\\)\\(?4:\\]\\)\\(?5:(\\)\\s-*\\(?6:[^)]*?\\)\\(?:\\s-+\\(?7:\"[^\"]*\"\\)\\)?\\s-*\\(?8:)\\)"
-  "Regular expression for a [text](file) or an image link ![text](file).
-Group 1 matches the leading exclamation point (optional).
-Group 2 matches the opening square bracket.
-Group 3 matches the text inside the square brackets.
-Group 4 matches the closing square bracket.
-Group 5 matches the opening parenthesis.
-Group 6 matches the URL.
-Group 7 matches the title (optional).
-Group 8 matches the closing parenthesis.")
-
-(defconst markdown-regex-link-reference
-  "\\(?1:!\\)?\\(?2:\\[\\)\\(?3:[^]^][^]]*\\|\\)\\(?4:\\]\\)\\(?5:\\[\\)\\(?6:[^]]*?\\)\\(?7:\\]\\)"
-  "Regular expression for a reference link [text][id].
-Group 1 matches the leading exclamation point (optional).
-Group 2 matches the opening square bracket for the link text.
-Group 3 matches the text inside the square brackets.
-Group 4 matches the closing square bracket for the link text.
-Group 5 matches the opening square bracket for the reference label.
-Group 6 matches the reference label.
-Group 7 matches the closing square bracket for the reference label.")
-
-(defconst markdown-regex-reference-definition
-  "^ \\{0,3\\}\\(?1:\\[\\)\\(?2:[^]\n]+?\\)\\(?3:\\]\\)\\(?4::\\)\\s *\\(?5:.*?\\)\\s *\\(?6: \"[^\"]*\"$\\|$\\)"
-  "Regular expression for a reference definition.
-Group 1 matches the opening square bracket.
-Group 2 matches the reference label.
-Group 3 matches the closing square bracket.
-Group 4 matches the colon.
-Group 5 matches the URL.
-Group 6 matches the title attribute (optional).")
-
-(defconst markdown-regex-footnote
-  "\\(?1:\\[\\^\\)\\(?2:.+?\\)\\(?3:\\]\\)"
-  "Regular expression for a footnote marker [^fn].
-Group 1 matches the opening square bracket and carat.
-Group 2 matches only the label, without the surrounding markup.
-Group 3 matches the closing square bracket.")
-
-(defconst markdown-regex-header
-  "^\\(?:\\(?1:[^\r\n\t -].*\\)\n\\(?:\\(?2:=+\\)\\|\\(?3:-+\\)\\)\\|\\(?4:#+[ \t]+\\)\\(?5:.*?\\)\\(?6:[ \t]+#+\\)?\\)$"
-  "Regexp identifying Markdown headings.
-Group 1 matches the text of a setext heading.
-Group 2 matches the underline of a level-1 setext heading.
-Group 3 matches the underline of a level-2 setext heading.
-Group 4 matches the opening hash marks of an atx heading and whitespace.
-Group 5 matches the text, without surrounding whitespace, of an atx heading.
-Group 6 matches the closing whitespace and hash marks of an atx heading.")
-
-(defconst markdown-regex-header-setext
-  "^\\([^\r\n\t -].*\\)\n\\(=+\\|-+\\)$"
-  "Regular expression for generic setext-style (underline) headers.")
-
-(defconst markdown-regex-header-atx
-  "^\\(#+\\)[ \t]+\\(.*?\\)[ \t]*\\(#*\\)$"
-  "Regular expression for generic atx-style (hash mark) headers.")
-
-(defconst markdown-regex-hr
-  (rx line-start
-      (group (or (and (repeat 3 (and "*" (? " "))) (* (any "* ")))
-                 (and (repeat 3 (and "-" (? " "))) (* (any "- ")))
-                 (and (repeat 3 (and "_" (? " "))) (* (any "_ ")))))
-      line-end)
-  "Regular expression for matching Markdown horizontal rules.")
-
-(defconst markdown-regex-code
-  "\\(?:\\`\\|[^\\]\\)\\(?1:\\(?2:`+\\)\\(?3:\\(?:.\\|\n[^\n]\\)*?[^`]\\)\\(?4:\\2\\)\\)\\(?:[^`]\\|\\'\\)"
-  "Regular expression for matching inline code fragments.
-
-Group 1 matches the entire code fragment including the backquotes.
-Group 2 matches the opening backquotes.
-Group 3 matches the code fragment itself, without backquotes.
-Group 4 matches the closing backquotes.
-
-The leading, unnumbered group ensures that the leading backquote
-character is not escaped.
-The last group, also unnumbered, requires that the character
-following the code fragment is not a backquote.
-Note that \\(?:.\\|\n[^\n]\\) matches any character, including newlines,
-but not two newlines in a row.")
-
-(defconst markdown-regex-kbd
-  "\\(?1:<kbd>\\)\\(?2:\\(?:.\\|\n[^\n]\\)*?\\)\\(?3:</kbd>\\)"
-  "Regular expression for matching <kbd> tags.
-Groups 1 and 3 match the opening and closing tags.
-Group 2 matches the key sequence.")
-
-(defconst markdown-regex-gfm-code-block-open
-  "^[[:blank:]]*\\(?1:```\\)\\(?2:[[:blank:]]*{?[[:blank:]]*\\)\\(?3:[^`[:space:]]+?\\)?\\(?:[[:blank:]]+\\(?4:.+?\\)\\)?\\(?5:[[:blank:]]*}?[[:blank:]]*\\)$"
-  "Regular expression matching opening of GFM code blocks.
-Group 1 matches the opening three backquotes and any following whitespace.
-Group 2 matches the opening brace (optional) and surrounding whitespace.
-Group 3 matches the language identifier (optional).
-Group 4 matches the info string (optional).
-Group 5 matches the closing brace (optional), whitespace, and newline.
-Groups need to agree with `markdown-regex-tilde-fence-begin'.")
-
-(defconst markdown-regex-gfm-code-block-close
-  "^[[:blank:]]*\\(?1:```\\)\\(?2:\\s *?\\)$"
-  "Regular expression matching closing of GFM code blocks.
-Group 1 matches the closing three backquotes.
-Group 2 matches any whitespace and the final newline.")
-
-(defconst markdown-regex-pre
-  "^\\(    \\|\t\\).*$"
-  "Regular expression for matching preformatted text sections.")
-
-(defconst markdown-regex-list
-  (markdown-rx line-start
-               ;; 1. Leading whitespace
-               (group (* blank))
-               ;; 2. List marker: a numeral, bullet, or colon
-               (group list-marker)
-               ;; 3. Trailing whitespace
-               (group (+ blank))
-               ;; 4. Optional checkbox for GFM task list items
-               (opt (group (and checkbox (* blank)))))
-  "Regular expression for matching list items.")
-
-(defconst markdown-regex-bold
-  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:\\*\\*\\|__\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:\\3\\)\\)"
-  "Regular expression for matching bold text.
-Group 1 matches the character before the opening asterisk or
-underscore, if any, ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-(defconst markdown-regex-italic
-  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:[*_]\\)\\(?3:[^ \n\t\\]\\|[^ \n\t*]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?4:\\2\\)\\)"
-  "Regular expression for matching italic text.
-The leading unnumbered matches the character before the opening
-asterisk or underscore, if any, ensuring that it is not a
-backslash escape.
-Group 1 matches the entire expression, including delimiters.
-Groups 2 and 4 matches the opening and closing delimiters.
-Group 3 matches the text inside the delimiters.")
-
-(defconst markdown-regex-strike-through
-  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:~~\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:~~\\)\\)"
-  "Regular expression for matching strike-through text.
-Group 1 matches the character before the opening tilde, if any,
-ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-(defconst markdown-regex-gfm-italic
-  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:[*_]\\)\\(?3:[^ \\]\\2\\|[^ ]\\(?:.\\|\n[^\n]\\)*?\\)\\(?4:\\2\\)\\)"
-  "Regular expression for matching italic text in GitHub Flavored Markdown.
-Underscores in words are not treated as special.
-Group 1 matches the entire expression, including delimiters.
-Groups 2 and 4 matches the opening and closing delimiters.
-Group 3 matches the text inside the delimiters.")
-
-(defconst markdown-regex-blockquote
-  "^[ \t]*\\(?1:[A-Z]?>\\)\\(?2:[ \t]*\\)\\(?3:.*\\)$"
-  "Regular expression for matching blockquote lines.
-Also accounts for a potential capital letter preceding the angle
-bracket, for use with Leanpub blocks (asides, warnings, info
-blocks, etc.).
-Group 1 matches the leading angle bracket.
-Group 2 matches the separating whitespace.
-Group 3 matches the text.")
-
-(defconst markdown-regex-line-break
-  "[^ \n\t][ \t]*\\(  \\)\n"
-  "Regular expression for matching line breaks.")
-
-(defconst markdown-regex-escape
-  "\\(\\\\\\)."
-  "Regular expression for matching escape sequences.")
-
-(defconst markdown-regex-wiki-link
-  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:\\[\\[\\)\\(?3:[^]|]+\\)\\(?:\\(?4:|\\)\\(?5:[^]]+\\)\\)?\\(?6:\\]\\]\\)\\)"
-  "Regular expression for matching wiki links.
-This matches typical bracketed [[WikiLinks]] as well as \\='aliased
-wiki links of the form [[PageName|link text]].
-The meanings of the first and second components depend
-on the value of `markdown-wiki-link-alias-first'.
-
-Group 1 matches the entire link.
-Group 2 matches the opening square brackets.
-Group 3 matches the first component of the wiki link.
-Group 4 matches the pipe separator, when present.
-Group 5 matches the second component of the wiki link, when present.
-Group 6 matches the closing square brackets.")
-
-(defconst markdown-regex-uri
-  (concat "\\(" (regexp-opt markdown-uri-types) ":[^]\t\n\r<>; ]+\\)")
-  "Regular expression for matching inline URIs.")
-
-;; CommanMark specification says scheme length is 2-32 characters
-(defconst markdown-regex-angle-uri
-  (concat "\\(<\\)\\([a-z][a-z0-9.+-]\\{1,31\\}:[^]\t\n\r<>,;()]+\\)\\(>\\)")
-  "Regular expression for matching inline URIs in angle brackets.")
-
-(defconst markdown-regex-email
-  "<\\(\\(?:\\sw\\|\\s_\\|\\s.\\)+@\\(?:\\sw\\|\\s_\\|\\s.\\)+\\)>"
-  "Regular expression for matching inline email addresses.")
-
-(defsubst markdown-make-regex-link-generic ()
-  "Make regular expression for matching any recognized link."
-  (concat "\\(?:" markdown-regex-link-inline
-          (when markdown-enable-wiki-links
-            (concat "\\|" markdown-regex-wiki-link))
-          "\\|" markdown-regex-link-reference
-          "\\|" markdown-regex-angle-uri "\\)"))
-
-(defconst markdown-regex-gfm-checkbox
-  " \\(\\[[ xX]\\]\\) "
-  "Regular expression for matching GFM checkboxes.
-Group 1 matches the text to become a button.")
-
-(defconst markdown-regex-blank-line
-  "^[[:blank:]]*$"
-  "Regular expression that matches a blank line.")
-
-(defconst markdown-regex-block-separator
-  "\n[\n\t\f ]*\n"
-  "Regular expression for matching block boundaries.")
-
-(defconst markdown-regex-block-separator-noindent
-  (concat "\\(\\`\\|\\(" markdown-regex-block-separator "\\)[^\n\t\f ]\\)")
-  "Regexp for block separators before lines with no indentation.")
-
-(defconst markdown-regex-math-inline-single
-  "\\(?:^\\|[^\\]\\)\\(?1:\\$\\)\\(?2:\\(?:[^\\$]\\|\\\\.\\)*\\)\\(?3:\\$\\)"
-  "Regular expression for itex $..$ math mode expressions.
-Groups 1 and 3 match the opening and closing dollar signs.
-Group 2 matches the mathematical expression contained within.")
-
-(defconst markdown-regex-math-inline-double
-  "\\(?:^\\|[^\\]\\)\\(?1:\\$\\$\\)\\(?2:\\(?:[^\\$]\\|\\\\.\\)*\\)\\(?3:\\$\\$\\)"
-  "Regular expression for itex $$..$$ math mode expressions.
-Groups 1 and 3 match opening and closing dollar signs.
-Group 2 matches the mathematical expression contained within.")
-
-(defconst markdown-regex-math-display
-  (rx line-start (* blank)
-      (group (group (repeat 1 2 "\\")) "[")
-      (group (*? anything))
-      (group (backref 2) "]")
-      line-end)
-  "Regular expression for \[..\] or \\[..\\] display math.
-Groups 1 and 4 match the opening and closing markup.
-Group 3 matches the mathematical expression contained within.
-Group 2 matches the opening slashes, and is used internally to
-match the closing slashes.")
-
-(defsubst markdown-make-tilde-fence-regex (num-tildes &optional end-of-line)
-  "Return regexp matching a tilde code fence at least NUM-TILDES long.
-END-OF-LINE is the regexp construct to indicate end of line; $ if
-missing."
-  (format "%s%d%s%s" "^[[:blank:]]*\\([~]\\{" num-tildes ",\\}\\)"
-          (or end-of-line "$")))
-
-(defconst markdown-regex-tilde-fence-begin
-  (markdown-make-tilde-fence-regex
-   3 "\\([[:blank:]]*{?\\)[[:blank:]]*\\([^[:space:]]+?\\)?\\(?:[[:blank:]]+\\(.+?\\)\\)?\\([[:blank:]]*}?[[:blank:]]*\\)$")
-  "Regular expression for matching tilde-fenced code blocks.
-Group 1 matches the opening tildes.
-Group 2 matches (optional) opening brace and surrounding whitespace.
-Group 3 matches the language identifier (optional).
-Group 4 matches the info string (optional).
-Group 5 matches the closing brace (optional) and any surrounding whitespace.
-Groups need to agree with `markdown-regex-gfm-code-block-open'.")
-
-(defconst markdown-regex-declarative-metadata
-  "^[ \t]*\\(?:-[ \t]*\\)?\\([[:alpha:]][[:alpha:] _-]*?\\)\\([:=][ \t]*\\)\\(.*\\)$"
-  "Regular expression for matching declarative metadata statements.
-This matches MultiMarkdown metadata as well as YAML and TOML
-assignments such as the following:
-
-    variable: value
-
-or
-
-    variable = value")
-
-(defconst markdown-regex-pandoc-metadata
-  "^\\(%\\)\\([ \t]*\\)\\(.*\\(?:\n[ \t]+.*\\)*\\)"
-  "Regular expression for matching Pandoc metadata.")
-
-(defconst markdown-regex-yaml-metadata-border
-  "\\(-\\{3\\}\\)$"
-  "Regular expression for matching YAML metadata.")
-
-(defconst markdown-regex-yaml-pandoc-metadata-end-border
-  "^\\(\\.\\{3\\}\\|\\-\\{3\\}\\)$"
-  "Regular expression for matching YAML metadata end borders.")
-
-(defsubst markdown-get-yaml-metadata-start-border ()
-  "Return YAML metadata start border depending upon whether Pandoc is used."
-  (concat
-   (if markdown-use-pandoc-style-yaml-metadata "^" "\\`")
-   markdown-regex-yaml-metadata-border))
-
-(defsubst markdown-get-yaml-metadata-end-border (_)
-  "Return YAML metadata end border depending upon whether Pandoc is used."
-  (if markdown-use-pandoc-style-yaml-metadata
-      markdown-regex-yaml-pandoc-metadata-end-border
-    markdown-regex-yaml-metadata-border))
-
-(defconst markdown-regex-inline-attributes
-  "[ \t]*\\(?:{:?\\)[ \t]*\\(?:\\(?:#[[:alpha:]_.:-]+\\|\\.[[:alpha:]_.:-]+\\|\\w+=['\"]?[^\n'\"}]*['\"]?\\),?[ \t]*\\)+\\(?:}\\)[ \t]*$"
-  "Regular expression for matching inline identifiers or attribute lists.
-Compatible with Pandoc, Python Markdown, PHP Markdown Extra, and Leanpub.")
-
-(defconst markdown-regex-leanpub-sections
-  (concat
-   "^\\({\\)\\("
-   (regexp-opt '("frontmatter" "mainmatter" "backmatter" "appendix" "pagebreak"))
-   "\\)\\(}\\)[ \t]*\n")
-  "Regular expression for Leanpub section markers and related syntax.")
-
-(defconst markdown-regex-sub-superscript
-  "\\(?:^\\|[^\\~^]\\)\\(?1:\\(?2:[~^]\\)\\(?3:[+-\u2212]?[[:alnum:]]+\\)\\(?4:\\2\\)\\)"
-  "The regular expression matching a sub- or superscript.
-The leading un-numbered group matches the character before the
-opening tilde or carat, if any, ensuring that it is not a
-backslash escape, carat, or tilde.
-Group 1 matches the entire expression, including markup.
-Group 2 matches the opening markup--a tilde or carat.
-Group 3 matches the text inside the delimiters.
-Group 4 matches the closing markup--a tilde or carat.")
-
-(defconst markdown-regex-include
-  "^\\(?1:<<\\)\\(?:\\(?2:\\[\\)\\(?3:.*\\)\\(?4:\\]\\)\\)?\\(?:\\(?5:(\\)\\(?6:.*\\)\\(?7:)\\)\\)?\\(?:\\(?8:{\\)\\(?9:.*\\)\\(?10:}\\)\\)?$"
-  "Regular expression matching common forms of include syntax.
-Marked 2, Leanpub, and other processors support some of these forms:
-
-<<[sections/section1.md]
-<<(folder/filename)
-<<[Code title](folder/filename)
-<<{folder/raw_file.html}
-
-Group 1 matches the opening two angle brackets.
-Groups 2-4 match the opening square bracket, the text inside,
-and the closing square bracket, respectively.
-Groups 5-7 match the opening parenthesis, the text inside, and
-the closing parenthesis.
-Groups 8-10 match the opening brace, the text inside, and the brace.")
-
-(defconst markdown-regex-pandoc-inline-footnote
-  "\\(?1:\\^\\)\\(?2:\\[\\)\\(?3:\\(?:.\\|\n[^\n]\\)*?\\)\\(?4:\\]\\)"
-  "Regular expression for Pandoc inline footnote^[footnote text].
-Group 1 matches the opening caret.
-Group 2 matches the opening square bracket.
-Group 3 matches the footnote text, without the surrounding markup.
-Group 4 matches the closing square bracket.")
-
-(defconst markdown-regex-html-attr
-  "\\(\\<[[:alpha:]:-]+\\>\\)\\(\\s-*\\(=\\)\\s-*\\(\".*?\"\\|'.*?'\\|[^'\">[:space:]]+\\)?\\)?"
-  "Regular expression for matching HTML attributes and values.
-Group 1 matches the attribute name.
-Group 2 matches the following whitespace, equals sign, and value, if any.
-Group 3 matches the equals sign, if any.
-Group 4 matches single-, double-, or un-quoted attribute values.")
-
-(defconst markdown-regex-html-tag
-  (concat "\\(</?\\)\\(\\w+\\)\\(\\(\\s-+" markdown-regex-html-attr
-          "\\)+\\s-*\\|\\s-*\\)\\(/?>\\)")
-  "Regular expression for matching HTML tags.
-Groups 1 and 9 match the beginning and ending angle brackets and slashes.
-Group 2 matches the tag name.
-Group 3 matches all attributes and whitespace following the tag name.")
-
-(defconst markdown-regex-html-entity
-  "\\(&#?[[:alnum:]]+;\\)"
-  "Regular expression for matching HTML entities.")
-
-(defconst markdown-regex-highlighting
-  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:==\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:==\\)\\)"
-"Regular expression for matching highlighting text.
-Group 1 matches the character before the opening equal, if any,
-ensuring that it is not a backslash escape.
-Group 2 matches the entire expression, including delimiters.
-Groups 3 and 5 matches the opening and closing delimiters.
-Group 4 matches the text inside the delimiters.")
-
-
-;;; Syntax ====================================================================
-
-(defvar markdown--syntax-properties
-  (list 'markdown-tilde-fence-begin nil
-        'markdown-tilde-fence-end nil
-        'markdown-fenced-code nil
-        'markdown-yaml-metadata-begin nil
-        'markdown-yaml-metadata-end nil
-        'markdown-yaml-metadata-section nil
-        'markdown-gfm-block-begin nil
-        'markdown-gfm-block-end nil
-        'markdown-gfm-code nil
-        'markdown-list-item nil
-        'markdown-pre nil
-        'markdown-blockquote nil
-        'markdown-hr nil
-        'markdown-comment nil
-        'markdown-heading nil
-        'markdown-heading-1-setext nil
-        'markdown-heading-2-setext nil
-        'markdown-heading-1-atx nil
-        'markdown-heading-2-atx nil
-        'markdown-heading-3-atx nil
-        'markdown-heading-4-atx nil
-        'markdown-heading-5-atx nil
-        'markdown-heading-6-atx nil
-        'markdown-metadata-key nil
-        'markdown-metadata-value nil
-        'markdown-metadata-markup nil)
-  "Property list of all Markdown syntactic properties.")
-
-(defvar markdown-literal-faces
-  '(markdown-inline-code-face
-    markdown-pre-face
-    markdown-math-face
-    markdown-url-face
-    markdown-plain-url-face
-    markdown-language-keyword-face
-    markdown-language-info-face
-    markdown-metadata-key-face
-    markdown-metadata-value-face
-    markdown-html-entity-face
-    markdown-html-tag-name-face
-    markdown-html-tag-delimiter-face
-    markdown-html-attr-name-face
-    markdown-html-attr-value-face
-    markdown-reference-face
-    markdown-footnote-marker-face
-    markdown-line-break-face
-    markdown-comment-face)
-  "A list of markdown-mode faces that contain literal text.
-Literal text treats backslashes literally, rather than as an
-escape character (see `markdown-match-escape').")
-
-(defsubst markdown-in-comment-p (&optional pos)
-  "Return non-nil if POS is in a comment.
-If POS is not given, use point instead."
-  (get-text-property (or pos (point)) 'markdown-comment))
-
-(defun markdown--face-p (pos faces)
-  "Return non-nil if face of POS contain FACES."
-  (let ((face-prop (get-text-property pos 'face)))
-    (if (listp face-prop)
-        (cl-loop for face in face-prop
-                 thereis (memq face faces))
-      (memq face-prop faces))))
-
-(defsubst markdown--math-block-p (&optional pos)
-  (when markdown-enable-math
-    (markdown--face-p (or pos (point)) '(markdown-math-face))))
-
-(defun markdown-syntax-propertize-extend-region (start end)
-  "Extend START to END region to include an entire block of text.
-This helps improve syntax analysis for block constructs.
-Returns a cons (NEW-START . NEW-END) or nil if no adjustment should be made.
-Function is called repeatedly until it returns nil. For details, see
-`syntax-propertize-extend-region-functions'."
-  (save-match-data
-    (save-excursion
-      (let* ((new-start (progn (goto-char start)
-                               (skip-chars-forward "\n")
-                               (if (re-search-backward "\n\n" nil t)
-                                   (min start (match-end 0))
-                                 (point-min))))
-             (new-end (progn (goto-char end)
-                             (skip-chars-backward "\n")
-                             (if (re-search-forward "\n\n" nil t)
-                                 (max end (match-beginning 0))
-                               (point-max))))
-             (code-match (markdown-code-block-at-pos new-start))
-             ;; FIXME: The `code-match' can return bogus values
-             ;; when text has been inserted/deleted!
-             (new-start (min (or (and code-match (cl-first code-match))
-                                 (point-max))
-                             new-start))
-             (code-match (and (< end (point-max))
-                              (markdown-code-block-at-pos end)))
-             (new-end (max (or (and code-match (cl-second code-match)) 0)
-                           new-end)))
-
-        (unless (and (eq new-start start) (eq new-end end))
-          (cons new-start (min new-end (point-max))))))))
-
-(defun markdown-font-lock-extend-region-function (start end _)
-  "Used in `jit-lock-after-change-extend-region-functions'.
-Delegates to `markdown-syntax-propertize-extend-region'. START
-and END are the previous region to refontify."
-  (let ((res (markdown-syntax-propertize-extend-region start end)))
-    (when res
-      ;; syntax-propertize-function is not called when character at
-      ;; (point-max) is deleted, but font-lock-extend-region-functions
-      ;; are called.  Force a syntax property update in that case.
-      (when (= end (point-max))
-        ;; This function is called in a buffer modification hook.
-        ;; `markdown-syntax-propertize' doesn't save the match data,
-        ;; so we have to do it here.
-        (save-match-data
-          (markdown-syntax-propertize (car res) (cdr res))))
-      (setq jit-lock-start (car res)
-            jit-lock-end (cdr res)))))
-
-(defun markdown--cur-list-item-bounds ()
-  "Return a list describing the list item at point.
-Assumes that match data is set for `markdown-regex-list'.  See the
-documentation for `markdown-cur-list-item-bounds' for the format of
-the returned list."
-  (save-excursion
-    (let* ((begin (match-beginning 0))
-           (indent (length (match-string-no-properties 1)))
-           (nonlist-indent (- (match-end 3) (match-beginning 0)))
-           (marker (buffer-substring-no-properties
-                    (match-beginning 2) (match-end 3)))
-           (checkbox (match-string-no-properties 4))
-           (match (butlast (match-data t)))
-           (end (markdown-cur-list-item-end nonlist-indent)))
-      (list begin end indent nonlist-indent marker checkbox match))))
-
-(defun markdown--append-list-item-bounds (marker indent cur-bounds bounds)
-  "Update list item BOUNDS given list MARKER, block INDENT, and CUR-BOUNDS.
-Here, MARKER is a string representing the type of list and INDENT
-is an integer giving the indentation, in spaces, of the current
-block.  CUR-BOUNDS is a list of the form returned by
-`markdown-cur-list-item-bounds' and BOUNDS is a list of bounds
-values for parent list items.  When BOUNDS is nil, it means we are
-at baseline (not inside of a nested list)."
-  (let ((prev-indent (or (cl-third (car bounds)) 0)))
-    (cond
-     ;; New list item at baseline.
-     ((and marker (null bounds))
-      (list cur-bounds))
-     ;; List item with greater indentation (four or more spaces).
-     ;; Increase list level by consing CUR-BOUNDS onto BOUNDS.
-     ((and marker (>= indent (+ prev-indent markdown-list-indent-width)))
-      (cons cur-bounds bounds))
-     ;; List item with greater or equal indentation (less than four spaces).
-     ;; Keep list level the same by replacing the car of BOUNDS.
-     ((and marker (>= indent prev-indent))
-      (cons cur-bounds (cdr bounds)))
-     ;; Lesser indentation level.
-     ;; Pop appropriate number of elements off BOUNDS list (e.g., lesser
-     ;; indentation could move back more than one list level).  Note
-     ;; that this block need not be the beginning of list item.
-     ((< indent prev-indent)
-      (while (and (> (length bounds) 1)
-                  (setq prev-indent (cl-third (cadr bounds)))
-                  (< indent (+ prev-indent markdown-list-indent-width)))
-        (setq bounds (cdr bounds)))
-      (cons cur-bounds bounds))
-     ;; Otherwise, do nothing.
-     (t bounds))))
-
-(defun markdown-syntax-propertize-list-items (start end)
-  "Propertize list items from START to END.
-Stores nested list item information in the `markdown-list-item'
-text property to make later syntax analysis easier.  The value of
-this property is a list with elements of the form (begin . end)
-giving the bounds of the current and parent list items."
-  (save-excursion
-    (goto-char start)
-    (let ((prev-list-line -100)
-          bounds level pre-regexp)
-      ;; Find a baseline point with zero list indentation
-      (markdown-search-backward-baseline)
-      ;; Search for all list items between baseline and END
-      (while (and (< (point) end)
-                  (re-search-forward markdown-regex-list end 'limit))
-        ;; Level of list nesting
-        (setq level (length bounds))
-        ;; Pre blocks need to be indented one level past the list level
-        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ level)))
-        (beginning-of-line)
-        (cond
-         ;; Reset at headings, horizontal rules, and top-level blank lines.
-         ;; Propertize baseline when in range.
-         ((markdown-new-baseline)
-          (setq bounds nil))
-         ;; Make sure this is not a line from a pre block
-         ((and (looking-at-p pre-regexp)
-               ;; too indented line is also treated as list if previous line is list
-               (>= (- (line-number-at-pos) prev-list-line) 2)))
-         ;; If not, then update levels and propertize list item when in range.
-         (t
-          (let* ((indent (current-indentation))
-                 (cur-bounds (markdown--cur-list-item-bounds))
-                 (first (cl-first cur-bounds))
-                 (last (cl-second cur-bounds))
-                 (marker (cl-fifth cur-bounds)))
-            (setq bounds (markdown--append-list-item-bounds
-                          marker indent cur-bounds bounds))
-            (when (and (<= start (point)) (<= (point) end))
-              (setq prev-list-line (line-number-at-pos first))
-              (put-text-property first last 'markdown-list-item bounds)))))
-        (end-of-line)))))
-
-(defun markdown-syntax-propertize-pre-blocks (start end)
-  "Match preformatted text blocks from START to END."
-  (save-excursion
-    (goto-char start)
-    (let (finish)
-      ;; Use loop for avoiding too many recursive calls
-      ;; https://github.com/jrblevin/markdown-mode/issues/512
-      (while (not finish)
-        (let ((levels (markdown-calculate-list-levels))
-              indent pre-regexp close-regexp open close)
-          (while (and (< (point) end) (not close))
-            ;; Search for a region with sufficient indentation
-            (if (null levels)
-                (setq indent 1)
-              (setq indent (1+ (length levels))))
-            (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" indent))
-            (setq close-regexp (format "^\\(    \\|\t\\)\\{0,%d\\}\\([^ \t]\\)" (1- indent)))
-
-            (cond
-             ;; If not at the beginning of a line, move forward
-             ((not (bolp)) (forward-line))
-             ;; Move past blank lines
-             ((markdown-cur-line-blank-p) (forward-line))
-             ;; At headers and horizontal rules, reset levels
-             ((markdown-new-baseline) (forward-line) (setq levels nil))
-             ;; If the current line has sufficient indentation, mark out pre block
-             ;; The opening should be preceded by a blank line.
-             ((and (markdown-prev-line-blank) (looking-at pre-regexp))
-              (setq open (match-beginning 0))
-              (while (and (or (looking-at-p pre-regexp) (markdown-cur-line-blank-p))
-                          (not (eobp)))
-                (forward-line))
-              (skip-syntax-backward "-")
-              (forward-line)
-              (setq close (point)))
-             ;; If current line has a list marker, update levels, move to end of block
-             ((looking-at markdown-regex-list)
-              (setq levels (markdown-update-list-levels
-                            (match-string 2) (current-indentation) levels))
-              (markdown-end-of-text-block))
-             ;; If this is the end of the indentation level, adjust levels accordingly.
-             ;; Only match end of indentation level if levels is not the empty list.
-             ((and (car levels) (looking-at-p close-regexp))
-              (setq levels (markdown-update-list-levels
-                            nil (current-indentation) levels))
-              (markdown-end-of-text-block))
-             (t (markdown-end-of-text-block))))
-
-          (if (and open close)
-              ;; Set text property data and continue to search
-              (put-text-property open close 'markdown-pre (list open close))
-            (setq finish t))))
-      nil)))
-
-(defconst markdown-fenced-block-pairs
-  `(((,markdown-regex-tilde-fence-begin markdown-tilde-fence-begin)
-     (markdown-make-tilde-fence-regex markdown-tilde-fence-end)
-     markdown-fenced-code)
-    ((markdown-get-yaml-metadata-start-border markdown-yaml-metadata-begin)
-     (markdown-get-yaml-metadata-end-border markdown-yaml-metadata-end)
-     markdown-yaml-metadata-section)
-    ((,markdown-regex-gfm-code-block-open markdown-gfm-block-begin)
-     (,markdown-regex-gfm-code-block-close markdown-gfm-block-end)
-     markdown-gfm-code))
-  "Mapping of regular expressions to \"fenced-block\" constructs.
-These constructs are distinguished by having a distinctive start
-and end pattern, both of which take up an entire line of text,
-but no special pattern to identify text within the fenced
-blocks (unlike blockquotes and indented-code sections).
-
-Each element within this list takes the form:
-
-  ((START-REGEX-OR-FUN START-PROPERTY)
-   (END-REGEX-OR-FUN END-PROPERTY)
-   MIDDLE-PROPERTY)
-
-Each *-REGEX-OR-FUN element can be a regular expression as a string, or a
-function which evaluates to same. Functions for START-REGEX-OR-FUN accept no
-arguments, but functions for END-REGEX-OR-FUN accept a single numerical argument
-which is the length of the first group of the START-REGEX-OR-FUN match, which
-can be ignored if unnecessary. `markdown-maybe-funcall-regexp' is used to
-evaluate these into \"real\" regexps.
-
-The *-PROPERTY elements are the text properties applied to each part of the
-block construct when it is matched using
-`markdown-syntax-propertize-fenced-block-constructs'. START-PROPERTY is applied
-to the text matching START-REGEX-OR-FUN, END-PROPERTY to END-REGEX-OR-FUN, and
-MIDDLE-PROPERTY to the text in between the two. The value of *-PROPERTY is the
-`match-data' when the regexp was matched to the text. In the case of
-MIDDLE-PROPERTY, the value is a false match data of the form \\='(begin end), with
-begin and end set to the edges of the \"middle\" text. This makes fontification
-easier.")
-
-(defun markdown-text-property-at-point (prop)
-  (get-text-property (point) prop))
-
-(defsubst markdown-maybe-funcall-regexp (object &optional arg)
-  (cond ((functionp object)
-         (if arg (funcall object arg) (funcall object)))
-        ((stringp object) object)
-        (t (error "Object cannot be turned into regex"))))
-
-(defsubst markdown-get-start-fence-regexp ()
-  "Return regexp to find all \"start\" sections of fenced block constructs.
-Which construct is actually contained in the match must be found separately."
-  (mapconcat
-   #'identity
-   (mapcar (lambda (entry) (markdown-maybe-funcall-regexp (caar entry)))
-           markdown-fenced-block-pairs)
-   "\\|"))
-
-(defun markdown-get-fenced-block-begin-properties ()
-  (cl-mapcar (lambda (entry) (cl-cadar entry)) markdown-fenced-block-pairs))
-
-(defun markdown-get-fenced-block-end-properties ()
-  (cl-mapcar (lambda (entry) (cl-cadadr entry)) markdown-fenced-block-pairs))
-
-(defun markdown-get-fenced-block-middle-properties ()
-  (cl-mapcar #'cl-third markdown-fenced-block-pairs))
-
-(defun markdown-find-previous-prop (prop &optional lim)
-  "Find previous place where property PROP is non-nil, up to LIM.
-Return a cons of (pos . property). pos is point if point contains
-non-nil PROP."
-  (let ((res
-         (if (get-text-property (point) prop) (point)
-           (previous-single-property-change
-            (point) prop nil (or lim (point-min))))))
-    (when (and (not (get-text-property res prop))
-               (> res (point-min))
-               (get-text-property (1- res) prop))
-      (cl-decf res))
-    (when (and res (get-text-property res prop)) (cons res prop))))
-
-(defun markdown-find-next-prop (prop &optional lim)
-  "Find next place where property PROP is non-nil, up to LIM.
-Return a cons of (POS . PROPERTY) where POS is point if point
-contains non-nil PROP."
-  (let ((res
-         (if (get-text-property (point) prop) (point)
-           (next-single-property-change
-            (point) prop nil (or lim (point-max))))))
-    (when (and res (get-text-property res prop)) (cons res prop))))
-
-(defun markdown-min-of-seq (map-fn seq)
-  "Apply MAP-FN to SEQ and return element of SEQ with minimum value of MAP-FN."
-  (cl-loop for el in seq
-           with min = 1.0e+INF          ; infinity
-           with min-el = nil
-           do (let ((res (funcall map-fn el)))
-                (when (< res min)
-                  (setq min res)
-                  (setq min-el el)))
-           finally return min-el))
-
-(defun markdown-max-of-seq (map-fn seq)
-  "Apply MAP-FN to SEQ and return element of SEQ with maximum value of MAP-FN."
-  (cl-loop for el in seq
-           with max = -1.0e+INF          ; negative infinity
-           with max-el = nil
-           do (let ((res (funcall map-fn el)))
-                (when (and res (> res max))
-                  (setq max res)
-                  (setq max-el el)))
-           finally return max-el))
-
-(defun markdown-find-previous-block ()
-  "Find previous block.
-Detect whether `markdown-syntax-propertize-fenced-block-constructs' was
-unable to propertize the entire block, but was able to propertize the beginning
-of the block. If so, return a cons of (pos . property) where the beginning of
-the block was propertized."
-  (let ((start-pt (point))
-        (closest-open
-         (markdown-max-of-seq
-          #'car
-          (cl-remove-if
-           #'null
-           (cl-mapcar
-            #'markdown-find-previous-prop
-            (markdown-get-fenced-block-begin-properties))))))
-    (when closest-open
-      (let* ((length-of-open-match
-              (let ((match-d
-                     (get-text-property (car closest-open) (cdr closest-open))))
-                (- (cl-fourth match-d) (cl-third match-d))))
-             (end-regexp
-              (markdown-maybe-funcall-regexp
-               (cl-caadr
-                (cl-find-if
-                 (lambda (entry) (eq (cl-cadar entry) (cdr closest-open)))
-                 markdown-fenced-block-pairs))
-               length-of-open-match))
-             (end-prop-loc
-              (save-excursion
-                (save-match-data
-                  (goto-char (car closest-open))
-                  (and (re-search-forward end-regexp start-pt t)
-                       (match-beginning 0))))))
-        (and (not end-prop-loc) closest-open)))))
-
-(defun markdown-get-fenced-block-from-start (prop)
-  "Return limits of an enclosing fenced block from its start, using PROP.
-Return value is a list usable as `match-data'."
-  (catch 'no-rest-of-block
-    (let* ((correct-entry
-            (cl-find-if
-             (lambda (entry) (eq (cl-cadar entry) prop))
-             markdown-fenced-block-pairs))
-           (begin-of-begin (cl-first (markdown-text-property-at-point prop)))
-           (middle-prop (cl-third correct-entry))
-           (end-prop (cl-cadadr correct-entry))
-           (end-of-end
-            (save-excursion
-              (goto-char (match-end 0))   ; end of begin
-              (unless (eobp) (forward-char))
-              (let ((mid-prop-v (markdown-text-property-at-point middle-prop)))
-                (if (not mid-prop-v)    ; no middle
-                    (progn
-                      ;; try to find end by advancing one
-                      (let ((end-prop-v
-                             (markdown-text-property-at-point end-prop)))
-                        (if end-prop-v (cl-second end-prop-v)
-                          (throw 'no-rest-of-block nil))))
-                  (set-match-data mid-prop-v)
-                  (goto-char (match-end 0))   ; end of middle
-                  (beginning-of-line)         ; into end
-                  (cl-second (markdown-text-property-at-point end-prop)))))))
-      (list begin-of-begin end-of-end))))
-
-(defun markdown-get-fenced-block-from-middle (prop)
-  "Return limits of an enclosing fenced block from its middle, using PROP.
-Return value is a list usable as `match-data'."
-  (let* ((correct-entry
-          (cl-find-if
-           (lambda (entry) (eq (cl-third entry) prop))
-           markdown-fenced-block-pairs))
-         (begin-prop (cl-cadar correct-entry))
-         (begin-of-begin
-          (save-excursion
-            (goto-char (match-beginning 0))
-            (unless (bobp) (forward-line -1))
-            (beginning-of-line)
-            (cl-first (markdown-text-property-at-point begin-prop))))
-         (end-prop (cl-cadadr correct-entry))
-         (end-of-end
-          (save-excursion
-            (goto-char (match-end 0))
-            (beginning-of-line)
-            (cl-second (markdown-text-property-at-point end-prop)))))
-    (list begin-of-begin end-of-end)))
-
-(defun markdown-get-fenced-block-from-end (prop)
-  "Return limits of an enclosing fenced block from its end, using PROP.
-Return value is a list usable as `match-data'."
-  (let* ((correct-entry
-          (cl-find-if
-           (lambda (entry) (eq (cl-cadadr entry) prop))
-           markdown-fenced-block-pairs))
-         (end-of-end (cl-second (markdown-text-property-at-point prop)))
-         (middle-prop (cl-third correct-entry))
-         (begin-prop (cl-cadar correct-entry))
-         (begin-of-begin
-          (save-excursion
-            (goto-char (match-beginning 0)) ; beginning of end
-            (unless (bobp) (backward-char)) ; into middle
-            (let ((mid-prop-v (markdown-text-property-at-point middle-prop)))
-              (if (not mid-prop-v)
-                  (progn
-                    (beginning-of-line)
-                    (cl-first (markdown-text-property-at-point begin-prop)))
-                (set-match-data mid-prop-v)
-                (goto-char (match-beginning 0))   ; beginning of middle
-                (unless (bobp) (forward-line -1)) ; into beginning
-                (beginning-of-line)
-                (cl-first (markdown-text-property-at-point begin-prop)))))))
-    (list begin-of-begin end-of-end)))
-
-(defun markdown-get-enclosing-fenced-block-construct (&optional pos)
-  "Get \"fake\" match data for block enclosing POS.
-Returns fake match data which encloses the start, middle, and end
-of the block construct enclosing POS, if it exists. Used in
-`markdown-code-block-at-pos'."
-  (save-excursion
-    (when pos (goto-char pos))
-    (beginning-of-line)
-    (car
-     (cl-remove-if
-      #'null
-      (cl-mapcar
-       (lambda (fun-and-prop)
-         (cl-destructuring-bind (fun prop) fun-and-prop
-           (when prop
-             (save-match-data
-               (set-match-data (markdown-text-property-at-point prop))
-               (funcall fun prop)))))
-       `((markdown-get-fenced-block-from-start
-          ,(cl-find-if
-            #'markdown-text-property-at-point
-            (markdown-get-fenced-block-begin-properties)))
-         (markdown-get-fenced-block-from-middle
-          ,(cl-find-if
-            #'markdown-text-property-at-point
-            (markdown-get-fenced-block-middle-properties)))
-         (markdown-get-fenced-block-from-end
-          ,(cl-find-if
-            #'markdown-text-property-at-point
-            (markdown-get-fenced-block-end-properties)))))))))
-
-(defun markdown-propertize-end-match (reg end fence-spec middle-begin)
-  "Get match for REG up to END, if exists, and propertize appropriately.
-FENCE-SPEC is an entry in `markdown-fenced-block-pairs' and
-MIDDLE-BEGIN is the start of the \"middle\" section of the block."
-  (when (re-search-forward reg end t)
-    (let ((close-begin (match-beginning 0)) ; Start of closing line.
-          (close-end (match-end 0))         ; End of closing line.
-          (close-data (match-data t)))      ; Match data for closing line.
-      ;; Propertize middle section of fenced block.
-      (put-text-property middle-begin close-begin
-                         (cl-third fence-spec)
-                         (list middle-begin close-begin))
-      ;; If the block is a YAML block, propertize the declarations inside
-      (when (< middle-begin close-begin) ;; workaround #634
-        (markdown-syntax-propertize-yaml-metadata middle-begin close-begin))
-      ;; Propertize closing line of fenced block.
-      (put-text-property close-begin close-end
-                         (cl-cadadr fence-spec) close-data))))
-
-(defun markdown--triple-quote-single-line-p (begin)
-  (save-excursion
-    (goto-char begin)
-    (save-match-data
-      (and (search-forward "```" nil t)
-           (search-forward "```" (line-end-position) t)))))
-
-(defun markdown-syntax-propertize-fenced-block-constructs (start end)
-  "Propertize according to `markdown-fenced-block-pairs' from START to END.
-If unable to propertize an entire block (if the start of a block is within START
-and END, but the end of the block is not), propertize the start section of a
-block, then in a subsequent call propertize both middle and end by finding the
-start which was previously propertized."
-  (let ((start-reg (markdown-get-start-fence-regexp)))
-    (save-excursion
-      (goto-char start)
-      ;; start from previous unclosed block, if exists
-      (let ((prev-begin-block (markdown-find-previous-block)))
-        (when prev-begin-block
-          (let* ((correct-entry
-                  (cl-find-if (lambda (entry)
-                                (eq (cdr prev-begin-block) (cl-cadar entry)))
-                              markdown-fenced-block-pairs))
-                 (enclosed-text-start (1+ (car prev-begin-block)))
-                 (start-length
-                  (save-excursion
-                    (goto-char (car prev-begin-block))
-                    (string-match
-                     (markdown-maybe-funcall-regexp
-                      (caar correct-entry))
-                     (buffer-substring
-                      (line-beginning-position) (line-end-position)))
-                    (- (match-end 1) (match-beginning 1))))
-                 (end-reg (markdown-maybe-funcall-regexp
-                           (cl-caadr correct-entry) start-length)))
-            (markdown-propertize-end-match
-             end-reg end correct-entry enclosed-text-start))))
-      ;; find all new blocks within region
-      (while (re-search-forward start-reg end t)
-        ;; we assume the opening constructs take up (only) an entire line,
-        ;; so we re-check the current line
-        (let* ((block-start (match-beginning 0))
-               (cur-line (buffer-substring (line-beginning-position) (line-end-position)))
-               ;; find entry in `markdown-fenced-block-pairs' corresponding
-               ;; to regex which was matched
-               (correct-entry
-                (cl-find-if
-                 (lambda (fenced-pair)
-                   (string-match-p
-                    (markdown-maybe-funcall-regexp (caar fenced-pair))
-                    cur-line))
-                 markdown-fenced-block-pairs))
-               (enclosed-text-start
-                (save-excursion (1+ (line-end-position))))
-               (end-reg
-                (markdown-maybe-funcall-regexp
-                 (cl-caadr correct-entry)
-                 (if (and (match-beginning 1) (match-end 1))
-                     (- (match-end 1) (match-beginning 1))
-                   0)))
-               (prop (cl-cadar correct-entry)))
-          (when (or (not (eq prop 'markdown-gfm-block-begin))
-                    (not (markdown--triple-quote-single-line-p block-start)))
-            ;; get correct match data
-            (save-excursion
-              (beginning-of-line)
-              (re-search-forward
-               (markdown-maybe-funcall-regexp (caar correct-entry))
-               (line-end-position)))
-            ;; mark starting, even if ending is outside of region
-            (put-text-property (match-beginning 0) (match-end 0) prop (match-data t))
-            (markdown-propertize-end-match
-             end-reg end correct-entry enclosed-text-start)))))))
-
-(defun markdown-syntax-propertize-blockquotes (start end)
-  "Match blockquotes from START to END."
-  (save-excursion
-    (goto-char start)
-    (while (and (re-search-forward markdown-regex-blockquote end t)
-                (not (markdown-code-block-at-pos (match-beginning 0))))
-      (put-text-property (match-beginning 0) (match-end 0)
-                         'markdown-blockquote
-                         (match-data t)))))
-
-(defun markdown-syntax-propertize-hrs (start end)
-  "Match horizontal rules from START to END."
-  (save-excursion
-    (goto-char start)
-    (while (re-search-forward markdown-regex-hr end t)
-      (let ((beg (match-beginning 0))
-            (end (match-end 0)))
-        (goto-char beg)
-        (unless (or (markdown-on-heading-p)
-                    (markdown-code-block-at-point-p))
-          (put-text-property beg end 'markdown-hr (match-data t)))
-        (goto-char end)))))
-
-(defun markdown-syntax-propertize-yaml-metadata (start end)
-  "Propertize elements inside YAML metadata blocks from START to END.
-Assumes region from START and END is already known to be the interior
-region of a YAML metadata block as propertized by
-`markdown-syntax-propertize-fenced-block-constructs'."
-  (save-excursion
-    (goto-char start)
-    (cl-loop
-     while (re-search-forward markdown-regex-declarative-metadata end t)
-     do (progn
-          (put-text-property (match-beginning 1) (match-end 1)
-                             'markdown-metadata-key (match-data t))
-          (put-text-property (match-beginning 2) (match-end 2)
-                             'markdown-metadata-markup (match-data t))
-          (put-text-property (match-beginning 3) (match-end 3)
-                             'markdown-metadata-value (match-data t))))))
-
-(defun markdown-syntax-propertize-headings (start end)
-  "Match headings of type SYMBOL with REGEX from START to END."
-  (goto-char start)
-  (while (re-search-forward markdown-regex-header end t)
-    (unless (markdown-code-block-at-pos (match-beginning 0))
-      (put-text-property
-       (match-beginning 0) (match-end 0) 'markdown-heading
-       (match-data t))
-      (put-text-property
-       (match-beginning 0) (match-end 0)
-       (cond ((match-string-no-properties 2) 'markdown-heading-1-setext)
-             ((match-string-no-properties 3) 'markdown-heading-2-setext)
-             (t (let ((atx-level (length (markdown-trim-whitespace
-                                          (match-string-no-properties 4)))))
-                  (intern (format "markdown-heading-%d-atx" atx-level)))))
-       (match-data t)))))
-
-(defun markdown-syntax-propertize-comments (start end)
-  "Match HTML comments from the START to END."
-  ;; Implement by loop instead of recursive call for avoiding
-  ;; exceed max-lisp-eval-depth issue
-  ;; https://github.com/jrblevin/markdown-mode/issues/536
-  (let (finish)
-    (goto-char start)
-    (while (not finish)
-      (let* ((in-comment (nth 4 (syntax-ppss)))
-             (comment-begin (nth 8 (syntax-ppss))))
-        (cond
-         ;; Comment start
-         ((and (not in-comment)
-               (re-search-forward markdown-regex-comment-start end t)
-               (not (markdown-inline-code-at-point-p))
-               (not (markdown-code-block-at-point-p)))
-          (let ((open-beg (match-beginning 0)))
-            (put-text-property open-beg (1+ open-beg)
-                               'syntax-table (string-to-syntax "<"))
-            (goto-char (min (1+ (match-end 0)) end (point-max)))))
-         ;; Comment end
-         ((and in-comment comment-begin
-               (re-search-forward markdown-regex-comment-end end t))
-          (let ((comment-end (match-end 0)))
-            (put-text-property (1- comment-end) comment-end
-                               'syntax-table (string-to-syntax ">"))
-            ;; Remove any other text properties inside the comment
-            (remove-text-properties comment-begin comment-end
-                                    markdown--syntax-properties)
-            (put-text-property comment-begin comment-end
-                               'markdown-comment (list comment-begin comment-end))
-            (goto-char (min comment-end end (point-max)))))
-         ;; Nothing found
-         (t (setq finish t)))))
-    nil))
-
-(defun markdown-syntax-propertize (start end)
-  "Function used as `syntax-propertize-function'.
-START and END delimit region to propertize."
-  (with-silent-modifications
-    (save-excursion
-      (remove-text-properties start end markdown--syntax-properties)
-      (markdown-syntax-propertize-fenced-block-constructs start end)
-      (markdown-syntax-propertize-list-items start end)
-      (markdown-syntax-propertize-pre-blocks start end)
-      (markdown-syntax-propertize-blockquotes start end)
-      (markdown-syntax-propertize-headings start end)
-      (markdown-syntax-propertize-hrs start end)
-      (markdown-syntax-propertize-comments start end))))
-
-
-;;; Markup Hiding =============================================================
-
-(defconst markdown-markup-properties
-  '(face markdown-markup-face invisible markdown-markup)
-  "List of properties and values to apply to markup.")
-
-(defconst markdown-line-break-properties
-  '(face markdown-line-break-face invisible markdown-markup)
-  "List of properties and values to apply to line break markup.")
-
-(defconst markdown-language-keyword-properties
-  '(face markdown-language-keyword-face invisible markdown-markup)
-  "List of properties and values to apply to code block language names.")
-
-(defconst markdown-language-info-properties
-  '(face markdown-language-info-face invisible markdown-markup)
-  "List of properties and values to apply to code block language info strings.")
-
-(defconst markdown-include-title-properties
-  '(face markdown-link-title-face invisible markdown-markup)
-  "List of properties and values to apply to included code titles.")
-
-(defcustom markdown-hide-markup nil
-  "Determines whether markup in the buffer will be hidden.
-When set to nil, all markup is displayed in the buffer as it
-appears in the file.  An exception is when `markdown-hide-urls'
-is non-nil.
-Set this to a non-nil value to turn this feature on by default.
-You can interactively toggle the value of this variable with
-`markdown-toggle-markup-hiding', \\[markdown-toggle-markup-hiding],
-or from the Markdown > Show & Hide menu.
-
-Markup hiding works by adding text properties to positions in the
-buffer---either the `invisible' property or the `display' property
-in cases where alternative glyphs are used (e.g., list bullets).
-This does not, however, affect printing or other output.
-Functions such as `htmlfontify-buffer' and `ps-print-buffer' will
-not honor these text properties.  For printing, it would be better
-to first convert to HTML or PDF (e.g,. using Pandoc)."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.3"))
-(make-variable-buffer-local 'markdown-hide-markup)
-
-(defun markdown-toggle-markup-hiding (&optional arg)
-  "Toggle the display or hiding of markup.
-With a prefix argument ARG, enable markup hiding if ARG is positive,
-and disable it otherwise.
-See `markdown-hide-markup' for additional details."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-hide-markup
-        (if (eq arg 'toggle)
-            (not markdown-hide-markup)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-hide-markup
-      (progn (add-to-invisibility-spec 'markdown-markup)
-             (message "markdown-mode markup hiding enabled"))
-    (progn (remove-from-invisibility-spec 'markdown-markup)
-           (message "markdown-mode markup hiding disabled")))
-  (markdown-reload-extensions))
-
-
-;;; Font Lock =================================================================
-
-(require 'font-lock)
-
-(defgroup markdown-faces nil
-  "Faces used in Markdown Mode."
-  :group 'markdown
-  :group 'faces)
-
-(defface markdown-italic-face
-  '((t (:inherit italic)))
-  "Face for italic text."
-  :group 'markdown-faces)
-
-(defface markdown-bold-face
-  '((t (:inherit bold)))
-  "Face for bold text."
-  :group 'markdown-faces)
-
-(defface markdown-strike-through-face
-  '((t (:strike-through t)))
-  "Face for strike-through text."
-  :group 'markdown-faces)
-
-(defface markdown-markup-face
-  '((t (:inherit shadow :slant normal :weight normal)))
-  "Face for markup elements."
-  :group 'markdown-faces)
-
-(defface markdown-header-rule-face
-  '((t (:inherit markdown-markup-face)))
-  "Base face for headers rules."
-  :group 'markdown-faces)
-
-(defface markdown-header-delimiter-face
-  '((t (:inherit markdown-markup-face)))
-  "Base face for headers hash delimiter."
-  :group 'markdown-faces)
-
-(defface markdown-list-face
-  '((t (:inherit markdown-markup-face)))
-  "Face for list item markers."
-  :group 'markdown-faces)
-
-(defface markdown-blockquote-face
-  '((t (:inherit font-lock-doc-face)))
-  "Face for blockquote sections."
-  :group 'markdown-faces)
-
-(defface markdown-code-face
-  '((t (:inherit fixed-pitch)))
-  "Face for inline code, pre blocks, and fenced code blocks.
-This may be used, for example, to add a contrasting background to
-inline code fragments and code blocks."
-  :group 'markdown-faces)
-
-(defface markdown-inline-code-face
-  '((t (:inherit (markdown-code-face font-lock-constant-face))))
-  "Face for inline code."
-  :group 'markdown-faces)
-
-(defface markdown-pre-face
-  '((t (:inherit (markdown-code-face font-lock-constant-face))))
-  "Face for preformatted text."
-  :group 'markdown-faces)
-
-(defface markdown-table-face
-  '((t (:inherit (markdown-code-face))))
-  "Face for tables."
-  :group 'markdown-faces)
-
-(defface markdown-language-keyword-face
-  '((t (:inherit font-lock-type-face)))
-  "Face for programming language identifiers."
-  :group 'markdown-faces)
-
-(defface markdown-language-info-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for programming language info strings."
-  :group 'markdown-faces)
-
-(defface markdown-link-face
-  '((t (:inherit link)))
-  "Face for links."
-  :group 'markdown-faces)
-
-(defface markdown-missing-link-face
-  '((t (:inherit font-lock-warning-face)))
-  "Face for missing links."
-  :group 'markdown-faces)
-
-(defface markdown-reference-face
-  '((t (:inherit markdown-markup-face)))
-  "Face for link references."
-  :group 'markdown-faces)
-
-(defface markdown-footnote-marker-face
-  '((t (:inherit markdown-markup-face)))
-  "Face for footnote markers."
-  :group 'markdown-faces)
-
-(defface markdown-footnote-text-face
-  '((t (:inherit font-lock-comment-face)))
-  "Face for footnote text."
-  :group 'markdown-faces)
-
-(defface markdown-url-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for URLs that are part of markup.
-For example, this applies to URLs in inline links:
-[link text](http://example.com/)."
-  :group 'markdown-faces)
-
-(defface markdown-plain-url-face
-  '((t (:inherit markdown-link-face)))
-  "Face for URLs that are also links.
-For example, this applies to plain angle bracket URLs:
-<http://example.com/>."
-  :group 'markdown-faces)
-
-(defface markdown-link-title-face
-  '((t (:inherit font-lock-comment-face)))
-  "Face for reference link titles."
-  :group 'markdown-faces)
-
-(defface markdown-line-break-face
-  '((t (:inherit font-lock-constant-face :underline t)))
-  "Face for hard line breaks."
-  :group 'markdown-faces)
-
-(defface markdown-comment-face
-  '((t (:inherit font-lock-comment-face)))
-  "Face for HTML comments."
-  :group 'markdown-faces)
-
-(defface markdown-math-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for LaTeX expressions."
-  :group 'markdown-faces)
-
-(defface markdown-metadata-key-face
-  '((t (:inherit font-lock-variable-name-face)))
-  "Face for metadata keys."
-  :group 'markdown-faces)
-
-(defface markdown-metadata-value-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for metadata values."
-  :group 'markdown-faces)
-
-(defface markdown-gfm-checkbox-face
-  '((t (:inherit font-lock-builtin-face)))
-  "Face for GFM checkboxes."
-  :group 'markdown-faces)
-
-(defface markdown-highlight-face
-  '((t (:inherit highlight)))
-  "Face for mouse highlighting."
-  :group 'markdown-faces)
-
-(defface markdown-hr-face
-  '((t (:inherit markdown-markup-face)))
-  "Face for horizontal rules."
-  :group 'markdown-faces)
-
-(defface markdown-html-tag-name-face
-  '((t (:inherit font-lock-type-face)))
-  "Face for HTML tag names."
-  :group 'markdown-faces)
-
-(defface markdown-html-tag-delimiter-face
-  '((t (:inherit markdown-markup-face)))
-  "Face for HTML tag delimiters."
-  :group 'markdown-faces)
-
-(defface markdown-html-attr-name-face
-  '((t (:inherit font-lock-variable-name-face)))
-  "Face for HTML attribute names."
-  :group 'markdown-faces)
-
-(defface markdown-html-attr-value-face
-  '((t (:inherit font-lock-string-face)))
-  "Face for HTML attribute values."
-  :group 'markdown-faces)
-
-(defface markdown-html-entity-face
-  '((t (:inherit font-lock-variable-name-face)))
-  "Face for HTML entities."
-  :group 'markdown-faces)
-
-(defface markdown-highlighting-face
-  '((t (:background "yellow" :foreground "black")))
-  "Face for highlighting."
-  :group 'markdown-faces)
-
-(defcustom markdown-header-scaling nil
-  "Whether to use variable-height faces for headers.
-When non-nil, `markdown-header-face' will inherit from
-`variable-pitch' and the scaling values in
-`markdown-header-scaling-values' will be applied to
-headers of levels one through six respectively."
-  :type 'boolean
-  :initialize #'custom-initialize-default
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (markdown-update-header-faces value))
-  :group 'markdown-faces
-  :package-version '(markdown-mode . "2.2"))
-
-(defcustom markdown-header-scaling-values
-  '(2.0 1.7 1.4 1.1 1.0 1.0)
-  "List of scaling values for headers of level one through six.
-Used when `markdown-header-scaling' is non-nil."
-  :type '(repeat float)
-  :initialize #'custom-initialize-default
-  :set (lambda (symbol value)
-         (set-default symbol value)
-         (markdown-update-header-faces markdown-header-scaling value)))
-
-(defmacro markdown--dotimes-when-compile (i-n body)
-  (declare (indent 1) (debug ((symbolp form) form)))
-  (let ((var (car i-n))
-        (n (cadr i-n))
-        (code ()))
-    (dotimes (i (eval n t))
-      (push (eval body `((,var . ,i))) code))
-    `(progn ,@(nreverse code))))
-
-(defface markdown-header-face
-  `((t (:inherit (,@(when markdown-header-scaling '(variable-pitch))
-                  font-lock-function-name-face)
-        :weight bold)))
-  "Base face for headers.")
-
-(markdown--dotimes-when-compile (num 6)
-  (let* ((num1 (1+ num))
-         (face-name (intern (format "markdown-header-face-%s" num1))))
-    `(defface ,face-name
-       (,'\` ((t (:inherit markdown-header-face
-                  :height
-                  (,'\, (if markdown-header-scaling
-                            (float (nth ,num markdown-header-scaling-values))
-                          1.0))))))
-       (format "Face for level %s headers.
-You probably don't want to customize this face directly. Instead
-you can customize the base face `markdown-header-face' or the
-variable-height variable `markdown-header-scaling'." ,num1))))
-
-(defun markdown-update-header-faces (&optional scaling scaling-values)
-  "Update header faces, depending on if header SCALING is desired.
-If so, use given list of SCALING-VALUES relative to the baseline
-size of `markdown-header-face'."
-  (dotimes (num 6)
-    (let* ((face-name (intern (format "markdown-header-face-%s" (1+ num))))
-           (scale (cond ((not scaling) 1.0)
-                        (scaling-values (float (nth num scaling-values)))
-                        (t (float (nth num markdown-header-scaling-values))))))
-      (unless (get face-name 'saved-face) ; Don't update customized faces
-        (set-face-attribute face-name nil :height scale)))))
-
-(defun markdown-syntactic-face (state)
-  "Return font-lock face for characters with given STATE.
-See `font-lock-syntactic-face-function' for details."
-  (let ((in-comment (nth 4 state)))
-    (cond
-     (in-comment 'markdown-comment-face)
-     (t nil))))
-
-(defcustom markdown-list-item-bullets
-  '("●" "◎" "○" "◆" "◇" "►" "•")
-  "List of bullets to use for unordered lists.
-It can contain any number of symbols, which will be repeated.
-Depending on your font, some reasonable choices are:
-♥ ● ◇ ✚ ✜ ☯ ◆ ♠ ♣ ♦ ❀ ◆ ◖ ▶ ► • ★ ▸."
-  :group 'markdown
-  :type '(repeat (string :tag "Bullet character"))
-  :package-version '(markdown-mode . "2.3"))
-
-(defun markdown--footnote-marker-properties ()
-  "Return a font-lock facespec expression for footnote marker text."
-  `(face markdown-footnote-marker-face
-         ,@(when markdown-hide-markup
-             `(display ,markdown-footnote-display))))
-
-(defun markdown--pandoc-inline-footnote-properties ()
-  "Return a font-lock facespec expression for Pandoc inline footnote text."
-  `(face markdown-footnote-text-face
-         ,@(when markdown-hide-markup
-             `(display ,markdown-footnote-display))))
-
-(defvar markdown-mode-font-lock-keywords
-  `((markdown-match-yaml-metadata-begin . ((1 'markdown-markup-face)))
-    (markdown-match-yaml-metadata-end . ((1 'markdown-markup-face)))
-    (markdown-match-yaml-metadata-key . ((1 'markdown-metadata-key-face)
-                                         (2 'markdown-markup-face)
-                                         (3 'markdown-metadata-value-face)))
-    (markdown-match-gfm-open-code-blocks . ((1 markdown-markup-properties)
-                                            (2 markdown-markup-properties nil t)
-                                            (3 markdown-language-keyword-properties nil t)
-                                            (4 markdown-language-info-properties nil t)
-                                            (5 markdown-markup-properties nil t)))
-    (markdown-match-gfm-close-code-blocks . ((0 markdown-markup-properties)))
-    (markdown-fontify-gfm-code-blocks)
-    (markdown-fontify-tables)
-    (markdown-match-fenced-start-code-block . ((1 markdown-markup-properties)
-                                               (2 markdown-markup-properties nil t)
-                                               (3 markdown-language-keyword-properties nil t)
-                                               (4 markdown-language-info-properties nil t)
-                                               (5 markdown-markup-properties nil t)))
-    (markdown-match-fenced-end-code-block . ((0 markdown-markup-properties)))
-    (markdown-fontify-fenced-code-blocks)
-    (markdown-match-pre-blocks . ((0 'markdown-pre-face)))
-    (markdown-fontify-headings)
-    (markdown-match-declarative-metadata . ((1 'markdown-metadata-key-face)
-                                            (2 'markdown-markup-face)
-                                            (3 'markdown-metadata-value-face)))
-    (markdown-match-pandoc-metadata . ((1 'markdown-markup-face)
-                                       (2 'markdown-markup-face)
-                                       (3 'markdown-metadata-value-face)))
-    (markdown-fontify-hrs)
-    (markdown-match-code . ((1 markdown-markup-properties prepend)
-                            (2 'markdown-inline-code-face prepend)
-                            (3 markdown-markup-properties prepend)))
-    (,markdown-regex-kbd . ((1 markdown-markup-properties)
-                            (2 'markdown-inline-code-face)
-                            (3 markdown-markup-properties)))
-    (markdown-fontify-angle-uris)
-    (,markdown-regex-email . 'markdown-plain-url-face)
-    (markdown-match-html-tag . ((1 'markdown-html-tag-delimiter-face t)
-                                (2 'markdown-html-tag-name-face t)
-                                (3 'markdown-html-tag-delimiter-face t)
-                                ;; Anchored matcher for HTML tag attributes
-                                (,markdown-regex-html-attr
-                                 ;; Before searching, move past tag
-                                 ;; name; set limit at tag close.
-                                 (progn
-                                   (goto-char (match-end 2)) (match-end 3))
-                                 nil
-                                 . ((1 'markdown-html-attr-name-face)
-                                    (3 'markdown-html-tag-delimiter-face nil t)
-                                    (4 'markdown-html-attr-value-face nil t)))))
-    (,markdown-regex-html-entity . 'markdown-html-entity-face)
-    (markdown-fontify-list-items)
-    (,markdown-regex-footnote . ((1 markdown-markup-properties)    ; [^
-                                 (2 (markdown--footnote-marker-properties)) ; label
-                                 (3 markdown-markup-properties)))  ; ]
-    (,markdown-regex-pandoc-inline-footnote . ((1 markdown-markup-properties)   ; ^
-                                               (2 markdown-markup-properties)   ; [
-                                               (3 (markdown--pandoc-inline-footnote-properties)) ; text
-                                               (4 markdown-markup-properties))) ; ]
-    (markdown-match-includes . ((1 markdown-markup-properties)
-                                (2 markdown-markup-properties nil t)
-                                (3 markdown-include-title-properties nil t)
-                                (4 markdown-markup-properties nil t)
-                                (5 markdown-markup-properties)
-                                (6 'markdown-url-face)
-                                (7 markdown-markup-properties)))
-    (markdown-fontify-inline-links)
-    (markdown-fontify-reference-links)
-    (,markdown-regex-reference-definition . ((1 'markdown-markup-face) ; [
-                                             (2 'markdown-reference-face) ; label
-                                             (3 'markdown-markup-face)    ; ]
-                                             (4 'markdown-markup-face)    ; :
-                                             (5 'markdown-url-face)       ; url
-                                             (6 'markdown-link-title-face))) ; "title" (optional)
-    (markdown-fontify-plain-uris)
-    ;; Math mode $..$
-    (markdown-match-math-single . ((1 'markdown-markup-face prepend)
-                                   (2 'markdown-math-face append)
-                                   (3 'markdown-markup-face prepend)))
-    ;; Math mode $$..$$
-    (markdown-match-math-double . ((1 'markdown-markup-face prepend)
-                                   (2 'markdown-math-face append)
-                                   (3 'markdown-markup-face prepend)))
-    ;; Math mode \[..\] and \\[..\\]
-    (markdown-match-math-display . ((1 'markdown-markup-face prepend)
-                                    (3 'markdown-math-face append)
-                                    (4 'markdown-markup-face prepend)))
-    (markdown-match-bold . ((1 markdown-markup-properties prepend)
-                            (2 'markdown-bold-face append)
-                            (3 markdown-markup-properties prepend)))
-    (markdown-match-italic . ((1 markdown-markup-properties prepend)
-                              (2 'markdown-italic-face append)
-                              (3 markdown-markup-properties prepend)))
-    (,markdown-regex-strike-through . ((3 markdown-markup-properties)
-                                       (4 'markdown-strike-through-face)
-                                       (5 markdown-markup-properties)))
-    (markdown--match-highlighting . ((3 markdown-markup-properties)
-                                     (4 'markdown-highlighting-face)
-                                     (5 markdown-markup-properties)))
-    (,markdown-regex-line-break . (1 markdown-line-break-properties prepend))
-    (markdown-match-escape . ((1 markdown-markup-properties prepend)))
-    (markdown-fontify-sub-superscripts)
-    (markdown-match-inline-attributes . ((0 markdown-markup-properties prepend)))
-    (markdown-match-leanpub-sections . ((0 markdown-markup-properties)))
-    (markdown-fontify-blockquotes)
-    (markdown-match-wiki-link . ((0 'markdown-link-face prepend))))
-  "Syntax highlighting for Markdown files.")
-
-;; Footnotes
-(defvar-local markdown-footnote-counter 0
-  "Counter for footnote numbers.")
-
-(defconst markdown-footnote-chars
-  "[[:alnum:]-]"
-  "Regular expression matching any character for a footnote identifier.")
-
-(defconst markdown-regex-footnote-definition
-  (concat "^ \\{0,3\\}\\[\\(\\^" markdown-footnote-chars "*?\\)\\]:\\(?:[ \t]+\\|$\\)")
-  "Regular expression matching a footnote definition, capturing the label.")
-
-
-;;; Compatibility =============================================================
-
-(defun markdown--pandoc-reference-p ()
-  (let ((bounds (bounds-of-thing-at-point 'word)))
-    (when (and bounds (char-before (car bounds)))
-      (= (char-before (car bounds)) ?@))))
-
-(defun markdown-flyspell-check-word-p ()
-  "Return t if `flyspell' should check word just before point.
-Used for `flyspell-generic-check-word-predicate'."
-  (save-excursion
-    (goto-char (1- (point)))
-    ;; https://github.com/jrblevin/markdown-mode/issues/560
-    ;; enable spell check YAML meta data
-    (if (or (and (markdown-code-block-at-point-p)
-                 (not (markdown-text-property-at-point 'markdown-yaml-metadata-section)))
-            (markdown-inline-code-at-point-p)
-            (markdown-in-comment-p)
-            (markdown--face-p (point) '(markdown-reference-face
-                                        markdown-markup-face
-                                        markdown-plain-url-face
-                                        markdown-inline-code-face
-                                        markdown-url-face))
-            (markdown--pandoc-reference-p))
-        (prog1 nil
-          ;; If flyspell overlay is put, then remove it
-          (let ((bounds (bounds-of-thing-at-point 'word)))
-            (when bounds
-              (cl-loop for ov in (overlays-in (car bounds) (cdr bounds))
-                       when (overlay-get ov 'flyspell-overlay)
-                       do
-                       (delete-overlay ov)))))
-      t)))
-
-
-;;; Markdown Parsing Functions ================================================
-
-(defun markdown-cur-line-blank-p ()
-  "Return t if the current line is blank and nil otherwise."
-  (save-excursion
-    (beginning-of-line)
-    (looking-at-p markdown-regex-blank-line)))
-
-(defun markdown-prev-line-blank ()
-  "Return t if the previous line is blank and nil otherwise.
-If we are at the first line, then consider the previous line to be blank."
-  (or (= (line-beginning-position) (point-min))
-      (save-excursion
-        (forward-line -1)
-        (looking-at markdown-regex-blank-line))))
-
-(defun markdown-prev-line-blank-p ()
-  "Like `markdown-prev-line-blank', but preserve `match-data'."
-  (save-match-data (markdown-prev-line-blank)))
-
-(defun markdown-next-line-blank-p ()
-  "Return t if the next line is blank and nil otherwise.
-If we are at the last line, then consider the next line to be blank."
-  (or (= (line-end-position) (point-max))
-      (save-excursion
-        (forward-line 1)
-        (markdown-cur-line-blank-p))))
-
-(defun markdown-prev-line-indent ()
-  "Return the number of leading whitespace characters in the previous line.
-Return 0 if the current line is the first line in the buffer."
-  (save-excursion
-    (if (= (line-beginning-position) (point-min))
-        0
-      (forward-line -1)
-      (current-indentation))))
-
-(defun markdown-next-line-indent ()
-  "Return the number of leading whitespace characters in the next line.
-Return 0 if line is the last line in the buffer."
-  (save-excursion
-    (if (= (line-end-position) (point-max))
-        0
-      (forward-line 1)
-      (current-indentation))))
-
-(defun markdown-new-baseline ()
-  "Determine if the current line begins a new baseline level.
-Assume point is positioned at beginning of line."
-  (or (looking-at markdown-regex-header)
-      (looking-at markdown-regex-hr)
-      (and (= (current-indentation) 0)
-           (not (looking-at markdown-regex-list))
-           (markdown-prev-line-blank))))
-
-(defun markdown-search-backward-baseline ()
-  "Search backward baseline point with no indentation and not a list item."
-  (end-of-line)
-  (let (stop)
-    (while (not (or stop (bobp)))
-      (re-search-backward markdown-regex-block-separator-noindent nil t)
-      (when (match-end 2)
-        (goto-char (match-end 2))
-        (cond
-         ((markdown-new-baseline)
-          (setq stop t))
-         ((looking-at-p markdown-regex-list)
-          (setq stop nil))
-         (t (setq stop t)))))))
-
-(defun markdown-update-list-levels (marker indent levels)
-  "Update list levels given list MARKER, block INDENT, and current LEVELS.
-Here, MARKER is a string representing the type of list, INDENT is an integer
-giving the indentation, in spaces, of the current block, and LEVELS is a
-list of the indentation levels of parent list items.  When LEVELS is nil,
-it means we are at baseline (not inside of a nested list)."
-  (cond
-   ;; New list item at baseline.
-   ((and marker (null levels))
-    (setq levels (list indent)))
-   ;; List item with greater indentation (four or more spaces).
-   ;; Increase list level.
-   ((and marker (>= indent (+ (car levels) markdown-list-indent-width)))
-    (setq levels (cons indent levels)))
-   ;; List item with greater or equal indentation (less than four spaces).
-   ;; Do not increase list level.
-   ((and marker (>= indent (car levels)))
-    levels)
-   ;; Lesser indentation level.
-   ;; Pop appropriate number of elements off LEVELS list (e.g., lesser
-   ;; indentation could move back more than one list level).  Note
-   ;; that this block need not be the beginning of list item.
-   ((< indent (car levels))
-    (while (and (> (length levels) 1)
-                (< indent (+ (cadr levels) markdown-list-indent-width)))
-      (setq levels (cdr levels)))
-    levels)
-   ;; Otherwise, do nothing.
-   (t levels)))
-
-(defun markdown-calculate-list-levels ()
-  "Calculate list levels at point.
-Return a list of the form (n1 n2 n3 ...) where n1 is the
-indentation of the deepest nested list item in the branch of
-the list at the point, n2 is the indentation of the parent
-list item, and so on.  The depth of the list item is therefore
-the length of the returned list.  If the point is not at or
-immediately  after a list item, return nil."
-  (save-excursion
-    (let ((first (point)) levels indent pre-regexp)
-      ;; Find a baseline point with zero list indentation
-      (markdown-search-backward-baseline)
-      ;; Search for all list items between baseline and LOC
-      (while (and (< (point) first)
-                  (re-search-forward markdown-regex-list first t))
-        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ (length levels))))
-        (beginning-of-line)
-        (cond
-         ;; Make sure this is not a header or hr
-         ((markdown-new-baseline) (setq levels nil))
-         ;; Make sure this is not a line from a pre block
-         ((looking-at-p pre-regexp))
-         ;; If not, then update levels
-         (t
-          (setq indent (current-indentation))
-          (setq levels (markdown-update-list-levels (match-string 2)
-                                                    indent levels))))
-        (end-of-line))
-      levels)))
-
-(defun markdown-prev-list-item (level)
-  "Search backward from point for a list item with indentation LEVEL.
-Set point to the beginning of the item, and return point, or nil
-upon failure."
-  (let (bounds indent prev)
-    (setq prev (point))
-    (forward-line -1)
-    (setq indent (current-indentation))
-    (while
-        (cond
-         ;; List item
-         ((and (looking-at-p markdown-regex-list)
-               (setq bounds (markdown-cur-list-item-bounds)))
-          (cond
-           ;; Stop and return point at item of equal indentation
-           ((= (nth 3 bounds) level)
-            (setq prev (point))
-            nil)
-           ;; Stop and return nil at item with lesser indentation
-           ((< (nth 3 bounds) level)
-            (setq prev nil)
-            nil)
-           ;; Stop at beginning of buffer
-           ((bobp) (setq prev nil))
-           ;; Continue at item with greater indentation
-           ((> (nth 3 bounds) level) t)))
-         ;; Stop at beginning of buffer
-         ((bobp) (setq prev nil))
-         ;; Continue if current line is blank
-         ((markdown-cur-line-blank-p) t)
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the next is blank
-         ((and (< indent level)
-               (markdown-next-line-blank-p))
-          (setq prev nil))
-         ;; Stop at a header
-         ((looking-at-p markdown-regex-header) (setq prev nil))
-         ;; Stop at a horizontal rule
-         ((looking-at-p markdown-regex-hr) (setq prev nil))
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line -1)
-      (setq indent (current-indentation)))
-    prev))
-
-(defun markdown-next-list-item (level)
-  "Search forward from point for the next list item with indentation LEVEL.
-Set point to the beginning of the item, and return point, or nil
-upon failure."
-  (let (bounds indent next)
-    (setq next (point))
-    (if (looking-at markdown-regex-header-setext)
-        (goto-char (match-end 0)))
-    (forward-line)
-    (setq indent (current-indentation))
-    (while
-        (cond
-         ;; Stop at end of the buffer.
-         ((eobp) nil)
-         ;; Continue if the current line is blank
-         ((markdown-cur-line-blank-p) t)
-         ;; List item
-         ((and (looking-at-p markdown-regex-list)
-               (setq bounds (markdown-cur-list-item-bounds)))
-          (cond
-           ;; Continue at item with greater indentation
-           ((> (nth 3 bounds) level) t)
-           ;; Stop and return point at item of equal indentation
-           ((= (nth 3 bounds) level)
-            (setq next (point))
-            nil)
-           ;; Stop and return nil at item with lesser indentation
-           ((< (nth 3 bounds) level)
-            (setq next nil)
-            nil)))
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the previous line was blank.
-         ((and (< indent level)
-               (markdown-prev-line-blank-p))
-          (setq next nil))
-         ;; Stop at a header
-         ((looking-at-p markdown-regex-header) (setq next nil))
-         ;; Stop at a horizontal rule
-         ((looking-at-p markdown-regex-hr) (setq next nil))
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line)
-      (setq indent (current-indentation)))
-    next))
-
-(defun markdown-cur-list-item-end (level)
-  "Move to end of list item with pre-marker indentation LEVEL.
-Return the point at the end when a list item was found at the
-original point.  If the point is not in a list item, do nothing."
-  (let (indent)
-    (forward-line)
-    (setq indent (current-indentation))
-    (while
-        (cond
-         ;; Stop at end of the buffer.
-         ((eobp) nil)
-         ;; Continue while indentation is the same or greater
-         ((>= indent level) t)
-         ;; Continue if the current line is blank
-         ((looking-at markdown-regex-blank-line) t)
-         ;; Stop if current indentation is less than list item
-         ;; and the previous line was blank.
-         ((and (< indent level)
-               (markdown-prev-line-blank))
-          nil)
-         ;; Stop at a new list items of the same or lesser
-         ;; indentation, headings, and horizontal rules.
-         ((looking-at (concat "\\(?:" markdown-regex-list
-                              "\\|" markdown-regex-header
-                              "\\|" markdown-regex-hr "\\)"))
-          nil)
-         ;; Otherwise, continue.
-         (t t))
-      (forward-line)
-      (setq indent (current-indentation)))
-    ;; Don't skip over whitespace for empty list items (marker and
-    ;; whitespace only), just move to end of whitespace.
-    (if (save-excursion
-          (beginning-of-line)
-          (looking-at (concat markdown-regex-list "[ \t]*$")))
-        (goto-char (match-end 3))
-      (skip-chars-backward " \t\n"))
-    (end-of-line)
-    (point)))
-
-(defun markdown-cur-list-item-bounds ()
-  "Return bounds for list item at point.
-Return a list of the following form:
-
-    (begin end indent nonlist-indent marker checkbox match)
-
-The named components are:
-
-  - begin: Position of beginning of list item, including leading indentation.
-  - end: Position of the end of the list item, including list item text.
-  - indent: Number of characters of indentation before list marker (an integer).
-  - nonlist-indent: Number characters of indentation, list
-    marker, and whitespace following list marker (an integer).
-  - marker: String containing the list marker and following whitespace
-            (e.g., \"- \" or \"* \").
-  - checkbox: String containing the GFM checkbox portion, if any,
-    including any trailing whitespace before the text
-    begins (e.g., \"[x] \").
-  - match: match data for markdown-regex-list
-
-As an example, for the following unordered list item
-
-   - item
-
-the returned list would be
-
-    (1 14 3 5 \"- \" nil (1 6 1 4 4 5 5 6))
-
-If the point is not inside a list item, return nil."
-  (car (get-text-property (line-beginning-position) 'markdown-list-item)))
-
-(defun markdown-list-item-at-point-p ()
-  "Return t if there is a list item at the point and nil otherwise."
-  (save-match-data (markdown-cur-list-item-bounds)))
-
-(defun markdown-prev-list-item-bounds ()
-  "Return bounds of previous item in the same list of any level.
-The return value has the same form as that of
-`markdown-cur-list-item-bounds'."
-  (save-excursion
-    (let ((cur-bounds (markdown-cur-list-item-bounds))
-          (beginning-of-list (save-excursion (markdown-beginning-of-list)))
-          stop)
-      (when cur-bounds
-        (goto-char (nth 0 cur-bounds))
-        (while (and (not stop) (not (bobp))
-                    (re-search-backward markdown-regex-list
-                                        beginning-of-list t))
-          (unless (or (looking-at markdown-regex-hr)
-                      (markdown-code-block-at-point-p))
-            (setq stop (point))))
-        (markdown-cur-list-item-bounds)))))
-
-(defun markdown-next-list-item-bounds ()
-  "Return bounds of next item in the same list of any level.
-The return value has the same form as that of
-`markdown-cur-list-item-bounds'."
-  (save-excursion
-    (let ((cur-bounds (markdown-cur-list-item-bounds))
-          (end-of-list (save-excursion (markdown-end-of-list)))
-          stop)
-      (when cur-bounds
-        (goto-char (nth 0 cur-bounds))
-        (end-of-line)
-        (while (and (not stop) (not (eobp))
-                    (re-search-forward markdown-regex-list
-                                       end-of-list t))
-          (unless (or (looking-at markdown-regex-hr)
-                      (markdown-code-block-at-point-p))
-            (setq stop (point))))
-        (when stop
-          (markdown-cur-list-item-bounds))))))
-
-(defun markdown-beginning-of-list ()
-  "Move point to beginning of list at point, if any."
-  (interactive)
-  (let ((orig-point (point))
-        (list-begin (save-excursion
-                      (markdown-search-backward-baseline)
-                      ;; Stop at next list item, regardless of the indentation.
-                      (markdown-next-list-item (point-max))
-                      (when (looking-at markdown-regex-list)
-                        (point)))))
-    (when (and list-begin (<= list-begin orig-point))
-      (goto-char list-begin))))
-
-(defun markdown-end-of-list ()
-  "Move point to end of list at point, if any."
-  (interactive)
-  (let ((start (point))
-        (end (save-excursion
-               (when (markdown-beginning-of-list)
-                 ;; Items can't have nonlist-indent <= 1, so this
-                 ;; moves past all list items.
-                 (markdown-next-list-item 1)
-                 (skip-syntax-backward "-")
-                 (unless (eobp) (forward-char 1))
-                 (point)))))
-    (when (and end (>= end start))
-      (goto-char end))))
-
-(defun markdown-up-list ()
-  "Move point to beginning of parent list item."
-  (interactive)
-  (let ((cur-bounds (markdown-cur-list-item-bounds)))
-    (when cur-bounds
-      (markdown-prev-list-item (1- (nth 3 cur-bounds)))
-      (let ((up-bounds (markdown-cur-list-item-bounds)))
-        (when (and up-bounds (< (nth 3 up-bounds) (nth 3 cur-bounds)))
-          (point))))))
-
-(defun markdown-bounds-of-thing-at-point (thing)
-  "Call `bounds-of-thing-at-point' for THING with slight modifications.
-Does not include trailing newlines when THING is \\='line.  Handles the
-end of buffer case by setting both endpoints equal to the value of
-`point-max', since an empty region will trigger empty markup insertion.
-Return bounds of form (beg . end) if THING is found, or nil otherwise."
-  (let* ((bounds (bounds-of-thing-at-point thing))
-         (a (car bounds))
-         (b (cdr bounds)))
-    (when bounds
-      (when (eq thing 'line)
-        (cond ((and (eobp) (markdown-cur-line-blank-p))
-               (setq a b))
-              ((char-equal (char-before b) ?\^J)
-               (setq b (1- b)))))
-      (cons a b))))
-
-(defun markdown-reference-definition (reference)
-  "Find out whether Markdown REFERENCE is defined.
-REFERENCE should not include the square brackets.
-When REFERENCE is defined, return a list of the form (text start end)
-containing the definition text itself followed by the start and end
-locations of the text.  Otherwise, return nil.
-Leave match data for `markdown-regex-reference-definition'
-intact additional processing."
-  (let ((reference (downcase reference)))
-    (save-excursion
-      (goto-char (point-min))
-      (catch 'found
-        (while (re-search-forward markdown-regex-reference-definition nil t)
-          (when (string= reference (downcase (match-string-no-properties 2)))
-            (throw 'found
-                   (list (match-string-no-properties 5)
-                         (match-beginning 5) (match-end 5)))))))))
-
-(defun markdown-get-defined-references ()
-  "Return all defined reference labels and their line numbers.
-They does not include square brackets)."
-  (save-excursion
-    (goto-char (point-min))
-    (let (refs)
-      (while (re-search-forward markdown-regex-reference-definition nil t)
-        (let ((target (match-string-no-properties 2)))
-          (cl-pushnew
-           (cons (downcase target)
-                 (markdown-line-number-at-pos (match-beginning 2)))
-           refs :test #'equal :key #'car)))
-      (reverse refs))))
-
-(defun markdown-get-used-uris ()
-  "Return a list of all used URIs in the buffer."
-  (save-excursion
-    (goto-char (point-min))
-    (let (uris)
-      (while (re-search-forward
-              (concat "\\(?:" markdown-regex-link-inline
-                      "\\|" markdown-regex-angle-uri
-                      "\\|" markdown-regex-uri
-                      "\\|" markdown-regex-email
-                      "\\)")
-              nil t)
-        (unless (or (markdown-inline-code-at-point-p)
-                    (markdown-code-block-at-point-p))
-          (cl-pushnew (or (match-string-no-properties 6)
-                          (match-string-no-properties 10)
-                          (match-string-no-properties 12)
-                          (match-string-no-properties 13))
-                      uris :test #'equal)))
-      (reverse uris))))
-
-(defun markdown-inline-code-at-pos (pos)
-  "Return non-nil if there is an inline code fragment at POS.
-Return nil otherwise.  Set match data according to
-`markdown-match-code' upon success.
-This function searches the block for a code fragment that
-contains the point using `markdown-match-code'.  We do this
-because `thing-at-point-looking-at' does not work reliably with
-`markdown-regex-code'.
-
-The match data is set as follows:
-Group 1 matches the opening backquotes.
-Group 2 matches the code fragment itself, without backquotes.
-Group 3 matches the closing backquotes."
-  (save-excursion
-    (goto-char pos)
-    (let ((old-point (point))
-          (end-of-block (progn (markdown-end-of-text-block) (point)))
-          found)
-      (markdown-beginning-of-text-block)
-      (while (and (markdown-match-code end-of-block)
-                  (setq found t)
-                  (< (match-end 0) old-point)))
-      (let ((match-group (if (eq (char-after (match-beginning 0)) ?`) 0 1)))
-        (and found                                        ; matched something
-             (<= (match-beginning match-group) old-point) ; match contains old-point
-             (> (match-end 0) old-point))))))
-
-(defun markdown-inline-code-at-pos-p (pos)
-  "Return non-nil if there is an inline code fragment at POS.
-Like `markdown-inline-code-at-pos`, but preserves match data."
-  (save-match-data (markdown-inline-code-at-pos pos)))
-
-(defun markdown-inline-code-at-point ()
-  "Return non-nil if the point is at an inline code fragment.
-See `markdown-inline-code-at-pos' for details."
-  (markdown-inline-code-at-pos (point)))
-
-(defun markdown-inline-code-at-point-p (&optional pos)
-  "Return non-nil if there is inline code at the POS.
-This is a predicate function counterpart to
-`markdown-inline-code-at-point' which does not modify the match
-data.  See `markdown-code-block-at-point-p' for code blocks."
-  (save-match-data (markdown-inline-code-at-pos (or pos (point)))))
-
-(defun markdown-code-block-at-pos (pos)
-  "Return match data list if there is a code block at POS.
-Uses text properties at the beginning of the line position.
-This includes pre blocks, tilde-fenced code blocks, and GFM
-quoted code blocks.  Return nil otherwise."
-  (let ((bol (save-excursion (goto-char pos) (line-beginning-position))))
-    (or (get-text-property bol 'markdown-pre)
-        (let* ((bounds (markdown-get-enclosing-fenced-block-construct pos))
-               (second (cl-second bounds)))
-          (if second
-              ;; chunks are right open
-              (when (< pos second)
-                bounds)
-            bounds)))))
-
-;; Function was renamed to emphasize that it does not modify match-data.
-(defalias 'markdown-code-block-at-point 'markdown-code-block-at-point-p)
-
-(defun markdown-code-block-at-point-p (&optional pos)
-  "Return non-nil if there is a code block at the POS.
-This includes pre blocks, tilde-fenced code blocks, and GFM
-quoted code blocks.  This function does not modify the match
-data.  See `markdown-inline-code-at-point-p' for inline code."
-  (save-match-data (markdown-code-block-at-pos (or pos (point)))))
-
-(defun markdown-heading-at-point (&optional pos)
-  "Return non-nil if there is a heading at the POS.
-Set match data for `markdown-regex-header'."
-  (let ((match-data (get-text-property (or pos (point)) 'markdown-heading)))
-    (when match-data
-      (set-match-data match-data)
-      t)))
-
-(defun markdown-pipe-at-bol-p ()
-  "Return non-nil if the line begins with a pipe symbol.
-This may be useful for tables and Pandoc's line_blocks extension."
-  (char-equal (char-after (line-beginning-position)) ?|))
-
-
-;;; Markdown Font Lock Matching Functions =====================================
-
-(defun markdown-range-property-any (begin end prop prop-values)
-  "Return t if PROP from BEGIN to END is equal to one of the given PROP-VALUES.
-Also returns t if PROP is a list containing one of the PROP-VALUES.
-Return nil otherwise."
-  (let (props)
-    (catch 'found
-      (dolist (loc (number-sequence begin end))
-        (when (setq props (get-text-property loc prop))
-          (cond ((listp props)
-                 ;; props is a list, check for membership
-                 (dolist (val prop-values)
-                   (when (memq val props) (throw 'found loc))))
-                (t
-                 ;; props is a scalar, check for equality
-                 (dolist (val prop-values)
-                   (when (eq val props) (throw 'found loc))))))))))
-
-(defun markdown-range-properties-exist (begin end props)
-  (cl-loop
-   for loc in (number-sequence begin end)
-   with result = nil
-   while (not
-          (setq result
-                (cl-some (lambda (prop) (get-text-property loc prop)) props)))
-   finally return result))
-
-(defun markdown-match-inline-generic (regex last &optional faceless)
-  "Match inline REGEX from the point to LAST.
-When FACELESS is non-nil, do not return matches where faces have been applied."
-  (when (re-search-forward regex last t)
-    (let ((bounds (markdown-code-block-at-pos (match-beginning 1)))
-          (face (and faceless (text-property-not-all
-                               (match-beginning 0) (match-end 0) 'face nil))))
-      (cond
-       ;; In code block: move past it and recursively search again
-       (bounds
-        (when (< (goto-char (cl-second bounds)) last)
-          (markdown-match-inline-generic regex last faceless)))
-       ;; When faces are found in the match range, skip over the match and
-       ;; recursively search again.
-       (face
-        (when (< (goto-char (match-end 0)) last)
-          (markdown-match-inline-generic regex last faceless)))
-       ;; Keep match data and return t when in bounds.
-       (t
-        (<= (match-end 0) last))))))
-
-(defun markdown-match-code (last)
-  "Match inline code fragments from point to LAST."
-  (unless (bobp)
-    (backward-char 1))
-  (when (markdown-search-until-condition
-         (lambda ()
-           (and
-            ;; Advance point in case of failure, but without exceeding last.
-            (goto-char (min (1+ (match-beginning 1)) last))
-            (not (markdown-in-comment-p (match-beginning 1)))
-            (not (markdown-in-comment-p (match-end 1)))
-            (not (markdown-code-block-at-pos (match-beginning 1)))))
-         markdown-regex-code last t)
-    (set-match-data (list (match-beginning 1) (match-end 1)
-                          (match-beginning 2) (match-end 2)
-                          (match-beginning 3) (match-end 3)
-                          (match-beginning 4) (match-end 4)))
-    (goto-char (min (1+ (match-end 0)) last (point-max)))
-    t))
-
-(defun markdown--gfm-markup-underscore-p (begin end)
-  (let ((is-underscore (eql (char-after begin) ?_)))
-    (if (not is-underscore)
-        t
-      (save-excursion
-        (save-match-data
-          (goto-char begin)
-          (and (looking-back "\\(?:^\\|[[:blank:][:punct:]]\\)" (1- begin))
-               (progn
-                 (goto-char end)
-                 (looking-at-p "\\(?:[[:blank:][:punct:]]\\|$\\)"))))))))
-
-(defun markdown-match-bold (last)
-  "Match inline bold from the point to LAST."
-  (when (markdown-match-inline-generic markdown-regex-bold last)
-    (let ((is-gfm (derived-mode-p 'gfm-mode))
-          (begin (match-beginning 2))
-          (end (match-end 2)))
-      (if (or (markdown-inline-code-at-pos-p begin)
-              (markdown-inline-code-at-pos-p end)
-              (markdown-in-comment-p)
-              (markdown-range-property-any
-               begin begin 'face '(markdown-url-face
-                                   markdown-plain-url-face))
-              (markdown-range-property-any
-               begin end 'face '(markdown-hr-face
-                                 markdown-math-face))
-              (and is-gfm (not (markdown--gfm-markup-underscore-p begin end))))
-          (progn (goto-char (min (1+ begin) last))
-                 (when (< (point) last)
-                   (markdown-match-bold last)))
-        (set-match-data (list (match-beginning 2) (match-end 2)
-                              (match-beginning 3) (match-end 3)
-                              (match-beginning 4) (match-end 4)
-                              (match-beginning 5) (match-end 5)))
-        t))))
-
-(defun markdown-match-italic (last)
-  "Match inline italics from the point to LAST."
-  (let* ((is-gfm (derived-mode-p 'gfm-mode))
-         (regex (if is-gfm
-                    markdown-regex-gfm-italic
-                  markdown-regex-italic)))
-    (when (and (markdown-match-inline-generic regex last)
-               (not (markdown--face-p
-                     (match-beginning 1)
-                     '(markdown-html-attr-name-face markdown-html-attr-value-face))))
-      (let ((begin (match-beginning 1))
-            (end (match-end 1))
-            (close-end (match-end 4)))
-        (if (or (eql (char-before begin) (char-after begin))
-                (markdown-inline-code-at-pos-p begin)
-                (markdown-inline-code-at-pos-p (1- end))
-                (markdown-in-comment-p)
-                (markdown-range-property-any
-                 begin begin 'face '(markdown-url-face
-                                     markdown-plain-url-face
-                                     markdown-markup-face))
-                (markdown-range-property-any
-                 begin end 'face '(markdown-bold-face
-                                   markdown-list-face
-                                   markdown-hr-face
-                                   markdown-math-face))
-                (and is-gfm
-                     (or (char-equal (char-after begin) (char-after (1+ begin))) ;; check bold case
-                         (not (markdown--gfm-markup-underscore-p begin close-end)))))
-            (progn (goto-char (min (1+ begin) last))
-                   (when (< (point) last)
-                     (markdown-match-italic last)))
-          (set-match-data (list (match-beginning 1) (match-end 1)
-                                (match-beginning 2) (match-end 2)
-                                (match-beginning 3) (match-end 3)
-                                (match-beginning 4) (match-end 4)))
-          t)))))
-
-(defun markdown--match-highlighting (last)
-  (when markdown-enable-highlighting-syntax
-    (re-search-forward markdown-regex-highlighting last t)))
-
-(defun markdown-match-escape (last)
-  "Match escape characters (backslashes) from point to LAST.
-Backlashes only count as escape characters outside of literal
-regions (e.g. code blocks). See `markdown-literal-faces'."
-  (catch 'found
-    (while (search-forward-regexp markdown-regex-escape last t)
-      (let* ((face (get-text-property (match-beginning 1) 'face))
-             (face-list (if (listp face) face (list face))))
-        ;; Ignore any backslashes with a literal face.
-        (unless (cl-intersection face-list markdown-literal-faces)
-          (throw 'found t))))))
-
-(defun markdown-match-math-generic (regex last)
-  "Match REGEX from point to LAST.
-REGEX is either `markdown-regex-math-inline-single' for matching
-$..$ or `markdown-regex-math-inline-double' for matching $$..$$."
-  (when (markdown-match-inline-generic regex last)
-    (let ((begin (match-beginning 1)) (end (match-end 1)))
-      (prog1
-          (if (or (markdown-range-property-any
-                   begin end 'face
-                   '(markdown-inline-code-face markdown-bold-face))
-                  (markdown-range-properties-exist
-                   begin end
-                   (markdown-get-fenced-block-middle-properties)))
-              (markdown-match-math-generic regex last)
-            t)
-        (goto-char (1+ (match-end 0)))))))
-
-(defun markdown-match-list-items (last)
-  "Match list items from point to LAST."
-  (let* ((first (point))
-         (pos first)
-         (prop 'markdown-list-item)
-         (bounds (car (get-text-property pos prop))))
-    (while
-        (and (or (null (setq bounds (car (get-text-property pos prop))))
-                 (< (cl-first bounds) pos))
-             (< (point) last)
-             (setq pos (next-single-property-change pos prop nil last))
-             (goto-char pos)))
-    (when bounds
-      (set-match-data (cl-seventh bounds))
-      ;; Step at least one character beyond point. Otherwise
-      ;; `font-lock-fontify-keywords-region' infloops.
-      (goto-char (min (1+ (max (line-end-position) first))
-                      (point-max)))
-      t)))
-
-(defun markdown-match-math-single (last)
-  "Match single quoted $..$ math from point to LAST."
-  (when markdown-enable-math
-    (when (and (char-equal (char-after) ?$)
-               (not (bolp))
-               (not (char-equal (char-before) ?\\))
-               (not (char-equal (char-before) ?$)))
-      (forward-char -1))
-    (markdown-match-math-generic markdown-regex-math-inline-single last)))
-
-(defun markdown-match-math-double (last)
-  "Match double quoted $$..$$ math from point to LAST."
-  (when markdown-enable-math
-    (when (and (< (1+ (point)) (point-max))
-               (char-equal (char-after) ?$)
-               (char-equal (char-after (1+ (point))) ?$)
-               (not (bolp))
-               (not (char-equal (char-before) ?\\))
-               (not (char-equal (char-before) ?$)))
-      (forward-char -1))
-    (markdown-match-math-generic markdown-regex-math-inline-double last)))
-
-(defun markdown-match-math-display (last)
-  "Match bracketed display math \[..\] and \\[..\\] from point to LAST."
-  (when markdown-enable-math
-    (markdown-match-math-generic markdown-regex-math-display last)))
-
-(defun markdown-match-propertized-text (property last)
-  "Match text with PROPERTY from point to LAST.
-Restore match data previously stored in PROPERTY."
-  (let ((saved (get-text-property (point) property))
-        pos)
-    (unless saved
-      (setq pos (next-single-property-change (point) property nil last))
-      (unless (= pos last)
-        (setq saved (get-text-property pos property))))
-    (when saved
-      (set-match-data saved)
-      ;; Step at least one character beyond point. Otherwise
-      ;; `font-lock-fontify-keywords-region' infloops.
-      (goto-char (min (1+ (max (match-end 0) (point)))
-                      (point-max)))
-      saved)))
-
-(defun markdown-match-pre-blocks (last)
-  "Match preformatted blocks from point to LAST.
-Use data stored in \\='markdown-pre text property during syntax
-analysis."
-  (markdown-match-propertized-text 'markdown-pre last))
-
-(defun markdown-match-gfm-code-blocks (last)
-  "Match GFM quoted code blocks from point to LAST.
-Use data stored in \\='markdown-gfm-code text property during syntax
-analysis."
-  (markdown-match-propertized-text 'markdown-gfm-code last))
-
-(defun markdown-match-gfm-open-code-blocks (last)
-  (markdown-match-propertized-text 'markdown-gfm-block-begin last))
-
-(defun markdown-match-gfm-close-code-blocks (last)
-  (markdown-match-propertized-text 'markdown-gfm-block-end last))
-
-(defun markdown-match-fenced-code-blocks (last)
-  "Match fenced code blocks from the point to LAST."
-  (markdown-match-propertized-text 'markdown-fenced-code last))
-
-(defun markdown-match-fenced-start-code-block (last)
-  (markdown-match-propertized-text 'markdown-tilde-fence-begin last))
-
-(defun markdown-match-fenced-end-code-block (last)
-  (markdown-match-propertized-text 'markdown-tilde-fence-end last))
-
-(defun markdown-match-blockquotes (last)
-  "Match blockquotes from point to LAST.
-Use data stored in \\='markdown-blockquote text property during syntax
-analysis."
-  (markdown-match-propertized-text 'markdown-blockquote last))
-
-(defun markdown-match-hr (last)
-  "Match horizontal rules comments from the point to LAST."
-  (markdown-match-propertized-text 'markdown-hr last))
-
-(defun markdown-match-comments (last)
-  "Match HTML comments from the point to LAST."
-  (when (and (skip-syntax-forward "^<" last))
-    (let ((beg (point)))
-      (when (and (skip-syntax-forward "^>" last) (< (point) last))
-        (forward-char)
-        (set-match-data (list beg (point)))
-        t))))
-
-(defun markdown-match-generic-links (last ref)
-  "Match inline links from point to LAST.
-When REF is non-nil, match reference links instead of standard
-links with URLs.
-This function should only be used during font-lock, as it
-determines syntax based on the presence of faces for previously
-processed elements."
-  ;; Search for the next potential link (not in a code block).
-  (let ((prohibited-faces '(markdown-pre-face
-                            markdown-code-face
-                            markdown-inline-code-face
-                            markdown-comment-face))
-        found)
-    (while
-        (and (not found) (< (point) last)
-             (progn
-               ;; Clear match data to test for a match after functions returns.
-               (set-match-data nil)
-               ;; Preliminary regular expression search so we can return
-               ;; quickly upon failure.  This doesn't handle malformed links
-               ;; or nested square brackets well, so if it passes we back up
-               ;; continue with a more precise search.
-               (re-search-forward
-                (if ref
-                    markdown-regex-link-reference
-                  markdown-regex-link-inline)
-                last 'limit)))
-      ;; Keep searching if this is in a code block, inline code, or a
-      ;; comment, or if it is include syntax. The link text portion
-      ;; (group 3) may contain inline code or comments, but the
-      ;; markup, URL, and title should not be part of such elements.
-      (if (or (markdown-range-property-any
-               (match-beginning 0) (match-end 2) 'face prohibited-faces)
-              (markdown-range-property-any
-               (match-beginning 4) (match-end 0) 'face prohibited-faces)
-              (and (char-equal (char-after (line-beginning-position)) ?<)
-                   (char-equal (char-after (1+ (line-beginning-position))) ?<)))
-          (set-match-data nil)
-        (setq found t))))
-  ;; Match opening exclamation point (optional) and left bracket.
-  (when (match-beginning 2)
-    (let* ((bang (match-beginning 1))
-           (first-begin (match-beginning 2))
-           ;; Find end of block to prevent matching across blocks.
-           (end-of-block (save-excursion
-                           (progn
-                             (goto-char (match-beginning 2))
-                             (markdown-end-of-text-block)
-                             (point))))
-           ;; Move over balanced expressions to closing right bracket.
-           ;; Catch unbalanced expression errors and return nil.
-           (first-end (condition-case nil
-                          (and (goto-char first-begin)
-                               (scan-sexps (point) 1))
-                        (error nil)))
-           ;; Continue with point at CONT-POINT upon failure.
-           (cont-point (min (1+ first-begin) last))
-           second-begin second-end url-begin url-end
-           title-begin title-end)
-      ;; When bracket found, in range, and followed by a left paren/bracket...
-      (when (and first-end (< first-end end-of-block) (goto-char first-end)
-                 (char-equal (char-after (point)) (if ref ?\[ ?\()))
-        ;; Scan across balanced expressions for closing parenthesis/bracket.
-        (setq second-begin (point)
-              second-end (condition-case nil
-                             (scan-sexps (point) 1)
-                           (error nil)))
-        ;; Check that closing parenthesis/bracket is in range.
-        (if (and second-end (<= second-end end-of-block) (<= second-end last))
-            (progn
-              ;; Search for (optional) title inside closing parenthesis
-              (when (and (not ref) (search-forward "\"" second-end t))
-                (setq title-begin (1- (point))
-                      title-end (and (goto-char second-end)
-                                     (search-backward "\"" (1+ title-begin) t))
-                      title-end (and title-end (1+ title-end))))
-              ;; Store URL/reference range
-              (setq url-begin (1+ second-begin)
-                    url-end (1- (or title-begin second-end)))
-              ;; Set match data, move point beyond link, and return
-              (set-match-data
-               (list (or bang first-begin) second-end  ; 0 - all
-                     bang (and bang (1+ bang))         ; 1 - bang
-                     first-begin (1+ first-begin)      ; 2 - markup
-                     (1+ first-begin) (1- first-end)   ; 3 - link text
-                     (1- first-end) first-end          ; 4 - markup
-                     second-begin (1+ second-begin)    ; 5 - markup
-                     url-begin url-end                 ; 6 - url/reference
-                     title-begin title-end             ; 7 - title
-                     (1- second-end) second-end))      ; 8 - markup
-              ;; Nullify cont-point and leave point at end and
-              (setq cont-point nil)
-              (goto-char second-end))
-          ;; If no closing parenthesis in range, update continuation point
-          (setq cont-point (min end-of-block second-begin))))
-      (cond
-       ;; On failure, continue searching at cont-point
-       ((and cont-point (< cont-point last))
-        (goto-char cont-point)
-        (markdown-match-generic-links last ref))
-       ;; No more text, return nil
-       ((and cont-point (= cont-point last))
-        nil)
-       ;; Return t if a match occurred
-       (t t)))))
-
-(defun markdown-match-angle-uris (last)
-  "Match angle bracket URIs from point to LAST."
-  (when (markdown-match-inline-generic markdown-regex-angle-uri last)
-    (goto-char (1+ (match-end 0)))))
-
-(defun markdown-match-plain-uris (last)
-  "Match plain URIs from point to LAST."
-  (when (markdown-match-inline-generic markdown-regex-uri last t)
-    (goto-char (1+ (match-end 0)))))
-
-(defvar markdown-conditional-search-function #'re-search-forward
-  "Conditional search function used in `markdown-search-until-condition'.
-Made into a variable to allow for dynamic let-binding.")
-
-(defun markdown-search-until-condition (condition &rest args)
-  (let (ret)
-    (while (and (not ret) (apply markdown-conditional-search-function args))
-      (setq ret (funcall condition)))
-    ret))
-
-(defun markdown-metadata-line-p (pos regexp)
-  (save-excursion
-    (or (= (line-number-at-pos pos) 1)
-        (progn
-          (forward-line -1)
-          ;; skip multi-line metadata
-          (while (and (looking-at-p "^\\s-+[[:alpha:]]")
-                      (> (line-number-at-pos (point)) 1))
-            (forward-line -1))
-          (looking-at-p regexp)))))
-
-(defun markdown-match-generic-metadata (regexp last)
-  "Match metadata declarations specified by REGEXP from point to LAST.
-These declarations must appear inside a metadata block that begins at
-the beginning of the buffer and ends with a blank line (or the end of
-the buffer)."
-  (let* ((first (point))
-         (end-re "\n[ \t]*\n\\|\n\\'\\|\\'")
-         (block-begin (goto-char 1))
-         (block-end (re-search-forward end-re nil t)))
-    (if (and block-end (> first block-end))
-        ;; Don't match declarations if there is no metadata block or if
-        ;; the point is beyond the block.  Move point to point-max to
-        ;; prevent additional searches and return return nil since nothing
-        ;; was found.
-        (progn (goto-char (point-max)) nil)
-      ;; If a block was found that begins before LAST and ends after
-      ;; point, search for declarations inside it.  If the starting is
-      ;; before the beginning of the block, start there. Otherwise,
-      ;; move back to FIRST.
-      (goto-char (if (< first block-begin) block-begin first))
-      (if (and (re-search-forward regexp (min last block-end) t)
-               (markdown-metadata-line-p (point) regexp))
-          ;; If a metadata declaration is found, set match-data and return t.
-          (let ((key-beginning (match-beginning 1))
-                (key-end (match-end 1))
-                (markup-begin (match-beginning 2))
-                (markup-end (match-end 2))
-                (value-beginning (match-beginning 3)))
-            (set-match-data (list key-beginning (point) ; complete metadata
-                                  key-beginning key-end ; key
-                                  markup-begin markup-end ; markup
-                                  value-beginning (point))) ; value
-            t)
-        ;; Otherwise, move the point to last and return nil
-        (goto-char last)
-        nil))))
-
-(defun markdown-match-declarative-metadata (last)
-  "Match declarative metadata from the point to LAST."
-  (markdown-match-generic-metadata markdown-regex-declarative-metadata last))
-
-(defun markdown-match-pandoc-metadata (last)
-  "Match Pandoc metadata from the point to LAST."
-  (markdown-match-generic-metadata markdown-regex-pandoc-metadata last))
-
-(defun markdown-match-yaml-metadata-begin (last)
-  (markdown-match-propertized-text 'markdown-yaml-metadata-begin last))
-
-(defun markdown-match-yaml-metadata-end (last)
-  (markdown-match-propertized-text 'markdown-yaml-metadata-end last))
-
-(defun markdown-match-yaml-metadata-key (last)
-  (markdown-match-propertized-text 'markdown-metadata-key last))
-
-(defun markdown-match-wiki-link (last)
-  "Match wiki links from point to LAST."
-  (when (and markdown-enable-wiki-links
-             (not markdown-wiki-link-fontify-missing)
-             (markdown-match-inline-generic markdown-regex-wiki-link last))
-    (let ((begin (match-beginning 1)) (end (match-end 1)))
-      (if (or (markdown-in-comment-p begin)
-              (markdown-in-comment-p end)
-              (markdown-inline-code-at-pos-p begin)
-              (markdown-inline-code-at-pos-p end)
-              (markdown-code-block-at-pos begin))
-          (progn (goto-char (min (1+ begin) last))
-                 (when (< (point) last)
-                   (markdown-match-wiki-link last)))
-        (set-match-data (list begin end))
-        t))))
-
-(defun markdown-match-inline-attributes (last)
-  "Match inline attributes from point to LAST."
-  ;; #428 re-search-forward markdown-regex-inline-attributes is very slow.
-  ;; So use simple regex for re-search-forward and use markdown-regex-inline-attributes
-  ;; against matched string.
-  (when (markdown-match-inline-generic "[ \t]*\\({\\)\\([^\n]*\\)}[ \t]*$" last)
-    (if (not (string-match-p markdown-regex-inline-attributes (match-string 0)))
-        (markdown-match-inline-attributes last)
-      (unless (or (markdown-inline-code-at-pos-p (match-beginning 0))
-                  (markdown-inline-code-at-pos-p (match-end 0))
-                  (markdown-in-comment-p))
-        t))))
-
-(defun markdown-match-leanpub-sections (last)
-  "Match Leanpub section markers from point to LAST."
-  (when (markdown-match-inline-generic markdown-regex-leanpub-sections last)
-    (unless (or (markdown-inline-code-at-pos-p (match-beginning 0))
-                (markdown-inline-code-at-pos-p (match-end 0))
-                (markdown-in-comment-p))
-      t)))
-
-(defun markdown-match-includes (last)
-  "Match include statements from point to LAST.
-Sets match data for the following seven groups:
-Group 1: opening two angle brackets
-Group 2: opening title delimiter (optional)
-Group 3: title text (optional)
-Group 4: closing title delimiter (optional)
-Group 5: opening filename delimiter
-Group 6: filename
-Group 7: closing filename delimiter"
-  (when (markdown-match-inline-generic markdown-regex-include last)
-    (let ((valid (not (or (markdown-in-comment-p (match-beginning 0))
-                          (markdown-in-comment-p (match-end 0))
-                          (markdown-code-block-at-pos (match-beginning 0))))))
-      (cond
-       ;; Parentheses and maybe square brackets, but no curly braces:
-       ;; match optional title in square brackets and file in parentheses.
-       ((and valid (match-beginning 5)
-             (not (match-beginning 8)))
-        (set-match-data (list (match-beginning 1) (match-end 7)
-                              (match-beginning 1) (match-end 1)
-                              (match-beginning 2) (match-end 2)
-                              (match-beginning 3) (match-end 3)
-                              (match-beginning 4) (match-end 4)
-                              (match-beginning 5) (match-end 5)
-                              (match-beginning 6) (match-end 6)
-                              (match-beginning 7) (match-end 7))))
-       ;; Only square brackets present: match file in square brackets.
-       ((and valid (match-beginning 2)
-             (not (match-beginning 5))
-             (not (match-beginning 7)))
-        (set-match-data (list (match-beginning 1) (match-end 4)
-                              (match-beginning 1) (match-end 1)
-                              nil nil
-                              nil nil
-                              nil nil
-                              (match-beginning 2) (match-end 2)
-                              (match-beginning 3) (match-end 3)
-                              (match-beginning 4) (match-end 4))))
-       ;; Only curly braces present: match file in curly braces.
-       ((and valid (match-beginning 8)
-             (not (match-beginning 2))
-             (not (match-beginning 5)))
-        (set-match-data (list (match-beginning 1) (match-end 10)
-                              (match-beginning 1) (match-end 1)
-                              nil nil
-                              nil nil
-                              nil nil
-                              (match-beginning 8) (match-end 8)
-                              (match-beginning 9) (match-end 9)
-                              (match-beginning 10) (match-end 10))))
-       (t
-        ;; Not a valid match, move to next line and search again.
-        (forward-line)
-        (when (< (point) last)
-          (setq valid (markdown-match-includes last)))))
-      valid)))
-
-(defun markdown-match-html-tag (last)
-  "Match HTML tags from point to LAST."
-  (when (and markdown-enable-html
-             (markdown-match-inline-generic markdown-regex-html-tag last t))
-    (set-match-data (list (match-beginning 0) (match-end 0)
-                          (match-beginning 1) (match-end 1)
-                          (match-beginning 2) (match-end 2)
-                          (match-beginning 9) (match-end 9)))
-    t))
-
-
-;;; Markdown Font Fontification Functions =====================================
-
-(defvar markdown--first-displayable-cache (make-hash-table :test #'equal))
-
-(defun markdown--first-displayable (seq)
-  "Return the first displayable character or string in SEQ.
-SEQ may be an atom or a sequence."
-  (let ((c (gethash seq markdown--first-displayable-cache t)))
-    (if (not (eq c t))
-        c
-      (puthash seq
-               (let ((seq (if (listp seq) seq (list seq))))
-                 (cond ((stringp (car seq))
-                        (cl-find-if
-                         (lambda (str)
-                           (and (mapcar #'char-displayable-p (string-to-list str))))
-                         seq))
-                       ((characterp (car seq))
-                        (cl-find-if #'char-displayable-p seq))))
-               markdown--first-displayable-cache))))
-
-(defun markdown--marginalize-string (level)
-  "Generate atx markup string of given LEVEL for left margin."
-  (let ((margin-left-space-count
-         (- markdown-marginalize-headers-margin-width level)))
-    (concat (make-string margin-left-space-count ? )
-            (make-string level ?#))))
-
-(defun markdown-marginalize-update-current ()
-  "Update the window configuration to create a left margin."
-  (if window-system
-      (let* ((header-delimiter-font-width
-              (window-font-width nil 'markdown-header-delimiter-face))
-             (margin-pixel-width (* markdown-marginalize-headers-margin-width
-                                    header-delimiter-font-width))
-             (margin-char-width (/ margin-pixel-width (default-font-width))))
-        (set-window-margins nil margin-char-width))
-    ;; As a fallback, simply set margin based on character count.
-    (set-window-margins nil (1+ markdown-marginalize-headers-margin-width))))
-
-(defun markdown-fontify-headings (last)
-  "Add text properties to headings from point to LAST."
-  (when (markdown-match-propertized-text 'markdown-heading last)
-    (let* ((level (markdown-outline-level))
-           (heading-face
-            (intern (format "markdown-header-face-%d" level)))
-           (heading-props `(face ,heading-face))
-           (left-markup-props
-            `(face markdown-header-delimiter-face
-                   ,@(cond
-                      (markdown-hide-markup
-                       `(display ""))
-                      (markdown-marginalize-headers
-                       `(display ((margin left-margin)
-                                  ,(markdown--marginalize-string level)))))))
-           (right-markup-props
-            `(face markdown-header-delimiter-face
-                   ,@(when markdown-hide-markup `(display ""))))
-           (rule-props `(face markdown-header-rule-face
-                              ,@(when markdown-hide-markup `(display "")))))
-      (if (match-end 1)
-          ;; Setext heading
-          (progn (add-text-properties
-                  (match-beginning 1) (match-end 1) heading-props)
-                 (if (= level 1)
-                     (add-text-properties
-                      (match-beginning 2) (match-end 2) rule-props)
-                   (add-text-properties
-                    (match-beginning 3) (match-end 3) rule-props)))
-        ;; atx heading
-        (let ((header-end
-               (if markdown-fontify-whole-heading-line
-                   (min (point-max) (1+ (match-end 0)))
-                 (match-end 0))))
-          (add-text-properties
-           (match-beginning 4) (match-end 4) left-markup-props)
-
-          ;; If closing tag is present
-          (if (match-end 6)
-              (progn
-                (if markdown-hide-markup
-                    (progn
-                      (add-text-properties
-                       (match-beginning 5) header-end heading-props)
-                      (add-text-properties
-                       (match-beginning 6) (match-end 6) right-markup-props))
-                  (add-text-properties
-                   (match-beginning 5) (match-end 5) heading-props)
-                  (add-text-properties
-                   (match-beginning 6) header-end right-markup-props)))
-            ;; If closing tag is not present
-            (add-text-properties
-             (match-beginning 5) header-end heading-props))
-          )))
-    t))
-
-(defun markdown-fontify-tables (last)
-  (when (re-search-forward "|" last t)
-    (when (markdown-table-at-point-p)
-      (font-lock-append-text-property
-       (line-beginning-position) (min (1+ (line-end-position)) (point-max))
-       'face 'markdown-table-face))
-    (forward-line 1)
-    t))
-
-(defun markdown-fontify-blockquotes (last)
-  "Apply font-lock properties to blockquotes from point to LAST."
-  (when (markdown-match-blockquotes last)
-    (let ((display-string
-           (markdown--first-displayable markdown-blockquote-display-char)))
-      (add-text-properties
-       (match-beginning 1) (match-end 1)
-       (if markdown-hide-markup
-           `(face markdown-blockquote-face display ,display-string)
-         `(face markdown-markup-face)))
-      (font-lock-append-text-property
-       (match-beginning 0) (match-end 0) 'face 'markdown-blockquote-face)
-      t)))
-
-(defun markdown-fontify-list-items (last)
-  "Apply font-lock properties to list markers from point to LAST."
-  (when (markdown-match-list-items last)
-    (when (not (markdown-code-block-at-point-p (match-beginning 2)))
-      (let* ((indent (length (match-string-no-properties 1)))
-             (level (/ indent markdown-list-indent-width)) ;; level = 0, 1, 2, ...
-             (bullet (nth (mod level (length markdown-list-item-bullets))
-                          markdown-list-item-bullets)))
-        (add-text-properties
-         (match-beginning 2) (match-end 2) '(face markdown-list-face))
-        (when markdown-hide-markup
-          (cond
-           ;; Unordered lists
-           ((string-match-p "[\\*\\+-]" (match-string 2))
-            (add-text-properties
-             (match-beginning 2) (match-end 2) `(display ,bullet)))
-           ;; Definition lists
-           ((string-equal ":" (match-string 2))
-            (let ((display-string
-                   (char-to-string (markdown--first-displayable
-                                    markdown-definition-display-char))))
-              (add-text-properties (match-beginning 2) (match-end 2)
-                                   `(display ,display-string))))))))
-    t))
-
-(defun markdown--fontify-hrs-view-mode (hr-char)
-  (if (and hr-char (display-supports-face-attributes-p '(:extend t)))
-      (add-text-properties
-       (match-beginning 0) (match-end 0)
-       `(face
-         (:inherit markdown-hr-face :underline t :extend t)
-         font-lock-multiline t
-         display "\n"))
-    (let ((hr-len (and hr-char (/ (1- (window-body-width)) (char-width hr-char)))))
-      (add-text-properties
-       (match-beginning 0) (match-end 0)
-       `(face
-         markdown-hr-face font-lock-multiline t
-         display ,(make-string hr-len hr-char))))))
-
-(defun markdown-fontify-hrs (last)
-  "Add text properties to horizontal rules from point to LAST."
-  (when (markdown-match-hr last)
-    (let ((hr-char (markdown--first-displayable markdown-hr-display-char)))
-      (if (and markdown-hide-markup hr-char)
-          (markdown--fontify-hrs-view-mode hr-char)
-        (add-text-properties
-         (match-beginning 0) (match-end 0)
-         `(face markdown-hr-face font-lock-multiline t)))
-      t)))
-
-(defun markdown-fontify-sub-superscripts (last)
-  "Apply text properties to sub- and superscripts from point to LAST."
-  (when (markdown-search-until-condition
-         (lambda () (and (not (markdown-code-block-at-point-p))
-                         (not (markdown-inline-code-at-point-p))
-                         (not (markdown-in-comment-p))
-                         (not (markdown--math-block-p))))
-         markdown-regex-sub-superscript last t)
-    (let* ((subscript-p (string= (match-string 2) "~"))
-           (props
-            (if subscript-p
-                (car markdown-sub-superscript-display)
-              (cdr markdown-sub-superscript-display)))
-           (mp (list 'face 'markdown-markup-face
-                     'invisible 'markdown-markup)))
-      (when markdown-hide-markup
-        (put-text-property (match-beginning 3) (match-end 3)
-                           'display props))
-      (add-text-properties (match-beginning 2) (match-end 2) mp)
-      (add-text-properties (match-beginning 4) (match-end 4) mp)
-      t)))
-
-
-;;; Syntax Table ==============================================================
-
-(defvar markdown-mode-syntax-table
-  (let ((tab (make-syntax-table text-mode-syntax-table)))
-    (modify-syntax-entry ?\" "." tab)
-    tab)
-  "Syntax table for `markdown-mode'.")
-
-
-;;; Element Insertion =========================================================
-
-(defun markdown-ensure-blank-line-before ()
-  "If previous line is not already blank, insert a blank line before point."
-  (unless (bolp) (insert "\n"))
-  (unless (or (bobp) (looking-back "\n\\s-*\n" nil)) (insert "\n")))
-
-(defun markdown-ensure-blank-line-after ()
-  "If following line is not already blank, insert a blank line after point.
-Return the point where it was originally."
-  (save-excursion
-    (unless (eolp) (insert "\n"))
-    (unless (or (eobp) (looking-at-p "\n\\s-*\n")) (insert "\n"))))
-
-(defun markdown-wrap-or-insert (s1 s2 &optional thing beg end)
-  "Insert the strings S1 and S2, wrapping around region or THING.
-If a region is specified by the optional BEG and END arguments,
-wrap the strings S1 and S2 around that region.
-If there is an active region, wrap the strings S1 and S2 around
-the region.  If there is not an active region but the point is at
-THING, wrap that thing (which defaults to word).  Otherwise, just
-insert S1 and S2 and place the point in between.  Return the
-bounds of the entire wrapped string, or nil if nothing was wrapped
-and S1 and S2 were only inserted."
-  (let (a b bounds new-point)
-    (cond
-     ;; Given region
-     ((and beg end)
-      (setq a beg
-            b end
-            new-point (+ (point) (length s1))))
-     ;; Active region
-     ((use-region-p)
-      (setq a (region-beginning)
-            b (region-end)
-            new-point (+ (point) (length s1))))
-     ;; Thing (word) at point
-     ((setq bounds (markdown-bounds-of-thing-at-point (or thing 'word)))
-      (setq a (car bounds)
-            b (cdr bounds)
-            new-point (+ (point) (length s1))))
-     ;; No active region and no word
-     (t
-      (setq a (point)
-            b (point))))
-    (goto-char b)
-    (insert s2)
-    (goto-char a)
-    (insert s1)
-    (when new-point (goto-char new-point))
-    (if (= a b)
-        nil
-      (setq b (+ b (length s1) (length s2)))
-      (cons a b))))
-
-(defun markdown-point-after-unwrap (cur prefix suffix)
-  "Return desired position of point after an unwrapping operation.
-CUR gives the position of the point before the operation.
-Additionally, two cons cells must be provided.  PREFIX gives the
-bounds of the prefix string and SUFFIX gives the bounds of the
-suffix string."
-  (cond ((< cur (cdr prefix)) (car prefix))
-        ((< cur (car suffix)) (- cur (- (cdr prefix) (car prefix))))
-        ((<= cur (cdr suffix))
-         (- cur (+ (- (cdr prefix) (car prefix))
-                   (- cur (car suffix)))))
-        (t cur)))
-
-(defun markdown-unwrap-thing-at-point (regexp all text)
-  "Remove prefix and suffix of thing at point and reposition the point.
-When the thing at point matches REGEXP, replace the subexpression
-ALL with the string in subexpression TEXT.  Reposition the point
-in an appropriate location accounting for the removal of prefix
-and suffix strings.  Return new bounds of string from group TEXT.
-When REGEXP is nil, assumes match data is already set."
-  (when (or (null regexp)
-            (thing-at-point-looking-at regexp))
-    (let ((cur (point))
-          (prefix (cons (match-beginning all) (match-beginning text)))
-          (suffix (cons (match-end text) (match-end all)))
-          (bounds (cons (match-beginning text) (match-end text))))
-      ;; Replace the thing at point
-      (replace-match (match-string text) t t nil all)
-      ;; Reposition the point
-      (goto-char (markdown-point-after-unwrap cur prefix suffix))
-      ;; Adjust bounds
-      (setq bounds (cons (car prefix)
-                         (- (cdr bounds) (- (cdr prefix) (car prefix))))))))
-
-(defun markdown-unwrap-things-in-region (beg end regexp all text)
-  "Remove prefix and suffix of all things in region from BEG to END.
-When a thing in the region matches REGEXP, replace the
-subexpression ALL with the string in subexpression TEXT.
-Return a cons cell containing updated bounds for the region."
-  (save-excursion
-    (goto-char beg)
-    (let ((removed 0) len-all len-text)
-      (while (re-search-forward regexp (- end removed) t)
-        (setq len-all (length (match-string-no-properties all)))
-        (setq len-text (length (match-string-no-properties text)))
-        (setq removed (+ removed (- len-all len-text)))
-        (replace-match (match-string text) t t nil all))
-      (cons beg (- end removed)))))
-
-(defun markdown-insert-hr (arg)
-  "Insert or replace a horizontal rule.
-By default, use the first element of `markdown-hr-strings'.  When
-ARG is non-nil, as when given a prefix, select a different
-element as follows.  When prefixed with \\[universal-argument],
-use the last element of `markdown-hr-strings' instead.  When
-prefixed with an integer from 1 to the length of
-`markdown-hr-strings', use the element in that position instead."
-  (interactive "*P")
-  (when (thing-at-point-looking-at markdown-regex-hr)
-    (delete-region (match-beginning 0) (match-end 0)))
-  (markdown-ensure-blank-line-before)
-  (cond ((equal arg '(4))
-         (insert (car (reverse markdown-hr-strings))))
-        ((and (integerp arg) (> arg 0)
-              (<= arg (length markdown-hr-strings)))
-         (insert (nth (1- arg) markdown-hr-strings)))
-        (t
-         (insert (car markdown-hr-strings))))
-  (markdown-ensure-blank-line-after))
-
-(defun markdown--insert-common (start-delim end-delim regex start-group end-group face
-                                            &optional skip-space)
-  (if (use-region-p)
-      ;; Active region
-      (let* ((bounds (markdown-unwrap-things-in-region
-                      (region-beginning) (region-end)
-                      regex start-group end-group))
-             (beg (car bounds))
-             (end (cdr bounds)))
-        (when (and beg skip-space)
-          (save-excursion
-            (goto-char beg)
-            (skip-chars-forward "[ \t]")
-            (setq beg (point))))
-        (when (and end skip-space)
-          (save-excursion
-            (goto-char end)
-            (skip-chars-backward "[ \t]")
-            (setq end (point))))
-        (markdown-wrap-or-insert start-delim end-delim nil beg end))
-    (if (markdown--face-p (point) (list face))
-        (save-excursion
-          (while (and (markdown--face-p (point) (list face)) (not (bobp)))
-            (forward-char -1))
-          (forward-char (- (1- (length start-delim)))) ;; for delimiter
-          (unless (bolp)
-            (forward-char -1))
-          (when (looking-at regex)
-            (markdown-unwrap-thing-at-point nil start-group end-group)))
-      (if (thing-at-point-looking-at regex)
-          (markdown-unwrap-thing-at-point nil start-group end-group)
-        (markdown-wrap-or-insert start-delim end-delim 'word nil nil)))))
-
-(defun markdown-insert-bold ()
-  "Insert markup to make a region or word bold.
-If there is an active region, make the region bold.  If the point
-is at a non-bold word, make the word bold.  If the point is at a
-bold word or phrase, remove the bold markup.  Otherwise, simply
-insert bold delimiters and place the point in between them."
-  (interactive)
-  (let ((delim (if markdown-bold-underscore "__" "**")))
-    (markdown--insert-common delim delim markdown-regex-bold 2 4 'markdown-bold-face t)))
-
-(defun markdown-insert-italic ()
-  "Insert markup to make a region or word italic.
-If there is an active region, make the region italic.  If the point
-is at a non-italic word, make the word italic.  If the point is at an
-italic word or phrase, remove the italic markup.  Otherwise, simply
-insert italic delimiters and place the point in between them."
-  (interactive)
-  (let ((delim (if markdown-italic-underscore "_" "*")))
-    (markdown--insert-common delim delim markdown-regex-italic 1 3 'markdown-italic-face t)))
-
-(defun markdown-insert-strike-through ()
-  "Insert markup to make a region or word strikethrough.
-If there is an active region, make the region strikethrough.  If the point
-is at a non-bold word, make the word strikethrough.  If the point is at a
-strikethrough word or phrase, remove the strikethrough markup.  Otherwise,
-simply insert bold delimiters and place the point in between them."
-  (interactive)
-  (markdown--insert-common
-   "~~" "~~" markdown-regex-strike-through 2 4 'markdown-strike-through-face t))
-
-(defun markdown-insert-code ()
-  "Insert markup to make a region or word an inline code fragment.
-If there is an active region, make the region an inline code
-fragment.  If the point is at a word, make the word an inline
-code fragment.  Otherwise, simply insert code delimiters and
-place the point in between them."
-  (interactive)
-  (if (use-region-p)
-      ;; Active region
-      (let ((bounds (markdown-unwrap-things-in-region
-                     (region-beginning) (region-end)
-                     markdown-regex-code 1 3)))
-        (markdown-wrap-or-insert "`" "`" nil (car bounds) (cdr bounds)))
-    ;; Code markup removal, code markup for word, or empty markup insertion
-    (if (markdown-inline-code-at-point)
-        (markdown-unwrap-thing-at-point nil 0 2)
-      (markdown-wrap-or-insert "`" "`" 'word nil nil))))
-
-(defun markdown-insert-kbd ()
-  "Insert markup to wrap region or word in <kbd> tags.
-If there is an active region, use the region.  If the point is at
-a word, use the word.  Otherwise, simply insert <kbd> tags and
-place the point in between them."
-  (interactive)
-  (if (use-region-p)
-      ;; Active region
-      (let ((bounds (markdown-unwrap-things-in-region
-                     (region-beginning) (region-end)
-                     markdown-regex-kbd 0 2)))
-        (markdown-wrap-or-insert "<kbd>" "</kbd>" nil (car bounds) (cdr bounds)))
-    ;; Markup removal, markup for word, or empty markup insertion
-    (if (thing-at-point-looking-at markdown-regex-kbd)
-        (markdown-unwrap-thing-at-point nil 0 2)
-      (markdown-wrap-or-insert "<kbd>" "</kbd>" 'word nil nil))))
-
-(defun markdown-insert-inline-link (text url &optional title)
-  "Insert an inline link with TEXT pointing to URL.
-Optionally, the user can provide a TITLE."
-  (let ((cur (point)))
-    (setq title (and title (concat " \"" title "\"")))
-    (insert (concat "[" text "](" url title ")"))
-    (cond ((not text) (goto-char (+ 1 cur)))
-          ((not url) (goto-char (+ 3 (length text) cur))))))
-
-(defun markdown-insert-inline-image (text url &optional title)
-  "Insert an inline link with alt TEXT pointing to URL.
-Optionally, also provide a TITLE."
-  (let ((cur (point)))
-    (setq title (and title (concat " \"" title "\"")))
-    (insert (concat "![" text "](" url title ")"))
-    (cond ((not text) (goto-char (+ 2 cur)))
-          ((not url) (goto-char (+ 4 (length text) cur))))))
-
-(defun markdown-insert-reference-link (text label &optional url title)
-  "Insert a reference link and, optionally, a reference definition.
-The link TEXT will be inserted followed by the optional LABEL.
-If a URL is given, also insert a definition for the reference
-LABEL according to `markdown-reference-location'.  If a TITLE is
-given, it will be added to the end of the reference definition
-and will be used to populate the title attribute when converted
-to XHTML.  If URL is nil, insert only the link portion (for
-example, when a reference label is already defined)."
-  (insert (concat "[" text "][" label "]"))
-  (when url
-    (markdown-insert-reference-definition
-     (if (string-equal label "") text label)
-     url title)))
-
-(defun markdown-insert-reference-image (text label &optional url title)
-  "Insert a reference image and, optionally, a reference definition.
-The alt TEXT will be inserted followed by the optional LABEL.
-If a URL is given, also insert a definition for the reference
-LABEL according to `markdown-reference-location'.  If a TITLE is
-given, it will be added to the end of the reference definition
-and will be used to populate the title attribute when converted
-to XHTML.  If URL is nil, insert only the link portion (for
-example, when a reference label is already defined)."
-  (insert (concat "![" text "][" label "]"))
-  (when url
-    (markdown-insert-reference-definition
-     (if (string-equal label "") text label)
-     url title)))
-
-(defun markdown-insert-reference-definition (label &optional url title)
-  "Add definition for reference LABEL with URL and TITLE.
-LABEL is a Markdown reference label without square brackets.
-URL and TITLE are optional.  When given, the TITLE will
-be used to populate the title attribute when converted to XHTML."
-  ;; END specifies where to leave the point upon return
-  (let ((end (point)))
-    (cl-case markdown-reference-location
-      (end         (goto-char (point-max)))
-      (immediately (markdown-end-of-text-block))
-      (subtree     (markdown-end-of-subtree))
-      (header      (markdown-end-of-defun)))
-    ;; Skip backwards over local variables.  This logic is similar to the one
-    ;; used in ‘hack-local-variables’.
-    (when (and enable-local-variables (eobp))
-      (search-backward "\n\f" (max (- (point) 3000) (point-min)) :move)
-      (when (let ((case-fold-search t))
-              (search-forward "Local Variables:" nil :move))
-        (beginning-of-line 0)
-        (when (eq (char-before) ?\n) (backward-char))))
-    (unless (or (markdown-cur-line-blank-p)
-                (thing-at-point-looking-at markdown-regex-reference-definition))
-      (insert "\n"))
-    (insert "\n[" label "]: ")
-    (if url
-        (insert url)
-      ;; When no URL is given, leave point at END following the colon
-      (setq end (point)))
-    (when (> (length title) 0)
-      (insert " \"" title "\""))
-    (unless (looking-at-p "\n")
-      (insert "\n"))
-    (goto-char end)
-    (when url
-      (message
-       (markdown--substitute-command-keys
-        "Reference [%s] was defined, press \\[markdown-do] to jump there")
-       label))))
-
-(defcustom markdown-link-make-text-function nil
-  "Function that automatically generates a link text for a URL.
-
-If non-nil, this function will be called by
-`markdown--insert-link-or-image' and the result will be the
-default link text. The function should receive exactly one
-argument that corresponds to the link URL."
-  :group 'markdown
-  :type 'function
-  :package-version '(markdown-mode . "2.5"))
-
-(defcustom markdown-disable-tooltip-prompt nil
-  "Disable prompt for tooltip when inserting a link or image.
-
-If non-nil, `markdown-insert-link' and `markdown-insert-link'
-will not prompt the user to insert a tooltip text for the given
-link or image."
-  :group 'markdown
-  :type 'boolean
-  :safe 'booleanp
-  :package-version '(markdown-mode . "2.5"))
-
-(defun markdown--insert-link-or-image (image)
-  "Interactively insert new or update an existing link or image.
-When IMAGE is non-nil, insert an image.  Otherwise, insert a link.
-This is an internal function called by
-`markdown-insert-link' and `markdown-insert-image'."
-  (cl-multiple-value-bind (begin end text uri ref title)
-      (if (use-region-p)
-          ;; Use region as either link text or URL as appropriate.
-          (let ((region (buffer-substring-no-properties
-                         (region-beginning) (region-end))))
-            (if (string-match markdown-regex-uri region)
-                ;; Region contains a URL; use it as such.
-                (list (region-beginning) (region-end)
-                      nil (match-string 0 region) nil nil)
-              ;; Region doesn't contain a URL, so use it as text.
-              (list (region-beginning) (region-end)
-                    region nil nil nil)))
-        ;; Extract and use properties of existing link, if any.
-        (markdown-link-at-pos (point)))
-    (let* ((ref (when ref (concat "[" ref "]")))
-           (defined-refs (mapcar #'car (markdown-get-defined-references)))
-           (defined-ref-cands (mapcar (lambda (ref) (concat "[" ref "]")) defined-refs))
-           (used-uris (markdown-get-used-uris))
-           (uri-or-ref (completing-read
-                        "URL or [reference]: "
-                        (append defined-ref-cands used-uris)
-                        nil nil (or uri ref)))
-           (ref (cond ((string-match "\\`\\[\\(.*\\)\\]\\'" uri-or-ref)
-                       (match-string 1 uri-or-ref))
-                      ((string-equal "" uri-or-ref)
-                       "")))
-           (uri (unless ref uri-or-ref))
-           (text-prompt (if image
-                            "Alt text: "
-                          (if ref
-                              "Link text: "
-                            "Link text (blank for plain URL): ")))
-           (text (or text (and markdown-link-make-text-function uri
-                               (funcall markdown-link-make-text-function uri))))
-           (text (completing-read text-prompt defined-refs nil nil text))
-           (text (if (= (length text) 0) nil text))
-           (plainp (and uri (not text)))
-           (implicitp (string-equal ref ""))
-           (ref (if implicitp text ref))
-           (definedp (and ref (markdown-reference-definition ref)))
-           (ref-url (unless (or uri definedp)
-                      (completing-read "Reference URL: " used-uris)))
-           (title (unless (or plainp definedp markdown-disable-tooltip-prompt)
-                    (read-string "Title (tooltip text, optional): " title)))
-           (title (if (= (length title) 0) nil title)))
-      (when (and image implicitp)
-        (user-error "Reference required: implicit image references are invalid"))
-      (when (and begin end)
-        (delete-region begin end))
-      (cond
-       ((and (not image) uri text)
-        (markdown-insert-inline-link text uri title))
-       ((and image uri text)
-        (markdown-insert-inline-image text uri title))
-       ((and ref text)
-        (if image
-            (markdown-insert-reference-image text (unless implicitp ref) nil title)
-          (markdown-insert-reference-link text (unless implicitp ref) nil title))
-        (unless definedp
-          (markdown-insert-reference-definition ref ref-url title)))
-       ((and (not image) uri)
-        (markdown-insert-uri uri))))))
-
-(defun markdown-insert-link ()
-  "Insert new or update an existing link, with interactive prompt.
-If the point is at an existing link or URL, update the link text,
-URL, reference label, and/or title.  Otherwise, insert a new link.
-The type of link inserted (inline, reference, or plain URL)
-depends on which values are provided:
-
-*   If a URL and TEXT are given, insert an inline link: [TEXT](URL).
-*   If [REF] and TEXT are given, insert a reference link: [TEXT][REF].
-*   If only TEXT is given, insert an implicit reference link: [TEXT][].
-*   If only a URL is given, insert a plain link: <URL>.
-
-In other words, to create an implicit reference link, leave the
-URL prompt empty and to create a plain URL link, leave the link
-text empty.
-
-If there is an active region, use the text as the default URL, if
-it seems to be a URL, or link text value otherwise.
-
-If a given reference is not defined, this function will
-additionally prompt for the URL and optional title.  In this case,
-the reference definition is placed at the location determined by
-`markdown-reference-location'.  In addition, it is possible to
-have the `markdown-link-make-text-function' function, if non-nil,
-define the default link text before prompting the user for it.
-
-If `markdown-disable-tooltip-prompt' is non-nil, the user will
-not be prompted to add or modify a tooltip text.
-
-Through updating the link, this function can be used to convert a
-link of one type (inline, reference, or plain) to another type by
-selectively adding or removing information via the prompts."
-  (interactive)
-  (markdown--insert-link-or-image nil))
-
-(defun markdown-insert-image ()
-  "Insert new or update an existing image, with interactive prompt.
-If the point is at an existing image, update the alt text, URL,
-reference label, and/or title. Otherwise, insert a new image.
-The type of image inserted (inline or reference) depends on which
-values are provided:
-
-*   If a URL and ALT-TEXT are given, insert an inline image:
-    ![ALT-TEXT](URL).
-*   If [REF] and ALT-TEXT are given, insert a reference image:
-    ![ALT-TEXT][REF].
-
-If there is an active region, use the text as the default URL, if
-it seems to be a URL, or alt text value otherwise.
-
-If a given reference is not defined, this function will
-additionally prompt for the URL and optional title.  In this case,
-the reference definition is placed at the location determined by
-`markdown-reference-location'.
-
-Through updating the image, this function can be used to convert an
-image of one type (inline or reference) to another type by
-selectively adding or removing information via the prompts."
-  (interactive)
-  (markdown--insert-link-or-image t))
-
-(defun markdown-insert-uri (&optional uri)
-  "Insert markup for an inline URI.
-If there is an active region, use it as the URI.  If the point is
-at a URI, wrap it with angle brackets.  If the point is at an
-inline URI, remove the angle brackets.  Otherwise, simply insert
-angle brackets place the point between them."
-  (interactive)
-  (if (use-region-p)
-      ;; Active region
-      (let ((bounds (markdown-unwrap-things-in-region
-                     (region-beginning) (region-end)
-                     markdown-regex-angle-uri 0 2)))
-        (markdown-wrap-or-insert "<" ">" nil (car bounds) (cdr bounds)))
-    ;; Markup removal, URI at point, new URI, or empty markup insertion
-    (if (thing-at-point-looking-at markdown-regex-angle-uri)
-        (markdown-unwrap-thing-at-point nil 0 2)
-      (if uri
-          (insert "<" uri ">")
-        (markdown-wrap-or-insert "<" ">" 'url nil nil)))))
-
-(defun markdown-insert-wiki-link ()
-  "Insert a wiki link of the form [[WikiLink]].
-If there is an active region, use the region as the link text.
-If the point is at a word, use the word as the link text.  If
-there is no active region and the point is not at word, simply
-insert link markup."
-  (interactive)
-  (if (use-region-p)
-      ;; Active region
-      (markdown-wrap-or-insert "[[" "]]" nil (region-beginning) (region-end))
-    ;; Markup removal, wiki link at at point, or empty markup insertion
-    (if (thing-at-point-looking-at markdown-regex-wiki-link)
-        (if (or markdown-wiki-link-alias-first
-                (null (match-string 5)))
-            (markdown-unwrap-thing-at-point nil 1 3)
-          (markdown-unwrap-thing-at-point nil 1 5))
-      (markdown-wrap-or-insert "[[" "]]"))))
-
-(defun markdown-remove-header ()
-  "Remove header markup if point is at a header.
-Return bounds of remaining header text if a header was removed
-and nil otherwise."
-  (interactive "*")
-  (or (markdown-unwrap-thing-at-point markdown-regex-header-atx 0 2)
-      (markdown-unwrap-thing-at-point markdown-regex-header-setext 0 1)))
-
-(defun markdown-insert-header (&optional level text setext)
-  "Insert or replace header markup.
-The level of the header is specified by LEVEL and header text is
-given by TEXT.  LEVEL must be an integer from 1 and 6, and the
-default value is 1.
-When TEXT is nil, the header text is obtained as follows.
-If there is an active region, it is used as the header text.
-Otherwise, the current line will be used as the header text.
-If there is not an active region and the point is at a header,
-remove the header markup and replace with level N header.
-Otherwise, insert empty header markup and place the point in
-between.
-The style of the header will be atx (hash marks) unless
-SETEXT is non-nil, in which case a setext-style (underlined)
-header will be inserted."
-  (interactive "p\nsHeader text: ")
-  (setq level (min (max (or level 1) 1) (if setext 2 6)))
-  ;; Determine header text if not given
-  (when (null text)
-    (if (use-region-p)
-        ;; Active region
-        (setq text (delete-and-extract-region (region-beginning) (region-end)))
-      ;; No active region
-      (markdown-remove-header)
-      (setq text (delete-and-extract-region
-                  (line-beginning-position) (line-end-position)))
-      (when (and setext (string-match-p "^[ \t]*$" text))
-        (setq text (read-string "Header text: "))))
-    (setq text (markdown-compress-whitespace-string text)))
-  ;; Insertion with given text
-  (markdown-ensure-blank-line-before)
-  (let (hdr)
-    (cond (setext
-           (setq hdr (make-string (string-width text) (if (= level 2) ?- ?=)))
-           (insert text "\n" hdr))
-          (t
-           (setq hdr (make-string level ?#))
-           (insert hdr " " text)
-           (when (null markdown-asymmetric-header) (insert " " hdr)))))
-  (markdown-ensure-blank-line-after)
-  ;; Leave point at end of text
-  (cond (setext
-         (backward-char (1+ (string-width text))))
-        ((null markdown-asymmetric-header)
-         (backward-char (1+ level)))))
-
-(defun markdown-insert-header-dwim (&optional arg setext)
-  "Insert or replace header markup.
-The level and type of the header are determined automatically by
-the type and level of the previous header, unless a prefix
-argument is given via ARG.
-With a numeric prefix valued 1 to 6, insert a header of the given
-level, with the type being determined automatically (note that
-only level 1 or 2 setext headers are possible).
-
-With a \\[universal-argument] prefix (i.e., when ARG is (4)),
-promote the heading by one level.
-With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
-demote the heading by one level.
-When SETEXT is non-nil, prefer setext-style headers when
-possible (levels one and two).
-
-When there is an active region, use it for the header text.  When
-the point is at an existing header, change the type and level
-according to the rules above.
-Otherwise, if the line is not empty, create a header using the
-text on the current line as the header text.
-Finally, if the point is on a blank line, insert empty header
-markup (atx) or prompt for text (setext).
-See `markdown-insert-header' for more details about how the
-header text is determined."
-  (interactive "*P")
-  (let (level)
-    (save-excursion
-      (when (or (thing-at-point-looking-at markdown-regex-header)
-                (re-search-backward markdown-regex-header nil t))
-        ;; level of current or previous header
-        (setq level (markdown-outline-level))
-        ;; match group 1 indicates a setext header
-        (setq setext (match-end 1))))
-    ;; check prefix argument
-    (cond
-     ((and (equal arg '(4)) level (> level 1)) ;; C-u
-      (cl-decf level))
-     ((and (equal arg '(16)) level (< level 6)) ;; C-u C-u
-      (cl-incf level))
-     (arg ;; numeric prefix
-      (setq level (prefix-numeric-value arg))))
-    ;; setext headers must be level one or two
-    (and level (setq setext (and setext (<= level 2))))
-    ;; insert the heading
-    (markdown-insert-header level nil setext)))
-
-(defun markdown-insert-header-setext-dwim (&optional arg)
-  "Insert or replace header markup, with preference for setext.
-See `markdown-insert-header-dwim' for details, including how ARG is handled."
-  (interactive "*P")
-  (markdown-insert-header-dwim arg t))
-
-(defun markdown-insert-header-atx-1 ()
-  "Insert a first level atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 1 nil nil))
-
-(defun markdown-insert-header-atx-2 ()
-  "Insert a level two atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 2 nil nil))
-
-(defun markdown-insert-header-atx-3 ()
-  "Insert a level three atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 3 nil nil))
-
-(defun markdown-insert-header-atx-4 ()
-  "Insert a level four atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 4 nil nil))
-
-(defun markdown-insert-header-atx-5 ()
-  "Insert a level five atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 5 nil nil))
-
-(defun markdown-insert-header-atx-6 ()
-  "Insert a sixth level atx-style (hash mark) header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 6 nil nil))
-
-(defun markdown-insert-header-setext-1 ()
-  "Insert a setext-style (underlined) first-level header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 1 nil t))
-
-(defun markdown-insert-header-setext-2 ()
-  "Insert a setext-style (underlined) second-level header.
-See `markdown-insert-header'."
-  (interactive "*")
-  (markdown-insert-header 2 nil t))
-
-(defun markdown-blockquote-indentation (loc)
-  "Return string containing necessary indentation for a blockquote at LOC.
-Also see `markdown-pre-indentation'."
-  (save-excursion
-    (goto-char loc)
-    (let* ((list-level (length (markdown-calculate-list-levels)))
-           (indent ""))
-      (dotimes (_ list-level indent)
-        (setq indent (concat indent "    "))))))
-
-(defun markdown-insert-blockquote ()
-  "Start a blockquote section (or blockquote the region).
-If Transient Mark mode is on and a region is active, it is used as
-the blockquote text."
-  (interactive)
-  (if (use-region-p)
-      (markdown-blockquote-region (region-beginning) (region-end))
-    (markdown-ensure-blank-line-before)
-    (insert (markdown-blockquote-indentation (point)) "> ")
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-block-region (beg end prefix)
-  "Format the region using a block prefix.
-Arguments BEG and END specify the beginning and end of the
-region.  The characters PREFIX will appear at the beginning
-of each line."
-  (save-excursion
-    (let* ((end-marker (make-marker))
-           (beg-marker (make-marker))
-           (prefix-without-trailing-whitespace
-            (replace-regexp-in-string (rx (+ blank) eos) "" prefix)))
-      ;; Ensure blank line after and remove extra whitespace
-      (goto-char end)
-      (skip-syntax-backward "-")
-      (set-marker end-marker (point))
-      (delete-horizontal-space)
-      (markdown-ensure-blank-line-after)
-      ;; Ensure blank line before and remove extra whitespace
-      (goto-char beg)
-      (skip-syntax-forward "-")
-      (delete-horizontal-space)
-      (markdown-ensure-blank-line-before)
-      (set-marker beg-marker (point))
-      ;; Insert PREFIX before each line
-      (goto-char beg-marker)
-      (while (and (< (line-beginning-position) end-marker)
-                  (not (eobp)))
-        ;; Don’t insert trailing whitespace.
-        (insert (if (eolp) prefix-without-trailing-whitespace prefix))
-        (forward-line)))))
-
-(defun markdown-blockquote-region (beg end)
-  "Blockquote the region.
-Arguments BEG and END specify the beginning and end of the region."
-  (interactive "*r")
-  (markdown-block-region
-   beg end (concat (markdown-blockquote-indentation
-                    (max (point-min) (1- beg))) "> ")))
-
-(defun markdown-pre-indentation (loc)
-  "Return string containing necessary whitespace for a pre block at LOC.
-Also see `markdown-blockquote-indentation'."
-  (save-excursion
-    (goto-char loc)
-    (let* ((list-level (length (markdown-calculate-list-levels)))
-           indent)
-      (dotimes (_ (1+ list-level) indent)
-        (setq indent (concat indent "    "))))))
-
-(defun markdown-insert-pre ()
-  "Start a preformatted section (or apply to the region).
-If Transient Mark mode is on and a region is active, it is marked
-as preformatted text."
-  (interactive)
-  (if (use-region-p)
-      (markdown-pre-region (region-beginning) (region-end))
-    (markdown-ensure-blank-line-before)
-    (insert (markdown-pre-indentation (point)))
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-pre-region (beg end)
-  "Format the region as preformatted text.
-Arguments BEG and END specify the beginning and end of the region."
-  (interactive "*r")
-  (let ((indent (markdown-pre-indentation (max (point-min) (1- beg)))))
-    (markdown-block-region beg end indent)))
-
-(defun markdown-electric-backquote (arg)
-  "Insert a backquote.
-The numeric prefix argument ARG says how many times to repeat the insertion.
-Call `markdown-insert-gfm-code-block' interactively
-if three backquotes inserted at the beginning of line."
-  (interactive "*P")
-  (self-insert-command (prefix-numeric-value arg))
-  (when (and markdown-gfm-use-electric-backquote (looking-back "^```" nil))
-    (replace-match "")
-    (call-interactively #'markdown-insert-gfm-code-block)))
-
-(defconst markdown-gfm-recognized-languages
-  ;; To reproduce/update, evaluate the let-form in
-  ;; scripts/get-recognized-gfm-languages.el. that produces a single long sexp,
-  ;; but with appropriate use of a keyboard macro, indenting and filling it
-  ;; properly is pretty fast.
-  '("1C-Enterprise" "2-Dimensional-Array" "4D" "ABAP" "ABAP-CDS" "ABNF"
-    "AGS-Script" "AIDL" "AL" "AMPL" "ANTLR" "API-Blueprint" "APL" "ASL"
-    "ASN.1" "ASP.NET" "ATS" "ActionScript" "Ada" "Adblock-Filter-List"
-    "Adobe-Font-Metrics" "Agda" "Alloy" "Alpine-Abuild" "Altium-Designer"
-    "AngelScript" "Ant-Build-System" "Antlers" "ApacheConf" "Apex"
-    "Apollo-Guidance-Computer" "AppleScript" "Arc" "AsciiDoc" "AspectJ"
-    "Assembly" "Astro" "Asymptote" "Augeas" "AutoHotkey" "AutoIt"
-    "Avro-IDL" "Awk" "BASIC" "Ballerina" "Batchfile" "Beef" "Befunge"
-    "Berry" "BibTeX" "Bicep" "Bikeshed" "Bison" "BitBake" "Blade"
-    "BlitzBasic" "BlitzMax" "Bluespec" "Bluespec-BH" "Boo" "Boogie"
-    "Brainfuck" "BrighterScript" "Brightscript" "Browserslist" "C" "C#"
-    "C++" "C-ObjDump" "C2hs-Haskell" "CAP-CDS" "CIL" "CLIPS" "CMake"
-    "COBOL" "CODEOWNERS" "COLLADA" "CSON" "CSS" "CSV" "CUE" "CWeb"
-    "Cabal-Config" "Cadence" "Cairo" "CameLIGO" "Cap'n-Proto" "CartoCSS"
-    "Ceylon" "Chapel" "Charity" "Checksums" "ChucK" "Circom" "Cirru"
-    "Clarion" "Clarity" "Classic-ASP" "Clean" "Click" "Clojure"
-    "Closure-Templates" "Cloud-Firestore-Security-Rules" "CoNLL-U"
-    "CodeQL" "CoffeeScript" "ColdFusion" "ColdFusion-CFC" "Common-Lisp"
-    "Common-Workflow-Language" "Component-Pascal" "Cool" "Coq"
-    "Cpp-ObjDump" "Creole" "Crystal" "Csound" "Csound-Document"
-    "Csound-Score" "Cuda" "Cue-Sheet" "Curry" "Cycript" "Cypher" "Cython"
-    "D" "D-ObjDump" "D2" "DIGITAL-Command-Language" "DM" "DNS-Zone"
-    "DTrace" "Dafny" "Darcs-Patch" "Dart" "DataWeave"
-    "Debian-Package-Control-File" "DenizenScript" "Dhall" "Diff"
-    "DirectX-3D-File" "Dockerfile" "Dogescript" "Dotenv" "Dylan" "E"
-    "E-mail" "EBNF" "ECL" "ECLiPSe" "EJS" "EQ" "Eagle" "Earthly"
-    "Easybuild" "Ecere-Projects" "Ecmarkup" "Edge" "EdgeQL"
-    "EditorConfig" "Edje-Data-Collection" "Eiffel" "Elixir" "Elm"
-    "Elvish" "Elvish-Transcript" "Emacs-Lisp" "EmberScript" "Erlang"
-    "Euphoria" "F#" "F*" "FIGlet-Font" "FLUX" "Factor" "Fancy" "Fantom"
-    "Faust" "Fennel" "Filebench-WML" "Filterscript" "Fluent" "Formatted"
-    "Forth" "Fortran" "Fortran-Free-Form" "FreeBasic" "FreeMarker"
-    "Frege" "Futhark" "G-code" "GAML" "GAMS" "GAP"
-    "GCC-Machine-Description" "GDB" "GDScript" "GEDCOM" "GLSL" "GN" "GSC"
-    "Game-Maker-Language" "Gemfile.lock" "Gemini" "Genero-4gl"
-    "Genero-per" "Genie" "Genshi" "Gentoo-Ebuild" "Gentoo-Eclass"
-    "Gerber-Image" "Gettext-Catalog" "Gherkin" "Git-Attributes"
-    "Git-Config" "Git-Revision-List" "Gleam" "Glimmer-JS" "Glimmer-TS"
-    "Glyph" "Glyph-Bitmap-Distribution-Format" "Gnuplot" "Go"
-    "Go-Checksums" "Go-Module" "Go-Workspace" "Godot-Resource" "Golo"
-    "Gosu" "Grace" "Gradle" "Gradle-Kotlin-DSL" "Grammatical-Framework"
-    "Graph-Modeling-Language" "GraphQL" "Graphviz-(DOT)" "Groovy"
-    "Groovy-Server-Pages" "HAProxy" "HCL" "HLSL" "HOCON" "HTML"
-    "HTML+ECR" "HTML+EEX" "HTML+ERB" "HTML+PHP" "HTML+Razor" "HTTP"
-    "HXML" "Hack" "Haml" "Handlebars" "Harbour" "Haskell" "Haxe" "HiveQL"
-    "HolyC" "Hosts-File" "Hy" "HyPhy" "IDL" "IGOR-Pro" "INI" "IRC-log"
-    "Idris" "Ignore-List" "ImageJ-Macro" "Imba" "Inform-7" "Ink"
-    "Inno-Setup" "Io" "Ioke" "Isabelle" "Isabelle-ROOT" "J"
-    "JAR-Manifest" "JCL" "JFlex" "JSON" "JSON-with-Comments" "JSON5"
-    "JSONLD" "JSONiq" "Janet" "Jasmin" "Java" "Java-Properties"
-    "Java-Server-Pages" "JavaScript" "JavaScript+ERB" "Jest-Snapshot"
-    "JetBrains-MPS" "Jinja" "Jison" "Jison-Lex" "Jolie" "Jsonnet" "Julia"
-    "Jupyter-Notebook" "Just" "KRL" "Kaitai-Struct" "KakouneScript"
-    "KerboScript" "KiCad-Layout" "KiCad-Legacy-Layout" "KiCad-Schematic"
-    "Kickstart" "Kit" "Kotlin" "Kusto" "LFE" "LLVM" "LOLCODE" "LSL"
-    "LTspice-Symbol" "LabVIEW" "Lark" "Lasso" "Latte" "Lean" "Lean-4"
-    "Less" "Lex" "LigoLANG" "LilyPond" "Limbo" "Linker-Script"
-    "Linux-Kernel-Module" "Liquid" "Literate-Agda"
-    "Literate-CoffeeScript" "Literate-Haskell" "LiveScript" "Logos"
-    "Logtalk" "LookML" "LoomScript" "Lua" "M" "M4" "M4Sugar" "MATLAB"
-    "MAXScript" "MDX" "MLIR" "MQL4" "MQL5" "MTML" "MUF" "Macaulay2"
-    "Makefile" "Mako" "Markdown" "Marko" "Mask" "Mathematica" "Maven-POM"
-    "Max" "Mercury" "Mermaid" "Meson" "Metal"
-    "Microsoft-Developer-Studio-Project"
-    "Microsoft-Visual-Studio-Solution" "MiniD" "MiniYAML" "Mint" "Mirah"
-    "Modelica" "Modula-2" "Modula-3" "Module-Management-System" "Mojo"
-    "Monkey" "Monkey-C" "Moocode" "MoonScript" "Motoko"
-    "Motorola-68K-Assembly" "Move" "Muse" "Mustache" "Myghty" "NASL"
-    "NCL" "NEON" "NL" "NPM-Config" "NSIS" "NWScript" "Nasal" "Nearley"
-    "Nemerle" "NetLinx" "NetLinx+ERB" "NetLogo" "NewLisp" "Nextflow"
-    "Nginx" "Nim" "Ninja" "Nit" "Nix" "Nu" "NumPy" "Nunjucks" "Nushell"
-    "OASv2-json" "OASv2-yaml" "OASv3-json" "OASv3-yaml" "OCaml" "Oberon"
-    "ObjDump" "Object-Data-Instance-Notation" "ObjectScript"
-    "Objective-C" "Objective-C++" "Objective-J" "Odin" "Omgrofl" "Opa"
-    "Opal" "Open-Policy-Agent" "OpenAPI-Specification-v2"
-    "OpenAPI-Specification-v3" "OpenCL" "OpenEdge-ABL" "OpenQASM"
-    "OpenRC-runscript" "OpenSCAD" "OpenStep-Property-List"
-    "OpenType-Feature-File" "Option-List" "Org" "Ox" "Oxygene" "Oz" "P4"
-    "PDDL" "PEG.js" "PHP" "PLSQL" "PLpgSQL" "POV-Ray-SDL" "Pact" "Pan"
-    "Papyrus" "Parrot" "Parrot-Assembly" "Parrot-Internal-Representation"
-    "Pascal" "Pawn" "Pep8" "Perl" "Pic" "Pickle" "PicoLisp" "PigLatin"
-    "Pike" "Pip-Requirements" "PlantUML" "Pod" "Pod-6" "PogoScript"
-    "Polar" "Pony" "Portugol" "PostCSS" "PostScript" "PowerBuilder"
-    "PowerShell" "Praat" "Prisma" "Processing" "Procfile" "Proguard"
-    "Prolog" "Promela" "Propeller-Spin" "Protocol-Buffer"
-    "Protocol-Buffer-Text-Format" "Public-Key" "Pug" "Puppet" "Pure-Data"
-    "PureBasic" "PureScript" "Pyret" "Python" "Python-console"
-    "Python-traceback" "Q#" "QML" "QMake" "Qt-Script" "Quake" "R" "RAML"
-    "RBS" "RDoc" "REALbasic" "REXX" "RMarkdown" "RPC" "RPGLE" "RPM-Spec"
-    "RUNOFF" "Racket" "Ragel" "Raku" "Rascal" "Raw-token-data" "ReScript"
-    "Readline-Config" "Reason" "ReasonLIGO" "Rebol" "Record-Jar" "Red"
-    "Redcode" "Redirect-Rules" "Regular-Expression" "Ren'Py"
-    "RenderScript" "Rez" "Rich-Text-Format" "Ring" "Riot"
-    "RobotFramework" "Roc" "Roff" "Roff-Manpage" "Rouge"
-    "RouterOS-Script" "Ruby" "Rust" "SAS" "SCSS" "SELinux-Policy" "SMT"
-    "SPARQL" "SQF" "SQL" "SQLPL" "SRecode-Template" "SSH-Config" "STAR"
-    "STL" "STON" "SVG" "SWIG" "Sage" "SaltStack" "Sass" "Scala" "Scaml"
-    "Scenic" "Scheme" "Scilab" "Self" "ShaderLab" "Shell"
-    "ShellCheck-Config" "ShellSession" "Shen" "Sieve"
-    "Simple-File-Verification" "Singularity" "Slash" "Slice" "Slim"
-    "Slint" "SmPL" "Smali" "Smalltalk" "Smarty" "Smithy" "Snakemake"
-    "Solidity" "Soong" "SourcePawn" "Spline-Font-Database" "Squirrel"
-    "Stan" "Standard-ML" "Starlark" "Stata" "StringTemplate" "Stylus"
-    "SubRip-Text" "SugarSS" "SuperCollider" "Svelte" "Sway" "Sweave"
-    "Swift" "SystemVerilog" "TI-Program" "TL-Verilog" "TLA" "TOML" "TSQL"
-    "TSV" "TSX" "TXL" "Talon" "Tcl" "Tcsh" "TeX" "Tea" "Terra"
-    "Terraform-Template" "Texinfo" "Text" "TextGrid"
-    "TextMate-Properties" "Textile" "Thrift" "Toit" "Turing" "Turtle"
-    "Twig" "Type-Language" "TypeScript" "Typst" "Unified-Parallel-C"
-    "Unity3D-Asset" "Unix-Assembly" "Uno" "UnrealScript" "UrWeb" "V"
-    "VBA" "VBScript" "VCL" "VHDL" "Vala" "Valve-Data-Format"
-    "Velocity-Template-Language" "Verilog" "Vim-Help-File" "Vim-Script"
-    "Vim-Snippet" "Visual-Basic-.NET" "Visual-Basic-6.0" "Volt" "Vue"
-    "Vyper" "WDL" "WGSL" "Wavefront-Material" "Wavefront-Object"
-    "Web-Ontology-Language" "WebAssembly" "WebAssembly-Interface-Type"
-    "WebIDL" "WebVTT" "Wget-Config" "Whiley" "Wikitext"
-    "Win32-Message-File" "Windows-Registry-Entries" "Witcher-Script"
-    "Wollok" "World-of-Warcraft-Addon-Data" "Wren" "X-BitMap"
-    "X-Font-Directory-Index" "X-PixMap" "X10" "XC" "XCompose" "XML"
-    "XML-Property-List" "XPages" "XProc" "XQuery" "XS" "XSLT" "Xojo"
-    "Xonsh" "Xtend" "YAML" "YANG" "YARA" "YASnippet" "Yacc" "Yul" "ZAP"
-    "ZIL" "Zeek" "ZenScript" "Zephir" "Zig" "Zimpl" "cURL-Config"
-    "desktop" "dircolors" "eC" "edn" "fish" "hoon" "jq" "kvlang"
-    "mIRC-Script" "mcfunction" "mupad" "nanorc" "nesC" "ooc" "q"
-    "reStructuredText" "robots.txt" "sed" "wisp" "xBase")
-  "Language specifiers recognized by GitHub's syntax highlighting features.")
-
-(defvar-local markdown-gfm-used-languages nil
-  "Language names used in GFM code blocks.")
-
-(defun markdown-trim-whitespace (str)
-  (replace-regexp-in-string
-   "\\(?:[[:space:]\r\n]+\\'\\|\\`[[:space:]\r\n]+\\)" "" str))
-
-(defun markdown-clean-language-string (str)
-  (replace-regexp-in-string
-   "{\\.?\\|}" "" (markdown-trim-whitespace str)))
-
-(defun markdown-validate-language-string (widget)
-  (let ((str (widget-value widget)))
-    (unless (string= str (markdown-clean-language-string str))
-      (widget-put widget :error (format "Invalid language spec: '%s'" str))
-      widget)))
-
-(defun markdown-gfm-get-corpus ()
-  "Create corpus of recognized GFM code block languages for the given buffer."
-  (let ((given-corpus (append markdown-gfm-additional-languages
-                              markdown-gfm-recognized-languages)))
-    (append
-     markdown-gfm-used-languages
-     (if markdown-gfm-downcase-languages (cl-mapcar #'downcase given-corpus)
-       given-corpus))))
-
-(defun markdown-gfm-add-used-language (lang)
-  "Clean LANG and add to list of used languages."
-  (setq markdown-gfm-used-languages
-        (cons lang (remove lang markdown-gfm-used-languages))))
-
-(defcustom markdown-spaces-after-code-fence 1
-  "Number of space characters to insert after a code fence.
-\\<gfm-mode-map>\\[markdown-insert-gfm-code-block] inserts this many spaces between an
-opening code fence and an info string."
-  :group 'markdown
-  :type 'integer
-  :safe #'natnump
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-code-block-braces nil
-  "When non-nil, automatically insert braces for GFM code blocks."
-  :group 'markdown
-  :type 'boolean)
-
-(defun markdown-insert-gfm-code-block (&optional lang edit)
-  "Insert GFM code block for language LANG.
-If LANG is nil, the language will be queried from user.  If a
-region is active, wrap this region with the markup instead.  If
-the region boundaries are not on empty lines, these are added
-automatically in order to have the correct markup.  When EDIT is
-non-nil (e.g., when \\[universal-argument] is given), edit the
-code block in an indirect buffer after insertion."
-  (interactive
-   (list (let ((completion-ignore-case nil))
-           (condition-case nil
-               (markdown-clean-language-string
-                (completing-read
-                 "Programming language: "
-                 (markdown-gfm-get-corpus)
-                 nil 'confirm (car markdown-gfm-used-languages)
-                 'markdown-gfm-language-history))
-             (quit "")))
-         current-prefix-arg))
-  (unless (string= lang "") (markdown-gfm-add-used-language lang))
-  (when (and (> (length lang) 0)
-             (not markdown-code-block-braces))
-    (setq lang (concat (make-string markdown-spaces-after-code-fence ?\s)
-                       lang)))
-  (let ((gfm-open-brace (if markdown-code-block-braces "{" ""))
-        (gfm-close-brace (if markdown-code-block-braces "}" "")))
-    (if (use-region-p)
-        (let* ((b (region-beginning)) (e (region-end)) end
-               (indent (progn (goto-char b) (current-indentation))))
-          (goto-char e)
-          ;; if we're on a blank line, don't newline, otherwise the ```
-          ;; should go on its own line
-          (unless (looking-back "\n" nil)
-            (newline))
-          (indent-to indent)
-          (insert "```")
-          (markdown-ensure-blank-line-after)
-          (setq end (point))
-          (goto-char b)
-          ;; if we're on a blank line, insert the quotes here, otherwise
-          ;; add a new line first
-          (unless (looking-at-p "\n")
-            (newline)
-            (forward-line -1))
-          (markdown-ensure-blank-line-before)
-          (indent-to indent)
-          (insert "```" gfm-open-brace lang gfm-close-brace)
-          (markdown-syntax-propertize-fenced-block-constructs (line-beginning-position) end))
-      (let ((indent (current-indentation))
-            start-bol)
-        (delete-horizontal-space :backward-only)
-        (markdown-ensure-blank-line-before)
-        (indent-to indent)
-        (setq start-bol (line-beginning-position))
-        (insert "```" gfm-open-brace lang gfm-close-brace "\n")
-        (indent-to indent)
-        (unless edit (insert ?\n))
-        (indent-to indent)
-        (insert "```")
-        (markdown-ensure-blank-line-after)
-        (markdown-syntax-propertize-fenced-block-constructs start-bol (point)))
-      (end-of-line 0)
-      (when edit (markdown-edit-code-block)))))
-
-(defun markdown-code-block-lang (&optional pos-prop)
-  "Return the language name for a GFM or tilde fenced code block.
-The beginning of the block may be described by POS-PROP,
-a cons of (pos . prop) giving the position and property
-at the beginning of the block."
-  (or pos-prop
-      (setq pos-prop
-            (markdown-max-of-seq
-             #'car
-             (cl-remove-if
-              #'null
-              (cl-mapcar
-               #'markdown-find-previous-prop
-               (markdown-get-fenced-block-begin-properties))))))
-  (when pos-prop
-    (goto-char (car pos-prop))
-    (set-match-data (get-text-property (point) (cdr pos-prop)))
-    ;; Note: Hard-coded group number assumes tilde
-    ;; and GFM fenced code regexp groups agree.
-    (let ((begin (match-beginning 3))
-          (end (match-end 3)))
-      (when (and begin end)
-        ;; Fix language strings beginning with periods, like ".ruby".
-        (when (eq (char-after begin) ?.)
-          (setq begin (1+ begin)))
-        (buffer-substring-no-properties begin end)))))
-
-(defun markdown-gfm-parse-buffer-for-languages (&optional buffer)
-  (with-current-buffer (or buffer (current-buffer))
-    (save-excursion
-      (goto-char (point-min))
-      (cl-loop
-       with prop = 'markdown-gfm-block-begin
-       for pos-prop = (markdown-find-next-prop prop)
-       while pos-prop
-       for lang = (markdown-code-block-lang pos-prop)
-       do (progn (when lang (markdown-gfm-add-used-language lang))
-                 (goto-char (next-single-property-change (point) prop)))))))
-
-(defun markdown-insert-foldable-block ()
-  "Insert details disclosure element to make content foldable.
-If a region is active, wrap this region with the disclosure
-element. More details here https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details."
-  (interactive)
-  (let ((details-open-tag "<details>")
-        (details-close-tag "</details>")
-        (summary-open-tag "<summary>")
-        (summary-close-tag " </summary>"))
-    (if (use-region-p)
-        (let* ((b (region-beginning))
-               (e (region-end))
-               (indent (progn (goto-char b) (current-indentation))))
-          (goto-char e)
-          ;; if we're on a blank line, don't newline, otherwise the tags
-          ;; should go on its own line
-          (unless (looking-back "\n" nil)
-            (newline))
-          (indent-to indent)
-          (insert details-close-tag)
-          (markdown-ensure-blank-line-after)
-          (goto-char b)
-          ;; if we're on a blank line, insert the quotes here, otherwise
-          ;; add a new line first
-          (unless (looking-at-p "\n")
-            (newline)
-            (forward-line -1))
-          (markdown-ensure-blank-line-before)
-          (indent-to indent)
-          (insert details-open-tag "\n")
-          (insert summary-open-tag summary-close-tag)
-          (search-backward summary-close-tag))
-      (let ((indent (current-indentation)))
-        (delete-horizontal-space :backward-only)
-        (markdown-ensure-blank-line-before)
-        (indent-to indent)
-        (insert details-open-tag "\n")
-        (insert summary-open-tag summary-close-tag "\n")
-        (insert details-close-tag)
-        (indent-to indent)
-        (markdown-ensure-blank-line-after)
-        (search-backward summary-close-tag)))))
-
-
-;;; Footnotes =================================================================
-
-(defun markdown-footnote-counter-inc ()
-  "Increment `markdown-footnote-counter' and return the new value."
-  (when (= markdown-footnote-counter 0) ; hasn't been updated in this buffer yet.
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward (concat "^\\[\\^\\(" markdown-footnote-chars "*?\\)\\]:")
-                                (point-max) t)
-        (let ((fn (string-to-number (match-string 1))))
-          (when (> fn markdown-footnote-counter)
-            (setq markdown-footnote-counter fn))))))
-  (cl-incf markdown-footnote-counter))
-
-(defun markdown-insert-footnote ()
-  "Insert footnote with a new number and move point to footnote definition."
-  (interactive)
-  (let ((fn (markdown-footnote-counter-inc)))
-    (insert (format "[^%d]" fn))
-    (push-mark (point) t)
-    (markdown-footnote-text-find-new-location)
-    (markdown-ensure-blank-line-before)
-    (unless (markdown-cur-line-blank-p)
-      (insert "\n"))
-    (insert (format "[^%d]: " fn))
-    (markdown-ensure-blank-line-after)))
-
-(defun markdown-footnote-text-find-new-location ()
-  "Position the point at the proper location for a new footnote text."
-  (cond
-   ((eq markdown-footnote-location 'end) (goto-char (point-max)))
-   ((eq markdown-footnote-location 'immediately) (markdown-end-of-text-block))
-   ((eq markdown-footnote-location 'subtree) (markdown-end-of-subtree))
-   ((eq markdown-footnote-location 'header) (markdown-end-of-defun))))
-
-(defun markdown-footnote-kill ()
-  "Kill the footnote at point.
-The footnote text is killed (and added to the kill ring), the
-footnote marker is deleted.  Point has to be either at the
-footnote marker or in the footnote text."
-  (interactive)
-  (let ((marker-pos nil)
-        (skip-deleting-marker nil)
-        (starting-footnote-text-positions
-         (markdown-footnote-text-positions)))
-    (when starting-footnote-text-positions
-      ;; We're starting in footnote text, so mark our return position and jump
-      ;; to the marker if possible.
-      (let ((marker-pos (markdown-footnote-find-marker
-                         (cl-first starting-footnote-text-positions))))
-        (if marker-pos
-            (goto-char (1- marker-pos))
-          ;; If there isn't a marker, we still want to kill the text.
-          (setq skip-deleting-marker t))))
-    ;; Either we didn't start in the text, or we started in the text and jumped
-    ;; to the marker. We want to assume we're at the marker now and error if
-    ;; we're not.
-    (unless skip-deleting-marker
-      (let ((marker (markdown-footnote-delete-marker)))
-        (unless marker
-          (error "Not at a footnote"))
-        ;; Even if we knew the text position before, it changed when we deleted
-        ;; the label.
-        (setq marker-pos (cl-second marker))
-        (let ((new-text-pos (markdown-footnote-find-text (cl-first marker))))
-          (unless new-text-pos
-            (error "No text for footnote `%s'" (cl-first marker)))
-          (goto-char new-text-pos))))
-    (let ((pos (markdown-footnote-kill-text)))
-      (goto-char (if starting-footnote-text-positions
-                     pos
-                   marker-pos)))))
-
-(defun markdown-footnote-delete-marker ()
-  "Delete a footnote marker at point.
-Returns a list (ID START) containing the footnote ID and the
-start position of the marker before deletion.  If no footnote
-marker was deleted, this function returns NIL."
-  (let ((marker (markdown-footnote-marker-positions)))
-    (when marker
-      (delete-region (cl-second marker) (cl-third marker))
-      (butlast marker))))
-
-(defun markdown-footnote-kill-text ()
-  "Kill footnote text at point.
-Returns the start position of the footnote text before deletion,
-or NIL if point was not inside a footnote text.
-
-The killed text is placed in the kill ring (without the footnote
-number)."
-  (let ((fn (markdown-footnote-text-positions)))
-    (when fn
-      (let ((text (delete-and-extract-region (cl-second fn) (cl-third fn))))
-        (string-match (concat "\\[\\" (cl-first fn) "\\]:[[:space:]]*\\(\\(.*\n?\\)*\\)") text)
-        (kill-new (match-string 1 text))
-        (when (and (markdown-cur-line-blank-p)
-                   (markdown-prev-line-blank-p)
-                   (not (bobp)))
-          (delete-region (1- (point)) (point)))
-        (cl-second fn)))))
-
-(defun markdown-footnote-goto-text ()
-  "Jump to the text of the footnote at point."
-  (interactive)
-  (let ((fn (car (markdown-footnote-marker-positions))))
-    (unless fn
-      (user-error "Not at a footnote marker"))
-    (let ((new-pos (markdown-footnote-find-text fn)))
-      (unless new-pos
-        (error "No definition found for footnote `%s'" fn))
-      (goto-char new-pos))))
-
-(defun markdown-footnote-return ()
-  "Return from a footnote to its footnote number in the main text."
-  (interactive)
-  (let ((fn (save-excursion
-              (car (markdown-footnote-text-positions)))))
-    (unless fn
-      (user-error "Not in a footnote"))
-    (let ((new-pos (markdown-footnote-find-marker fn)))
-      (unless new-pos
-        (error "Footnote marker `%s' not found" fn))
-      (goto-char new-pos))))
-
-(defun markdown-footnote-find-marker (id)
-  "Find the location of the footnote marker with ID.
-The actual buffer position returned is the position directly
-following the marker's closing bracket.  If no marker is found,
-NIL is returned."
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward (concat "\\[" id "\\]\\([^:]\\|\\'\\)") nil t)
-      (skip-chars-backward "^]")
-      (point))))
-
-(defun markdown-footnote-find-text (id)
-  "Find the location of the text of footnote ID.
-The actual buffer position returned is the position of the first
-character of the text, after the footnote's identifier.  If no
-footnote text is found, NIL is returned."
-  (save-excursion
-    (goto-char (point-min))
-    (when (re-search-forward (concat "^ \\{0,3\\}\\[" id "\\]:") nil t)
-      (skip-chars-forward "[ \t]")
-      (point))))
-
-(defun markdown-footnote-marker-positions ()
-  "Return the position and ID of the footnote marker point is on.
-The return value is a list (ID START END).  If point is not on a
-footnote, NIL is returned."
-  ;; first make sure we're at a footnote marker
-  (if (or (looking-back (concat "\\[\\^" markdown-footnote-chars "*\\]?") (line-beginning-position))
-          (looking-at-p (concat "\\[?\\^" markdown-footnote-chars "*?\\]")))
-      (save-excursion
-        ;; move point between [ and ^:
-        (if (looking-at-p "\\[")
-            (forward-char 1)
-          (skip-chars-backward "^["))
-        (looking-at (concat "\\(\\^" markdown-footnote-chars "*?\\)\\]"))
-        (list (match-string 1) (1- (match-beginning 1)) (1+ (match-end 1))))))
-
-(defun markdown-footnote-text-positions ()
-  "Return the start and end positions of the footnote text point is in.
-The exact return value is a list of three elements: (ID START END).
-The start position is the position of the opening bracket
-of the footnote id.  The end position is directly after the
-newline that ends the footnote.  If point is not in a footnote,
-NIL is returned instead."
-  (save-excursion
-    (let (result)
-      (move-beginning-of-line 1)
-      ;; Try to find the label. If we haven't found the label and we're at a blank
-      ;; or indented line, back up if possible.
-      (while (and
-              (not (and (looking-at markdown-regex-footnote-definition)
-                        (setq result (list (match-string 1) (point)))))
-              (and (not (bobp))
-                   (or (markdown-cur-line-blank-p)
-                       (>= (current-indentation) 4))))
-        (forward-line -1))
-      (when result
-        ;; Advance if there is a next line that is either blank or indented.
-        ;; (Need to check if we're on the last line, because
-        ;; markdown-next-line-blank-p returns true for last line in buffer.)
-        (while (and (/= (line-end-position) (point-max))
-                    (or (markdown-next-line-blank-p)
-                        (>= (markdown-next-line-indent) 4)))
-          (forward-line))
-        ;; Move back while the current line is blank.
-        (while (markdown-cur-line-blank-p)
-          (forward-line -1))
-        ;; Advance to capture this line and a single trailing newline (if there
-        ;; is one).
-        (forward-line)
-        (append result (list (point)))))))
-
-(defun markdown-get-defined-footnotes ()
-  "Return a list of all defined footnotes.
-Result is an alist of pairs (MARKER . LINE), where MARKER is the
-footnote marker, a string, and LINE is the line number containing
-the footnote definition.
-
-For example, suppose the following footnotes are defined at positions
-448 and 475:
-
-\[^1]: First footnote here.
-\[^marker]: Second footnote.
-
-Then the returned list is: ((\"^1\" . 478) (\"^marker\" . 475))"
-  (save-excursion
-    (goto-char (point-min))
-    (let (footnotes)
-      (while (markdown-search-until-condition
-              (lambda () (and (not (markdown-code-block-at-point-p))
-                              (not (markdown-inline-code-at-point-p))
-                              (not (markdown-in-comment-p))))
-              markdown-regex-footnote-definition nil t)
-        (let ((marker (match-string-no-properties 1))
-              (pos (match-beginning 0)))
-          (unless (zerop (length marker))
-            (cl-pushnew (cons marker pos) footnotes :test #'equal))))
-      (reverse footnotes))))
-
-
-;;; Element Removal ===========================================================
-
-(defun markdown-kill-thing-at-point ()
-  "Kill thing at point and add important text, without markup, to kill ring.
-Possible things to kill include (roughly in order of precedence):
-inline code, headers, horizontal rules, links (add link text to
-kill ring), images (add alt text to kill ring), angle uri, email
-addresses, bold, italics, reference definition (add URI to kill
-ring), footnote markers and text (kill both marker and text, add
-text to kill ring), and list items."
-  (interactive "*")
-  (let (val)
-    (cond
-     ;; Inline code
-     ((markdown-inline-code-at-point)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; ATX header
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Setext header
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (kill-new (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Horizontal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (kill-new (match-string 0))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Inline link or image (add link or alt text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-link-inline)
-      (kill-new (match-string 3))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Reference link or image (add link or alt text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-link-reference)
-      (kill-new (match-string 3))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Angle URI (add URL to kill ring)
-     ((thing-at-point-looking-at markdown-regex-angle-uri)
-      (kill-new (match-string 2))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Email address in angle brackets (add email address to kill ring)
-     ((thing-at-point-looking-at markdown-regex-email)
-      (kill-new (match-string 1))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; Wiki link (add alias text to kill ring)
-     ((and markdown-enable-wiki-links
-           (thing-at-point-looking-at markdown-regex-wiki-link))
-      (kill-new (markdown-wiki-link-alias))
-      (delete-region (match-beginning 1) (match-end 1)))
-     ;; Bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (kill-new (match-string 4))
-      (delete-region (match-beginning 2) (match-end 2)))
-     ;; Italics
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (kill-new (match-string 3))
-      (delete-region (match-beginning 1) (match-end 1)))
-     ;; Strikethrough
-     ((thing-at-point-looking-at markdown-regex-strike-through)
-      (kill-new (match-string 4))
-      (delete-region (match-beginning 2) (match-end 2)))
-     ;; Footnote marker (add footnote text to kill ring)
-     ((thing-at-point-looking-at markdown-regex-footnote)
-      (markdown-footnote-kill))
-     ;; Footnote text (add footnote text to kill ring)
-     ((setq val (markdown-footnote-text-positions))
-      (markdown-footnote-kill))
-     ;; Reference definition (add URL to kill ring)
-     ((thing-at-point-looking-at markdown-regex-reference-definition)
-      (kill-new (match-string 5))
-      (delete-region (match-beginning 0) (match-end 0)))
-     ;; List item
-     ((setq val (markdown-cur-list-item-bounds))
-      (kill-new (delete-and-extract-region (cl-first val) (cl-second val))))
-     (t
-      (user-error "Nothing found at point to kill")))))
-
-(defun markdown-kill-outline ()
-  "Kill visible heading and add it to `kill-ring'."
-  (interactive)
-  (save-excursion
-    (markdown-outline-previous)
-    (kill-region (point) (progn (markdown-outline-next) (point)))))
-
-(defun markdown-kill-block ()
-  "Kill visible code block, list item, or blockquote and add it to `kill-ring'."
-  (interactive)
-  (save-excursion
-    (markdown-backward-block)
-    (kill-region (point) (progn (markdown-forward-block) (point)))))
-
-
-;;; Indentation ===============================================================
-
-(defun markdown-indent-find-next-position (cur-pos positions)
-  "Return the position after the index of CUR-POS in POSITIONS.
-Positions are calculated by `markdown-calc-indents'."
-  (while (and positions
-              (not (equal cur-pos (car positions))))
-    (setq positions (cdr positions)))
-  (or (cadr positions) 0))
-
-(defun markdown-outdent-find-next-position (cur-pos positions)
-  "Return the maximal element that precedes CUR-POS from POSITIONS.
-Positions are calculated by `markdown-calc-indents'."
-  (let ((result 0))
-    (dolist (i positions)
-      (when (< i cur-pos)
-        (setq result (max result i))))
-    result))
-
-(defun markdown-indent-line ()
-  "Indent the current line using some heuristics.
-If the _previous_ command was either `markdown-enter-key' or
-`markdown-cycle', then we should cycle to the next
-reasonable indentation position.  Otherwise, we could have been
-called directly by `markdown-enter-key', by an initial call of
-`markdown-cycle', or indirectly by `auto-fill-mode'.  In
-these cases, indent to the default position.
-Positions are calculated by `markdown-calc-indents'."
-  (interactive)
-  (let ((positions (markdown-calc-indents))
-        (point-pos (current-column))
-        (_ (back-to-indentation))
-        (cur-pos (current-column)))
-    (if (not (equal this-command 'markdown-cycle))
-        (indent-line-to (car positions))
-      (setq positions (sort (delete-dups positions) '<))
-      (let* ((next-pos (markdown-indent-find-next-position cur-pos positions))
-             (new-point-pos (max (+ point-pos (- next-pos cur-pos)) 0)))
-        (indent-line-to next-pos)
-        (move-to-column new-point-pos)))))
-
-(defun markdown-calc-indents ()
-  "Return a list of indentation columns to cycle through.
-The first element in the returned list should be considered the
-default indentation level.  This function does not worry about
-duplicate positions, which are handled up by calling functions."
-  (let (pos prev-line-pos positions)
-
-    ;; Indentation of previous line
-    (setq prev-line-pos (markdown-prev-line-indent))
-    (setq positions (cons prev-line-pos positions))
-
-    ;; Indentation of previous non-list-marker text
-    (when (setq pos (save-excursion
-                      (forward-line -1)
-                      (when (looking-at markdown-regex-list)
-                        (- (match-end 3) (match-beginning 0)))))
-      (setq positions (cons pos positions)))
-
-    ;; Indentation required for a pre block in current context
-    (setq pos (length (markdown-pre-indentation (point))))
-    (setq positions (cons pos positions))
-
-    ;; Indentation of the previous line + tab-width
-    (if prev-line-pos
-        (setq positions (cons (+ prev-line-pos tab-width) positions))
-      (setq positions (cons tab-width positions)))
-
-    ;; Indentation of the previous line - tab-width
-    (if (and prev-line-pos (> prev-line-pos tab-width))
-        (setq positions (cons (- prev-line-pos tab-width) positions)))
-
-    ;; Indentation of all preceding list markers (when in a list)
-    (when (setq pos (markdown-calculate-list-levels))
-      (setq positions (append pos positions)))
-
-    ;; First column
-    (setq positions (cons 0 positions))
-
-    ;; Return reversed list
-    (reverse positions)))
-
-(defun markdown-enter-key ()        ;FIXME: Partly obsoleted by electric-indent
-  "Handle RET depending on the context.
-If the point is at a table, move to the next row.  Otherwise,
-indent according to value of `markdown-indent-on-enter'.
-When it is nil, simply call `newline'.  Otherwise, indent the next line
-following RET using `markdown-indent-line'.  Furthermore, when it
-is set to \\='indent-and-new-item and the point is in a list item,
-start a new item with the same indentation. If the point is in an
-empty list item, remove it (so that pressing RET twice when in a
-list simply adds a blank line)."
-  (interactive)
-  (cond
-   ;; Table
-   ((markdown-table-at-point-p)
-    (call-interactively #'markdown-table-next-row))
-   ;; Indent non-table text
-   (markdown-indent-on-enter
-    (let (bounds)
-      (if (and (memq markdown-indent-on-enter '(indent-and-new-item))
-               (setq bounds (markdown-cur-list-item-bounds)))
-          (let ((beg (cl-first bounds))
-                (end (cl-second bounds))
-                (nonlist-indent (cl-fourth bounds))
-                (checkbox (cl-sixth bounds)))
-            ;; Point is in a list item
-            (if (= (- end beg) (+ nonlist-indent (length checkbox)))
-                ;; Delete blank list
-                (progn
-                  (delete-region beg end)
-                  (newline)
-                  (markdown-indent-line))
-              (call-interactively #'markdown-insert-list-item)))
-        ;; Point is not in a list
-        (newline)
-        (markdown-indent-line))))
-   ;; Insert a raw newline
-   (t (newline))))
-
-(defun markdown-outdent-or-delete (arg)
-  "Handle BACKSPACE by cycling through indentation points.
-When BACKSPACE is pressed, if there is only whitespace
-before the current point, then outdent the line one level.
-Otherwise, do normal delete by repeating
-`backward-delete-char-untabify' ARG times."
-  (interactive "*p")
-  (if (use-region-p)
-      (backward-delete-char-untabify arg)
-    (let ((cur-pos (current-column))
-          (start-of-indention (save-excursion
-                                (back-to-indentation)
-                                (current-column)))
-          (positions (markdown-calc-indents)))
-      (if (and (> cur-pos 0) (= cur-pos start-of-indention))
-          (indent-line-to (markdown-outdent-find-next-position cur-pos positions))
-        (backward-delete-char-untabify arg)))))
-
-(defun markdown-find-leftmost-column (beg end)
-  "Find the leftmost column in the region from BEG to END."
-  (let ((mincol 1000))
-    (save-excursion
-      (goto-char beg)
-      (while (< (point) end)
-        (back-to-indentation)
-        (unless (looking-at-p "[ \t]*$")
-          (setq mincol (min mincol (current-column))))
-        (forward-line 1)
-        ))
-    mincol))
-
-(defun markdown-indent-region (beg end arg)
-  "Indent the region from BEG to END using some heuristics.
-When ARG is non-nil, outdent the region instead.
-See `markdown-indent-line' and `markdown-indent-line'."
-  (interactive "*r\nP")
-  (let* ((positions (sort (delete-dups (markdown-calc-indents)) '<))
-         (leftmostcol (markdown-find-leftmost-column beg end))
-         (next-pos (if arg
-                       (markdown-outdent-find-next-position leftmostcol positions)
-                     (markdown-indent-find-next-position leftmostcol positions))))
-    (indent-rigidly beg end (- next-pos leftmostcol))
-    (setq deactivate-mark nil)))
-
-(defun markdown-outdent-region (beg end)
-  "Call `markdown-indent-region' on region from BEG to END with prefix."
-  (interactive "*r")
-  (markdown-indent-region beg end t))
-
-(defun markdown--indent-region (start end)
-  (let ((deactivate-mark nil))
-    (save-excursion
-      (goto-char end)
-      (setq end (point-marker))
-      (goto-char start)
-      (when (bolp)
-        (forward-line 1))
-      (while (< (point) end)
-        (unless (or (markdown-code-block-at-point-p) (and (bolp) (eolp)))
-          (indent-according-to-mode))
-        (forward-line 1))
-      (move-marker end nil))))
-
-
-;;; Markup Completion =========================================================
-
-(defconst markdown-complete-alist
-  '((markdown-regex-header-atx . markdown-complete-atx)
-    (markdown-regex-header-setext . markdown-complete-setext)
-    (markdown-regex-hr . markdown-complete-hr))
-  "Association list of form (regexp . function) for markup completion.")
-
-(defun markdown-incomplete-atx-p ()
-  "Return t if ATX header markup is incomplete and nil otherwise.
-Assumes match data is available for `markdown-regex-header-atx'.
-Checks that the number of trailing hash marks equals the number of leading
-hash marks, that there is only a single space before and after the text,
-and that there is no extraneous whitespace in the text."
-  (or
-   ;; Number of starting and ending hash marks differs
-   (not (= (length (match-string 1)) (length (match-string 3))))
-   ;; When the header text is not empty...
-   (and (> (length (match-string 2)) 0)
-        ;; ...if there are extra leading, trailing, or interior spaces
-        (or (not (= (match-beginning 2) (1+ (match-end 1))))
-            (not (= (match-beginning 3) (1+ (match-end 2))))
-            (string-match-p "[ \t\n]\\{2\\}" (match-string 2))))
-   ;; When the header text is empty...
-   (and (= (length (match-string 2)) 0)
-        ;; ...if there are too many or too few spaces
-        (not (= (match-beginning 3) (+ (match-end 1) 2))))))
-
-(defun markdown-complete-atx ()
-  "Complete and normalize ATX headers.
-Add or remove hash marks to the end of the header to match the
-beginning.  Ensure that there is only a single space between hash
-marks and header text.  Removes extraneous whitespace from header text.
-Assumes match data is available for `markdown-regex-header-atx'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-atx-p)
-    (let* ((new-marker (make-marker))
-           (new-marker (set-marker new-marker (match-end 2))))
-      ;; Hash marks and spacing at end
-      (goto-char (match-end 2))
-      (delete-region (match-end 2) (match-end 3))
-      (insert " " (match-string 1))
-      ;; Remove extraneous whitespace from title
-      (replace-match (markdown-compress-whitespace-string (match-string 2))
-                     t t nil 2)
-      ;; Spacing at beginning
-      (goto-char (match-end 1))
-      (delete-region (match-end 1) (match-beginning 2))
-      (insert " ")
-      ;; Leave point at end of text
-      (goto-char new-marker))))
-
-(defun markdown-incomplete-setext-p ()
-  "Return t if setext header markup is incomplete and nil otherwise.
-Assumes match data is available for `markdown-regex-header-setext'.
-Checks that length of underline matches text and that there is no
-extraneous whitespace in the text."
-  (or (not (= (length (match-string 1)) (length (match-string 2))))
-      (string-match-p "[ \t\n]\\{2\\}" (match-string 1))))
-
-(defun markdown-complete-setext ()
-  "Complete and normalize setext headers.
-Add or remove underline characters to match length of header
-text.  Removes extraneous whitespace from header text.  Assumes
-match data is available for `markdown-regex-header-setext'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-setext-p)
-    (let* ((text (markdown-compress-whitespace-string (match-string 1)))
-           (char (char-after (match-beginning 2)))
-           (level (if (char-equal char ?-) 2 1)))
-      (goto-char (match-beginning 0))
-      (delete-region (match-beginning 0) (match-end 0))
-      (markdown-insert-header level text t)
-      t)))
-
-(defun markdown-incomplete-hr-p ()
-  "Return non-nil if hr is not in `markdown-hr-strings' and nil otherwise.
-Assumes match data is available for `markdown-regex-hr'."
-  (not (member (match-string 0) markdown-hr-strings)))
-
-(defun markdown-complete-hr ()
-  "Complete horizontal rules.
-If horizontal rule string is a member of `markdown-hr-strings',
-do nothing.  Otherwise, replace with the car of
-`markdown-hr-strings'.
-Assumes match data is available for `markdown-regex-hr'.
-Return nil if markup was complete and non-nil if markup was completed."
-  (when (markdown-incomplete-hr-p)
-    (replace-match (car markdown-hr-strings))
-    t))
-
-(defun markdown-complete ()
-  "Complete markup of object near point or in region when active.
-Handle all objects in `markdown-complete-alist', in order.
-See `markdown-complete-at-point' and `markdown-complete-region'."
-  (interactive "*")
-  (if (use-region-p)
-      (markdown-complete-region (region-beginning) (region-end))
-    (markdown-complete-at-point)))
-
-(defun markdown-complete-at-point ()
-  "Complete markup of object near point.
-Handle all elements of `markdown-complete-alist' in order."
-  (interactive "*")
-  (let ((list markdown-complete-alist) found changed)
-    (while list
-      (let ((regexp (eval (caar list) t)) ;FIXME: Why `eval'?
-            (function (cdar list)))
-        (setq list (cdr list))
-        (when (thing-at-point-looking-at regexp)
-          (setq found t)
-          (setq changed (funcall function))
-          (setq list nil))))
-    (if found
-        (or changed (user-error "Markup at point is complete"))
-      (user-error "Nothing to complete at point"))))
-
-(defun markdown-complete-region (beg end)
-  "Complete markup of objects in region from BEG to END.
-Handle all objects in `markdown-complete-alist', in order.  Each
-match is checked to ensure that a previous regexp does not also
-match."
-  (interactive "*r")
-  (let ((end-marker (set-marker (make-marker) end))
-        previous)
-    (dolist (element markdown-complete-alist)
-      (let ((regexp (eval (car element) t)) ;FIXME: Why `eval'?
-            (function (cdr element)))
-        (goto-char beg)
-        (while (re-search-forward regexp end-marker 'limit)
-          (when (match-string 0)
-            ;; Make sure this is not a match for any of the preceding regexps.
-            ;; This prevents mistaking an HR for a Setext subheading.
-            (let (match)
-              (save-match-data
-                (dolist (prev-regexp previous)
-                  (or match (setq match (looking-back prev-regexp nil)))))
-              (unless match
-                (save-excursion (funcall function))))))
-        (cl-pushnew regexp previous :test #'equal)))
-    previous))
-
-(defun markdown-complete-buffer ()
-  "Complete markup for all objects in the current buffer."
-  (interactive "*")
-  (markdown-complete-region (point-min) (point-max)))
-
-
-;;; Markup Cycling ============================================================
-
-(defun markdown-cycle-atx (arg &optional remove)
-  "Cycle ATX header markup.
-Promote header (decrease level) when ARG is 1 and demote
-header (increase level) if arg is -1.  When REMOVE is non-nil,
-remove the header when the level reaches zero and stop cycling
-when it reaches six.  Otherwise, perform a proper cycling through
-levels one through six.  Assumes match data is available for
-`markdown-regex-header-atx'."
-  (let* ((old-level (length (match-string 1)))
-         (new-level (+ old-level arg))
-         (text (match-string 2)))
-    (when (not remove)
-      (setq new-level (% new-level 6))
-      (setq new-level (cond ((= new-level 0) 6)
-                            ((< new-level 0) (+ new-level 6))
-                            (t new-level))))
-    (cond
-     ((= new-level 0)
-      (markdown-unwrap-thing-at-point nil 0 2))
-     ((<= new-level 6)
-      (goto-char (match-beginning 0))
-      (delete-region (match-beginning 0) (match-end 0))
-      (markdown-insert-header new-level text nil)))))
-
-(defun markdown-cycle-setext (arg &optional remove)
-  "Cycle setext header markup.
-Promote header (increase level) when ARG is 1 and demote
-header (decrease level or remove) if arg is -1.  When demoting a
-level-two setext header, replace with a level-three atx header.
-When REMOVE is non-nil, remove the header when the level reaches
-zero.  Otherwise, cycle back to a level six atx header.  Assumes
-match data is available for `markdown-regex-header-setext'."
-  (let* ((char (char-after (match-beginning 2)))
-         (old-level (if (char-equal char ?=) 1 2))
-         (new-level (+ old-level arg)))
-    (when (and (not remove) (= new-level 0))
-      (setq new-level 6))
-    (cond
-     ((= new-level 0)
-      (markdown-unwrap-thing-at-point nil 0 1))
-     ((<= new-level 2)
-      (markdown-insert-header new-level nil t))
-     ((<= new-level 6)
-      (markdown-insert-header new-level nil nil)))))
-
-(defun markdown-cycle-hr (arg &optional remove)
-  "Cycle string used for horizontal rule from `markdown-hr-strings'.
-When ARG is 1, cycle forward (demote), and when ARG is -1, cycle
-backwards (promote).  When REMOVE is non-nil, remove the hr instead
-of cycling when the end of the list is reached.
-Assumes match data is available for `markdown-regex-hr'."
-  (let* ((strings (if (= arg -1)
-                      (reverse markdown-hr-strings)
-                    markdown-hr-strings))
-         (tail (member (match-string 0) strings))
-         (new (or (cadr tail)
-                  (if remove
-                      (if (= arg 1)
-                          ""
-                        (car tail))
-                    (car strings)))))
-    (replace-match new)))
-
-(defun markdown-cycle-bold ()
-  "Cycle bold markup between underscores and asterisks.
-Assumes match data is available for `markdown-regex-bold'."
-  (save-excursion
-    (let* ((old-delim (match-string 3))
-           (new-delim (if (string-equal old-delim "**") "__" "**")))
-      (replace-match new-delim t t nil 3)
-      (replace-match new-delim t t nil 5))))
-
-(defun markdown-cycle-italic ()
-  "Cycle italic markup between underscores and asterisks.
-Assumes match data is available for `markdown-regex-italic'."
-  (save-excursion
-    (let* ((old-delim (match-string 2))
-           (new-delim (if (string-equal old-delim "*") "_" "*")))
-      (replace-match new-delim t t nil 2)
-      (replace-match new-delim t t nil 4))))
-
-
-;;; Keymap ====================================================================
-
-(defun markdown--style-map-prompt ()
-  "Return a formatted prompt for Markdown markup insertion."
-  (when markdown-enable-prefix-prompts
-    (concat
-     "Markdown: "
-     (propertize "bold" 'face 'markdown-bold-face) ", "
-     (propertize "italic" 'face 'markdown-italic-face) ", "
-     (propertize "code" 'face 'markdown-inline-code-face) ", "
-     (propertize "C = GFM code" 'face 'markdown-code-face) ", "
-     (propertize "pre" 'face 'markdown-pre-face) ", "
-     (propertize "footnote" 'face 'markdown-footnote-text-face) ", "
-     (propertize "F = foldable" 'face 'markdown-bold-face) ", "
-     (propertize "q = blockquote" 'face 'markdown-blockquote-face) ", "
-     (propertize "h & 1-6 = heading" 'face 'markdown-header-face) ", "
-     (propertize "- = hr" 'face 'markdown-hr-face) ", "
-     "C-h = more")))
-
-(defun markdown--command-map-prompt ()
-  "Return prompt for Markdown buffer-wide commands."
-  (when markdown-enable-prefix-prompts
-    (concat
-     "Command: "
-     (propertize "m" 'face 'markdown-bold-face) "arkdown, "
-     (propertize "p" 'face 'markdown-bold-face) "review, "
-     (propertize "o" 'face 'markdown-bold-face) "pen, "
-     (propertize "e" 'face 'markdown-bold-face) "xport, "
-     "export & pre" (propertize "v" 'face 'markdown-bold-face) "iew, "
-     (propertize "c" 'face 'markdown-bold-face) "heck refs, "
-     (propertize "u" 'face 'markdown-bold-face) "nused refs, "
-     "C-h = more")))
-
-(defvar markdown-mode-style-map
-  (let ((map (make-keymap (markdown--style-map-prompt))))
-    (define-key map (kbd "1") 'markdown-insert-header-atx-1)
-    (define-key map (kbd "2") 'markdown-insert-header-atx-2)
-    (define-key map (kbd "3") 'markdown-insert-header-atx-3)
-    (define-key map (kbd "4") 'markdown-insert-header-atx-4)
-    (define-key map (kbd "5") 'markdown-insert-header-atx-5)
-    (define-key map (kbd "6") 'markdown-insert-header-atx-6)
-    (define-key map (kbd "!") 'markdown-insert-header-setext-1)
-    (define-key map (kbd "@") 'markdown-insert-header-setext-2)
-    (define-key map (kbd "b") 'markdown-insert-bold)
-    (define-key map (kbd "c") 'markdown-insert-code)
-    (define-key map (kbd "C") 'markdown-insert-gfm-code-block)
-    (define-key map (kbd "f") 'markdown-insert-footnote)
-    (define-key map (kbd "F") 'markdown-insert-foldable-block)
-    (define-key map (kbd "h") 'markdown-insert-header-dwim)
-    (define-key map (kbd "H") 'markdown-insert-header-setext-dwim)
-    (define-key map (kbd "i") 'markdown-insert-italic)
-    (define-key map (kbd "k") 'markdown-insert-kbd)
-    (define-key map (kbd "l") 'markdown-insert-link)
-    (define-key map (kbd "p") 'markdown-insert-pre)
-    (define-key map (kbd "P") 'markdown-pre-region)
-    (define-key map (kbd "q") 'markdown-insert-blockquote)
-    (define-key map (kbd "s") 'markdown-insert-strike-through)
-    (define-key map (kbd "t") 'markdown-insert-table)
-    (define-key map (kbd "Q") 'markdown-blockquote-region)
-    (define-key map (kbd "w") 'markdown-insert-wiki-link)
-    (define-key map (kbd "-") 'markdown-insert-hr)
-    (define-key map (kbd "[") 'markdown-insert-gfm-checkbox)
-    ;; Deprecated keys that may be removed in a future version
-    (define-key map (kbd "e") 'markdown-insert-italic)
-    map)
-  "Keymap for Markdown text styling commands.")
-
-(defvar markdown-mode-command-map
-  (let ((map (make-keymap (markdown--command-map-prompt))))
-    (define-key map (kbd "m") 'markdown-other-window)
-    (define-key map (kbd "p") 'markdown-preview)
-    (define-key map (kbd "e") 'markdown-export)
-    (define-key map (kbd "v") 'markdown-export-and-preview)
-    (define-key map (kbd "o") 'markdown-open)
-    (define-key map (kbd "l") 'markdown-live-preview-mode)
-    (define-key map (kbd "w") 'markdown-kill-ring-save)
-    (define-key map (kbd "c") 'markdown-check-refs)
-    (define-key map (kbd "u") 'markdown-unused-refs)
-    (define-key map (kbd "n") 'markdown-cleanup-list-numbers)
-    (define-key map (kbd "]") 'markdown-complete-buffer)
-    (define-key map (kbd "^") 'markdown-table-sort-lines)
-    (define-key map (kbd "|") 'markdown-table-convert-region)
-    (define-key map (kbd "t") 'markdown-table-transpose)
-    map)
-  "Keymap for Markdown buffer-wide commands.")
-
-(defvar markdown-mode-map
-  (let ((map (make-keymap)))
-    ;; Markup insertion & removal
-    (define-key map (kbd "C-c C-s") markdown-mode-style-map)
-    (define-key map (kbd "C-c C-l") 'markdown-insert-link)
-    (define-key map (kbd "C-c C-k") 'markdown-kill-thing-at-point)
-    ;; Promotion, demotion, and cycling
-    (define-key map (kbd "C-c C--") 'markdown-promote)
-    (define-key map (kbd "C-c C-=") 'markdown-demote)
-    (define-key map (kbd "C-c C-]") 'markdown-complete)
-    ;; Following and doing things
-    (define-key map (kbd "C-c C-o") 'markdown-follow-thing-at-point)
-    (define-key map (kbd "C-c C-d") 'markdown-do)
-    (define-key map (kbd "C-c '") 'markdown-edit-code-block)
-    ;; Indentation
-    (define-key map (kbd "RET") 'markdown-enter-key)
-    (define-key map (kbd "DEL") 'markdown-outdent-or-delete)
-    (define-key map (kbd "C-c >") 'markdown-indent-region)
-    (define-key map (kbd "C-c <") 'markdown-outdent-region)
-    ;; Visibility cycling
-    (define-key map (kbd "TAB") 'markdown-cycle)
-    ;; S-iso-lefttab and S-tab should both be mapped to `backtab' by
-    ;; (local-)function-key-map.
-    ;;(define-key map (kbd "<S-iso-lefttab>") 'markdown-shifttab)
-    ;;(define-key map (kbd "<S-tab>")  'markdown-shifttab)
-    (define-key map (kbd "<backtab>") 'markdown-shifttab)
-    ;; Heading and list navigation
-    (define-key map (kbd "C-c C-n") 'markdown-outline-next)
-    (define-key map (kbd "C-c C-p") 'markdown-outline-previous)
-    (define-key map (kbd "C-c C-f") 'markdown-outline-next-same-level)
-    (define-key map (kbd "C-c C-b") 'markdown-outline-previous-same-level)
-    (define-key map (kbd "C-c C-u") 'markdown-outline-up)
-    ;; Buffer-wide commands
-    (define-key map (kbd "C-c C-c") markdown-mode-command-map)
-    ;; Subtree, list, and table editing
-    (define-key map (kbd "C-c <up>") 'markdown-move-up)
-    (define-key map (kbd "C-c <down>") 'markdown-move-down)
-    (define-key map (kbd "C-c <left>") 'markdown-promote)
-    (define-key map (kbd "C-c <right>") 'markdown-demote)
-    (define-key map (kbd "C-c S-<up>") 'markdown-table-delete-row)
-    (define-key map (kbd "C-c S-<down>") 'markdown-table-insert-row)
-    (define-key map (kbd "C-c S-<left>") 'markdown-table-delete-column)
-    (define-key map (kbd "C-c S-<right>") 'markdown-table-insert-column)
-    (define-key map (kbd "C-c C-M-h") 'markdown-mark-subtree)
-    (define-key map (kbd "C-x n s") 'markdown-narrow-to-subtree)
-    (define-key map (kbd "M-RET") 'markdown-insert-list-item)
-    (define-key map (kbd "C-c C-j") 'markdown-insert-list-item)
-    ;; Lines
-    (define-key map [remap move-beginning-of-line] 'markdown-beginning-of-line)
-    (define-key map [remap move-end-of-line] 'markdown-end-of-line)
-    ;; Paragraphs (Markdown context aware)
-    (define-key map [remap backward-paragraph] 'markdown-backward-paragraph)
-    (define-key map [remap forward-paragraph] 'markdown-forward-paragraph)
-    (define-key map [remap mark-paragraph] 'markdown-mark-paragraph)
-    ;; Blocks (one or more paragraphs)
-    (define-key map (kbd "C-M-{") 'markdown-backward-block)
-    (define-key map (kbd "C-M-}") 'markdown-forward-block)
-    (define-key map (kbd "C-c M-h") 'markdown-mark-block)
-    (define-key map (kbd "C-x n b") 'markdown-narrow-to-block)
-    ;; Pages (top-level sections)
-    (define-key map [remap backward-page] 'markdown-backward-page)
-    (define-key map [remap forward-page] 'markdown-forward-page)
-    (define-key map [remap mark-page] 'markdown-mark-page)
-    (define-key map [remap narrow-to-page] 'markdown-narrow-to-page)
-    ;; Link Movement
-    (define-key map (kbd "M-n") 'markdown-next-link)
-    (define-key map (kbd "M-p") 'markdown-previous-link)
-    ;; Toggling functionality
-    (define-key map (kbd "C-c C-x C-e") 'markdown-toggle-math)
-    (define-key map (kbd "C-c C-x C-f") 'markdown-toggle-fontify-code-blocks-natively)
-    (define-key map (kbd "C-c C-x C-i") 'markdown-toggle-inline-images)
-    (define-key map (kbd "C-c C-x C-l") 'markdown-toggle-url-hiding)
-    (define-key map (kbd "C-c C-x C-m") 'markdown-toggle-markup-hiding)
-    ;; Alternative keys (in case of problems with the arrow keys)
-    (define-key map (kbd "C-c C-x u") 'markdown-move-up)
-    (define-key map (kbd "C-c C-x d") 'markdown-move-down)
-    (define-key map (kbd "C-c C-x l") 'markdown-promote)
-    (define-key map (kbd "C-c C-x r") 'markdown-demote)
-    ;; Deprecated keys that may be removed in a future version
-    (define-key map (kbd "C-c C-a L") 'markdown-insert-link) ;; C-c C-l
-    (define-key map (kbd "C-c C-a l") 'markdown-insert-link) ;; C-c C-l
-    (define-key map (kbd "C-c C-a r") 'markdown-insert-link) ;; C-c C-l
-    (define-key map (kbd "C-c C-a u") 'markdown-insert-uri) ;; C-c C-l
-    (define-key map (kbd "C-c C-a f") 'markdown-insert-footnote)
-    (define-key map (kbd "C-c C-a w") 'markdown-insert-wiki-link)
-    (define-key map (kbd "C-c C-t 1") 'markdown-insert-header-atx-1)
-    (define-key map (kbd "C-c C-t 2") 'markdown-insert-header-atx-2)
-    (define-key map (kbd "C-c C-t 3") 'markdown-insert-header-atx-3)
-    (define-key map (kbd "C-c C-t 4") 'markdown-insert-header-atx-4)
-    (define-key map (kbd "C-c C-t 5") 'markdown-insert-header-atx-5)
-    (define-key map (kbd "C-c C-t 6") 'markdown-insert-header-atx-6)
-    (define-key map (kbd "C-c C-t !") 'markdown-insert-header-setext-1)
-    (define-key map (kbd "C-c C-t @") 'markdown-insert-header-setext-2)
-    (define-key map (kbd "C-c C-t h") 'markdown-insert-header-dwim)
-    (define-key map (kbd "C-c C-t H") 'markdown-insert-header-setext-dwim)
-    (define-key map (kbd "C-c C-t s") 'markdown-insert-header-setext-2)
-    (define-key map (kbd "C-c C-t t") 'markdown-insert-header-setext-1)
-    (define-key map (kbd "C-c C-i") 'markdown-insert-image)
-    (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item) ;; C-c C-j
-    (define-key map (kbd "C-c C-x C-x") 'markdown-toggle-gfm-checkbox) ;; C-c C-d
-    (define-key map (kbd "C-c -") 'markdown-insert-hr)
-    map)
-  "Keymap for Markdown major mode.")
-
-(defvar markdown-mode-mouse-map
-  (when markdown-mouse-follow-link
-    (let ((map (make-sparse-keymap)))
-      (define-key map [follow-link] 'mouse-face)
-      (define-key map [mouse-2] #'markdown-follow-thing-at-point)
-      map))
-  "Keymap for following links with mouse.")
-
-(defvar gfm-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map markdown-mode-map)
-    (define-key map (kbd "C-c C-s d") 'markdown-insert-strike-through)
-    (define-key map "`" 'markdown-electric-backquote)
-    map)
-  "Keymap for `gfm-mode'.
-See also `markdown-mode-map'.")
-
-
-;;; Menu ======================================================================
-
-(easy-menu-define markdown-mode-menu markdown-mode-map
-  "Menu for Markdown mode."
-  '("Markdown"
-    "---"
-    ("Movement"
-     ["Jump" markdown-do]
-     ["Follow Link" markdown-follow-thing-at-point]
-     ["Next Link" markdown-next-link]
-     ["Previous Link" markdown-previous-link]
-     "---"
-     ["Next Heading or List Item" markdown-outline-next]
-     ["Previous Heading or List Item" markdown-outline-previous]
-     ["Next at Same Level" markdown-outline-next-same-level]
-     ["Previous at Same Level" markdown-outline-previous-same-level]
-     ["Up to Parent" markdown-outline-up]
-     "---"
-     ["Forward Paragraph" markdown-forward-paragraph]
-     ["Backward Paragraph" markdown-backward-paragraph]
-     ["Forward Block" markdown-forward-block]
-     ["Backward Block" markdown-backward-block])
-    ("Show & Hide"
-     ["Cycle Heading Visibility" markdown-cycle
-      :enable (markdown-on-heading-p)]
-     ["Cycle Heading Visibility (Global)" markdown-shifttab]
-     "---"
-     ["Narrow to Region" narrow-to-region]
-     ["Narrow to Block" markdown-narrow-to-block]
-     ["Narrow to Section" narrow-to-defun]
-     ["Narrow to Subtree" markdown-narrow-to-subtree]
-     ["Widen" widen (buffer-narrowed-p)]
-     "---"
-     ["Toggle Markup Hiding" markdown-toggle-markup-hiding
-      :keys "C-c C-x C-m"
-      :style radio
-      :selected markdown-hide-markup])
-    "---"
-    ("Headings & Structure"
-     ["Automatic Heading" markdown-insert-header-dwim
-      :keys "C-c C-s h"]
-     ["Automatic Heading (Setext)" markdown-insert-header-setext-dwim
-      :keys "C-c C-s H"]
-     ("Specific Heading (atx)"
-      ["First Level atx" markdown-insert-header-atx-1
-       :keys "C-c C-s 1"]
-      ["Second Level atx" markdown-insert-header-atx-2
-       :keys "C-c C-s 2"]
-      ["Third Level atx" markdown-insert-header-atx-3
-       :keys "C-c C-s 3"]
-      ["Fourth Level atx" markdown-insert-header-atx-4
-       :keys "C-c C-s 4"]
-      ["Fifth Level atx" markdown-insert-header-atx-5
-       :keys "C-c C-s 5"]
-      ["Sixth Level atx" markdown-insert-header-atx-6
-       :keys "C-c C-s 6"])
-     ("Specific Heading (Setext)"
-      ["First Level Setext" markdown-insert-header-setext-1
-       :keys "C-c C-s !"]
-      ["Second Level Setext" markdown-insert-header-setext-2
-       :keys "C-c C-s @"])
-     ["Horizontal Rule" markdown-insert-hr
-      :keys "C-c C-s -"]
-     "---"
-     ["Move Subtree Up" markdown-move-up
-      :keys "C-c <up>"]
-     ["Move Subtree Down" markdown-move-down
-      :keys "C-c <down>"]
-     ["Promote Subtree" markdown-promote
-      :keys "C-c <left>"]
-     ["Demote Subtree" markdown-demote
-      :keys "C-c <right>"])
-    ("Region & Mark"
-     ["Indent Region" markdown-indent-region]
-     ["Outdent Region" markdown-outdent-region]
-     "--"
-     ["Mark Paragraph" mark-paragraph]
-     ["Mark Block" markdown-mark-block]
-     ["Mark Section" mark-defun]
-     ["Mark Subtree" markdown-mark-subtree])
-    ("Tables"
-     ["Move Row Up" markdown-move-up
-      :enable (markdown-table-at-point-p)
-      :keys "C-c <up>"]
-     ["Move Row Down" markdown-move-down
-      :enable (markdown-table-at-point-p)
-      :keys "C-c <down>"]
-     ["Move Column Left" markdown-promote
-      :enable (markdown-table-at-point-p)
-      :keys "C-c <left>"]
-     ["Move Column Right" markdown-demote
-      :enable (markdown-table-at-point-p)
-      :keys "C-c <right>"]
-     ["Delete Row" markdown-table-delete-row
-      :enable (markdown-table-at-point-p)]
-     ["Insert Row" markdown-table-insert-row
-      :enable (markdown-table-at-point-p)]
-     ["Delete Column" markdown-table-delete-column
-      :enable (markdown-table-at-point-p)]
-     ["Insert Column" markdown-table-insert-column
-      :enable (markdown-table-at-point-p)]
-     ["Insert Table" markdown-insert-table]
-     "--"
-     ["Convert Region to Table" markdown-table-convert-region]
-     ["Sort Table Lines" markdown-table-sort-lines
-      :enable (markdown-table-at-point-p)]
-     ["Transpose Table" markdown-table-transpose
-      :enable (markdown-table-at-point-p)])
-    ("Lists"
-     ["Insert List Item" markdown-insert-list-item]
-     ["Move Subtree Up" markdown-move-up
-      :keys "C-c <up>"]
-     ["Move Subtree Down" markdown-move-down
-      :keys "C-c <down>"]
-     ["Indent Subtree" markdown-demote
-      :keys "C-c <right>"]
-     ["Outdent Subtree" markdown-promote
-      :keys "C-c <left>"]
-     ["Renumber List" markdown-cleanup-list-numbers]
-     ["Insert Task List Item" markdown-insert-gfm-checkbox
-      :keys "C-c C-x ["]
-     ["Toggle Task List Item" markdown-toggle-gfm-checkbox
-      :enable (markdown-gfm-task-list-item-at-point)
-      :keys "C-c C-d"])
-    ("Links & Images"
-     ["Insert Link" markdown-insert-link]
-     ["Insert Image" markdown-insert-image]
-     ["Insert Footnote" markdown-insert-footnote
-      :keys "C-c C-s f"]
-     ["Insert Wiki Link" markdown-insert-wiki-link
-      :keys "C-c C-s w"]
-     "---"
-     ["Check References" markdown-check-refs]
-     ["Find Unused References" markdown-unused-refs]
-     ["Toggle URL Hiding" markdown-toggle-url-hiding
-      :style radio
-      :selected markdown-hide-urls]
-     ["Toggle Inline Images" markdown-toggle-inline-images
-      :keys "C-c C-x C-i"
-      :style radio
-      :selected markdown-inline-image-overlays]
-     ["Toggle Wiki Links" markdown-toggle-wiki-links
-      :style radio
-      :selected markdown-enable-wiki-links])
-    ("Styles"
-     ["Bold" markdown-insert-bold]
-     ["Italic" markdown-insert-italic]
-     ["Code" markdown-insert-code]
-     ["Strikethrough" markdown-insert-strike-through]
-     ["Keyboard" markdown-insert-kbd]
-     "---"
-     ["Blockquote" markdown-insert-blockquote]
-     ["Preformatted" markdown-insert-pre]
-     ["GFM Code Block" markdown-insert-gfm-code-block]
-     ["Edit Code Block" markdown-edit-code-block
-      :enable (markdown-code-block-at-point-p)]
-     ["Foldable Block" markdown-insert-foldable-block]
-     "---"
-     ["Blockquote Region" markdown-blockquote-region]
-     ["Preformatted Region" markdown-pre-region]
-     "---"
-     ["Fontify Code Blocks Natively"
-      markdown-toggle-fontify-code-blocks-natively
-      :style radio
-      :selected markdown-fontify-code-blocks-natively]
-     ["LaTeX Math Support" markdown-toggle-math
-      :style radio
-      :selected markdown-enable-math])
-    "---"
-    ("Preview & Export"
-     ["Compile" markdown-other-window]
-     ["Preview" markdown-preview]
-     ["Export" markdown-export]
-     ["Export & View" markdown-export-and-preview]
-     ["Open" markdown-open]
-     ["Live Export" markdown-live-preview-mode
-      :style radio
-      :selected markdown-live-preview-mode]
-     ["Kill ring save" markdown-kill-ring-save])
-    ("Markup Completion and Cycling"
-     ["Complete Markup" markdown-complete]
-     ["Promote Element" markdown-promote
-      :keys "C-c C--"]
-     ["Demote Element" markdown-demote
-      :keys "C-c C-="])
-    "---"
-    ["Kill Element" markdown-kill-thing-at-point]
-    "---"
-    ("Documentation"
-     ["Version" markdown-show-version]
-     ["Homepage" markdown-mode-info]
-     ["Describe Mode" (describe-function 'markdown-mode)]
-     ["Guide" (browse-url "https://leanpub.com/markdown-mode")])))
-
-
-;;; imenu =====================================================================
-
-(defun markdown-imenu-create-nested-index ()
-  "Create and return a nested imenu index alist for the current buffer.
-See `imenu-create-index-function' and `imenu--index-alist' for details."
-  (let* ((root (list nil))
-         (min-level 9999)
-         hashes headers)
-    (save-excursion
-      ;; Headings
-      (goto-char (point-min))
-      (while (re-search-forward markdown-regex-header (point-max) t)
-        (unless (or (markdown-code-block-at-point-p)
-                    (and (match-beginning 3)
-                         (get-text-property (match-beginning 3) 'markdown-yaml-metadata-end)))
-          (cond
-           ((match-string-no-properties 2) ;; level 1 setext
-            (setq min-level 1)
-            (push (list :heading (match-string-no-properties 1)
-                        :point (match-beginning 1)
-                        :level 1) headers))
-           ((match-string-no-properties 3) ;; level 2 setext
-            (setq min-level (min min-level 2))
-            (push (list :heading (match-string-no-properties 1)
-                        :point (match-beginning 1)
-                        :level (- 2 (1- min-level))) headers))
-           ((setq hashes (markdown-trim-whitespace
-                          (match-string-no-properties 4)))
-            (setq min-level (min min-level (length hashes)))
-            (push (list :heading (match-string-no-properties 5)
-                        :point (match-beginning 4)
-                        :level (- (length hashes) (1- min-level))) headers)))))
-      (cl-loop with cur-level = 0
-               with cur-alist = nil
-               with empty-heading = "-"
-               with self-heading = "."
-               for header in (reverse headers)
-               for level = (plist-get header :level)
-               do
-               (let ((alist (list (cons (plist-get header :heading) (plist-get header :point)))))
-                 (cond
-                  ((= cur-level level)  ; new sibling
-                   (setcdr cur-alist alist)
-                   (setq cur-alist alist))
-                  ((< cur-level level)  ; first child
-                   (dotimes (_ (- level cur-level 1))
-                     (setq alist (list (cons empty-heading alist))))
-                   (if cur-alist
-                       (let* ((parent (car cur-alist))
-                              (self-pos (cdr parent)))
-                         (setcdr parent (cons (cons self-heading self-pos) alist)))
-                     (setcdr root alist)) ; primogenitor
-                   (setq cur-alist alist)
-                   (setq cur-level level))
-                  (t                    ; new sibling of an ancestor
-                   (let ((sibling-alist (last (cdr root))))
-                     (dotimes (_ (1- level))
-                       (setq sibling-alist (last (cdar sibling-alist))))
-                     (setcdr sibling-alist alist)
-                     (setq cur-alist alist))
-                   (setq cur-level level)))))
-      (setq root (copy-tree root))
-      ;; Footnotes
-      (let ((fn (markdown-get-defined-footnotes)))
-        (if (or (zerop (length fn))
-                (null markdown-add-footnotes-to-imenu))
-            (cdr root)
-          (nconc (cdr root) (list (cons "Footnotes" fn))))))))
-
-(defun markdown-imenu-create-flat-index ()
-  "Create and return a flat imenu index alist for the current buffer.
-See `imenu-create-index-function' and `imenu--index-alist' for details."
-  (let* ((empty-heading "-") index heading pos)
-    (save-excursion
-      ;; Headings
-      (goto-char (point-min))
-      (while (re-search-forward markdown-regex-header (point-max) t)
-        (when (and (not (markdown-code-block-at-point-p (line-beginning-position)))
-                   (not (markdown-text-property-at-point 'markdown-yaml-metadata-begin)))
-          (cond
-           ((setq heading (match-string-no-properties 1))
-            (setq pos (match-beginning 1)))
-           ((setq heading (match-string-no-properties 5))
-            (setq pos (match-beginning 4))))
-          (or (> (length heading) 0)
-              (setq heading empty-heading))
-          (setq index (append index (list (cons heading pos))))))
-      ;; Footnotes
-      (when markdown-add-footnotes-to-imenu
-        (nconc index (markdown-get-defined-footnotes)))
-      index)))
-
-
-;;; References ================================================================
-
-(defun markdown-reference-goto-definition ()
-  "Jump to the definition of the reference at point or create it."
-  (interactive)
-  (when (thing-at-point-looking-at markdown-regex-link-reference)
-    (let* ((text (match-string-no-properties 3))
-           (reference (match-string-no-properties 6))
-           (target (downcase (if (string= reference "") text reference)))
-           (loc (cadr (save-match-data (markdown-reference-definition target)))))
-      (if loc
-          (goto-char loc)
-        (goto-char (match-beginning 0))
-        (markdown-insert-reference-definition target)))))
-
-(defun markdown-reference-find-links (reference)
-  "Return a list of all links for REFERENCE.
-REFERENCE should not include the surrounding square brackets.
-Elements of the list have the form (text start line), where
-text is the link text, start is the location at the beginning of
-the link, and line is the line number on which the link appears."
-  (let* ((ref-quote (regexp-quote reference))
-         (regexp (format "!?\\(?:\\[\\(%s\\)\\][ ]?\\[\\]\\|\\[\\([^]]+?\\)\\][ ]?\\[%s\\]\\)"
-                         ref-quote ref-quote))
-         links)
-    (save-excursion
-      (goto-char (point-min))
-      (while (re-search-forward regexp nil t)
-        (let* ((text (or (match-string-no-properties 1)
-                         (match-string-no-properties 2)))
-               (start (match-beginning 0))
-               (line (markdown-line-number-at-pos)))
-          (cl-pushnew (list text start line) links :test #'equal))))
-    links))
-
-(defmacro markdown-for-all-refs (f)
-  `(let ((result))
-     (save-excursion
-       (goto-char (point-min))
-       (while
-           (re-search-forward markdown-regex-link-reference nil t)
-         (let* ((text (match-string-no-properties 3))
-                (reference (match-string-no-properties 6))
-                (target (downcase (if (string= reference "") text reference))))
-           (,f text target result))))
-     (reverse result)))
-
-(defmacro markdown-collect-always (_ target result)
-  `(cl-pushnew ,target ,result :test #'equal))
-
-(defmacro markdown-collect-undefined (text target result)
-  `(unless (markdown-reference-definition target)
-     (let ((entry (assoc ,target ,result)))
-       (if (not entry)
-           (cl-pushnew
-            (cons ,target (list (cons ,text (markdown-line-number-at-pos))))
-            ,result :test #'equal)
-         (setcdr entry
-                 (append (cdr entry) (list (cons ,text (markdown-line-number-at-pos)))))))))
-
-(defun markdown-get-all-refs ()
-  "Return a list of all Markdown references."
-  (markdown-for-all-refs markdown-collect-always))
-
-(defun markdown-get-undefined-refs ()
-  "Return a list of undefined Markdown references.
-Result is an alist of pairs (reference . occurrences), where
-occurrences is itself another alist of pairs (label . line-number).
-For example, an alist corresponding to [Nice editor][Emacs] at line 12,
-\[GNU Emacs][Emacs] at line 45 and [manual][elisp] at line 127 is
-\((\"emacs\" (\"Nice editor\" . 12) (\"GNU Emacs\" . 45)) (\"elisp\" (\"manual\" . 127)))."
-  (markdown-for-all-refs markdown-collect-undefined))
-
-(defun markdown-get-unused-refs ()
-  (cl-sort
-   (cl-set-difference
-    (markdown-get-defined-references) (markdown-get-all-refs)
-    :test (lambda (e1 e2) (equal (car e1) e2)))
-   #'< :key #'cdr))
-
-(defmacro defun-markdown-buffer (name docstring)
-  "Define a function to name and return a buffer.
-
-By convention, NAME must be a name of a string constant with
-%buffer% placeholder used to name the buffer, and will also be
-used as a name of the function defined.
-
-DOCSTRING will be used as the first part of the docstring."
-  `(defun ,name (&optional buffer-name)
-     ,(concat docstring "\n\nBUFFER-NAME is the name of the main buffer being visited.")
-     (or buffer-name (setq buffer-name (buffer-name)))
-     (let ((refbuf (get-buffer-create (replace-regexp-in-string
-                                       "%buffer%" buffer-name
-                                       ,name))))
-       (with-current-buffer refbuf
-         (when view-mode
-           (View-exit-and-edit))
-         (use-local-map button-buffer-map)
-         (erase-buffer))
-       refbuf)))
-
-(defconst markdown-reference-check-buffer
-  "*Undefined references for %buffer%*"
-  "Pattern for name of buffer for listing undefined references.
-The string %buffer% will be replaced by the corresponding
-`markdown-mode' buffer name.")
-
-(defun-markdown-buffer
-  markdown-reference-check-buffer
-  "Name and return buffer for reference checking.")
-
-(defconst markdown-unused-references-buffer
-  "*Unused references for %buffer%*"
-  "Pattern for name of buffer for listing unused references.
-The string %buffer% will be replaced by the corresponding
-`markdown-mode' buffer name.")
-
-(defun-markdown-buffer
-  markdown-unused-references-buffer
-  "Name and return buffer for unused reference checking.")
-
-(defconst markdown-reference-links-buffer
-  "*Reference links for %buffer%*"
-  "Pattern for name of buffer for listing references.
-The string %buffer% will be replaced by the corresponding buffer name.")
-
-(defun-markdown-buffer
-  markdown-reference-links-buffer
-  "Name, setup, and return a buffer for listing links.")
-
-;; Add an empty Markdown reference definition to buffer
-;; specified in the 'target-buffer property.  The reference name is
-;; the button's label.
-(define-button-type 'markdown-undefined-reference-button
-  'help-echo "mouse-1, RET: create definition for undefined reference"
-  'follow-link t
-  'face 'bold
-  'action (lambda (b)
-            (let ((buffer (button-get b 'target-buffer))
-                  (line (button-get b 'target-line))
-                  (label (button-label b)))
-              (switch-to-buffer-other-window buffer)
-              (goto-char (point-min))
-              (forward-line line)
-              (markdown-insert-reference-definition label)
-              (markdown-check-refs t))))
-
-;; Jump to line in buffer specified by 'target-buffer property.
-;; Line number is button's 'target-line property.
-(define-button-type 'markdown-goto-line-button
-  'help-echo "mouse-1, RET: go to line"
-  'follow-link t
-  'face 'italic
-  'action (lambda (b)
-            (switch-to-buffer-other-window (button-get b 'target-buffer))
-            ;; use call-interactively to silence compiler
-            (let ((current-prefix-arg (button-get b 'target-line)))
-              (call-interactively 'goto-line))))
-
-;; Kill a line in buffer specified by 'target-buffer property.
-;; Line number is button's 'target-line property.
-(define-button-type 'markdown-kill-line-button
-  'help-echo "mouse-1, RET: kill line"
-  'follow-link t
-  'face 'italic
-  'action (lambda (b)
-            (switch-to-buffer-other-window (button-get b 'target-buffer))
-            ;; use call-interactively to silence compiler
-            (let ((current-prefix-arg (button-get b 'target-line)))
-              (call-interactively 'goto-line))
-            (kill-line 1)
-            (markdown-unused-refs t)))
-
-;; Jumps to a particular link at location given by 'target-char
-;; property in buffer given by 'target-buffer property.
-(define-button-type 'markdown-location-button
-  'help-echo "mouse-1, RET: jump to location of link"
-  'follow-link t
-  'face 'bold
-  'action (lambda (b)
-            (let ((target (button-get b 'target-buffer))
-                  (loc (button-get b 'target-char)))
-              (kill-buffer-and-window)
-              (switch-to-buffer target)
-              (goto-char loc))))
-
-(defun markdown-insert-undefined-reference-button (reference oldbuf)
-  "Insert a button for creating REFERENCE in buffer OLDBUF.
-REFERENCE should be a list of the form (reference . occurrences),
-as returned by `markdown-get-undefined-refs'."
-  (let ((label (car reference)))
-    ;; Create a reference button
-    (insert-button label
-                   :type 'markdown-undefined-reference-button
-                   'target-buffer oldbuf
-                   'target-line (cdr (car (cdr reference))))
-    (insert " (")
-    (dolist (occurrence (cdr reference))
-      (let ((line (cdr occurrence)))
-        ;; Create a line number button
-        (insert-button (number-to-string line)
-                       :type 'markdown-goto-line-button
-                       'target-buffer oldbuf
-                       'target-line line)
-        (insert " ")))
-    (delete-char -1)
-    (insert ")")
-    (newline)))
-
-(defun markdown-insert-unused-reference-button (reference oldbuf)
-  "Insert a button for creating REFERENCE in buffer OLDBUF.
-REFERENCE must be a pair of (ref . line-number)."
-  (let ((label (car reference))
-        (line (cdr reference)))
-    ;; Create a reference button
-    (insert-button label
-                   :type 'markdown-goto-line-button
-                   'face 'bold
-                   'target-buffer oldbuf
-                   'target-line line)
-    (insert (format " (%d) [" line))
-    (insert-button "X"
-                   :type 'markdown-kill-line-button
-                   'face 'bold
-                   'target-buffer oldbuf
-                   'target-line line)
-    (insert "]")
-    (newline)))
-
-(defun markdown-insert-link-button (link oldbuf)
-  "Insert a button for jumping to LINK in buffer OLDBUF.
-LINK should be a list of the form (text char line) containing
-the link text, location, and line number."
-  (let ((label (cl-first link))
-        (char (cl-second link))
-        (line (cl-third link)))
-    ;; Create a reference button
-    (insert-button label
-                   :type 'markdown-location-button
-                   'target-buffer oldbuf
-                   'target-char char)
-    (insert (format " (line %d)\n" line))))
-
-(defun markdown-reference-goto-link (&optional reference)
-  "Jump to the location of the first use of REFERENCE."
-  (interactive)
-  (unless reference
-    (if (thing-at-point-looking-at markdown-regex-reference-definition)
-        (setq reference (match-string-no-properties 2))
-      (user-error "No reference definition at point")))
-  (let ((links (markdown-reference-find-links reference)))
-    (cond ((= (length links) 1)
-           (goto-char (cadr (car links))))
-          ((> (length links) 1)
-           (let ((oldbuf (current-buffer))
-                 (linkbuf (markdown-reference-links-buffer)))
-             (with-current-buffer linkbuf
-               (insert "Links using reference " reference ":\n\n")
-               (dolist (link (reverse links))
-                 (markdown-insert-link-button link oldbuf)))
-             (view-buffer-other-window linkbuf)
-             (goto-char (point-min))
-             (forward-line 2)))
-          (t
-           (error "No links for reference %s" reference)))))
-
-(defmacro defun-markdown-ref-checker
-    (name docstring checker-function buffer-function none-message buffer-header insert-reference)
-  "Define a function NAME acting on result of CHECKER-FUNCTION.
-
-DOCSTRING is used as a docstring for the defined function.
-
-BUFFER-FUNCTION should name and return an auxiliary buffer to put
-results in.
-
-NONE-MESSAGE is used when CHECKER-FUNCTION returns no results.
-
-BUFFER-HEADER is put into the auxiliary buffer first, followed by
-calling INSERT-REFERENCE for each element in the list returned by
-CHECKER-FUNCTION."
-  `(defun ,name (&optional silent)
-     ,(concat
-       docstring
-       "\n\nIf SILENT is non-nil, do not message anything when no
-such references found.")
-     (interactive "P")
-     (unless (derived-mode-p 'markdown-mode)
-       (user-error "Not available in current mode"))
-     (let ((oldbuf (current-buffer))
-           (refs (,checker-function))
-           (refbuf (,buffer-function)))
-       (if (null refs)
-           (progn
-             (when (not silent)
-               (message ,none-message))
-             (kill-buffer refbuf))
-         (with-current-buffer refbuf
-           (insert ,buffer-header)
-           (dolist (ref refs)
-             (,insert-reference ref oldbuf))
-           (view-buffer-other-window refbuf)
-           (goto-char (point-min))
-           (forward-line 2))))))
-
-(defun-markdown-ref-checker
-  markdown-check-refs
-  "Show all undefined Markdown references in current `markdown-mode' buffer.
-
-Links which have empty reference definitions are considered to be
-defined."
-  markdown-get-undefined-refs
-  markdown-reference-check-buffer
-  "No undefined references found"
-  "The following references are undefined:\n\n"
-  markdown-insert-undefined-reference-button)
-
-
-(defun-markdown-ref-checker
-  markdown-unused-refs
-  "Show all unused Markdown references in current `markdown-mode' buffer."
-  markdown-get-unused-refs
-  markdown-unused-references-buffer
-  "No unused references found"
-  "The following references are unused:\n\n"
-  markdown-insert-unused-reference-button)
-
-
-
-;;; Lists =====================================================================
-
-(defun markdown-insert-list-item (&optional arg)
-  "Insert a new list item.
-If the point is inside unordered list, insert a bullet mark.  If
-the point is inside ordered list, insert the next number followed
-by a period.  Use the previous list item to determine the amount
-of whitespace to place before and after list markers.
-
-With a \\[universal-argument] prefix (i.e., when ARG is (4)),
-decrease the indentation by one level.
-
-With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
-increase the indentation by one level."
-  (interactive "p")
-  (let (bounds cur-indent marker indent new-indent new-loc)
-    (save-match-data
-      ;; Look for a list item on current or previous non-blank line
-      (save-excursion
-        (while (and (not (setq bounds (markdown-cur-list-item-bounds)))
-                    (not (bobp))
-                    (markdown-cur-line-blank-p))
-          (forward-line -1)))
-      (when bounds
-        (cond ((save-excursion
-                 (skip-chars-backward " \t")
-                 (looking-at-p markdown-regex-list))
-               (beginning-of-line)
-               (insert "\n")
-               (forward-line -1))
-              ((not (markdown-cur-line-blank-p))
-               (newline)))
-        (setq new-loc (point)))
-      ;; Look ahead for a list item on next non-blank line
-      (unless bounds
-        (save-excursion
-          (while (and (null bounds)
-                      (not (eobp))
-                      (markdown-cur-line-blank-p))
-            (forward-line)
-            (setq bounds (markdown-cur-list-item-bounds))))
-        (when bounds
-          (setq new-loc (point))
-          (unless (markdown-cur-line-blank-p)
-            (newline))))
-      (if (not bounds)
-          ;; When not in a list, start a new unordered one
-          (progn
-            (unless (markdown-cur-line-blank-p)
-              (insert "\n"))
-            (insert markdown-unordered-list-item-prefix))
-        ;; Compute indentation and marker for new list item
-        (setq cur-indent (nth 2 bounds))
-        (setq marker (nth 4 bounds))
-        ;; If current item is a GFM checkbox, insert new unchecked checkbox.
-        (when (nth 5 bounds)
-          (setq marker
-                (concat marker
-                        (replace-regexp-in-string "[Xx]" " " (nth 5 bounds)))))
-        (cond
-         ;; Dedent: decrement indentation, find previous marker.
-         ((= arg 4)
-          (setq indent (max (- cur-indent markdown-list-indent-width) 0))
-          (let ((prev-bounds
-                 (save-excursion
-                   (goto-char (nth 0 bounds))
-                   (when (markdown-up-list)
-                     (markdown-cur-list-item-bounds)))))
-            (when prev-bounds
-              (setq marker (nth 4 prev-bounds)))))
-         ;; Indent: increment indentation by 4, use same marker.
-         ((= arg 16) (setq indent (+ cur-indent markdown-list-indent-width)))
-         ;; Same level: keep current indentation and marker.
-         (t (setq indent cur-indent)))
-        (setq new-indent (make-string indent 32))
-        (goto-char new-loc)
-        (cond
-         ;; Ordered list
-         ((string-match-p "[0-9]" marker)
-          (if (= arg 16) ;; starting a new column indented one more level
-              (insert (concat new-indent "1. "))
-            ;; Don't use previous match-data
-            (set-match-data nil)
-            ;; travel up to the last item and pick the correct number.  If
-            ;; the argument was nil, "new-indent = cur-indent" is the same,
-            ;; so we don't need special treatment. Neat.
-            (save-excursion
-              (while (and (not (looking-at (concat new-indent "\\([0-9]+\\)\\(\\.[ \t]*\\)")))
-                          (>= (forward-line -1) 0))))
-            (let* ((old-prefix (match-string 1))
-                   (old-spacing (match-string 2))
-                   (new-prefix (if (and old-prefix markdown-ordered-list-enumeration)
-                                   (int-to-string (1+ (string-to-number old-prefix)))
-                                 "1"))
-                   (space-adjust (- (length old-prefix) (length new-prefix)))
-                   (new-spacing (if (and (match-string 2)
-                                         (not (string-match-p "\t" old-spacing))
-                                         (< space-adjust 0)
-                                         (> space-adjust (- 1 (length (match-string 2)))))
-                                    (substring (match-string 2) 0 space-adjust)
-                                  (or old-spacing ". "))))
-              (insert (concat new-indent new-prefix new-spacing)))))
-         ;; Unordered list, GFM task list, or ordered list with hash mark
-         ((string-match-p "[\\*\\+-]\\|#\\." marker)
-          (insert new-indent marker))))
-      ;; Propertize the newly inserted list item now
-      (markdown-syntax-propertize-list-items (line-beginning-position) (line-end-position)))))
-
-(defun markdown-move-list-item-up ()
-  "Move the current list item up in the list when possible.
-In nested lists, move child items with the parent item."
-  (interactive)
-  (let (cur prev old)
-    (when (setq cur (markdown-cur-list-item-bounds))
-      (setq old (point))
-      (goto-char (nth 0 cur))
-      (if (markdown-prev-list-item (nth 3 cur))
-          (progn
-            (setq prev (markdown-cur-list-item-bounds))
-            (condition-case nil
-                (progn
-                  (transpose-regions (nth 0 prev) (nth 1 prev)
-                                     (nth 0 cur) (nth 1 cur) t)
-                  (goto-char (+ (nth 0 prev) (- old (nth 0 cur)))))
-              ;; Catch error in case regions overlap.
-              (error (goto-char old))))
-        (goto-char old)))))
-
-(defun markdown-move-list-item-down ()
-  "Move the current list item down in the list when possible.
-In nested lists, move child items with the parent item."
-  (interactive)
-  (let (cur next old)
-    (when (setq cur (markdown-cur-list-item-bounds))
-      (setq old (point))
-      (if (markdown-next-list-item (nth 3 cur))
-          (progn
-            (setq next (markdown-cur-list-item-bounds))
-            (condition-case nil
-                (progn
-                  (transpose-regions (nth 0 cur) (nth 1 cur)
-                                     (nth 0 next) (nth 1 next) nil)
-                  (goto-char (+ old (- (nth 1 next) (nth 1 cur)))))
-              ;; Catch error in case regions overlap.
-              (error (goto-char old))))
-        (goto-char old)))))
-
-(defun markdown-demote-list-item (&optional bounds)
-  "Indent (or demote) the current list item.
-Optionally, BOUNDS of the current list item may be provided if available.
-In nested lists, demote child items as well."
-  (interactive)
-  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
-    (save-excursion
-      (let* ((item-start (set-marker (make-marker) (nth 0 bounds)))
-             (item-end (set-marker (make-marker) (nth 1 bounds)))
-             (list-start (progn (markdown-beginning-of-list)
-                                (set-marker (make-marker) (point))))
-             (list-end (progn (markdown-end-of-list)
-                              (set-marker (make-marker) (point)))))
-        (goto-char item-start)
-        (while (< (point) item-end)
-          (unless (markdown-cur-line-blank-p)
-            (insert (make-string markdown-list-indent-width ? )))
-          (forward-line))
-        (markdown-syntax-propertize-list-items list-start list-end)))))
-
-(defun markdown-promote-list-item (&optional bounds)
-  "Unindent (or promote) the current list item.
-Optionally, BOUNDS of the current list item may be provided if available.
-In nested lists, demote child items as well."
-  (interactive)
-  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
-    (save-excursion
-      (save-match-data
-        (let ((item-start (set-marker (make-marker) (nth 0 bounds)))
-              (item-end (set-marker (make-marker) (nth 1 bounds)))
-              (list-start (progn (markdown-beginning-of-list)
-                                 (set-marker (make-marker) (point))))
-              (list-end (progn (markdown-end-of-list)
-                               (set-marker (make-marker) (point))))
-              num regexp)
-          (goto-char item-start)
-          (when (looking-at (format "^[ ]\\{1,%d\\}"
-                                    markdown-list-indent-width))
-            (setq num (- (match-end 0) (match-beginning 0)))
-            (setq regexp (format "^[ ]\\{1,%d\\}" num))
-            (while (and (< (point) item-end)
-                        (re-search-forward regexp item-end t))
-              (replace-match "" nil nil)
-              (forward-line))
-            (markdown-syntax-propertize-list-items list-start list-end)))))))
-
-(defun markdown-cleanup-list-numbers-level (&optional pfx prev-item)
-  "Update the numbering for level PFX (as a string of spaces) and PREV-ITEM.
-PREV-ITEM is width of previous-indentation and list number
-
-Assume that the previously found match was for a numbered item in
-a list."
-  (let ((cpfx pfx)
-        (cur-item nil)
-        (idx 0)
-        (continue t)
-        (step t)
-        (sep nil))
-    (while (and continue (not (eobp)))
-      (setq step t)
-      (cond
-       ((looking-at "^\\(\\([\s-]*\\)[0-9]+\\)\\. ")
-        (setq cpfx (match-string-no-properties 2))
-        (setq cur-item (match-string-no-properties 1)) ;; indentation and list marker
-        (cond
-         ((or (= (length cpfx) (length pfx))
-              (= (length cur-item) (length prev-item)))
-          (save-excursion
-            (replace-match
-             (if (not markdown-ordered-list-enumeration)
-                 (concat pfx "1. ")
-               (cl-incf idx)
-               (concat pfx (number-to-string idx) ". "))))
-          (setq sep nil))
-         ;; indented a level
-         ((< (length pfx) (length cpfx))
-          (setq sep (markdown-cleanup-list-numbers-level cpfx cur-item))
-          (setq step nil))
-         ;; exit the loop
-         (t
-          (setq step nil)
-          (setq continue nil))))
-
-       ((looking-at "^\\([\s-]*\\)[^ \t\n\r].*$")
-        (setq cpfx (match-string-no-properties 1))
-        (cond
-         ;; reset if separated before
-         ((string= cpfx pfx) (when sep (setq idx 0)))
-         ((string< cpfx pfx)
-          (setq step nil)
-          (setq continue nil))))
-       (t (setq sep t)))
-
-      (when step
-        (beginning-of-line)
-        (setq continue (= (forward-line) 0))))
-    sep))
-
-(defun markdown-cleanup-list-numbers ()
-  "Update the numbering of ordered lists."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (markdown-cleanup-list-numbers-level "")))
-
-
-;;; Movement ==================================================================
-
-;; This function was originally derived from `org-beginning-of-line' from org.el.
-(defun markdown-beginning-of-line (&optional n)
-  "Go to the beginning of the current visible line.
-
-If this is a headline, and `markdown-special-ctrl-a/e' is not nil
-or symbol `reversed', on the first attempt move to where the
-headline text hashes, and only move to beginning of line when the
-cursor is already before the hashes of the text of the headline.
-
-If `markdown-special-ctrl-a/e' is symbol `reversed' then go to
-the hashes of the text on the second attempt.
-
-With argument N not nil or 1, move forward N - 1 lines first."
-  (interactive "^p")
-  (let ((origin (point))
-        (special (pcase markdown-special-ctrl-a/e
-                   (`(,C-a . ,_) C-a) (_ markdown-special-ctrl-a/e)))
-        deactivate-mark)
-    ;; First move to a visible line.
-    (if visual-line-mode
-        (beginning-of-visual-line n)
-      (move-beginning-of-line n)
-      ;; `move-beginning-of-line' may leave point after invisible
-      ;; characters if line starts with such of these (e.g., with
-      ;; a link at column 0).  Really move to the beginning of the
-      ;; current visible line.
-      (forward-line 0))
-    (cond
-     ;; No special behavior.  Point is already at the beginning of
-     ;; a line, logical or visual.
-     ((not special))
-     ;; `beginning-of-visual-line' left point before logical beginning
-     ;; of line: point is at the beginning of a visual line.  Bail
-     ;; out.
-     ((and visual-line-mode (not (bolp))))
-     ((looking-at markdown-regex-header-atx)
-      ;; At a header, special position is before the title.
-      (let ((refpos (match-beginning 2))
-            (bol (point)))
-        (if (eq special 'reversed)
-            (when (and (= origin bol) (eq last-command this-command))
-              (goto-char refpos))
-          (when (or (> origin refpos) (<= origin bol))
-            (goto-char refpos)))
-        ;; Prevent automatic cursor movement caused by the command loop.
-        ;; Enable disable-point-adjustment to avoid unintended cursor repositioning.
-        (when (and markdown-hide-markup
-                   (equal (get-char-property (point) 'display) ""))
-          (setq disable-point-adjustment t))))
-     ((looking-at markdown-regex-list)
-      ;; At a list item, special position is after the list marker or checkbox.
-      (let ((refpos (or (match-end 4) (match-end 3))))
-        (if (eq special 'reversed)
-            (when (and (= (point) origin) (eq last-command this-command))
-              (goto-char refpos))
-          (when (or (> origin refpos) (<= origin (line-beginning-position)))
-          (goto-char refpos)))))
-     ;; No special case, already at beginning of line.
-     (t nil))))
-
-;; This function was originally derived from `org-end-of-line' from org.el.
-(defun markdown-end-of-line (&optional n)
-  "Go to the end of the line, but before ellipsis, if any.
-
-If this is a headline, and `markdown-special-ctrl-a/e' is not nil
-or symbol `reversed', ignore closing tags on the first attempt,
-and only move to after the closing tags when the cursor is
-already beyond the end of the headline.
-
-If `markdown-special-ctrl-a/e' is symbol `reversed' then ignore
-closing tags on the second attempt.
-
-With argument N not nil or 1, move forward N - 1 lines first."
-  (interactive "^p")
-  (let ((origin (point))
-        (special (pcase markdown-special-ctrl-a/e
-                   (`(,_ . ,C-e) C-e) (_ markdown-special-ctrl-a/e)))
-        deactivate-mark)
-    ;; First move to a visible line.
-    (if visual-line-mode
-        (beginning-of-visual-line n)
-      (move-beginning-of-line n))
-    (cond
-     ;; At a headline, with closing tags.
-     ((save-excursion
-        (forward-line 0)
-        (and (looking-at markdown-regex-header-atx) (match-end 3)))
-      (let ((refpos (match-end 2))
-            (visual-end (and visual-line-mode
-                             (save-excursion
-                               (end-of-visual-line)
-                               (point)))))
-        ;; If `end-of-visual-line' brings us before end of line or even closing
-        ;; tags, i.e., the headline spans over multiple visual lines, move
-        ;; there.
-        (cond ((and visual-end
-                    (< visual-end refpos)
-                    (<= origin visual-end))
-               (goto-char visual-end))
-              ((not special) (end-of-line))
-              ((eq special 'reversed)
-               (if (and (= origin (line-end-position))
-                        (eq this-command last-command))
-                   (goto-char refpos)
-                 (end-of-line)))
-              (t
-               (if (or (< origin refpos) (>= origin (line-end-position)))
-                   (goto-char refpos)
-                 (end-of-line))))
-        ;; Prevent automatic cursor movement caused by the command loop.
-        ;; Enable disable-point-adjustment to avoid unintended cursor repositioning.
-        (when (and markdown-hide-markup
-                   (equal (get-char-property (point) 'display) ""))
-          (setq disable-point-adjustment t))))
-     (visual-line-mode
-      (let ((bol (line-beginning-position)))
-        (end-of-visual-line)
-        ;; If `end-of-visual-line' gets us past the ellipsis at the
-        ;; end of a line, backtrack and use `end-of-line' instead.
-        (when (/= bol (line-beginning-position))
-          (goto-char bol)
-          (end-of-line))))
-     (t (end-of-line)))))
-
-(defun markdown-beginning-of-defun (&optional arg)
-  "`beginning-of-defun-function' for Markdown.
-This is used to find the beginning of the defun and should behave
-like ‘beginning-of-defun’, returning non-nil if it found the
-beginning of a defun.  It moves the point backward, right before a
-heading which defines a defun.  When ARG is non-nil, repeat that
-many times.  When ARG is negative, move forward to the ARG-th
-following section."
-  (or arg (setq arg 1))
-  (when (< arg 0) (end-of-line))
-  ;; Adjust position for setext headings.
-  (when (and (thing-at-point-looking-at markdown-regex-header-setext)
-             (not (= (point) (match-beginning 0)))
-             (not (markdown-code-block-at-point-p)))
-    (goto-char (match-end 0)))
-  (let (found)
-    ;; Move backward with positive argument.
-    (while (and (not (bobp)) (> arg 0))
-      (setq found nil)
-      (while (and (not found)
-                  (not (bobp))
-                  (re-search-backward markdown-regex-header nil 'move))
-        (markdown-code-block-at-pos (match-beginning 0))
-        (setq found (match-beginning 0)))
-      (setq arg (1- arg)))
-    ;; Move forward with negative argument.
-    (while (and (not (eobp)) (< arg 0))
-      (setq found nil)
-      (while (and (not found)
-                  (not (eobp))
-                  (re-search-forward markdown-regex-header nil 'move))
-        (markdown-code-block-at-pos (match-beginning 0))
-        (setq found (match-beginning 0)))
-      (setq arg (1+ arg)))
-    (when found
-      (beginning-of-line)
-      t)))
-
-(defun markdown-end-of-defun ()
-  "`end-of-defun-function’ for Markdown.
-This is used to find the end of the defun at point.
-It is called with no argument, right after calling ‘beginning-of-defun-raw’,
-so it can assume that point is at the beginning of the defun body.
-It should move point to the first position after the defun."
-  (or (eobp) (forward-char 1))
-  (let (found)
-    (while (and (not found)
-                (not (eobp))
-                (re-search-forward markdown-regex-header nil 'move))
-      (when (not (markdown-code-block-at-pos (match-beginning 0)))
-        (setq found (match-beginning 0))))
-    (when found
-      (goto-char found)
-      (skip-syntax-backward "-"))))
-
-(defun markdown-beginning-of-text-block ()
-  "Move backward to previous beginning of a plain text block.
-This function simply looks for blank lines without considering
-the surrounding context in light of Markdown syntax.  For that, see
-`markdown-backward-block'."
-  (interactive)
-  (let ((start (point)))
-    (if (re-search-backward markdown-regex-block-separator nil t)
-        (goto-char (match-end 0))
-      (goto-char (point-min)))
-    (when (and (= start (point)) (not (bobp)))
-      (forward-line -1)
-      (if (re-search-backward markdown-regex-block-separator nil t)
-          (goto-char (match-end 0))
-        (goto-char (point-min))))))
-
-(defun markdown-end-of-text-block ()
-  "Move forward to next beginning of a plain text block.
-This function simply looks for blank lines without considering
-the surrounding context in light of Markdown syntax.  For that, see
-`markdown-forward-block'."
-  (interactive)
-  (beginning-of-line)
-  (skip-chars-forward " \t\n")
-  (when (= (point) (point-min))
-    (forward-char))
-  (if (re-search-forward markdown-regex-block-separator nil t)
-      (goto-char (match-end 0))
-    (goto-char (point-max)))
-  (skip-chars-backward " \t\n")
-  (forward-line))
-
-(defun markdown-backward-paragraph (&optional arg)
-  "Move the point to the start of the current paragraph.
-With argument ARG, do it ARG times; a negative argument ARG = -N
-means move forward N blocks."
-  (interactive "^p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (markdown-forward-paragraph (- arg))
-    (dotimes (_ arg)
-      ;; Skip over whitespace in between paragraphs when moving backward.
-      (skip-chars-backward " \t\n")
-      (beginning-of-line)
-      ;; Skip over code block endings.
-      (when (markdown-range-properties-exist
-             (line-beginning-position) (line-end-position)
-             '(markdown-gfm-block-end
-               markdown-tilde-fence-end))
-        (forward-line -1))
-      ;; Skip over blank lines inside blockquotes.
-      (while (and (not (eobp))
-                  (looking-at markdown-regex-blockquote)
-                  (= (length (match-string 3)) 0))
-        (forward-line -1))
-      ;; Proceed forward based on the type of block of paragraph.
-      (let (bounds skip)
-        (cond
-         ;; Blockquotes
-         ((looking-at markdown-regex-blockquote)
-          (while (and (not (bobp))
-                      (looking-at markdown-regex-blockquote)
-                      (> (length (match-string 3)) 0)) ;; not blank
-            (forward-line -1))
-          (forward-line))
-         ;; List items
-         ((setq bounds (markdown-cur-list-item-bounds))
-          (goto-char (nth 0 bounds)))
-         ;; Other
-         (t
-          (while (and (not (bobp))
-                      (not skip)
-                      (not (markdown-cur-line-blank-p))
-                      (not (looking-at markdown-regex-blockquote))
-                      (not (markdown-range-properties-exist
-                            (line-beginning-position) (line-end-position)
-                            '(markdown-gfm-block-end
-                              markdown-tilde-fence-end))))
-            (setq skip (markdown-range-properties-exist
-                        (line-beginning-position) (line-end-position)
-                        '(markdown-gfm-block-begin
-                          markdown-tilde-fence-begin)))
-            (forward-line -1))
-          (unless (bobp)
-            (forward-line 1))))))))
-
-(defun markdown-forward-paragraph (&optional arg)
-  "Move forward to the next end of a paragraph.
-With argument ARG, do it ARG times; a negative argument ARG = -N
-means move backward N blocks."
-  (interactive "^p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (markdown-backward-paragraph (- arg))
-    (dotimes (_ arg)
-      ;; Skip whitespace in between paragraphs.
-      (when (markdown-cur-line-blank-p)
-        (skip-syntax-forward "-")
-        (beginning-of-line))
-      ;; Proceed forward based on the type of block.
-      (let (bounds skip)
-        (cond
-         ;; Blockquotes
-         ((looking-at markdown-regex-blockquote)
-          ;; Skip over blank lines inside blockquotes.
-          (while (and (not (eobp))
-                      (looking-at markdown-regex-blockquote)
-                      (= (length (match-string 3)) 0))
-            (forward-line))
-          ;; Move to end of quoted text block
-          (while (and (not (eobp))
-                      (looking-at markdown-regex-blockquote)
-                      (> (length (match-string 3)) 0)) ;; not blank
-            (forward-line)))
-         ;; List items
-         ((and (markdown-cur-list-item-bounds)
-               (setq bounds (markdown-next-list-item-bounds)))
-          (goto-char (nth 0 bounds)))
-         ;; Other
-         (t
-          (forward-line)
-          (while (and (not (eobp))
-                      (not skip)
-                      (not (markdown-cur-line-blank-p))
-                      (not (looking-at markdown-regex-blockquote))
-                      (not (markdown-range-properties-exist
-                            (line-beginning-position) (line-end-position)
-                            '(markdown-gfm-block-begin
-                              markdown-tilde-fence-begin))))
-            (setq skip (markdown-range-properties-exist
-                        (line-beginning-position) (line-end-position)
-                        '(markdown-gfm-block-end
-                          markdown-tilde-fence-end)))
-            (forward-line))))))))
-
-(defun markdown-backward-block (&optional arg)
-  "Move the point to the start of the current Markdown block.
-Moves across complete code blocks, list items, and blockquotes,
-but otherwise stops at blank lines, headers, and horizontal
-rules.  With argument ARG, do it ARG times; a negative argument
-ARG = -N means move forward N blocks."
-  (interactive "^p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (markdown-forward-block (- arg))
-    (dotimes (_ arg)
-      ;; Skip over whitespace in between blocks when moving backward,
-      ;; unless at a block boundary with no whitespace.
-      (skip-syntax-backward "-")
-      (beginning-of-line)
-      ;; Proceed forward based on the type of block.
-      (cond
-       ;; Code blocks
-       ((and (markdown-code-block-at-pos (point)) ;; this line
-             (markdown-code-block-at-pos (line-beginning-position 0))) ;; previous line
-        (forward-line -1)
-        (while (and (markdown-code-block-at-point-p) (not (bobp)))
-          (forward-line -1))
-        (forward-line))
-       ;; Headings
-       ((markdown-heading-at-point)
-        (goto-char (match-beginning 0)))
-       ;; Horizontal rules
-       ((looking-at markdown-regex-hr))
-       ;; Blockquotes
-       ((looking-at markdown-regex-blockquote)
-        (forward-line -1)
-        (while (and (looking-at markdown-regex-blockquote)
-                    (not (bobp)))
-          (forward-line -1))
-        (forward-line))
-       ;; List items
-       ((markdown-cur-list-item-bounds)
-        (markdown-beginning-of-list))
-       ;; Other
-       (t
-        ;; Move forward in case it is a one line regular paragraph.
-        (unless (markdown-next-line-blank-p)
-          (forward-line))
-        (unless (markdown-prev-line-blank-p)
-          (markdown-backward-paragraph)))))))
-
-(defun markdown-forward-block (&optional arg)
-  "Move forward to the next end of a Markdown block.
-Moves across complete code blocks, list items, and blockquotes,
-but otherwise stops at blank lines, headers, and horizontal
-rules.  With argument ARG, do it ARG times; a negative argument
-ARG = -N means move backward N blocks."
-  (interactive "^p")
-  (or arg (setq arg 1))
-  (if (< arg 0)
-      (markdown-backward-block (- arg))
-    (dotimes (_ arg)
-      ;; Skip over whitespace in between blocks when moving forward.
-      (if (markdown-cur-line-blank-p)
-          (skip-syntax-forward "-")
-        (beginning-of-line))
-      ;; Proceed forward based on the type of block.
-      (cond
-       ;; Code blocks
-       ((markdown-code-block-at-point-p)
-        (forward-line)
-        (while (and (markdown-code-block-at-point-p) (not (eobp)))
-          (forward-line)))
-       ;; Headings
-       ((looking-at markdown-regex-header)
-        (goto-char (or (match-end 4) (match-end 2) (match-end 3)))
-        (forward-line))
-       ;; Horizontal rules
-       ((looking-at markdown-regex-hr)
-        (forward-line))
-       ;; Blockquotes
-       ((looking-at markdown-regex-blockquote)
-        (forward-line)
-        (while (and (looking-at markdown-regex-blockquote) (not (eobp)))
-          (forward-line)))
-       ;; List items
-       ((markdown-cur-list-item-bounds)
-        (markdown-end-of-list)
-        (forward-line))
-       ;; Other
-       (t (markdown-forward-paragraph))))
-    (skip-syntax-backward "-")
-    (unless (eobp)
-      (forward-char 1))))
-
-(defun markdown-backward-page (&optional count)
-  "Move backward to boundary of the current toplevel section.
-With COUNT, repeat, or go forward if negative."
-  (interactive "p")
-  (or count (setq count 1))
-  (if (< count 0)
-      (markdown-forward-page (- count))
-    (skip-syntax-backward "-")
-    (or (markdown-back-to-heading-over-code-block t t)
-        (goto-char (point-min)))
-    (when (looking-at markdown-regex-header)
-      (let ((level (markdown-outline-level)))
-        (when (> level 1) (markdown-up-heading level))
-        (when (> count 1)
-          (condition-case nil
-              (markdown-backward-same-level (1- count))
-            (error (goto-char (point-min)))))))))
-
-(defun markdown-forward-page (&optional count)
-  "Move forward to boundary of the current toplevel section.
-With COUNT, repeat, or go backward if negative."
-  (interactive "p")
-  (or count (setq count 1))
-  (if (< count 0)
-      (markdown-backward-page (- count))
-    (if (markdown-back-to-heading-over-code-block t t)
-        (let ((level (markdown-outline-level)))
-          (when (> level 1) (markdown-up-heading level))
-          (condition-case nil
-              (markdown-forward-same-level count)
-            (error (goto-char (point-max)))))
-      (markdown-next-visible-heading 1))))
-
-(defun markdown-next-link ()
-  "Jump to next inline, reference, or wiki link.
-If successful, return point.  Otherwise, return nil.
-See `markdown-wiki-link-p' and `markdown-previous-wiki-link'."
-  (interactive)
-  (let ((opoint (point)))
-    (when (or (markdown-link-p) (markdown-wiki-link-p))
-      ;; At a link already, move past it.
-      (goto-char (+ (match-end 0) 1)))
-    ;; Search for the next wiki link and move to the beginning.
-    (while (and (re-search-forward (markdown-make-regex-link-generic) nil t)
-                (markdown-code-block-at-point-p)
-                (< (point) (point-max))))
-    (if (and (not (eq (point) opoint))
-             (or (markdown-link-p) (markdown-wiki-link-p)))
-        ;; Group 1 will move past non-escape character in wiki link regexp.
-        ;; Go to beginning of group zero for all other link types.
-        (goto-char (or (match-beginning 1) (match-beginning 0)))
-      (goto-char opoint)
-      nil)))
-
-(defun markdown-previous-link ()
-  "Jump to previous wiki link.
-If successful, return point.  Otherwise, return nil.
-See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
-  (interactive)
-  (let ((opoint (point)))
-    (while (and (re-search-backward (markdown-make-regex-link-generic) nil t)
-                (markdown-code-block-at-point-p)
-                (> (point) (point-min))))
-    (if (and (not (eq (point) opoint))
-             (or (markdown-link-p) (markdown-wiki-link-p)))
-        (goto-char (or (match-beginning 1) (match-beginning 0)))
-      (goto-char opoint)
-      nil)))
-
-
-;;; Outline ===================================================================
-
-(defun markdown-move-heading-common (move-fn &optional arg adjust)
-  "Wrapper for `outline-mode' functions to skip false positives.
-MOVE-FN is a function and ARG is its argument. For example,
-headings inside preformatted code blocks may match
-`outline-regexp' but should not be considered as headings.
-When ADJUST is non-nil, adjust the point for interactive calls
-to avoid leaving the point at invisible markup.  This adjustment
-generally should only be done for interactive calls, since other
-functions may expect the point to be at the beginning of the
-regular expression."
-  (let ((prev -1) (start (point)))
-    (if arg (funcall move-fn arg) (funcall move-fn))
-    (while (and (/= prev (point)) (markdown-code-block-at-point-p))
-      (setq prev (point))
-      (if arg (funcall move-fn arg) (funcall move-fn)))
-    ;; Adjust point for setext headings and invisible text.
-    (save-match-data
-      (when (and adjust (thing-at-point-looking-at markdown-regex-header))
-        (if markdown-hide-markup
-            ;; Move to beginning of heading text if markup is hidden.
-            (goto-char (or (match-beginning 1) (match-beginning 5)))
-          ;; Move to beginning of markup otherwise.
-          (goto-char (or (match-beginning 1) (match-beginning 4))))))
-    (if (= (point) start) nil (point))))
-
-(defun markdown-next-visible-heading (arg)
-  "Move to the next visible heading line of any level.
-With argument, repeats or can move backward if negative. ARG is
-passed to `outline-next-visible-heading'."
-  (interactive "p")
-  (markdown-move-heading-common #'outline-next-visible-heading arg 'adjust))
-
-(defun markdown-previous-visible-heading (arg)
-  "Move to the previous visible heading line of any level.
-With argument, repeats or can move backward if negative. ARG is
-passed to `outline-previous-visible-heading'."
-  (interactive "p")
-  (markdown-move-heading-common #'outline-previous-visible-heading arg 'adjust))
-
-(defun markdown-next-heading ()
-  "Move to the next heading line of any level."
-  (markdown-move-heading-common #'outline-next-heading))
-
-(defun markdown-previous-heading ()
-  "Move to the previous heading line of any level."
-  (markdown-move-heading-common #'outline-previous-heading))
-
-(defun markdown-back-to-heading-over-code-block (&optional invisible-ok no-error)
-  "Move back to the beginning of the previous heading.
-Returns t if the point is at a heading, the location if a heading
-was found, and nil otherwise.
-Only visible heading lines are considered, unless INVISIBLE-OK is
-non-nil.  Throw an error if there is no previous heading unless
-NO-ERROR is non-nil.
-Leaves match data intact for `markdown-regex-header'."
-  (beginning-of-line)
-  (or (and (markdown-heading-at-point)
-           (not (markdown-code-block-at-point-p)))
-      (let (found)
-        (save-excursion
-          (while (and (not found)
-                      (re-search-backward markdown-regex-header nil t))
-            (when (and (or invisible-ok (not (outline-invisible-p)))
-                       (not (markdown-code-block-at-point-p)))
-              (setq found (point))))
-          (if (not found)
-              (unless no-error (user-error "Before first heading"))
-            (setq found (point))))
-        (when found (goto-char found)))))
-
-(defun markdown-forward-same-level (arg)
-  "Move forward to the ARG'th heading at same level as this one.
-Stop at the first and last headings of a superior heading."
-  (interactive "p")
-  (markdown-back-to-heading-over-code-block)
-  (markdown-move-heading-common #'outline-forward-same-level arg 'adjust))
-
-(defun markdown-backward-same-level (arg)
-  "Move backward to the ARG'th heading at same level as this one.
-Stop at the first and last headings of a superior heading."
-  (interactive "p")
-  (markdown-back-to-heading-over-code-block)
-  (while (> arg 0)
-    (let ((point-to-move-to
-           (save-excursion
-             (markdown-move-heading-common #'outline-get-last-sibling nil 'adjust))))
-      (if point-to-move-to
-          (progn
-            (goto-char point-to-move-to)
-            (setq arg (1- arg)))
-        (user-error "No previous same-level heading")))))
-
-(defun markdown-up-heading (arg &optional interactive)
-  "Move to the visible heading line of which the present line is a subheading.
-With argument, move up ARG levels.  When called interactively (or
-INTERACTIVE is non-nil), also push the mark."
-  (interactive "p\np")
-  (and interactive (not (eq last-command 'markdown-up-heading))
-       (push-mark))
-  (markdown-move-heading-common #'outline-up-heading arg 'adjust))
-
-(defun markdown-back-to-heading (&optional invisible-ok)
-  "Move to previous heading line, or beg of this line if it's a heading.
-Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
-  (interactive)
-  (markdown-move-heading-common #'outline-back-to-heading invisible-ok))
-
-(defalias 'markdown-end-of-heading 'outline-end-of-heading)
-
-(defun markdown-on-heading-p ()
-  "Return non-nil if point is on a heading line."
-  (get-text-property (line-beginning-position) 'markdown-heading))
-
-(defun markdown-end-of-subtree (&optional invisible-OK)
-  "Move to the end of the current subtree.
-Only visible heading lines are considered, unless INVISIBLE-OK is
-non-nil.
-Derived from `org-end-of-subtree'."
-  (markdown-back-to-heading invisible-OK)
-  (let ((first t)
-        (level (markdown-outline-level)))
-    (while (and (not (eobp))
-                (or first (> (markdown-outline-level) level)))
-      (setq first nil)
-      (markdown-next-heading))
-    (if (memq (preceding-char) '(?\n ?\^M))
-        (progn
-          ;; Go to end of line before heading
-          (forward-char -1)
-          (if (memq (preceding-char) '(?\n ?\^M))
-              ;; leave blank line before heading
-              (forward-char -1)))))
-  (point))
-
-(defun markdown-outline-fix-visibility ()
-  "Hide any false positive headings that should not be shown.
-For example, headings inside preformatted code blocks may match
-`outline-regexp' but should not be shown as headings when cycling.
-Also, the ending --- line in metadata blocks appears to be a
-setext header, but should not be folded."
-  (save-excursion
-    (goto-char (point-min))
-    ;; Unhide any false positives in metadata blocks
-    (when (markdown-text-property-at-point 'markdown-yaml-metadata-begin)
-      (let ((body (progn (forward-line)
-                         (markdown-text-property-at-point
-                          'markdown-yaml-metadata-section))))
-        (when body
-          (let ((end (progn (goto-char (cl-second body))
-                            (markdown-text-property-at-point
-                             'markdown-yaml-metadata-end))))
-            (outline-flag-region (point-min) (1+ (cl-second end)) nil)))))
-    ;; Hide any false positives in code blocks
-    (unless (outline-on-heading-p)
-      (outline-next-visible-heading 1))
-    (while (< (point) (point-max))
-      (when (markdown-code-block-at-point-p)
-        (outline-flag-region (1- (line-beginning-position)) (line-end-position) t))
-      (outline-next-visible-heading 1))))
-
-(defvar markdown-cycle-global-status 1)
-(defvar markdown-cycle-subtree-status nil)
-
-(defun markdown-next-preface ()
-  (let (finish)
-    (while (and (not finish) (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
-                                                nil 'move))
-      (unless (markdown-code-block-at-point-p)
-        (goto-char (match-beginning 0))
-        (setq finish t))))
-  (when (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
-    (forward-char -1)))
-
-(defun markdown-show-entry ()
-  (save-excursion
-    (outline-back-to-heading t)
-    (outline-flag-region (1- (point))
-                         (progn
-                           (markdown-next-preface)
-                           (if (= 1 (- (point-max) (point)))
-                               (point-max)
-                             (point)))
-                         nil)))
-
-;; This function was originally derived from `org-cycle' from org.el.
-(defun markdown-cycle (&optional arg)
-  "Visibility cycling for Markdown mode.
-This function is called with a `\\[universal-argument]' or if ARG is t, perform
-global visibility cycling.  If the point is at an atx-style header, cycle
-visibility of the corresponding subtree.  Otherwise, indent the current line
- or insert a tab, as appropriate, by calling `indent-for-tab-command'."
-  (interactive "P")
-  (cond
-
-   ;; Global cycling
-   (arg
-    (cond
-     ;; Move from overview to contents
-     ((and (eq last-command this-command)
-           (eq markdown-cycle-global-status 2))
-      (outline-hide-sublevels 1)
-      (message "CONTENTS")
-      (setq markdown-cycle-global-status 3)
-      (markdown-outline-fix-visibility))
-     ;; Move from contents to all
-     ((and (eq last-command this-command)
-           (eq markdown-cycle-global-status 3))
-      (outline-show-all)
-      (message "SHOW ALL")
-      (setq markdown-cycle-global-status 1))
-     ;; Defaults to overview
-     (t
-      (outline-hide-body)
-      (message "OVERVIEW")
-      (setq markdown-cycle-global-status 2)
-      (markdown-outline-fix-visibility))))
-
-   ;; At a heading: rotate between three different views
-   ((save-excursion (beginning-of-line 1) (markdown-on-heading-p))
-    (markdown-back-to-heading)
-    (let ((goal-column 0) eoh eol eos)
-      ;; Determine boundaries
-      (save-excursion
-        (markdown-back-to-heading)
-        (save-excursion
-          (beginning-of-line 2)
-          (while (and (not (eobp)) ;; this is like `next-line'
-                      (get-char-property (1- (point)) 'invisible))
-            (beginning-of-line 2)) (setq eol (point)))
-        (markdown-end-of-heading)   (setq eoh (point))
-        (markdown-end-of-subtree t)
-        (skip-chars-forward " \t\n")
-        (beginning-of-line 1) ; in case this is an item
-        (setq eos (1- (point))))
-      ;; Find out what to do next and set `this-command'
-      (cond
-       ;; Nothing is hidden behind this heading
-       ((= eos eoh)
-        (message "EMPTY ENTRY")
-        (setq markdown-cycle-subtree-status nil))
-       ;; Entire subtree is hidden in one line: open it
-       ((>= eol eos)
-        (markdown-show-entry)
-        (outline-show-children)
-        (message "CHILDREN")
-        (setq markdown-cycle-subtree-status 'children))
-       ;; We just showed the children, now show everything.
-       ((and (eq last-command this-command)
-             (eq markdown-cycle-subtree-status 'children))
-        (outline-show-subtree)
-        (message "SUBTREE")
-        (setq markdown-cycle-subtree-status 'subtree))
-       ;; Default action: hide the subtree.
-       (t
-        (outline-hide-subtree)
-        (message "FOLDED")
-        (setq markdown-cycle-subtree-status 'folded)))))
-
-   ;; In a table, move forward by one cell
-   ((markdown-table-at-point-p)
-    (call-interactively #'markdown-table-forward-cell))
-
-   ;; Otherwise, indent as appropriate
-   (t
-    (indent-for-tab-command))))
-
-(defun markdown-shifttab ()
-  "Handle S-TAB keybinding based on context.
-When in a table, move backward one cell.
-Otherwise, cycle global heading visibility by calling
-`markdown-cycle' with argument t."
-  (interactive)
-  (cond ((markdown-table-at-point-p)
-         (call-interactively #'markdown-table-backward-cell))
-        (t (markdown-cycle t))))
-
-(defun markdown-outline-level ()
-  "Return the depth to which a statement is nested in the outline."
-  (cond
-   ((and (match-beginning 0)
-         (markdown-code-block-at-pos (match-beginning 0)))
-    7) ;; Only 6 header levels are defined.
-   ((match-end 2) 1)
-   ((match-end 3) 2)
-   ((match-end 4)
-    (length (markdown-trim-whitespace (match-string-no-properties 4))))))
-
-(defun markdown-promote-subtree (&optional arg)
-  "Promote the current subtree of ATX headings.
-Note that Markdown does not support heading levels higher than
-six and therefore level-six headings will not be promoted
-further. If ARG is non-nil promote the heading, otherwise
-demote."
-  (interactive "*P")
-  (save-excursion
-    (when (and (or (thing-at-point-looking-at markdown-regex-header-atx)
-                   (re-search-backward markdown-regex-header-atx nil t))
-               (not (markdown-code-block-at-point-p)))
-      (let ((level (length (match-string 1)))
-            (promote-or-demote (if arg 1 -1))
-            (remove 't))
-        (markdown-cycle-atx promote-or-demote remove)
-        (catch 'end-of-subtree
-          (while (and (markdown-next-heading)
-                      (looking-at markdown-regex-header-atx))
-            ;; Exit if this not a higher level heading; promote otherwise.
-            (if (and (looking-at markdown-regex-header-atx)
-                     (<= (length (match-string-no-properties 1)) level))
-                (throw 'end-of-subtree nil)
-              (markdown-cycle-atx promote-or-demote remove))))))))
-
-(defun markdown-demote-subtree ()
-  "Demote the current subtree of ATX headings."
-  (interactive)
-  (markdown-promote-subtree t))
-
-(defun markdown-move-subtree-up ()
-  "Move the current subtree of ATX headings up."
-  (interactive)
-  (outline-move-subtree-up 1))
-
-(defun markdown-move-subtree-down ()
-  "Move the current subtree of ATX headings down."
-  (interactive)
-  (outline-move-subtree-down 1))
-
-(defun markdown-outline-next ()
-  "Move to next list item, when in a list, or next visible heading."
-  (interactive)
-  (let ((bounds (markdown-next-list-item-bounds)))
-    (if bounds
-        (goto-char (nth 0 bounds))
-      (markdown-next-visible-heading 1))))
-
-(defun markdown-outline-previous ()
-  "Move to previous list item, when in a list, or previous visible heading."
-  (interactive)
-  (let ((bounds (markdown-prev-list-item-bounds)))
-    (if bounds
-        (goto-char (nth 0 bounds))
-      (markdown-previous-visible-heading 1))))
-
-(defun markdown-outline-next-same-level ()
-  "Move to next list item or heading of same level."
-  (interactive)
-  (let ((bounds (markdown-cur-list-item-bounds)))
-    (if bounds
-        (markdown-next-list-item (nth 3 bounds))
-      (markdown-forward-same-level 1))))
-
-(defun markdown-outline-previous-same-level ()
-  "Move to previous list item or heading of same level."
-  (interactive)
-  (let ((bounds (markdown-cur-list-item-bounds)))
-    (if bounds
-        (markdown-prev-list-item (nth 3 bounds))
-      (markdown-backward-same-level 1))))
-
-(defun markdown-outline-up ()
-  "Move to previous list item, when in a list, or previous heading."
-  (interactive)
-  (unless (markdown-up-list)
-    (markdown-up-heading 1)))
-
-
-;;; Marking and Narrowing =====================================================
-
-(defun markdown-mark-paragraph ()
-  "Put mark at end of this block, point at beginning.
-The block marked is the one that contains point or follows point.
-
-Interactively, if this command is repeated or (in Transient Mark
-mode) if the mark is active, it marks the next block after the
-ones already marked."
-  (interactive)
-  (if (or (and (eq last-command this-command) (mark t))
-          (and transient-mark-mode mark-active))
-      (set-mark
-       (save-excursion
-         (goto-char (mark))
-         (markdown-forward-paragraph)
-         (point)))
-    (let ((beginning-of-defun-function #'markdown-backward-paragraph)
-          (end-of-defun-function #'markdown-forward-paragraph))
-      (mark-defun))))
-
-(defun markdown-mark-block ()
-  "Put mark at end of this block, point at beginning.
-The block marked is the one that contains point or follows point.
-
-Interactively, if this command is repeated or (in Transient Mark
-mode) if the mark is active, it marks the next block after the
-ones already marked."
-  (interactive)
-  (if (or (and (eq last-command this-command) (mark t))
-          (and transient-mark-mode mark-active))
-      (set-mark
-       (save-excursion
-         (goto-char (mark))
-         (markdown-forward-block)
-         (point)))
-    (let ((beginning-of-defun-function #'markdown-backward-block)
-          (end-of-defun-function #'markdown-forward-block))
-      (mark-defun))))
-
-(defun markdown-narrow-to-block ()
-  "Make text outside current block invisible.
-The current block is the one that contains point or follows point."
-  (interactive)
-  (let ((beginning-of-defun-function #'markdown-backward-block)
-        (end-of-defun-function #'markdown-forward-block))
-    (narrow-to-defun)))
-
-(defun markdown-mark-text-block ()
-  "Put mark at end of this plain text block, point at beginning.
-The block marked is the one that contains point or follows point.
-
-Interactively, if this command is repeated or (in Transient Mark
-mode) if the mark is active, it marks the next block after the
-ones already marked."
-  (interactive)
-  (if (or (and (eq last-command this-command) (mark t))
-          (and transient-mark-mode mark-active))
-      (set-mark
-       (save-excursion
-         (goto-char (mark))
-         (markdown-end-of-text-block)
-         (point)))
-    (let ((beginning-of-defun-function #'markdown-beginning-of-text-block)
-          (end-of-defun-function #'markdown-end-of-text-block))
-      (mark-defun))))
-
-(defun markdown-mark-page ()
-  "Put mark at end of this top level section, point at beginning.
-The top level section marked is the one that contains point or
-follows point.
-
-Interactively, if this command is repeated or (in Transient Mark
-mode) if the mark is active, it marks the next page after the
-ones already marked."
-  (interactive)
-  (if (or (and (eq last-command this-command) (mark t))
-          (and transient-mark-mode mark-active))
-      (set-mark
-       (save-excursion
-         (goto-char (mark))
-         (markdown-forward-page)
-         (point)))
-    (let ((beginning-of-defun-function #'markdown-backward-page)
-          (end-of-defun-function #'markdown-forward-page))
-      (mark-defun))))
-
-(defun markdown-narrow-to-page ()
-  "Make text outside current top level section invisible.
-The current section is the one that contains point or follows point."
-  (interactive)
-  (let ((beginning-of-defun-function #'markdown-backward-page)
-        (end-of-defun-function #'markdown-forward-page))
-    (narrow-to-defun)))
-
-(defun markdown-mark-subtree ()
-  "Mark the current subtree.
-This puts point at the start of the current subtree, and mark at the end."
-  (interactive)
-  (let ((beg))
-    (if (markdown-heading-at-point)
-        (beginning-of-line)
-      (markdown-previous-visible-heading 1))
-    (setq beg (point))
-    (markdown-end-of-subtree)
-    (push-mark (point) nil t)
-    (goto-char beg)))
-
-(defun markdown-narrow-to-subtree ()
-  "Narrow buffer to the current subtree."
-  (interactive)
-  (save-excursion
-    (save-match-data
-      (narrow-to-region
-       (progn (markdown-back-to-heading-over-code-block t) (point))
-       (progn (markdown-end-of-subtree)
-              (if (and (markdown-heading-at-point) (not (eobp)))
-                  (backward-char 1))
-              (point))))))
-
-
-;;; Generic Structure Editing, Completion, and Cycling Commands ===============
-
-(defun markdown-move-up ()
-  "Move thing at point up.
-When in a list item, call `markdown-move-list-item-up'.
-When in a table, call `markdown-table-move-row-up'.
-Otherwise, move the current heading subtree up with
-`markdown-move-subtree-up'."
-  (interactive)
-  (cond
-   ((markdown-list-item-at-point-p)
-    (call-interactively #'markdown-move-list-item-up))
-   ((markdown-table-at-point-p)
-    (call-interactively #'markdown-table-move-row-up))
-   (t
-    (call-interactively #'markdown-move-subtree-up))))
-
-(defun markdown-move-down ()
-  "Move thing at point down.
-When in a list item, call `markdown-move-list-item-down'.
-Otherwise, move the current heading subtree up with
-`markdown-move-subtree-down'."
-  (interactive)
-  (cond
-   ((markdown-list-item-at-point-p)
-    (call-interactively #'markdown-move-list-item-down))
-   ((markdown-table-at-point-p)
-    (call-interactively #'markdown-table-move-row-down))
-   (t
-    (call-interactively #'markdown-move-subtree-down))))
-
-(defun markdown-promote ()
-  "Promote or move element at point to the left.
-Depending on the context, this function will promote a heading or
-list item at the point, move a table column to the left, or cycle
-markup."
-  (interactive)
-  (let (bounds)
-    (cond
-     ;; Promote atx heading subtree
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (markdown-promote-subtree))
-     ;; Promote setext heading
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (markdown-cycle-setext -1))
-     ;; Promote horizontal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (markdown-cycle-hr -1))
-     ;; Promote list item
-     ((setq bounds (markdown-cur-list-item-bounds))
-      (markdown-promote-list-item bounds))
-     ;; Move table column to the left
-     ((markdown-table-at-point-p)
-      (call-interactively #'markdown-table-move-column-left))
-     ;; Promote bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (markdown-cycle-bold))
-     ;; Promote italic
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (markdown-cycle-italic))
-     (t
-      (user-error "Nothing to promote at point")))))
-
-(defun markdown-demote ()
-  "Demote or move element at point to the right.
-Depending on the context, this function will demote a heading or
-list item at the point, move a table column to the right, or cycle
-or remove markup."
-  (interactive)
-  (let (bounds)
-    (cond
-     ;; Demote atx heading subtree
-     ((thing-at-point-looking-at markdown-regex-header-atx)
-      (markdown-demote-subtree))
-     ;; Demote setext heading
-     ((thing-at-point-looking-at markdown-regex-header-setext)
-      (markdown-cycle-setext 1))
-     ;; Demote horizontal rule
-     ((thing-at-point-looking-at markdown-regex-hr)
-      (markdown-cycle-hr 1))
-     ;; Demote list item
-     ((setq bounds (markdown-cur-list-item-bounds))
-      (markdown-demote-list-item bounds))
-     ;; Move table column to the right
-     ((markdown-table-at-point-p)
-      (call-interactively #'markdown-table-move-column-right))
-     ;; Demote bold
-     ((thing-at-point-looking-at markdown-regex-bold)
-      (markdown-cycle-bold))
-     ;; Demote italic
-     ((thing-at-point-looking-at markdown-regex-italic)
-      (markdown-cycle-italic))
-     (t
-      (user-error "Nothing to demote at point")))))
-
-
-;;; Commands ==================================================================
-
-(defun markdown (&optional output-buffer-name)
-  "Run `markdown-command' on buffer, sending output to OUTPUT-BUFFER-NAME.
-The output buffer name defaults to `markdown-output-buffer-name'.
-Return the name of the output buffer used."
-  (interactive)
-  (save-window-excursion
-    (let* ((commands (cond ((stringp markdown-command) (split-string markdown-command))
-                           ((listp markdown-command) markdown-command)))
-           (command (car-safe commands))
-           (command-args (cdr-safe commands))
-           begin-region end-region)
-      (if (use-region-p)
-          (setq begin-region (region-beginning)
-                end-region (region-end))
-        (setq begin-region (point-min)
-              end-region (point-max)))
-
-      (unless output-buffer-name
-        (setq output-buffer-name markdown-output-buffer-name))
-      (when (and (stringp command) (not (executable-find command)))
-        (user-error "Markdown command %s is not found" command))
-      (let ((exit-code
-             (cond
-              ;; Handle case when `markdown-command' does not read from stdin
-              ((and (stringp command) markdown-command-needs-filename)
-               (if (not buffer-file-name)
-                   (user-error "Must be visiting a file")
-                 ;; Don’t use ‘shell-command’ because it’s not guaranteed to
-                 ;; return the exit code of the process.
-                 (let ((command (if (listp markdown-command)
-                                    (string-join markdown-command " ")
-                                  markdown-command)))
-                   (shell-command-on-region
-                    ;; Pass an empty region so that stdin is empty.
-                    (point) (point)
-                    (concat command " "
-                            (shell-quote-argument buffer-file-name))
-                    output-buffer-name))))
-              ;; Pass region to `markdown-command' via stdin
-              (t
-               (let ((buf (get-buffer-create output-buffer-name)))
-                 (with-current-buffer buf
-                   (setq buffer-read-only nil)
-                   (erase-buffer))
-                 (if (stringp command)
-                     (if (not (null command-args))
-                         (apply #'call-process-region begin-region end-region command nil buf nil command-args)
-                       (call-process-region begin-region end-region command nil buf))
-                   (if markdown-command-needs-filename
-                       (if (not buffer-file-name)
-                           (user-error "Must be visiting a file")
-                         (funcall markdown-command begin-region end-region buf buffer-file-name))
-                     (funcall markdown-command begin-region end-region buf))
-                   ;; If the ‘markdown-command’ function didn’t signal an
-                   ;; error, assume it succeeded by binding ‘exit-code’ to 0.
-                   0))))))
-        ;; The exit code can be a signal description string, so don’t use ‘=’
-        ;; or ‘zerop’.
-        (unless (eq exit-code 0)
-          (user-error "%s failed with exit code %s"
-                      markdown-command exit-code))))
-    output-buffer-name))
-
-(defun markdown-standalone (&optional output-buffer-name)
-  "Special function to provide standalone HTML output.
-Insert the output in the buffer named OUTPUT-BUFFER-NAME."
-  (interactive)
-  (setq output-buffer-name (markdown output-buffer-name))
-  (with-current-buffer output-buffer-name
-    (set-buffer output-buffer-name)
-    (unless (markdown-output-standalone-p)
-      (markdown-add-xhtml-header-and-footer output-buffer-name))
-    (goto-char (point-min))
-    (html-mode))
-  output-buffer-name)
-
-(defun markdown-other-window (&optional output-buffer-name)
-  "Run `markdown-command' on current buffer and display in other window.
-When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
-that name."
-  (interactive)
-  (markdown-display-buffer-other-window
-   (markdown-standalone output-buffer-name)))
-
-(defun markdown-output-standalone-p ()
-  "Determine whether `markdown-command' output is standalone XHTML.
-Standalone XHTML output is identified by an occurrence of
-`markdown-xhtml-standalone-regexp' in the first five lines of output."
-  (save-excursion
-    (goto-char (point-min))
-    (save-match-data
-      (re-search-forward
-       markdown-xhtml-standalone-regexp
-       (save-excursion (goto-char (point-min)) (forward-line 4) (point))
-       t))))
-
-(defun markdown-stylesheet-link-string (stylesheet-path)
-  (concat "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\""
-          (or (and (string-prefix-p "~" stylesheet-path)
-                   (expand-file-name stylesheet-path))
-              stylesheet-path)
-          "\"  />"))
-
-(defun markdown-escape-title (title)
-  "Escape a minimum set of characters in TITLE so they don't clash with html."
-  (replace-regexp-in-string ">" "&gt;"
-    (replace-regexp-in-string "<" "&lt;"
-      (replace-regexp-in-string "&" "&amp;" title))))
-
-(defun markdown-add-xhtml-header-and-footer (title)
-  "Wrap XHTML header and footer with given TITLE around current buffer."
-  (goto-char (point-min))
-  (insert "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
-          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
-          "\t\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n"
-          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\n"
-          "<head>\n<title>")
-  (insert (markdown-escape-title title))
-  (insert "</title>\n")
-  (unless (= (length markdown-content-type) 0)
-    (insert
-     (format
-      "<meta http-equiv=\"Content-Type\" content=\"%s;charset=%s\"/>\n"
-      markdown-content-type
-      (or (and markdown-coding-system
-               (coding-system-get markdown-coding-system
-                                  'mime-charset))
-          (coding-system-get buffer-file-coding-system
-                             'mime-charset)
-          "utf-8"))))
-  (if (> (length markdown-css-paths) 0)
-      (insert (mapconcat #'markdown-stylesheet-link-string
-                         markdown-css-paths "\n")))
-  (when (> (length markdown-xhtml-header-content) 0)
-    (insert markdown-xhtml-header-content))
-  (insert "\n</head>\n\n"
-          "<body>\n\n")
-  (when (> (length markdown-xhtml-body-preamble) 0)
-    (insert markdown-xhtml-body-preamble "\n"))
-  (goto-char (point-max))
-  (when (> (length markdown-xhtml-body-epilogue) 0)
-    (insert "\n" markdown-xhtml-body-epilogue))
-  (insert "\n"
-          "</body>\n"
-          "</html>\n"))
-
-(defun markdown-preview (&optional output-buffer-name)
-  "Run `markdown-command' on the current buffer and view output in browser.
-When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
-that name."
-  (interactive)
-  (browse-url-of-buffer
-   (markdown-standalone (or output-buffer-name markdown-output-buffer-name))))
-
-(defun markdown-export-file-name (&optional extension)
-  "Attempt to generate a filename for Markdown output.
-The file extension will be EXTENSION if given, or .html by default.
-If the current buffer is visiting a file, we construct a new
-output filename based on that filename.  Otherwise, return nil."
-  (when (buffer-file-name)
-    (unless extension
-      (setq extension ".html"))
-    (let ((candidate
-           (concat
-            (cond
-             ((buffer-file-name)
-              (file-name-sans-extension (buffer-file-name)))
-             (t (buffer-name)))
-            extension)))
-      (cond
-       ((equal candidate (buffer-file-name))
-        (concat candidate extension))
-       (t
-        candidate)))))
-
-(defun markdown-export (&optional output-file)
-  "Run Markdown on the current buffer, save to file, and return the filename.
-If OUTPUT-FILE is given, use that as the filename.  Otherwise, use the filename
-generated by `markdown-export-file-name', which will be constructed using the
-current filename, but with the extension removed and replaced with .html."
-  (interactive)
-  (unless output-file
-    (setq output-file (markdown-export-file-name ".html")))
-  (when output-file
-    (let* ((init-buf (current-buffer))
-           (init-point (point))
-           (init-buf-string (buffer-string))
-           (output-buffer (find-file-noselect output-file))
-           (output-buffer-name (buffer-name output-buffer)))
-      (run-hooks 'markdown-before-export-hook)
-      (markdown-standalone output-buffer-name)
-      (with-current-buffer output-buffer
-        (run-hooks 'markdown-after-export-hook)
-        (save-buffer)
-        (when markdown-export-kill-buffer (kill-buffer)))
-      ;; if modified, restore initial buffer
-      (when (buffer-modified-p init-buf)
-        (erase-buffer)
-        (insert init-buf-string)
-        (save-buffer)
-        (goto-char init-point))
-      output-file)))
-
-(defun markdown-export-and-preview ()
-  "Export to XHTML using `markdown-export' and browse the resulting file."
-  (interactive)
-  (browse-url-of-file (markdown-export)))
-
-(defvar-local markdown-live-preview-buffer nil
-  "Buffer used to preview markdown output in `markdown-live-preview-export'.")
-
-(defvar-local markdown-live-preview-source-buffer nil
-  "Source buffer from which current buffer was generated.
-This is the inverse of `markdown-live-preview-buffer'.")
-
-(defvar markdown-live-preview-currently-exporting nil)
-
-(defun markdown-live-preview-get-filename ()
-  "Standardize the filename exported by `markdown-live-preview-export'."
-  (markdown-export-file-name ".html"))
-
-(defun markdown-live-preview-window-eww (file)
-  "Preview FILE with eww.
-To be used with `markdown-live-preview-window-function'."
-  (when (and (bound-and-true-p eww-auto-rename-buffer)
-             markdown-live-preview-buffer)
-    (kill-buffer markdown-live-preview-buffer))
-  (eww-open-file file)
-  ;; #737 if `eww-auto-rename-buffer' is non-nil, the buffer name is not  "*eww*"
-  ;; Try to find the buffer whose name ends with "eww*"
-  (if (bound-and-true-p eww-auto-rename-buffer)
-      (cl-loop for buf in (buffer-list)
-               when (string-match-p "eww\\*\\'" (buffer-name buf))
-               return buf)
-    (get-buffer "*eww*")))
-
-(defun markdown-visual-lines-between-points (beg end)
-  (save-excursion
-    (goto-char beg)
-    (cl-loop with count = 0
-             while (progn (end-of-visual-line)
-                          (and (< (point) end) (line-move-visual 1 t)))
-             do (cl-incf count)
-             finally return count)))
-
-(defun markdown-live-preview-window-serialize (buf)
-  "Get window point and scroll data for all windows displaying BUF."
-  (when (buffer-live-p buf)
-    (with-current-buffer buf
-      (mapcar
-       (lambda (win)
-         (with-selected-window win
-           (let* ((start (window-start))
-                  (pt (window-point))
-                  (pt-or-sym (cond ((= pt (point-min)) 'min)
-                                   ((= pt (point-max)) 'max)
-                                   (t pt)))
-                  (diff (markdown-visual-lines-between-points
-                         start pt)))
-             (list win pt-or-sym diff))))
-       (get-buffer-window-list buf)))))
-
-(defun markdown-get-point-back-lines (pt num-lines)
-  (save-excursion
-    (goto-char pt)
-    (line-move-visual (- num-lines) t)
-    ;; in testing, can occasionally overshoot the number of lines to traverse
-    (let ((actual-num-lines (markdown-visual-lines-between-points (point) pt)))
-      (when (> actual-num-lines num-lines)
-        (line-move-visual (- actual-num-lines num-lines) t)))
-    (point)))
-
-(defun markdown-live-preview-window-deserialize (window-posns)
-  "Apply window point and scroll data from WINDOW-POSNS.
-WINDOW-POSNS is provided by `markdown-live-preview-window-serialize'."
-  (cl-destructuring-bind (win pt-or-sym diff) window-posns
-    (when (window-live-p win)
-      (with-current-buffer markdown-live-preview-buffer
-        (set-window-buffer win (current-buffer))
-        (cl-destructuring-bind (actual-pt actual-diff)
-            (cl-case pt-or-sym
-              (min (list (point-min) 0))
-              (max (list (point-max) diff))
-              (t   (list pt-or-sym diff)))
-          (set-window-start
-           win (markdown-get-point-back-lines actual-pt actual-diff))
-          (set-window-point win actual-pt))))))
-
-(defun markdown-live-preview-export ()
-  "Export to XHTML using `markdown-export'.
-Browse the resulting file within Emacs using
-`markdown-live-preview-window-function' Return the buffer
-displaying the rendered output."
-  (interactive)
-  (let ((filename (markdown-live-preview-get-filename)))
-    (when filename
-      (let* ((markdown-live-preview-currently-exporting t)
-             (cur-buf (current-buffer))
-             (export-file (markdown-export filename))
-             ;; get positions in all windows currently displaying output buffer
-             (window-data
-              (markdown-live-preview-window-serialize
-               markdown-live-preview-buffer)))
-        (save-window-excursion
-          (let ((output-buffer
-                 (funcall markdown-live-preview-window-function export-file)))
-            (with-current-buffer output-buffer
-              (setq markdown-live-preview-source-buffer cur-buf)
-              (add-hook 'kill-buffer-hook
-                        #'markdown-live-preview-remove-on-kill t t))
-            (with-current-buffer cur-buf
-              (setq markdown-live-preview-buffer output-buffer))))
-        (with-current-buffer cur-buf
-          ;; reset all windows displaying output buffer to where they were,
-          ;; now with the new output
-          (mapc #'markdown-live-preview-window-deserialize window-data)
-          ;; delete html editing buffer
-          (let ((buf (get-file-buffer export-file))) (when buf (kill-buffer buf)))
-          (when (and export-file (file-exists-p export-file)
-                     (eq markdown-live-preview-delete-export
-                         'delete-on-export))
-            (delete-file export-file))
-          markdown-live-preview-buffer)))))
-
-(defun markdown-live-preview-remove ()
-  (when (buffer-live-p markdown-live-preview-buffer)
-    (kill-buffer markdown-live-preview-buffer))
-  (setq markdown-live-preview-buffer nil)
-  ;; if set to 'delete-on-export, the output has already been deleted
-  (when (eq markdown-live-preview-delete-export 'delete-on-destroy)
-    (let ((outfile-name (markdown-live-preview-get-filename)))
-      (when (and outfile-name (file-exists-p outfile-name))
-        (delete-file outfile-name)))))
-
-(defun markdown-get-other-window ()
-  "Find another window to display preview or output content."
-  (cond
-   ((memq markdown-split-window-direction '(vertical below))
-    (or (window-in-direction 'below) (split-window-vertically)))
-   ((memq markdown-split-window-direction '(horizontal right))
-    (or (window-in-direction 'right) (split-window-horizontally)))
-   (t (split-window-sensibly (get-buffer-window)))))
-
-(defun markdown-display-buffer-other-window (buf)
-  "Display preview or output buffer BUF in another window."
-  (if (and display-buffer-alist (eq markdown-split-window-direction 'any))
-      (display-buffer buf)
-    (let ((cur-buf (current-buffer))
-          (window (markdown-get-other-window)))
-      (set-window-buffer window buf)
-      (set-buffer cur-buf))))
-
-(defun markdown-live-preview-if-markdown ()
-  (when (and (derived-mode-p 'markdown-mode)
-             markdown-live-preview-mode)
-    (unless markdown-live-preview-currently-exporting
-      (if (buffer-live-p markdown-live-preview-buffer)
-          (markdown-live-preview-export)
-        (markdown-display-buffer-other-window
-         (markdown-live-preview-export))))))
-
-(defun markdown-live-preview-remove-on-kill ()
-  (cond ((and (derived-mode-p 'markdown-mode)
-              markdown-live-preview-mode)
-         (markdown-live-preview-remove))
-        (markdown-live-preview-source-buffer
-         (with-current-buffer markdown-live-preview-source-buffer
-           (setq markdown-live-preview-buffer nil))
-         (setq markdown-live-preview-source-buffer nil))))
-
-(defun markdown-live-preview-switch-to-output ()
-  "Turn on `markdown-live-preview-mode' and switch to output buffer.
-The output buffer is opened in another window."
-  (interactive)
-  (if markdown-live-preview-mode
-      (markdown-display-buffer-other-window (markdown-live-preview-export)))
-  (markdown-live-preview-mode))
-
-(defun markdown-live-preview-re-export ()
-  "Re-export the current live previewed content.
-If the current buffer is a buffer displaying the exported version of a
-`markdown-live-preview-mode' buffer, call `markdown-live-preview-export' and
-update this buffer's contents."
-  (interactive)
-  (when markdown-live-preview-source-buffer
-    (with-current-buffer markdown-live-preview-source-buffer
-      (markdown-live-preview-export))))
-
-(defun markdown-open ()
-  "Open file for the current buffer with `markdown-open-command'."
-  (interactive)
-  (unless markdown-open-command
-    (user-error "Variable `markdown-open-command' must be set"))
-  (if (stringp markdown-open-command)
-      (if (not buffer-file-name)
-          (user-error "Must be visiting a file")
-        (save-buffer)
-        (let ((exit-code (call-process markdown-open-command nil nil nil
-                                       buffer-file-name)))
-          ;; The exit code can be a signal description string, so don’t use ‘=’
-          ;; or ‘zerop’.
-          (unless (eq exit-code 0)
-            (user-error "%s failed with exit code %s"
-                        markdown-open-command exit-code))))
-    (funcall markdown-open-command))
-  nil)
-
-(defun markdown-kill-ring-save ()
-  "Run Markdown on file and store output in the kill ring."
-  (interactive)
-  (save-window-excursion
-    (markdown)
-    (with-current-buffer markdown-output-buffer-name
-      (kill-ring-save (point-min) (point-max)))))
-
-
-;;; Links =====================================================================
-
-(defun markdown-backward-to-link-start ()
-  "Backward link start position if current position is in link title."
-  ;; Issue #305
-  (when (eq (get-text-property (point) 'face) 'markdown-link-face)
-    (skip-chars-backward "^[")
-    (forward-char -1)))
-
-(defun markdown-link-p ()
-  "Return non-nil when `point' is at a non-wiki link.
-See `markdown-wiki-link-p' for more information."
-  (save-excursion
-    (let ((case-fold-search nil))
-      (when (and (not (markdown-wiki-link-p)) (not (markdown-code-block-at-point-p)))
-        (markdown-backward-to-link-start)
-        (or (thing-at-point-looking-at markdown-regex-link-inline)
-            (thing-at-point-looking-at markdown-regex-link-reference)
-            (thing-at-point-looking-at markdown-regex-uri)
-            (thing-at-point-looking-at markdown-regex-angle-uri))))))
-
-(defun markdown-link-at-pos (pos)
-  "Return properties of link or image at position POS.
-Value is a list of elements describing the link:
- 0. beginning position
- 1. end position
- 2. link text
- 3. URL
- 4. reference label
- 5. title text
- 6. bang (nil or \"!\")"
-  (save-excursion
-    (goto-char pos)
-    (markdown-backward-to-link-start)
-    (let (begin end text url reference title bang)
-      (cond
-       ;; Inline image or link at point.
-       ((thing-at-point-looking-at markdown-regex-link-inline)
-        (setq bang (match-string-no-properties 1)
-              begin (match-beginning 0)
-              text (match-string-no-properties 3)
-              url (match-string-no-properties 6))
-        ;; consider nested parentheses
-        ;; if link target contains parentheses, (match-end 0) isn't correct end position of the link
-        (let* ((close-pos (scan-sexps (match-beginning 5) 1))
-               (destination-part (string-trim (buffer-substring-no-properties (1+ (match-beginning 5)) (1- close-pos)))))
-          (setq end close-pos)
-          ;; A link can contain spaces if it is wrapped with angle brackets
-          (cond ((string-match "\\`<\\(.+\\)>\\'" destination-part)
-                 (setq url (match-string-no-properties 1 destination-part)))
-                ((string-match "\\([^ ]+\\)\\s-+\\(.+\\)" destination-part)
-                 (setq url (match-string-no-properties 1 destination-part)
-                       title (substring (match-string-no-properties 2 destination-part) 1 -1)))
-                (t (setq url destination-part)))
-          (setq url (url-unhex-string url))))
-       ;; Reference link at point.
-       ((thing-at-point-looking-at markdown-regex-link-reference)
-        (setq bang (match-string-no-properties 1)
-              begin (match-beginning 0)
-              end (match-end 0)
-              text (match-string-no-properties 3))
-        (when (char-equal (char-after (match-beginning 5)) ?\[)
-          (setq reference (match-string-no-properties 6))))
-       ;; Angle bracket URI at point.
-       ((thing-at-point-looking-at markdown-regex-angle-uri)
-        (setq begin (match-beginning 0)
-              end (match-end 0)
-              url (match-string-no-properties 2)))
-       ;; Plain URI at point.
-       ((thing-at-point-looking-at markdown-regex-uri)
-        (setq begin (match-beginning 0)
-              end (match-end 0)
-              url (match-string-no-properties 1))))
-      (list begin end text url reference title bang))))
-
-(defun markdown-link-url ()
-  "Return the URL part of the regular (non-wiki) link at point.
-Works with both inline and reference style links, and with images.
-If point is not at a link or the link reference is not defined
-returns nil."
-  (let* ((values (markdown-link-at-pos (point)))
-         (text (nth 2 values))
-         (url (nth 3 values))
-         (ref (nth 4 values)))
-    (or url (and ref (car (markdown-reference-definition
-                           (downcase (if (string= ref "") text ref))))))))
-
-(defun markdown--browse-url (url)
-  (let* ((struct (url-generic-parse-url url))
-         (full (url-fullness struct))
-         (file url))
-    ;; Parse URL, determine fullness, strip query string
-    (setq file (car (url-path-and-query struct)))
-    ;; Open full URLs in browser, files in Emacs
-    (if full
-        (browse-url url)
-      (when (and file (> (length file) 0))
-        (let ((link-file (funcall markdown-translate-filename-function file)))
-          (if (and markdown-open-image-command (string-match-p (image-file-name-regexp) link-file))
-              (if (functionp markdown-open-image-command)
-                  (funcall markdown-open-image-command link-file)
-                (process-file markdown-open-image-command nil nil nil link-file))
-            (find-file link-file)))))))
-
-(defun markdown-follow-link-at-point (&optional event)
-  "Open the non-wiki link at point or EVENT.
-If the link is a complete URL, open in browser with `browse-url'.
-Otherwise, open with `find-file' after stripping anchor and/or query string.
-Translate filenames using `markdown-filename-translate-function'."
-  (interactive (list last-command-event))
-  (if event (posn-set-point (event-start event)))
-  (if (markdown-link-p)
-      (or (run-hook-with-args-until-success 'markdown-follow-link-functions (markdown-link-url))
-          (markdown--browse-url (markdown-link-url)))
-    (user-error "Point is not at a Markdown link or URL")))
-
-(defun markdown-fontify-inline-links (last)
-  "Add text properties to next inline link from point to LAST."
-  (when (markdown-match-generic-links last nil)
-    (let* ((link-start (match-beginning 3))
-           (link-end (match-end 3))
-           (url-start (match-beginning 6))
-           (url-end (match-end 6))
-           (url (match-string-no-properties 6))
-           (title-start (match-beginning 7))
-           (title-end (match-end 7))
-           (title (match-string-no-properties 7))
-           ;; Markup part
-           (mp (list 'invisible 'markdown-markup
-                     'rear-nonsticky t
-                     'font-lock-multiline t))
-           ;; Link part (without face)
-           (lp (list 'keymap markdown-mode-mouse-map
-                     'mouse-face 'markdown-highlight-face
-                     'font-lock-multiline t
-                     'help-echo (if title (concat title "\n" url) url)))
-           ;; URL part
-           (up (list 'keymap markdown-mode-mouse-map
-                     'invisible 'markdown-markup
-                     'mouse-face 'markdown-highlight-face
-                     'font-lock-multiline t))
-           ;; URL composition character
-           (url-char (markdown--first-displayable markdown-url-compose-char))
-           ;; Title part
-           (tp (list 'invisible 'markdown-markup
-                     'font-lock-multiline t)))
-      (dolist (g '(1 2 4 5 8))
-        (when (match-end g)
-          (add-text-properties (match-beginning g) (match-end g) mp)
-          (add-face-text-property (match-beginning g) (match-end g) 'markdown-markup-face)))
-      ;; Preserve existing faces applied to link part (e.g., inline code)
-      (when link-start
-        (add-text-properties link-start link-end lp)
-        (add-face-text-property link-start link-end 'markdown-link-face))
-      (when url-start
-        (add-text-properties url-start url-end up)
-        (add-face-text-property url-start url-end 'markdown-url-face))
-      (when title-start
-        (add-text-properties url-end title-end tp)
-        (add-face-text-property url-end title-end 'markdown-link-title-face))
-      (when (and markdown-hide-urls url-start)
-        (compose-region url-start (or title-end url-end) url-char))
-      t)))
-
-(defun markdown-fontify-reference-links (last)
-  "Add text properties to next reference link from point to LAST."
-  (when (markdown-match-generic-links last t)
-    (let* ((link-start (match-beginning 3))
-           (link-end (match-end 3))
-           (ref-start (match-beginning 6))
-           (ref-end (match-end 6))
-           ;; Markup part
-           (mp (list 'invisible 'markdown-markup
-                     'rear-nonsticky t
-                     'font-lock-multiline t))
-           ;; Link part
-           (lp (list 'keymap markdown-mode-mouse-map
-                     'mouse-face 'markdown-highlight-face
-                     'font-lock-multiline t
-                     'help-echo (lambda (_ __ pos)
-                                  (save-match-data
-                                    (save-excursion
-                                      (goto-char pos)
-                                      (or (markdown-link-url)
-                                          "Undefined reference"))))))
-           ;; URL composition character
-           (url-char (markdown--first-displayable markdown-url-compose-char))
-           ;; Reference part
-           (rp (list 'invisible 'markdown-markup
-                     'font-lock-multiline t)))
-      (dolist (g '(1 2 4 5 8))
-        (when (match-end g)
-          (add-text-properties (match-beginning g) (match-end g) mp)
-          (add-face-text-property (match-beginning g) (match-end g) 'markdown-markup-face)))
-      (when link-start
-        (add-text-properties link-start link-end lp)
-        (add-face-text-property link-start link-end 'markdown-link-face))
-      (when ref-start
-        (add-text-properties ref-start ref-end rp)
-        (add-face-text-property ref-start ref-end 'markdown-reference-face)
-        (when (and markdown-hide-urls (> (- ref-end ref-start) 2))
-          (compose-region ref-start ref-end url-char)))
-      t)))
-
-(defun markdown-fontify-angle-uris (last)
-  "Add text properties to angle URIs from point to LAST."
-  (when (markdown-match-angle-uris last)
-    (let* ((url-start (match-beginning 2))
-           (url-end (match-end 2))
-           ;; Markup part
-           (mp (list 'face 'markdown-markup-face
-                     'invisible 'markdown-markup
-                     'rear-nonsticky t
-                     'font-lock-multiline t))
-           ;; URI part
-           (up (list 'keymap markdown-mode-mouse-map
-                     'face 'markdown-plain-url-face
-                     'mouse-face 'markdown-highlight-face
-                     'font-lock-multiline t)))
-      (dolist (g '(1 3))
-        (add-text-properties (match-beginning g) (match-end g) mp))
-      (add-text-properties url-start url-end up)
-      t)))
-
-(defun markdown-fontify-plain-uris (last)
-  "Add text properties to plain URLs from point to LAST."
-  (when (markdown-match-plain-uris last)
-    (let* ((start (match-beginning 0))
-           (end (match-end 0))
-           (props (list 'keymap markdown-mode-mouse-map
-                        'face 'markdown-plain-url-face
-                        'mouse-face 'markdown-highlight-face
-                        'rear-nonsticky t
-                        'font-lock-multiline t)))
-      (add-text-properties start end props)
-      t)))
-
-(defun markdown-toggle-url-hiding (&optional arg)
-  "Toggle the display or hiding of URLs.
-With a prefix argument ARG, enable URL hiding if ARG is positive,
-and disable it otherwise."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-hide-urls
-        (if (eq arg 'toggle)
-            (not markdown-hide-urls)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-hide-urls
-      (message "markdown-mode URL hiding enabled")
-    (message "markdown-mode URL hiding disabled"))
-  (markdown-reload-extensions))
-
-
-;;; Wiki Links ================================================================
-
-(defun markdown-wiki-link-p ()
-  "Return non-nil if wiki links are enabled and `point' is at a true wiki link.
-A true wiki link name matches `markdown-regex-wiki-link' but does
-not match the current file name after conversion.  This modifies
-the data returned by `match-data'.  Note that the potential wiki
-link name must be available via `match-string'."
-  (when markdown-enable-wiki-links
-    (let ((case-fold-search nil))
-      (and (thing-at-point-looking-at markdown-regex-wiki-link)
-           (not (markdown-code-block-at-point-p))
-           (or (not buffer-file-name)
-               (not (string-equal (buffer-file-name)
-                                  (markdown-convert-wiki-link-to-filename
-                                   (markdown-wiki-link-link)))))))))
-
-(defun markdown-wiki-link-link ()
-  "Return the link part of the wiki link using current match data.
-The location of the link component depends on the value of
-`markdown-wiki-link-alias-first'."
-  (if markdown-wiki-link-alias-first
-      (or (match-string-no-properties 5) (match-string-no-properties 3))
-    (match-string-no-properties 3)))
-
-(defun markdown-wiki-link-alias ()
-  "Return the alias or text part of the wiki link using current match data.
-The location of the alias component depends on the value of
-`markdown-wiki-link-alias-first'."
-  (if markdown-wiki-link-alias-first
-      (match-string-no-properties 3)
-    (or (match-string-no-properties 5) (match-string-no-properties 3))))
-
-(defun markdown--wiki-link-search-types ()
-  (let ((ret (and markdown-wiki-link-search-type
-                  (cl-copy-list markdown-wiki-link-search-type))))
-    (when (and markdown-wiki-link-search-subdirectories
-               (not (memq 'sub-directories markdown-wiki-link-search-type)))
-      (push 'sub-directories ret))
-    (when (and markdown-wiki-link-search-parent-directories
-               (not (memq 'parent-directories markdown-wiki-link-search-type)))
-      (push 'parent-directories ret))
-    ret))
-
-(defun markdown--project-root ()
-  (or (cl-loop for dir in '(".git" ".hg" ".svn")
-               when (locate-dominating-file default-directory dir)
-               return it)
-      (progn
-        (require 'project)
-        (let ((project (project-current t)))
-          (with-no-warnings
-            (if (fboundp 'project-root)
-                (project-root project)
-              (car (project-roots project))))))))
-
-(defun markdown-convert-wiki-link-to-filename (name)
-  "Generate a filename from the wiki link NAME.
-Spaces in NAME are replaced with `markdown-link-space-sub-char'.
-When in `gfm-mode', follow GitHub's conventions where [[Test Test]]
-and [[test test]] both map to Test-test.ext.  Look in the current
-directory first, then in subdirectories if
-`markdown-wiki-link-search-subdirectories' is non-nil, and then
-in parent directories if
-`markdown-wiki-link-search-parent-directories' is non-nil."
-  (save-match-data
-    ;; This function must not overwrite match data(PR #590)
-    (let* ((basename (replace-regexp-in-string
-                      "[[:space:]\n]" markdown-link-space-sub-char name))
-           (basename (if (derived-mode-p 'gfm-mode)
-                         (concat (upcase (substring basename 0 1))
-                                 (downcase (substring basename 1 nil)))
-                       basename))
-           (search-types (markdown--wiki-link-search-types))
-           directory extension default candidates dir)
-      (when buffer-file-name
-        (setq directory (file-name-directory buffer-file-name)
-              extension (file-name-extension buffer-file-name)))
-      (setq default (concat basename
-                            (when extension (concat "." extension))))
-      (cond
-       ;; Look in current directory first.
-       ((or (null buffer-file-name)
-            (file-exists-p default))
-        default)
-       ;; Possibly search in subdirectories, next.
-       ((and (memq 'sub-directories search-types)
-             (setq candidates
-                   (directory-files-recursively
-                    directory (concat "^" default "$"))))
-        (car candidates))
-       ;; Possibly search in parent directories as a last resort.
-       ((and (memq 'parent-directories search-types)
-             (setq dir (locate-dominating-file directory default)))
-        (concat dir default))
-       ((and (memq 'project search-types)
-             (setq candidates
-                   (directory-files-recursively
-                    (markdown--project-root) (concat "^" default "$"))))
-        (car candidates))
-       ;; If nothing is found, return default in current directory.
-       (t default)))))
-
-(defun markdown-follow-wiki-link (name &optional other)
-  "Follow the wiki link NAME.
-Convert the name to a file name and call `find-file'.  Ensure that
-the new buffer remains in `markdown-mode'.  Open the link in another
-window when OTHER is non-nil."
-  (let ((filename (markdown-convert-wiki-link-to-filename name))
-        (wp (when buffer-file-name
-              (file-name-directory buffer-file-name))))
-    (if (not wp)
-        (user-error "Must be visiting a file")
-      (when other (other-window 1))
-      (let ((default-directory wp))
-        (find-file filename)))
-    (unless (derived-mode-p 'markdown-mode)
-      (markdown-mode))))
-
-(defun markdown-follow-wiki-link-at-point (&optional arg)
-  "Find Wiki Link at point.
-With prefix argument ARG, open the file in other window.
-See `markdown-wiki-link-p' and `markdown-follow-wiki-link'."
-  (interactive "P")
-  (if (markdown-wiki-link-p)
-      (markdown-follow-wiki-link (markdown-wiki-link-link) arg)
-    (user-error "Point is not at a Wiki Link")))
-
-(defun markdown-highlight-wiki-link (from to face)
-  "Highlight the wiki link in the region between FROM and TO using FACE."
-  (put-text-property from to 'font-lock-face face))
-
-(defun markdown-unfontify-region-wiki-links (from to)
-  "Remove wiki link faces from the region specified by FROM and TO."
-  (interactive "*r")
-  (let ((modified (buffer-modified-p)))
-    (remove-text-properties from to '(font-lock-face markdown-link-face))
-    (remove-text-properties from to '(font-lock-face markdown-missing-link-face))
-    ;; remove-text-properties marks the buffer modified in emacs 24.3,
-    ;; undo that if it wasn't originally marked modified
-    (set-buffer-modified-p modified)))
-
-(defun markdown-fontify-region-wiki-links (from to)
-  "Search region given by FROM and TO for wiki links and fontify them.
-If a wiki link is found check to see if the backing file exists
-and highlight accordingly."
-  (goto-char from)
-  (save-match-data
-    (while (re-search-forward markdown-regex-wiki-link to t)
-      (when (not (markdown-code-block-at-point-p))
-        (let ((highlight-beginning (match-beginning 1))
-              (highlight-end (match-end 1))
-              (file-name
-               (markdown-convert-wiki-link-to-filename
-                (markdown-wiki-link-link))))
-          (if (condition-case nil (file-exists-p file-name) (error nil))
-              (markdown-highlight-wiki-link
-               highlight-beginning highlight-end 'markdown-link-face)
-            (markdown-highlight-wiki-link
-             highlight-beginning highlight-end 'markdown-missing-link-face)))))))
-
-(defun markdown-extend-changed-region (from to)
-  "Extend region given by FROM and TO so that we can fontify all links.
-The region is extended to the first newline before and the first
-newline after."
-  ;; start looking for the first new line before 'from
-  (goto-char from)
-  (re-search-backward "\n" nil t)
-  (let ((new-from (point-min))
-        (new-to (point-max)))
-    (if (not (= (point) from))
-        (setq new-from (point)))
-    ;; do the same thing for the first new line after 'to
-    (goto-char to)
-    (re-search-forward "\n" nil t)
-    (if (not (= (point) to))
-        (setq new-to (point)))
-    (cl-values new-from new-to)))
-
-(defun markdown-check-change-for-wiki-link (from to)
-  "Check region between FROM and TO for wiki links and re-fontify as needed."
-  (interactive "*r")
-  (let* ((modified (buffer-modified-p))
-         (buffer-undo-list t)
-         (inhibit-read-only t)
-         deactivate-mark
-         buffer-file-truename)
-    (unwind-protect
-        (save-excursion
-          (save-match-data
-            (save-restriction
-              (cursor-intangible-mode +1) ;; inhibit-point-motion-hooks is obsoleted since Emacs 29
-              ;; Extend the region to fontify so that it starts
-              ;; and ends at safe places.
-              (cl-multiple-value-bind (new-from new-to)
-                  (markdown-extend-changed-region from to)
-                (goto-char new-from)
-                ;; Only refontify when the range contains text with a
-                ;; wiki link face or if the wiki link regexp matches.
-                (when (or (markdown-range-property-any
-                           new-from new-to 'font-lock-face
-                           '(markdown-link-face markdown-missing-link-face))
-                          (re-search-forward
-                           markdown-regex-wiki-link new-to t))
-                  ;; Unfontify existing fontification (start from scratch)
-                  (markdown-unfontify-region-wiki-links new-from new-to)
-                  ;; Now do the fontification.
-                  (markdown-fontify-region-wiki-links new-from new-to))))))
-      (cursor-intangible-mode -1)
-      (and (not modified)
-           (buffer-modified-p)
-           (set-buffer-modified-p nil)))))
-
-(defun markdown-check-change-for-wiki-link-after-change (from to _)
-  "Check region between FROM and TO for wiki links and re-fontify as needed.
-Designed to be used with the `after-change-functions' hook."
-  (markdown-check-change-for-wiki-link from to))
-
-(defun markdown-fontify-buffer-wiki-links ()
-  "Refontify all wiki links in the buffer."
-  (interactive)
-  (markdown-check-change-for-wiki-link (point-min) (point-max)))
-
-(defun markdown-toggle-wiki-links (&optional arg)
-  "Toggle support for wiki links.
-With a prefix argument ARG, enable wiki link support if ARG is positive,
-and disable it otherwise."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-enable-wiki-links
-        (if (eq arg 'toggle)
-            (not markdown-enable-wiki-links)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-enable-wiki-links
-      (message "markdown-mode wiki link support enabled")
-    (message "markdown-mode wiki link support disabled"))
-  (markdown-reload-extensions))
-
-(defun markdown-setup-wiki-link-hooks ()
-  "Add or remove hooks for fontifying wiki links.
-These are only enabled when `markdown-wiki-link-fontify-missing' is non-nil."
-  ;; Anytime text changes make sure it gets fontified correctly
-  (if (and markdown-enable-wiki-links
-           markdown-wiki-link-fontify-missing)
-      (add-hook 'after-change-functions
-                #'markdown-check-change-for-wiki-link-after-change t t)
-    (remove-hook 'after-change-functions
-                 #'markdown-check-change-for-wiki-link-after-change t))
-  ;; If we left the buffer there is a really good chance we were
-  ;; creating one of the wiki link documents. Make sure we get
-  ;; refontified when we come back.
-  (if (and markdown-enable-wiki-links
-           markdown-wiki-link-fontify-missing)
-      (progn
-        (add-hook 'window-configuration-change-hook
-                  #'markdown-fontify-buffer-wiki-links t t)
-        (markdown-fontify-buffer-wiki-links))
-    (remove-hook 'window-configuration-change-hook
-                 #'markdown-fontify-buffer-wiki-links t)
-    (markdown-unfontify-region-wiki-links (point-min) (point-max))))
-
-
-;;; Following & Doing =========================================================
-
-(defun markdown-follow-thing-at-point (arg)
-  "Follow thing at point if possible, such as a reference link or wiki link.
-Opens inline and reference links in a browser.  Opens wiki links
-to other files in the current window, or the another window if
-ARG is non-nil.
-See `markdown-follow-link-at-point' and
-`markdown-follow-wiki-link-at-point'."
-  (interactive "P")
-  (cond ((markdown-link-p)
-         (markdown-follow-link-at-point))
-        ((markdown-wiki-link-p)
-         (markdown-follow-wiki-link-at-point arg))
-        (t
-         (let* ((values (markdown-link-at-pos (point)))
-                (url (nth 3 values)))
-           (unless url
-             (user-error "Nothing to follow at point"))
-           (markdown--browse-url url)))))
-
-(defun markdown-do ()
-  "Do something sensible based on context at point.
-Jumps between reference links and definitions; between footnote
-markers and footnote text."
-  (interactive)
-  (cond
-   ;; Footnote definition
-   ((markdown-footnote-text-positions)
-    (markdown-footnote-return))
-   ;; Footnote marker
-   ((markdown-footnote-marker-positions)
-    (markdown-footnote-goto-text))
-   ;; Reference link
-   ((thing-at-point-looking-at markdown-regex-link-reference)
-    (markdown-reference-goto-definition))
-   ;; Reference definition
-   ((thing-at-point-looking-at markdown-regex-reference-definition)
-    (markdown-reference-goto-link (match-string-no-properties 2)))
-   ;; Link
-   ((or (markdown-link-p) (markdown-wiki-link-p))
-    (markdown-follow-thing-at-point nil))
-   ;; GFM task list item
-   ((markdown-gfm-task-list-item-at-point)
-    (markdown-toggle-gfm-checkbox))
-   ;; Align table
-   ((markdown-table-at-point-p)
-    (call-interactively #'markdown-table-align))
-   ;; Otherwise
-   (t
-    (markdown-insert-gfm-checkbox))))
-
-
-;;; Miscellaneous =============================================================
-
-(defun markdown-compress-whitespace-string (str)
-  "Compress whitespace in STR and return result.
-Leading and trailing whitespace is removed.  Sequences of multiple
-spaces, tabs, and newlines are replaced with single spaces."
-  (replace-regexp-in-string "\\(^[ \t\n]+\\|[ \t\n]+$\\)" ""
-                            (replace-regexp-in-string "[ \t\n]+" " " str)))
-
-(defun markdown--substitute-command-keys (string)
-  "Like `substitute-command-keys' but, but prefers control characters.
-First pass STRING to `substitute-command-keys' and then
-substitute `C-i` for `TAB` and `C-m` for `RET`."
-  (replace-regexp-in-string
-   "\\<TAB\\>" "C-i"
-   (replace-regexp-in-string
-    "\\<RET\\>" "C-m" (substitute-command-keys string) t) t))
-
-(defun markdown-line-number-at-pos (&optional pos)
-  "Return (narrowed) buffer line number at position POS.
-If POS is nil, use current buffer location.
-This is an exact copy of `line-number-at-pos' for use in emacs21."
-  (let ((opoint (or pos (point))) start)
-    (save-excursion
-      (goto-char (point-min))
-      (setq start (point))
-      (goto-char opoint)
-      (forward-line 0)
-      (1+ (count-lines start (point))))))
-
-(defun markdown-inside-link-p ()
-  "Return t if point is within a link."
-  (save-match-data
-    (thing-at-point-looking-at (markdown-make-regex-link-generic))))
-
-(defun markdown-line-is-reference-definition-p ()
-  "Return whether the current line is a (non-footnote) reference definition."
-  (save-excursion
-    (move-beginning-of-line 1)
-    (and (looking-at-p markdown-regex-reference-definition)
-         (not (looking-at-p "[ \t]*\\[^")))))
-
-(defun markdown-adaptive-fill-function ()
-  "Return prefix for filling paragraph or nil if not determined."
-  (cond
-   ;; List item inside blockquote
-   ((looking-at "^[ \t]*>[ \t]*\\(\\(?:[0-9]+\\|#\\)\\.\\|[*+:-]\\)[ \t]+")
-    (replace-regexp-in-string
-     "[0-9\\.*+-]" " " (match-string-no-properties 0)))
-   ;; Blockquote
-   ((looking-at markdown-regex-blockquote)
-    (buffer-substring-no-properties (match-beginning 0) (match-end 2)))
-   ;; List items
-   ((looking-at markdown-regex-list)
-    (match-string-no-properties 0))
-   ;; Footnote definition
-   ((looking-at-p markdown-regex-footnote-definition)
-    "    ") ; four spaces
-   ;; No match
-   (t nil)))
-
-(defun markdown-fill-paragraph (&optional justify)
-  "Fill paragraph at or after point.
-This function is like \\[fill-paragraph], but it skips Markdown
-code blocks.  If the point is in a code block, or just before one,
-do not fill.  Otherwise, call `fill-paragraph' as usual. If
-JUSTIFY is non-nil, justify text as well.  Since this function
-handles filling itself, it always returns t so that
-`fill-paragraph' doesn't run."
-  (interactive "P")
-  (unless (or (markdown-code-block-at-point-p)
-              (save-excursion
-                (back-to-indentation)
-                (skip-syntax-forward "-")
-                (markdown-code-block-at-point-p)))
-    (let ((fill-prefix (save-excursion
-                         (goto-char (line-beginning-position))
-                         (when (looking-at "\\([ \t]*>[ \t]*\\(?:>[ \t]*\\)+\\)")
-                           (match-string-no-properties 1)))))
-      (fill-paragraph justify)))
-  t)
-
-(defun markdown-fill-forward-paragraph (&optional arg)
-  "Function used by `fill-paragraph' to move over ARG paragraphs.
-This is a `fill-forward-paragraph-function' for `markdown-mode'.
-It is called with a single argument specifying the number of
-paragraphs to move.  Just like `forward-paragraph', it should
-return the number of paragraphs left to move."
-  (or arg (setq arg 1))
-  (if (> arg 0)
-      ;; With positive ARG, move across ARG non-code-block paragraphs,
-      ;; one at a time.  When passing a code block, don't decrement ARG.
-      (while (and (not (eobp))
-                  (> arg 0)
-                  (= (forward-paragraph 1) 0)
-                  (or (markdown-code-block-at-pos (line-beginning-position 0))
-                      (setq arg (1- arg)))))
-    ;; Move backward by one paragraph with negative ARG (always -1).
-    (let ((start (point)))
-      (setq arg (forward-paragraph arg))
-      (while (and (not (eobp))
-                  (progn (move-to-left-margin) (not (eobp)))
-                  (looking-at-p paragraph-separate))
-        (forward-line 1))
-      (cond
-       ;; Move point past whitespace following list marker.
-       ((looking-at markdown-regex-list)
-        (goto-char (match-end 0)))
-       ;; Move point past whitespace following pipe at beginning of line
-       ;; to handle Pandoc line blocks.
-       ((looking-at "^|\\s-*")
-        (goto-char (match-end 0)))
-       ;; Return point if the paragraph passed was a code block.
-       ((markdown-code-block-at-pos (line-beginning-position 2))
-        (goto-char start)))))
-  arg)
-
-(defun markdown--inhibit-electric-quote ()
-  "Function added to `electric-quote-inhibit-functions'.
-Return non-nil if the quote has been inserted inside a code block
-or span."
-  (let ((pos (1- (point))))
-    (or (markdown-inline-code-at-pos pos)
-        (markdown-code-block-at-pos pos))))
-
-
-;;; Extension Framework =======================================================
-
-(defun markdown-reload-extensions ()
-  "Check settings, update font-lock keywords and hooks, and re-fontify buffer."
-  (interactive)
-  (when (derived-mode-p 'markdown-mode)
-    ;; Refontify buffer
-    (font-lock-flush)
-    ;; Add or remove hooks related to extensions
-    (markdown-setup-wiki-link-hooks)))
-
-(defun markdown-handle-local-variables ()
-  "Run in `hack-local-variables-hook' to update font lock rules.
-Checks to see if there is actually a ‘markdown-mode’ file local variable
-before regenerating font-lock rules for extensions."
-  (when (or (assoc 'markdown-enable-wiki-links file-local-variables-alist)
-            (assoc 'markdown-enable-math file-local-variables-alist))
-    (when (assoc 'markdown-enable-math file-local-variables-alist)
-      (markdown-toggle-math markdown-enable-math))
-    (markdown-reload-extensions)))
-
-
-;;; Math Support ==============================================================
-
-(defconst markdown-mode-font-lock-keywords-math
-  (list
-   ;; Equation reference (eq:foo)
-   '("\\((eq:\\)\\([[:alnum:]:_]+\\)\\()\\)" . ((1 markdown-markup-face)
-                                                (2 markdown-reference-face)
-                                                (3 markdown-markup-face)))
-   ;; Equation reference \eqref{foo}
-   '("\\(\\\\eqref{\\)\\([[:alnum:]:_]+\\)\\(}\\)" . ((1 markdown-markup-face)
-                                                      (2 markdown-reference-face)
-                                                      (3 markdown-markup-face))))
-  "Font lock keywords to add and remove when toggling math support.")
-
-(defun markdown-toggle-math (&optional arg)
-  "Toggle support for inline and display LaTeX math expressions.
-With a prefix argument ARG, enable math mode if ARG is positive,
-and disable it otherwise.  If called from Lisp, enable the mode
-if ARG is omitted or nil."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-enable-math
-        (if (eq arg 'toggle)
-            (not markdown-enable-math)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-enable-math
-      (progn
-        (font-lock-add-keywords
-         'markdown-mode markdown-mode-font-lock-keywords-math)
-        (message "markdown-mode math support enabled"))
-    (font-lock-remove-keywords
-     'markdown-mode markdown-mode-font-lock-keywords-math)
-    (message "markdown-mode math support disabled"))
-  (markdown-reload-extensions))
-
-
-;;; GFM Checkboxes ============================================================
-
-(define-button-type 'markdown-gfm-checkbox-button
-  'follow-link t
-  'face 'markdown-gfm-checkbox-face
-  'mouse-face 'markdown-highlight-face
-  'action #'markdown-toggle-gfm-checkbox-button)
-
-(defun markdown-gfm-task-list-item-at-point (&optional bounds)
-  "Return non-nil if there is a GFM task list item at the point.
-Optionally, the list item BOUNDS may be given if available, as
-returned by `markdown-cur-list-item-bounds'.  When a task list item
-is found, the return value is the same value returned by
-`markdown-cur-list-item-bounds'."
-  (unless bounds
-    (setq bounds (markdown-cur-list-item-bounds)))
-  (> (length (nth 5 bounds)) 0))
-
-(defun markdown-insert-gfm-checkbox ()
-  "Add GFM checkbox at point.
-Returns t if added.
-Returns nil if non-applicable."
-  (interactive)
-  (let ((bounds (markdown-cur-list-item-bounds)))
-    (if bounds
-        (unless (cl-sixth bounds)
-          (let ((pos (+ (cl-first bounds) (cl-fourth bounds)))
-                (markup "[ ] "))
-            (if (< pos (point))
-                (save-excursion
-                  (goto-char pos)
-                  (insert markup))
-              (goto-char pos)
-              (insert markup))
-            (syntax-propertize (+ (cl-second bounds) 4))
-            t))
-      (unless (save-excursion
-                (back-to-indentation)
-                (or (markdown-list-item-at-point-p)
-                    (markdown-heading-at-point)
-                    (markdown-in-comment-p)
-                    (markdown-code-block-at-point-p)))
-        (let ((pos (save-excursion
-                     (back-to-indentation)
-                     (point)))
-              (markup (concat (or (save-excursion
-                                    (beginning-of-line 0)
-                                    (cl-fifth (markdown-cur-list-item-bounds)))
-                                  markdown-unordered-list-item-prefix)
-                              "[ ] ")))
-          (if (< pos (point))
-              (save-excursion
-                (goto-char pos)
-                (insert markup))
-            (goto-char pos)
-            (insert markup))
-          (syntax-propertize (line-end-position))
-          t)))))
-
-(defun markdown-toggle-gfm-checkbox ()
-  "Toggle GFM checkbox at point.
-Returns the resulting status as a string, either \"[x]\" or \"[ ]\".
-Returns nil if there is no task list item at the point."
-  (interactive)
-  (save-match-data
-    (save-excursion
-      (let ((bounds (markdown-cur-list-item-bounds)))
-        (when bounds
-          ;; Move to beginning of task list item
-          (goto-char (cl-first bounds))
-          ;; Advance to column of first non-whitespace after marker
-          (forward-char (cl-fourth bounds))
-          (cond ((looking-at "\\[ \\]")
-                 (replace-match
-                  (if markdown-gfm-uppercase-checkbox "[X]" "[x]")
-                  nil t)
-                 (match-string-no-properties 0))
-                ((looking-at "\\[[xX]\\]")
-                 (replace-match "[ ]" nil t)
-                 (match-string-no-properties 0))))))))
-
-(defun markdown-toggle-gfm-checkbox-button (button)
-  "Toggle GFM checkbox BUTTON on click."
-  (save-match-data
-    (save-excursion
-      (goto-char (button-start button))
-      (markdown-toggle-gfm-checkbox))))
-
-(defun markdown-make-gfm-checkboxes-buttons (start end)
-  "Make GFM checkboxes buttons in region between START and END."
-  (save-excursion
-    (goto-char start)
-    (let ((case-fold-search t))
-      (save-excursion
-        (while (re-search-forward markdown-regex-gfm-checkbox end t)
-          (make-button (match-beginning 1) (match-end 1)
-                       :type 'markdown-gfm-checkbox-button))))))
-
-;; Called when any modification is made to buffer text.
-(defun markdown-gfm-checkbox-after-change-function (beg end _)
-  "Add to `after-change-functions' to setup GFM checkboxes as buttons.
-BEG and END are the limits of scanned region."
-  (save-excursion
-    (save-match-data
-      ;; Rescan between start of line from `beg' and start of line after `end'.
-      (markdown-make-gfm-checkboxes-buttons
-       (progn (goto-char beg) (beginning-of-line) (point))
-       (progn (goto-char end) (forward-line 1) (point))))))
-
-(defun markdown-remove-gfm-checkbox-overlays ()
-  "Remove all GFM checkbox overlays in buffer."
-  (save-excursion
-    (save-restriction
-      (widen)
-      (remove-overlays nil nil 'face 'markdown-gfm-checkbox-face))))
-
-
-;;; Display inline image ======================================================
-
-(defvar-local markdown-inline-image-overlays nil)
-
-(defun markdown-remove-inline-images ()
-  "Remove inline image overlays from image links in the buffer.
-This can be toggled with `markdown-toggle-inline-images'
-or \\[markdown-toggle-inline-images]."
-  (interactive)
-  (mapc #'delete-overlay markdown-inline-image-overlays)
-  (setq markdown-inline-image-overlays nil)
-  (when (fboundp 'clear-image-cache) (clear-image-cache)))
-
-(defcustom markdown-display-remote-images nil
-  "If non-nil, download and display remote images.
-See also `markdown-inline-image-overlays'.
-
-Only image URLs specified with a protocol listed in
-`markdown-remote-image-protocols' are displayed."
-  :group 'markdown
-  :type 'boolean)
-
-(defcustom markdown-remote-image-protocols '("https")
-  "List of protocols to use to download remote images.
-See also `markdown-display-remote-images'."
-  :group 'markdown
-  :type '(repeat string))
-
-(defvar markdown--remote-image-cache
-  (make-hash-table :test 'equal)
-  "A map from URLs to image paths.")
-
-(defun markdown--get-remote-image (url)
-  "Retrieve the image path for a given URL."
-  (or (gethash url markdown--remote-image-cache)
-      (let ((dl-path (make-temp-file "markdown-mode--image")))
-        (require 'url)
-        (url-copy-file url dl-path t)
-        (puthash url dl-path markdown--remote-image-cache))))
-
-(defun markdown-display-inline-images ()
-  "Add inline image overlays to image links in the buffer.
-This can be toggled with `markdown-toggle-inline-images'
-or \\[markdown-toggle-inline-images]."
-  (interactive)
-  (unless (display-images-p)
-    (error "Cannot show images"))
-  (save-excursion
-    (save-restriction
-      (widen)
-      (goto-char (point-min))
-      (while (re-search-forward markdown-regex-link-inline nil t)
-        (let* ((start (match-beginning 0))
-               (imagep (match-beginning 1))
-               (end (match-end 0))
-               (file (match-string-no-properties 6)))
-          (when (and imagep
-                     (not (zerop (length file))))
-            (unless (file-exists-p file)
-              (let* ((download-file (funcall markdown-translate-filename-function file))
-                     (valid-url (ignore-errors
-                                  (member (downcase (url-type (url-generic-parse-url download-file)))
-                                          markdown-remote-image-protocols))))
-                (if (and markdown-display-remote-images valid-url)
-                    (setq file (markdown--get-remote-image download-file))
-                  (when (not valid-url)
-                    ;; strip query parameter
-                    (setq file (replace-regexp-in-string "?.+\\'" "" file))
-                    (unless (file-exists-p file)
-                      (setq file (url-unhex-string file)))))))
-            (when (file-exists-p file)
-              (let* ((abspath (if (file-name-absolute-p file)
-                                  file
-                                (concat default-directory file)))
-                     (image
-                      (cond ((and markdown-max-image-size
-                                  (image-type-available-p 'imagemagick))
-                             (create-image
-                              abspath 'imagemagick nil
-                              :max-width (car markdown-max-image-size)
-                              :max-height (cdr markdown-max-image-size)))
-                            (markdown-max-image-size
-                             (create-image abspath nil nil
-                                           :max-width (car markdown-max-image-size)
-                                           :max-height (cdr markdown-max-image-size)))
-                            (t (create-image abspath)))))
-                (when image
-                  (let ((ov (make-overlay start end)))
-                    (overlay-put ov 'display image)
-                    (overlay-put ov 'face 'default)
-                    (push ov markdown-inline-image-overlays)))))))))))
-
-(defun markdown-toggle-inline-images ()
-  "Toggle inline image overlays in the buffer."
-  (interactive)
-  (if markdown-inline-image-overlays
-      (markdown-remove-inline-images)
-    (markdown-display-inline-images)))
-
-
-;;; GFM Code Block Fontification ==============================================
-
-(defcustom markdown-fontify-code-blocks-natively nil
-  "When non-nil, fontify code in code blocks using the native major mode.
-This only works for fenced code blocks where the language is
-specified where we can automatically determine the appropriate
-mode to use.  The language to mode mapping may be customized by
-setting the variable `markdown-code-lang-modes'."
-  :group 'markdown
-  :type 'boolean
-  :safe #'booleanp
-  :package-version '(markdown-mode . "2.3"))
-
-(defcustom markdown-fontify-code-block-default-mode nil
-  "Default mode to use to fontify code blocks.
-This mode is used when automatic detection fails, such as for GFM
-code blocks with no language specified."
-  :group 'markdown
-  :type '(choice function (const :tag "None" nil))
-  :package-version '(markdown-mode . "2.4"))
-
-(defun markdown-toggle-fontify-code-blocks-natively (&optional arg)
-  "Toggle the native fontification of code blocks.
-With a prefix argument ARG, enable if ARG is positive,
-and disable otherwise."
-  (interactive (list (or current-prefix-arg 'toggle)))
-  (setq markdown-fontify-code-blocks-natively
-        (if (eq arg 'toggle)
-            (not markdown-fontify-code-blocks-natively)
-          (> (prefix-numeric-value arg) 0)))
-  (if markdown-fontify-code-blocks-natively
-      (message "markdown-mode native code block fontification enabled")
-    (message "markdown-mode native code block fontification disabled"))
-  (markdown-reload-extensions))
-
-;; This is based on `org-src-lang-modes' from org-src.el
-(defcustom markdown-code-lang-modes
-  '(("ocaml" . tuareg-mode) ("elisp" . emacs-lisp-mode) ("ditaa" . artist-mode)
-    ("asymptote" . asy-mode) ("dot" . fundamental-mode) ("sqlite" . sql-mode)
-    ("calc" . fundamental-mode) ("C" . c-mode) ("cpp" . c++-mode)
-    ("C++" . c++-mode) ("screen" . shell-script-mode) ("shell" . sh-mode)
-    ("bash" . sh-mode))
-  "Alist mapping languages to their major mode.
-The key is the language name, the value is the major mode.  For
-many languages this is simple, but for language where this is not
-the case, this variable provides a way to simplify things on the
-user side.  For example, there is no ocaml-mode in Emacs, but the
-mode to use is `tuareg-mode'."
-  :group 'markdown
-  :type '(repeat
-          (cons
-           (string "Language name")
-           (symbol "Major mode")))
-  :package-version '(markdown-mode . "2.3"))
-
-(defun markdown-get-lang-mode (lang)
-  "Return major mode that should be used for LANG.
-LANG is a string, and the returned major mode is a symbol."
-  (cl-find-if
-   #'markdown--lang-mode-predicate
-   (nconc (list (cdr (assoc lang markdown-code-lang-modes))
-                (cdr (assoc (downcase lang) markdown-code-lang-modes)))
-          (and (fboundp 'treesit-language-available-p)
-               (list (and (treesit-language-available-p (intern lang))
-                          (intern (concat lang "-ts-mode")))
-                     (and (treesit-language-available-p (intern (downcase lang)))
-                          (intern (concat (downcase lang) "-ts-mode")))))
-          (list
-           (intern (concat lang "-mode"))
-           (intern (concat (downcase lang) "-mode"))))))
-
-(defun markdown--lang-mode-predicate (mode)
-  (and mode
-       (fboundp mode)
-       (or
-        ;; https://github.com/jrblevin/markdown-mode/issues/787
-        ;; major-mode-remap-alist was introduced at Emacs 29.1
-        (cl-loop for pair in (bound-and-true-p major-mode-remap-alist)
-                 for func = (cdr pair)
-                 thereis (and (atom func) (eq mode func)))
-        ;; https://github.com/jrblevin/markdown-mode/issues/761
-        (cl-loop for pair in auto-mode-alist
-                 for func = (cdr pair)
-                 thereis (and (atom func) (eq mode func))))))
-
-(defun markdown-fontify-code-blocks-generic (matcher last)
-  "Add text properties to next code block from point to LAST.
-Use matching function MATCHER."
-  (when (funcall matcher last)
-    (save-excursion
-      (save-match-data
-        (let* ((start (match-beginning 0))
-               (end (match-end 0))
-               ;; Find positions outside opening and closing backquotes.
-               (bol-prev (progn (goto-char start)
-                                (if (bolp) (line-beginning-position 0) (line-beginning-position))))
-               (eol-next (progn (goto-char end)
-                                (if (bolp) (line-beginning-position 2) (line-beginning-position 3))))
-               lang)
-          (if (and markdown-fontify-code-blocks-natively
-                   (or (setq lang (markdown-code-block-lang))
-                       markdown-fontify-code-block-default-mode))
-              (markdown-fontify-code-block-natively lang start end)
-            (add-text-properties start end '(face markdown-pre-face)))
-          ;; Set background for block as well as opening and closing lines.
-          (font-lock-append-text-property
-           bol-prev eol-next 'face 'markdown-code-face)
-          ;; Set invisible property for lines before and after, including newline.
-          (add-text-properties bol-prev start '(invisible markdown-markup))
-          (add-text-properties end eol-next '(invisible markdown-markup)))))
-    t))
-
-(defun markdown-fontify-gfm-code-blocks (last)
-  "Add text properties to next GFM code block from point to LAST."
-  (markdown-fontify-code-blocks-generic 'markdown-match-gfm-code-blocks last))
-
-(defun markdown-fontify-fenced-code-blocks (last)
-  "Add text properties to next tilde fenced code block from point to LAST."
-  (markdown-fontify-code-blocks-generic 'markdown-match-fenced-code-blocks last))
-
-;; Based on `org-src-font-lock-fontify-block' from org-src.el.
-(defun markdown-fontify-code-block-natively (lang start end)
-  "Fontify given GFM or fenced code block.
-This function is called by Emacs for automatic fontification when
-`markdown-fontify-code-blocks-natively' is non-nil.  LANG is the
-language used in the block. START and END specify the block
-position."
-  (let ((lang-mode (if lang (markdown-get-lang-mode lang)
-                     markdown-fontify-code-block-default-mode)))
-    (when (fboundp lang-mode)
-      (let ((string (buffer-substring-no-properties start end))
-            (modified (buffer-modified-p))
-            (markdown-buffer (current-buffer)) pos next)
-        (remove-text-properties start end '(face nil))
-        (with-current-buffer
-            (get-buffer-create
-             (concat " markdown-code-fontification:" (symbol-name lang-mode)))
-          ;; Make sure that modification hooks are not inhibited in
-          ;; the org-src-fontification buffer in case we're called
-          ;; from `jit-lock-function' (Bug#25132).
-          (let ((inhibit-modification-hooks nil))
-            (delete-region (point-min) (point-max))
-            (insert string " ")) ;; so there's a final property change
-          (unless (eq major-mode lang-mode) (funcall lang-mode))
-          (font-lock-ensure)
-          (setq pos (point-min))
-          (while (setq next (next-single-property-change pos 'face))
-            (let ((val (get-text-property pos 'face)))
-              (when val
-                (put-text-property
-                 (+ start (1- pos)) (1- (+ start next)) 'face
-                 val markdown-buffer)))
-            (setq pos next)))
-        (add-text-properties
-         start end
-         '(font-lock-fontified t fontified t font-lock-multiline t))
-        (set-buffer-modified-p modified)))))
-
-(require 'edit-indirect nil t)
-(defvar edit-indirect-guess-mode-function)
-(defvar edit-indirect-after-commit-functions)
-
-(defun markdown--edit-indirect-after-commit-function (beg end)
-  "Corrective logic run on code block content from lines BEG to END.
-Restores code block indentation from BEG to END, and ensures trailing newlines
-at the END of code blocks."
-  ;; ensure trailing newlines
-  (goto-char end)
-  (unless (eq (char-before) ?\n)
-    (insert "\n"))
-  ;; restore code block indentation
-  (goto-char (- beg 1))
-  (let ((block-indentation (current-indentation)))
-    (when (> block-indentation 0)
-      (indent-rigidly beg end block-indentation)))
-  (font-lock-ensure))
-
-(defun markdown-edit-code-block ()
-  "Edit Markdown code block in an indirect buffer."
-  (interactive)
-  (save-excursion
-    (if (fboundp 'edit-indirect-region)
-        (let* ((bounds (markdown-get-enclosing-fenced-block-construct))
-               (begin (and bounds (not (null (nth 0 bounds))) (goto-char (nth 0 bounds)) (line-beginning-position 2)))
-               (end (and bounds(not (null (nth 1 bounds)))  (goto-char (nth 1 bounds)) (line-beginning-position 1))))
-          (if (and begin end)
-              (let* ((indentation (and (goto-char (nth 0 bounds)) (current-indentation)))
-                     (lang (markdown-code-block-lang))
-                     (mode (or (and lang (markdown-get-lang-mode lang))
-                               markdown-edit-code-block-default-mode))
-                     (edit-indirect-guess-mode-function
-                      (lambda (_parent-buffer _beg _end)
-                        (funcall mode)))
-                     (indirect-buf (edit-indirect-region begin end 'display-buffer)))
-                ;; reset `sh-shell' when indirect buffer
-                (when (and (not (member system-type '(ms-dos windows-nt)))
-                           (member mode '(shell-script-mode sh-mode))
-                           (member lang (append
-                                         (mapcar (lambda (e) (symbol-name (car e)))
-                                                 sh-ancestor-alist)
-                                         '("csh" "rc" "sh"))))
-                  (with-current-buffer indirect-buf
-                    (sh-set-shell lang)))
-                (when (> indentation 0) ;; un-indent in edit-indirect buffer
-                  (with-current-buffer indirect-buf
-                    (indent-rigidly (point-min) (point-max) (- indentation)))))
-            (user-error "Not inside a GFM or tilde fenced code block")))
-      (when (y-or-n-p "Package edit-indirect needed to edit code blocks. Install it now? ")
-        (progn (package-refresh-contents)
-               (package-install 'edit-indirect)
-               (markdown-edit-code-block))))))
-
-
-;;; Table Editing =============================================================
-
-;; These functions were originally adapted from `org-table.el'.
-
-;; General helper functions
-
-(defmacro markdown--with-gensyms (symbols &rest body)
-  (declare (debug (sexp body)) (indent 1))
-  `(let ,(mapcar (lambda (s)
-                   `(,s (make-symbol (concat "--" (symbol-name ',s)))))
-                 symbols)
-     ,@body))
-
-(defun markdown--split-string (string &optional separators)
-  "Splits STRING into substrings at SEPARATORS.
-SEPARATORS is a regular expression. If nil it defaults to
-`split-string-default-separators'. This version returns no empty
-strings if there are matches at the beginning and end of string."
-  (let ((start 0) notfirst list)
-    (while (and (string-match
-                 (or separators split-string-default-separators)
-                 string
-                 (if (and notfirst
-                          (= start (match-beginning 0))
-                          (< start (length string)))
-                     (1+ start) start))
-                (< (match-beginning 0) (length string)))
-      (setq notfirst t)
-      (or (eq (match-beginning 0) 0)
-          (and (eq (match-beginning 0) (match-end 0))
-               (eq (match-beginning 0) start))
-          (push (substring string start (match-beginning 0)) list))
-      (setq start (match-end 0)))
-    (or (eq start (length string))
-        (push (substring string start) list))
-    (nreverse list)))
-
-(defun markdown--string-width (s)
-  "Return width of string S.
-This version ignores characters with invisibility property
-`markdown-markup'."
-  (let (b)
-    (when (or (eq t buffer-invisibility-spec)
-              (member 'markdown-markup buffer-invisibility-spec))
-      (while (setq b (text-property-any
-                      0 (length s)
-                      'invisible 'markdown-markup s))
-        (setq s (concat
-                 (substring s 0 b)
-                 (substring s (or (next-single-property-change
-                                   b 'invisible s)
-                                  (length s))))))))
-  (string-width s))
-
-(defun markdown--remove-invisible-markup (s)
-  "Remove Markdown markup from string S.
-This version removes characters with invisibility property
-`markdown-markup'."
-  (let (b)
-    (while (setq b (text-property-any
-                    0 (length s)
-                    'invisible 'markdown-markup s))
-      (setq s (concat
-               (substring s 0 b)
-               (substring s (or (next-single-property-change
-                                 b 'invisible s)
-                                (length s)))))))
-  s)
-
-;; Functions for maintaining tables
-
-(defvar markdown-table-at-point-p-function #'markdown--table-at-point-p
-  "Function to decide if point is inside a table.
-
-The indirection serves to differentiate between standard markdown
-tables and gfm tables which are less strict about the markup.")
-
-(defconst markdown-table-line-regexp "^[ \t]*|"
-  "Regexp matching any line inside a table.")
-
-(defconst markdown-table-hline-regexp "^[ \t]*|[-:]"
-  "Regexp matching hline inside a table.")
-
-(defconst markdown-table-dline-regexp "^[ \t]*|[^-:]"
-  "Regexp matching dline inside a table.")
-
-(defun markdown-table-at-point-p ()
-  "Return non-nil when point is inside a table."
-  (funcall markdown-table-at-point-p-function))
-
-(defun markdown--table-at-point-p ()
-  "Return non-nil when point is inside a table."
-  (save-excursion
-    (beginning-of-line)
-    (and (looking-at-p markdown-table-line-regexp)
-         (not (markdown-code-block-at-point-p)))))
-
-(defconst gfm-table-line-regexp "^.?*|"
-  "Regexp matching any line inside a table.")
-
-(defconst gfm-table-hline-regexp "^-+\\(|-\\)+"
-  "Regexp matching hline inside a table.")
-
-;; GFM simplified tables syntax is as follows:
-;; - A header line for the column names, this is any text
-;;   separated by `|'.
-;; - Followed by a string -|-|- ..., the number of dashes is optional
-;;   but must be higher than 1. The number of separators should match
-;;   the number of columns.
-;; - Followed by the rows of data, which has the same format as the
-;;   header line.
-;; Example:
-;;
-;; foo | bar
-;; ------|---------
-;; bar | baz
-;; bar | baz
-(defun gfm--table-at-point-p ()
-  "Return non-nil when point is inside a gfm-compatible table."
-  (or (markdown--table-at-point-p)
-      (save-excursion
-        (beginning-of-line)
-        (when (looking-at-p gfm-table-line-regexp)
-          ;; we might be at the first line of the table, check if the
-          ;; line below is the hline
-          (or (save-excursion
-                (forward-line 1)
-                (looking-at-p gfm-table-hline-regexp))
-              ;; go up to find the header
-              (catch 'done
-                (while (looking-at-p gfm-table-line-regexp)
-                  (cond
-                   ((looking-at-p gfm-table-hline-regexp)
-                    (throw 'done t))
-                   ((bobp)
-                    (throw 'done nil)))
-                  (forward-line -1))
-                nil))))))
-
-(defun markdown-table-hline-at-point-p ()
-  "Return non-nil when point is on a hline in a table.
-This function assumes point is on a table."
-  (save-excursion
-    (beginning-of-line)
-    (looking-at-p markdown-table-hline-regexp)))
-
-(defun markdown-table-begin ()
-  "Find the beginning of the table and return its position.
-This function assumes point is on a table."
-  (save-excursion
-    (while (and (not (bobp))
-                (markdown-table-at-point-p))
-      (forward-line -1))
-    (unless (or (eobp)
-                (markdown-table-at-point-p))
-      (forward-line 1))
-    (point)))
-
-(defun markdown-table-end ()
-  "Find the end of the table and return its position.
-This function assumes point is on a table."
-  (save-excursion
-    (while (and (not (eobp))
-                (markdown-table-at-point-p))
-      (forward-line 1))
-    (point)))
-
-(defun markdown-table-get-dline ()
-  "Return index of the table data line at point.
-This function assumes point is on a table."
-  (let ((pos (point)) (end (markdown-table-end)) (cnt 0))
-    (save-excursion
-      (goto-char (markdown-table-begin))
-      (while (and (re-search-forward
-                   markdown-table-dline-regexp end t)
-                  (setq cnt (1+ cnt))
-                  (< (line-end-position) pos))))
-    cnt))
-
-(defun markdown--thing-at-wiki-link (pos)
-  (when markdown-enable-wiki-links
-    (save-excursion
-      (save-match-data
-        (goto-char pos)
-        (thing-at-point-looking-at markdown-regex-wiki-link)))))
-
-(defun markdown-table-get-column ()
-  "Return table column at point.
-This function assumes point is on a table."
-  (let ((pos (point)) (cnt 0))
-    (save-excursion
-      (beginning-of-line)
-      (while (search-forward "|" pos t)
-        (when (and (not (looking-back "\\\\|" (line-beginning-position)))
-                   (not (markdown--thing-at-wiki-link (match-beginning 0))))
-          (setq cnt (1+ cnt)))))
-    cnt))
-
-(defun markdown-table-get-cell (&optional n)
-  "Return the content of the cell in column N of current row.
-N defaults to column at point. This function assumes point is on
-a table."
-  (and n (markdown-table-goto-column n))
-  (skip-chars-backward "^|\n") (backward-char 1)
-  (if (looking-at "|[^|\r\n]*")
-      (let* ((pos (match-beginning 0))
-             (val (buffer-substring (1+ pos) (match-end 0))))
-        (goto-char (min (line-end-position) (+ 2 pos)))
-        ;; Trim whitespaces
-        (setq val (replace-regexp-in-string "\\`[ \t]+" "" val)
-              val (replace-regexp-in-string "[ \t]+\\'" "" val)))
-    (forward-char 1) ""))
-
-(defun markdown-table-goto-dline (n)
-  "Go to the Nth data line in the table at point.
-Return t when the line exists, nil otherwise. This function
-assumes point is on a table."
-  (goto-char (markdown-table-begin))
-  (let ((end (markdown-table-end)) (cnt 0))
-    (while (and (re-search-forward
-                 markdown-table-dline-regexp end t)
-                (< (setq cnt (1+ cnt)) n)))
-    (= cnt n)))
-
-(defun markdown-table-goto-column (n &optional on-delim)
-  "Go to the Nth column in the table line at point.
-With optional argument ON-DELIM, stop with point before the left
-delimiter of the cell. If there are less than N cells, just go
-beyond the last delimiter. This function assumes point is on a
-table."
-  (beginning-of-line 1)
-  (when (> n 0)
-    (while (and (> n 0) (search-forward "|" (line-end-position) t))
-      (when (and (not (looking-back "\\\\|" (line-beginning-position)))
-                 (not (markdown--thing-at-wiki-link (match-beginning 0))))
-        (cl-decf n)))
-    (if on-delim
-        (backward-char 1)
-      (when (looking-at " ") (forward-char 1)))))
-
-(defmacro markdown-table-save-cell (&rest body)
-  "Save cell at point, execute BODY and restore cell.
-This function assumes point is on a table."
-  (declare (debug (body)))
-  (markdown--with-gensyms (line column)
-    `(let ((,line (copy-marker (line-beginning-position)))
-           (,column (markdown-table-get-column)))
-       (unwind-protect
-           (progn ,@body)
-         (goto-char ,line)
-         (markdown-table-goto-column ,column)
-         (set-marker ,line nil)))))
-
-(defun markdown-table-blank-line (s)
-  "Convert a table line S into a line with blank cells."
-  (if (string-match "^[ \t]*|-" s)
-      (setq s (mapconcat
-               (lambda (x) (if (member x '(?| ?+)) "|" " "))
-               s ""))
-    (with-temp-buffer
-      (insert s)
-      (goto-char (point-min))
-      (when (re-search-forward "|" nil t)
-        (let ((cur (point))
-              ret)
-          (while (re-search-forward "|" nil t)
-            (when (and (not (eql (char-before (match-beginning 0)) ?\\))
-                       (not (markdown--thing-at-wiki-link (match-beginning 0))))
-              (push (make-string (- (match-beginning 0) cur) ? ) ret)
-              (setq cur (match-end 0))))
-          (format "|%s|" (string-join (nreverse ret) "|")))))))
-
-(defun markdown-table-colfmt (fmtspec)
-  "Process column alignment specifier FMTSPEC for tables."
-  (when (stringp fmtspec)
-    (mapcar (lambda (x)
-              (cond ((string-match-p "^:.*:$" x) 'c)
-                    ((string-match-p "^:"     x) 'l)
-                    ((string-match-p ":$"     x) 'r)
-                    (t 'd)))
-            (markdown--split-string fmtspec "\\s-*|\\s-*"))))
-
-(defun markdown--first-column-p (bar-pos)
-  (save-excursion
-    (save-match-data
-      (goto-char bar-pos)
-      (looking-back "^\\s-*" (line-beginning-position)))))
-
-(defun markdown--table-line-to-columns (line)
-  (with-temp-buffer
-    (insert line)
-    (goto-char (point-min))
-    (let ((cur (point))
-          ret)
-      (while (and (re-search-forward "\\s-*\\(|\\)\\s-*" nil t))
-        (when (not (markdown--face-p (match-beginning 1) '(markdown-inline-code-face)))
-          (if (markdown--first-column-p (match-beginning 1))
-              (setq cur (match-end 0))
-            (cond ((eql (char-before (match-beginning 1)) ?\\)
-                   ;; keep spaces
-                   (goto-char (match-end 1)))
-                  ((markdown--thing-at-wiki-link (match-beginning 1))) ;; do nothing
-                  (t
-                   (push (buffer-substring-no-properties cur (match-beginning 0)) ret)
-                   (setq cur (match-end 0)))))))
-      (when (< cur (length line))
-        (push (buffer-substring-no-properties cur (point-max)) ret))
-      (nreverse ret))))
-
-(defsubst markdown--is-delimiter-row (line)
-  (and (string-match-p "\\`[ \t]*|[ \t]*[-:]" line)
-       (cl-loop for c across line
-                always (member c '(?| ?- ?: ?\t ? )))))
-
-(defun markdown-table-align ()
-  "Align table at point.
-This function assumes point is on a table."
-  (interactive)
-  (let ((begin (markdown-table-begin))
-        (end (copy-marker (markdown-table-end))))
-    (markdown-table-save-cell
-     (goto-char begin)
-     (let* (fmtspec
-            ;; Store table indent
-            (indent (progn (looking-at "[ \t]*") (match-string 0)))
-            ;; Split table in lines and save column format specifier
-            (lines (mapcar (lambda (line)
-                             (if (markdown--is-delimiter-row line)
-                                 (progn (setq fmtspec (or fmtspec line)) nil)
-                               line))
-                           (markdown--split-string (buffer-substring begin end) "\n")))
-            ;; Split lines in cells
-            (cells (mapcar (lambda (l) (markdown--table-line-to-columns l))
-                           (remq nil lines)))
-            ;; Calculate maximum number of cells in a line
-            (maxcells (if cells
-                          (apply #'max (mapcar #'length cells))
-                        (user-error "Empty table")))
-            ;; Empty cells to fill short lines
-            (emptycells (make-list maxcells ""))
-            maxwidths)
-       ;; Calculate maximum width for each column
-       (dotimes (i maxcells)
-         (let ((column (mapcar (lambda (x) (or (nth i x) "")) cells)))
-           (push (apply #'max 1 (mapcar #'markdown--string-width column))
-                 maxwidths)))
-       (setq maxwidths (nreverse maxwidths))
-       ;; Process column format specifier
-       (setq fmtspec (markdown-table-colfmt fmtspec))
-       ;; Compute formats needed for output of table lines
-       (let ((hfmt (concat indent "|"))
-             (rfmt (concat indent "|"))
-             hfmt1 rfmt1 fmt)
-         (dolist (width maxwidths (setq hfmt (concat (substring hfmt 0 -1) "|")))
-           (setq fmt (pop fmtspec))
-           (cond ((equal fmt 'l) (setq hfmt1 ":%s-|" rfmt1 " %%-%ds |"))
-                 ((equal fmt 'r) (setq hfmt1 "-%s:|" rfmt1  " %%%ds |"))
-                 ((equal fmt 'c) (setq hfmt1 ":%s:|" rfmt1 " %%-%ds |"))
-                 (t              (setq hfmt1 "-%s-|" rfmt1 " %%-%ds |")))
-           (setq rfmt (concat rfmt (format rfmt1 width)))
-           (setq hfmt (concat hfmt (format hfmt1 (make-string width ?-)))))
-         ;; Replace modified lines only
-         (dolist (line lines)
-           (let ((line (if line
-                           (apply #'format rfmt (append (pop cells) emptycells))
-                         hfmt))
-                 (previous (buffer-substring (point) (line-end-position))))
-             (if (equal previous line)
-                 (forward-line)
-               (insert line "\n")
-               (delete-region (point) (line-beginning-position 2))))))
-       (set-marker end nil)))))
-
-(defun markdown-table-insert-row (&optional arg)
-  "Insert a new row above the row at point into the table.
-With optional argument ARG, insert below the current row."
-  (interactive "P")
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let* ((line (buffer-substring
-                (line-beginning-position) (line-end-position)))
-         (new (markdown-table-blank-line line)))
-    (beginning-of-line (if arg 2 1))
-    (unless (bolp) (insert "\n"))
-    (insert-before-markers new "\n")
-    (beginning-of-line 0)
-    (re-search-forward "| ?" (line-end-position) t)))
-
-(defun markdown-table-delete-row ()
-  "Delete row or horizontal line at point from the table."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let ((col (current-column)))
-    (kill-region (line-beginning-position)
-                 (min (1+ (line-end-position)) (point-max)))
-    (unless (markdown-table-at-point-p) (beginning-of-line 0))
-    (move-to-column col)))
-
-(defun markdown-table-move-row (&optional up)
-  "Move table line at point down.
-With optional argument UP, move it up."
-  (interactive "P")
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let* ((col (current-column)) (pos (point))
-         (tonew (if up 0 2)) txt)
-    (beginning-of-line tonew)
-    (unless (markdown-table-at-point-p)
-      (goto-char pos) (user-error "Cannot move row further"))
-    (goto-char pos) (beginning-of-line 1) (setq pos (point))
-    (setq txt (buffer-substring (point) (1+ (line-end-position))))
-    (delete-region (point) (1+ (line-end-position)))
-    (beginning-of-line tonew)
-    (insert txt) (beginning-of-line 0)
-    (move-to-column col)))
-
-(defun markdown-table-move-row-up ()
-  "Move table row at point up."
-  (interactive)
-  (markdown-table-move-row 'up))
-
-(defun markdown-table-move-row-down ()
-  "Move table row at point down."
-  (interactive)
-  (markdown-table-move-row nil))
-
-(defun markdown-table-insert-column ()
-  "Insert a new table column."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let* ((col (max 1 (markdown-table-get-column)))
-         (begin (markdown-table-begin))
-         (end (copy-marker (markdown-table-end))))
-    (markdown-table-save-cell
-     (goto-char begin)
-     (while (< (point) end)
-       (markdown-table-goto-column col t)
-       (if (markdown-table-hline-at-point-p)
-           (insert "|---")
-         (insert "|   "))
-       (forward-line)))
-    (set-marker end nil)
-    (when markdown-table-align-p
-      (markdown-table-align))))
-
-(defun markdown-table-delete-column ()
-  "Delete column at point from table."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let ((col (markdown-table-get-column))
-        (begin (markdown-table-begin))
-        (end (copy-marker (markdown-table-end))))
-    (markdown-table-save-cell
-     (goto-char begin)
-     (while (< (point) end)
-       (markdown-table-goto-column col t)
-       (and (looking-at "|\\(?:\\\\|\\|[^|\n]\\)+|")
-            (replace-match "|"))
-       (forward-line)))
-    (set-marker end nil)
-    (markdown-table-goto-column (max 1 (1- col)))
-    (when markdown-table-align-p
-      (markdown-table-align))))
-
-(defun markdown-table-move-column (&optional left)
-  "Move table column at point to the right.
-With optional argument LEFT, move it to the left."
-  (interactive "P")
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let* ((col (markdown-table-get-column))
-         (col1 (if left (1- col) col))
-         (colpos (if left (1- col) (1+ col)))
-         (begin (markdown-table-begin))
-         (end (copy-marker (markdown-table-end))))
-    (when (and left (= col 1))
-      (user-error "Cannot move column further left"))
-    (when (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
-      (user-error "Cannot move column further right"))
-    (markdown-table-save-cell
-     (goto-char begin)
-     (while (< (point) end)
-       (markdown-table-goto-column col1 t)
-       (when (looking-at "|\\(\\(?:\\\\|\\|[^|\n]\\|\\)+\\)|\\(\\(?:\\\\|\\|[^|\n]\\|\\)+\\)|")
-         (replace-match "|\\2|\\1|"))
-       (forward-line)))
-    (set-marker end nil)
-    (markdown-table-goto-column colpos)
-    (when markdown-table-align-p
-      (markdown-table-align))))
-
-(defun markdown-table-move-column-left ()
-  "Move table column at point to the left."
-  (interactive)
-  (markdown-table-move-column 'left))
-
-(defun markdown-table-move-column-right ()
-  "Move table column at point to the right."
-  (interactive)
-  (markdown-table-move-column nil))
-
-(defun markdown-table-next-row ()
-  "Go to the next row (same column) in the table.
-Create new table lines if required."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (if (or (looking-at "[ \t]*$")
-          (save-excursion (skip-chars-backward " \t") (bolp)))
-      (newline)
-    (when markdown-table-align-p
-      (markdown-table-align))
-    (let ((col (markdown-table-get-column)))
-      (beginning-of-line 2)
-      (if (or (not (markdown-table-at-point-p))
-              (markdown-table-hline-at-point-p))
-          (progn
-            (beginning-of-line 0)
-            (markdown-table-insert-row 'below)))
-      (markdown-table-goto-column col)
-      (skip-chars-backward "^|\n\r")
-      (when (looking-at " ") (forward-char 1)))))
-
-(defun markdown-table-forward-cell ()
-  "Go to the next cell in the table.
-Create new table lines if required."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (when markdown-table-align-p
-    (markdown-table-align))
-  (let ((end (markdown-table-end)))
-    (when (markdown-table-hline-at-point-p) (end-of-line 1))
-    (condition-case nil
-        (progn
-          (re-search-forward "\\(?:^\\|[^\\]\\)|" end)
-          (when (looking-at "[ \t]*$")
-            (re-search-forward "\\(?:^\\|[^\\]:\\)|" end))
-          (when (and (looking-at "[-:]")
-                     (re-search-forward "^\\(?:[ \t]*\\|[^\\]\\)|\\([^-:]\\)" end t))
-            (goto-char (match-beginning 1)))
-          (if (looking-at "[-:]")
-              (progn
-                (beginning-of-line 0)
-                (markdown-table-insert-row 'below))
-            (when (looking-at " ") (forward-char 1))))
-      (error (markdown-table-insert-row 'below)))))
-
-(defun markdown-table-backward-cell ()
-  "Go to the previous cell in the table."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (when markdown-table-align-p
-    (markdown-table-align))
-  (when (markdown-table-hline-at-point-p) (beginning-of-line 1))
-  (condition-case nil
-      (progn
-        (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin))
-        ;; When this function is called while in the first cell in a
-        ;; table, the point will now be at the beginning of a line. In
-        ;; this case, we need to move past one additional table
-        ;; boundary, the end of the table on the previous line.
-        (when (= (point) (line-beginning-position))
-          (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin)))
-        (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin)))
-    (error (user-error "Cannot move to previous table cell")))
-  (when (looking-at "\\(?:^\\|[^\\]\\)| ?") (goto-char (match-end 0)))
-
-  ;; This may have dropped point on the hline.
-  (when (markdown-table-hline-at-point-p)
-    (markdown-table-backward-cell)))
-
-(defun markdown-table-transpose ()
-  "Transpose table at point.
-Horizontal separator lines will be eliminated."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  (let* ((table (buffer-substring-no-properties
-                 (markdown-table-begin) (markdown-table-end)))
-         ;; Convert table to Lisp structure
-         (table (delq nil
-                      (mapcar
-                       (lambda (x)
-                         (unless (string-match-p
-                                  markdown-table-hline-regexp x)
-                           (markdown--table-line-to-columns x)))
-                       (markdown--split-string table "[ \t]*\n[ \t]*"))))
-         (dline_old (markdown-table-get-dline))
-         (col_old (markdown-table-get-column))
-         (contents (mapcar (lambda (_)
-                             (let ((tp table))
-                               (mapcar
-                                (lambda (_)
-                                  (prog1
-                                      (pop (car tp))
-                                    (setq tp (cdr tp))))
-                                table)))
-                           (car table))))
-    (goto-char (markdown-table-begin))
-    (save-excursion
-      (re-search-forward "|") (backward-char)
-      (delete-region (point) (markdown-table-end))
-      (insert (mapconcat
-               (lambda(x)
-                 (concat "| " (mapconcat 'identity x " | " ) " |\n"))
-               contents "")))
-    (markdown-table-goto-dline col_old)
-    (markdown-table-goto-column dline_old))
-  (when markdown-table-align-p
-    (markdown-table-align)))
-
-(defun markdown-table-sort-lines (&optional sorting-type)
-  "Sort table lines according to the column at point.
-
-The position of point indicates the column to be used for
-sorting, and the range of lines is the range between the nearest
-horizontal separator lines, or the entire table of no such lines
-exist. If point is before the first column, user will be prompted
-for the sorting column. If there is an active region, the mark
-specifies the first line and the sorting column, while point
-should be in the last line to be included into the sorting.
-
-The command then prompts for the sorting type which can be
-alphabetically or numerically. Sorting in reverse order is also
-possible.
-
-If SORTING-TYPE is specified when this function is called from a
-Lisp program, no prompting will take place. SORTING-TYPE must be
-a character, any of (?a ?A ?n ?N) where the capital letters
-indicate that sorting should be done in reverse order."
-  (interactive)
-  (unless (markdown-table-at-point-p)
-    (user-error "Not at a table"))
-  ;; Set sorting type and column used for sorting
-  (let ((column (let ((c (markdown-table-get-column)))
-                  (cond ((> c 0) c)
-                        ((called-interactively-p 'any)
-                         (read-number "Use column N for sorting: "))
-                        (t 1))))
-        (sorting-type
-         (or sorting-type
-             (progn
-               ;; workaround #641
-               ;; Emacs < 28 hides prompt message by another message. This erases it.
-               (message "")
-               (read-char-exclusive
-                "Sort type: [a]lpha [n]umeric (A/N means reversed): ")))))
-    (save-restriction
-      ;; Narrow buffer to appropriate sorting area
-      (if (region-active-p)
-          (narrow-to-region
-           (save-excursion
-             (progn
-               (goto-char (region-beginning)) (line-beginning-position)))
-           (save-excursion
-             (progn
-               (goto-char (region-end)) (line-end-position))))
-        (let ((start (markdown-table-begin))
-              (end (markdown-table-end)))
-          (narrow-to-region
-           (save-excursion
-             (if (re-search-backward
-                  markdown-table-hline-regexp start t)
-                 (line-beginning-position 2)
-               start))
-           (if (save-excursion (re-search-forward
-                                markdown-table-hline-regexp end t))
-               (match-beginning 0)
-             end))))
-      ;; Determine arguments for `sort-subr'
-      (let* ((extract-key-from-cell
-              (cl-case sorting-type
-                ((?a ?A) #'markdown--remove-invisible-markup) ;; #'identity)
-                ((?n ?N) #'string-to-number)
-                (t (user-error "Invalid sorting type: %c" sorting-type))))
-             (predicate
-              (cl-case sorting-type
-                ((?n ?N) #'<)
-                ((?a ?A) #'string<))))
-        ;; Sort selected area
-        (goto-char (point-min))
-        (sort-subr (memq sorting-type '(?A ?N))
-                   (lambda ()
-                     (forward-line)
-                     (while (and (not (eobp))
-                                 (not (looking-at
-                                       markdown-table-dline-regexp)))
-                       (forward-line)))
-                   #'end-of-line
-                   (lambda ()
-                     (funcall extract-key-from-cell
-                              (markdown-table-get-cell column)))
-                   nil
-                   predicate)
-        (goto-char (point-min))))))
-
-(defun markdown-table-convert-region (begin end &optional separator)
-  "Convert region from BEGIN to END to table with SEPARATOR.
-
-If every line contains at least one TAB character, the function
-assumes that the material is tab separated (TSV). If every line
-contains a comma, comma-separated values (CSV) are assumed. If
-not, lines are split at whitespace into cells.
-
-You can use a prefix argument to force a specific separator:
-\\[universal-argument] once forces CSV, \\[universal-argument]
-twice forces TAB, and \\[universal-argument] three times will
-prompt for a regular expression to match the separator, and a
-numeric argument N indicates that at least N consecutive
-spaces, or alternatively a TAB should be used as the separator."
-
-  (interactive "r\nP")
-  (let* ((begin (min begin end)) (end (max begin end)) re)
-    (goto-char begin) (beginning-of-line 1)
-    (setq begin (point-marker))
-    (goto-char end)
-    (if (bolp) (backward-char 1) (end-of-line 1))
-    (setq end (point-marker))
-    (when (equal separator '(64))
-      (setq separator (read-regexp "Regexp for cell separator: ")))
-    (unless separator
-      ;; Get the right cell separator
-      (goto-char begin)
-      (setq separator
-            (cond
-             ((not (re-search-forward "^[^\n\t]+$" end t)) '(16))
-             ((not (re-search-forward "^[^\n,]+$" end t)) '(4))
-             (t 1))))
-    (goto-char begin)
-    (if (equal separator '(4))
-        ;; Parse CSV
-        (while (< (point) end)
-          (cond
-           ((looking-at "^") (insert "| "))
-           ((looking-at "[ \t]*$") (replace-match " |") (beginning-of-line 2))
-           ((looking-at "[ \t]*\"\\([^\"\n]*\\)\"")
-            (replace-match "\\1") (if (looking-at "\"") (insert "\"")))
-           ((looking-at "[^,\n]+") (goto-char (match-end 0)))
-           ((looking-at "[ \t]*,") (replace-match " | "))
-           (t (beginning-of-line 2))))
-      (setq re
-            (cond
-             ((equal separator '(4))  "^\\|\"?[ \t]*,[ \t]*\"?")
-             ((equal separator '(16)) "^\\|\t")
-             ((integerp separator)
-              (if (< separator 1)
-                  (user-error "Cell separator must contain one or more spaces")
-                (format "^ *\\| *\t *\\| \\{%d,\\}\\|$" separator)))
-             ((stringp separator) (format "^ *\\|%s" separator))
-             (t (error "Invalid cell separator"))))
-      (let (finish)
-        (while (and (not finish) (re-search-forward re end t))
-          (if (eolp)
-              (progn
-                (replace-match "|" t t)
-                (forward-line 1)
-                (when (eobp)
-                  (setq finish t)))
-            (replace-match "| " t t)))))
-    (goto-char begin)
-    (when markdown-table-align-p
-      (markdown-table-align))))
-
-(defun markdown-insert-table (&optional rows columns align)
-  "Insert an empty pipe table.
-Optional arguments ROWS, COLUMNS, and ALIGN specify number of
-rows and columns and the column alignment."
-  (interactive)
-  (let* ((rows (or rows (read-number "Number of Rows: ")))
-         (columns (or columns (read-number "Number of Columns: ")))
-         (align (or align (read-string "Alignment ([l]eft, [r]ight, [c]enter, or RET for default): ")))
-         (align (cond ((equal align "l") ":--")
-                      ((equal align "r") "--:")
-                      ((equal align "c") ":-:")
-                      (t "---")))
-         (pos (point))
-         (indent (make-string (current-column) ?\ ))
-         (line (concat
-                (apply 'concat indent "|"
-                       (make-list columns "   |")) "\n"))
-         (hline (apply 'concat indent "|"
-                       (make-list columns (concat align "|")))))
-    (if (string-match
-         "^[ \t]*$" (buffer-substring-no-properties
-                     (line-beginning-position) (point)))
-        (beginning-of-line 1)
-      (newline))
-    (dotimes (_ rows) (insert line))
-    (goto-char pos)
-    (if (> rows 1)
-        (progn
-          (end-of-line 1) (insert (concat "\n" hline)) (goto-char pos)))
-    (markdown-table-forward-cell)))
-
-
-;;; ElDoc Support =============================================================
-
-(defun markdown-eldoc-function (&rest _ignored)
-  "Return a helpful string when appropriate based on context.
-* Report URL when point is at a hidden URL.
-* Report language name when point is a code block with hidden markup."
-  (cond
-   ;; Hidden URL or reference for inline link
-   ((and (or (thing-at-point-looking-at markdown-regex-link-inline)
-             (thing-at-point-looking-at markdown-regex-link-reference))
-         (or markdown-hide-urls markdown-hide-markup))
-    (let* ((imagep (string-equal (match-string 1) "!"))
-           (referencep (string-equal (match-string 5) "["))
-           (link (match-string-no-properties 6))
-           (edit-keys (markdown--substitute-command-keys
-                       (if imagep
-                           "\\[markdown-insert-image]"
-                         "\\[markdown-insert-link]")))
-           (edit-str (propertize edit-keys 'face 'font-lock-constant-face))
-           (object (if referencep "reference" "URL")))
-      (format "Hidden %s (%s to edit): %s" object edit-str
-              (if referencep
-                  (concat
-                   (propertize "[" 'face 'markdown-markup-face)
-                   (propertize link 'face 'markdown-reference-face)
-                   (propertize "]" 'face 'markdown-markup-face))
-                (propertize link 'face 'markdown-url-face)))))
-   ;; Hidden language name for fenced code blocks
-   ((and (markdown-code-block-at-point-p)
-         (not (get-text-property (point) 'markdown-pre))
-         markdown-hide-markup)
-    (let ((lang (save-excursion (markdown-code-block-lang))))
-      (unless lang (setq lang "[unspecified]"))
-      (format "Hidden code block language: %s (%s to toggle markup)"
-              (propertize lang 'face 'markdown-language-keyword-face)
-              (markdown--substitute-command-keys
-               "\\[markdown-toggle-markup-hiding]"))))))
-
-(defun markdown--image-media-handler (mimetype data)
-  (let* ((ext (symbol-name (mailcap-mime-type-to-extension mimetype)))
-         (filename (read-string "Insert filename for image: "))
-         (link-text (read-string "Link text: "))
-         (filepath (file-name-with-extension filename ext))
-         (dir (file-name-directory filepath)))
-    (when (and dir (not (file-directory-p dir)))
-      (make-directory dir t))
-    (with-temp-file filepath
-      (insert data))
-    (when (string-match-p "\\s-" filepath)
-      (setq filepath (concat "<" filepath ">")))
-    (markdown-insert-inline-image link-text filepath)))
-
-(defun markdown--file-media-handler (_mimetype data)
-  (let* ((data (split-string data "[\0\r\n]" t "^file://"))
-         (files (cdr data)))
-    (while (not (null files))
-      (let* ((file (url-unhex-string (car files)))
-             (file (file-relative-name file))
-             (prompt (format "Link text(%s): " (file-name-nondirectory file)))
-             (link-text (read-string prompt)))
-        (when (string-match-p "\\s-" file)
-          (setq file (concat "<" file ">")))
-        (markdown-insert-inline-image link-text file)
-        (when (not (null (cdr files)))
-          (insert " "))
-        (setq files (cdr files))))))
-
-(defun markdown--dnd-local-file-handler (url _action)
-  (require 'mailcap)
-  (require 'dnd)
-  (let* ((filename (dnd-get-local-file-name url))
-         (mimetype (mailcap-file-name-to-mime-type filename))
-         (file (file-relative-name filename))
-         (link-text "link text"))
-    (when (string-match-p "\\s-" file)
-      (setq file (concat "<" file ">")))
-    (if (string-prefix-p "image/" mimetype)
-        (markdown-insert-inline-image link-text file)
-      (markdown-insert-inline-link link-text file))))
-
-
-;;; Mode Definition  ==========================================================
-
-(defun markdown-show-version ()
-  "Show the version number in the minibuffer."
-  (interactive)
-  (message "markdown-mode, version %s" markdown-mode-version))
-
-(defun markdown-mode-info ()
-  "Open the `markdown-mode' homepage."
-  (interactive)
-  (browse-url "https://jblevins.org/projects/markdown-mode/"))
-
-;;;###autoload
-(define-derived-mode markdown-mode text-mode "Markdown"
-  "Major mode for editing Markdown files."
-  (when buffer-read-only
-    (when (or (not (buffer-file-name)) (file-writable-p (buffer-file-name)))
-      (setq-local buffer-read-only nil)))
-  ;; Natural Markdown tab width
-  (setq tab-width 4)
-  ;; Comments
-  (setq-local comment-start "<!-- ")
-  (setq-local comment-end " -->")
-  (setq-local comment-start-skip "<!--[ \t]*")
-  (setq-local comment-column 0)
-  (setq-local comment-auto-fill-only-comments nil)
-  (setq-local comment-use-syntax t)
-  ;; Sentence
-  (setq-local sentence-end-base "[.?!…‽][]\"'”’)}»›*_`~]*")
-  ;; Syntax
-  (add-hook 'syntax-propertize-extend-region-functions
-            #'markdown-syntax-propertize-extend-region nil t)
-  (add-hook 'jit-lock-after-change-extend-region-functions
-            #'markdown-font-lock-extend-region-function t t)
-  (setq-local syntax-propertize-function #'markdown-syntax-propertize)
-  (syntax-propertize (point-max)) ;; Propertize before hooks run, etc.
-  ;; Font lock.
-  (setq font-lock-defaults
-        '(markdown-mode-font-lock-keywords
-          nil nil nil nil
-          (font-lock-multiline . t)
-          (font-lock-syntactic-face-function . markdown-syntactic-face)
-          (font-lock-extra-managed-props
-           . (composition display invisible rear-nonsticky
-                          keymap help-echo mouse-face))))
-  (if markdown-hide-markup
-      (add-to-invisibility-spec 'markdown-markup)
-    (remove-from-invisibility-spec 'markdown-markup))
-  ;; Wiki links
-  (markdown-setup-wiki-link-hooks)
-  ;; Math mode
-  (when markdown-enable-math (markdown-toggle-math t))
-  ;; Add a buffer-local hook to reload after file-local variables are read
-  (add-hook 'hack-local-variables-hook #'markdown-handle-local-variables nil t)
-  ;; For imenu support
-  (setq imenu-create-index-function
-        (if markdown-nested-imenu-heading-index
-            #'markdown-imenu-create-nested-index
-          #'markdown-imenu-create-flat-index))
-
-  ;; Defun movement
-  (setq-local beginning-of-defun-function #'markdown-beginning-of-defun)
-  (setq-local end-of-defun-function #'markdown-end-of-defun)
-  ;; Paragraph filling
-  (setq-local fill-paragraph-function #'markdown-fill-paragraph)
-  (setq-local paragraph-start
-              ;; Should match start of lines that start or separate paragraphs
-              (mapconcat #'identity
-                         '(
-                           "\f" ; starts with a literal line-feed
-                           "[ \t\f]*$" ; space-only line
-                           "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
-                           "[ \t]*[*+-][ \t]+" ; unordered list item
-                           "[ \t]*\\(?:[0-9]+\\|#\\)\\.[ \t]+" ; ordered list item
-                           "[ \t]*\\[\\S-*\\]:[ \t]+" ; link ref def
-                           "[ \t]*:[ \t]+" ; definition
-                           "^|" ; table or Pandoc line block
-                           )
-                         "\\|"))
-  (setq-local paragraph-separate
-              ;; Should match lines that separate paragraphs without being
-              ;; part of any paragraph:
-              (mapconcat #'identity
-                         '("[ \t\f]*$" ; space-only line
-                           "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
-                           ;; The following is not ideal, but the Fill customization
-                           ;; options really only handle paragraph-starting prefixes,
-                           ;; not paragraph-ending suffixes:
-                           ".*  $" ; line ending in two spaces
-                           "^#+"
-                           "^\\(?:   \\)?[-=]+[ \t]*$" ;; setext
-                           "[ \t]*\\[\\^\\S-*\\]:[ \t]*$") ; just the start of a footnote def
-                         "\\|"))
-  (setq-local adaptive-fill-first-line-regexp "\\`[ \t]*[A-Z]?>[ \t]*?\\'")
-  (setq-local adaptive-fill-regexp "\\s-*")
-  (setq-local adaptive-fill-function #'markdown-adaptive-fill-function)
-  (setq-local fill-forward-paragraph-function #'markdown-fill-forward-paragraph)
-  ;; Outline mode
-  (setq-local outline-regexp markdown-regex-header)
-  (setq-local outline-level #'markdown-outline-level)
-  ;; Cause use of ellipses for invisible text.
-  (add-to-invisibility-spec '(outline . t))
-  ;; ElDoc support
-  (if (boundp 'eldoc-documentation-functions)
-      (add-hook 'eldoc-documentation-functions #'markdown-eldoc-function nil t)
-    (add-function :before-until (local 'eldoc-documentation-function)
-                  #'markdown-eldoc-function))
-  ;; Inhibiting line-breaking:
-  ;; Separating out each condition into a separate function so that users can
-  ;; override if desired (with remove-hook)
-  (add-hook 'fill-nobreak-predicate
-            #'markdown-line-is-reference-definition-p nil t)
-  (add-hook 'fill-nobreak-predicate
-            #'markdown-pipe-at-bol-p nil t)
-
-  ;; Indentation
-  (setq-local indent-line-function markdown-indent-function)
-  (setq-local indent-region-function #'markdown--indent-region)
-
-  ;; Flyspell
-  (setq-local flyspell-generic-check-word-predicate
-              #'markdown-flyspell-check-word-p)
-
-  ;; Electric quoting
-  (add-hook 'electric-quote-inhibit-functions
-            #'markdown--inhibit-electric-quote nil :local)
-
-  ;; drag and drop handler
-  (setq-local dnd-protocol-alist  (cons '("^file:///" . markdown--dnd-local-file-handler)
-                                        dnd-protocol-alist))
-
-  ;; media handler
-  (when (version< "29" emacs-version)
-    (yank-media-handler "image/.*" #'markdown--image-media-handler)
-    ;; TODO support other than GNOME, like KDE etc
-    (yank-media-handler "x-special/gnome-copied-files" #'markdown--file-media-handler))
-
-  ;; Make checkboxes buttons
-  (when markdown-make-gfm-checkboxes-buttons
-    (markdown-make-gfm-checkboxes-buttons (point-min) (point-max))
-    (add-hook 'after-change-functions #'markdown-gfm-checkbox-after-change-function t t)
-    (add-hook 'change-major-mode-hook #'markdown-remove-gfm-checkbox-overlays t t))
-
-  ;; edit-indirect
-  (add-hook 'edit-indirect-after-commit-functions
-            #'markdown--edit-indirect-after-commit-function
-            nil 'local)
-
-  ;; Marginalized headings
-  (when markdown-marginalize-headers
-    (add-hook 'window-configuration-change-hook
-              #'markdown-marginalize-update-current nil t))
-
-  ;; add live preview export hook
-  (add-hook 'after-save-hook #'markdown-live-preview-if-markdown t t)
-  (add-hook 'kill-buffer-hook #'markdown-live-preview-remove-on-kill t t)
-
-  ;; Add a custom keymap for `visual-line-mode' so that activating
-  ;; this minor mode does not override markdown-mode's keybindings.
-  ;; FIXME: Probably `visual-line-mode' should take care of this.
-  (let ((oldmap (cdr (assoc 'visual-line-mode minor-mode-map-alist)))
-        (newmap (make-sparse-keymap)))
-    (set-keymap-parent newmap oldmap)
-    (define-key newmap [remap move-beginning-of-line] nil)
-    (define-key newmap [remap move-end-of-line] nil)
-    (make-local-variable 'minor-mode-overriding-map-alist)
-    (push `(visual-line-mode . ,newmap) minor-mode-overriding-map-alist)))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist
-             '("\\.\\(?:md\\|markdown\\|mkd\\|mdown\\|mkdn\\|mdwn\\)\\'" . markdown-mode))
-
-
-;;; GitHub Flavored Markdown Mode  ============================================
-
-(defun gfm--electric-pair-fence-code-block ()
-  (when (and electric-pair-mode
-             (not markdown-gfm-use-electric-backquote)
-             (eql last-command-event ?`)
-             (let ((count 0))
-               (while (eql (char-before (- (point) count)) ?`)
-                 (cl-incf count))
-               (= count 3))
-             (eql (char-after) ?`))
-    (save-excursion (insert (make-string 2 ?`)))))
-
-(defvar gfm-mode-hook nil
-  "Hook run when entering GFM mode.")
-
-;;;###autoload
-(define-derived-mode gfm-mode markdown-mode "GFM"
-  "Major mode for editing GitHub Flavored Markdown files."
-  (setq markdown-link-space-sub-char "-")
-  (setq markdown-wiki-link-search-subdirectories t)
-  (setq-local markdown-table-at-point-p-function #'gfm--table-at-point-p)
-  (add-hook 'post-self-insert-hook #'gfm--electric-pair-fence-code-block 'append t)
-  (markdown-gfm-parse-buffer-for-languages))
-
-
-;;; Viewing modes =============================================================
-
-(defcustom markdown-hide-markup-in-view-modes t
-  "Enable hidden markup mode in `markdown-view-mode' and `gfm-view-mode'."
-  :group 'markdown
-  :type 'boolean
-  :safe #'booleanp)
-
-(defvar markdown-view-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "p") #'markdown-outline-previous)
-    (define-key map (kbd "n") #'markdown-outline-next)
-    (define-key map (kbd "f") #'markdown-outline-next-same-level)
-    (define-key map (kbd "b") #'markdown-outline-previous-same-level)
-    (define-key map (kbd "u") #'markdown-outline-up)
-    (define-key map (kbd "DEL") #'scroll-down-command)
-    (define-key map (kbd "SPC") #'scroll-up-command)
-    (define-key map (kbd ">") #'end-of-buffer)
-    (define-key map (kbd "<") #'beginning-of-buffer)
-    (define-key map (kbd "q") #'kill-this-buffer)
-    (define-key map (kbd "?") #'describe-mode)
-    map)
-  "Keymap for `markdown-view-mode'.")
-
-(defun markdown--filter-visible (beg end &optional delete)
-  (let ((result "")
-        (invisible-faces '(markdown-header-delimiter-face markdown-header-rule-face)))
-    (while (< beg end)
-      (when (markdown--face-p beg invisible-faces)
-        (cl-incf beg)
-        (while (and (markdown--face-p beg invisible-faces) (< beg end))
-          (cl-incf beg)))
-      (let ((next (next-single-char-property-change beg 'invisible)))
-        (unless (get-char-property beg 'invisible)
-          (setq result (concat result (buffer-substring beg (min end next)))))
-        (setq beg next)))
-    (prog1 result
-      (when delete
-        (let ((inhibit-read-only t))
-          (delete-region beg end))))))
-
-;;;###autoload
-(define-derived-mode markdown-view-mode markdown-mode "Markdown-View"
-  "Major mode for viewing Markdown content."
-  (setq-local markdown-hide-markup markdown-hide-markup-in-view-modes)
-  (add-to-invisibility-spec 'markdown-markup)
-  (setq-local filter-buffer-substring-function #'markdown--filter-visible)
-  (read-only-mode 1))
-
-(defvar gfm-view-mode-map
-  markdown-view-mode-map
-  "Keymap for `gfm-view-mode'.")
-
-;;;###autoload
-(define-derived-mode gfm-view-mode gfm-mode "GFM-View"
-  "Major mode for viewing GitHub Flavored Markdown content."
-  (setq-local markdown-hide-markup markdown-hide-markup-in-view-modes)
-  (setq-local markdown-fontify-code-blocks-natively t)
-  (setq-local filter-buffer-substring-function #'markdown--filter-visible)
-  (add-to-invisibility-spec 'markdown-markup)
-  (read-only-mode 1))
-
-
-;;; Live Preview Mode  ========================================================
-;;;###autoload
-(define-minor-mode markdown-live-preview-mode
-  "Toggle native previewing on save for a specific markdown file."
-  :lighter " MD-Preview"
-  (if markdown-live-preview-mode
-      (if (markdown-live-preview-get-filename)
-          (markdown-display-buffer-other-window (markdown-live-preview-export))
-        (markdown-live-preview-mode -1)
-        (user-error "Buffer %s does not visit a file" (current-buffer)))
-    (markdown-live-preview-remove)))
-
-
-(provide 'markdown-mode)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; coding: utf-8
-;; End:
-;;; markdown-mode.el ends here
diff --git a/emacs/elpa/markdown-mode-20240318.1307/markdown-mode.elc b/emacs/elpa/markdown-mode-20240318.1307/markdown-mode.elc
Binary files differ.
diff --git a/emacs/elpa/markdown-mode-20240318.1307/markdown-mode-autoloads.el b/emacs/elpa/markdown-mode-20240501.1057/markdown-mode-autoloads.el
diff --git a/emacs/elpa/markdown-mode-20240501.1057/markdown-mode-pkg.el b/emacs/elpa/markdown-mode-20240501.1057/markdown-mode-pkg.el
@@ -0,0 +1,14 @@
+(define-package "markdown-mode" "20240501.1057" "Major mode for Markdown-formatted text"
+  '((emacs "27.1"))
+  :commit "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89" :authors
+  '(("Jason R. Blevins" . "jblevins@xbeta.org"))
+  :maintainers
+  '(("Jason R. Blevins" . "jblevins@xbeta.org"))
+  :maintainer
+  '("Jason R. Blevins" . "jblevins@xbeta.org")
+  :keywords
+  '("markdown" "github flavored markdown" "itex")
+  :url "https://jblevins.org/projects/markdown-mode/")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/markdown-mode-20240501.1057/markdown-mode.el b/emacs/elpa/markdown-mode-20240501.1057/markdown-mode.el
@@ -0,0 +1,10381 @@
+;;; markdown-mode.el --- Major mode for Markdown-formatted text -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2007-2023 Jason R. Blevins and markdown-mode
+;; contributors (see the commit log for details).
+
+;; Author: Jason R. Blevins <jblevins@xbeta.org>
+;; Maintainer: Jason R. Blevins <jblevins@xbeta.org>
+;; Created: May 24, 2007
+;; Version: 2.7-alpha
+;; Package-Requires: ((emacs "27.1"))
+;; Keywords: Markdown, GitHub Flavored Markdown, itex
+;; URL: https://jblevins.org/projects/markdown-mode/
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; See the README.md file for details.
+
+
+;;; Code:
+
+(require 'easymenu)
+(require 'outline)
+(require 'thingatpt)
+(require 'cl-lib)
+(require 'url-parse)
+(require 'button)
+(require 'color)
+(require 'rx)
+(require 'subr-x)
+
+(defvar jit-lock-start)
+(defvar jit-lock-end)
+(defvar flyspell-generic-check-word-predicate)
+(defvar electric-pair-pairs)
+(defvar sh-ancestor-alist)
+
+(declare-function project-roots "project")
+(declare-function sh-set-shell "sh-script")
+(declare-function mailcap-file-name-to-mime-type "mailcap")
+(declare-function dnd-get-local-file-name "dnd")
+
+;; for older emacs<29
+(declare-function mailcap-mime-type-to-extension "mailcap")
+(declare-function file-name-with-extension "files")
+(declare-function yank-media-handler "yank-media")
+
+
+;;; Constants =================================================================
+
+(defconst markdown-mode-version "2.7-alpha"
+  "Markdown mode version number.")
+
+(defconst markdown-output-buffer-name "*markdown-output*"
+  "Name of temporary buffer for markdown command output.")
+
+
+;;; Global Variables ==========================================================
+
+(defvar markdown-reference-label-history nil
+  "History of used reference labels.")
+
+(defvar markdown-live-preview-mode nil
+  "Sentinel variable for command `markdown-live-preview-mode'.")
+
+(defvar markdown-gfm-language-history nil
+  "History list of languages used in the current buffer in GFM code blocks.")
+
+(defvar markdown-follow-link-functions nil
+  "Functions used to follow a link.
+Each function is called with one argument, the link's URL. It
+should return non-nil if it followed the link, or nil if not.
+Functions are called in order until one of them returns non-nil;
+otherwise the default link-following function is used.")
+
+
+;;; Customizable Variables ====================================================
+
+(defvar markdown-mode-hook nil
+  "Hook run when entering Markdown mode.")
+
+(defvar markdown-before-export-hook nil
+  "Hook run before running Markdown to export XHTML output.
+The hook may modify the buffer, which will be restored to it's
+original state after exporting is complete.")
+
+(defvar markdown-after-export-hook nil
+  "Hook run after XHTML output has been saved.
+Any changes to the output buffer made by this hook will be saved.")
+
+(defgroup markdown nil
+  "Major mode for editing text files in Markdown format."
+  :prefix "markdown-"
+  :group 'text
+  :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
+
+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown_py")
+                                                    when (executable-find cmd)
+                                                    return (file-name-nondirectory it))))
+                              (or command "markdown"))
+  "Command to run markdown."
+  :group 'markdown
+  :type '(choice (string :tag "Shell command") (repeat (string)) function))
+
+(defcustom markdown-command-needs-filename nil
+  "Set to non-nil if `markdown-command' does not accept input from stdin.
+Instead, it will be passed a filename as the final command line
+option.  As a result, you will only be able to run Markdown from
+buffers which are visiting a file."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-open-command nil
+  "Command used for opening Markdown files directly.
+For example, a standalone Markdown previewer.  This command will
+be called with a single argument: the filename of the current
+buffer.  It can also be a function, which will be called without
+arguments."
+  :group 'markdown
+  :type '(choice file function (const :tag "None" nil)))
+
+(defcustom markdown-open-image-command nil
+  "Command used for opening image files directly.
+This is used at `markdown-follow-link-at-point'."
+  :group 'markdown
+  :type '(choice file function (const :tag "None" nil)))
+
+(defcustom markdown-hr-strings
+  '("-------------------------------------------------------------------------------"
+    "* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *"
+    "---------------------------------------"
+    "* * * * * * * * * * * * * * * * * * * *"
+    "---------"
+    "* * * * *")
+  "Strings to use when inserting horizontal rules.
+The first string in the list will be the default when inserting a
+horizontal rule.  Strings should be listed in decreasing order of
+prominence (as in headings from level one to six) for use with
+promotion and demotion functions."
+  :group 'markdown
+  :type '(repeat string))
+
+(defcustom markdown-bold-underscore nil
+  "Use two underscores when inserting bold text instead of two asterisks."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-italic-underscore nil
+  "Use underscores when inserting italic text instead of asterisks."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-marginalize-headers nil
+  "When non-nil, put opening atx header markup in a left margin.
+
+This setting goes well with `markdown-asymmetric-header'.  But
+sadly it conflicts with `linum-mode' since they both use the
+same margin."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-marginalize-headers-margin-width 6
+  "Character width of margin used for marginalized headers.
+The default value is based on there being six heading levels
+defined by Markdown and HTML.  Increasing this produces extra
+whitespace on the left.  Decreasing it may be preferred when
+fewer than six nested heading levels are used."
+  :group 'markdown
+  :type 'integer
+  :safe 'natnump
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-asymmetric-header nil
+  "Determines if atx header style will be asymmetric.
+Set to a non-nil value to use asymmetric header styling, placing
+header markup only at the beginning of the line. By default,
+balanced markup will be inserted at the beginning and end of the
+line around the header title."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-indent-function 'markdown-indent-line
+  "Function to use to indent."
+  :group 'markdown
+  :type 'function)
+
+(defcustom markdown-indent-on-enter t
+  "Determines indentation behavior when pressing \\[newline].
+Possible settings are nil, t, and \\='indent-and-new-item.
+
+When non-nil, pressing \\[newline] will call `newline-and-indent'
+to indent the following line according to the context using
+`markdown-indent-function'.  In this case, note that
+\\[electric-newline-and-maybe-indent] can still be used to insert
+a newline without indentation.
+
+When set to \\='indent-and-new-item and the point is in a list item
+when \\[newline] is pressed, the list will be continued on the next
+line, where a new item will be inserted.
+
+When set to nil, simply call `newline' as usual.  In this case,
+you can still indent lines using \\[markdown-cycle] and continue
+lists with \\[markdown-insert-list-item].
+
+Note that this assumes the variable `electric-indent-mode' is
+non-nil (enabled).  When it is *disabled*, the behavior of
+\\[newline] and `\\[electric-newline-and-maybe-indent]' are
+reversed."
+  :group 'markdown
+  :type '(choice (const :tag "Don't automatically indent" nil)
+                 (const :tag "Automatically indent" t)
+                 (const :tag "Automatically indent and insert new list items" indent-and-new-item)))
+
+(defcustom markdown-enable-wiki-links nil
+  "Syntax highlighting for wiki links.
+Set this to a non-nil value to turn on wiki link support by default.
+Support can be toggled later using the `markdown-toggle-wiki-links'
+function or \\[markdown-toggle-wiki-links]."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-wiki-link-alias-first t
+  "When non-nil, treat aliased wiki links like [[alias text|PageName]].
+Otherwise, they will be treated as [[PageName|alias text]]."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
+(defcustom markdown-wiki-link-search-subdirectories nil
+  "When non-nil, search for wiki link targets in subdirectories.
+This is the default search behavior for GitHub and is
+automatically set to t in `gfm-mode'."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-wiki-link-search-parent-directories nil
+  "When non-nil, search for wiki link targets in parent directories.
+This is the default search behavior of Ikiwiki."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-wiki-link-search-type nil
+  "Searching type for markdown wiki link.
+
+sub-directories: search for wiki link targets in sub directories
+parent-directories: search for wiki link targets in parent directories
+project: search for wiki link targets under project root"
+  :group 'markdown
+  :type '(set
+          (const :tag "search wiki link from subdirectories" sub-directories)
+          (const :tag "search wiki link from parent directories" parent-directories)
+          (const :tag "search wiki link under project root" project))
+  :package-version '(markdown-mode . "2.5"))
+
+(make-obsolete-variable 'markdown-wiki-link-search-subdirectories 'markdown-wiki-link-search-type "2.5")
+(make-obsolete-variable 'markdown-wiki-link-search-parent-directories 'markdown-wiki-link-search-type "2.5")
+
+(defcustom markdown-wiki-link-fontify-missing nil
+  "When non-nil, change wiki link face according to existence of target files.
+This is expensive because it requires checking for the file each time the buffer
+changes or the user switches windows.  It is disabled by default because it may
+cause lag when typing on slower machines."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-uri-types
+  '("acap" "cid" "data" "dav" "fax" "file" "ftp"
+    "geo" "gopher" "http" "https" "imap" "ldap" "mailto"
+    "mid" "message" "modem" "news" "nfs" "nntp"
+    "pop" "prospero" "rtsp" "service" "sip" "tel"
+    "telnet" "tip" "urn" "vemmi" "wais")
+  "Link types for syntax highlighting of URIs."
+  :group 'markdown
+  :type '(repeat (string :tag "URI scheme")))
+
+(defcustom markdown-url-compose-char
+  '(?∞ ?… ?⋯ ?# ?★ ?⚓)
+  "Placeholder character for hidden URLs.
+This may be a single character or a list of characters. In case
+of a list, the first one that satisfies `char-displayable-p' will
+be used."
+  :type '(choice
+          (character :tag "Single URL replacement character")
+          (repeat :tag "List of possible URL replacement characters"
+                  character))
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-blockquote-display-char
+  '("▌" "┃" ">")
+  "String to display when hiding blockquote markup.
+This may be a single string or a list of string. In case of a
+list, the first one that satisfies `char-displayable-p' will be
+used."
+  :type '(choice
+          (string :tag "Single blockquote display string")
+          (repeat :tag "List of possible blockquote display strings" string))
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-hr-display-char
+  '(?─ ?━ ?-)
+  "Character for hiding horizontal rule markup.
+This may be a single character or a list of characters.  In case
+of a list, the first one that satisfies `char-displayable-p' will
+be used."
+  :group 'markdown
+  :type '(choice
+          (character :tag "Single HR display character")
+          (repeat :tag "List of possible HR display characters" character))
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-definition-display-char
+  '(?⁘ ?⁙ ?≡ ?⌑ ?◊ ?:)
+  "Character for replacing definition list markup.
+This may be a single character or a list of characters.  In case
+of a list, the first one that satisfies `char-displayable-p' will
+be used."
+  :type '(choice
+          (character :tag "Single definition list character")
+          (repeat :tag "List of possible definition list characters" character))
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-enable-math nil
+  "Syntax highlighting for inline LaTeX and itex expressions.
+Set this to a non-nil value to turn on math support by default.
+Math support can be enabled, disabled, or toggled later using
+`markdown-toggle-math' or \\[markdown-toggle-math]."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+(make-variable-buffer-local 'markdown-enable-math)
+
+(defcustom markdown-enable-html t
+  "Enable font-lock support for HTML tags and attributes."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-enable-highlighting-syntax nil
+  "Enable highlighting syntax."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-css-paths nil
+  "List of URLs of CSS files to link to in the output XHTML."
+  :group 'markdown
+  :type '(repeat (string :tag "CSS File Path")))
+
+(defcustom markdown-content-type "text/html"
+  "Content type string for the http-equiv header in XHTML output.
+When set to an empty string, this attribute is omitted.  Defaults to
+`text/html'."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-coding-system nil
+  "Character set string for the http-equiv header in XHTML output.
+Defaults to `buffer-file-coding-system' (and falling back to
+`utf-8' when not available).  Common settings are `iso-8859-1'
+and `iso-latin-1'.  Use `list-coding-systems' for more choices."
+  :group 'markdown
+  :type 'coding-system)
+
+(defcustom markdown-export-kill-buffer t
+  "Kill output buffer after HTML export.
+When non-nil, kill the HTML output buffer after
+exporting with `markdown-export'."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-xhtml-header-content ""
+  "Additional content to include in the XHTML <head> block."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-xhtml-body-preamble ""
+  "Content to include in the XHTML <body> block, before the output."
+  :group 'markdown
+  :type 'string
+  :safe 'stringp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-xhtml-body-epilogue ""
+  "Content to include in the XHTML <body> block, after the output."
+  :group 'markdown
+  :type 'string
+  :safe 'stringp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-xhtml-standalone-regexp
+  "^\\(<\\?xml\\|<!DOCTYPE\\|<html\\)"
+  "Regexp indicating whether `markdown-command' output is standalone XHTML."
+  :group 'markdown
+  :type 'regexp)
+
+(defcustom markdown-link-space-sub-char "_"
+  "Character to use instead of spaces when mapping wiki links to filenames."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-reference-location 'header
+  "Position where new reference definitions are inserted in the document."
+  :group 'markdown
+  :type '(choice (const :tag "At the end of the document" end)
+                 (const :tag "Immediately after the current block" immediately)
+                 (const :tag "At the end of the subtree" subtree)
+                 (const :tag "Before next header" header)))
+
+(defcustom markdown-footnote-location 'end
+  "Position where new footnotes are inserted in the document."
+  :group 'markdown
+  :type '(choice (const :tag "At the end of the document" end)
+                 (const :tag "Immediately after the current block" immediately)
+                 (const :tag "At the end of the subtree" subtree)
+                 (const :tag "Before next header" header)))
+
+(defcustom markdown-footnote-display '((raise 0.2) (height 0.8))
+  "Display specification for footnote markers and inline footnotes.
+By default, footnote text is reduced in size and raised.  Set to
+nil to disable this."
+  :group 'markdown
+  :type '(choice (sexp :tag "Display specification")
+                 (const :tag "Don't set display property" nil))
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-sub-superscript-display
+  '(((raise -0.3) (height 0.7)) . ((raise 0.3) (height 0.7)))
+  "Display specification for subscript and superscripts.
+The car is used for subscript, the cdr is used for superscripts."
+  :group 'markdown
+  :type '(cons (choice (sexp :tag "Subscript form")
+                       (const :tag "No lowering" nil))
+               (choice (sexp :tag "Superscript form")
+                       (const :tag "No raising" nil)))
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-unordered-list-item-prefix "  * "
+  "String inserted before unordered list items."
+  :group 'markdown
+  :type 'string)
+
+(defcustom markdown-ordered-list-enumeration t
+  "When non-nil, use enumerated numbers(1. 2. 3. etc.) for ordered list marker.
+While nil, always uses '1.' for the marker"
+  :group 'markdown
+  :type 'boolean
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-nested-imenu-heading-index t
+  "Use nested or flat imenu heading index.
+A nested index may provide more natural browsing from the menu,
+but a flat list may allow for faster keyboard navigation via tab
+completion."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-add-footnotes-to-imenu t
+  "Add footnotes to end of imenu heading index."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-make-gfm-checkboxes-buttons t
+  "When non-nil, make GFM checkboxes into buttons."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-use-pandoc-style-yaml-metadata nil
+  "When non-nil, allow YAML metadata anywhere in the document."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-split-window-direction 'any
+  "Preference for splitting windows for static and live preview.
+The default value is \\='any, which instructs Emacs to use
+`split-window-sensibly' to automatically choose how to split
+windows based on the values of `split-width-threshold' and
+`split-height-threshold' and the available windows.  To force
+vertically split (left and right) windows, set this to \\='vertical
+or \\='right.  To force horizontally split (top and bottom) windows,
+set this to \\='horizontal or \\='below.
+
+If this value is \\='any and `display-buffer-alist' is set then
+`display-buffer' is used for open buffer function"
+  :group 'markdown
+  :type '(choice (const :tag "Automatic" any)
+                 (const :tag "Right (vertical)" right)
+                 (const :tag "Below (horizontal)" below))
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-live-preview-window-function
+  #'markdown-live-preview-window-eww
+  "Function to display preview of Markdown output within Emacs.
+Function must update the buffer containing the preview and return
+the buffer."
+  :group 'markdown
+  :type 'function)
+
+(defcustom markdown-live-preview-delete-export 'delete-on-destroy
+  "Delete exported HTML file when using `markdown-live-preview-export'.
+If set to \\='delete-on-export, delete on every export. When set to
+\\='delete-on-destroy delete when quitting from command
+`markdown-live-preview-mode'. Never delete if set to nil."
+  :group 'markdown
+  :type '(choice
+          (const :tag "Delete on every export" delete-on-export)
+          (const :tag "Delete when quitting live preview" delete-on-destroy)
+          (const :tag "Never delete" nil)))
+
+(defcustom markdown-list-indent-width 4
+  "Depth of indentation for markdown lists.
+Used in `markdown-demote-list-item' and
+`markdown-promote-list-item'."
+  :group 'markdown
+  :type 'integer)
+
+(defcustom markdown-enable-prefix-prompts t
+  "Display prompts for certain prefix commands.
+Set to nil to disable these prompts."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-gfm-additional-languages nil
+  "Extra languages made available when inserting GFM code blocks.
+Language strings must have be trimmed of whitespace and not
+contain any curly braces. They may be of arbitrary
+capitalization, though."
+  :group 'markdown
+  :type '(repeat (string :validate markdown-validate-language-string)))
+
+(defcustom markdown-gfm-use-electric-backquote t
+  "Use `markdown-electric-backquote' when backquote is hit three times."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-gfm-downcase-languages t
+  "If non-nil, downcase suggested languages.
+This applies to insertions done with
+`markdown-electric-backquote'."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-edit-code-block-default-mode 'normal-mode
+  "Default mode to use for editing code blocks.
+This mode is used when automatic detection fails, such as for GFM
+code blocks with no language specified."
+  :group 'markdown
+  :type '(choice function (const :tag "None" nil))
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-gfm-uppercase-checkbox nil
+  "If non-nil, use [X] for completed checkboxes, [x] otherwise."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp)
+
+(defcustom markdown-hide-urls nil
+  "Hide URLs of inline links and reference tags of reference links.
+Such URLs will be replaced by a single customizable
+character, defined by `markdown-url-compose-char', but are still part
+of the buffer.  Links can be edited interactively with
+\\[markdown-insert-link] or, for example, by deleting the final
+parenthesis to remove the invisibility property. You can also
+hover your mouse pointer over the link text to see the URL.
+Set this to a non-nil value to turn this feature on by default.
+You can interactively set the value of this variable by calling
+`markdown-toggle-url-hiding', pressing \\[markdown-toggle-url-hiding],
+or from the menu Markdown > Links & Images menu."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.3"))
+(make-variable-buffer-local 'markdown-hide-urls)
+
+(defcustom markdown-translate-filename-function #'identity
+  "Function to use to translate filenames when following links.
+\\<markdown-mode-map>\\[markdown-follow-thing-at-point] and \\[markdown-follow-link-at-point]
+call this function with the filename as only argument whenever
+they encounter a filename (instead of a URL) to be visited and
+use its return value instead of the filename in the link.  For
+example, if absolute filenames are actually relative to a server
+root directory, you can set
+`markdown-translate-filename-function' to a function that
+prepends the root directory to the given filename."
+  :group 'markdown
+  :type 'function
+  :risky t
+  :package-version '(markdown-mode . "2.4"))
+
+(defcustom markdown-max-image-size nil
+  "Maximum width and height for displayed inline images.
+This variable may be nil or a cons cell (MAX-WIDTH . MAX-HEIGHT).
+When nil, use the actual size.  Otherwise, use ImageMagick to
+resize larger images to be of the given maximum dimensions.  This
+requires Emacs to be built with ImageMagick support."
+  :group 'markdown
+  :package-version '(markdown-mode . "2.4")
+  :type '(choice
+          (const :tag "Use actual image width" nil)
+          (cons (choice (sexp :tag "Maximum width in pixels")
+                        (const :tag "No maximum width" nil))
+                (choice (sexp :tag "Maximum height in pixels")
+                        (const :tag "No maximum height" nil)))))
+
+(defcustom markdown-mouse-follow-link t
+  "Non-nil means mouse on a link will follow the link.
+This variable must be set before loading markdown-mode."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-table-align-p t
+  "Non-nil means that table is aligned after table operation."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-fontify-whole-heading-line nil
+  "Non-nil means fontify the whole line for headings.
+This is useful when setting a background color for the
+markdown-header-face-* faces."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-special-ctrl-a/e nil
+  "Non-nil means `C-a' and `C-e' behave specially in headlines and items.
+
+When t, `C-a' will bring back the cursor to the beginning of the
+headline text. In an item, this will be the position after bullet
+and check-box, if any. When the cursor is already at that
+position, another `C-a' will bring it to the beginning of the
+line.
+
+`C-e' will jump to the end of the headline, ignoring the presence
+of closing tags in the headline. A second `C-e' will then jump to
+the true end of the line, after closing tags. This also means
+that, when this variable is non-nil, `C-e' also will never jump
+beyond the end of the heading of a folded section, i.e. not after
+the ellipses.
+
+When set to the symbol `reversed', the first `C-a' or `C-e' works
+normally, going to the true line boundary first.  Only a directly
+following, identical keypress will bring the cursor to the
+special positions.
+
+This may also be a cons cell where the behavior for `C-a' and
+`C-e' is set separately."
+  :group 'markdown
+  :type '(choice
+	  (const :tag "off" nil)
+	  (const :tag "on: after hashes/bullet and before closing tags first" t)
+	  (const :tag "reversed: true line boundary first" reversed)
+	  (cons :tag "Set C-a and C-e separately"
+		(choice :tag "Special C-a"
+			(const :tag "off" nil)
+			(const :tag "on: after hashes/bullet first" t)
+			(const :tag "reversed: before hashes/bullet first" reversed))
+		(choice :tag "Special C-e"
+			(const :tag "off" nil)
+			(const :tag "on: before closing tags first" t)
+			(const :tag "reversed: after closing tags first" reversed))))
+  :package-version '(markdown-mode . "2.7"))
+
+;;; Markdown-Specific `rx' Macro ==============================================
+
+;; Based on python-rx from python.el.
+(eval-and-compile
+  (defconst markdown-rx-constituents
+    `((newline . ,(rx "\n"))
+      ;; Note: #405 not consider markdown-list-indent-width however this is never used
+      (indent . ,(rx (or (repeat 4 " ") "\t")))
+      (block-end . ,(rx (and (or (one-or-more (zero-or-more blank) "\n") line-end))))
+      (numeral . ,(rx (and (one-or-more (any "0-9#")) ".")))
+      (bullet . ,(rx (any "*+:-")))
+      (list-marker . ,(rx (or (and (one-or-more (any "0-9#")) ".")
+                              (any "*+:-"))))
+      (checkbox . ,(rx "[" (any " xX") "]")))
+    "Markdown-specific sexps for `markdown-rx'")
+
+  (defun markdown-rx-to-string (form &optional no-group)
+    "Markdown mode specialized `rx-to-string' function.
+This variant supports named Markdown expressions in FORM.
+NO-GROUP non-nil means don't put shy groups around the result."
+    (let ((rx-constituents (append markdown-rx-constituents rx-constituents)))
+      (rx-to-string form no-group)))
+
+  (defmacro markdown-rx (&rest regexps)
+    "Markdown mode specialized rx macro.
+This variant of `rx' supports common Markdown named REGEXPS."
+    (cond ((null regexps)
+           (error "No regexp"))
+          ((cdr regexps)
+           (markdown-rx-to-string `(and ,@regexps) t))
+          (t
+           (markdown-rx-to-string (car regexps) t)))))
+
+
+;;; Regular Expressions =======================================================
+
+(defconst markdown-regex-comment-start
+  "<!--"
+  "Regular expression matches HTML comment opening.")
+
+(defconst markdown-regex-comment-end
+  "--[ \t]*>"
+  "Regular expression matches HTML comment closing.")
+
+(defconst markdown-regex-link-inline
+  "\\(?1:!\\)?\\(?2:\\[\\)\\(?3:\\^?\\(?:\\\\\\]\\|[^]]\\)*\\|\\)\\(?4:\\]\\)\\(?5:(\\)\\s-*\\(?6:[^)]*?\\)\\(?:\\s-+\\(?7:\"[^\"]*\"\\)\\)?\\s-*\\(?8:)\\)"
+  "Regular expression for a [text](file) or an image link ![text](file).
+Group 1 matches the leading exclamation point (optional).
+Group 2 matches the opening square bracket.
+Group 3 matches the text inside the square brackets.
+Group 4 matches the closing square bracket.
+Group 5 matches the opening parenthesis.
+Group 6 matches the URL.
+Group 7 matches the title (optional).
+Group 8 matches the closing parenthesis.")
+
+(defconst markdown-regex-link-reference
+  "\\(?1:!\\)?\\(?2:\\[\\)\\(?3:[^]^][^]]*\\|\\)\\(?4:\\]\\)\\(?5:\\[\\)\\(?6:[^]]*?\\)\\(?7:\\]\\)"
+  "Regular expression for a reference link [text][id].
+Group 1 matches the leading exclamation point (optional).
+Group 2 matches the opening square bracket for the link text.
+Group 3 matches the text inside the square brackets.
+Group 4 matches the closing square bracket for the link text.
+Group 5 matches the opening square bracket for the reference label.
+Group 6 matches the reference label.
+Group 7 matches the closing square bracket for the reference label.")
+
+(defconst markdown-regex-reference-definition
+  "^ \\{0,3\\}\\(?1:\\[\\)\\(?2:[^]\n]+?\\)\\(?3:\\]\\)\\(?4::\\)\\s *\\(?5:.*?\\)\\s *\\(?6: \"[^\"]*\"$\\|$\\)"
+  "Regular expression for a reference definition.
+Group 1 matches the opening square bracket.
+Group 2 matches the reference label.
+Group 3 matches the closing square bracket.
+Group 4 matches the colon.
+Group 5 matches the URL.
+Group 6 matches the title attribute (optional).")
+
+(defconst markdown-regex-footnote
+  "\\(?1:\\[\\^\\)\\(?2:.+?\\)\\(?3:\\]\\)"
+  "Regular expression for a footnote marker [^fn].
+Group 1 matches the opening square bracket and carat.
+Group 2 matches only the label, without the surrounding markup.
+Group 3 matches the closing square bracket.")
+
+(defconst markdown-regex-header
+  "^\\(?:\\(?1:[^\r\n\t -].*\\)\n\\(?:\\(?2:=+\\)\\|\\(?3:-+\\)\\)\\|\\(?4:#+[ \t]+\\)\\(?5:.*?\\)\\(?6:[ \t]+#+\\)?\\)$"
+  "Regexp identifying Markdown headings.
+Group 1 matches the text of a setext heading.
+Group 2 matches the underline of a level-1 setext heading.
+Group 3 matches the underline of a level-2 setext heading.
+Group 4 matches the opening hash marks of an atx heading and whitespace.
+Group 5 matches the text, without surrounding whitespace, of an atx heading.
+Group 6 matches the closing whitespace and hash marks of an atx heading.")
+
+(defconst markdown-regex-header-setext
+  "^\\([^\r\n\t -].*\\)\n\\(=+\\|-+\\)$"
+  "Regular expression for generic setext-style (underline) headers.")
+
+(defconst markdown-regex-header-atx
+  "^\\(#+\\)[ \t]+\\(.*?\\)[ \t]*\\(#*\\)$"
+  "Regular expression for generic atx-style (hash mark) headers.")
+
+(defconst markdown-regex-hr
+  (rx line-start
+      (group (or (and (repeat 3 (and "*" (? " "))) (* (any "* ")))
+                 (and (repeat 3 (and "-" (? " "))) (* (any "- ")))
+                 (and (repeat 3 (and "_" (? " "))) (* (any "_ ")))))
+      line-end)
+  "Regular expression for matching Markdown horizontal rules.")
+
+(defconst markdown-regex-code
+  "\\(?:\\`\\|[^\\]\\)\\(?1:\\(?2:`+\\)\\(?3:\\(?:.\\|\n[^\n]\\)*?[^`]\\)\\(?4:\\2\\)\\)\\(?:[^`]\\|\\'\\)"
+  "Regular expression for matching inline code fragments.
+
+Group 1 matches the entire code fragment including the backquotes.
+Group 2 matches the opening backquotes.
+Group 3 matches the code fragment itself, without backquotes.
+Group 4 matches the closing backquotes.
+
+The leading, unnumbered group ensures that the leading backquote
+character is not escaped.
+The last group, also unnumbered, requires that the character
+following the code fragment is not a backquote.
+Note that \\(?:.\\|\n[^\n]\\) matches any character, including newlines,
+but not two newlines in a row.")
+
+(defconst markdown-regex-kbd
+  "\\(?1:<kbd>\\)\\(?2:\\(?:.\\|\n[^\n]\\)*?\\)\\(?3:</kbd>\\)"
+  "Regular expression for matching <kbd> tags.
+Groups 1 and 3 match the opening and closing tags.
+Group 2 matches the key sequence.")
+
+(defconst markdown-regex-gfm-code-block-open
+  "^[[:blank:]]*\\(?1:```\\)\\(?2:[[:blank:]]*{?[[:blank:]]*\\)\\(?3:[^`[:space:]]+?\\)?\\(?:[[:blank:]]+\\(?4:.+?\\)\\)?\\(?5:[[:blank:]]*}?[[:blank:]]*\\)$"
+  "Regular expression matching opening of GFM code blocks.
+Group 1 matches the opening three backquotes and any following whitespace.
+Group 2 matches the opening brace (optional) and surrounding whitespace.
+Group 3 matches the language identifier (optional).
+Group 4 matches the info string (optional).
+Group 5 matches the closing brace (optional), whitespace, and newline.
+Groups need to agree with `markdown-regex-tilde-fence-begin'.")
+
+(defconst markdown-regex-gfm-code-block-close
+  "^[[:blank:]]*\\(?1:```\\)\\(?2:\\s *?\\)$"
+  "Regular expression matching closing of GFM code blocks.
+Group 1 matches the closing three backquotes.
+Group 2 matches any whitespace and the final newline.")
+
+(defconst markdown-regex-pre
+  "^\\(    \\|\t\\).*$"
+  "Regular expression for matching preformatted text sections.")
+
+(defconst markdown-regex-list
+  (markdown-rx line-start
+               ;; 1. Leading whitespace
+               (group (* blank))
+               ;; 2. List marker: a numeral, bullet, or colon
+               (group list-marker)
+               ;; 3. Trailing whitespace
+               (group (+ blank))
+               ;; 4. Optional checkbox for GFM task list items
+               (opt (group (and checkbox (* blank)))))
+  "Regular expression for matching list items.")
+
+(defconst markdown-regex-bold
+  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:\\*\\*\\|__\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:\\3\\)\\)"
+  "Regular expression for matching bold text.
+Group 1 matches the character before the opening asterisk or
+underscore, if any, ensuring that it is not a backslash escape.
+Group 2 matches the entire expression, including delimiters.
+Groups 3 and 5 matches the opening and closing delimiters.
+Group 4 matches the text inside the delimiters.")
+
+(defconst markdown-regex-italic
+  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:[*_]\\)\\(?3:[^ \n\t\\]\\|[^ \n\t*]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?4:\\2\\)\\)"
+  "Regular expression for matching italic text.
+The leading unnumbered matches the character before the opening
+asterisk or underscore, if any, ensuring that it is not a
+backslash escape.
+Group 1 matches the entire expression, including delimiters.
+Groups 2 and 4 matches the opening and closing delimiters.
+Group 3 matches the text inside the delimiters.")
+
+(defconst markdown-regex-strike-through
+  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:~~\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:~~\\)\\)"
+  "Regular expression for matching strike-through text.
+Group 1 matches the character before the opening tilde, if any,
+ensuring that it is not a backslash escape.
+Group 2 matches the entire expression, including delimiters.
+Groups 3 and 5 matches the opening and closing delimiters.
+Group 4 matches the text inside the delimiters.")
+
+(defconst markdown-regex-gfm-italic
+  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:[*_]\\)\\(?3:[^ \\]\\2\\|[^ ]\\(?:.\\|\n[^\n]\\)*?\\)\\(?4:\\2\\)\\)"
+  "Regular expression for matching italic text in GitHub Flavored Markdown.
+Underscores in words are not treated as special.
+Group 1 matches the entire expression, including delimiters.
+Groups 2 and 4 matches the opening and closing delimiters.
+Group 3 matches the text inside the delimiters.")
+
+(defconst markdown-regex-blockquote
+  "^[ \t]*\\(?1:[A-Z]?>\\)\\(?2:[ \t]*\\)\\(?3:.*\\)$"
+  "Regular expression for matching blockquote lines.
+Also accounts for a potential capital letter preceding the angle
+bracket, for use with Leanpub blocks (asides, warnings, info
+blocks, etc.).
+Group 1 matches the leading angle bracket.
+Group 2 matches the separating whitespace.
+Group 3 matches the text.")
+
+(defconst markdown-regex-line-break
+  "[^ \n\t][ \t]*\\(  \\)\n"
+  "Regular expression for matching line breaks.")
+
+(defconst markdown-regex-escape
+  "\\(\\\\\\)."
+  "Regular expression for matching escape sequences.")
+
+(defconst markdown-regex-wiki-link
+  "\\(?:^\\|[^\\]\\)\\(?1:\\(?2:\\[\\[\\)\\(?3:[^]|]+\\)\\(?:\\(?4:|\\)\\(?5:[^]]+\\)\\)?\\(?6:\\]\\]\\)\\)"
+  "Regular expression for matching wiki links.
+This matches typical bracketed [[WikiLinks]] as well as \\='aliased
+wiki links of the form [[PageName|link text]].
+The meanings of the first and second components depend
+on the value of `markdown-wiki-link-alias-first'.
+
+Group 1 matches the entire link.
+Group 2 matches the opening square brackets.
+Group 3 matches the first component of the wiki link.
+Group 4 matches the pipe separator, when present.
+Group 5 matches the second component of the wiki link, when present.
+Group 6 matches the closing square brackets.")
+
+(defconst markdown-regex-uri
+  (concat "\\(" (regexp-opt markdown-uri-types) ":[^]\t\n\r<>; ]+\\)")
+  "Regular expression for matching inline URIs.")
+
+;; CommanMark specification says scheme length is 2-32 characters
+(defconst markdown-regex-angle-uri
+  (concat "\\(<\\)\\([a-z][a-z0-9.+-]\\{1,31\\}:[^]\t\n\r<>,;()]+\\)\\(>\\)")
+  "Regular expression for matching inline URIs in angle brackets.")
+
+(defconst markdown-regex-email
+  "<\\(\\(?:\\sw\\|\\s_\\|\\s.\\)+@\\(?:\\sw\\|\\s_\\|\\s.\\)+\\)>"
+  "Regular expression for matching inline email addresses.")
+
+(defsubst markdown-make-regex-link-generic ()
+  "Make regular expression for matching any recognized link."
+  (concat "\\(?:" markdown-regex-link-inline
+          (when markdown-enable-wiki-links
+            (concat "\\|" markdown-regex-wiki-link))
+          "\\|" markdown-regex-link-reference
+          "\\|" markdown-regex-angle-uri "\\)"))
+
+(defconst markdown-regex-gfm-checkbox
+  " \\(\\[[ xX]\\]\\) "
+  "Regular expression for matching GFM checkboxes.
+Group 1 matches the text to become a button.")
+
+(defconst markdown-regex-blank-line
+  "^[[:blank:]]*$"
+  "Regular expression that matches a blank line.")
+
+(defconst markdown-regex-block-separator
+  "\n[\n\t\f ]*\n"
+  "Regular expression for matching block boundaries.")
+
+(defconst markdown-regex-block-separator-noindent
+  (concat "\\(\\`\\|\\(" markdown-regex-block-separator "\\)[^\n\t\f ]\\)")
+  "Regexp for block separators before lines with no indentation.")
+
+(defconst markdown-regex-math-inline-single
+  "\\(?:^\\|[^\\]\\)\\(?1:\\$\\)\\(?2:\\(?:[^\\$]\\|\\\\.\\)*\\)\\(?3:\\$\\)"
+  "Regular expression for itex $..$ math mode expressions.
+Groups 1 and 3 match the opening and closing dollar signs.
+Group 2 matches the mathematical expression contained within.")
+
+(defconst markdown-regex-math-inline-double
+  "\\(?:^\\|[^\\]\\)\\(?1:\\$\\$\\)\\(?2:\\(?:[^\\$]\\|\\\\.\\)*\\)\\(?3:\\$\\$\\)"
+  "Regular expression for itex $$..$$ math mode expressions.
+Groups 1 and 3 match opening and closing dollar signs.
+Group 2 matches the mathematical expression contained within.")
+
+(defconst markdown-regex-math-display
+  (rx line-start (* blank)
+      (group (group (repeat 1 2 "\\")) "[")
+      (group (*? anything))
+      (group (backref 2) "]")
+      line-end)
+  "Regular expression for \[..\] or \\[..\\] display math.
+Groups 1 and 4 match the opening and closing markup.
+Group 3 matches the mathematical expression contained within.
+Group 2 matches the opening slashes, and is used internally to
+match the closing slashes.")
+
+(defsubst markdown-make-tilde-fence-regex (num-tildes &optional end-of-line)
+  "Return regexp matching a tilde code fence at least NUM-TILDES long.
+END-OF-LINE is the regexp construct to indicate end of line; $ if
+missing."
+  (format "%s%d%s%s" "^[[:blank:]]*\\([~]\\{" num-tildes ",\\}\\)"
+          (or end-of-line "$")))
+
+(defconst markdown-regex-tilde-fence-begin
+  (markdown-make-tilde-fence-regex
+   3 "\\([[:blank:]]*{?\\)[[:blank:]]*\\([^[:space:]]+?\\)?\\(?:[[:blank:]]+\\(.+?\\)\\)?\\([[:blank:]]*}?[[:blank:]]*\\)$")
+  "Regular expression for matching tilde-fenced code blocks.
+Group 1 matches the opening tildes.
+Group 2 matches (optional) opening brace and surrounding whitespace.
+Group 3 matches the language identifier (optional).
+Group 4 matches the info string (optional).
+Group 5 matches the closing brace (optional) and any surrounding whitespace.
+Groups need to agree with `markdown-regex-gfm-code-block-open'.")
+
+(defconst markdown-regex-declarative-metadata
+  "^[ \t]*\\(?:-[ \t]*\\)?\\([[:alpha:]][[:alpha:] _-]*?\\)\\([:=][ \t]*\\)\\(.*\\)$"
+  "Regular expression for matching declarative metadata statements.
+This matches MultiMarkdown metadata as well as YAML and TOML
+assignments such as the following:
+
+    variable: value
+
+or
+
+    variable = value")
+
+(defconst markdown-regex-pandoc-metadata
+  "^\\(%\\)\\([ \t]*\\)\\(.*\\(?:\n[ \t]+.*\\)*\\)"
+  "Regular expression for matching Pandoc metadata.")
+
+(defconst markdown-regex-yaml-metadata-border
+  "\\(-\\{3\\}\\)$"
+  "Regular expression for matching YAML metadata.")
+
+(defconst markdown-regex-yaml-pandoc-metadata-end-border
+  "^\\(\\.\\{3\\}\\|\\-\\{3\\}\\)$"
+  "Regular expression for matching YAML metadata end borders.")
+
+(defsubst markdown-get-yaml-metadata-start-border ()
+  "Return YAML metadata start border depending upon whether Pandoc is used."
+  (concat
+   (if markdown-use-pandoc-style-yaml-metadata "^" "\\`")
+   markdown-regex-yaml-metadata-border))
+
+(defsubst markdown-get-yaml-metadata-end-border (_)
+  "Return YAML metadata end border depending upon whether Pandoc is used."
+  (if markdown-use-pandoc-style-yaml-metadata
+      markdown-regex-yaml-pandoc-metadata-end-border
+    markdown-regex-yaml-metadata-border))
+
+(defconst markdown-regex-inline-attributes
+  "[ \t]*\\(?:{:?\\)[ \t]*\\(?:\\(?:#[[:alpha:]_.:-]+\\|\\.[[:alpha:]_.:-]+\\|\\w+=['\"]?[^\n'\"}]*['\"]?\\),?[ \t]*\\)+\\(?:}\\)[ \t]*$"
+  "Regular expression for matching inline identifiers or attribute lists.
+Compatible with Pandoc, Python Markdown, PHP Markdown Extra, and Leanpub.")
+
+(defconst markdown-regex-leanpub-sections
+  (concat
+   "^\\({\\)\\("
+   (regexp-opt '("frontmatter" "mainmatter" "backmatter" "appendix" "pagebreak"))
+   "\\)\\(}\\)[ \t]*\n")
+  "Regular expression for Leanpub section markers and related syntax.")
+
+(defconst markdown-regex-sub-superscript
+  "\\(?:^\\|[^\\~^]\\)\\(?1:\\(?2:[~^]\\)\\(?3:[+-\u2212]?[[:alnum:]]+\\)\\(?4:\\2\\)\\)"
+  "The regular expression matching a sub- or superscript.
+The leading un-numbered group matches the character before the
+opening tilde or carat, if any, ensuring that it is not a
+backslash escape, carat, or tilde.
+Group 1 matches the entire expression, including markup.
+Group 2 matches the opening markup--a tilde or carat.
+Group 3 matches the text inside the delimiters.
+Group 4 matches the closing markup--a tilde or carat.")
+
+(defconst markdown-regex-include
+  "^\\(?1:<<\\)\\(?:\\(?2:\\[\\)\\(?3:.*\\)\\(?4:\\]\\)\\)?\\(?:\\(?5:(\\)\\(?6:.*\\)\\(?7:)\\)\\)?\\(?:\\(?8:{\\)\\(?9:.*\\)\\(?10:}\\)\\)?$"
+  "Regular expression matching common forms of include syntax.
+Marked 2, Leanpub, and other processors support some of these forms:
+
+<<[sections/section1.md]
+<<(folder/filename)
+<<[Code title](folder/filename)
+<<{folder/raw_file.html}
+
+Group 1 matches the opening two angle brackets.
+Groups 2-4 match the opening square bracket, the text inside,
+and the closing square bracket, respectively.
+Groups 5-7 match the opening parenthesis, the text inside, and
+the closing parenthesis.
+Groups 8-10 match the opening brace, the text inside, and the brace.")
+
+(defconst markdown-regex-pandoc-inline-footnote
+  "\\(?1:\\^\\)\\(?2:\\[\\)\\(?3:\\(?:.\\|\n[^\n]\\)*?\\)\\(?4:\\]\\)"
+  "Regular expression for Pandoc inline footnote^[footnote text].
+Group 1 matches the opening caret.
+Group 2 matches the opening square bracket.
+Group 3 matches the footnote text, without the surrounding markup.
+Group 4 matches the closing square bracket.")
+
+(defconst markdown-regex-html-attr
+  "\\(\\<[[:alpha:]:-]+\\>\\)\\(\\s-*\\(=\\)\\s-*\\(\".*?\"\\|'.*?'\\|[^'\">[:space:]]+\\)?\\)?"
+  "Regular expression for matching HTML attributes and values.
+Group 1 matches the attribute name.
+Group 2 matches the following whitespace, equals sign, and value, if any.
+Group 3 matches the equals sign, if any.
+Group 4 matches single-, double-, or un-quoted attribute values.")
+
+(defconst markdown-regex-html-tag
+  (concat "\\(</?\\)\\(\\w+\\)\\(\\(\\s-+" markdown-regex-html-attr
+          "\\)+\\s-*\\|\\s-*\\)\\(/?>\\)")
+  "Regular expression for matching HTML tags.
+Groups 1 and 9 match the beginning and ending angle brackets and slashes.
+Group 2 matches the tag name.
+Group 3 matches all attributes and whitespace following the tag name.")
+
+(defconst markdown-regex-html-entity
+  "\\(&#?[[:alnum:]]+;\\)"
+  "Regular expression for matching HTML entities.")
+
+(defconst markdown-regex-highlighting
+  "\\(?1:^\\|[^\\]\\)\\(?2:\\(?3:==\\)\\(?4:[^ \n\t\\]\\|[^ \n\t]\\(?:.\\|\n[^\n]\\)*?[^\\ ]\\)\\(?5:==\\)\\)"
+"Regular expression for matching highlighting text.
+Group 1 matches the character before the opening equal, if any,
+ensuring that it is not a backslash escape.
+Group 2 matches the entire expression, including delimiters.
+Groups 3 and 5 matches the opening and closing delimiters.
+Group 4 matches the text inside the delimiters.")
+
+
+;;; Syntax ====================================================================
+
+(defvar markdown--syntax-properties
+  (list 'markdown-tilde-fence-begin nil
+        'markdown-tilde-fence-end nil
+        'markdown-fenced-code nil
+        'markdown-yaml-metadata-begin nil
+        'markdown-yaml-metadata-end nil
+        'markdown-yaml-metadata-section nil
+        'markdown-gfm-block-begin nil
+        'markdown-gfm-block-end nil
+        'markdown-gfm-code nil
+        'markdown-list-item nil
+        'markdown-pre nil
+        'markdown-blockquote nil
+        'markdown-hr nil
+        'markdown-comment nil
+        'markdown-heading nil
+        'markdown-heading-1-setext nil
+        'markdown-heading-2-setext nil
+        'markdown-heading-1-atx nil
+        'markdown-heading-2-atx nil
+        'markdown-heading-3-atx nil
+        'markdown-heading-4-atx nil
+        'markdown-heading-5-atx nil
+        'markdown-heading-6-atx nil
+        'markdown-metadata-key nil
+        'markdown-metadata-value nil
+        'markdown-metadata-markup nil)
+  "Property list of all Markdown syntactic properties.")
+
+(defvar markdown-literal-faces
+  '(markdown-inline-code-face
+    markdown-pre-face
+    markdown-math-face
+    markdown-url-face
+    markdown-plain-url-face
+    markdown-language-keyword-face
+    markdown-language-info-face
+    markdown-metadata-key-face
+    markdown-metadata-value-face
+    markdown-html-entity-face
+    markdown-html-tag-name-face
+    markdown-html-tag-delimiter-face
+    markdown-html-attr-name-face
+    markdown-html-attr-value-face
+    markdown-reference-face
+    markdown-footnote-marker-face
+    markdown-line-break-face
+    markdown-comment-face)
+  "A list of markdown-mode faces that contain literal text.
+Literal text treats backslashes literally, rather than as an
+escape character (see `markdown-match-escape').")
+
+(defsubst markdown-in-comment-p (&optional pos)
+  "Return non-nil if POS is in a comment.
+If POS is not given, use point instead."
+  (get-text-property (or pos (point)) 'markdown-comment))
+
+(defun markdown--face-p (pos faces)
+  "Return non-nil if face of POS contain FACES."
+  (let ((face-prop (get-text-property pos 'face)))
+    (if (listp face-prop)
+        (cl-loop for face in face-prop
+                 thereis (memq face faces))
+      (memq face-prop faces))))
+
+(defsubst markdown--math-block-p (&optional pos)
+  (when markdown-enable-math
+    (markdown--face-p (or pos (point)) '(markdown-math-face))))
+
+(defun markdown-syntax-propertize-extend-region (start end)
+  "Extend START to END region to include an entire block of text.
+This helps improve syntax analysis for block constructs.
+Returns a cons (NEW-START . NEW-END) or nil if no adjustment should be made.
+Function is called repeatedly until it returns nil. For details, see
+`syntax-propertize-extend-region-functions'."
+  (save-match-data
+    (save-excursion
+      (let* ((new-start (progn (goto-char start)
+                               (skip-chars-forward "\n")
+                               (if (re-search-backward "\n\n" nil t)
+                                   (min start (match-end 0))
+                                 (point-min))))
+             (new-end (progn (goto-char end)
+                             (skip-chars-backward "\n")
+                             (if (re-search-forward "\n\n" nil t)
+                                 (max end (match-beginning 0))
+                               (point-max))))
+             (code-match (markdown-code-block-at-pos new-start))
+             ;; FIXME: The `code-match' can return bogus values
+             ;; when text has been inserted/deleted!
+             (new-start (min (or (and code-match (cl-first code-match))
+                                 (point-max))
+                             new-start))
+             (code-match (and (< end (point-max))
+                              (markdown-code-block-at-pos end)))
+             (new-end (max (or (and code-match (cl-second code-match)) 0)
+                           new-end)))
+
+        (unless (and (eq new-start start) (eq new-end end))
+          (cons new-start (min new-end (point-max))))))))
+
+(defun markdown-font-lock-extend-region-function (start end _)
+  "Used in `jit-lock-after-change-extend-region-functions'.
+Delegates to `markdown-syntax-propertize-extend-region'. START
+and END are the previous region to refontify."
+  (let ((res (markdown-syntax-propertize-extend-region start end)))
+    (when res
+      ;; syntax-propertize-function is not called when character at
+      ;; (point-max) is deleted, but font-lock-extend-region-functions
+      ;; are called.  Force a syntax property update in that case.
+      (when (= end (point-max))
+        ;; This function is called in a buffer modification hook.
+        ;; `markdown-syntax-propertize' doesn't save the match data,
+        ;; so we have to do it here.
+        (save-match-data
+          (markdown-syntax-propertize (car res) (cdr res))))
+      (setq jit-lock-start (car res)
+            jit-lock-end (cdr res)))))
+
+(defun markdown--cur-list-item-bounds ()
+  "Return a list describing the list item at point.
+Assumes that match data is set for `markdown-regex-list'.  See the
+documentation for `markdown-cur-list-item-bounds' for the format of
+the returned list."
+  (save-excursion
+    (let* ((begin (match-beginning 0))
+           (indent (length (match-string-no-properties 1)))
+           (nonlist-indent (- (match-end 3) (match-beginning 0)))
+           (marker (buffer-substring-no-properties
+                    (match-beginning 2) (match-end 3)))
+           (checkbox (match-string-no-properties 4))
+           (match (butlast (match-data t)))
+           (end (markdown-cur-list-item-end nonlist-indent)))
+      (list begin end indent nonlist-indent marker checkbox match))))
+
+(defun markdown--append-list-item-bounds (marker indent cur-bounds bounds)
+  "Update list item BOUNDS given list MARKER, block INDENT, and CUR-BOUNDS.
+Here, MARKER is a string representing the type of list and INDENT
+is an integer giving the indentation, in spaces, of the current
+block.  CUR-BOUNDS is a list of the form returned by
+`markdown-cur-list-item-bounds' and BOUNDS is a list of bounds
+values for parent list items.  When BOUNDS is nil, it means we are
+at baseline (not inside of a nested list)."
+  (let ((prev-indent (or (cl-third (car bounds)) 0)))
+    (cond
+     ;; New list item at baseline.
+     ((and marker (null bounds))
+      (list cur-bounds))
+     ;; List item with greater indentation (four or more spaces).
+     ;; Increase list level by consing CUR-BOUNDS onto BOUNDS.
+     ((and marker (>= indent (+ prev-indent markdown-list-indent-width)))
+      (cons cur-bounds bounds))
+     ;; List item with greater or equal indentation (less than four spaces).
+     ;; Keep list level the same by replacing the car of BOUNDS.
+     ((and marker (>= indent prev-indent))
+      (cons cur-bounds (cdr bounds)))
+     ;; Lesser indentation level.
+     ;; Pop appropriate number of elements off BOUNDS list (e.g., lesser
+     ;; indentation could move back more than one list level).  Note
+     ;; that this block need not be the beginning of list item.
+     ((< indent prev-indent)
+      (while (and (> (length bounds) 1)
+                  (setq prev-indent (cl-third (cadr bounds)))
+                  (< indent (+ prev-indent markdown-list-indent-width)))
+        (setq bounds (cdr bounds)))
+      (cons cur-bounds bounds))
+     ;; Otherwise, do nothing.
+     (t bounds))))
+
+(defun markdown-syntax-propertize-list-items (start end)
+  "Propertize list items from START to END.
+Stores nested list item information in the `markdown-list-item'
+text property to make later syntax analysis easier.  The value of
+this property is a list with elements of the form (begin . end)
+giving the bounds of the current and parent list items."
+  (save-excursion
+    (goto-char start)
+    (let ((prev-list-line -100)
+          bounds level pre-regexp)
+      ;; Find a baseline point with zero list indentation
+      (markdown-search-backward-baseline)
+      ;; Search for all list items between baseline and END
+      (while (and (< (point) end)
+                  (re-search-forward markdown-regex-list end 'limit))
+        ;; Level of list nesting
+        (setq level (length bounds))
+        ;; Pre blocks need to be indented one level past the list level
+        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ level)))
+        (beginning-of-line)
+        (cond
+         ;; Reset at headings, horizontal rules, and top-level blank lines.
+         ;; Propertize baseline when in range.
+         ((markdown-new-baseline)
+          (setq bounds nil))
+         ;; Make sure this is not a line from a pre block
+         ((and (looking-at-p pre-regexp)
+               ;; too indented line is also treated as list if previous line is list
+               (>= (- (line-number-at-pos) prev-list-line) 2)))
+         ;; If not, then update levels and propertize list item when in range.
+         (t
+          (let* ((indent (current-indentation))
+                 (cur-bounds (markdown--cur-list-item-bounds))
+                 (first (cl-first cur-bounds))
+                 (last (cl-second cur-bounds))
+                 (marker (cl-fifth cur-bounds)))
+            (setq bounds (markdown--append-list-item-bounds
+                          marker indent cur-bounds bounds))
+            (when (and (<= start (point)) (<= (point) end))
+              (setq prev-list-line (line-number-at-pos first))
+              (put-text-property first last 'markdown-list-item bounds)))))
+        (end-of-line)))))
+
+(defun markdown-syntax-propertize-pre-blocks (start end)
+  "Match preformatted text blocks from START to END."
+  (save-excursion
+    (goto-char start)
+    (let (finish)
+      ;; Use loop for avoiding too many recursive calls
+      ;; https://github.com/jrblevin/markdown-mode/issues/512
+      (while (not finish)
+        (let ((levels (markdown-calculate-list-levels))
+              indent pre-regexp close-regexp open close)
+          (while (and (< (point) end) (not close))
+            ;; Search for a region with sufficient indentation
+            (if (null levels)
+                (setq indent 1)
+              (setq indent (1+ (length levels))))
+            (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" indent))
+            (setq close-regexp (format "^\\(    \\|\t\\)\\{0,%d\\}\\([^ \t]\\)" (1- indent)))
+
+            (cond
+             ;; If not at the beginning of a line, move forward
+             ((not (bolp)) (forward-line))
+             ;; Move past blank lines
+             ((markdown-cur-line-blank-p) (forward-line))
+             ;; At headers and horizontal rules, reset levels
+             ((markdown-new-baseline) (forward-line) (setq levels nil))
+             ;; If the current line has sufficient indentation, mark out pre block
+             ;; The opening should be preceded by a blank line.
+             ((and (markdown-prev-line-blank) (looking-at pre-regexp))
+              (setq open (match-beginning 0))
+              (while (and (or (looking-at-p pre-regexp) (markdown-cur-line-blank-p))
+                          (not (eobp)))
+                (forward-line))
+              (skip-syntax-backward "-")
+              (forward-line)
+              (setq close (point)))
+             ;; If current line has a list marker, update levels, move to end of block
+             ((looking-at markdown-regex-list)
+              (setq levels (markdown-update-list-levels
+                            (match-string 2) (current-indentation) levels))
+              (markdown-end-of-text-block))
+             ;; If this is the end of the indentation level, adjust levels accordingly.
+             ;; Only match end of indentation level if levels is not the empty list.
+             ((and (car levels) (looking-at-p close-regexp))
+              (setq levels (markdown-update-list-levels
+                            nil (current-indentation) levels))
+              (markdown-end-of-text-block))
+             (t (markdown-end-of-text-block))))
+
+          (if (and open close)
+              ;; Set text property data and continue to search
+              (put-text-property open close 'markdown-pre (list open close))
+            (setq finish t))))
+      nil)))
+
+(defconst markdown-fenced-block-pairs
+  `(((,markdown-regex-tilde-fence-begin markdown-tilde-fence-begin)
+     (markdown-make-tilde-fence-regex markdown-tilde-fence-end)
+     markdown-fenced-code)
+    ((markdown-get-yaml-metadata-start-border markdown-yaml-metadata-begin)
+     (markdown-get-yaml-metadata-end-border markdown-yaml-metadata-end)
+     markdown-yaml-metadata-section)
+    ((,markdown-regex-gfm-code-block-open markdown-gfm-block-begin)
+     (,markdown-regex-gfm-code-block-close markdown-gfm-block-end)
+     markdown-gfm-code))
+  "Mapping of regular expressions to \"fenced-block\" constructs.
+These constructs are distinguished by having a distinctive start
+and end pattern, both of which take up an entire line of text,
+but no special pattern to identify text within the fenced
+blocks (unlike blockquotes and indented-code sections).
+
+Each element within this list takes the form:
+
+  ((START-REGEX-OR-FUN START-PROPERTY)
+   (END-REGEX-OR-FUN END-PROPERTY)
+   MIDDLE-PROPERTY)
+
+Each *-REGEX-OR-FUN element can be a regular expression as a string, or a
+function which evaluates to same. Functions for START-REGEX-OR-FUN accept no
+arguments, but functions for END-REGEX-OR-FUN accept a single numerical argument
+which is the length of the first group of the START-REGEX-OR-FUN match, which
+can be ignored if unnecessary. `markdown-maybe-funcall-regexp' is used to
+evaluate these into \"real\" regexps.
+
+The *-PROPERTY elements are the text properties applied to each part of the
+block construct when it is matched using
+`markdown-syntax-propertize-fenced-block-constructs'. START-PROPERTY is applied
+to the text matching START-REGEX-OR-FUN, END-PROPERTY to END-REGEX-OR-FUN, and
+MIDDLE-PROPERTY to the text in between the two. The value of *-PROPERTY is the
+`match-data' when the regexp was matched to the text. In the case of
+MIDDLE-PROPERTY, the value is a false match data of the form \\='(begin end), with
+begin and end set to the edges of the \"middle\" text. This makes fontification
+easier.")
+
+(defun markdown-text-property-at-point (prop)
+  (get-text-property (point) prop))
+
+(defsubst markdown-maybe-funcall-regexp (object &optional arg)
+  (cond ((functionp object)
+         (if arg (funcall object arg) (funcall object)))
+        ((stringp object) object)
+        (t (error "Object cannot be turned into regex"))))
+
+(defsubst markdown-get-start-fence-regexp ()
+  "Return regexp to find all \"start\" sections of fenced block constructs.
+Which construct is actually contained in the match must be found separately."
+  (mapconcat
+   #'identity
+   (mapcar (lambda (entry) (markdown-maybe-funcall-regexp (caar entry)))
+           markdown-fenced-block-pairs)
+   "\\|"))
+
+(defun markdown-get-fenced-block-begin-properties ()
+  (cl-mapcar (lambda (entry) (cl-cadar entry)) markdown-fenced-block-pairs))
+
+(defun markdown-get-fenced-block-end-properties ()
+  (cl-mapcar (lambda (entry) (cl-cadadr entry)) markdown-fenced-block-pairs))
+
+(defun markdown-get-fenced-block-middle-properties ()
+  (cl-mapcar #'cl-third markdown-fenced-block-pairs))
+
+(defun markdown-find-previous-prop (prop &optional lim)
+  "Find previous place where property PROP is non-nil, up to LIM.
+Return a cons of (pos . property). pos is point if point contains
+non-nil PROP."
+  (let ((res
+         (if (get-text-property (point) prop) (point)
+           (previous-single-property-change
+            (point) prop nil (or lim (point-min))))))
+    (when (and (not (get-text-property res prop))
+               (> res (point-min))
+               (get-text-property (1- res) prop))
+      (cl-decf res))
+    (when (and res (get-text-property res prop)) (cons res prop))))
+
+(defun markdown-find-next-prop (prop &optional lim)
+  "Find next place where property PROP is non-nil, up to LIM.
+Return a cons of (POS . PROPERTY) where POS is point if point
+contains non-nil PROP."
+  (let ((res
+         (if (get-text-property (point) prop) (point)
+           (next-single-property-change
+            (point) prop nil (or lim (point-max))))))
+    (when (and res (get-text-property res prop)) (cons res prop))))
+
+(defun markdown-min-of-seq (map-fn seq)
+  "Apply MAP-FN to SEQ and return element of SEQ with minimum value of MAP-FN."
+  (cl-loop for el in seq
+           with min = 1.0e+INF          ; infinity
+           with min-el = nil
+           do (let ((res (funcall map-fn el)))
+                (when (< res min)
+                  (setq min res)
+                  (setq min-el el)))
+           finally return min-el))
+
+(defun markdown-max-of-seq (map-fn seq)
+  "Apply MAP-FN to SEQ and return element of SEQ with maximum value of MAP-FN."
+  (cl-loop for el in seq
+           with max = -1.0e+INF          ; negative infinity
+           with max-el = nil
+           do (let ((res (funcall map-fn el)))
+                (when (and res (> res max))
+                  (setq max res)
+                  (setq max-el el)))
+           finally return max-el))
+
+(defun markdown-find-previous-block ()
+  "Find previous block.
+Detect whether `markdown-syntax-propertize-fenced-block-constructs' was
+unable to propertize the entire block, but was able to propertize the beginning
+of the block. If so, return a cons of (pos . property) where the beginning of
+the block was propertized."
+  (let ((start-pt (point))
+        (closest-open
+         (markdown-max-of-seq
+          #'car
+          (cl-remove-if
+           #'null
+           (cl-mapcar
+            #'markdown-find-previous-prop
+            (markdown-get-fenced-block-begin-properties))))))
+    (when closest-open
+      (let* ((length-of-open-match
+              (let ((match-d
+                     (get-text-property (car closest-open) (cdr closest-open))))
+                (- (cl-fourth match-d) (cl-third match-d))))
+             (end-regexp
+              (markdown-maybe-funcall-regexp
+               (cl-caadr
+                (cl-find-if
+                 (lambda (entry) (eq (cl-cadar entry) (cdr closest-open)))
+                 markdown-fenced-block-pairs))
+               length-of-open-match))
+             (end-prop-loc
+              (save-excursion
+                (save-match-data
+                  (goto-char (car closest-open))
+                  (and (re-search-forward end-regexp start-pt t)
+                       (match-beginning 0))))))
+        (and (not end-prop-loc) closest-open)))))
+
+(defun markdown-get-fenced-block-from-start (prop)
+  "Return limits of an enclosing fenced block from its start, using PROP.
+Return value is a list usable as `match-data'."
+  (catch 'no-rest-of-block
+    (let* ((correct-entry
+            (cl-find-if
+             (lambda (entry) (eq (cl-cadar entry) prop))
+             markdown-fenced-block-pairs))
+           (begin-of-begin (cl-first (markdown-text-property-at-point prop)))
+           (middle-prop (cl-third correct-entry))
+           (end-prop (cl-cadadr correct-entry))
+           (end-of-end
+            (save-excursion
+              (goto-char (match-end 0))   ; end of begin
+              (unless (eobp) (forward-char))
+              (let ((mid-prop-v (markdown-text-property-at-point middle-prop)))
+                (if (not mid-prop-v)    ; no middle
+                    (progn
+                      ;; try to find end by advancing one
+                      (let ((end-prop-v
+                             (markdown-text-property-at-point end-prop)))
+                        (if end-prop-v (cl-second end-prop-v)
+                          (throw 'no-rest-of-block nil))))
+                  (set-match-data mid-prop-v)
+                  (goto-char (match-end 0))   ; end of middle
+                  (beginning-of-line)         ; into end
+                  (cl-second (markdown-text-property-at-point end-prop)))))))
+      (list begin-of-begin end-of-end))))
+
+(defun markdown-get-fenced-block-from-middle (prop)
+  "Return limits of an enclosing fenced block from its middle, using PROP.
+Return value is a list usable as `match-data'."
+  (let* ((correct-entry
+          (cl-find-if
+           (lambda (entry) (eq (cl-third entry) prop))
+           markdown-fenced-block-pairs))
+         (begin-prop (cl-cadar correct-entry))
+         (begin-of-begin
+          (save-excursion
+            (goto-char (match-beginning 0))
+            (unless (bobp) (forward-line -1))
+            (beginning-of-line)
+            (cl-first (markdown-text-property-at-point begin-prop))))
+         (end-prop (cl-cadadr correct-entry))
+         (end-of-end
+          (save-excursion
+            (goto-char (match-end 0))
+            (beginning-of-line)
+            (cl-second (markdown-text-property-at-point end-prop)))))
+    (list begin-of-begin end-of-end)))
+
+(defun markdown-get-fenced-block-from-end (prop)
+  "Return limits of an enclosing fenced block from its end, using PROP.
+Return value is a list usable as `match-data'."
+  (let* ((correct-entry
+          (cl-find-if
+           (lambda (entry) (eq (cl-cadadr entry) prop))
+           markdown-fenced-block-pairs))
+         (end-of-end (cl-second (markdown-text-property-at-point prop)))
+         (middle-prop (cl-third correct-entry))
+         (begin-prop (cl-cadar correct-entry))
+         (begin-of-begin
+          (save-excursion
+            (goto-char (match-beginning 0)) ; beginning of end
+            (unless (bobp) (backward-char)) ; into middle
+            (let ((mid-prop-v (markdown-text-property-at-point middle-prop)))
+              (if (not mid-prop-v)
+                  (progn
+                    (beginning-of-line)
+                    (cl-first (markdown-text-property-at-point begin-prop)))
+                (set-match-data mid-prop-v)
+                (goto-char (match-beginning 0))   ; beginning of middle
+                (unless (bobp) (forward-line -1)) ; into beginning
+                (beginning-of-line)
+                (cl-first (markdown-text-property-at-point begin-prop)))))))
+    (list begin-of-begin end-of-end)))
+
+(defun markdown-get-enclosing-fenced-block-construct (&optional pos)
+  "Get \"fake\" match data for block enclosing POS.
+Returns fake match data which encloses the start, middle, and end
+of the block construct enclosing POS, if it exists. Used in
+`markdown-code-block-at-pos'."
+  (save-excursion
+    (when pos (goto-char pos))
+    (beginning-of-line)
+    (car
+     (cl-remove-if
+      #'null
+      (cl-mapcar
+       (lambda (fun-and-prop)
+         (cl-destructuring-bind (fun prop) fun-and-prop
+           (when prop
+             (save-match-data
+               (set-match-data (markdown-text-property-at-point prop))
+               (funcall fun prop)))))
+       `((markdown-get-fenced-block-from-start
+          ,(cl-find-if
+            #'markdown-text-property-at-point
+            (markdown-get-fenced-block-begin-properties)))
+         (markdown-get-fenced-block-from-middle
+          ,(cl-find-if
+            #'markdown-text-property-at-point
+            (markdown-get-fenced-block-middle-properties)))
+         (markdown-get-fenced-block-from-end
+          ,(cl-find-if
+            #'markdown-text-property-at-point
+            (markdown-get-fenced-block-end-properties)))))))))
+
+(defun markdown-propertize-end-match (reg end fence-spec middle-begin)
+  "Get match for REG up to END, if exists, and propertize appropriately.
+FENCE-SPEC is an entry in `markdown-fenced-block-pairs' and
+MIDDLE-BEGIN is the start of the \"middle\" section of the block."
+  (when (re-search-forward reg end t)
+    (let ((close-begin (match-beginning 0)) ; Start of closing line.
+          (close-end (match-end 0))         ; End of closing line.
+          (close-data (match-data t)))      ; Match data for closing line.
+      ;; Propertize middle section of fenced block.
+      (put-text-property middle-begin close-begin
+                         (cl-third fence-spec)
+                         (list middle-begin close-begin))
+      ;; If the block is a YAML block, propertize the declarations inside
+      (when (< middle-begin close-begin) ;; workaround #634
+        (markdown-syntax-propertize-yaml-metadata middle-begin close-begin))
+      ;; Propertize closing line of fenced block.
+      (put-text-property close-begin close-end
+                         (cl-cadadr fence-spec) close-data))))
+
+(defun markdown--triple-quote-single-line-p (begin)
+  (save-excursion
+    (goto-char begin)
+    (save-match-data
+      (and (search-forward "```" nil t)
+           (search-forward "```" (line-end-position) t)))))
+
+(defun markdown-syntax-propertize-fenced-block-constructs (start end)
+  "Propertize according to `markdown-fenced-block-pairs' from START to END.
+If unable to propertize an entire block (if the start of a block is within START
+and END, but the end of the block is not), propertize the start section of a
+block, then in a subsequent call propertize both middle and end by finding the
+start which was previously propertized."
+  (let ((start-reg (markdown-get-start-fence-regexp)))
+    (save-excursion
+      (goto-char start)
+      ;; start from previous unclosed block, if exists
+      (let ((prev-begin-block (markdown-find-previous-block)))
+        (when prev-begin-block
+          (let* ((correct-entry
+                  (cl-find-if (lambda (entry)
+                                (eq (cdr prev-begin-block) (cl-cadar entry)))
+                              markdown-fenced-block-pairs))
+                 (enclosed-text-start (1+ (car prev-begin-block)))
+                 (start-length
+                  (save-excursion
+                    (goto-char (car prev-begin-block))
+                    (string-match
+                     (markdown-maybe-funcall-regexp
+                      (caar correct-entry))
+                     (buffer-substring
+                      (line-beginning-position) (line-end-position)))
+                    (- (match-end 1) (match-beginning 1))))
+                 (end-reg (markdown-maybe-funcall-regexp
+                           (cl-caadr correct-entry) start-length)))
+            (markdown-propertize-end-match
+             end-reg end correct-entry enclosed-text-start))))
+      ;; find all new blocks within region
+      (while (re-search-forward start-reg end t)
+        ;; we assume the opening constructs take up (only) an entire line,
+        ;; so we re-check the current line
+        (let* ((block-start (match-beginning 0))
+               (cur-line (buffer-substring (line-beginning-position) (line-end-position)))
+               ;; find entry in `markdown-fenced-block-pairs' corresponding
+               ;; to regex which was matched
+               (correct-entry
+                (cl-find-if
+                 (lambda (fenced-pair)
+                   (string-match-p
+                    (markdown-maybe-funcall-regexp (caar fenced-pair))
+                    cur-line))
+                 markdown-fenced-block-pairs))
+               (enclosed-text-start
+                (save-excursion (1+ (line-end-position))))
+               (end-reg
+                (markdown-maybe-funcall-regexp
+                 (cl-caadr correct-entry)
+                 (if (and (match-beginning 1) (match-end 1))
+                     (- (match-end 1) (match-beginning 1))
+                   0)))
+               (prop (cl-cadar correct-entry)))
+          (when (or (not (eq prop 'markdown-gfm-block-begin))
+                    (not (markdown--triple-quote-single-line-p block-start)))
+            ;; get correct match data
+            (save-excursion
+              (beginning-of-line)
+              (re-search-forward
+               (markdown-maybe-funcall-regexp (caar correct-entry))
+               (line-end-position)))
+            ;; mark starting, even if ending is outside of region
+            (put-text-property (match-beginning 0) (match-end 0) prop (match-data t))
+            (markdown-propertize-end-match
+             end-reg end correct-entry enclosed-text-start)))))))
+
+(defun markdown-syntax-propertize-blockquotes (start end)
+  "Match blockquotes from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (and (re-search-forward markdown-regex-blockquote end t)
+                (not (markdown-code-block-at-pos (match-beginning 0))))
+      (put-text-property (match-beginning 0) (match-end 0)
+                         'markdown-blockquote
+                         (match-data t)))))
+
+(defun markdown-syntax-propertize-hrs (start end)
+  "Match horizontal rules from START to END."
+  (save-excursion
+    (goto-char start)
+    (while (re-search-forward markdown-regex-hr end t)
+      (let ((beg (match-beginning 0))
+            (end (match-end 0)))
+        (goto-char beg)
+        (unless (or (markdown-on-heading-p)
+                    (markdown-code-block-at-point-p))
+          (put-text-property beg end 'markdown-hr (match-data t)))
+        (goto-char end)))))
+
+(defun markdown-syntax-propertize-yaml-metadata (start end)
+  "Propertize elements inside YAML metadata blocks from START to END.
+Assumes region from START and END is already known to be the interior
+region of a YAML metadata block as propertized by
+`markdown-syntax-propertize-fenced-block-constructs'."
+  (save-excursion
+    (goto-char start)
+    (cl-loop
+     while (re-search-forward markdown-regex-declarative-metadata end t)
+     do (progn
+          (put-text-property (match-beginning 1) (match-end 1)
+                             'markdown-metadata-key (match-data t))
+          (put-text-property (match-beginning 2) (match-end 2)
+                             'markdown-metadata-markup (match-data t))
+          (put-text-property (match-beginning 3) (match-end 3)
+                             'markdown-metadata-value (match-data t))))))
+
+(defun markdown-syntax-propertize-headings (start end)
+  "Match headings of type SYMBOL with REGEX from START to END."
+  (goto-char start)
+  (while (re-search-forward markdown-regex-header end t)
+    (unless (markdown-code-block-at-pos (match-beginning 0))
+      (put-text-property
+       (match-beginning 0) (match-end 0) 'markdown-heading
+       (match-data t))
+      (put-text-property
+       (match-beginning 0) (match-end 0)
+       (cond ((match-string-no-properties 2) 'markdown-heading-1-setext)
+             ((match-string-no-properties 3) 'markdown-heading-2-setext)
+             (t (let ((atx-level (length (markdown-trim-whitespace
+                                          (match-string-no-properties 4)))))
+                  (intern (format "markdown-heading-%d-atx" atx-level)))))
+       (match-data t)))))
+
+(defun markdown-syntax-propertize-comments (start end)
+  "Match HTML comments from the START to END."
+  ;; Implement by loop instead of recursive call for avoiding
+  ;; exceed max-lisp-eval-depth issue
+  ;; https://github.com/jrblevin/markdown-mode/issues/536
+  (let (finish)
+    (goto-char start)
+    (while (not finish)
+      (let* ((in-comment (nth 4 (syntax-ppss)))
+             (comment-begin (nth 8 (syntax-ppss))))
+        (cond
+         ;; Comment start
+         ((and (not in-comment)
+               (re-search-forward markdown-regex-comment-start end t)
+               (not (markdown-inline-code-at-point-p))
+               (not (markdown-code-block-at-point-p)))
+          (let ((open-beg (match-beginning 0)))
+            (put-text-property open-beg (1+ open-beg)
+                               'syntax-table (string-to-syntax "<"))
+            (goto-char (min (1+ (match-end 0)) end (point-max)))))
+         ;; Comment end
+         ((and in-comment comment-begin
+               (re-search-forward markdown-regex-comment-end end t))
+          (let ((comment-end (match-end 0)))
+            (put-text-property (1- comment-end) comment-end
+                               'syntax-table (string-to-syntax ">"))
+            ;; Remove any other text properties inside the comment
+            (remove-text-properties comment-begin comment-end
+                                    markdown--syntax-properties)
+            (put-text-property comment-begin comment-end
+                               'markdown-comment (list comment-begin comment-end))
+            (goto-char (min comment-end end (point-max)))))
+         ;; Nothing found
+         (t (setq finish t)))))
+    nil))
+
+(defun markdown-syntax-propertize (start end)
+  "Function used as `syntax-propertize-function'.
+START and END delimit region to propertize."
+  (with-silent-modifications
+    (save-excursion
+      (remove-text-properties start end markdown--syntax-properties)
+      (markdown-syntax-propertize-fenced-block-constructs start end)
+      (markdown-syntax-propertize-list-items start end)
+      (markdown-syntax-propertize-pre-blocks start end)
+      (markdown-syntax-propertize-blockquotes start end)
+      (markdown-syntax-propertize-headings start end)
+      (markdown-syntax-propertize-hrs start end)
+      (markdown-syntax-propertize-comments start end))))
+
+
+;;; Markup Hiding =============================================================
+
+(defconst markdown-markup-properties
+  '(face markdown-markup-face invisible markdown-markup)
+  "List of properties and values to apply to markup.")
+
+(defconst markdown-line-break-properties
+  '(face markdown-line-break-face invisible markdown-markup)
+  "List of properties and values to apply to line break markup.")
+
+(defconst markdown-language-keyword-properties
+  '(face markdown-language-keyword-face invisible markdown-markup)
+  "List of properties and values to apply to code block language names.")
+
+(defconst markdown-language-info-properties
+  '(face markdown-language-info-face invisible markdown-markup)
+  "List of properties and values to apply to code block language info strings.")
+
+(defconst markdown-include-title-properties
+  '(face markdown-link-title-face invisible markdown-markup)
+  "List of properties and values to apply to included code titles.")
+
+(defcustom markdown-hide-markup nil
+  "Determines whether markup in the buffer will be hidden.
+When set to nil, all markup is displayed in the buffer as it
+appears in the file.  An exception is when `markdown-hide-urls'
+is non-nil.
+Set this to a non-nil value to turn this feature on by default.
+You can interactively toggle the value of this variable with
+`markdown-toggle-markup-hiding', \\[markdown-toggle-markup-hiding],
+or from the Markdown > Show & Hide menu.
+
+Markup hiding works by adding text properties to positions in the
+buffer---either the `invisible' property or the `display' property
+in cases where alternative glyphs are used (e.g., list bullets).
+This does not, however, affect printing or other output.
+Functions such as `htmlfontify-buffer' and `ps-print-buffer' will
+not honor these text properties.  For printing, it would be better
+to first convert to HTML or PDF (e.g,. using Pandoc)."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.3"))
+(make-variable-buffer-local 'markdown-hide-markup)
+
+(defun markdown-toggle-markup-hiding (&optional arg)
+  "Toggle the display or hiding of markup.
+With a prefix argument ARG, enable markup hiding if ARG is positive,
+and disable it otherwise.
+See `markdown-hide-markup' for additional details."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-hide-markup
+        (if (eq arg 'toggle)
+            (not markdown-hide-markup)
+          (> (prefix-numeric-value arg) 0)))
+  (if markdown-hide-markup
+      (add-to-invisibility-spec 'markdown-markup)
+    (remove-from-invisibility-spec 'markdown-markup))
+  (when (called-interactively-p 'interactive)
+    (message "markdown-mode markup hiding %s" (if markdown-hide-markup "enabled" "disabled")))
+  (markdown-reload-extensions))
+
+
+;;; Font Lock =================================================================
+
+(require 'font-lock)
+
+(defgroup markdown-faces nil
+  "Faces used in Markdown Mode."
+  :group 'markdown
+  :group 'faces)
+
+(defface markdown-italic-face
+  '((t (:inherit italic)))
+  "Face for italic text."
+  :group 'markdown-faces)
+
+(defface markdown-bold-face
+  '((t (:inherit bold)))
+  "Face for bold text."
+  :group 'markdown-faces)
+
+(defface markdown-strike-through-face
+  '((t (:strike-through t)))
+  "Face for strike-through text."
+  :group 'markdown-faces)
+
+(defface markdown-markup-face
+  '((t (:inherit shadow :slant normal :weight normal)))
+  "Face for markup elements."
+  :group 'markdown-faces)
+
+(defface markdown-header-rule-face
+  '((t (:inherit markdown-markup-face)))
+  "Base face for headers rules."
+  :group 'markdown-faces)
+
+(defface markdown-header-delimiter-face
+  '((t (:inherit markdown-markup-face)))
+  "Base face for headers hash delimiter."
+  :group 'markdown-faces)
+
+(defface markdown-list-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for list item markers."
+  :group 'markdown-faces)
+
+(defface markdown-blockquote-face
+  '((t (:inherit font-lock-doc-face)))
+  "Face for blockquote sections."
+  :group 'markdown-faces)
+
+(defface markdown-code-face
+  '((t (:inherit fixed-pitch)))
+  "Face for inline code, pre blocks, and fenced code blocks.
+This may be used, for example, to add a contrasting background to
+inline code fragments and code blocks."
+  :group 'markdown-faces)
+
+(defface markdown-inline-code-face
+  '((t (:inherit (markdown-code-face font-lock-constant-face))))
+  "Face for inline code."
+  :group 'markdown-faces)
+
+(defface markdown-pre-face
+  '((t (:inherit (markdown-code-face font-lock-constant-face))))
+  "Face for preformatted text."
+  :group 'markdown-faces)
+
+(defface markdown-table-face
+  '((t (:inherit (markdown-code-face))))
+  "Face for tables."
+  :group 'markdown-faces)
+
+(defface markdown-language-keyword-face
+  '((t (:inherit font-lock-type-face)))
+  "Face for programming language identifiers."
+  :group 'markdown-faces)
+
+(defface markdown-language-info-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for programming language info strings."
+  :group 'markdown-faces)
+
+(defface markdown-link-face
+  '((t (:inherit link)))
+  "Face for links."
+  :group 'markdown-faces)
+
+(defface markdown-missing-link-face
+  '((t (:inherit font-lock-warning-face)))
+  "Face for missing links."
+  :group 'markdown-faces)
+
+(defface markdown-reference-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for link references."
+  :group 'markdown-faces)
+
+(defface markdown-footnote-marker-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for footnote markers."
+  :group 'markdown-faces)
+
+(defface markdown-footnote-text-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for footnote text."
+  :group 'markdown-faces)
+
+(defface markdown-url-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for URLs that are part of markup.
+For example, this applies to URLs in inline links:
+[link text](http://example.com/)."
+  :group 'markdown-faces)
+
+(defface markdown-plain-url-face
+  '((t (:inherit markdown-link-face)))
+  "Face for URLs that are also links.
+For example, this applies to plain angle bracket URLs:
+<http://example.com/>."
+  :group 'markdown-faces)
+
+(defface markdown-link-title-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for reference link titles."
+  :group 'markdown-faces)
+
+(defface markdown-line-break-face
+  '((t (:inherit font-lock-constant-face :underline t)))
+  "Face for hard line breaks."
+  :group 'markdown-faces)
+
+(defface markdown-comment-face
+  '((t (:inherit font-lock-comment-face)))
+  "Face for HTML comments."
+  :group 'markdown-faces)
+
+(defface markdown-math-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for LaTeX expressions."
+  :group 'markdown-faces)
+
+(defface markdown-metadata-key-face
+  '((t (:inherit font-lock-variable-name-face)))
+  "Face for metadata keys."
+  :group 'markdown-faces)
+
+(defface markdown-metadata-value-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for metadata values."
+  :group 'markdown-faces)
+
+(defface markdown-gfm-checkbox-face
+  '((t (:inherit font-lock-builtin-face)))
+  "Face for GFM checkboxes."
+  :group 'markdown-faces)
+
+(defface markdown-highlight-face
+  '((t (:inherit highlight)))
+  "Face for mouse highlighting."
+  :group 'markdown-faces)
+
+(defface markdown-hr-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for horizontal rules."
+  :group 'markdown-faces)
+
+(defface markdown-html-tag-name-face
+  '((t (:inherit font-lock-type-face)))
+  "Face for HTML tag names."
+  :group 'markdown-faces)
+
+(defface markdown-html-tag-delimiter-face
+  '((t (:inherit markdown-markup-face)))
+  "Face for HTML tag delimiters."
+  :group 'markdown-faces)
+
+(defface markdown-html-attr-name-face
+  '((t (:inherit font-lock-variable-name-face)))
+  "Face for HTML attribute names."
+  :group 'markdown-faces)
+
+(defface markdown-html-attr-value-face
+  '((t (:inherit font-lock-string-face)))
+  "Face for HTML attribute values."
+  :group 'markdown-faces)
+
+(defface markdown-html-entity-face
+  '((t (:inherit font-lock-variable-name-face)))
+  "Face for HTML entities."
+  :group 'markdown-faces)
+
+(defface markdown-highlighting-face
+  '((t (:background "yellow" :foreground "black")))
+  "Face for highlighting."
+  :group 'markdown-faces)
+
+(defcustom markdown-header-scaling nil
+  "Whether to use variable-height faces for headers.
+When non-nil, `markdown-header-face' will inherit from
+`variable-pitch' and the scaling values in
+`markdown-header-scaling-values' will be applied to
+headers of levels one through six respectively."
+  :type 'boolean
+  :initialize #'custom-initialize-default
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (markdown-update-header-faces value))
+  :group 'markdown-faces
+  :package-version '(markdown-mode . "2.2"))
+
+(defcustom markdown-header-scaling-values
+  '(2.0 1.7 1.4 1.1 1.0 1.0)
+  "List of scaling values for headers of level one through six.
+Used when `markdown-header-scaling' is non-nil."
+  :type '(repeat float)
+  :initialize #'custom-initialize-default
+  :set (lambda (symbol value)
+         (set-default symbol value)
+         (markdown-update-header-faces markdown-header-scaling value)))
+
+(defmacro markdown--dotimes-when-compile (i-n body)
+  (declare (indent 1) (debug ((symbolp form) form)))
+  (let ((var (car i-n))
+        (n (cadr i-n))
+        (code ()))
+    (dotimes (i (eval n t))
+      (push (eval body `((,var . ,i))) code))
+    `(progn ,@(nreverse code))))
+
+(defface markdown-header-face
+  `((t (:inherit (,@(when markdown-header-scaling '(variable-pitch))
+                  font-lock-function-name-face)
+        :weight bold)))
+  "Base face for headers.")
+
+(markdown--dotimes-when-compile (num 6)
+  (let* ((num1 (1+ num))
+         (face-name (intern (format "markdown-header-face-%s" num1))))
+    `(defface ,face-name
+       (,'\` ((t (:inherit markdown-header-face
+                  :height
+                  (,'\, (if markdown-header-scaling
+                            (float (nth ,num markdown-header-scaling-values))
+                          1.0))))))
+       (format "Face for level %s headers.
+You probably don't want to customize this face directly. Instead
+you can customize the base face `markdown-header-face' or the
+variable-height variable `markdown-header-scaling'." ,num1))))
+
+(defun markdown-update-header-faces (&optional scaling scaling-values)
+  "Update header faces, depending on if header SCALING is desired.
+If so, use given list of SCALING-VALUES relative to the baseline
+size of `markdown-header-face'."
+  (dotimes (num 6)
+    (let* ((face-name (intern (format "markdown-header-face-%s" (1+ num))))
+           (scale (cond ((not scaling) 1.0)
+                        (scaling-values (float (nth num scaling-values)))
+                        (t (float (nth num markdown-header-scaling-values))))))
+      (unless (get face-name 'saved-face) ; Don't update customized faces
+        (set-face-attribute face-name nil :height scale)))))
+
+(defun markdown-syntactic-face (state)
+  "Return font-lock face for characters with given STATE.
+See `font-lock-syntactic-face-function' for details."
+  (let ((in-comment (nth 4 state)))
+    (cond
+     (in-comment 'markdown-comment-face)
+     (t nil))))
+
+(defcustom markdown-list-item-bullets
+  '("●" "◎" "○" "◆" "◇" "►" "•")
+  "List of bullets to use for unordered lists.
+It can contain any number of symbols, which will be repeated.
+Depending on your font, some reasonable choices are:
+♥ ● ◇ ✚ ✜ ☯ ◆ ♠ ♣ ♦ ❀ ◆ ◖ ▶ ► • ★ ▸."
+  :group 'markdown
+  :type '(repeat (string :tag "Bullet character"))
+  :package-version '(markdown-mode . "2.3"))
+
+(defun markdown--footnote-marker-properties ()
+  "Return a font-lock facespec expression for footnote marker text."
+  `(face markdown-footnote-marker-face
+         ,@(when markdown-hide-markup
+             `(display ,markdown-footnote-display))))
+
+(defun markdown--pandoc-inline-footnote-properties ()
+  "Return a font-lock facespec expression for Pandoc inline footnote text."
+  `(face markdown-footnote-text-face
+         ,@(when markdown-hide-markup
+             `(display ,markdown-footnote-display))))
+
+(defvar markdown-mode-font-lock-keywords
+  `((markdown-match-yaml-metadata-begin . ((1 'markdown-markup-face)))
+    (markdown-match-yaml-metadata-end . ((1 'markdown-markup-face)))
+    (markdown-match-yaml-metadata-key . ((1 'markdown-metadata-key-face)
+                                         (2 'markdown-markup-face)
+                                         (3 'markdown-metadata-value-face)))
+    (markdown-match-gfm-open-code-blocks . ((1 markdown-markup-properties)
+                                            (2 markdown-markup-properties nil t)
+                                            (3 markdown-language-keyword-properties nil t)
+                                            (4 markdown-language-info-properties nil t)
+                                            (5 markdown-markup-properties nil t)))
+    (markdown-match-gfm-close-code-blocks . ((0 markdown-markup-properties)))
+    (markdown-fontify-gfm-code-blocks)
+    (markdown-fontify-tables)
+    (markdown-match-fenced-start-code-block . ((1 markdown-markup-properties)
+                                               (2 markdown-markup-properties nil t)
+                                               (3 markdown-language-keyword-properties nil t)
+                                               (4 markdown-language-info-properties nil t)
+                                               (5 markdown-markup-properties nil t)))
+    (markdown-match-fenced-end-code-block . ((0 markdown-markup-properties)))
+    (markdown-fontify-fenced-code-blocks)
+    (markdown-match-pre-blocks . ((0 'markdown-pre-face)))
+    (markdown-fontify-headings)
+    (markdown-match-declarative-metadata . ((1 'markdown-metadata-key-face)
+                                            (2 'markdown-markup-face)
+                                            (3 'markdown-metadata-value-face)))
+    (markdown-match-pandoc-metadata . ((1 'markdown-markup-face)
+                                       (2 'markdown-markup-face)
+                                       (3 'markdown-metadata-value-face)))
+    (markdown-fontify-hrs)
+    (markdown-match-code . ((1 markdown-markup-properties prepend)
+                            (2 'markdown-inline-code-face prepend)
+                            (3 markdown-markup-properties prepend)))
+    (,markdown-regex-kbd . ((1 markdown-markup-properties)
+                            (2 'markdown-inline-code-face)
+                            (3 markdown-markup-properties)))
+    (markdown-fontify-angle-uris)
+    (,markdown-regex-email . 'markdown-plain-url-face)
+    (markdown-match-html-tag . ((1 'markdown-html-tag-delimiter-face t)
+                                (2 'markdown-html-tag-name-face t)
+                                (3 'markdown-html-tag-delimiter-face t)
+                                ;; Anchored matcher for HTML tag attributes
+                                (,markdown-regex-html-attr
+                                 ;; Before searching, move past tag
+                                 ;; name; set limit at tag close.
+                                 (progn
+                                   (goto-char (match-end 2)) (match-end 3))
+                                 nil
+                                 . ((1 'markdown-html-attr-name-face)
+                                    (3 'markdown-html-tag-delimiter-face nil t)
+                                    (4 'markdown-html-attr-value-face nil t)))))
+    (,markdown-regex-html-entity . 'markdown-html-entity-face)
+    (markdown-fontify-list-items)
+    (,markdown-regex-footnote . ((1 markdown-markup-properties)    ; [^
+                                 (2 (markdown--footnote-marker-properties)) ; label
+                                 (3 markdown-markup-properties)))  ; ]
+    (,markdown-regex-pandoc-inline-footnote . ((1 markdown-markup-properties)   ; ^
+                                               (2 markdown-markup-properties)   ; [
+                                               (3 (markdown--pandoc-inline-footnote-properties)) ; text
+                                               (4 markdown-markup-properties))) ; ]
+    (markdown-match-includes . ((1 markdown-markup-properties)
+                                (2 markdown-markup-properties nil t)
+                                (3 markdown-include-title-properties nil t)
+                                (4 markdown-markup-properties nil t)
+                                (5 markdown-markup-properties)
+                                (6 'markdown-url-face)
+                                (7 markdown-markup-properties)))
+    (markdown-fontify-inline-links)
+    (markdown-fontify-reference-links)
+    (,markdown-regex-reference-definition . ((1 'markdown-markup-face) ; [
+                                             (2 'markdown-reference-face) ; label
+                                             (3 'markdown-markup-face)    ; ]
+                                             (4 'markdown-markup-face)    ; :
+                                             (5 'markdown-url-face)       ; url
+                                             (6 'markdown-link-title-face))) ; "title" (optional)
+    (markdown-fontify-plain-uris)
+    ;; Math mode $..$
+    (markdown-match-math-single . ((1 'markdown-markup-face prepend)
+                                   (2 'markdown-math-face append)
+                                   (3 'markdown-markup-face prepend)))
+    ;; Math mode $$..$$
+    (markdown-match-math-double . ((1 'markdown-markup-face prepend)
+                                   (2 'markdown-math-face append)
+                                   (3 'markdown-markup-face prepend)))
+    ;; Math mode \[..\] and \\[..\\]
+    (markdown-match-math-display . ((1 'markdown-markup-face prepend)
+                                    (3 'markdown-math-face append)
+                                    (4 'markdown-markup-face prepend)))
+    (markdown-match-bold . ((1 markdown-markup-properties prepend)
+                            (2 'markdown-bold-face append)
+                            (3 markdown-markup-properties prepend)))
+    (markdown-match-italic . ((1 markdown-markup-properties prepend)
+                              (2 'markdown-italic-face append)
+                              (3 markdown-markup-properties prepend)))
+    (,markdown-regex-strike-through . ((3 markdown-markup-properties)
+                                       (4 'markdown-strike-through-face)
+                                       (5 markdown-markup-properties)))
+    (markdown--match-highlighting . ((3 markdown-markup-properties)
+                                     (4 'markdown-highlighting-face)
+                                     (5 markdown-markup-properties)))
+    (,markdown-regex-line-break . (1 markdown-line-break-properties prepend))
+    (markdown-match-escape . ((1 markdown-markup-properties prepend)))
+    (markdown-fontify-sub-superscripts)
+    (markdown-match-inline-attributes . ((0 markdown-markup-properties prepend)))
+    (markdown-match-leanpub-sections . ((0 markdown-markup-properties)))
+    (markdown-fontify-blockquotes)
+    (markdown-match-wiki-link . ((0 'markdown-link-face prepend))))
+  "Syntax highlighting for Markdown files.")
+
+;; Footnotes
+(defvar-local markdown-footnote-counter 0
+  "Counter for footnote numbers.")
+
+(defconst markdown-footnote-chars
+  "[[:alnum:]-]"
+  "Regular expression matching any character for a footnote identifier.")
+
+(defconst markdown-regex-footnote-definition
+  (concat "^ \\{0,3\\}\\[\\(\\^" markdown-footnote-chars "*?\\)\\]:\\(?:[ \t]+\\|$\\)")
+  "Regular expression matching a footnote definition, capturing the label.")
+
+
+;;; Compatibility =============================================================
+
+(defun markdown--pandoc-reference-p ()
+  (let ((bounds (bounds-of-thing-at-point 'word)))
+    (when (and bounds (char-before (car bounds)))
+      (= (char-before (car bounds)) ?@))))
+
+(defun markdown-flyspell-check-word-p ()
+  "Return t if `flyspell' should check word just before point.
+Used for `flyspell-generic-check-word-predicate'."
+  (save-excursion
+    (goto-char (1- (point)))
+    ;; https://github.com/jrblevin/markdown-mode/issues/560
+    ;; enable spell check YAML meta data
+    (if (or (and (markdown-code-block-at-point-p)
+                 (not (markdown-text-property-at-point 'markdown-yaml-metadata-section)))
+            (markdown-inline-code-at-point-p)
+            (markdown-in-comment-p)
+            (markdown--face-p (point) '(markdown-reference-face
+                                        markdown-markup-face
+                                        markdown-plain-url-face
+                                        markdown-inline-code-face
+                                        markdown-url-face))
+            (markdown--pandoc-reference-p))
+        (prog1 nil
+          ;; If flyspell overlay is put, then remove it
+          (let ((bounds (bounds-of-thing-at-point 'word)))
+            (when bounds
+              (cl-loop for ov in (overlays-in (car bounds) (cdr bounds))
+                       when (overlay-get ov 'flyspell-overlay)
+                       do
+                       (delete-overlay ov)))))
+      t)))
+
+
+;;; Markdown Parsing Functions ================================================
+
+(defun markdown-cur-line-blank-p ()
+  "Return t if the current line is blank and nil otherwise."
+  (save-excursion
+    (beginning-of-line)
+    (looking-at-p markdown-regex-blank-line)))
+
+(defun markdown-prev-line-blank ()
+  "Return t if the previous line is blank and nil otherwise.
+If we are at the first line, then consider the previous line to be blank."
+  (or (= (line-beginning-position) (point-min))
+      (save-excursion
+        (forward-line -1)
+        (looking-at markdown-regex-blank-line))))
+
+(defun markdown-prev-line-blank-p ()
+  "Like `markdown-prev-line-blank', but preserve `match-data'."
+  (save-match-data (markdown-prev-line-blank)))
+
+(defun markdown-next-line-blank-p ()
+  "Return t if the next line is blank and nil otherwise.
+If we are at the last line, then consider the next line to be blank."
+  (or (= (line-end-position) (point-max))
+      (save-excursion
+        (forward-line 1)
+        (markdown-cur-line-blank-p))))
+
+(defun markdown-prev-line-indent ()
+  "Return the number of leading whitespace characters in the previous line.
+Return 0 if the current line is the first line in the buffer."
+  (save-excursion
+    (if (= (line-beginning-position) (point-min))
+        0
+      (forward-line -1)
+      (current-indentation))))
+
+(defun markdown-next-line-indent ()
+  "Return the number of leading whitespace characters in the next line.
+Return 0 if line is the last line in the buffer."
+  (save-excursion
+    (if (= (line-end-position) (point-max))
+        0
+      (forward-line 1)
+      (current-indentation))))
+
+(defun markdown-new-baseline ()
+  "Determine if the current line begins a new baseline level.
+Assume point is positioned at beginning of line."
+  (or (looking-at markdown-regex-header)
+      (looking-at markdown-regex-hr)
+      (and (= (current-indentation) 0)
+           (not (looking-at markdown-regex-list))
+           (markdown-prev-line-blank))))
+
+(defun markdown-search-backward-baseline ()
+  "Search backward baseline point with no indentation and not a list item."
+  (end-of-line)
+  (let (stop)
+    (while (not (or stop (bobp)))
+      (re-search-backward markdown-regex-block-separator-noindent nil t)
+      (when (match-end 2)
+        (goto-char (match-end 2))
+        (cond
+         ((markdown-new-baseline)
+          (setq stop t))
+         ((looking-at-p markdown-regex-list)
+          (setq stop nil))
+         (t (setq stop t)))))))
+
+(defun markdown-update-list-levels (marker indent levels)
+  "Update list levels given list MARKER, block INDENT, and current LEVELS.
+Here, MARKER is a string representing the type of list, INDENT is an integer
+giving the indentation, in spaces, of the current block, and LEVELS is a
+list of the indentation levels of parent list items.  When LEVELS is nil,
+it means we are at baseline (not inside of a nested list)."
+  (cond
+   ;; New list item at baseline.
+   ((and marker (null levels))
+    (setq levels (list indent)))
+   ;; List item with greater indentation (four or more spaces).
+   ;; Increase list level.
+   ((and marker (>= indent (+ (car levels) markdown-list-indent-width)))
+    (setq levels (cons indent levels)))
+   ;; List item with greater or equal indentation (less than four spaces).
+   ;; Do not increase list level.
+   ((and marker (>= indent (car levels)))
+    levels)
+   ;; Lesser indentation level.
+   ;; Pop appropriate number of elements off LEVELS list (e.g., lesser
+   ;; indentation could move back more than one list level).  Note
+   ;; that this block need not be the beginning of list item.
+   ((< indent (car levels))
+    (while (and (> (length levels) 1)
+                (< indent (+ (cadr levels) markdown-list-indent-width)))
+      (setq levels (cdr levels)))
+    levels)
+   ;; Otherwise, do nothing.
+   (t levels)))
+
+(defun markdown-calculate-list-levels ()
+  "Calculate list levels at point.
+Return a list of the form (n1 n2 n3 ...) where n1 is the
+indentation of the deepest nested list item in the branch of
+the list at the point, n2 is the indentation of the parent
+list item, and so on.  The depth of the list item is therefore
+the length of the returned list.  If the point is not at or
+immediately  after a list item, return nil."
+  (save-excursion
+    (let ((first (point)) levels indent pre-regexp)
+      ;; Find a baseline point with zero list indentation
+      (markdown-search-backward-baseline)
+      ;; Search for all list items between baseline and LOC
+      (while (and (< (point) first)
+                  (re-search-forward markdown-regex-list first t))
+        (setq pre-regexp (format "^\\(    \\|\t\\)\\{%d\\}" (1+ (length levels))))
+        (beginning-of-line)
+        (cond
+         ;; Make sure this is not a header or hr
+         ((markdown-new-baseline) (setq levels nil))
+         ;; Make sure this is not a line from a pre block
+         ((looking-at-p pre-regexp))
+         ;; If not, then update levels
+         (t
+          (setq indent (current-indentation))
+          (setq levels (markdown-update-list-levels (match-string 2)
+                                                    indent levels))))
+        (end-of-line))
+      levels)))
+
+(defun markdown-prev-list-item (level)
+  "Search backward from point for a list item with indentation LEVEL.
+Set point to the beginning of the item, and return point, or nil
+upon failure."
+  (let (bounds indent prev)
+    (setq prev (point))
+    (forward-line -1)
+    (setq indent (current-indentation))
+    (while
+        (cond
+         ;; List item
+         ((and (looking-at-p markdown-regex-list)
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (cond
+           ;; Stop and return point at item of equal indentation
+           ((= (nth 3 bounds) level)
+            (setq prev (point))
+            nil)
+           ;; Stop and return nil at item with lesser indentation
+           ((< (nth 3 bounds) level)
+            (setq prev nil)
+            nil)
+           ;; Stop at beginning of buffer
+           ((bobp) (setq prev nil))
+           ;; Continue at item with greater indentation
+           ((> (nth 3 bounds) level) t)))
+         ;; Stop at beginning of buffer
+         ((bobp) (setq prev nil))
+         ;; Continue if current line is blank
+         ((markdown-cur-line-blank-p) t)
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the next is blank
+         ((and (< indent level)
+               (markdown-next-line-blank-p))
+          (setq prev nil))
+         ;; Stop at a header
+         ((looking-at-p markdown-regex-header) (setq prev nil))
+         ;; Stop at a horizontal rule
+         ((looking-at-p markdown-regex-hr) (setq prev nil))
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line -1)
+      (setq indent (current-indentation)))
+    prev))
+
+(defun markdown-next-list-item (level)
+  "Search forward from point for the next list item with indentation LEVEL.
+Set point to the beginning of the item, and return point, or nil
+upon failure."
+  (let (bounds indent next)
+    (setq next (point))
+    (if (looking-at markdown-regex-header-setext)
+        (goto-char (match-end 0)))
+    (forward-line)
+    (setq indent (current-indentation))
+    (while
+        (cond
+         ;; Stop at end of the buffer.
+         ((eobp) nil)
+         ;; Continue if the current line is blank
+         ((markdown-cur-line-blank-p) t)
+         ;; List item
+         ((and (looking-at-p markdown-regex-list)
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (cond
+           ;; Continue at item with greater indentation
+           ((> (nth 3 bounds) level) t)
+           ;; Stop and return point at item of equal indentation
+           ((= (nth 3 bounds) level)
+            (setq next (point))
+            nil)
+           ;; Stop and return nil at item with lesser indentation
+           ((< (nth 3 bounds) level)
+            (setq next nil)
+            nil)))
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the previous line was blank.
+         ((and (< indent level)
+               (markdown-prev-line-blank-p))
+          (setq next nil))
+         ;; Stop at a header
+         ((looking-at-p markdown-regex-header) (setq next nil))
+         ;; Stop at a horizontal rule
+         ((looking-at-p markdown-regex-hr) (setq next nil))
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line)
+      (setq indent (current-indentation)))
+    next))
+
+(defun markdown-cur-list-item-end (level)
+  "Move to end of list item with pre-marker indentation LEVEL.
+Return the point at the end when a list item was found at the
+original point.  If the point is not in a list item, do nothing."
+  (let (indent)
+    (forward-line)
+    (setq indent (current-indentation))
+    (while
+        (cond
+         ;; Stop at end of the buffer.
+         ((eobp) nil)
+         ;; Continue while indentation is the same or greater
+         ((>= indent level) t)
+         ;; Continue if the current line is blank
+         ((looking-at markdown-regex-blank-line) t)
+         ;; Stop if current indentation is less than list item
+         ;; and the previous line was blank.
+         ((and (< indent level)
+               (markdown-prev-line-blank))
+          nil)
+         ;; Stop at a new list items of the same or lesser
+         ;; indentation, headings, and horizontal rules.
+         ((looking-at (concat "\\(?:" markdown-regex-list
+                              "\\|" markdown-regex-header
+                              "\\|" markdown-regex-hr "\\)"))
+          nil)
+         ;; Otherwise, continue.
+         (t t))
+      (forward-line)
+      (setq indent (current-indentation)))
+    ;; Don't skip over whitespace for empty list items (marker and
+    ;; whitespace only), just move to end of whitespace.
+    (if (save-excursion
+          (beginning-of-line)
+          (looking-at (concat markdown-regex-list "[ \t]*$")))
+        (goto-char (match-end 3))
+      (skip-chars-backward " \t\n"))
+    (end-of-line)
+    (point)))
+
+(defun markdown-cur-list-item-bounds ()
+  "Return bounds for list item at point.
+Return a list of the following form:
+
+    (begin end indent nonlist-indent marker checkbox match)
+
+The named components are:
+
+  - begin: Position of beginning of list item, including leading indentation.
+  - end: Position of the end of the list item, including list item text.
+  - indent: Number of characters of indentation before list marker (an integer).
+  - nonlist-indent: Number characters of indentation, list
+    marker, and whitespace following list marker (an integer).
+  - marker: String containing the list marker and following whitespace
+            (e.g., \"- \" or \"* \").
+  - checkbox: String containing the GFM checkbox portion, if any,
+    including any trailing whitespace before the text
+    begins (e.g., \"[x] \").
+  - match: match data for markdown-regex-list
+
+As an example, for the following unordered list item
+
+   - item
+
+the returned list would be
+
+    (1 14 3 5 \"- \" nil (1 6 1 4 4 5 5 6))
+
+If the point is not inside a list item, return nil."
+  (car (get-text-property (line-beginning-position) 'markdown-list-item)))
+
+(defun markdown-list-item-at-point-p ()
+  "Return t if there is a list item at the point and nil otherwise."
+  (save-match-data (markdown-cur-list-item-bounds)))
+
+(defun markdown-prev-list-item-bounds ()
+  "Return bounds of previous item in the same list of any level.
+The return value has the same form as that of
+`markdown-cur-list-item-bounds'."
+  (save-excursion
+    (let ((cur-bounds (markdown-cur-list-item-bounds))
+          (beginning-of-list (save-excursion (markdown-beginning-of-list)))
+          stop)
+      (when cur-bounds
+        (goto-char (nth 0 cur-bounds))
+        (while (and (not stop) (not (bobp))
+                    (re-search-backward markdown-regex-list
+                                        beginning-of-list t))
+          (unless (or (looking-at markdown-regex-hr)
+                      (markdown-code-block-at-point-p))
+            (setq stop (point))))
+        (markdown-cur-list-item-bounds)))))
+
+(defun markdown-next-list-item-bounds ()
+  "Return bounds of next item in the same list of any level.
+The return value has the same form as that of
+`markdown-cur-list-item-bounds'."
+  (save-excursion
+    (let ((cur-bounds (markdown-cur-list-item-bounds))
+          (end-of-list (save-excursion (markdown-end-of-list)))
+          stop)
+      (when cur-bounds
+        (goto-char (nth 0 cur-bounds))
+        (end-of-line)
+        (while (and (not stop) (not (eobp))
+                    (re-search-forward markdown-regex-list
+                                       end-of-list t))
+          (unless (or (looking-at markdown-regex-hr)
+                      (markdown-code-block-at-point-p))
+            (setq stop (point))))
+        (when stop
+          (markdown-cur-list-item-bounds))))))
+
+(defun markdown-beginning-of-list ()
+  "Move point to beginning of list at point, if any."
+  (interactive)
+  (let ((orig-point (point))
+        (list-begin (save-excursion
+                      (markdown-search-backward-baseline)
+                      ;; Stop at next list item, regardless of the indentation.
+                      (markdown-next-list-item (point-max))
+                      (when (looking-at markdown-regex-list)
+                        (point)))))
+    (when (and list-begin (<= list-begin orig-point))
+      (goto-char list-begin))))
+
+(defun markdown-end-of-list ()
+  "Move point to end of list at point, if any."
+  (interactive)
+  (let ((start (point))
+        (end (save-excursion
+               (when (markdown-beginning-of-list)
+                 ;; Items can't have nonlist-indent <= 1, so this
+                 ;; moves past all list items.
+                 (markdown-next-list-item 1)
+                 (skip-syntax-backward "-")
+                 (unless (eobp) (forward-char 1))
+                 (point)))))
+    (when (and end (>= end start))
+      (goto-char end))))
+
+(defun markdown-up-list ()
+  "Move point to beginning of parent list item."
+  (interactive)
+  (let ((cur-bounds (markdown-cur-list-item-bounds)))
+    (when cur-bounds
+      (markdown-prev-list-item (1- (nth 3 cur-bounds)))
+      (let ((up-bounds (markdown-cur-list-item-bounds)))
+        (when (and up-bounds (< (nth 3 up-bounds) (nth 3 cur-bounds)))
+          (point))))))
+
+(defun markdown-bounds-of-thing-at-point (thing)
+  "Call `bounds-of-thing-at-point' for THING with slight modifications.
+Does not include trailing newlines when THING is \\='line.  Handles the
+end of buffer case by setting both endpoints equal to the value of
+`point-max', since an empty region will trigger empty markup insertion.
+Return bounds of form (beg . end) if THING is found, or nil otherwise."
+  (let* ((bounds (bounds-of-thing-at-point thing))
+         (a (car bounds))
+         (b (cdr bounds)))
+    (when bounds
+      (when (eq thing 'line)
+        (cond ((and (eobp) (markdown-cur-line-blank-p))
+               (setq a b))
+              ((char-equal (char-before b) ?\^J)
+               (setq b (1- b)))))
+      (cons a b))))
+
+(defun markdown-reference-definition (reference)
+  "Find out whether Markdown REFERENCE is defined.
+REFERENCE should not include the square brackets.
+When REFERENCE is defined, return a list of the form (text start end)
+containing the definition text itself followed by the start and end
+locations of the text.  Otherwise, return nil.
+Leave match data for `markdown-regex-reference-definition'
+intact additional processing."
+  (let ((reference (downcase reference)))
+    (save-excursion
+      (goto-char (point-min))
+      (catch 'found
+        (while (re-search-forward markdown-regex-reference-definition nil t)
+          (when (string= reference (downcase (match-string-no-properties 2)))
+            (throw 'found
+                   (list (match-string-no-properties 5)
+                         (match-beginning 5) (match-end 5)))))))))
+
+(defun markdown-get-defined-references ()
+  "Return all defined reference labels and their line numbers.
+They does not include square brackets)."
+  (save-excursion
+    (goto-char (point-min))
+    (let (refs)
+      (while (re-search-forward markdown-regex-reference-definition nil t)
+        (let ((target (match-string-no-properties 2)))
+          (cl-pushnew
+           (cons (downcase target)
+                 (markdown-line-number-at-pos (match-beginning 2)))
+           refs :test #'equal :key #'car)))
+      (reverse refs))))
+
+(defun markdown-get-used-uris ()
+  "Return a list of all used URIs in the buffer."
+  (save-excursion
+    (goto-char (point-min))
+    (let (uris)
+      (while (re-search-forward
+              (concat "\\(?:" markdown-regex-link-inline
+                      "\\|" markdown-regex-angle-uri
+                      "\\|" markdown-regex-uri
+                      "\\|" markdown-regex-email
+                      "\\)")
+              nil t)
+        (unless (or (markdown-inline-code-at-point-p)
+                    (markdown-code-block-at-point-p))
+          (cl-pushnew (or (match-string-no-properties 6)
+                          (match-string-no-properties 10)
+                          (match-string-no-properties 12)
+                          (match-string-no-properties 13))
+                      uris :test #'equal)))
+      (reverse uris))))
+
+(defun markdown-inline-code-at-pos (pos)
+  "Return non-nil if there is an inline code fragment at POS.
+Return nil otherwise.  Set match data according to
+`markdown-match-code' upon success.
+This function searches the block for a code fragment that
+contains the point using `markdown-match-code'.  We do this
+because `thing-at-point-looking-at' does not work reliably with
+`markdown-regex-code'.
+
+The match data is set as follows:
+Group 1 matches the opening backquotes.
+Group 2 matches the code fragment itself, without backquotes.
+Group 3 matches the closing backquotes."
+  (save-excursion
+    (goto-char pos)
+    (let ((old-point (point))
+          (end-of-block (progn (markdown-end-of-text-block) (point)))
+          found)
+      (markdown-beginning-of-text-block)
+      (while (and (markdown-match-code end-of-block)
+                  (setq found t)
+                  (< (match-end 0) old-point)))
+      (let ((match-group (if (eq (char-after (match-beginning 0)) ?`) 0 1)))
+        (and found                                        ; matched something
+             (<= (match-beginning match-group) old-point) ; match contains old-point
+             (> (match-end 0) old-point))))))
+
+(defun markdown-inline-code-at-pos-p (pos)
+  "Return non-nil if there is an inline code fragment at POS.
+Like `markdown-inline-code-at-pos`, but preserves match data."
+  (save-match-data (markdown-inline-code-at-pos pos)))
+
+(defun markdown-inline-code-at-point ()
+  "Return non-nil if the point is at an inline code fragment.
+See `markdown-inline-code-at-pos' for details."
+  (markdown-inline-code-at-pos (point)))
+
+(defun markdown-inline-code-at-point-p (&optional pos)
+  "Return non-nil if there is inline code at the POS.
+This is a predicate function counterpart to
+`markdown-inline-code-at-point' which does not modify the match
+data.  See `markdown-code-block-at-point-p' for code blocks."
+  (save-match-data (markdown-inline-code-at-pos (or pos (point)))))
+
+(defun markdown-code-block-at-pos (pos)
+  "Return match data list if there is a code block at POS.
+Uses text properties at the beginning of the line position.
+This includes pre blocks, tilde-fenced code blocks, and GFM
+quoted code blocks.  Return nil otherwise."
+  (let ((bol (save-excursion (goto-char pos) (line-beginning-position))))
+    (or (get-text-property bol 'markdown-pre)
+        (let* ((bounds (markdown-get-enclosing-fenced-block-construct pos))
+               (second (cl-second bounds)))
+          (if second
+              ;; chunks are right open
+              (when (< pos second)
+                bounds)
+            bounds)))))
+
+;; Function was renamed to emphasize that it does not modify match-data.
+(defalias 'markdown-code-block-at-point 'markdown-code-block-at-point-p)
+
+(defun markdown-code-block-at-point-p (&optional pos)
+  "Return non-nil if there is a code block at the POS.
+This includes pre blocks, tilde-fenced code blocks, and GFM
+quoted code blocks.  This function does not modify the match
+data.  See `markdown-inline-code-at-point-p' for inline code."
+  (save-match-data (markdown-code-block-at-pos (or pos (point)))))
+
+(defun markdown-heading-at-point (&optional pos)
+  "Return non-nil if there is a heading at the POS.
+Set match data for `markdown-regex-header'."
+  (let ((match-data (get-text-property (or pos (point)) 'markdown-heading)))
+    (when match-data
+      (set-match-data match-data)
+      t)))
+
+(defun markdown-pipe-at-bol-p ()
+  "Return non-nil if the line begins with a pipe symbol.
+This may be useful for tables and Pandoc's line_blocks extension."
+  (char-equal (char-after (line-beginning-position)) ?|))
+
+
+;;; Markdown Font Lock Matching Functions =====================================
+
+(defun markdown-range-property-any (begin end prop prop-values)
+  "Return t if PROP from BEGIN to END is equal to one of the given PROP-VALUES.
+Also returns t if PROP is a list containing one of the PROP-VALUES.
+Return nil otherwise."
+  (let (props)
+    (catch 'found
+      (dolist (loc (number-sequence begin end))
+        (when (setq props (get-text-property loc prop))
+          (cond ((listp props)
+                 ;; props is a list, check for membership
+                 (dolist (val prop-values)
+                   (when (memq val props) (throw 'found loc))))
+                (t
+                 ;; props is a scalar, check for equality
+                 (dolist (val prop-values)
+                   (when (eq val props) (throw 'found loc))))))))))
+
+(defun markdown-range-properties-exist (begin end props)
+  (cl-loop
+   for loc in (number-sequence begin end)
+   with result = nil
+   while (not
+          (setq result
+                (cl-some (lambda (prop) (get-text-property loc prop)) props)))
+   finally return result))
+
+(defun markdown-match-inline-generic (regex last &optional faceless)
+  "Match inline REGEX from the point to LAST.
+When FACELESS is non-nil, do not return matches where faces have been applied."
+  (when (re-search-forward regex last t)
+    (let ((bounds (markdown-code-block-at-pos (match-beginning 1)))
+          (face (and faceless (text-property-not-all
+                               (match-beginning 0) (match-end 0) 'face nil))))
+      (cond
+       ;; In code block: move past it and recursively search again
+       (bounds
+        (when (< (goto-char (cl-second bounds)) last)
+          (markdown-match-inline-generic regex last faceless)))
+       ;; When faces are found in the match range, skip over the match and
+       ;; recursively search again.
+       (face
+        (when (< (goto-char (match-end 0)) last)
+          (markdown-match-inline-generic regex last faceless)))
+       ;; Keep match data and return t when in bounds.
+       (t
+        (<= (match-end 0) last))))))
+
+(defun markdown-match-code (last)
+  "Match inline code fragments from point to LAST."
+  (unless (bobp)
+    (backward-char 1))
+  (when (markdown-search-until-condition
+         (lambda ()
+           (and
+            ;; Advance point in case of failure, but without exceeding last.
+            (goto-char (min (1+ (match-beginning 1)) last))
+            (not (markdown-in-comment-p (match-beginning 1)))
+            (not (markdown-in-comment-p (match-end 1)))
+            (not (markdown-code-block-at-pos (match-beginning 1)))))
+         markdown-regex-code last t)
+    (set-match-data (list (match-beginning 1) (match-end 1)
+                          (match-beginning 2) (match-end 2)
+                          (match-beginning 3) (match-end 3)
+                          (match-beginning 4) (match-end 4)))
+    (goto-char (min (1+ (match-end 0)) last (point-max)))
+    t))
+
+(defun markdown--gfm-markup-underscore-p (begin end)
+  (let ((is-underscore (eql (char-after begin) ?_)))
+    (if (not is-underscore)
+        t
+      (save-excursion
+        (save-match-data
+          (goto-char begin)
+          (and (looking-back "\\(?:^\\|[[:blank:][:punct:]]\\)" (1- begin))
+               (progn
+                 (goto-char end)
+                 (looking-at-p "\\(?:[[:blank:][:punct:]]\\|$\\)"))))))))
+
+(defun markdown-match-bold (last)
+  "Match inline bold from the point to LAST."
+  (when (markdown-match-inline-generic markdown-regex-bold last)
+    (let ((is-gfm (derived-mode-p 'gfm-mode))
+          (begin (match-beginning 2))
+          (end (match-end 2)))
+      (if (or (markdown-inline-code-at-pos-p begin)
+              (markdown-inline-code-at-pos-p end)
+              (markdown-in-comment-p)
+              (markdown-range-property-any
+               begin begin 'face '(markdown-url-face
+                                   markdown-plain-url-face))
+              (markdown-range-property-any
+               begin end 'face '(markdown-hr-face
+                                 markdown-math-face))
+              (and is-gfm (not (markdown--gfm-markup-underscore-p begin end))))
+          (progn (goto-char (min (1+ begin) last))
+                 (when (< (point) last)
+                   (markdown-match-bold last)))
+        (set-match-data (list (match-beginning 2) (match-end 2)
+                              (match-beginning 3) (match-end 3)
+                              (match-beginning 4) (match-end 4)
+                              (match-beginning 5) (match-end 5)))
+        t))))
+
+(defun markdown-match-italic (last)
+  "Match inline italics from the point to LAST."
+  (let* ((is-gfm (derived-mode-p 'gfm-mode))
+         (regex (if is-gfm
+                    markdown-regex-gfm-italic
+                  markdown-regex-italic)))
+    (when (and (markdown-match-inline-generic regex last)
+               (not (markdown--face-p
+                     (match-beginning 1)
+                     '(markdown-html-attr-name-face markdown-html-attr-value-face))))
+      (let ((begin (match-beginning 1))
+            (end (match-end 1))
+            (close-end (match-end 4)))
+        (if (or (eql (char-before begin) (char-after begin))
+                (markdown-inline-code-at-pos-p begin)
+                (markdown-inline-code-at-pos-p (1- end))
+                (markdown-in-comment-p)
+                (markdown-range-property-any
+                 begin begin 'face '(markdown-url-face
+                                     markdown-plain-url-face
+                                     markdown-markup-face))
+                (markdown-range-property-any
+                 begin end 'face '(markdown-bold-face
+                                   markdown-list-face
+                                   markdown-hr-face
+                                   markdown-math-face))
+                (and is-gfm
+                     (or (char-equal (char-after begin) (char-after (1+ begin))) ;; check bold case
+                         (not (markdown--gfm-markup-underscore-p begin close-end)))))
+            (progn (goto-char (min (1+ begin) last))
+                   (when (< (point) last)
+                     (markdown-match-italic last)))
+          (set-match-data (list (match-beginning 1) (match-end 1)
+                                (match-beginning 2) (match-end 2)
+                                (match-beginning 3) (match-end 3)
+                                (match-beginning 4) (match-end 4)))
+          t)))))
+
+(defun markdown--match-highlighting (last)
+  (when markdown-enable-highlighting-syntax
+    (re-search-forward markdown-regex-highlighting last t)))
+
+(defun markdown-match-escape (last)
+  "Match escape characters (backslashes) from point to LAST.
+Backlashes only count as escape characters outside of literal
+regions (e.g. code blocks). See `markdown-literal-faces'."
+  (catch 'found
+    (while (search-forward-regexp markdown-regex-escape last t)
+      (let* ((face (get-text-property (match-beginning 1) 'face))
+             (face-list (if (listp face) face (list face))))
+        ;; Ignore any backslashes with a literal face.
+        (unless (cl-intersection face-list markdown-literal-faces)
+          (throw 'found t))))))
+
+(defun markdown-match-math-generic (regex last)
+  "Match REGEX from point to LAST.
+REGEX is either `markdown-regex-math-inline-single' for matching
+$..$ or `markdown-regex-math-inline-double' for matching $$..$$."
+  (when (markdown-match-inline-generic regex last)
+    (let ((begin (match-beginning 1)) (end (match-end 1)))
+      (prog1
+          (if (or (markdown-range-property-any
+                   begin end 'face
+                   '(markdown-inline-code-face markdown-bold-face))
+                  (markdown-range-properties-exist
+                   begin end
+                   (markdown-get-fenced-block-middle-properties)))
+              (markdown-match-math-generic regex last)
+            t)
+        (goto-char (1+ (match-end 0)))))))
+
+(defun markdown-match-list-items (last)
+  "Match list items from point to LAST."
+  (let* ((first (point))
+         (pos first)
+         (prop 'markdown-list-item)
+         (bounds (car (get-text-property pos prop))))
+    (while
+        (and (or (null (setq bounds (car (get-text-property pos prop))))
+                 (< (cl-first bounds) pos))
+             (< (point) last)
+             (setq pos (next-single-property-change pos prop nil last))
+             (goto-char pos)))
+    (when bounds
+      (set-match-data (cl-seventh bounds))
+      ;; Step at least one character beyond point. Otherwise
+      ;; `font-lock-fontify-keywords-region' infloops.
+      (goto-char (min (1+ (max (line-end-position) first))
+                      (point-max)))
+      t)))
+
+(defun markdown-match-math-single (last)
+  "Match single quoted $..$ math from point to LAST."
+  (when markdown-enable-math
+    (when (and (char-equal (char-after) ?$)
+               (not (bolp))
+               (not (char-equal (char-before) ?\\))
+               (not (char-equal (char-before) ?$)))
+      (forward-char -1))
+    (markdown-match-math-generic markdown-regex-math-inline-single last)))
+
+(defun markdown-match-math-double (last)
+  "Match double quoted $$..$$ math from point to LAST."
+  (when markdown-enable-math
+    (when (and (< (1+ (point)) (point-max))
+               (char-equal (char-after) ?$)
+               (char-equal (char-after (1+ (point))) ?$)
+               (not (bolp))
+               (not (char-equal (char-before) ?\\))
+               (not (char-equal (char-before) ?$)))
+      (forward-char -1))
+    (markdown-match-math-generic markdown-regex-math-inline-double last)))
+
+(defun markdown-match-math-display (last)
+  "Match bracketed display math \[..\] and \\[..\\] from point to LAST."
+  (when markdown-enable-math
+    (markdown-match-math-generic markdown-regex-math-display last)))
+
+(defun markdown-match-propertized-text (property last)
+  "Match text with PROPERTY from point to LAST.
+Restore match data previously stored in PROPERTY."
+  (let ((saved (get-text-property (point) property))
+        pos)
+    (unless saved
+      (setq pos (next-single-property-change (point) property nil last))
+      (unless (= pos last)
+        (setq saved (get-text-property pos property))))
+    (when saved
+      (set-match-data saved)
+      ;; Step at least one character beyond point. Otherwise
+      ;; `font-lock-fontify-keywords-region' infloops.
+      (goto-char (min (1+ (max (match-end 0) (point)))
+                      (point-max)))
+      saved)))
+
+(defun markdown-match-pre-blocks (last)
+  "Match preformatted blocks from point to LAST.
+Use data stored in \\='markdown-pre text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-pre last))
+
+(defun markdown-match-gfm-code-blocks (last)
+  "Match GFM quoted code blocks from point to LAST.
+Use data stored in \\='markdown-gfm-code text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-gfm-code last))
+
+(defun markdown-match-gfm-open-code-blocks (last)
+  (markdown-match-propertized-text 'markdown-gfm-block-begin last))
+
+(defun markdown-match-gfm-close-code-blocks (last)
+  (markdown-match-propertized-text 'markdown-gfm-block-end last))
+
+(defun markdown-match-fenced-code-blocks (last)
+  "Match fenced code blocks from the point to LAST."
+  (markdown-match-propertized-text 'markdown-fenced-code last))
+
+(defun markdown-match-fenced-start-code-block (last)
+  (markdown-match-propertized-text 'markdown-tilde-fence-begin last))
+
+(defun markdown-match-fenced-end-code-block (last)
+  (markdown-match-propertized-text 'markdown-tilde-fence-end last))
+
+(defun markdown-match-blockquotes (last)
+  "Match blockquotes from point to LAST.
+Use data stored in \\='markdown-blockquote text property during syntax
+analysis."
+  (markdown-match-propertized-text 'markdown-blockquote last))
+
+(defun markdown-match-hr (last)
+  "Match horizontal rules comments from the point to LAST."
+  (markdown-match-propertized-text 'markdown-hr last))
+
+(defun markdown-match-comments (last)
+  "Match HTML comments from the point to LAST."
+  (when (and (skip-syntax-forward "^<" last))
+    (let ((beg (point)))
+      (when (and (skip-syntax-forward "^>" last) (< (point) last))
+        (forward-char)
+        (set-match-data (list beg (point)))
+        t))))
+
+(defun markdown-match-generic-links (last ref)
+  "Match inline links from point to LAST.
+When REF is non-nil, match reference links instead of standard
+links with URLs.
+This function should only be used during font-lock, as it
+determines syntax based on the presence of faces for previously
+processed elements."
+  ;; Search for the next potential link (not in a code block).
+  (let ((prohibited-faces '(markdown-pre-face
+                            markdown-code-face
+                            markdown-inline-code-face
+                            markdown-comment-face))
+        found)
+    (while
+        (and (not found) (< (point) last)
+             (progn
+               ;; Clear match data to test for a match after functions returns.
+               (set-match-data nil)
+               ;; Preliminary regular expression search so we can return
+               ;; quickly upon failure.  This doesn't handle malformed links
+               ;; or nested square brackets well, so if it passes we back up
+               ;; continue with a more precise search.
+               (re-search-forward
+                (if ref
+                    markdown-regex-link-reference
+                  markdown-regex-link-inline)
+                last 'limit)))
+      ;; Keep searching if this is in a code block, inline code, or a
+      ;; comment, or if it is include syntax. The link text portion
+      ;; (group 3) may contain inline code or comments, but the
+      ;; markup, URL, and title should not be part of such elements.
+      (if (or (markdown-range-property-any
+               (match-beginning 0) (match-end 2) 'face prohibited-faces)
+              (markdown-range-property-any
+               (match-beginning 4) (match-end 0) 'face prohibited-faces)
+              (and (char-equal (char-after (line-beginning-position)) ?<)
+                   (char-equal (char-after (1+ (line-beginning-position))) ?<)))
+          (set-match-data nil)
+        (setq found t))))
+  ;; Match opening exclamation point (optional) and left bracket.
+  (when (match-beginning 2)
+    (let* ((bang (match-beginning 1))
+           (first-begin (match-beginning 2))
+           ;; Find end of block to prevent matching across blocks.
+           (end-of-block (save-excursion
+                           (progn
+                             (goto-char (match-beginning 2))
+                             (markdown-end-of-text-block)
+                             (point))))
+           ;; Move over balanced expressions to closing right bracket.
+           ;; Catch unbalanced expression errors and return nil.
+           (first-end (condition-case nil
+                          (and (goto-char first-begin)
+                               (scan-sexps (point) 1))
+                        (error nil)))
+           ;; Continue with point at CONT-POINT upon failure.
+           (cont-point (min (1+ first-begin) last))
+           second-begin second-end url-begin url-end
+           title-begin title-end)
+      ;; When bracket found, in range, and followed by a left paren/bracket...
+      (when (and first-end (< first-end end-of-block) (goto-char first-end)
+                 (char-equal (char-after (point)) (if ref ?\[ ?\()))
+        ;; Scan across balanced expressions for closing parenthesis/bracket.
+        (setq second-begin (point)
+              second-end (condition-case nil
+                             (scan-sexps (point) 1)
+                           (error nil)))
+        ;; Check that closing parenthesis/bracket is in range.
+        (if (and second-end (<= second-end end-of-block) (<= second-end last))
+            (progn
+              ;; Search for (optional) title inside closing parenthesis
+              (when (and (not ref) (search-forward "\"" second-end t))
+                (setq title-begin (1- (point))
+                      title-end (and (goto-char second-end)
+                                     (search-backward "\"" (1+ title-begin) t))
+                      title-end (and title-end (1+ title-end))))
+              ;; Store URL/reference range
+              (setq url-begin (1+ second-begin)
+                    url-end (1- (or title-begin second-end)))
+              ;; Set match data, move point beyond link, and return
+              (set-match-data
+               (list (or bang first-begin) second-end  ; 0 - all
+                     bang (and bang (1+ bang))         ; 1 - bang
+                     first-begin (1+ first-begin)      ; 2 - markup
+                     (1+ first-begin) (1- first-end)   ; 3 - link text
+                     (1- first-end) first-end          ; 4 - markup
+                     second-begin (1+ second-begin)    ; 5 - markup
+                     url-begin url-end                 ; 6 - url/reference
+                     title-begin title-end             ; 7 - title
+                     (1- second-end) second-end))      ; 8 - markup
+              ;; Nullify cont-point and leave point at end and
+              (setq cont-point nil)
+              (goto-char second-end))
+          ;; If no closing parenthesis in range, update continuation point
+          (setq cont-point (min end-of-block second-begin))))
+      (cond
+       ;; On failure, continue searching at cont-point
+       ((and cont-point (< cont-point last))
+        (goto-char cont-point)
+        (markdown-match-generic-links last ref))
+       ;; No more text, return nil
+       ((and cont-point (= cont-point last))
+        nil)
+       ;; Return t if a match occurred
+       (t t)))))
+
+(defun markdown-match-angle-uris (last)
+  "Match angle bracket URIs from point to LAST."
+  (when (markdown-match-inline-generic markdown-regex-angle-uri last)
+    (goto-char (1+ (match-end 0)))))
+
+(defun markdown-match-plain-uris (last)
+  "Match plain URIs from point to LAST."
+  (when (markdown-match-inline-generic markdown-regex-uri last t)
+    (goto-char (1+ (match-end 0)))))
+
+(defvar markdown-conditional-search-function #'re-search-forward
+  "Conditional search function used in `markdown-search-until-condition'.
+Made into a variable to allow for dynamic let-binding.")
+
+(defun markdown-search-until-condition (condition &rest args)
+  (let (ret)
+    (while (and (not ret) (apply markdown-conditional-search-function args))
+      (setq ret (funcall condition)))
+    ret))
+
+(defun markdown-metadata-line-p (pos regexp)
+  (save-excursion
+    (or (= (line-number-at-pos pos) 1)
+        (progn
+          (forward-line -1)
+          ;; skip multi-line metadata
+          (while (and (looking-at-p "^\\s-+[[:alpha:]]")
+                      (> (line-number-at-pos (point)) 1))
+            (forward-line -1))
+          (looking-at-p regexp)))))
+
+(defun markdown-match-generic-metadata (regexp last)
+  "Match metadata declarations specified by REGEXP from point to LAST.
+These declarations must appear inside a metadata block that begins at
+the beginning of the buffer and ends with a blank line (or the end of
+the buffer)."
+  (let* ((first (point))
+         (end-re "\n[ \t]*\n\\|\n\\'\\|\\'")
+         (block-begin (goto-char 1))
+         (block-end (re-search-forward end-re nil t)))
+    (if (and block-end (> first block-end))
+        ;; Don't match declarations if there is no metadata block or if
+        ;; the point is beyond the block.  Move point to point-max to
+        ;; prevent additional searches and return return nil since nothing
+        ;; was found.
+        (progn (goto-char (point-max)) nil)
+      ;; If a block was found that begins before LAST and ends after
+      ;; point, search for declarations inside it.  If the starting is
+      ;; before the beginning of the block, start there. Otherwise,
+      ;; move back to FIRST.
+      (goto-char (if (< first block-begin) block-begin first))
+      (if (and (re-search-forward regexp (min last block-end) t)
+               (markdown-metadata-line-p (point) regexp))
+          ;; If a metadata declaration is found, set match-data and return t.
+          (let ((key-beginning (match-beginning 1))
+                (key-end (match-end 1))
+                (markup-begin (match-beginning 2))
+                (markup-end (match-end 2))
+                (value-beginning (match-beginning 3)))
+            (set-match-data (list key-beginning (point) ; complete metadata
+                                  key-beginning key-end ; key
+                                  markup-begin markup-end ; markup
+                                  value-beginning (point))) ; value
+            t)
+        ;; Otherwise, move the point to last and return nil
+        (goto-char last)
+        nil))))
+
+(defun markdown-match-declarative-metadata (last)
+  "Match declarative metadata from the point to LAST."
+  (markdown-match-generic-metadata markdown-regex-declarative-metadata last))
+
+(defun markdown-match-pandoc-metadata (last)
+  "Match Pandoc metadata from the point to LAST."
+  (markdown-match-generic-metadata markdown-regex-pandoc-metadata last))
+
+(defun markdown-match-yaml-metadata-begin (last)
+  (markdown-match-propertized-text 'markdown-yaml-metadata-begin last))
+
+(defun markdown-match-yaml-metadata-end (last)
+  (markdown-match-propertized-text 'markdown-yaml-metadata-end last))
+
+(defun markdown-match-yaml-metadata-key (last)
+  (markdown-match-propertized-text 'markdown-metadata-key last))
+
+(defun markdown-match-wiki-link (last)
+  "Match wiki links from point to LAST."
+  (when (and markdown-enable-wiki-links
+             (not markdown-wiki-link-fontify-missing)
+             (markdown-match-inline-generic markdown-regex-wiki-link last))
+    (let ((begin (match-beginning 1)) (end (match-end 1)))
+      (if (or (markdown-in-comment-p begin)
+              (markdown-in-comment-p end)
+              (markdown-inline-code-at-pos-p begin)
+              (markdown-inline-code-at-pos-p end)
+              (markdown-code-block-at-pos begin))
+          (progn (goto-char (min (1+ begin) last))
+                 (when (< (point) last)
+                   (markdown-match-wiki-link last)))
+        (set-match-data (list begin end))
+        t))))
+
+(defun markdown-match-inline-attributes (last)
+  "Match inline attributes from point to LAST."
+  ;; #428 re-search-forward markdown-regex-inline-attributes is very slow.
+  ;; So use simple regex for re-search-forward and use markdown-regex-inline-attributes
+  ;; against matched string.
+  (when (markdown-match-inline-generic "[ \t]*\\({\\)\\([^\n]*\\)}[ \t]*$" last)
+    (if (not (string-match-p markdown-regex-inline-attributes (match-string 0)))
+        (markdown-match-inline-attributes last)
+      (unless (or (markdown-inline-code-at-pos-p (match-beginning 0))
+                  (markdown-inline-code-at-pos-p (match-end 0))
+                  (markdown-in-comment-p))
+        t))))
+
+(defun markdown-match-leanpub-sections (last)
+  "Match Leanpub section markers from point to LAST."
+  (when (markdown-match-inline-generic markdown-regex-leanpub-sections last)
+    (unless (or (markdown-inline-code-at-pos-p (match-beginning 0))
+                (markdown-inline-code-at-pos-p (match-end 0))
+                (markdown-in-comment-p))
+      t)))
+
+(defun markdown-match-includes (last)
+  "Match include statements from point to LAST.
+Sets match data for the following seven groups:
+Group 1: opening two angle brackets
+Group 2: opening title delimiter (optional)
+Group 3: title text (optional)
+Group 4: closing title delimiter (optional)
+Group 5: opening filename delimiter
+Group 6: filename
+Group 7: closing filename delimiter"
+  (when (markdown-match-inline-generic markdown-regex-include last)
+    (let ((valid (not (or (markdown-in-comment-p (match-beginning 0))
+                          (markdown-in-comment-p (match-end 0))
+                          (markdown-code-block-at-pos (match-beginning 0))))))
+      (cond
+       ;; Parentheses and maybe square brackets, but no curly braces:
+       ;; match optional title in square brackets and file in parentheses.
+       ((and valid (match-beginning 5)
+             (not (match-beginning 8)))
+        (set-match-data (list (match-beginning 1) (match-end 7)
+                              (match-beginning 1) (match-end 1)
+                              (match-beginning 2) (match-end 2)
+                              (match-beginning 3) (match-end 3)
+                              (match-beginning 4) (match-end 4)
+                              (match-beginning 5) (match-end 5)
+                              (match-beginning 6) (match-end 6)
+                              (match-beginning 7) (match-end 7))))
+       ;; Only square brackets present: match file in square brackets.
+       ((and valid (match-beginning 2)
+             (not (match-beginning 5))
+             (not (match-beginning 7)))
+        (set-match-data (list (match-beginning 1) (match-end 4)
+                              (match-beginning 1) (match-end 1)
+                              nil nil
+                              nil nil
+                              nil nil
+                              (match-beginning 2) (match-end 2)
+                              (match-beginning 3) (match-end 3)
+                              (match-beginning 4) (match-end 4))))
+       ;; Only curly braces present: match file in curly braces.
+       ((and valid (match-beginning 8)
+             (not (match-beginning 2))
+             (not (match-beginning 5)))
+        (set-match-data (list (match-beginning 1) (match-end 10)
+                              (match-beginning 1) (match-end 1)
+                              nil nil
+                              nil nil
+                              nil nil
+                              (match-beginning 8) (match-end 8)
+                              (match-beginning 9) (match-end 9)
+                              (match-beginning 10) (match-end 10))))
+       (t
+        ;; Not a valid match, move to next line and search again.
+        (forward-line)
+        (when (< (point) last)
+          (setq valid (markdown-match-includes last)))))
+      valid)))
+
+(defun markdown-match-html-tag (last)
+  "Match HTML tags from point to LAST."
+  (when (and markdown-enable-html
+             (markdown-match-inline-generic markdown-regex-html-tag last t))
+    (set-match-data (list (match-beginning 0) (match-end 0)
+                          (match-beginning 1) (match-end 1)
+                          (match-beginning 2) (match-end 2)
+                          (match-beginning 9) (match-end 9)))
+    t))
+
+
+;;; Markdown Font Fontification Functions =====================================
+
+(defvar markdown--first-displayable-cache (make-hash-table :test #'equal))
+
+(defun markdown--first-displayable (seq)
+  "Return the first displayable character or string in SEQ.
+SEQ may be an atom or a sequence."
+  (let ((c (gethash seq markdown--first-displayable-cache t)))
+    (if (not (eq c t))
+        c
+      (puthash seq
+               (let ((seq (if (listp seq) seq (list seq))))
+                 (cond ((stringp (car seq))
+                        (cl-find-if
+                         (lambda (str)
+                           (and (mapcar #'char-displayable-p (string-to-list str))))
+                         seq))
+                       ((characterp (car seq))
+                        (cl-find-if #'char-displayable-p seq))))
+               markdown--first-displayable-cache))))
+
+(defun markdown--marginalize-string (level)
+  "Generate atx markup string of given LEVEL for left margin."
+  (let ((margin-left-space-count
+         (- markdown-marginalize-headers-margin-width level)))
+    (concat (make-string margin-left-space-count ? )
+            (make-string level ?#))))
+
+(defun markdown-marginalize-update-current ()
+  "Update the window configuration to create a left margin."
+  (if window-system
+      (let* ((header-delimiter-font-width
+              (window-font-width nil 'markdown-header-delimiter-face))
+             (margin-pixel-width (* markdown-marginalize-headers-margin-width
+                                    header-delimiter-font-width))
+             (margin-char-width (/ margin-pixel-width (default-font-width))))
+        (set-window-margins nil margin-char-width))
+    ;; As a fallback, simply set margin based on character count.
+    (set-window-margins nil (1+ markdown-marginalize-headers-margin-width))))
+
+(defun markdown-fontify-headings (last)
+  "Add text properties to headings from point to LAST."
+  (when (markdown-match-propertized-text 'markdown-heading last)
+    (let* ((level (markdown-outline-level))
+           (heading-face
+            (intern (format "markdown-header-face-%d" level)))
+           (heading-props `(face ,heading-face))
+           (left-markup-props
+            `(face markdown-header-delimiter-face
+                   ,@(cond
+                      (markdown-hide-markup
+                       `(display ""))
+                      (markdown-marginalize-headers
+                       `(display ((margin left-margin)
+                                  ,(markdown--marginalize-string level)))))))
+           (right-markup-props
+            `(face markdown-header-delimiter-face
+                   ,@(when markdown-hide-markup `(display ""))))
+           (rule-props `(face markdown-header-rule-face
+                              ,@(when markdown-hide-markup `(display "")))))
+      (if (match-end 1)
+          ;; Setext heading
+          (progn (add-text-properties
+                  (match-beginning 1) (match-end 1) heading-props)
+                 (if (= level 1)
+                     (add-text-properties
+                      (match-beginning 2) (match-end 2) rule-props)
+                   (add-text-properties
+                    (match-beginning 3) (match-end 3) rule-props)))
+        ;; atx heading
+        (let ((header-end
+               (if markdown-fontify-whole-heading-line
+                   (min (point-max) (1+ (match-end 0)))
+                 (match-end 0))))
+          (add-text-properties
+           (match-beginning 4) (match-end 4) left-markup-props)
+
+          ;; If closing tag is present
+          (if (match-end 6)
+              (progn
+                (if markdown-hide-markup
+                    (progn
+                      (add-text-properties
+                       (match-beginning 5) header-end heading-props)
+                      (add-text-properties
+                       (match-beginning 6) (match-end 6) right-markup-props))
+                  (add-text-properties
+                   (match-beginning 5) (match-end 5) heading-props)
+                  (add-text-properties
+                   (match-beginning 6) header-end right-markup-props)))
+            ;; If closing tag is not present
+            (add-text-properties
+             (match-beginning 5) header-end heading-props))
+          )))
+    t))
+
+(defun markdown-fontify-tables (last)
+  (when (re-search-forward "|" last t)
+    (when (markdown-table-at-point-p)
+      (font-lock-append-text-property
+       (line-beginning-position) (min (1+ (line-end-position)) (point-max))
+       'face 'markdown-table-face))
+    (forward-line 1)
+    t))
+
+(defun markdown-fontify-blockquotes (last)
+  "Apply font-lock properties to blockquotes from point to LAST."
+  (when (markdown-match-blockquotes last)
+    (let ((display-string
+           (markdown--first-displayable markdown-blockquote-display-char)))
+      (add-text-properties
+       (match-beginning 1) (match-end 1)
+       (if markdown-hide-markup
+           `(face markdown-blockquote-face display ,display-string)
+         `(face markdown-markup-face)))
+      (font-lock-append-text-property
+       (match-beginning 0) (match-end 0) 'face 'markdown-blockquote-face)
+      t)))
+
+(defun markdown-fontify-list-items (last)
+  "Apply font-lock properties to list markers from point to LAST."
+  (when (markdown-match-list-items last)
+    (when (not (markdown-code-block-at-point-p (match-beginning 2)))
+      (let* ((indent (length (match-string-no-properties 1)))
+             (level (/ indent markdown-list-indent-width)) ;; level = 0, 1, 2, ...
+             (bullet (nth (mod level (length markdown-list-item-bullets))
+                          markdown-list-item-bullets)))
+        (add-text-properties
+         (match-beginning 2) (match-end 2) '(face markdown-list-face))
+        (when markdown-hide-markup
+          (cond
+           ;; Unordered lists
+           ((string-match-p "[\\*\\+-]" (match-string 2))
+            (add-text-properties
+             (match-beginning 2) (match-end 2) `(display ,bullet)))
+           ;; Definition lists
+           ((string-equal ":" (match-string 2))
+            (let ((display-string
+                   (char-to-string (markdown--first-displayable
+                                    markdown-definition-display-char))))
+              (add-text-properties (match-beginning 2) (match-end 2)
+                                   `(display ,display-string))))))))
+    t))
+
+(defun markdown--fontify-hrs-view-mode (hr-char)
+  (if (and hr-char (display-supports-face-attributes-p '(:extend t)))
+      (add-text-properties
+       (match-beginning 0) (match-end 0)
+       `(face
+         (:inherit markdown-hr-face :underline t :extend t)
+         font-lock-multiline t
+         display "\n"))
+    (let ((hr-len (and hr-char (/ (1- (window-body-width)) (char-width hr-char)))))
+      (add-text-properties
+       (match-beginning 0) (match-end 0)
+       `(face
+         markdown-hr-face font-lock-multiline t
+         display ,(make-string hr-len hr-char))))))
+
+(defun markdown-fontify-hrs (last)
+  "Add text properties to horizontal rules from point to LAST."
+  (when (markdown-match-hr last)
+    (let ((hr-char (markdown--first-displayable markdown-hr-display-char)))
+      (if (and markdown-hide-markup hr-char)
+          (markdown--fontify-hrs-view-mode hr-char)
+        (add-text-properties
+         (match-beginning 0) (match-end 0)
+         `(face markdown-hr-face font-lock-multiline t)))
+      t)))
+
+(defun markdown-fontify-sub-superscripts (last)
+  "Apply text properties to sub- and superscripts from point to LAST."
+  (when (markdown-search-until-condition
+         (lambda () (and (not (markdown-code-block-at-point-p))
+                         (not (markdown-inline-code-at-point-p))
+                         (not (markdown-in-comment-p))
+                         (not (markdown--math-block-p))))
+         markdown-regex-sub-superscript last t)
+    (let* ((subscript-p (string= (match-string 2) "~"))
+           (props
+            (if subscript-p
+                (car markdown-sub-superscript-display)
+              (cdr markdown-sub-superscript-display)))
+           (mp (list 'face 'markdown-markup-face
+                     'invisible 'markdown-markup)))
+      (when markdown-hide-markup
+        (put-text-property (match-beginning 3) (match-end 3)
+                           'display props))
+      (add-text-properties (match-beginning 2) (match-end 2) mp)
+      (add-text-properties (match-beginning 4) (match-end 4) mp)
+      t)))
+
+
+;;; Syntax Table ==============================================================
+
+(defvar markdown-mode-syntax-table
+  (let ((tab (make-syntax-table text-mode-syntax-table)))
+    (modify-syntax-entry ?\" "." tab)
+    tab)
+  "Syntax table for `markdown-mode'.")
+
+
+;;; Element Insertion =========================================================
+
+(defun markdown-ensure-blank-line-before ()
+  "If previous line is not already blank, insert a blank line before point."
+  (unless (bolp) (insert "\n"))
+  (unless (or (bobp) (looking-back "\n\\s-*\n" nil)) (insert "\n")))
+
+(defun markdown-ensure-blank-line-after ()
+  "If following line is not already blank, insert a blank line after point.
+Return the point where it was originally."
+  (save-excursion
+    (unless (eolp) (insert "\n"))
+    (unless (or (eobp) (looking-at-p "\n\\s-*\n")) (insert "\n"))))
+
+(defun markdown-wrap-or-insert (s1 s2 &optional thing beg end)
+  "Insert the strings S1 and S2, wrapping around region or THING.
+If a region is specified by the optional BEG and END arguments,
+wrap the strings S1 and S2 around that region.
+If there is an active region, wrap the strings S1 and S2 around
+the region.  If there is not an active region but the point is at
+THING, wrap that thing (which defaults to word).  Otherwise, just
+insert S1 and S2 and place the point in between.  Return the
+bounds of the entire wrapped string, or nil if nothing was wrapped
+and S1 and S2 were only inserted."
+  (let (a b bounds new-point)
+    (cond
+     ;; Given region
+     ((and beg end)
+      (setq a beg
+            b end
+            new-point (+ (point) (length s1))))
+     ;; Active region
+     ((use-region-p)
+      (setq a (region-beginning)
+            b (region-end)
+            new-point (+ (point) (length s1))))
+     ;; Thing (word) at point
+     ((setq bounds (markdown-bounds-of-thing-at-point (or thing 'word)))
+      (setq a (car bounds)
+            b (cdr bounds)
+            new-point (+ (point) (length s1))))
+     ;; No active region and no word
+     (t
+      (setq a (point)
+            b (point))))
+    (goto-char b)
+    (insert s2)
+    (goto-char a)
+    (insert s1)
+    (when new-point (goto-char new-point))
+    (if (= a b)
+        nil
+      (setq b (+ b (length s1) (length s2)))
+      (cons a b))))
+
+(defun markdown-point-after-unwrap (cur prefix suffix)
+  "Return desired position of point after an unwrapping operation.
+CUR gives the position of the point before the operation.
+Additionally, two cons cells must be provided.  PREFIX gives the
+bounds of the prefix string and SUFFIX gives the bounds of the
+suffix string."
+  (cond ((< cur (cdr prefix)) (car prefix))
+        ((< cur (car suffix)) (- cur (- (cdr prefix) (car prefix))))
+        ((<= cur (cdr suffix))
+         (- cur (+ (- (cdr prefix) (car prefix))
+                   (- cur (car suffix)))))
+        (t cur)))
+
+(defun markdown-unwrap-thing-at-point (regexp all text)
+  "Remove prefix and suffix of thing at point and reposition the point.
+When the thing at point matches REGEXP, replace the subexpression
+ALL with the string in subexpression TEXT.  Reposition the point
+in an appropriate location accounting for the removal of prefix
+and suffix strings.  Return new bounds of string from group TEXT.
+When REGEXP is nil, assumes match data is already set."
+  (when (or (null regexp)
+            (thing-at-point-looking-at regexp))
+    (let ((cur (point))
+          (prefix (cons (match-beginning all) (match-beginning text)))
+          (suffix (cons (match-end text) (match-end all)))
+          (bounds (cons (match-beginning text) (match-end text))))
+      ;; Replace the thing at point
+      (replace-match (match-string text) t t nil all)
+      ;; Reposition the point
+      (goto-char (markdown-point-after-unwrap cur prefix suffix))
+      ;; Adjust bounds
+      (setq bounds (cons (car prefix)
+                         (- (cdr bounds) (- (cdr prefix) (car prefix))))))))
+
+(defun markdown-unwrap-things-in-region (beg end regexp all text)
+  "Remove prefix and suffix of all things in region from BEG to END.
+When a thing in the region matches REGEXP, replace the
+subexpression ALL with the string in subexpression TEXT.
+Return a cons cell containing updated bounds for the region."
+  (save-excursion
+    (goto-char beg)
+    (let ((removed 0) len-all len-text)
+      (while (re-search-forward regexp (- end removed) t)
+        (setq len-all (length (match-string-no-properties all)))
+        (setq len-text (length (match-string-no-properties text)))
+        (setq removed (+ removed (- len-all len-text)))
+        (replace-match (match-string text) t t nil all))
+      (cons beg (- end removed)))))
+
+(defun markdown-insert-hr (arg)
+  "Insert or replace a horizontal rule.
+By default, use the first element of `markdown-hr-strings'.  When
+ARG is non-nil, as when given a prefix, select a different
+element as follows.  When prefixed with \\[universal-argument],
+use the last element of `markdown-hr-strings' instead.  When
+prefixed with an integer from 1 to the length of
+`markdown-hr-strings', use the element in that position instead."
+  (interactive "*P")
+  (when (thing-at-point-looking-at markdown-regex-hr)
+    (delete-region (match-beginning 0) (match-end 0)))
+  (markdown-ensure-blank-line-before)
+  (cond ((equal arg '(4))
+         (insert (car (reverse markdown-hr-strings))))
+        ((and (integerp arg) (> arg 0)
+              (<= arg (length markdown-hr-strings)))
+         (insert (nth (1- arg) markdown-hr-strings)))
+        (t
+         (insert (car markdown-hr-strings))))
+  (markdown-ensure-blank-line-after))
+
+(defun markdown--insert-common (start-delim end-delim regex start-group end-group face
+                                            &optional skip-space)
+  (if (use-region-p)
+      ;; Active region
+      (let* ((bounds (markdown-unwrap-things-in-region
+                      (region-beginning) (region-end)
+                      regex start-group end-group))
+             (beg (car bounds))
+             (end (cdr bounds)))
+        (when (and beg skip-space)
+          (save-excursion
+            (goto-char beg)
+            (skip-chars-forward "[ \t]")
+            (setq beg (point))))
+        (when (and end skip-space)
+          (save-excursion
+            (goto-char end)
+            (skip-chars-backward "[ \t]")
+            (setq end (point))))
+        (markdown-wrap-or-insert start-delim end-delim nil beg end))
+    (if (markdown--face-p (point) (list face))
+        (save-excursion
+          (while (and (markdown--face-p (point) (list face)) (not (bobp)))
+            (forward-char -1))
+          (forward-char (- (1- (length start-delim)))) ;; for delimiter
+          (unless (bolp)
+            (forward-char -1))
+          (when (looking-at regex)
+            (markdown-unwrap-thing-at-point nil start-group end-group)))
+      (if (thing-at-point-looking-at regex)
+          (markdown-unwrap-thing-at-point nil start-group end-group)
+        (markdown-wrap-or-insert start-delim end-delim 'word nil nil)))))
+
+(defun markdown-insert-bold ()
+  "Insert markup to make a region or word bold.
+If there is an active region, make the region bold.  If the point
+is at a non-bold word, make the word bold.  If the point is at a
+bold word or phrase, remove the bold markup.  Otherwise, simply
+insert bold delimiters and place the point in between them."
+  (interactive)
+  (let ((delim (if markdown-bold-underscore "__" "**")))
+    (markdown--insert-common delim delim markdown-regex-bold 2 4 'markdown-bold-face t)))
+
+(defun markdown-insert-italic ()
+  "Insert markup to make a region or word italic.
+If there is an active region, make the region italic.  If the point
+is at a non-italic word, make the word italic.  If the point is at an
+italic word or phrase, remove the italic markup.  Otherwise, simply
+insert italic delimiters and place the point in between them."
+  (interactive)
+  (let ((delim (if markdown-italic-underscore "_" "*")))
+    (markdown--insert-common delim delim markdown-regex-italic 1 3 'markdown-italic-face t)))
+
+(defun markdown-insert-strike-through ()
+  "Insert markup to make a region or word strikethrough.
+If there is an active region, make the region strikethrough.  If the point
+is at a non-bold word, make the word strikethrough.  If the point is at a
+strikethrough word or phrase, remove the strikethrough markup.  Otherwise,
+simply insert bold delimiters and place the point in between them."
+  (interactive)
+  (markdown--insert-common
+   "~~" "~~" markdown-regex-strike-through 2 4 'markdown-strike-through-face t))
+
+(defun markdown-insert-code ()
+  "Insert markup to make a region or word an inline code fragment.
+If there is an active region, make the region an inline code
+fragment.  If the point is at a word, make the word an inline
+code fragment.  Otherwise, simply insert code delimiters and
+place the point in between them."
+  (interactive)
+  (if (use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-code 1 3)))
+        (markdown-wrap-or-insert "`" "`" nil (car bounds) (cdr bounds)))
+    ;; Code markup removal, code markup for word, or empty markup insertion
+    (if (markdown-inline-code-at-point)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (markdown-wrap-or-insert "`" "`" 'word nil nil))))
+
+(defun markdown-insert-kbd ()
+  "Insert markup to wrap region or word in <kbd> tags.
+If there is an active region, use the region.  If the point is at
+a word, use the word.  Otherwise, simply insert <kbd> tags and
+place the point in between them."
+  (interactive)
+  (if (use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-kbd 0 2)))
+        (markdown-wrap-or-insert "<kbd>" "</kbd>" nil (car bounds) (cdr bounds)))
+    ;; Markup removal, markup for word, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-kbd)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (markdown-wrap-or-insert "<kbd>" "</kbd>" 'word nil nil))))
+
+(defun markdown-insert-inline-link (text url &optional title)
+  "Insert an inline link with TEXT pointing to URL.
+Optionally, the user can provide a TITLE."
+  (let ((cur (point)))
+    (setq title (and title (concat " \"" title "\"")))
+    (insert (concat "[" text "](" url title ")"))
+    (cond ((not text) (goto-char (+ 1 cur)))
+          ((not url) (goto-char (+ 3 (length text) cur))))))
+
+(defun markdown-insert-inline-image (text url &optional title)
+  "Insert an inline link with alt TEXT pointing to URL.
+Optionally, also provide a TITLE."
+  (let ((cur (point)))
+    (setq title (and title (concat " \"" title "\"")))
+    (insert (concat "![" text "](" url title ")"))
+    (cond ((not text) (goto-char (+ 2 cur)))
+          ((not url) (goto-char (+ 4 (length text) cur))))))
+
+(defun markdown-insert-reference-link (text label &optional url title)
+  "Insert a reference link and, optionally, a reference definition.
+The link TEXT will be inserted followed by the optional LABEL.
+If a URL is given, also insert a definition for the reference
+LABEL according to `markdown-reference-location'.  If a TITLE is
+given, it will be added to the end of the reference definition
+and will be used to populate the title attribute when converted
+to XHTML.  If URL is nil, insert only the link portion (for
+example, when a reference label is already defined)."
+  (insert (concat "[" text "][" label "]"))
+  (when url
+    (markdown-insert-reference-definition
+     (if (string-equal label "") text label)
+     url title)))
+
+(defun markdown-insert-reference-image (text label &optional url title)
+  "Insert a reference image and, optionally, a reference definition.
+The alt TEXT will be inserted followed by the optional LABEL.
+If a URL is given, also insert a definition for the reference
+LABEL according to `markdown-reference-location'.  If a TITLE is
+given, it will be added to the end of the reference definition
+and will be used to populate the title attribute when converted
+to XHTML.  If URL is nil, insert only the link portion (for
+example, when a reference label is already defined)."
+  (insert (concat "![" text "][" label "]"))
+  (when url
+    (markdown-insert-reference-definition
+     (if (string-equal label "") text label)
+     url title)))
+
+(defun markdown-insert-reference-definition (label &optional url title)
+  "Add definition for reference LABEL with URL and TITLE.
+LABEL is a Markdown reference label without square brackets.
+URL and TITLE are optional.  When given, the TITLE will
+be used to populate the title attribute when converted to XHTML."
+  ;; END specifies where to leave the point upon return
+  (let ((end (point)))
+    (cl-case markdown-reference-location
+      (end         (goto-char (point-max)))
+      (immediately (markdown-end-of-text-block))
+      (subtree     (markdown-end-of-subtree))
+      (header      (markdown-end-of-defun)))
+    ;; Skip backwards over local variables.  This logic is similar to the one
+    ;; used in ‘hack-local-variables’.
+    (when (and enable-local-variables (eobp))
+      (search-backward "\n\f" (max (- (point) 3000) (point-min)) :move)
+      (when (let ((case-fold-search t))
+              (search-forward "Local Variables:" nil :move))
+        (beginning-of-line 0)
+        (when (eq (char-before) ?\n) (backward-char))))
+    (unless (or (markdown-cur-line-blank-p)
+                (thing-at-point-looking-at markdown-regex-reference-definition))
+      (insert "\n"))
+    (insert "\n[" label "]: ")
+    (if url
+        (insert url)
+      ;; When no URL is given, leave point at END following the colon
+      (setq end (point)))
+    (when (> (length title) 0)
+      (insert " \"" title "\""))
+    (unless (looking-at-p "\n")
+      (insert "\n"))
+    (goto-char end)
+    (when url
+      (message
+       (markdown--substitute-command-keys
+        "Reference [%s] was defined, press \\[markdown-do] to jump there")
+       label))))
+
+(defcustom markdown-link-make-text-function nil
+  "Function that automatically generates a link text for a URL.
+
+If non-nil, this function will be called by
+`markdown--insert-link-or-image' and the result will be the
+default link text. The function should receive exactly one
+argument that corresponds to the link URL."
+  :group 'markdown
+  :type 'function
+  :package-version '(markdown-mode . "2.5"))
+
+(defcustom markdown-disable-tooltip-prompt nil
+  "Disable prompt for tooltip when inserting a link or image.
+
+If non-nil, `markdown-insert-link' and `markdown-insert-link'
+will not prompt the user to insert a tooltip text for the given
+link or image."
+  :group 'markdown
+  :type 'boolean
+  :safe 'booleanp
+  :package-version '(markdown-mode . "2.5"))
+
+(defun markdown--insert-link-or-image (image)
+  "Interactively insert new or update an existing link or image.
+When IMAGE is non-nil, insert an image.  Otherwise, insert a link.
+This is an internal function called by
+`markdown-insert-link' and `markdown-insert-image'."
+  (cl-multiple-value-bind (begin end text uri ref title)
+      (if (use-region-p)
+          ;; Use region as either link text or URL as appropriate.
+          (let ((region (buffer-substring-no-properties
+                         (region-beginning) (region-end))))
+            (if (string-match markdown-regex-uri region)
+                ;; Region contains a URL; use it as such.
+                (list (region-beginning) (region-end)
+                      nil (match-string 0 region) nil nil)
+              ;; Region doesn't contain a URL, so use it as text.
+              (list (region-beginning) (region-end)
+                    region nil nil nil)))
+        ;; Extract and use properties of existing link, if any.
+        (markdown-link-at-pos (point)))
+    (let* ((ref (when ref (concat "[" ref "]")))
+           (defined-refs (mapcar #'car (markdown-get-defined-references)))
+           (defined-ref-cands (mapcar (lambda (ref) (concat "[" ref "]")) defined-refs))
+           (used-uris (markdown-get-used-uris))
+           (uri-or-ref (completing-read
+                        "URL or [reference]: "
+                        (append defined-ref-cands used-uris)
+                        nil nil (or uri ref)))
+           (ref (cond ((string-match "\\`\\[\\(.*\\)\\]\\'" uri-or-ref)
+                       (match-string 1 uri-or-ref))
+                      ((string-equal "" uri-or-ref)
+                       "")))
+           (uri (unless ref uri-or-ref))
+           (text-prompt (if image
+                            "Alt text: "
+                          (if ref
+                              "Link text: "
+                            "Link text (blank for plain URL): ")))
+           (text (or text (and markdown-link-make-text-function uri
+                               (funcall markdown-link-make-text-function uri))))
+           (text (completing-read text-prompt defined-refs nil nil text))
+           (text (if (= (length text) 0) nil text))
+           (plainp (and uri (not text)))
+           (implicitp (string-equal ref ""))
+           (ref (if implicitp text ref))
+           (definedp (and ref (markdown-reference-definition ref)))
+           (ref-url (unless (or uri definedp)
+                      (completing-read "Reference URL: " used-uris)))
+           (title (unless (or plainp definedp markdown-disable-tooltip-prompt)
+                    (read-string "Title (tooltip text, optional): " title)))
+           (title (if (= (length title) 0) nil title)))
+      (when (and image implicitp)
+        (user-error "Reference required: implicit image references are invalid"))
+      (when (and begin end)
+        (delete-region begin end))
+      (cond
+       ((and (not image) uri text)
+        (markdown-insert-inline-link text uri title))
+       ((and image uri text)
+        (markdown-insert-inline-image text uri title))
+       ((and ref text)
+        (if image
+            (markdown-insert-reference-image text (unless implicitp ref) nil title)
+          (markdown-insert-reference-link text (unless implicitp ref) nil title))
+        (unless definedp
+          (markdown-insert-reference-definition ref ref-url title)))
+       ((and (not image) uri)
+        (markdown-insert-uri uri))))))
+
+(defun markdown-insert-link ()
+  "Insert new or update an existing link, with interactive prompt.
+If the point is at an existing link or URL, update the link text,
+URL, reference label, and/or title.  Otherwise, insert a new link.
+The type of link inserted (inline, reference, or plain URL)
+depends on which values are provided:
+
+*   If a URL and TEXT are given, insert an inline link: [TEXT](URL).
+*   If [REF] and TEXT are given, insert a reference link: [TEXT][REF].
+*   If only TEXT is given, insert an implicit reference link: [TEXT][].
+*   If only a URL is given, insert a plain link: <URL>.
+
+In other words, to create an implicit reference link, leave the
+URL prompt empty and to create a plain URL link, leave the link
+text empty.
+
+If there is an active region, use the text as the default URL, if
+it seems to be a URL, or link text value otherwise.
+
+If a given reference is not defined, this function will
+additionally prompt for the URL and optional title.  In this case,
+the reference definition is placed at the location determined by
+`markdown-reference-location'.  In addition, it is possible to
+have the `markdown-link-make-text-function' function, if non-nil,
+define the default link text before prompting the user for it.
+
+If `markdown-disable-tooltip-prompt' is non-nil, the user will
+not be prompted to add or modify a tooltip text.
+
+Through updating the link, this function can be used to convert a
+link of one type (inline, reference, or plain) to another type by
+selectively adding or removing information via the prompts."
+  (interactive)
+  (markdown--insert-link-or-image nil))
+
+(defun markdown-insert-image ()
+  "Insert new or update an existing image, with interactive prompt.
+If the point is at an existing image, update the alt text, URL,
+reference label, and/or title. Otherwise, insert a new image.
+The type of image inserted (inline or reference) depends on which
+values are provided:
+
+*   If a URL and ALT-TEXT are given, insert an inline image:
+    ![ALT-TEXT](URL).
+*   If [REF] and ALT-TEXT are given, insert a reference image:
+    ![ALT-TEXT][REF].
+
+If there is an active region, use the text as the default URL, if
+it seems to be a URL, or alt text value otherwise.
+
+If a given reference is not defined, this function will
+additionally prompt for the URL and optional title.  In this case,
+the reference definition is placed at the location determined by
+`markdown-reference-location'.
+
+Through updating the image, this function can be used to convert an
+image of one type (inline or reference) to another type by
+selectively adding or removing information via the prompts."
+  (interactive)
+  (markdown--insert-link-or-image t))
+
+(defun markdown-insert-uri (&optional uri)
+  "Insert markup for an inline URI.
+If there is an active region, use it as the URI.  If the point is
+at a URI, wrap it with angle brackets.  If the point is at an
+inline URI, remove the angle brackets.  Otherwise, simply insert
+angle brackets place the point between them."
+  (interactive)
+  (if (use-region-p)
+      ;; Active region
+      (let ((bounds (markdown-unwrap-things-in-region
+                     (region-beginning) (region-end)
+                     markdown-regex-angle-uri 0 2)))
+        (markdown-wrap-or-insert "<" ">" nil (car bounds) (cdr bounds)))
+    ;; Markup removal, URI at point, new URI, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-angle-uri)
+        (markdown-unwrap-thing-at-point nil 0 2)
+      (if uri
+          (insert "<" uri ">")
+        (markdown-wrap-or-insert "<" ">" 'url nil nil)))))
+
+(defun markdown-insert-wiki-link ()
+  "Insert a wiki link of the form [[WikiLink]].
+If there is an active region, use the region as the link text.
+If the point is at a word, use the word as the link text.  If
+there is no active region and the point is not at word, simply
+insert link markup."
+  (interactive)
+  (if (use-region-p)
+      ;; Active region
+      (markdown-wrap-or-insert "[[" "]]" nil (region-beginning) (region-end))
+    ;; Markup removal, wiki link at at point, or empty markup insertion
+    (if (thing-at-point-looking-at markdown-regex-wiki-link)
+        (if (or markdown-wiki-link-alias-first
+                (null (match-string 5)))
+            (markdown-unwrap-thing-at-point nil 1 3)
+          (markdown-unwrap-thing-at-point nil 1 5))
+      (markdown-wrap-or-insert "[[" "]]"))))
+
+(defun markdown-remove-header ()
+  "Remove header markup if point is at a header.
+Return bounds of remaining header text if a header was removed
+and nil otherwise."
+  (interactive "*")
+  (or (markdown-unwrap-thing-at-point markdown-regex-header-atx 0 2)
+      (markdown-unwrap-thing-at-point markdown-regex-header-setext 0 1)))
+
+(defun markdown-insert-header (&optional level text setext)
+  "Insert or replace header markup.
+The level of the header is specified by LEVEL and header text is
+given by TEXT.  LEVEL must be an integer from 1 and 6, and the
+default value is 1.
+When TEXT is nil, the header text is obtained as follows.
+If there is an active region, it is used as the header text.
+Otherwise, the current line will be used as the header text.
+If there is not an active region and the point is at a header,
+remove the header markup and replace with level N header.
+Otherwise, insert empty header markup and place the point in
+between.
+The style of the header will be atx (hash marks) unless
+SETEXT is non-nil, in which case a setext-style (underlined)
+header will be inserted."
+  (interactive "p\nsHeader text: ")
+  (setq level (min (max (or level 1) 1) (if setext 2 6)))
+  ;; Determine header text if not given
+  (when (null text)
+    (if (use-region-p)
+        ;; Active region
+        (setq text (delete-and-extract-region (region-beginning) (region-end)))
+      ;; No active region
+      (markdown-remove-header)
+      (setq text (delete-and-extract-region
+                  (line-beginning-position) (line-end-position)))
+      (when (and setext (string-match-p "^[ \t]*$" text))
+        (setq text (read-string "Header text: "))))
+    (setq text (markdown-compress-whitespace-string text)))
+  ;; Insertion with given text
+  (markdown-ensure-blank-line-before)
+  (let (hdr)
+    (cond (setext
+           (setq hdr (make-string (string-width text) (if (= level 2) ?- ?=)))
+           (insert text "\n" hdr))
+          (t
+           (setq hdr (make-string level ?#))
+           (insert hdr " " text)
+           (when (null markdown-asymmetric-header) (insert " " hdr)))))
+  (markdown-ensure-blank-line-after)
+  ;; Leave point at end of text
+  (cond (setext
+         (backward-char (1+ (string-width text))))
+        ((null markdown-asymmetric-header)
+         (backward-char (1+ level)))))
+
+(defun markdown-insert-header-dwim (&optional arg setext)
+  "Insert or replace header markup.
+The level and type of the header are determined automatically by
+the type and level of the previous header, unless a prefix
+argument is given via ARG.
+With a numeric prefix valued 1 to 6, insert a header of the given
+level, with the type being determined automatically (note that
+only level 1 or 2 setext headers are possible).
+
+With a \\[universal-argument] prefix (i.e., when ARG is (4)),
+promote the heading by one level.
+With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
+demote the heading by one level.
+When SETEXT is non-nil, prefer setext-style headers when
+possible (levels one and two).
+
+When there is an active region, use it for the header text.  When
+the point is at an existing header, change the type and level
+according to the rules above.
+Otherwise, if the line is not empty, create a header using the
+text on the current line as the header text.
+Finally, if the point is on a blank line, insert empty header
+markup (atx) or prompt for text (setext).
+See `markdown-insert-header' for more details about how the
+header text is determined."
+  (interactive "*P")
+  (let (level)
+    (save-excursion
+      (when (or (thing-at-point-looking-at markdown-regex-header)
+                (re-search-backward markdown-regex-header nil t))
+        ;; level of current or previous header
+        (setq level (markdown-outline-level))
+        ;; match group 1 indicates a setext header
+        (setq setext (match-end 1))))
+    ;; check prefix argument
+    (cond
+     ((and (equal arg '(4)) level (> level 1)) ;; C-u
+      (cl-decf level))
+     ((and (equal arg '(16)) level (< level 6)) ;; C-u C-u
+      (cl-incf level))
+     (arg ;; numeric prefix
+      (setq level (prefix-numeric-value arg))))
+    ;; setext headers must be level one or two
+    (and level (setq setext (and setext (<= level 2))))
+    ;; insert the heading
+    (markdown-insert-header level nil setext)))
+
+(defun markdown-insert-header-setext-dwim (&optional arg)
+  "Insert or replace header markup, with preference for setext.
+See `markdown-insert-header-dwim' for details, including how ARG is handled."
+  (interactive "*P")
+  (markdown-insert-header-dwim arg t))
+
+(defun markdown-insert-header-atx-1 ()
+  "Insert a first level atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 1 nil nil))
+
+(defun markdown-insert-header-atx-2 ()
+  "Insert a level two atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 2 nil nil))
+
+(defun markdown-insert-header-atx-3 ()
+  "Insert a level three atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 3 nil nil))
+
+(defun markdown-insert-header-atx-4 ()
+  "Insert a level four atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 4 nil nil))
+
+(defun markdown-insert-header-atx-5 ()
+  "Insert a level five atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 5 nil nil))
+
+(defun markdown-insert-header-atx-6 ()
+  "Insert a sixth level atx-style (hash mark) header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 6 nil nil))
+
+(defun markdown-insert-header-setext-1 ()
+  "Insert a setext-style (underlined) first-level header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 1 nil t))
+
+(defun markdown-insert-header-setext-2 ()
+  "Insert a setext-style (underlined) second-level header.
+See `markdown-insert-header'."
+  (interactive "*")
+  (markdown-insert-header 2 nil t))
+
+(defun markdown-blockquote-indentation (loc)
+  "Return string containing necessary indentation for a blockquote at LOC.
+Also see `markdown-pre-indentation'."
+  (save-excursion
+    (goto-char loc)
+    (let* ((list-level (length (markdown-calculate-list-levels)))
+           (indent ""))
+      (dotimes (_ list-level indent)
+        (setq indent (concat indent "    "))))))
+
+(defun markdown-insert-blockquote ()
+  "Start a blockquote section (or blockquote the region).
+If Transient Mark mode is on and a region is active, it is used as
+the blockquote text."
+  (interactive)
+  (if (use-region-p)
+      (markdown-blockquote-region (region-beginning) (region-end))
+    (markdown-ensure-blank-line-before)
+    (insert (markdown-blockquote-indentation (point)) "> ")
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-block-region (beg end prefix)
+  "Format the region using a block prefix.
+Arguments BEG and END specify the beginning and end of the
+region.  The characters PREFIX will appear at the beginning
+of each line."
+  (save-excursion
+    (let* ((end-marker (make-marker))
+           (beg-marker (make-marker))
+           (prefix-without-trailing-whitespace
+            (replace-regexp-in-string (rx (+ blank) eos) "" prefix)))
+      ;; Ensure blank line after and remove extra whitespace
+      (goto-char end)
+      (skip-syntax-backward "-")
+      (set-marker end-marker (point))
+      (delete-horizontal-space)
+      (markdown-ensure-blank-line-after)
+      ;; Ensure blank line before and remove extra whitespace
+      (goto-char beg)
+      (skip-syntax-forward "-")
+      (delete-horizontal-space)
+      (markdown-ensure-blank-line-before)
+      (set-marker beg-marker (point))
+      ;; Insert PREFIX before each line
+      (goto-char beg-marker)
+      (while (and (< (line-beginning-position) end-marker)
+                  (not (eobp)))
+        ;; Don’t insert trailing whitespace.
+        (insert (if (eolp) prefix-without-trailing-whitespace prefix))
+        (forward-line)))))
+
+(defun markdown-blockquote-region (beg end)
+  "Blockquote the region.
+Arguments BEG and END specify the beginning and end of the region."
+  (interactive "*r")
+  (markdown-block-region
+   beg end (concat (markdown-blockquote-indentation
+                    (max (point-min) (1- beg))) "> ")))
+
+(defun markdown-pre-indentation (loc)
+  "Return string containing necessary whitespace for a pre block at LOC.
+Also see `markdown-blockquote-indentation'."
+  (save-excursion
+    (goto-char loc)
+    (let* ((list-level (length (markdown-calculate-list-levels)))
+           indent)
+      (dotimes (_ (1+ list-level) indent)
+        (setq indent (concat indent "    "))))))
+
+(defun markdown-insert-pre ()
+  "Start a preformatted section (or apply to the region).
+If Transient Mark mode is on and a region is active, it is marked
+as preformatted text."
+  (interactive)
+  (if (use-region-p)
+      (markdown-pre-region (region-beginning) (region-end))
+    (markdown-ensure-blank-line-before)
+    (insert (markdown-pre-indentation (point)))
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-pre-region (beg end)
+  "Format the region as preformatted text.
+Arguments BEG and END specify the beginning and end of the region."
+  (interactive "*r")
+  (let ((indent (markdown-pre-indentation (max (point-min) (1- beg)))))
+    (markdown-block-region beg end indent)))
+
+(defun markdown-electric-backquote (arg)
+  "Insert a backquote.
+The numeric prefix argument ARG says how many times to repeat the insertion.
+Call `markdown-insert-gfm-code-block' interactively
+if three backquotes inserted at the beginning of line."
+  (interactive "*P")
+  (self-insert-command (prefix-numeric-value arg))
+  (when (and markdown-gfm-use-electric-backquote (looking-back "^```" nil))
+    (replace-match "")
+    (call-interactively #'markdown-insert-gfm-code-block)))
+
+(defconst markdown-gfm-recognized-languages
+  ;; To reproduce/update, evaluate the let-form in
+  ;; scripts/get-recognized-gfm-languages.el. that produces a single long sexp,
+  ;; but with appropriate use of a keyboard macro, indenting and filling it
+  ;; properly is pretty fast.
+  '("1C-Enterprise" "2-Dimensional-Array" "4D" "ABAP" "ABAP-CDS" "ABNF"
+    "AGS-Script" "AIDL" "AL" "AMPL" "ANTLR" "API-Blueprint" "APL" "ASL"
+    "ASN.1" "ASP.NET" "ATS" "ActionScript" "Ada" "Adblock-Filter-List"
+    "Adobe-Font-Metrics" "Agda" "Alloy" "Alpine-Abuild" "Altium-Designer"
+    "AngelScript" "Ant-Build-System" "Antlers" "ApacheConf" "Apex"
+    "Apollo-Guidance-Computer" "AppleScript" "Arc" "AsciiDoc" "AspectJ"
+    "Assembly" "Astro" "Asymptote" "Augeas" "AutoHotkey" "AutoIt"
+    "Avro-IDL" "Awk" "BASIC" "Ballerina" "Batchfile" "Beef" "Befunge"
+    "Berry" "BibTeX" "Bicep" "Bikeshed" "Bison" "BitBake" "Blade"
+    "BlitzBasic" "BlitzMax" "Bluespec" "Bluespec-BH" "Boo" "Boogie"
+    "Brainfuck" "BrighterScript" "Brightscript" "Browserslist" "C" "C#"
+    "C++" "C-ObjDump" "C2hs-Haskell" "CAP-CDS" "CIL" "CLIPS" "CMake"
+    "COBOL" "CODEOWNERS" "COLLADA" "CSON" "CSS" "CSV" "CUE" "CWeb"
+    "Cabal-Config" "Cadence" "Cairo" "CameLIGO" "Cap'n-Proto" "CartoCSS"
+    "Ceylon" "Chapel" "Charity" "Checksums" "ChucK" "Circom" "Cirru"
+    "Clarion" "Clarity" "Classic-ASP" "Clean" "Click" "Clojure"
+    "Closure-Templates" "Cloud-Firestore-Security-Rules" "CoNLL-U"
+    "CodeQL" "CoffeeScript" "ColdFusion" "ColdFusion-CFC" "Common-Lisp"
+    "Common-Workflow-Language" "Component-Pascal" "Cool" "Coq"
+    "Cpp-ObjDump" "Creole" "Crystal" "Csound" "Csound-Document"
+    "Csound-Score" "Cuda" "Cue-Sheet" "Curry" "Cycript" "Cypher" "Cython"
+    "D" "D-ObjDump" "D2" "DIGITAL-Command-Language" "DM" "DNS-Zone"
+    "DTrace" "Dafny" "Darcs-Patch" "Dart" "DataWeave"
+    "Debian-Package-Control-File" "DenizenScript" "Dhall" "Diff"
+    "DirectX-3D-File" "Dockerfile" "Dogescript" "Dotenv" "Dylan" "E"
+    "E-mail" "EBNF" "ECL" "ECLiPSe" "EJS" "EQ" "Eagle" "Earthly"
+    "Easybuild" "Ecere-Projects" "Ecmarkup" "Edge" "EdgeQL"
+    "EditorConfig" "Edje-Data-Collection" "Eiffel" "Elixir" "Elm"
+    "Elvish" "Elvish-Transcript" "Emacs-Lisp" "EmberScript" "Erlang"
+    "Euphoria" "F#" "F*" "FIGlet-Font" "FLUX" "Factor" "Fancy" "Fantom"
+    "Faust" "Fennel" "Filebench-WML" "Filterscript" "Fluent" "Formatted"
+    "Forth" "Fortran" "Fortran-Free-Form" "FreeBasic" "FreeMarker"
+    "Frege" "Futhark" "G-code" "GAML" "GAMS" "GAP"
+    "GCC-Machine-Description" "GDB" "GDScript" "GEDCOM" "GLSL" "GN" "GSC"
+    "Game-Maker-Language" "Gemfile.lock" "Gemini" "Genero-4gl"
+    "Genero-per" "Genie" "Genshi" "Gentoo-Ebuild" "Gentoo-Eclass"
+    "Gerber-Image" "Gettext-Catalog" "Gherkin" "Git-Attributes"
+    "Git-Config" "Git-Revision-List" "Gleam" "Glimmer-JS" "Glimmer-TS"
+    "Glyph" "Glyph-Bitmap-Distribution-Format" "Gnuplot" "Go"
+    "Go-Checksums" "Go-Module" "Go-Workspace" "Godot-Resource" "Golo"
+    "Gosu" "Grace" "Gradle" "Gradle-Kotlin-DSL" "Grammatical-Framework"
+    "Graph-Modeling-Language" "GraphQL" "Graphviz-(DOT)" "Groovy"
+    "Groovy-Server-Pages" "HAProxy" "HCL" "HLSL" "HOCON" "HTML"
+    "HTML+ECR" "HTML+EEX" "HTML+ERB" "HTML+PHP" "HTML+Razor" "HTTP"
+    "HXML" "Hack" "Haml" "Handlebars" "Harbour" "Haskell" "Haxe" "HiveQL"
+    "HolyC" "Hosts-File" "Hy" "HyPhy" "IDL" "IGOR-Pro" "INI" "IRC-log"
+    "Idris" "Ignore-List" "ImageJ-Macro" "Imba" "Inform-7" "Ink"
+    "Inno-Setup" "Io" "Ioke" "Isabelle" "Isabelle-ROOT" "J"
+    "JAR-Manifest" "JCL" "JFlex" "JSON" "JSON-with-Comments" "JSON5"
+    "JSONLD" "JSONiq" "Janet" "Jasmin" "Java" "Java-Properties"
+    "Java-Server-Pages" "JavaScript" "JavaScript+ERB" "Jest-Snapshot"
+    "JetBrains-MPS" "Jinja" "Jison" "Jison-Lex" "Jolie" "Jsonnet" "Julia"
+    "Jupyter-Notebook" "Just" "KRL" "Kaitai-Struct" "KakouneScript"
+    "KerboScript" "KiCad-Layout" "KiCad-Legacy-Layout" "KiCad-Schematic"
+    "Kickstart" "Kit" "Kotlin" "Kusto" "LFE" "LLVM" "LOLCODE" "LSL"
+    "LTspice-Symbol" "LabVIEW" "Lark" "Lasso" "Latte" "Lean" "Lean-4"
+    "Less" "Lex" "LigoLANG" "LilyPond" "Limbo" "Linker-Script"
+    "Linux-Kernel-Module" "Liquid" "Literate-Agda"
+    "Literate-CoffeeScript" "Literate-Haskell" "LiveScript" "Logos"
+    "Logtalk" "LookML" "LoomScript" "Lua" "M" "M4" "M4Sugar" "MATLAB"
+    "MAXScript" "MDX" "MLIR" "MQL4" "MQL5" "MTML" "MUF" "Macaulay2"
+    "Makefile" "Mako" "Markdown" "Marko" "Mask" "Mathematica" "Maven-POM"
+    "Max" "Mercury" "Mermaid" "Meson" "Metal"
+    "Microsoft-Developer-Studio-Project"
+    "Microsoft-Visual-Studio-Solution" "MiniD" "MiniYAML" "Mint" "Mirah"
+    "Modelica" "Modula-2" "Modula-3" "Module-Management-System" "Mojo"
+    "Monkey" "Monkey-C" "Moocode" "MoonScript" "Motoko"
+    "Motorola-68K-Assembly" "Move" "Muse" "Mustache" "Myghty" "NASL"
+    "NCL" "NEON" "NL" "NPM-Config" "NSIS" "NWScript" "Nasal" "Nearley"
+    "Nemerle" "NetLinx" "NetLinx+ERB" "NetLogo" "NewLisp" "Nextflow"
+    "Nginx" "Nim" "Ninja" "Nit" "Nix" "Nu" "NumPy" "Nunjucks" "Nushell"
+    "OASv2-json" "OASv2-yaml" "OASv3-json" "OASv3-yaml" "OCaml" "Oberon"
+    "ObjDump" "Object-Data-Instance-Notation" "ObjectScript"
+    "Objective-C" "Objective-C++" "Objective-J" "Odin" "Omgrofl" "Opa"
+    "Opal" "Open-Policy-Agent" "OpenAPI-Specification-v2"
+    "OpenAPI-Specification-v3" "OpenCL" "OpenEdge-ABL" "OpenQASM"
+    "OpenRC-runscript" "OpenSCAD" "OpenStep-Property-List"
+    "OpenType-Feature-File" "Option-List" "Org" "Ox" "Oxygene" "Oz" "P4"
+    "PDDL" "PEG.js" "PHP" "PLSQL" "PLpgSQL" "POV-Ray-SDL" "Pact" "Pan"
+    "Papyrus" "Parrot" "Parrot-Assembly" "Parrot-Internal-Representation"
+    "Pascal" "Pawn" "Pep8" "Perl" "Pic" "Pickle" "PicoLisp" "PigLatin"
+    "Pike" "Pip-Requirements" "PlantUML" "Pod" "Pod-6" "PogoScript"
+    "Polar" "Pony" "Portugol" "PostCSS" "PostScript" "PowerBuilder"
+    "PowerShell" "Praat" "Prisma" "Processing" "Procfile" "Proguard"
+    "Prolog" "Promela" "Propeller-Spin" "Protocol-Buffer"
+    "Protocol-Buffer-Text-Format" "Public-Key" "Pug" "Puppet" "Pure-Data"
+    "PureBasic" "PureScript" "Pyret" "Python" "Python-console"
+    "Python-traceback" "Q#" "QML" "QMake" "Qt-Script" "Quake" "R" "RAML"
+    "RBS" "RDoc" "REALbasic" "REXX" "RMarkdown" "RPC" "RPGLE" "RPM-Spec"
+    "RUNOFF" "Racket" "Ragel" "Raku" "Rascal" "Raw-token-data" "ReScript"
+    "Readline-Config" "Reason" "ReasonLIGO" "Rebol" "Record-Jar" "Red"
+    "Redcode" "Redirect-Rules" "Regular-Expression" "Ren'Py"
+    "RenderScript" "Rez" "Rich-Text-Format" "Ring" "Riot"
+    "RobotFramework" "Roc" "Roff" "Roff-Manpage" "Rouge"
+    "RouterOS-Script" "Ruby" "Rust" "SAS" "SCSS" "SELinux-Policy" "SMT"
+    "SPARQL" "SQF" "SQL" "SQLPL" "SRecode-Template" "SSH-Config" "STAR"
+    "STL" "STON" "SVG" "SWIG" "Sage" "SaltStack" "Sass" "Scala" "Scaml"
+    "Scenic" "Scheme" "Scilab" "Self" "ShaderLab" "Shell"
+    "ShellCheck-Config" "ShellSession" "Shen" "Sieve"
+    "Simple-File-Verification" "Singularity" "Slash" "Slice" "Slim"
+    "Slint" "SmPL" "Smali" "Smalltalk" "Smarty" "Smithy" "Snakemake"
+    "Solidity" "Soong" "SourcePawn" "Spline-Font-Database" "Squirrel"
+    "Stan" "Standard-ML" "Starlark" "Stata" "StringTemplate" "Stylus"
+    "SubRip-Text" "SugarSS" "SuperCollider" "Svelte" "Sway" "Sweave"
+    "Swift" "SystemVerilog" "TI-Program" "TL-Verilog" "TLA" "TOML" "TSQL"
+    "TSV" "TSX" "TXL" "Talon" "Tcl" "Tcsh" "TeX" "Tea" "Terra"
+    "Terraform-Template" "Texinfo" "Text" "TextGrid"
+    "TextMate-Properties" "Textile" "Thrift" "Toit" "Turing" "Turtle"
+    "Twig" "Type-Language" "TypeScript" "Typst" "Unified-Parallel-C"
+    "Unity3D-Asset" "Unix-Assembly" "Uno" "UnrealScript" "UrWeb" "V"
+    "VBA" "VBScript" "VCL" "VHDL" "Vala" "Valve-Data-Format"
+    "Velocity-Template-Language" "Verilog" "Vim-Help-File" "Vim-Script"
+    "Vim-Snippet" "Visual-Basic-.NET" "Visual-Basic-6.0" "Volt" "Vue"
+    "Vyper" "WDL" "WGSL" "Wavefront-Material" "Wavefront-Object"
+    "Web-Ontology-Language" "WebAssembly" "WebAssembly-Interface-Type"
+    "WebIDL" "WebVTT" "Wget-Config" "Whiley" "Wikitext"
+    "Win32-Message-File" "Windows-Registry-Entries" "Witcher-Script"
+    "Wollok" "World-of-Warcraft-Addon-Data" "Wren" "X-BitMap"
+    "X-Font-Directory-Index" "X-PixMap" "X10" "XC" "XCompose" "XML"
+    "XML-Property-List" "XPages" "XProc" "XQuery" "XS" "XSLT" "Xojo"
+    "Xonsh" "Xtend" "YAML" "YANG" "YARA" "YASnippet" "Yacc" "Yul" "ZAP"
+    "ZIL" "Zeek" "ZenScript" "Zephir" "Zig" "Zimpl" "cURL-Config"
+    "desktop" "dircolors" "eC" "edn" "fish" "hoon" "jq" "kvlang"
+    "mIRC-Script" "mcfunction" "mupad" "nanorc" "nesC" "ooc" "q"
+    "reStructuredText" "robots.txt" "sed" "wisp" "xBase")
+  "Language specifiers recognized by GitHub's syntax highlighting features.")
+
+(defvar-local markdown-gfm-used-languages nil
+  "Language names used in GFM code blocks.")
+
+(defun markdown-trim-whitespace (str)
+  (replace-regexp-in-string
+   "\\(?:[[:space:]\r\n]+\\'\\|\\`[[:space:]\r\n]+\\)" "" str))
+
+(defun markdown-clean-language-string (str)
+  (replace-regexp-in-string
+   "{\\.?\\|}" "" (markdown-trim-whitespace str)))
+
+(defun markdown-validate-language-string (widget)
+  (let ((str (widget-value widget)))
+    (unless (string= str (markdown-clean-language-string str))
+      (widget-put widget :error (format "Invalid language spec: '%s'" str))
+      widget)))
+
+(defun markdown-gfm-get-corpus ()
+  "Create corpus of recognized GFM code block languages for the given buffer."
+  (let ((given-corpus (append markdown-gfm-additional-languages
+                              markdown-gfm-recognized-languages)))
+    (append
+     markdown-gfm-used-languages
+     (if markdown-gfm-downcase-languages (cl-mapcar #'downcase given-corpus)
+       given-corpus))))
+
+(defun markdown-gfm-add-used-language (lang)
+  "Clean LANG and add to list of used languages."
+  (setq markdown-gfm-used-languages
+        (cons lang (remove lang markdown-gfm-used-languages))))
+
+(defcustom markdown-spaces-after-code-fence 1
+  "Number of space characters to insert after a code fence.
+\\<gfm-mode-map>\\[markdown-insert-gfm-code-block] inserts this many spaces between an
+opening code fence and an info string."
+  :group 'markdown
+  :type 'integer
+  :safe #'natnump
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-code-block-braces nil
+  "When non-nil, automatically insert braces for GFM code blocks."
+  :group 'markdown
+  :type 'boolean)
+
+(defun markdown-insert-gfm-code-block (&optional lang edit)
+  "Insert GFM code block for language LANG.
+If LANG is nil, the language will be queried from user.  If a
+region is active, wrap this region with the markup instead.  If
+the region boundaries are not on empty lines, these are added
+automatically in order to have the correct markup.  When EDIT is
+non-nil (e.g., when \\[universal-argument] is given), edit the
+code block in an indirect buffer after insertion."
+  (interactive
+   (list (let ((completion-ignore-case nil))
+           (condition-case nil
+               (markdown-clean-language-string
+                (completing-read
+                 "Programming language: "
+                 (markdown-gfm-get-corpus)
+                 nil 'confirm (car markdown-gfm-used-languages)
+                 'markdown-gfm-language-history))
+             (quit "")))
+         current-prefix-arg))
+  (unless (string= lang "") (markdown-gfm-add-used-language lang))
+  (when (and (> (length lang) 0)
+             (not markdown-code-block-braces))
+    (setq lang (concat (make-string markdown-spaces-after-code-fence ?\s)
+                       lang)))
+  (let ((gfm-open-brace (if markdown-code-block-braces "{" ""))
+        (gfm-close-brace (if markdown-code-block-braces "}" "")))
+    (if (use-region-p)
+        (let* ((b (region-beginning)) (e (region-end)) end
+               (indent (progn (goto-char b) (current-indentation))))
+          (goto-char e)
+          ;; if we're on a blank line, don't newline, otherwise the ```
+          ;; should go on its own line
+          (unless (looking-back "\n" nil)
+            (newline))
+          (indent-to indent)
+          (insert "```")
+          (markdown-ensure-blank-line-after)
+          (setq end (point))
+          (goto-char b)
+          ;; if we're on a blank line, insert the quotes here, otherwise
+          ;; add a new line first
+          (unless (looking-at-p "\n")
+            (newline)
+            (forward-line -1))
+          (markdown-ensure-blank-line-before)
+          (indent-to indent)
+          (insert "```" gfm-open-brace lang gfm-close-brace)
+          (markdown-syntax-propertize-fenced-block-constructs (line-beginning-position) end))
+      (let ((indent (current-indentation))
+            start-bol)
+        (delete-horizontal-space :backward-only)
+        (markdown-ensure-blank-line-before)
+        (indent-to indent)
+        (setq start-bol (line-beginning-position))
+        (insert "```" gfm-open-brace lang gfm-close-brace "\n")
+        (indent-to indent)
+        (unless edit (insert ?\n))
+        (indent-to indent)
+        (insert "```")
+        (markdown-ensure-blank-line-after)
+        (markdown-syntax-propertize-fenced-block-constructs start-bol (point)))
+      (end-of-line 0)
+      (when edit (markdown-edit-code-block)))))
+
+(defun markdown-code-block-lang (&optional pos-prop)
+  "Return the language name for a GFM or tilde fenced code block.
+The beginning of the block may be described by POS-PROP,
+a cons of (pos . prop) giving the position and property
+at the beginning of the block."
+  (or pos-prop
+      (setq pos-prop
+            (markdown-max-of-seq
+             #'car
+             (cl-remove-if
+              #'null
+              (cl-mapcar
+               #'markdown-find-previous-prop
+               (markdown-get-fenced-block-begin-properties))))))
+  (when pos-prop
+    (goto-char (car pos-prop))
+    (set-match-data (get-text-property (point) (cdr pos-prop)))
+    ;; Note: Hard-coded group number assumes tilde
+    ;; and GFM fenced code regexp groups agree.
+    (let ((begin (match-beginning 3))
+          (end (match-end 3)))
+      (when (and begin end)
+        ;; Fix language strings beginning with periods, like ".ruby".
+        (when (eq (char-after begin) ?.)
+          (setq begin (1+ begin)))
+        (buffer-substring-no-properties begin end)))))
+
+(defun markdown-gfm-parse-buffer-for-languages (&optional buffer)
+  (with-current-buffer (or buffer (current-buffer))
+    (save-excursion
+      (goto-char (point-min))
+      (cl-loop
+       with prop = 'markdown-gfm-block-begin
+       for pos-prop = (markdown-find-next-prop prop)
+       while pos-prop
+       for lang = (markdown-code-block-lang pos-prop)
+       do (progn (when lang (markdown-gfm-add-used-language lang))
+                 (goto-char (next-single-property-change (point) prop)))))))
+
+(defun markdown-insert-foldable-block ()
+  "Insert details disclosure element to make content foldable.
+If a region is active, wrap this region with the disclosure
+element. More details here https://developer.mozilla.org/en-US/docs/Web/HTML/Element/details."
+  (interactive)
+  (let ((details-open-tag "<details>")
+        (details-close-tag "</details>")
+        (summary-open-tag "<summary>")
+        (summary-close-tag " </summary>"))
+    (if (use-region-p)
+        (let* ((b (region-beginning))
+               (e (region-end))
+               (indent (progn (goto-char b) (current-indentation))))
+          (goto-char e)
+          ;; if we're on a blank line, don't newline, otherwise the tags
+          ;; should go on its own line
+          (unless (looking-back "\n" nil)
+            (newline))
+          (indent-to indent)
+          (insert details-close-tag)
+          (markdown-ensure-blank-line-after)
+          (goto-char b)
+          ;; if we're on a blank line, insert the quotes here, otherwise
+          ;; add a new line first
+          (unless (looking-at-p "\n")
+            (newline)
+            (forward-line -1))
+          (markdown-ensure-blank-line-before)
+          (indent-to indent)
+          (insert details-open-tag "\n")
+          (insert summary-open-tag summary-close-tag)
+          (search-backward summary-close-tag))
+      (let ((indent (current-indentation)))
+        (delete-horizontal-space :backward-only)
+        (markdown-ensure-blank-line-before)
+        (indent-to indent)
+        (insert details-open-tag "\n")
+        (insert summary-open-tag summary-close-tag "\n")
+        (insert details-close-tag)
+        (indent-to indent)
+        (markdown-ensure-blank-line-after)
+        (search-backward summary-close-tag)))))
+
+
+;;; Footnotes =================================================================
+
+(defun markdown-footnote-counter-inc ()
+  "Increment `markdown-footnote-counter' and return the new value."
+  (when (= markdown-footnote-counter 0) ; hasn't been updated in this buffer yet.
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward (concat "^\\[\\^\\(" markdown-footnote-chars "*?\\)\\]:")
+                                (point-max) t)
+        (let ((fn (string-to-number (match-string 1))))
+          (when (> fn markdown-footnote-counter)
+            (setq markdown-footnote-counter fn))))))
+  (cl-incf markdown-footnote-counter))
+
+(defun markdown-insert-footnote ()
+  "Insert footnote with a new number and move point to footnote definition."
+  (interactive)
+  (let ((fn (markdown-footnote-counter-inc)))
+    (insert (format "[^%d]" fn))
+    (push-mark (point) t)
+    (markdown-footnote-text-find-new-location)
+    (markdown-ensure-blank-line-before)
+    (unless (markdown-cur-line-blank-p)
+      (insert "\n"))
+    (insert (format "[^%d]: " fn))
+    (markdown-ensure-blank-line-after)))
+
+(defun markdown-footnote-text-find-new-location ()
+  "Position the point at the proper location for a new footnote text."
+  (cond
+   ((eq markdown-footnote-location 'end) (goto-char (point-max)))
+   ((eq markdown-footnote-location 'immediately) (markdown-end-of-text-block))
+   ((eq markdown-footnote-location 'subtree) (markdown-end-of-subtree))
+   ((eq markdown-footnote-location 'header) (markdown-end-of-defun))))
+
+(defun markdown-footnote-kill ()
+  "Kill the footnote at point.
+The footnote text is killed (and added to the kill ring), the
+footnote marker is deleted.  Point has to be either at the
+footnote marker or in the footnote text."
+  (interactive)
+  (let ((marker-pos nil)
+        (skip-deleting-marker nil)
+        (starting-footnote-text-positions
+         (markdown-footnote-text-positions)))
+    (when starting-footnote-text-positions
+      ;; We're starting in footnote text, so mark our return position and jump
+      ;; to the marker if possible.
+      (let ((marker-pos (markdown-footnote-find-marker
+                         (cl-first starting-footnote-text-positions))))
+        (if marker-pos
+            (goto-char (1- marker-pos))
+          ;; If there isn't a marker, we still want to kill the text.
+          (setq skip-deleting-marker t))))
+    ;; Either we didn't start in the text, or we started in the text and jumped
+    ;; to the marker. We want to assume we're at the marker now and error if
+    ;; we're not.
+    (unless skip-deleting-marker
+      (let ((marker (markdown-footnote-delete-marker)))
+        (unless marker
+          (error "Not at a footnote"))
+        ;; Even if we knew the text position before, it changed when we deleted
+        ;; the label.
+        (setq marker-pos (cl-second marker))
+        (let ((new-text-pos (markdown-footnote-find-text (cl-first marker))))
+          (unless new-text-pos
+            (error "No text for footnote `%s'" (cl-first marker)))
+          (goto-char new-text-pos))))
+    (let ((pos (markdown-footnote-kill-text)))
+      (goto-char (if starting-footnote-text-positions
+                     pos
+                   marker-pos)))))
+
+(defun markdown-footnote-delete-marker ()
+  "Delete a footnote marker at point.
+Returns a list (ID START) containing the footnote ID and the
+start position of the marker before deletion.  If no footnote
+marker was deleted, this function returns NIL."
+  (let ((marker (markdown-footnote-marker-positions)))
+    (when marker
+      (delete-region (cl-second marker) (cl-third marker))
+      (butlast marker))))
+
+(defun markdown-footnote-kill-text ()
+  "Kill footnote text at point.
+Returns the start position of the footnote text before deletion,
+or NIL if point was not inside a footnote text.
+
+The killed text is placed in the kill ring (without the footnote
+number)."
+  (let ((fn (markdown-footnote-text-positions)))
+    (when fn
+      (let ((text (delete-and-extract-region (cl-second fn) (cl-third fn))))
+        (string-match (concat "\\[\\" (cl-first fn) "\\]:[[:space:]]*\\(\\(.*\n?\\)*\\)") text)
+        (kill-new (match-string 1 text))
+        (when (and (markdown-cur-line-blank-p)
+                   (markdown-prev-line-blank-p)
+                   (not (bobp)))
+          (delete-region (1- (point)) (point)))
+        (cl-second fn)))))
+
+(defun markdown-footnote-goto-text ()
+  "Jump to the text of the footnote at point."
+  (interactive)
+  (let ((fn (car (markdown-footnote-marker-positions))))
+    (unless fn
+      (user-error "Not at a footnote marker"))
+    (let ((new-pos (markdown-footnote-find-text fn)))
+      (unless new-pos
+        (error "No definition found for footnote `%s'" fn))
+      (goto-char new-pos))))
+
+(defun markdown-footnote-return ()
+  "Return from a footnote to its footnote number in the main text."
+  (interactive)
+  (let ((fn (save-excursion
+              (car (markdown-footnote-text-positions)))))
+    (unless fn
+      (user-error "Not in a footnote"))
+    (let ((new-pos (markdown-footnote-find-marker fn)))
+      (unless new-pos
+        (error "Footnote marker `%s' not found" fn))
+      (goto-char new-pos))))
+
+(defun markdown-footnote-find-marker (id)
+  "Find the location of the footnote marker with ID.
+The actual buffer position returned is the position directly
+following the marker's closing bracket.  If no marker is found,
+NIL is returned."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (concat "\\[" id "\\]\\([^:]\\|\\'\\)") nil t)
+      (skip-chars-backward "^]")
+      (point))))
+
+(defun markdown-footnote-find-text (id)
+  "Find the location of the text of footnote ID.
+The actual buffer position returned is the position of the first
+character of the text, after the footnote's identifier.  If no
+footnote text is found, NIL is returned."
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward (concat "^ \\{0,3\\}\\[" id "\\]:") nil t)
+      (skip-chars-forward "[ \t]")
+      (point))))
+
+(defun markdown-footnote-marker-positions ()
+  "Return the position and ID of the footnote marker point is on.
+The return value is a list (ID START END).  If point is not on a
+footnote, NIL is returned."
+  ;; first make sure we're at a footnote marker
+  (if (or (looking-back (concat "\\[\\^" markdown-footnote-chars "*\\]?") (line-beginning-position))
+          (looking-at-p (concat "\\[?\\^" markdown-footnote-chars "*?\\]")))
+      (save-excursion
+        ;; move point between [ and ^:
+        (if (looking-at-p "\\[")
+            (forward-char 1)
+          (skip-chars-backward "^["))
+        (looking-at (concat "\\(\\^" markdown-footnote-chars "*?\\)\\]"))
+        (list (match-string 1) (1- (match-beginning 1)) (1+ (match-end 1))))))
+
+(defun markdown-footnote-text-positions ()
+  "Return the start and end positions of the footnote text point is in.
+The exact return value is a list of three elements: (ID START END).
+The start position is the position of the opening bracket
+of the footnote id.  The end position is directly after the
+newline that ends the footnote.  If point is not in a footnote,
+NIL is returned instead."
+  (save-excursion
+    (let (result)
+      (move-beginning-of-line 1)
+      ;; Try to find the label. If we haven't found the label and we're at a blank
+      ;; or indented line, back up if possible.
+      (while (and
+              (not (and (looking-at markdown-regex-footnote-definition)
+                        (setq result (list (match-string 1) (point)))))
+              (and (not (bobp))
+                   (or (markdown-cur-line-blank-p)
+                       (>= (current-indentation) 4))))
+        (forward-line -1))
+      (when result
+        ;; Advance if there is a next line that is either blank or indented.
+        ;; (Need to check if we're on the last line, because
+        ;; markdown-next-line-blank-p returns true for last line in buffer.)
+        (while (and (/= (line-end-position) (point-max))
+                    (or (markdown-next-line-blank-p)
+                        (>= (markdown-next-line-indent) 4)))
+          (forward-line))
+        ;; Move back while the current line is blank.
+        (while (markdown-cur-line-blank-p)
+          (forward-line -1))
+        ;; Advance to capture this line and a single trailing newline (if there
+        ;; is one).
+        (forward-line)
+        (append result (list (point)))))))
+
+(defun markdown-get-defined-footnotes ()
+  "Return a list of all defined footnotes.
+Result is an alist of pairs (MARKER . LINE), where MARKER is the
+footnote marker, a string, and LINE is the line number containing
+the footnote definition.
+
+For example, suppose the following footnotes are defined at positions
+448 and 475:
+
+\[^1]: First footnote here.
+\[^marker]: Second footnote.
+
+Then the returned list is: ((\"^1\" . 478) (\"^marker\" . 475))"
+  (save-excursion
+    (goto-char (point-min))
+    (let (footnotes)
+      (while (markdown-search-until-condition
+              (lambda () (and (not (markdown-code-block-at-point-p))
+                              (not (markdown-inline-code-at-point-p))
+                              (not (markdown-in-comment-p))))
+              markdown-regex-footnote-definition nil t)
+        (let ((marker (match-string-no-properties 1))
+              (pos (match-beginning 0)))
+          (unless (zerop (length marker))
+            (cl-pushnew (cons marker pos) footnotes :test #'equal))))
+      (reverse footnotes))))
+
+
+;;; Element Removal ===========================================================
+
+(defun markdown-kill-thing-at-point ()
+  "Kill thing at point and add important text, without markup, to kill ring.
+Possible things to kill include (roughly in order of precedence):
+inline code, headers, horizontal rules, links (add link text to
+kill ring), images (add alt text to kill ring), angle uri, email
+addresses, bold, italics, reference definition (add URI to kill
+ring), footnote markers and text (kill both marker and text, add
+text to kill ring), and list items."
+  (interactive "*")
+  (let (val)
+    (cond
+     ;; Inline code
+     ((markdown-inline-code-at-point)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; ATX header
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Setext header
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (kill-new (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Horizontal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (kill-new (match-string 0))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Inline link or image (add link or alt text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-link-inline)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Reference link or image (add link or alt text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-link-reference)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Angle URI (add URL to kill ring)
+     ((thing-at-point-looking-at markdown-regex-angle-uri)
+      (kill-new (match-string 2))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Email address in angle brackets (add email address to kill ring)
+     ((thing-at-point-looking-at markdown-regex-email)
+      (kill-new (match-string 1))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; Wiki link (add alias text to kill ring)
+     ((and markdown-enable-wiki-links
+           (thing-at-point-looking-at markdown-regex-wiki-link))
+      (kill-new (markdown-wiki-link-alias))
+      (delete-region (match-beginning 1) (match-end 1)))
+     ;; Bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (kill-new (match-string 4))
+      (delete-region (match-beginning 2) (match-end 2)))
+     ;; Italics
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (kill-new (match-string 3))
+      (delete-region (match-beginning 1) (match-end 1)))
+     ;; Strikethrough
+     ((thing-at-point-looking-at markdown-regex-strike-through)
+      (kill-new (match-string 4))
+      (delete-region (match-beginning 2) (match-end 2)))
+     ;; Footnote marker (add footnote text to kill ring)
+     ((thing-at-point-looking-at markdown-regex-footnote)
+      (markdown-footnote-kill))
+     ;; Footnote text (add footnote text to kill ring)
+     ((setq val (markdown-footnote-text-positions))
+      (markdown-footnote-kill))
+     ;; Reference definition (add URL to kill ring)
+     ((thing-at-point-looking-at markdown-regex-reference-definition)
+      (kill-new (match-string 5))
+      (delete-region (match-beginning 0) (match-end 0)))
+     ;; List item
+     ((setq val (markdown-cur-list-item-bounds))
+      (kill-new (delete-and-extract-region (cl-first val) (cl-second val))))
+     (t
+      (user-error "Nothing found at point to kill")))))
+
+(defun markdown-kill-outline ()
+  "Kill visible heading and add it to `kill-ring'."
+  (interactive)
+  (save-excursion
+    (markdown-outline-previous)
+    (kill-region (point) (progn (markdown-outline-next) (point)))))
+
+(defun markdown-kill-block ()
+  "Kill visible code block, list item, or blockquote and add it to `kill-ring'."
+  (interactive)
+  (save-excursion
+    (markdown-backward-block)
+    (kill-region (point) (progn (markdown-forward-block) (point)))))
+
+
+;;; Indentation ===============================================================
+
+(defun markdown-indent-find-next-position (cur-pos positions)
+  "Return the position after the index of CUR-POS in POSITIONS.
+Positions are calculated by `markdown-calc-indents'."
+  (while (and positions
+              (not (equal cur-pos (car positions))))
+    (setq positions (cdr positions)))
+  (or (cadr positions) 0))
+
+(defun markdown-outdent-find-next-position (cur-pos positions)
+  "Return the maximal element that precedes CUR-POS from POSITIONS.
+Positions are calculated by `markdown-calc-indents'."
+  (let ((result 0))
+    (dolist (i positions)
+      (when (< i cur-pos)
+        (setq result (max result i))))
+    result))
+
+(defun markdown-indent-line ()
+  "Indent the current line using some heuristics.
+If the _previous_ command was either `markdown-enter-key' or
+`markdown-cycle', then we should cycle to the next
+reasonable indentation position.  Otherwise, we could have been
+called directly by `markdown-enter-key', by an initial call of
+`markdown-cycle', or indirectly by `auto-fill-mode'.  In
+these cases, indent to the default position.
+Positions are calculated by `markdown-calc-indents'."
+  (interactive)
+  (let ((positions (markdown-calc-indents))
+        (point-pos (current-column))
+        (_ (back-to-indentation))
+        (cur-pos (current-column)))
+    (if (not (equal this-command 'markdown-cycle))
+        (indent-line-to (car positions))
+      (setq positions (sort (delete-dups positions) '<))
+      (let* ((next-pos (markdown-indent-find-next-position cur-pos positions))
+             (new-point-pos (max (+ point-pos (- next-pos cur-pos)) 0)))
+        (indent-line-to next-pos)
+        (move-to-column new-point-pos)))))
+
+(defun markdown-calc-indents ()
+  "Return a list of indentation columns to cycle through.
+The first element in the returned list should be considered the
+default indentation level.  This function does not worry about
+duplicate positions, which are handled up by calling functions."
+  (let (pos prev-line-pos positions)
+
+    ;; Indentation of previous line
+    (setq prev-line-pos (markdown-prev-line-indent))
+    (setq positions (cons prev-line-pos positions))
+
+    ;; Indentation of previous non-list-marker text
+    (when (setq pos (save-excursion
+                      (forward-line -1)
+                      (when (looking-at markdown-regex-list)
+                        (- (match-end 3) (match-beginning 0)))))
+      (setq positions (cons pos positions)))
+
+    ;; Indentation required for a pre block in current context
+    (setq pos (length (markdown-pre-indentation (point))))
+    (setq positions (cons pos positions))
+
+    ;; Indentation of the previous line + tab-width
+    (if prev-line-pos
+        (setq positions (cons (+ prev-line-pos tab-width) positions))
+      (setq positions (cons tab-width positions)))
+
+    ;; Indentation of the previous line - tab-width
+    (if (and prev-line-pos (> prev-line-pos tab-width))
+        (setq positions (cons (- prev-line-pos tab-width) positions)))
+
+    ;; Indentation of all preceding list markers (when in a list)
+    (when (setq pos (markdown-calculate-list-levels))
+      (setq positions (append pos positions)))
+
+    ;; First column
+    (setq positions (cons 0 positions))
+
+    ;; Return reversed list
+    (reverse positions)))
+
+(defun markdown-enter-key ()        ;FIXME: Partly obsoleted by electric-indent
+  "Handle RET depending on the context.
+If the point is at a table, move to the next row.  Otherwise,
+indent according to value of `markdown-indent-on-enter'.
+When it is nil, simply call `newline'.  Otherwise, indent the next line
+following RET using `markdown-indent-line'.  Furthermore, when it
+is set to \\='indent-and-new-item and the point is in a list item,
+start a new item with the same indentation. If the point is in an
+empty list item, remove it (so that pressing RET twice when in a
+list simply adds a blank line)."
+  (interactive)
+  (cond
+   ;; Table
+   ((markdown-table-at-point-p)
+    (call-interactively #'markdown-table-next-row))
+   ;; Indent non-table text
+   (markdown-indent-on-enter
+    (let (bounds)
+      (if (and (memq markdown-indent-on-enter '(indent-and-new-item))
+               (setq bounds (markdown-cur-list-item-bounds)))
+          (let ((beg (cl-first bounds))
+                (end (cl-second bounds))
+                (nonlist-indent (cl-fourth bounds))
+                (checkbox (cl-sixth bounds)))
+            ;; Point is in a list item
+            (if (= (- end beg) (+ nonlist-indent (length checkbox)))
+                ;; Delete blank list
+                (progn
+                  (delete-region beg end)
+                  (newline)
+                  (markdown-indent-line))
+              (call-interactively #'markdown-insert-list-item)))
+        ;; Point is not in a list
+        (newline)
+        (markdown-indent-line))))
+   ;; Insert a raw newline
+   (t (newline))))
+
+(defun markdown-outdent-or-delete (arg)
+  "Handle BACKSPACE by cycling through indentation points.
+When BACKSPACE is pressed, if there is only whitespace
+before the current point, then outdent the line one level.
+Otherwise, do normal delete by repeating
+`backward-delete-char-untabify' ARG times."
+  (interactive "*p")
+  (if (use-region-p)
+      (backward-delete-char-untabify arg)
+    (let ((cur-pos (current-column))
+          (start-of-indention (save-excursion
+                                (back-to-indentation)
+                                (current-column)))
+          (positions (markdown-calc-indents)))
+      (if (and (> cur-pos 0) (= cur-pos start-of-indention))
+          (indent-line-to (markdown-outdent-find-next-position cur-pos positions))
+        (backward-delete-char-untabify arg)))))
+
+(defun markdown-find-leftmost-column (beg end)
+  "Find the leftmost column in the region from BEG to END."
+  (let ((mincol 1000))
+    (save-excursion
+      (goto-char beg)
+      (while (< (point) end)
+        (back-to-indentation)
+        (unless (looking-at-p "[ \t]*$")
+          (setq mincol (min mincol (current-column))))
+        (forward-line 1)
+        ))
+    mincol))
+
+(defun markdown-indent-region (beg end arg)
+  "Indent the region from BEG to END using some heuristics.
+When ARG is non-nil, outdent the region instead.
+See `markdown-indent-line' and `markdown-indent-line'."
+  (interactive "*r\nP")
+  (let* ((positions (sort (delete-dups (markdown-calc-indents)) '<))
+         (leftmostcol (markdown-find-leftmost-column beg end))
+         (next-pos (if arg
+                       (markdown-outdent-find-next-position leftmostcol positions)
+                     (markdown-indent-find-next-position leftmostcol positions))))
+    (indent-rigidly beg end (- next-pos leftmostcol))
+    (setq deactivate-mark nil)))
+
+(defun markdown-outdent-region (beg end)
+  "Call `markdown-indent-region' on region from BEG to END with prefix."
+  (interactive "*r")
+  (markdown-indent-region beg end t))
+
+(defun markdown--indent-region (start end)
+  (let ((deactivate-mark nil))
+    (save-excursion
+      (goto-char end)
+      (setq end (point-marker))
+      (goto-char start)
+      (when (bolp)
+        (forward-line 1))
+      (while (< (point) end)
+        (unless (or (markdown-code-block-at-point-p) (and (bolp) (eolp)))
+          (indent-according-to-mode))
+        (forward-line 1))
+      (move-marker end nil))))
+
+
+;;; Markup Completion =========================================================
+
+(defconst markdown-complete-alist
+  '((markdown-regex-header-atx . markdown-complete-atx)
+    (markdown-regex-header-setext . markdown-complete-setext)
+    (markdown-regex-hr . markdown-complete-hr))
+  "Association list of form (regexp . function) for markup completion.")
+
+(defun markdown-incomplete-atx-p ()
+  "Return t if ATX header markup is incomplete and nil otherwise.
+Assumes match data is available for `markdown-regex-header-atx'.
+Checks that the number of trailing hash marks equals the number of leading
+hash marks, that there is only a single space before and after the text,
+and that there is no extraneous whitespace in the text."
+  (or
+   ;; Number of starting and ending hash marks differs
+   (not (= (length (match-string 1)) (length (match-string 3))))
+   ;; When the header text is not empty...
+   (and (> (length (match-string 2)) 0)
+        ;; ...if there are extra leading, trailing, or interior spaces
+        (or (not (= (match-beginning 2) (1+ (match-end 1))))
+            (not (= (match-beginning 3) (1+ (match-end 2))))
+            (string-match-p "[ \t\n]\\{2\\}" (match-string 2))))
+   ;; When the header text is empty...
+   (and (= (length (match-string 2)) 0)
+        ;; ...if there are too many or too few spaces
+        (not (= (match-beginning 3) (+ (match-end 1) 2))))))
+
+(defun markdown-complete-atx ()
+  "Complete and normalize ATX headers.
+Add or remove hash marks to the end of the header to match the
+beginning.  Ensure that there is only a single space between hash
+marks and header text.  Removes extraneous whitespace from header text.
+Assumes match data is available for `markdown-regex-header-atx'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-atx-p)
+    (let* ((new-marker (make-marker))
+           (new-marker (set-marker new-marker (match-end 2))))
+      ;; Hash marks and spacing at end
+      (goto-char (match-end 2))
+      (delete-region (match-end 2) (match-end 3))
+      (insert " " (match-string 1))
+      ;; Remove extraneous whitespace from title
+      (replace-match (markdown-compress-whitespace-string (match-string 2))
+                     t t nil 2)
+      ;; Spacing at beginning
+      (goto-char (match-end 1))
+      (delete-region (match-end 1) (match-beginning 2))
+      (insert " ")
+      ;; Leave point at end of text
+      (goto-char new-marker))))
+
+(defun markdown-incomplete-setext-p ()
+  "Return t if setext header markup is incomplete and nil otherwise.
+Assumes match data is available for `markdown-regex-header-setext'.
+Checks that length of underline matches text and that there is no
+extraneous whitespace in the text."
+  (or (not (= (length (match-string 1)) (length (match-string 2))))
+      (string-match-p "[ \t\n]\\{2\\}" (match-string 1))))
+
+(defun markdown-complete-setext ()
+  "Complete and normalize setext headers.
+Add or remove underline characters to match length of header
+text.  Removes extraneous whitespace from header text.  Assumes
+match data is available for `markdown-regex-header-setext'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-setext-p)
+    (let* ((text (markdown-compress-whitespace-string (match-string 1)))
+           (char (char-after (match-beginning 2)))
+           (level (if (char-equal char ?-) 2 1)))
+      (goto-char (match-beginning 0))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-header level text t)
+      t)))
+
+(defun markdown-incomplete-hr-p ()
+  "Return non-nil if hr is not in `markdown-hr-strings' and nil otherwise.
+Assumes match data is available for `markdown-regex-hr'."
+  (not (member (match-string 0) markdown-hr-strings)))
+
+(defun markdown-complete-hr ()
+  "Complete horizontal rules.
+If horizontal rule string is a member of `markdown-hr-strings',
+do nothing.  Otherwise, replace with the car of
+`markdown-hr-strings'.
+Assumes match data is available for `markdown-regex-hr'.
+Return nil if markup was complete and non-nil if markup was completed."
+  (when (markdown-incomplete-hr-p)
+    (replace-match (car markdown-hr-strings))
+    t))
+
+(defun markdown-complete ()
+  "Complete markup of object near point or in region when active.
+Handle all objects in `markdown-complete-alist', in order.
+See `markdown-complete-at-point' and `markdown-complete-region'."
+  (interactive "*")
+  (if (use-region-p)
+      (markdown-complete-region (region-beginning) (region-end))
+    (markdown-complete-at-point)))
+
+(defun markdown-complete-at-point ()
+  "Complete markup of object near point.
+Handle all elements of `markdown-complete-alist' in order."
+  (interactive "*")
+  (let ((list markdown-complete-alist) found changed)
+    (while list
+      (let ((regexp (eval (caar list) t)) ;FIXME: Why `eval'?
+            (function (cdar list)))
+        (setq list (cdr list))
+        (when (thing-at-point-looking-at regexp)
+          (setq found t)
+          (setq changed (funcall function))
+          (setq list nil))))
+    (if found
+        (or changed (user-error "Markup at point is complete"))
+      (user-error "Nothing to complete at point"))))
+
+(defun markdown-complete-region (beg end)
+  "Complete markup of objects in region from BEG to END.
+Handle all objects in `markdown-complete-alist', in order.  Each
+match is checked to ensure that a previous regexp does not also
+match."
+  (interactive "*r")
+  (let ((end-marker (set-marker (make-marker) end))
+        previous)
+    (dolist (element markdown-complete-alist)
+      (let ((regexp (eval (car element) t)) ;FIXME: Why `eval'?
+            (function (cdr element)))
+        (goto-char beg)
+        (while (re-search-forward regexp end-marker 'limit)
+          (when (match-string 0)
+            ;; Make sure this is not a match for any of the preceding regexps.
+            ;; This prevents mistaking an HR for a Setext subheading.
+            (let (match)
+              (save-match-data
+                (dolist (prev-regexp previous)
+                  (or match (setq match (looking-back prev-regexp nil)))))
+              (unless match
+                (save-excursion (funcall function))))))
+        (cl-pushnew regexp previous :test #'equal)))
+    previous))
+
+(defun markdown-complete-buffer ()
+  "Complete markup for all objects in the current buffer."
+  (interactive "*")
+  (markdown-complete-region (point-min) (point-max)))
+
+
+;;; Markup Cycling ============================================================
+
+(defun markdown-cycle-atx (arg &optional remove)
+  "Cycle ATX header markup.
+Promote header (decrease level) when ARG is 1 and demote
+header (increase level) if arg is -1.  When REMOVE is non-nil,
+remove the header when the level reaches zero and stop cycling
+when it reaches six.  Otherwise, perform a proper cycling through
+levels one through six.  Assumes match data is available for
+`markdown-regex-header-atx'."
+  (let* ((old-level (length (match-string 1)))
+         (new-level (+ old-level arg))
+         (text (match-string 2)))
+    (when (not remove)
+      (setq new-level (% new-level 6))
+      (setq new-level (cond ((= new-level 0) 6)
+                            ((< new-level 0) (+ new-level 6))
+                            (t new-level))))
+    (cond
+     ((= new-level 0)
+      (markdown-unwrap-thing-at-point nil 0 2))
+     ((<= new-level 6)
+      (goto-char (match-beginning 0))
+      (delete-region (match-beginning 0) (match-end 0))
+      (markdown-insert-header new-level text nil)))))
+
+(defun markdown-cycle-setext (arg &optional remove)
+  "Cycle setext header markup.
+Promote header (increase level) when ARG is 1 and demote
+header (decrease level or remove) if arg is -1.  When demoting a
+level-two setext header, replace with a level-three atx header.
+When REMOVE is non-nil, remove the header when the level reaches
+zero.  Otherwise, cycle back to a level six atx header.  Assumes
+match data is available for `markdown-regex-header-setext'."
+  (let* ((char (char-after (match-beginning 2)))
+         (old-level (if (char-equal char ?=) 1 2))
+         (new-level (+ old-level arg)))
+    (when (and (not remove) (= new-level 0))
+      (setq new-level 6))
+    (cond
+     ((= new-level 0)
+      (markdown-unwrap-thing-at-point nil 0 1))
+     ((<= new-level 2)
+      (markdown-insert-header new-level nil t))
+     ((<= new-level 6)
+      (markdown-insert-header new-level nil nil)))))
+
+(defun markdown-cycle-hr (arg &optional remove)
+  "Cycle string used for horizontal rule from `markdown-hr-strings'.
+When ARG is 1, cycle forward (demote), and when ARG is -1, cycle
+backwards (promote).  When REMOVE is non-nil, remove the hr instead
+of cycling when the end of the list is reached.
+Assumes match data is available for `markdown-regex-hr'."
+  (let* ((strings (if (= arg -1)
+                      (reverse markdown-hr-strings)
+                    markdown-hr-strings))
+         (tail (member (match-string 0) strings))
+         (new (or (cadr tail)
+                  (if remove
+                      (if (= arg 1)
+                          ""
+                        (car tail))
+                    (car strings)))))
+    (replace-match new)))
+
+(defun markdown-cycle-bold ()
+  "Cycle bold markup between underscores and asterisks.
+Assumes match data is available for `markdown-regex-bold'."
+  (save-excursion
+    (let* ((old-delim (match-string 3))
+           (new-delim (if (string-equal old-delim "**") "__" "**")))
+      (replace-match new-delim t t nil 3)
+      (replace-match new-delim t t nil 5))))
+
+(defun markdown-cycle-italic ()
+  "Cycle italic markup between underscores and asterisks.
+Assumes match data is available for `markdown-regex-italic'."
+  (save-excursion
+    (let* ((old-delim (match-string 2))
+           (new-delim (if (string-equal old-delim "*") "_" "*")))
+      (replace-match new-delim t t nil 2)
+      (replace-match new-delim t t nil 4))))
+
+
+;;; Keymap ====================================================================
+
+(defun markdown--style-map-prompt ()
+  "Return a formatted prompt for Markdown markup insertion."
+  (when markdown-enable-prefix-prompts
+    (concat
+     "Markdown: "
+     (propertize "bold" 'face 'markdown-bold-face) ", "
+     (propertize "italic" 'face 'markdown-italic-face) ", "
+     (propertize "code" 'face 'markdown-inline-code-face) ", "
+     (propertize "C = GFM code" 'face 'markdown-code-face) ", "
+     (propertize "pre" 'face 'markdown-pre-face) ", "
+     (propertize "footnote" 'face 'markdown-footnote-text-face) ", "
+     (propertize "F = foldable" 'face 'markdown-bold-face) ", "
+     (propertize "q = blockquote" 'face 'markdown-blockquote-face) ", "
+     (propertize "h & 1-6 = heading" 'face 'markdown-header-face) ", "
+     (propertize "- = hr" 'face 'markdown-hr-face) ", "
+     "C-h = more")))
+
+(defun markdown--command-map-prompt ()
+  "Return prompt for Markdown buffer-wide commands."
+  (when markdown-enable-prefix-prompts
+    (concat
+     "Command: "
+     (propertize "m" 'face 'markdown-bold-face) "arkdown, "
+     (propertize "p" 'face 'markdown-bold-face) "review, "
+     (propertize "o" 'face 'markdown-bold-face) "pen, "
+     (propertize "e" 'face 'markdown-bold-face) "xport, "
+     "export & pre" (propertize "v" 'face 'markdown-bold-face) "iew, "
+     (propertize "c" 'face 'markdown-bold-face) "heck refs, "
+     (propertize "u" 'face 'markdown-bold-face) "nused refs, "
+     "C-h = more")))
+
+(defvar markdown-mode-style-map
+  (let ((map (make-keymap (markdown--style-map-prompt))))
+    (define-key map (kbd "1") 'markdown-insert-header-atx-1)
+    (define-key map (kbd "2") 'markdown-insert-header-atx-2)
+    (define-key map (kbd "3") 'markdown-insert-header-atx-3)
+    (define-key map (kbd "4") 'markdown-insert-header-atx-4)
+    (define-key map (kbd "5") 'markdown-insert-header-atx-5)
+    (define-key map (kbd "6") 'markdown-insert-header-atx-6)
+    (define-key map (kbd "!") 'markdown-insert-header-setext-1)
+    (define-key map (kbd "@") 'markdown-insert-header-setext-2)
+    (define-key map (kbd "b") 'markdown-insert-bold)
+    (define-key map (kbd "c") 'markdown-insert-code)
+    (define-key map (kbd "C") 'markdown-insert-gfm-code-block)
+    (define-key map (kbd "f") 'markdown-insert-footnote)
+    (define-key map (kbd "F") 'markdown-insert-foldable-block)
+    (define-key map (kbd "h") 'markdown-insert-header-dwim)
+    (define-key map (kbd "H") 'markdown-insert-header-setext-dwim)
+    (define-key map (kbd "i") 'markdown-insert-italic)
+    (define-key map (kbd "k") 'markdown-insert-kbd)
+    (define-key map (kbd "l") 'markdown-insert-link)
+    (define-key map (kbd "p") 'markdown-insert-pre)
+    (define-key map (kbd "P") 'markdown-pre-region)
+    (define-key map (kbd "q") 'markdown-insert-blockquote)
+    (define-key map (kbd "s") 'markdown-insert-strike-through)
+    (define-key map (kbd "t") 'markdown-insert-table)
+    (define-key map (kbd "Q") 'markdown-blockquote-region)
+    (define-key map (kbd "w") 'markdown-insert-wiki-link)
+    (define-key map (kbd "-") 'markdown-insert-hr)
+    (define-key map (kbd "[") 'markdown-insert-gfm-checkbox)
+    ;; Deprecated keys that may be removed in a future version
+    (define-key map (kbd "e") 'markdown-insert-italic)
+    map)
+  "Keymap for Markdown text styling commands.")
+
+(defvar markdown-mode-command-map
+  (let ((map (make-keymap (markdown--command-map-prompt))))
+    (define-key map (kbd "m") 'markdown-other-window)
+    (define-key map (kbd "p") 'markdown-preview)
+    (define-key map (kbd "e") 'markdown-export)
+    (define-key map (kbd "v") 'markdown-export-and-preview)
+    (define-key map (kbd "o") 'markdown-open)
+    (define-key map (kbd "l") 'markdown-live-preview-mode)
+    (define-key map (kbd "w") 'markdown-kill-ring-save)
+    (define-key map (kbd "c") 'markdown-check-refs)
+    (define-key map (kbd "u") 'markdown-unused-refs)
+    (define-key map (kbd "n") 'markdown-cleanup-list-numbers)
+    (define-key map (kbd "]") 'markdown-complete-buffer)
+    (define-key map (kbd "^") 'markdown-table-sort-lines)
+    (define-key map (kbd "|") 'markdown-table-convert-region)
+    (define-key map (kbd "t") 'markdown-table-transpose)
+    map)
+  "Keymap for Markdown buffer-wide commands.")
+
+(defvar markdown-mode-map
+  (let ((map (make-keymap)))
+    ;; Markup insertion & removal
+    (define-key map (kbd "C-c C-s") markdown-mode-style-map)
+    (define-key map (kbd "C-c C-l") 'markdown-insert-link)
+    (define-key map (kbd "C-c C-k") 'markdown-kill-thing-at-point)
+    ;; Promotion, demotion, and cycling
+    (define-key map (kbd "C-c C--") 'markdown-promote)
+    (define-key map (kbd "C-c C-=") 'markdown-demote)
+    (define-key map (kbd "C-c C-]") 'markdown-complete)
+    ;; Following and doing things
+    (define-key map (kbd "C-c C-o") 'markdown-follow-thing-at-point)
+    (define-key map (kbd "C-c C-d") 'markdown-do)
+    (define-key map (kbd "C-c '") 'markdown-edit-code-block)
+    ;; Indentation
+    (define-key map (kbd "RET") 'markdown-enter-key)
+    (define-key map (kbd "DEL") 'markdown-outdent-or-delete)
+    (define-key map (kbd "C-c >") 'markdown-indent-region)
+    (define-key map (kbd "C-c <") 'markdown-outdent-region)
+    ;; Visibility cycling
+    (define-key map (kbd "TAB") 'markdown-cycle)
+    ;; S-iso-lefttab and S-tab should both be mapped to `backtab' by
+    ;; (local-)function-key-map.
+    ;;(define-key map (kbd "<S-iso-lefttab>") 'markdown-shifttab)
+    ;;(define-key map (kbd "<S-tab>")  'markdown-shifttab)
+    (define-key map (kbd "<backtab>") 'markdown-shifttab)
+    ;; Heading and list navigation
+    (define-key map (kbd "C-c C-n") 'markdown-outline-next)
+    (define-key map (kbd "C-c C-p") 'markdown-outline-previous)
+    (define-key map (kbd "C-c C-f") 'markdown-outline-next-same-level)
+    (define-key map (kbd "C-c C-b") 'markdown-outline-previous-same-level)
+    (define-key map (kbd "C-c C-u") 'markdown-outline-up)
+    ;; Buffer-wide commands
+    (define-key map (kbd "C-c C-c") markdown-mode-command-map)
+    ;; Subtree, list, and table editing
+    (define-key map (kbd "C-c <up>") 'markdown-move-up)
+    (define-key map (kbd "C-c <down>") 'markdown-move-down)
+    (define-key map (kbd "C-c <left>") 'markdown-promote)
+    (define-key map (kbd "C-c <right>") 'markdown-demote)
+    (define-key map (kbd "C-c S-<up>") 'markdown-table-delete-row)
+    (define-key map (kbd "C-c S-<down>") 'markdown-table-insert-row)
+    (define-key map (kbd "C-c S-<left>") 'markdown-table-delete-column)
+    (define-key map (kbd "C-c S-<right>") 'markdown-table-insert-column)
+    (define-key map (kbd "C-c C-M-h") 'markdown-mark-subtree)
+    (define-key map (kbd "C-x n s") 'markdown-narrow-to-subtree)
+    (define-key map (kbd "M-RET") 'markdown-insert-list-item)
+    (define-key map (kbd "C-c C-j") 'markdown-insert-list-item)
+    ;; Lines
+    (define-key map [remap move-beginning-of-line] 'markdown-beginning-of-line)
+    (define-key map [remap move-end-of-line] 'markdown-end-of-line)
+    ;; Paragraphs (Markdown context aware)
+    (define-key map [remap backward-paragraph] 'markdown-backward-paragraph)
+    (define-key map [remap forward-paragraph] 'markdown-forward-paragraph)
+    (define-key map [remap mark-paragraph] 'markdown-mark-paragraph)
+    ;; Blocks (one or more paragraphs)
+    (define-key map (kbd "C-M-{") 'markdown-backward-block)
+    (define-key map (kbd "C-M-}") 'markdown-forward-block)
+    (define-key map (kbd "C-c M-h") 'markdown-mark-block)
+    (define-key map (kbd "C-x n b") 'markdown-narrow-to-block)
+    ;; Pages (top-level sections)
+    (define-key map [remap backward-page] 'markdown-backward-page)
+    (define-key map [remap forward-page] 'markdown-forward-page)
+    (define-key map [remap mark-page] 'markdown-mark-page)
+    (define-key map [remap narrow-to-page] 'markdown-narrow-to-page)
+    ;; Link Movement
+    (define-key map (kbd "M-n") 'markdown-next-link)
+    (define-key map (kbd "M-p") 'markdown-previous-link)
+    ;; Toggling functionality
+    (define-key map (kbd "C-c C-x C-e") 'markdown-toggle-math)
+    (define-key map (kbd "C-c C-x C-f") 'markdown-toggle-fontify-code-blocks-natively)
+    (define-key map (kbd "C-c C-x C-i") 'markdown-toggle-inline-images)
+    (define-key map (kbd "C-c C-x C-l") 'markdown-toggle-url-hiding)
+    (define-key map (kbd "C-c C-x C-m") 'markdown-toggle-markup-hiding)
+    ;; Alternative keys (in case of problems with the arrow keys)
+    (define-key map (kbd "C-c C-x u") 'markdown-move-up)
+    (define-key map (kbd "C-c C-x d") 'markdown-move-down)
+    (define-key map (kbd "C-c C-x l") 'markdown-promote)
+    (define-key map (kbd "C-c C-x r") 'markdown-demote)
+    ;; Deprecated keys that may be removed in a future version
+    (define-key map (kbd "C-c C-a L") 'markdown-insert-link) ;; C-c C-l
+    (define-key map (kbd "C-c C-a l") 'markdown-insert-link) ;; C-c C-l
+    (define-key map (kbd "C-c C-a r") 'markdown-insert-link) ;; C-c C-l
+    (define-key map (kbd "C-c C-a u") 'markdown-insert-uri) ;; C-c C-l
+    (define-key map (kbd "C-c C-a f") 'markdown-insert-footnote)
+    (define-key map (kbd "C-c C-a w") 'markdown-insert-wiki-link)
+    (define-key map (kbd "C-c C-t 1") 'markdown-insert-header-atx-1)
+    (define-key map (kbd "C-c C-t 2") 'markdown-insert-header-atx-2)
+    (define-key map (kbd "C-c C-t 3") 'markdown-insert-header-atx-3)
+    (define-key map (kbd "C-c C-t 4") 'markdown-insert-header-atx-4)
+    (define-key map (kbd "C-c C-t 5") 'markdown-insert-header-atx-5)
+    (define-key map (kbd "C-c C-t 6") 'markdown-insert-header-atx-6)
+    (define-key map (kbd "C-c C-t !") 'markdown-insert-header-setext-1)
+    (define-key map (kbd "C-c C-t @") 'markdown-insert-header-setext-2)
+    (define-key map (kbd "C-c C-t h") 'markdown-insert-header-dwim)
+    (define-key map (kbd "C-c C-t H") 'markdown-insert-header-setext-dwim)
+    (define-key map (kbd "C-c C-t s") 'markdown-insert-header-setext-2)
+    (define-key map (kbd "C-c C-t t") 'markdown-insert-header-setext-1)
+    (define-key map (kbd "C-c C-i") 'markdown-insert-image)
+    (define-key map (kbd "C-c C-x m") 'markdown-insert-list-item) ;; C-c C-j
+    (define-key map (kbd "C-c C-x C-x") 'markdown-toggle-gfm-checkbox) ;; C-c C-d
+    (define-key map (kbd "C-c -") 'markdown-insert-hr)
+    map)
+  "Keymap for Markdown major mode.")
+
+(defvar markdown-mode-mouse-map
+  (when markdown-mouse-follow-link
+    (let ((map (make-sparse-keymap)))
+      (define-key map [follow-link] 'mouse-face)
+      (define-key map [mouse-2] #'markdown-follow-thing-at-point)
+      map))
+  "Keymap for following links with mouse.")
+
+(defvar gfm-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map markdown-mode-map)
+    (define-key map (kbd "C-c C-s d") 'markdown-insert-strike-through)
+    (define-key map "`" 'markdown-electric-backquote)
+    map)
+  "Keymap for `gfm-mode'.
+See also `markdown-mode-map'.")
+
+
+;;; Menu ======================================================================
+
+(easy-menu-define markdown-mode-menu markdown-mode-map
+  "Menu for Markdown mode."
+  '("Markdown"
+    "---"
+    ("Movement"
+     ["Jump" markdown-do]
+     ["Follow Link" markdown-follow-thing-at-point]
+     ["Next Link" markdown-next-link]
+     ["Previous Link" markdown-previous-link]
+     "---"
+     ["Next Heading or List Item" markdown-outline-next]
+     ["Previous Heading or List Item" markdown-outline-previous]
+     ["Next at Same Level" markdown-outline-next-same-level]
+     ["Previous at Same Level" markdown-outline-previous-same-level]
+     ["Up to Parent" markdown-outline-up]
+     "---"
+     ["Forward Paragraph" markdown-forward-paragraph]
+     ["Backward Paragraph" markdown-backward-paragraph]
+     ["Forward Block" markdown-forward-block]
+     ["Backward Block" markdown-backward-block])
+    ("Show & Hide"
+     ["Cycle Heading Visibility" markdown-cycle
+      :enable (markdown-on-heading-p)]
+     ["Cycle Heading Visibility (Global)" markdown-shifttab]
+     "---"
+     ["Narrow to Region" narrow-to-region]
+     ["Narrow to Block" markdown-narrow-to-block]
+     ["Narrow to Section" narrow-to-defun]
+     ["Narrow to Subtree" markdown-narrow-to-subtree]
+     ["Widen" widen (buffer-narrowed-p)]
+     "---"
+     ["Toggle Markup Hiding" markdown-toggle-markup-hiding
+      :keys "C-c C-x C-m"
+      :style radio
+      :selected markdown-hide-markup])
+    "---"
+    ("Headings & Structure"
+     ["Automatic Heading" markdown-insert-header-dwim
+      :keys "C-c C-s h"]
+     ["Automatic Heading (Setext)" markdown-insert-header-setext-dwim
+      :keys "C-c C-s H"]
+     ("Specific Heading (atx)"
+      ["First Level atx" markdown-insert-header-atx-1
+       :keys "C-c C-s 1"]
+      ["Second Level atx" markdown-insert-header-atx-2
+       :keys "C-c C-s 2"]
+      ["Third Level atx" markdown-insert-header-atx-3
+       :keys "C-c C-s 3"]
+      ["Fourth Level atx" markdown-insert-header-atx-4
+       :keys "C-c C-s 4"]
+      ["Fifth Level atx" markdown-insert-header-atx-5
+       :keys "C-c C-s 5"]
+      ["Sixth Level atx" markdown-insert-header-atx-6
+       :keys "C-c C-s 6"])
+     ("Specific Heading (Setext)"
+      ["First Level Setext" markdown-insert-header-setext-1
+       :keys "C-c C-s !"]
+      ["Second Level Setext" markdown-insert-header-setext-2
+       :keys "C-c C-s @"])
+     ["Horizontal Rule" markdown-insert-hr
+      :keys "C-c C-s -"]
+     "---"
+     ["Move Subtree Up" markdown-move-up
+      :keys "C-c <up>"]
+     ["Move Subtree Down" markdown-move-down
+      :keys "C-c <down>"]
+     ["Promote Subtree" markdown-promote
+      :keys "C-c <left>"]
+     ["Demote Subtree" markdown-demote
+      :keys "C-c <right>"])
+    ("Region & Mark"
+     ["Indent Region" markdown-indent-region]
+     ["Outdent Region" markdown-outdent-region]
+     "--"
+     ["Mark Paragraph" mark-paragraph]
+     ["Mark Block" markdown-mark-block]
+     ["Mark Section" mark-defun]
+     ["Mark Subtree" markdown-mark-subtree])
+    ("Tables"
+     ["Move Row Up" markdown-move-up
+      :enable (markdown-table-at-point-p)
+      :keys "C-c <up>"]
+     ["Move Row Down" markdown-move-down
+      :enable (markdown-table-at-point-p)
+      :keys "C-c <down>"]
+     ["Move Column Left" markdown-promote
+      :enable (markdown-table-at-point-p)
+      :keys "C-c <left>"]
+     ["Move Column Right" markdown-demote
+      :enable (markdown-table-at-point-p)
+      :keys "C-c <right>"]
+     ["Delete Row" markdown-table-delete-row
+      :enable (markdown-table-at-point-p)]
+     ["Insert Row" markdown-table-insert-row
+      :enable (markdown-table-at-point-p)]
+     ["Delete Column" markdown-table-delete-column
+      :enable (markdown-table-at-point-p)]
+     ["Insert Column" markdown-table-insert-column
+      :enable (markdown-table-at-point-p)]
+     ["Insert Table" markdown-insert-table]
+     "--"
+     ["Convert Region to Table" markdown-table-convert-region]
+     ["Sort Table Lines" markdown-table-sort-lines
+      :enable (markdown-table-at-point-p)]
+     ["Transpose Table" markdown-table-transpose
+      :enable (markdown-table-at-point-p)])
+    ("Lists"
+     ["Insert List Item" markdown-insert-list-item]
+     ["Move Subtree Up" markdown-move-up
+      :keys "C-c <up>"]
+     ["Move Subtree Down" markdown-move-down
+      :keys "C-c <down>"]
+     ["Indent Subtree" markdown-demote
+      :keys "C-c <right>"]
+     ["Outdent Subtree" markdown-promote
+      :keys "C-c <left>"]
+     ["Renumber List" markdown-cleanup-list-numbers]
+     ["Insert Task List Item" markdown-insert-gfm-checkbox
+      :keys "C-c C-x ["]
+     ["Toggle Task List Item" markdown-toggle-gfm-checkbox
+      :enable (markdown-gfm-task-list-item-at-point)
+      :keys "C-c C-d"])
+    ("Links & Images"
+     ["Insert Link" markdown-insert-link]
+     ["Insert Image" markdown-insert-image]
+     ["Insert Footnote" markdown-insert-footnote
+      :keys "C-c C-s f"]
+     ["Insert Wiki Link" markdown-insert-wiki-link
+      :keys "C-c C-s w"]
+     "---"
+     ["Check References" markdown-check-refs]
+     ["Find Unused References" markdown-unused-refs]
+     ["Toggle URL Hiding" markdown-toggle-url-hiding
+      :style radio
+      :selected markdown-hide-urls]
+     ["Toggle Inline Images" markdown-toggle-inline-images
+      :keys "C-c C-x C-i"
+      :style radio
+      :selected markdown-inline-image-overlays]
+     ["Toggle Wiki Links" markdown-toggle-wiki-links
+      :style radio
+      :selected markdown-enable-wiki-links])
+    ("Styles"
+     ["Bold" markdown-insert-bold]
+     ["Italic" markdown-insert-italic]
+     ["Code" markdown-insert-code]
+     ["Strikethrough" markdown-insert-strike-through]
+     ["Keyboard" markdown-insert-kbd]
+     "---"
+     ["Blockquote" markdown-insert-blockquote]
+     ["Preformatted" markdown-insert-pre]
+     ["GFM Code Block" markdown-insert-gfm-code-block]
+     ["Edit Code Block" markdown-edit-code-block
+      :enable (markdown-code-block-at-point-p)]
+     ["Foldable Block" markdown-insert-foldable-block]
+     "---"
+     ["Blockquote Region" markdown-blockquote-region]
+     ["Preformatted Region" markdown-pre-region]
+     "---"
+     ["Fontify Code Blocks Natively"
+      markdown-toggle-fontify-code-blocks-natively
+      :style radio
+      :selected markdown-fontify-code-blocks-natively]
+     ["LaTeX Math Support" markdown-toggle-math
+      :style radio
+      :selected markdown-enable-math])
+    "---"
+    ("Preview & Export"
+     ["Compile" markdown-other-window]
+     ["Preview" markdown-preview]
+     ["Export" markdown-export]
+     ["Export & View" markdown-export-and-preview]
+     ["Open" markdown-open]
+     ["Live Export" markdown-live-preview-mode
+      :style radio
+      :selected markdown-live-preview-mode]
+     ["Kill ring save" markdown-kill-ring-save])
+    ("Markup Completion and Cycling"
+     ["Complete Markup" markdown-complete]
+     ["Promote Element" markdown-promote
+      :keys "C-c C--"]
+     ["Demote Element" markdown-demote
+      :keys "C-c C-="])
+    "---"
+    ["Kill Element" markdown-kill-thing-at-point]
+    "---"
+    ("Documentation"
+     ["Version" markdown-show-version]
+     ["Homepage" markdown-mode-info]
+     ["Describe Mode" (describe-function 'markdown-mode)]
+     ["Guide" (browse-url "https://leanpub.com/markdown-mode")])))
+
+
+;;; imenu =====================================================================
+
+(defun markdown-imenu-create-nested-index ()
+  "Create and return a nested imenu index alist for the current buffer.
+See `imenu-create-index-function' and `imenu--index-alist' for details."
+  (let* ((root (list nil))
+         (min-level 9999)
+         hashes headers)
+    (save-excursion
+      ;; Headings
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-header (point-max) t)
+        (unless (or (markdown-code-block-at-point-p)
+                    (and (match-beginning 3)
+                         (get-text-property (match-beginning 3) 'markdown-yaml-metadata-end)))
+          (cond
+           ((match-string-no-properties 2) ;; level 1 setext
+            (setq min-level 1)
+            (push (list :heading (match-string-no-properties 1)
+                        :point (match-beginning 1)
+                        :level 1) headers))
+           ((match-string-no-properties 3) ;; level 2 setext
+            (setq min-level (min min-level 2))
+            (push (list :heading (match-string-no-properties 1)
+                        :point (match-beginning 1)
+                        :level (- 2 (1- min-level))) headers))
+           ((setq hashes (markdown-trim-whitespace
+                          (match-string-no-properties 4)))
+            (setq min-level (min min-level (length hashes)))
+            (push (list :heading (match-string-no-properties 5)
+                        :point (match-beginning 4)
+                        :level (- (length hashes) (1- min-level))) headers)))))
+      (cl-loop with cur-level = 0
+               with cur-alist = nil
+               with empty-heading = "-"
+               with self-heading = "."
+               for header in (reverse headers)
+               for level = (plist-get header :level)
+               do
+               (let ((alist (list (cons (plist-get header :heading) (plist-get header :point)))))
+                 (cond
+                  ((= cur-level level)  ; new sibling
+                   (setcdr cur-alist alist)
+                   (setq cur-alist alist))
+                  ((< cur-level level)  ; first child
+                   (dotimes (_ (- level cur-level 1))
+                     (setq alist (list (cons empty-heading alist))))
+                   (if cur-alist
+                       (let* ((parent (car cur-alist))
+                              (self-pos (cdr parent)))
+                         (setcdr parent (cons (cons self-heading self-pos) alist)))
+                     (setcdr root alist)) ; primogenitor
+                   (setq cur-alist alist)
+                   (setq cur-level level))
+                  (t                    ; new sibling of an ancestor
+                   (let ((sibling-alist (last (cdr root))))
+                     (dotimes (_ (1- level))
+                       (setq sibling-alist (last (cdar sibling-alist))))
+                     (setcdr sibling-alist alist)
+                     (setq cur-alist alist))
+                   (setq cur-level level)))))
+      (setq root (copy-tree root))
+      ;; Footnotes
+      (let ((fn (markdown-get-defined-footnotes)))
+        (if (or (zerop (length fn))
+                (null markdown-add-footnotes-to-imenu))
+            (cdr root)
+          (nconc (cdr root) (list (cons "Footnotes" fn))))))))
+
+(defun markdown-imenu-create-flat-index ()
+  "Create and return a flat imenu index alist for the current buffer.
+See `imenu-create-index-function' and `imenu--index-alist' for details."
+  (let* ((empty-heading "-") index heading pos)
+    (save-excursion
+      ;; Headings
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-header (point-max) t)
+        (when (and (not (markdown-code-block-at-point-p (line-beginning-position)))
+                   (not (markdown-text-property-at-point 'markdown-yaml-metadata-begin)))
+          (cond
+           ((setq heading (match-string-no-properties 1))
+            (setq pos (match-beginning 1)))
+           ((setq heading (match-string-no-properties 5))
+            (setq pos (match-beginning 4))))
+          (or (> (length heading) 0)
+              (setq heading empty-heading))
+          (setq index (append index (list (cons heading pos))))))
+      ;; Footnotes
+      (when markdown-add-footnotes-to-imenu
+        (nconc index (markdown-get-defined-footnotes)))
+      index)))
+
+
+;;; References ================================================================
+
+(defun markdown-reference-goto-definition ()
+  "Jump to the definition of the reference at point or create it."
+  (interactive)
+  (when (thing-at-point-looking-at markdown-regex-link-reference)
+    (let* ((text (match-string-no-properties 3))
+           (reference (match-string-no-properties 6))
+           (target (downcase (if (string= reference "") text reference)))
+           (loc (cadr (save-match-data (markdown-reference-definition target)))))
+      (if loc
+          (goto-char loc)
+        (goto-char (match-beginning 0))
+        (markdown-insert-reference-definition target)))))
+
+(defun markdown-reference-find-links (reference)
+  "Return a list of all links for REFERENCE.
+REFERENCE should not include the surrounding square brackets.
+Elements of the list have the form (text start line), where
+text is the link text, start is the location at the beginning of
+the link, and line is the line number on which the link appears."
+  (let* ((ref-quote (regexp-quote reference))
+         (regexp (format "!?\\(?:\\[\\(%s\\)\\][ ]?\\[\\]\\|\\[\\([^]]+?\\)\\][ ]?\\[%s\\]\\)"
+                         ref-quote ref-quote))
+         links)
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward regexp nil t)
+        (let* ((text (or (match-string-no-properties 1)
+                         (match-string-no-properties 2)))
+               (start (match-beginning 0))
+               (line (markdown-line-number-at-pos)))
+          (cl-pushnew (list text start line) links :test #'equal))))
+    links))
+
+(defmacro markdown-for-all-refs (f)
+  `(let ((result))
+     (save-excursion
+       (goto-char (point-min))
+       (while
+           (re-search-forward markdown-regex-link-reference nil t)
+         (let* ((text (match-string-no-properties 3))
+                (reference (match-string-no-properties 6))
+                (target (downcase (if (string= reference "") text reference))))
+           (,f text target result))))
+     (reverse result)))
+
+(defmacro markdown-collect-always (_ target result)
+  `(cl-pushnew ,target ,result :test #'equal))
+
+(defmacro markdown-collect-undefined (text target result)
+  `(unless (markdown-reference-definition target)
+     (let ((entry (assoc ,target ,result)))
+       (if (not entry)
+           (cl-pushnew
+            (cons ,target (list (cons ,text (markdown-line-number-at-pos))))
+            ,result :test #'equal)
+         (setcdr entry
+                 (append (cdr entry) (list (cons ,text (markdown-line-number-at-pos)))))))))
+
+(defun markdown-get-all-refs ()
+  "Return a list of all Markdown references."
+  (markdown-for-all-refs markdown-collect-always))
+
+(defun markdown-get-undefined-refs ()
+  "Return a list of undefined Markdown references.
+Result is an alist of pairs (reference . occurrences), where
+occurrences is itself another alist of pairs (label . line-number).
+For example, an alist corresponding to [Nice editor][Emacs] at line 12,
+\[GNU Emacs][Emacs] at line 45 and [manual][elisp] at line 127 is
+\((\"emacs\" (\"Nice editor\" . 12) (\"GNU Emacs\" . 45)) (\"elisp\" (\"manual\" . 127)))."
+  (markdown-for-all-refs markdown-collect-undefined))
+
+(defun markdown-get-unused-refs ()
+  (cl-sort
+   (cl-set-difference
+    (markdown-get-defined-references) (markdown-get-all-refs)
+    :test (lambda (e1 e2) (equal (car e1) e2)))
+   #'< :key #'cdr))
+
+(defmacro defun-markdown-buffer (name docstring)
+  "Define a function to name and return a buffer.
+
+By convention, NAME must be a name of a string constant with
+%buffer% placeholder used to name the buffer, and will also be
+used as a name of the function defined.
+
+DOCSTRING will be used as the first part of the docstring."
+  `(defun ,name (&optional buffer-name)
+     ,(concat docstring "\n\nBUFFER-NAME is the name of the main buffer being visited.")
+     (or buffer-name (setq buffer-name (buffer-name)))
+     (let ((refbuf (get-buffer-create (replace-regexp-in-string
+                                       "%buffer%" buffer-name
+                                       ,name))))
+       (with-current-buffer refbuf
+         (when view-mode
+           (View-exit-and-edit))
+         (use-local-map button-buffer-map)
+         (erase-buffer))
+       refbuf)))
+
+(defconst markdown-reference-check-buffer
+  "*Undefined references for %buffer%*"
+  "Pattern for name of buffer for listing undefined references.
+The string %buffer% will be replaced by the corresponding
+`markdown-mode' buffer name.")
+
+(defun-markdown-buffer
+  markdown-reference-check-buffer
+  "Name and return buffer for reference checking.")
+
+(defconst markdown-unused-references-buffer
+  "*Unused references for %buffer%*"
+  "Pattern for name of buffer for listing unused references.
+The string %buffer% will be replaced by the corresponding
+`markdown-mode' buffer name.")
+
+(defun-markdown-buffer
+  markdown-unused-references-buffer
+  "Name and return buffer for unused reference checking.")
+
+(defconst markdown-reference-links-buffer
+  "*Reference links for %buffer%*"
+  "Pattern for name of buffer for listing references.
+The string %buffer% will be replaced by the corresponding buffer name.")
+
+(defun-markdown-buffer
+  markdown-reference-links-buffer
+  "Name, setup, and return a buffer for listing links.")
+
+;; Add an empty Markdown reference definition to buffer
+;; specified in the 'target-buffer property.  The reference name is
+;; the button's label.
+(define-button-type 'markdown-undefined-reference-button
+  'help-echo "mouse-1, RET: create definition for undefined reference"
+  'follow-link t
+  'face 'bold
+  'action (lambda (b)
+            (let ((buffer (button-get b 'target-buffer))
+                  (line (button-get b 'target-line))
+                  (label (button-label b)))
+              (switch-to-buffer-other-window buffer)
+              (goto-char (point-min))
+              (forward-line line)
+              (markdown-insert-reference-definition label)
+              (markdown-check-refs t))))
+
+;; Jump to line in buffer specified by 'target-buffer property.
+;; Line number is button's 'target-line property.
+(define-button-type 'markdown-goto-line-button
+  'help-echo "mouse-1, RET: go to line"
+  'follow-link t
+  'face 'italic
+  'action (lambda (b)
+            (switch-to-buffer-other-window (button-get b 'target-buffer))
+            ;; use call-interactively to silence compiler
+            (let ((current-prefix-arg (button-get b 'target-line)))
+              (call-interactively 'goto-line))))
+
+;; Kill a line in buffer specified by 'target-buffer property.
+;; Line number is button's 'target-line property.
+(define-button-type 'markdown-kill-line-button
+  'help-echo "mouse-1, RET: kill line"
+  'follow-link t
+  'face 'italic
+  'action (lambda (b)
+            (switch-to-buffer-other-window (button-get b 'target-buffer))
+            ;; use call-interactively to silence compiler
+            (let ((current-prefix-arg (button-get b 'target-line)))
+              (call-interactively 'goto-line))
+            (kill-line 1)
+            (markdown-unused-refs t)))
+
+;; Jumps to a particular link at location given by 'target-char
+;; property in buffer given by 'target-buffer property.
+(define-button-type 'markdown-location-button
+  'help-echo "mouse-1, RET: jump to location of link"
+  'follow-link t
+  'face 'bold
+  'action (lambda (b)
+            (let ((target (button-get b 'target-buffer))
+                  (loc (button-get b 'target-char)))
+              (kill-buffer-and-window)
+              (switch-to-buffer target)
+              (goto-char loc))))
+
+(defun markdown-insert-undefined-reference-button (reference oldbuf)
+  "Insert a button for creating REFERENCE in buffer OLDBUF.
+REFERENCE should be a list of the form (reference . occurrences),
+as returned by `markdown-get-undefined-refs'."
+  (let ((label (car reference)))
+    ;; Create a reference button
+    (insert-button label
+                   :type 'markdown-undefined-reference-button
+                   'target-buffer oldbuf
+                   'target-line (cdr (car (cdr reference))))
+    (insert " (")
+    (dolist (occurrence (cdr reference))
+      (let ((line (cdr occurrence)))
+        ;; Create a line number button
+        (insert-button (number-to-string line)
+                       :type 'markdown-goto-line-button
+                       'target-buffer oldbuf
+                       'target-line line)
+        (insert " ")))
+    (delete-char -1)
+    (insert ")")
+    (newline)))
+
+(defun markdown-insert-unused-reference-button (reference oldbuf)
+  "Insert a button for creating REFERENCE in buffer OLDBUF.
+REFERENCE must be a pair of (ref . line-number)."
+  (let ((label (car reference))
+        (line (cdr reference)))
+    ;; Create a reference button
+    (insert-button label
+                   :type 'markdown-goto-line-button
+                   'face 'bold
+                   'target-buffer oldbuf
+                   'target-line line)
+    (insert (format " (%d) [" line))
+    (insert-button "X"
+                   :type 'markdown-kill-line-button
+                   'face 'bold
+                   'target-buffer oldbuf
+                   'target-line line)
+    (insert "]")
+    (newline)))
+
+(defun markdown-insert-link-button (link oldbuf)
+  "Insert a button for jumping to LINK in buffer OLDBUF.
+LINK should be a list of the form (text char line) containing
+the link text, location, and line number."
+  (let ((label (cl-first link))
+        (char (cl-second link))
+        (line (cl-third link)))
+    ;; Create a reference button
+    (insert-button label
+                   :type 'markdown-location-button
+                   'target-buffer oldbuf
+                   'target-char char)
+    (insert (format " (line %d)\n" line))))
+
+(defun markdown-reference-goto-link (&optional reference)
+  "Jump to the location of the first use of REFERENCE."
+  (interactive)
+  (unless reference
+    (if (thing-at-point-looking-at markdown-regex-reference-definition)
+        (setq reference (match-string-no-properties 2))
+      (user-error "No reference definition at point")))
+  (let ((links (markdown-reference-find-links reference)))
+    (cond ((= (length links) 1)
+           (goto-char (cadr (car links))))
+          ((> (length links) 1)
+           (let ((oldbuf (current-buffer))
+                 (linkbuf (markdown-reference-links-buffer)))
+             (with-current-buffer linkbuf
+               (insert "Links using reference " reference ":\n\n")
+               (dolist (link (reverse links))
+                 (markdown-insert-link-button link oldbuf)))
+             (view-buffer-other-window linkbuf)
+             (goto-char (point-min))
+             (forward-line 2)))
+          (t
+           (error "No links for reference %s" reference)))))
+
+(defmacro defun-markdown-ref-checker
+    (name docstring checker-function buffer-function none-message buffer-header insert-reference)
+  "Define a function NAME acting on result of CHECKER-FUNCTION.
+
+DOCSTRING is used as a docstring for the defined function.
+
+BUFFER-FUNCTION should name and return an auxiliary buffer to put
+results in.
+
+NONE-MESSAGE is used when CHECKER-FUNCTION returns no results.
+
+BUFFER-HEADER is put into the auxiliary buffer first, followed by
+calling INSERT-REFERENCE for each element in the list returned by
+CHECKER-FUNCTION."
+  `(defun ,name (&optional silent)
+     ,(concat
+       docstring
+       "\n\nIf SILENT is non-nil, do not message anything when no
+such references found.")
+     (interactive "P")
+     (unless (derived-mode-p 'markdown-mode)
+       (user-error "Not available in current mode"))
+     (let ((oldbuf (current-buffer))
+           (refs (,checker-function))
+           (refbuf (,buffer-function)))
+       (if (null refs)
+           (progn
+             (when (not silent)
+               (message ,none-message))
+             (kill-buffer refbuf))
+         (with-current-buffer refbuf
+           (insert ,buffer-header)
+           (dolist (ref refs)
+             (,insert-reference ref oldbuf))
+           (view-buffer-other-window refbuf)
+           (goto-char (point-min))
+           (forward-line 2))))))
+
+(defun-markdown-ref-checker
+  markdown-check-refs
+  "Show all undefined Markdown references in current `markdown-mode' buffer.
+
+Links which have empty reference definitions are considered to be
+defined."
+  markdown-get-undefined-refs
+  markdown-reference-check-buffer
+  "No undefined references found"
+  "The following references are undefined:\n\n"
+  markdown-insert-undefined-reference-button)
+
+
+(defun-markdown-ref-checker
+  markdown-unused-refs
+  "Show all unused Markdown references in current `markdown-mode' buffer."
+  markdown-get-unused-refs
+  markdown-unused-references-buffer
+  "No unused references found"
+  "The following references are unused:\n\n"
+  markdown-insert-unused-reference-button)
+
+
+
+;;; Lists =====================================================================
+
+(defun markdown-insert-list-item (&optional arg)
+  "Insert a new list item.
+If the point is inside unordered list, insert a bullet mark.  If
+the point is inside ordered list, insert the next number followed
+by a period.  Use the previous list item to determine the amount
+of whitespace to place before and after list markers.
+
+With a \\[universal-argument] prefix (i.e., when ARG is (4)),
+decrease the indentation by one level.
+
+With two \\[universal-argument] prefixes (i.e., when ARG is (16)),
+increase the indentation by one level."
+  (interactive "p")
+  (let (bounds cur-indent marker indent new-indent new-loc)
+    (save-match-data
+      ;; Look for a list item on current or previous non-blank line
+      (save-excursion
+        (while (and (not (setq bounds (markdown-cur-list-item-bounds)))
+                    (not (bobp))
+                    (markdown-cur-line-blank-p))
+          (forward-line -1)))
+      (when bounds
+        (cond ((save-excursion
+                 (skip-chars-backward " \t")
+                 (looking-at-p markdown-regex-list))
+               (beginning-of-line)
+               (insert "\n")
+               (forward-line -1))
+              ((not (markdown-cur-line-blank-p))
+               (newline)))
+        (setq new-loc (point)))
+      ;; Look ahead for a list item on next non-blank line
+      (unless bounds
+        (save-excursion
+          (while (and (null bounds)
+                      (not (eobp))
+                      (markdown-cur-line-blank-p))
+            (forward-line)
+            (setq bounds (markdown-cur-list-item-bounds))))
+        (when bounds
+          (setq new-loc (point))
+          (unless (markdown-cur-line-blank-p)
+            (newline))))
+      (if (not bounds)
+          ;; When not in a list, start a new unordered one
+          (progn
+            (unless (markdown-cur-line-blank-p)
+              (insert "\n"))
+            (insert markdown-unordered-list-item-prefix))
+        ;; Compute indentation and marker for new list item
+        (setq cur-indent (nth 2 bounds))
+        (setq marker (nth 4 bounds))
+        ;; If current item is a GFM checkbox, insert new unchecked checkbox.
+        (when (nth 5 bounds)
+          (setq marker
+                (concat marker
+                        (replace-regexp-in-string "[Xx]" " " (nth 5 bounds)))))
+        (cond
+         ;; Dedent: decrement indentation, find previous marker.
+         ((= arg 4)
+          (setq indent (max (- cur-indent markdown-list-indent-width) 0))
+          (let ((prev-bounds
+                 (save-excursion
+                   (goto-char (nth 0 bounds))
+                   (when (markdown-up-list)
+                     (markdown-cur-list-item-bounds)))))
+            (when prev-bounds
+              (setq marker (nth 4 prev-bounds)))))
+         ;; Indent: increment indentation by 4, use same marker.
+         ((= arg 16) (setq indent (+ cur-indent markdown-list-indent-width)))
+         ;; Same level: keep current indentation and marker.
+         (t (setq indent cur-indent)))
+        (setq new-indent (make-string indent 32))
+        (goto-char new-loc)
+        (cond
+         ;; Ordered list
+         ((string-match-p "[0-9]" marker)
+          (if (= arg 16) ;; starting a new column indented one more level
+              (insert (concat new-indent "1. "))
+            ;; Don't use previous match-data
+            (set-match-data nil)
+            ;; travel up to the last item and pick the correct number.  If
+            ;; the argument was nil, "new-indent = cur-indent" is the same,
+            ;; so we don't need special treatment. Neat.
+            (save-excursion
+              (while (and (not (looking-at (concat new-indent "\\([0-9]+\\)\\(\\.[ \t]*\\)")))
+                          (>= (forward-line -1) 0))))
+            (let* ((old-prefix (match-string 1))
+                   (old-spacing (match-string 2))
+                   (new-prefix (if (and old-prefix markdown-ordered-list-enumeration)
+                                   (int-to-string (1+ (string-to-number old-prefix)))
+                                 "1"))
+                   (space-adjust (- (length old-prefix) (length new-prefix)))
+                   (new-spacing (if (and (match-string 2)
+                                         (not (string-match-p "\t" old-spacing))
+                                         (< space-adjust 0)
+                                         (> space-adjust (- 1 (length (match-string 2)))))
+                                    (substring (match-string 2) 0 space-adjust)
+                                  (or old-spacing ". "))))
+              (insert (concat new-indent new-prefix new-spacing)))))
+         ;; Unordered list, GFM task list, or ordered list with hash mark
+         ((string-match-p "[\\*\\+-]\\|#\\." marker)
+          (insert new-indent marker))))
+      ;; Propertize the newly inserted list item now
+      (markdown-syntax-propertize-list-items (line-beginning-position) (line-end-position)))))
+
+(defun markdown-move-list-item-up ()
+  "Move the current list item up in the list when possible.
+In nested lists, move child items with the parent item."
+  (interactive)
+  (let (cur prev old)
+    (when (setq cur (markdown-cur-list-item-bounds))
+      (setq old (point))
+      (goto-char (nth 0 cur))
+      (if (markdown-prev-list-item (nth 3 cur))
+          (progn
+            (setq prev (markdown-cur-list-item-bounds))
+            (condition-case nil
+                (progn
+                  (transpose-regions (nth 0 prev) (nth 1 prev)
+                                     (nth 0 cur) (nth 1 cur) t)
+                  (goto-char (+ (nth 0 prev) (- old (nth 0 cur)))))
+              ;; Catch error in case regions overlap.
+              (error (goto-char old))))
+        (goto-char old)))))
+
+(defun markdown-move-list-item-down ()
+  "Move the current list item down in the list when possible.
+In nested lists, move child items with the parent item."
+  (interactive)
+  (let (cur next old)
+    (when (setq cur (markdown-cur-list-item-bounds))
+      (setq old (point))
+      (if (markdown-next-list-item (nth 3 cur))
+          (progn
+            (setq next (markdown-cur-list-item-bounds))
+            (condition-case nil
+                (progn
+                  (transpose-regions (nth 0 cur) (nth 1 cur)
+                                     (nth 0 next) (nth 1 next) nil)
+                  (goto-char (+ old (- (nth 1 next) (nth 1 cur)))))
+              ;; Catch error in case regions overlap.
+              (error (goto-char old))))
+        (goto-char old)))))
+
+(defun markdown-demote-list-item (&optional bounds)
+  "Indent (or demote) the current list item.
+Optionally, BOUNDS of the current list item may be provided if available.
+In nested lists, demote child items as well."
+  (interactive)
+  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
+    (save-excursion
+      (let* ((item-start (set-marker (make-marker) (nth 0 bounds)))
+             (item-end (set-marker (make-marker) (nth 1 bounds)))
+             (list-start (progn (markdown-beginning-of-list)
+                                (set-marker (make-marker) (point))))
+             (list-end (progn (markdown-end-of-list)
+                              (set-marker (make-marker) (point)))))
+        (goto-char item-start)
+        (while (< (point) item-end)
+          (unless (markdown-cur-line-blank-p)
+            (insert (make-string markdown-list-indent-width ? )))
+          (forward-line))
+        (markdown-syntax-propertize-list-items list-start list-end)))))
+
+(defun markdown-promote-list-item (&optional bounds)
+  "Unindent (or promote) the current list item.
+Optionally, BOUNDS of the current list item may be provided if available.
+In nested lists, demote child items as well."
+  (interactive)
+  (when (or bounds (setq bounds (markdown-cur-list-item-bounds)))
+    (save-excursion
+      (save-match-data
+        (let ((item-start (set-marker (make-marker) (nth 0 bounds)))
+              (item-end (set-marker (make-marker) (nth 1 bounds)))
+              (list-start (progn (markdown-beginning-of-list)
+                                 (set-marker (make-marker) (point))))
+              (list-end (progn (markdown-end-of-list)
+                               (set-marker (make-marker) (point))))
+              num regexp)
+          (goto-char item-start)
+          (when (looking-at (format "^[ ]\\{1,%d\\}"
+                                    markdown-list-indent-width))
+            (setq num (- (match-end 0) (match-beginning 0)))
+            (setq regexp (format "^[ ]\\{1,%d\\}" num))
+            (while (and (< (point) item-end)
+                        (re-search-forward regexp item-end t))
+              (replace-match "" nil nil)
+              (forward-line))
+            (markdown-syntax-propertize-list-items list-start list-end)))))))
+
+(defun markdown-cleanup-list-numbers-level (&optional pfx prev-item)
+  "Update the numbering for level PFX (as a string of spaces) and PREV-ITEM.
+PREV-ITEM is width of previous-indentation and list number
+
+Assume that the previously found match was for a numbered item in
+a list."
+  (let ((cpfx pfx)
+        (cur-item nil)
+        (idx 0)
+        (continue t)
+        (step t)
+        (sep nil))
+    (while (and continue (not (eobp)))
+      (setq step t)
+      (cond
+       ((looking-at "^\\(\\([\s-]*\\)[0-9]+\\)\\. ")
+        (setq cpfx (match-string-no-properties 2))
+        (setq cur-item (match-string-no-properties 1)) ;; indentation and list marker
+        (cond
+         ((or (= (length cpfx) (length pfx))
+              (= (length cur-item) (length prev-item)))
+          (save-excursion
+            (replace-match
+             (if (not markdown-ordered-list-enumeration)
+                 (concat pfx "1. ")
+               (cl-incf idx)
+               (concat pfx (number-to-string idx) ". "))))
+          (setq sep nil))
+         ;; indented a level
+         ((< (length pfx) (length cpfx))
+          (setq sep (markdown-cleanup-list-numbers-level cpfx cur-item))
+          (setq step nil))
+         ;; exit the loop
+         (t
+          (setq step nil)
+          (setq continue nil))))
+
+       ((looking-at "^\\([\s-]*\\)[^ \t\n\r].*$")
+        (setq cpfx (match-string-no-properties 1))
+        (cond
+         ;; reset if separated before
+         ((string= cpfx pfx) (when sep (setq idx 0)))
+         ((string< cpfx pfx)
+          (setq step nil)
+          (setq continue nil))))
+       (t (setq sep t)))
+
+      (when step
+        (beginning-of-line)
+        (setq continue (= (forward-line) 0))))
+    sep))
+
+(defun markdown-cleanup-list-numbers ()
+  "Update the numbering of ordered lists."
+  (interactive)
+  (save-excursion
+    (goto-char (point-min))
+    (markdown-cleanup-list-numbers-level "")))
+
+
+;;; Movement ==================================================================
+
+;; This function was originally derived from `org-beginning-of-line' from org.el.
+(defun markdown-beginning-of-line (&optional n)
+  "Go to the beginning of the current visible line.
+
+If this is a headline, and `markdown-special-ctrl-a/e' is not nil
+or symbol `reversed', on the first attempt move to where the
+headline text hashes, and only move to beginning of line when the
+cursor is already before the hashes of the text of the headline.
+
+If `markdown-special-ctrl-a/e' is symbol `reversed' then go to
+the hashes of the text on the second attempt.
+
+With argument N not nil or 1, move forward N - 1 lines first."
+  (interactive "^p")
+  (let ((origin (point))
+        (special (pcase markdown-special-ctrl-a/e
+                   (`(,C-a . ,_) C-a) (_ markdown-special-ctrl-a/e)))
+        deactivate-mark)
+    ;; First move to a visible line.
+    (if visual-line-mode
+        (beginning-of-visual-line n)
+      (move-beginning-of-line n)
+      ;; `move-beginning-of-line' may leave point after invisible
+      ;; characters if line starts with such of these (e.g., with
+      ;; a link at column 0).  Really move to the beginning of the
+      ;; current visible line.
+      (forward-line 0))
+    (cond
+     ;; No special behavior.  Point is already at the beginning of
+     ;; a line, logical or visual.
+     ((not special))
+     ;; `beginning-of-visual-line' left point before logical beginning
+     ;; of line: point is at the beginning of a visual line.  Bail
+     ;; out.
+     ((and visual-line-mode (not (bolp))))
+     ((looking-at markdown-regex-header-atx)
+      ;; At a header, special position is before the title.
+      (let ((refpos (match-beginning 2))
+            (bol (point)))
+        (if (eq special 'reversed)
+            (when (and (= origin bol) (eq last-command this-command))
+              (goto-char refpos))
+          (when (or (> origin refpos) (<= origin bol))
+            (goto-char refpos)))
+        ;; Prevent automatic cursor movement caused by the command loop.
+        ;; Enable disable-point-adjustment to avoid unintended cursor repositioning.
+        (when (and markdown-hide-markup
+                   (equal (get-char-property (point) 'display) ""))
+          (setq disable-point-adjustment t))))
+     ((looking-at markdown-regex-list)
+      ;; At a list item, special position is after the list marker or checkbox.
+      (let ((refpos (or (match-end 4) (match-end 3))))
+        (if (eq special 'reversed)
+            (when (and (= (point) origin) (eq last-command this-command))
+              (goto-char refpos))
+          (when (or (> origin refpos) (<= origin (line-beginning-position)))
+          (goto-char refpos)))))
+     ;; No special case, already at beginning of line.
+     (t nil))))
+
+;; This function was originally derived from `org-end-of-line' from org.el.
+(defun markdown-end-of-line (&optional n)
+  "Go to the end of the line, but before ellipsis, if any.
+
+If this is a headline, and `markdown-special-ctrl-a/e' is not nil
+or symbol `reversed', ignore closing tags on the first attempt,
+and only move to after the closing tags when the cursor is
+already beyond the end of the headline.
+
+If `markdown-special-ctrl-a/e' is symbol `reversed' then ignore
+closing tags on the second attempt.
+
+With argument N not nil or 1, move forward N - 1 lines first."
+  (interactive "^p")
+  (let ((origin (point))
+        (special (pcase markdown-special-ctrl-a/e
+                   (`(,_ . ,C-e) C-e) (_ markdown-special-ctrl-a/e)))
+        deactivate-mark)
+    ;; First move to a visible line.
+    (if visual-line-mode
+        (beginning-of-visual-line n)
+      (move-beginning-of-line n))
+    (cond
+     ;; At a headline, with closing tags.
+     ((save-excursion
+        (forward-line 0)
+        (and (looking-at markdown-regex-header-atx) (match-end 3)))
+      (let ((refpos (match-end 2))
+            (visual-end (and visual-line-mode
+                             (save-excursion
+                               (end-of-visual-line)
+                               (point)))))
+        ;; If `end-of-visual-line' brings us before end of line or even closing
+        ;; tags, i.e., the headline spans over multiple visual lines, move
+        ;; there.
+        (cond ((and visual-end
+                    (< visual-end refpos)
+                    (<= origin visual-end))
+               (goto-char visual-end))
+              ((not special) (end-of-line))
+              ((eq special 'reversed)
+               (if (and (= origin (line-end-position))
+                        (eq this-command last-command))
+                   (goto-char refpos)
+                 (end-of-line)))
+              (t
+               (if (or (< origin refpos) (>= origin (line-end-position)))
+                   (goto-char refpos)
+                 (end-of-line))))
+        ;; Prevent automatic cursor movement caused by the command loop.
+        ;; Enable disable-point-adjustment to avoid unintended cursor repositioning.
+        (when (and markdown-hide-markup
+                   (equal (get-char-property (point) 'display) ""))
+          (setq disable-point-adjustment t))))
+     (visual-line-mode
+      (let ((bol (line-beginning-position)))
+        (end-of-visual-line)
+        ;; If `end-of-visual-line' gets us past the ellipsis at the
+        ;; end of a line, backtrack and use `end-of-line' instead.
+        (when (/= bol (line-beginning-position))
+          (goto-char bol)
+          (end-of-line))))
+     (t (end-of-line)))))
+
+(defun markdown-beginning-of-defun (&optional arg)
+  "`beginning-of-defun-function' for Markdown.
+This is used to find the beginning of the defun and should behave
+like ‘beginning-of-defun’, returning non-nil if it found the
+beginning of a defun.  It moves the point backward, right before a
+heading which defines a defun.  When ARG is non-nil, repeat that
+many times.  When ARG is negative, move forward to the ARG-th
+following section."
+  (or arg (setq arg 1))
+  (when (< arg 0) (end-of-line))
+  ;; Adjust position for setext headings.
+  (when (and (thing-at-point-looking-at markdown-regex-header-setext)
+             (not (= (point) (match-beginning 0)))
+             (not (markdown-code-block-at-point-p)))
+    (goto-char (match-end 0)))
+  (let (found)
+    ;; Move backward with positive argument.
+    (while (and (not (bobp)) (> arg 0))
+      (setq found nil)
+      (while (and (not found)
+                  (not (bobp))
+                  (re-search-backward markdown-regex-header nil 'move))
+        (markdown-code-block-at-pos (match-beginning 0))
+        (setq found (match-beginning 0)))
+      (setq arg (1- arg)))
+    ;; Move forward with negative argument.
+    (while (and (not (eobp)) (< arg 0))
+      (setq found nil)
+      (while (and (not found)
+                  (not (eobp))
+                  (re-search-forward markdown-regex-header nil 'move))
+        (markdown-code-block-at-pos (match-beginning 0))
+        (setq found (match-beginning 0)))
+      (setq arg (1+ arg)))
+    (when found
+      (beginning-of-line)
+      t)))
+
+(defun markdown-end-of-defun ()
+  "`end-of-defun-function’ for Markdown.
+This is used to find the end of the defun at point.
+It is called with no argument, right after calling ‘beginning-of-defun-raw’,
+so it can assume that point is at the beginning of the defun body.
+It should move point to the first position after the defun."
+  (or (eobp) (forward-char 1))
+  (let (found)
+    (while (and (not found)
+                (not (eobp))
+                (re-search-forward markdown-regex-header nil 'move))
+      (when (not (markdown-code-block-at-pos (match-beginning 0)))
+        (setq found (match-beginning 0))))
+    (when found
+      (goto-char found)
+      (skip-syntax-backward "-"))))
+
+(defun markdown-beginning-of-text-block ()
+  "Move backward to previous beginning of a plain text block.
+This function simply looks for blank lines without considering
+the surrounding context in light of Markdown syntax.  For that, see
+`markdown-backward-block'."
+  (interactive)
+  (let ((start (point)))
+    (if (re-search-backward markdown-regex-block-separator nil t)
+        (goto-char (match-end 0))
+      (goto-char (point-min)))
+    (when (and (= start (point)) (not (bobp)))
+      (forward-line -1)
+      (if (re-search-backward markdown-regex-block-separator nil t)
+          (goto-char (match-end 0))
+        (goto-char (point-min))))))
+
+(defun markdown-end-of-text-block ()
+  "Move forward to next beginning of a plain text block.
+This function simply looks for blank lines without considering
+the surrounding context in light of Markdown syntax.  For that, see
+`markdown-forward-block'."
+  (interactive)
+  (beginning-of-line)
+  (skip-chars-forward " \t\n")
+  (when (= (point) (point-min))
+    (forward-char))
+  (if (re-search-forward markdown-regex-block-separator nil t)
+      (goto-char (match-end 0))
+    (goto-char (point-max)))
+  (skip-chars-backward " \t\n")
+  (forward-line))
+
+(defun markdown-backward-paragraph (&optional arg)
+  "Move the point to the start of the current paragraph.
+With argument ARG, do it ARG times; a negative argument ARG = -N
+means move forward N blocks."
+  (interactive "^p")
+  (or arg (setq arg 1))
+  (if (< arg 0)
+      (markdown-forward-paragraph (- arg))
+    (dotimes (_ arg)
+      ;; Skip over whitespace in between paragraphs when moving backward.
+      (skip-chars-backward " \t\n")
+      (beginning-of-line)
+      ;; Skip over code block endings.
+      (when (markdown-range-properties-exist
+             (line-beginning-position) (line-end-position)
+             '(markdown-gfm-block-end
+               markdown-tilde-fence-end))
+        (forward-line -1))
+      ;; Skip over blank lines inside blockquotes.
+      (while (and (not (eobp))
+                  (looking-at markdown-regex-blockquote)
+                  (= (length (match-string 3)) 0))
+        (forward-line -1))
+      ;; Proceed forward based on the type of block of paragraph.
+      (let (bounds skip)
+        (cond
+         ;; Blockquotes
+         ((looking-at markdown-regex-blockquote)
+          (while (and (not (bobp))
+                      (looking-at markdown-regex-blockquote)
+                      (> (length (match-string 3)) 0)) ;; not blank
+            (forward-line -1))
+          (forward-line))
+         ;; List items
+         ((setq bounds (markdown-cur-list-item-bounds))
+          (goto-char (nth 0 bounds)))
+         ;; Other
+         (t
+          (while (and (not (bobp))
+                      (not skip)
+                      (not (markdown-cur-line-blank-p))
+                      (not (looking-at markdown-regex-blockquote))
+                      (not (markdown-range-properties-exist
+                            (line-beginning-position) (line-end-position)
+                            '(markdown-gfm-block-end
+                              markdown-tilde-fence-end))))
+            (setq skip (markdown-range-properties-exist
+                        (line-beginning-position) (line-end-position)
+                        '(markdown-gfm-block-begin
+                          markdown-tilde-fence-begin)))
+            (forward-line -1))
+          (unless (bobp)
+            (forward-line 1))))))))
+
+(defun markdown-forward-paragraph (&optional arg)
+  "Move forward to the next end of a paragraph.
+With argument ARG, do it ARG times; a negative argument ARG = -N
+means move backward N blocks."
+  (interactive "^p")
+  (or arg (setq arg 1))
+  (if (< arg 0)
+      (markdown-backward-paragraph (- arg))
+    (dotimes (_ arg)
+      ;; Skip whitespace in between paragraphs.
+      (when (markdown-cur-line-blank-p)
+        (skip-syntax-forward "-")
+        (beginning-of-line))
+      ;; Proceed forward based on the type of block.
+      (let (bounds skip)
+        (cond
+         ;; Blockquotes
+         ((looking-at markdown-regex-blockquote)
+          ;; Skip over blank lines inside blockquotes.
+          (while (and (not (eobp))
+                      (looking-at markdown-regex-blockquote)
+                      (= (length (match-string 3)) 0))
+            (forward-line))
+          ;; Move to end of quoted text block
+          (while (and (not (eobp))
+                      (looking-at markdown-regex-blockquote)
+                      (> (length (match-string 3)) 0)) ;; not blank
+            (forward-line)))
+         ;; List items
+         ((and (markdown-cur-list-item-bounds)
+               (setq bounds (markdown-next-list-item-bounds)))
+          (goto-char (nth 0 bounds)))
+         ;; Other
+         (t
+          (forward-line)
+          (while (and (not (eobp))
+                      (not skip)
+                      (not (markdown-cur-line-blank-p))
+                      (not (looking-at markdown-regex-blockquote))
+                      (not (markdown-range-properties-exist
+                            (line-beginning-position) (line-end-position)
+                            '(markdown-gfm-block-begin
+                              markdown-tilde-fence-begin))))
+            (setq skip (markdown-range-properties-exist
+                        (line-beginning-position) (line-end-position)
+                        '(markdown-gfm-block-end
+                          markdown-tilde-fence-end)))
+            (forward-line))))))))
+
+(defun markdown-backward-block (&optional arg)
+  "Move the point to the start of the current Markdown block.
+Moves across complete code blocks, list items, and blockquotes,
+but otherwise stops at blank lines, headers, and horizontal
+rules.  With argument ARG, do it ARG times; a negative argument
+ARG = -N means move forward N blocks."
+  (interactive "^p")
+  (or arg (setq arg 1))
+  (if (< arg 0)
+      (markdown-forward-block (- arg))
+    (dotimes (_ arg)
+      ;; Skip over whitespace in between blocks when moving backward,
+      ;; unless at a block boundary with no whitespace.
+      (skip-syntax-backward "-")
+      (beginning-of-line)
+      ;; Proceed forward based on the type of block.
+      (cond
+       ;; Code blocks
+       ((and (markdown-code-block-at-pos (point)) ;; this line
+             (markdown-code-block-at-pos (line-beginning-position 0))) ;; previous line
+        (forward-line -1)
+        (while (and (markdown-code-block-at-point-p) (not (bobp)))
+          (forward-line -1))
+        (forward-line))
+       ;; Headings
+       ((markdown-heading-at-point)
+        (goto-char (match-beginning 0)))
+       ;; Horizontal rules
+       ((looking-at markdown-regex-hr))
+       ;; Blockquotes
+       ((looking-at markdown-regex-blockquote)
+        (forward-line -1)
+        (while (and (looking-at markdown-regex-blockquote)
+                    (not (bobp)))
+          (forward-line -1))
+        (forward-line))
+       ;; List items
+       ((markdown-cur-list-item-bounds)
+        (markdown-beginning-of-list))
+       ;; Other
+       (t
+        ;; Move forward in case it is a one line regular paragraph.
+        (unless (markdown-next-line-blank-p)
+          (forward-line))
+        (unless (markdown-prev-line-blank-p)
+          (markdown-backward-paragraph)))))))
+
+(defun markdown-forward-block (&optional arg)
+  "Move forward to the next end of a Markdown block.
+Moves across complete code blocks, list items, and blockquotes,
+but otherwise stops at blank lines, headers, and horizontal
+rules.  With argument ARG, do it ARG times; a negative argument
+ARG = -N means move backward N blocks."
+  (interactive "^p")
+  (or arg (setq arg 1))
+  (if (< arg 0)
+      (markdown-backward-block (- arg))
+    (dotimes (_ arg)
+      ;; Skip over whitespace in between blocks when moving forward.
+      (if (markdown-cur-line-blank-p)
+          (skip-syntax-forward "-")
+        (beginning-of-line))
+      ;; Proceed forward based on the type of block.
+      (cond
+       ;; Code blocks
+       ((markdown-code-block-at-point-p)
+        (forward-line)
+        (while (and (markdown-code-block-at-point-p) (not (eobp)))
+          (forward-line)))
+       ;; Headings
+       ((looking-at markdown-regex-header)
+        (goto-char (or (match-end 4) (match-end 2) (match-end 3)))
+        (forward-line))
+       ;; Horizontal rules
+       ((looking-at markdown-regex-hr)
+        (forward-line))
+       ;; Blockquotes
+       ((looking-at markdown-regex-blockquote)
+        (forward-line)
+        (while (and (looking-at markdown-regex-blockquote) (not (eobp)))
+          (forward-line)))
+       ;; List items
+       ((markdown-cur-list-item-bounds)
+        (markdown-end-of-list)
+        (forward-line))
+       ;; Other
+       (t (markdown-forward-paragraph))))
+    (skip-syntax-backward "-")
+    (unless (eobp)
+      (forward-char 1))))
+
+(defun markdown-backward-page (&optional count)
+  "Move backward to boundary of the current toplevel section.
+With COUNT, repeat, or go forward if negative."
+  (interactive "p")
+  (or count (setq count 1))
+  (if (< count 0)
+      (markdown-forward-page (- count))
+    (skip-syntax-backward "-")
+    (or (markdown-back-to-heading-over-code-block t t)
+        (goto-char (point-min)))
+    (when (looking-at markdown-regex-header)
+      (let ((level (markdown-outline-level)))
+        (when (> level 1) (markdown-up-heading level))
+        (when (> count 1)
+          (condition-case nil
+              (markdown-backward-same-level (1- count))
+            (error (goto-char (point-min)))))))))
+
+(defun markdown-forward-page (&optional count)
+  "Move forward to boundary of the current toplevel section.
+With COUNT, repeat, or go backward if negative."
+  (interactive "p")
+  (or count (setq count 1))
+  (if (< count 0)
+      (markdown-backward-page (- count))
+    (if (markdown-back-to-heading-over-code-block t t)
+        (let ((level (markdown-outline-level)))
+          (when (> level 1) (markdown-up-heading level))
+          (condition-case nil
+              (markdown-forward-same-level count)
+            (error (goto-char (point-max)))))
+      (markdown-next-visible-heading 1))))
+
+(defun markdown-next-link ()
+  "Jump to next inline, reference, or wiki link.
+If successful, return point.  Otherwise, return nil.
+See `markdown-wiki-link-p' and `markdown-previous-wiki-link'."
+  (interactive)
+  (let ((opoint (point)))
+    (when (or (markdown-link-p) (markdown-wiki-link-p))
+      ;; At a link already, move past it.
+      (goto-char (+ (match-end 0) 1)))
+    ;; Search for the next wiki link and move to the beginning.
+    (while (and (re-search-forward (markdown-make-regex-link-generic) nil t)
+                (markdown-code-block-at-point-p)
+                (< (point) (point-max))))
+    (if (and (not (eq (point) opoint))
+             (or (markdown-link-p) (markdown-wiki-link-p)))
+        ;; Group 1 will move past non-escape character in wiki link regexp.
+        ;; Go to beginning of group zero for all other link types.
+        (goto-char (or (match-beginning 1) (match-beginning 0)))
+      (goto-char opoint)
+      nil)))
+
+(defun markdown-previous-link ()
+  "Jump to previous wiki link.
+If successful, return point.  Otherwise, return nil.
+See `markdown-wiki-link-p' and `markdown-next-wiki-link'."
+  (interactive)
+  (let ((opoint (point)))
+    (while (and (re-search-backward (markdown-make-regex-link-generic) nil t)
+                (markdown-code-block-at-point-p)
+                (> (point) (point-min))))
+    (if (and (not (eq (point) opoint))
+             (or (markdown-link-p) (markdown-wiki-link-p)))
+        (goto-char (or (match-beginning 1) (match-beginning 0)))
+      (goto-char opoint)
+      nil)))
+
+
+;;; Outline ===================================================================
+
+(defun markdown-move-heading-common (move-fn &optional arg adjust)
+  "Wrapper for `outline-mode' functions to skip false positives.
+MOVE-FN is a function and ARG is its argument. For example,
+headings inside preformatted code blocks may match
+`outline-regexp' but should not be considered as headings.
+When ADJUST is non-nil, adjust the point for interactive calls
+to avoid leaving the point at invisible markup.  This adjustment
+generally should only be done for interactive calls, since other
+functions may expect the point to be at the beginning of the
+regular expression."
+  (let ((prev -1) (start (point)))
+    (if arg (funcall move-fn arg) (funcall move-fn))
+    (while (and (/= prev (point)) (markdown-code-block-at-point-p))
+      (setq prev (point))
+      (if arg (funcall move-fn arg) (funcall move-fn)))
+    ;; Adjust point for setext headings and invisible text.
+    (save-match-data
+      (when (and adjust (thing-at-point-looking-at markdown-regex-header))
+        (if markdown-hide-markup
+            ;; Move to beginning of heading text if markup is hidden.
+            (goto-char (or (match-beginning 1) (match-beginning 5)))
+          ;; Move to beginning of markup otherwise.
+          (goto-char (or (match-beginning 1) (match-beginning 4))))))
+    (if (= (point) start) nil (point))))
+
+(defun markdown-next-visible-heading (arg)
+  "Move to the next visible heading line of any level.
+With argument, repeats or can move backward if negative. ARG is
+passed to `outline-next-visible-heading'."
+  (interactive "p")
+  (markdown-move-heading-common #'outline-next-visible-heading arg 'adjust))
+
+(defun markdown-previous-visible-heading (arg)
+  "Move to the previous visible heading line of any level.
+With argument, repeats or can move backward if negative. ARG is
+passed to `outline-previous-visible-heading'."
+  (interactive "p")
+  (markdown-move-heading-common #'outline-previous-visible-heading arg 'adjust))
+
+(defun markdown-next-heading ()
+  "Move to the next heading line of any level."
+  (markdown-move-heading-common #'outline-next-heading))
+
+(defun markdown-previous-heading ()
+  "Move to the previous heading line of any level."
+  (markdown-move-heading-common #'outline-previous-heading))
+
+(defun markdown-back-to-heading-over-code-block (&optional invisible-ok no-error)
+  "Move back to the beginning of the previous heading.
+Returns t if the point is at a heading, the location if a heading
+was found, and nil otherwise.
+Only visible heading lines are considered, unless INVISIBLE-OK is
+non-nil.  Throw an error if there is no previous heading unless
+NO-ERROR is non-nil.
+Leaves match data intact for `markdown-regex-header'."
+  (beginning-of-line)
+  (or (and (markdown-heading-at-point)
+           (not (markdown-code-block-at-point-p)))
+      (let (found)
+        (save-excursion
+          (while (and (not found)
+                      (re-search-backward markdown-regex-header nil t))
+            (when (and (or invisible-ok (not (outline-invisible-p)))
+                       (not (markdown-code-block-at-point-p)))
+              (setq found (point))))
+          (if (not found)
+              (unless no-error (user-error "Before first heading"))
+            (setq found (point))))
+        (when found (goto-char found)))))
+
+(defun markdown-forward-same-level (arg)
+  "Move forward to the ARG'th heading at same level as this one.
+Stop at the first and last headings of a superior heading."
+  (interactive "p")
+  (markdown-back-to-heading-over-code-block)
+  (markdown-move-heading-common #'outline-forward-same-level arg 'adjust))
+
+(defun markdown-backward-same-level (arg)
+  "Move backward to the ARG'th heading at same level as this one.
+Stop at the first and last headings of a superior heading."
+  (interactive "p")
+  (markdown-back-to-heading-over-code-block)
+  (while (> arg 0)
+    (let ((point-to-move-to
+           (save-excursion
+             (markdown-move-heading-common #'outline-get-last-sibling nil 'adjust))))
+      (if point-to-move-to
+          (progn
+            (goto-char point-to-move-to)
+            (setq arg (1- arg)))
+        (user-error "No previous same-level heading")))))
+
+(defun markdown-up-heading (arg &optional interactive)
+  "Move to the visible heading line of which the present line is a subheading.
+With argument, move up ARG levels.  When called interactively (or
+INTERACTIVE is non-nil), also push the mark."
+  (interactive "p\np")
+  (and interactive (not (eq last-command 'markdown-up-heading))
+       (push-mark))
+  (markdown-move-heading-common #'outline-up-heading arg 'adjust))
+
+(defun markdown-back-to-heading (&optional invisible-ok)
+  "Move to previous heading line, or beg of this line if it's a heading.
+Only visible heading lines are considered, unless INVISIBLE-OK is non-nil."
+  (interactive)
+  (markdown-move-heading-common #'outline-back-to-heading invisible-ok))
+
+(defalias 'markdown-end-of-heading 'outline-end-of-heading)
+
+(defun markdown-on-heading-p ()
+  "Return non-nil if point is on a heading line."
+  (get-text-property (line-beginning-position) 'markdown-heading))
+
+(defun markdown-end-of-subtree (&optional invisible-OK)
+  "Move to the end of the current subtree.
+Only visible heading lines are considered, unless INVISIBLE-OK is
+non-nil.
+Derived from `org-end-of-subtree'."
+  (markdown-back-to-heading invisible-OK)
+  (let ((first t)
+        (level (markdown-outline-level)))
+    (while (and (not (eobp))
+                (or first (> (markdown-outline-level) level)))
+      (setq first nil)
+      (markdown-next-heading))
+    (if (memq (preceding-char) '(?\n ?\^M))
+        (progn
+          ;; Go to end of line before heading
+          (forward-char -1)
+          (if (memq (preceding-char) '(?\n ?\^M))
+              ;; leave blank line before heading
+              (forward-char -1)))))
+  (point))
+
+(defun markdown-outline-fix-visibility ()
+  "Hide any false positive headings that should not be shown.
+For example, headings inside preformatted code blocks may match
+`outline-regexp' but should not be shown as headings when cycling.
+Also, the ending --- line in metadata blocks appears to be a
+setext header, but should not be folded."
+  (save-excursion
+    (goto-char (point-min))
+    ;; Unhide any false positives in metadata blocks
+    (when (markdown-text-property-at-point 'markdown-yaml-metadata-begin)
+      (let ((body (progn (forward-line)
+                         (markdown-text-property-at-point
+                          'markdown-yaml-metadata-section))))
+        (when body
+          (let ((end (progn (goto-char (cl-second body))
+                            (markdown-text-property-at-point
+                             'markdown-yaml-metadata-end))))
+            (outline-flag-region (point-min) (1+ (cl-second end)) nil)))))
+    ;; Hide any false positives in code blocks
+    (unless (outline-on-heading-p)
+      (outline-next-visible-heading 1))
+    (while (< (point) (point-max))
+      (when (markdown-code-block-at-point-p)
+        (outline-flag-region (1- (line-beginning-position)) (line-end-position) t))
+      (outline-next-visible-heading 1))))
+
+(defvar markdown-cycle-global-status 1)
+(defvar markdown-cycle-subtree-status nil)
+
+(defun markdown-next-preface ()
+  (let (finish)
+    (while (and (not finish) (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
+                                                nil 'move))
+      (unless (markdown-code-block-at-point-p)
+        (goto-char (match-beginning 0))
+        (setq finish t))))
+  (when (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
+    (forward-char -1)))
+
+(defun markdown-show-entry ()
+  (save-excursion
+    (outline-back-to-heading t)
+    (outline-flag-region (1- (point))
+                         (progn
+                           (markdown-next-preface)
+                           (if (= 1 (- (point-max) (point)))
+                               (point-max)
+                             (point)))
+                         nil)))
+
+;; This function was originally derived from `org-cycle' from org.el.
+(defun markdown-cycle (&optional arg)
+  "Visibility cycling for Markdown mode.
+This function is called with a `\\[universal-argument]' or if ARG is t, perform
+global visibility cycling.  If the point is at an atx-style header, cycle
+visibility of the corresponding subtree.  Otherwise, indent the current line
+ or insert a tab, as appropriate, by calling `indent-for-tab-command'."
+  (interactive "P")
+  (cond
+
+   ;; Global cycling
+   (arg
+    (cond
+     ;; Move from overview to contents
+     ((and (eq last-command this-command)
+           (eq markdown-cycle-global-status 2))
+      (outline-hide-sublevels 1)
+      (message "CONTENTS")
+      (setq markdown-cycle-global-status 3)
+      (markdown-outline-fix-visibility))
+     ;; Move from contents to all
+     ((and (eq last-command this-command)
+           (eq markdown-cycle-global-status 3))
+      (outline-show-all)
+      (message "SHOW ALL")
+      (setq markdown-cycle-global-status 1))
+     ;; Defaults to overview
+     (t
+      (outline-hide-body)
+      (message "OVERVIEW")
+      (setq markdown-cycle-global-status 2)
+      (markdown-outline-fix-visibility))))
+
+   ;; At a heading: rotate between three different views
+   ((save-excursion (beginning-of-line 1) (markdown-on-heading-p))
+    (markdown-back-to-heading)
+    (let ((goal-column 0) eoh eol eos)
+      ;; Determine boundaries
+      (save-excursion
+        (markdown-back-to-heading)
+        (save-excursion
+          (beginning-of-line 2)
+          (while (and (not (eobp)) ;; this is like `next-line'
+                      (get-char-property (1- (point)) 'invisible))
+            (beginning-of-line 2)) (setq eol (point)))
+        (markdown-end-of-heading)   (setq eoh (point))
+        (markdown-end-of-subtree t)
+        (skip-chars-forward " \t\n")
+        (beginning-of-line 1) ; in case this is an item
+        (setq eos (1- (point))))
+      ;; Find out what to do next and set `this-command'
+      (cond
+       ;; Nothing is hidden behind this heading
+       ((= eos eoh)
+        (message "EMPTY ENTRY")
+        (setq markdown-cycle-subtree-status nil))
+       ;; Entire subtree is hidden in one line: open it
+       ((>= eol eos)
+        (markdown-show-entry)
+        (outline-show-children)
+        (message "CHILDREN")
+        (setq markdown-cycle-subtree-status 'children))
+       ;; We just showed the children, now show everything.
+       ((and (eq last-command this-command)
+             (eq markdown-cycle-subtree-status 'children))
+        (outline-show-subtree)
+        (message "SUBTREE")
+        (setq markdown-cycle-subtree-status 'subtree))
+       ;; Default action: hide the subtree.
+       (t
+        (outline-hide-subtree)
+        (message "FOLDED")
+        (setq markdown-cycle-subtree-status 'folded)))))
+
+   ;; In a table, move forward by one cell
+   ((markdown-table-at-point-p)
+    (call-interactively #'markdown-table-forward-cell))
+
+   ;; Otherwise, indent as appropriate
+   (t
+    (indent-for-tab-command))))
+
+(defun markdown-shifttab ()
+  "Handle S-TAB keybinding based on context.
+When in a table, move backward one cell.
+Otherwise, cycle global heading visibility by calling
+`markdown-cycle' with argument t."
+  (interactive)
+  (cond ((markdown-table-at-point-p)
+         (call-interactively #'markdown-table-backward-cell))
+        (t (markdown-cycle t))))
+
+(defun markdown-outline-level ()
+  "Return the depth to which a statement is nested in the outline."
+  (cond
+   ((and (match-beginning 0)
+         (markdown-code-block-at-pos (match-beginning 0)))
+    7) ;; Only 6 header levels are defined.
+   ((match-end 2) 1)
+   ((match-end 3) 2)
+   ((match-end 4)
+    (length (markdown-trim-whitespace (match-string-no-properties 4))))))
+
+(defun markdown-promote-subtree (&optional arg)
+  "Promote the current subtree of ATX headings.
+Note that Markdown does not support heading levels higher than
+six and therefore level-six headings will not be promoted
+further. If ARG is non-nil promote the heading, otherwise
+demote."
+  (interactive "*P")
+  (save-excursion
+    (when (and (or (thing-at-point-looking-at markdown-regex-header-atx)
+                   (re-search-backward markdown-regex-header-atx nil t))
+               (not (markdown-code-block-at-point-p)))
+      (let ((level (length (match-string 1)))
+            (promote-or-demote (if arg 1 -1))
+            (remove 't))
+        (markdown-cycle-atx promote-or-demote remove)
+        (catch 'end-of-subtree
+          (while (and (markdown-next-heading)
+                      (looking-at markdown-regex-header-atx))
+            ;; Exit if this not a higher level heading; promote otherwise.
+            (if (and (looking-at markdown-regex-header-atx)
+                     (<= (length (match-string-no-properties 1)) level))
+                (throw 'end-of-subtree nil)
+              (markdown-cycle-atx promote-or-demote remove))))))))
+
+(defun markdown-demote-subtree ()
+  "Demote the current subtree of ATX headings."
+  (interactive)
+  (markdown-promote-subtree t))
+
+(defun markdown-move-subtree-up ()
+  "Move the current subtree of ATX headings up."
+  (interactive)
+  (outline-move-subtree-up 1))
+
+(defun markdown-move-subtree-down ()
+  "Move the current subtree of ATX headings down."
+  (interactive)
+  (outline-move-subtree-down 1))
+
+(defun markdown-outline-next ()
+  "Move to next list item, when in a list, or next visible heading."
+  (interactive)
+  (let ((bounds (markdown-next-list-item-bounds)))
+    (if bounds
+        (goto-char (nth 0 bounds))
+      (markdown-next-visible-heading 1))))
+
+(defun markdown-outline-previous ()
+  "Move to previous list item, when in a list, or previous visible heading."
+  (interactive)
+  (let ((bounds (markdown-prev-list-item-bounds)))
+    (if bounds
+        (goto-char (nth 0 bounds))
+      (markdown-previous-visible-heading 1))))
+
+(defun markdown-outline-next-same-level ()
+  "Move to next list item or heading of same level."
+  (interactive)
+  (let ((bounds (markdown-cur-list-item-bounds)))
+    (if bounds
+        (markdown-next-list-item (nth 3 bounds))
+      (markdown-forward-same-level 1))))
+
+(defun markdown-outline-previous-same-level ()
+  "Move to previous list item or heading of same level."
+  (interactive)
+  (let ((bounds (markdown-cur-list-item-bounds)))
+    (if bounds
+        (markdown-prev-list-item (nth 3 bounds))
+      (markdown-backward-same-level 1))))
+
+(defun markdown-outline-up ()
+  "Move to previous list item, when in a list, or previous heading."
+  (interactive)
+  (unless (markdown-up-list)
+    (markdown-up-heading 1)))
+
+
+;;; Marking and Narrowing =====================================================
+
+(defun markdown-mark-paragraph ()
+  "Put mark at end of this block, point at beginning.
+The block marked is the one that contains point or follows point.
+
+Interactively, if this command is repeated or (in Transient Mark
+mode) if the mark is active, it marks the next block after the
+ones already marked."
+  (interactive)
+  (if (or (and (eq last-command this-command) (mark t))
+          (and transient-mark-mode mark-active))
+      (set-mark
+       (save-excursion
+         (goto-char (mark))
+         (markdown-forward-paragraph)
+         (point)))
+    (let ((beginning-of-defun-function #'markdown-backward-paragraph)
+          (end-of-defun-function #'markdown-forward-paragraph))
+      (mark-defun))))
+
+(defun markdown-mark-block ()
+  "Put mark at end of this block, point at beginning.
+The block marked is the one that contains point or follows point.
+
+Interactively, if this command is repeated or (in Transient Mark
+mode) if the mark is active, it marks the next block after the
+ones already marked."
+  (interactive)
+  (if (or (and (eq last-command this-command) (mark t))
+          (and transient-mark-mode mark-active))
+      (set-mark
+       (save-excursion
+         (goto-char (mark))
+         (markdown-forward-block)
+         (point)))
+    (let ((beginning-of-defun-function #'markdown-backward-block)
+          (end-of-defun-function #'markdown-forward-block))
+      (mark-defun))))
+
+(defun markdown-narrow-to-block ()
+  "Make text outside current block invisible.
+The current block is the one that contains point or follows point."
+  (interactive)
+  (let ((beginning-of-defun-function #'markdown-backward-block)
+        (end-of-defun-function #'markdown-forward-block))
+    (narrow-to-defun)))
+
+(defun markdown-mark-text-block ()
+  "Put mark at end of this plain text block, point at beginning.
+The block marked is the one that contains point or follows point.
+
+Interactively, if this command is repeated or (in Transient Mark
+mode) if the mark is active, it marks the next block after the
+ones already marked."
+  (interactive)
+  (if (or (and (eq last-command this-command) (mark t))
+          (and transient-mark-mode mark-active))
+      (set-mark
+       (save-excursion
+         (goto-char (mark))
+         (markdown-end-of-text-block)
+         (point)))
+    (let ((beginning-of-defun-function #'markdown-beginning-of-text-block)
+          (end-of-defun-function #'markdown-end-of-text-block))
+      (mark-defun))))
+
+(defun markdown-mark-page ()
+  "Put mark at end of this top level section, point at beginning.
+The top level section marked is the one that contains point or
+follows point.
+
+Interactively, if this command is repeated or (in Transient Mark
+mode) if the mark is active, it marks the next page after the
+ones already marked."
+  (interactive)
+  (if (or (and (eq last-command this-command) (mark t))
+          (and transient-mark-mode mark-active))
+      (set-mark
+       (save-excursion
+         (goto-char (mark))
+         (markdown-forward-page)
+         (point)))
+    (let ((beginning-of-defun-function #'markdown-backward-page)
+          (end-of-defun-function #'markdown-forward-page))
+      (mark-defun))))
+
+(defun markdown-narrow-to-page ()
+  "Make text outside current top level section invisible.
+The current section is the one that contains point or follows point."
+  (interactive)
+  (let ((beginning-of-defun-function #'markdown-backward-page)
+        (end-of-defun-function #'markdown-forward-page))
+    (narrow-to-defun)))
+
+(defun markdown-mark-subtree ()
+  "Mark the current subtree.
+This puts point at the start of the current subtree, and mark at the end."
+  (interactive)
+  (let ((beg))
+    (if (markdown-heading-at-point)
+        (beginning-of-line)
+      (markdown-previous-visible-heading 1))
+    (setq beg (point))
+    (markdown-end-of-subtree)
+    (push-mark (point) nil t)
+    (goto-char beg)))
+
+(defun markdown-narrow-to-subtree ()
+  "Narrow buffer to the current subtree."
+  (interactive)
+  (save-excursion
+    (save-match-data
+      (narrow-to-region
+       (progn (markdown-back-to-heading-over-code-block t) (point))
+       (progn (markdown-end-of-subtree)
+              (if (and (markdown-heading-at-point) (not (eobp)))
+                  (backward-char 1))
+              (point))))))
+
+
+;;; Generic Structure Editing, Completion, and Cycling Commands ===============
+
+(defun markdown-move-up ()
+  "Move thing at point up.
+When in a list item, call `markdown-move-list-item-up'.
+When in a table, call `markdown-table-move-row-up'.
+Otherwise, move the current heading subtree up with
+`markdown-move-subtree-up'."
+  (interactive)
+  (cond
+   ((markdown-list-item-at-point-p)
+    (call-interactively #'markdown-move-list-item-up))
+   ((markdown-table-at-point-p)
+    (call-interactively #'markdown-table-move-row-up))
+   (t
+    (call-interactively #'markdown-move-subtree-up))))
+
+(defun markdown-move-down ()
+  "Move thing at point down.
+When in a list item, call `markdown-move-list-item-down'.
+Otherwise, move the current heading subtree up with
+`markdown-move-subtree-down'."
+  (interactive)
+  (cond
+   ((markdown-list-item-at-point-p)
+    (call-interactively #'markdown-move-list-item-down))
+   ((markdown-table-at-point-p)
+    (call-interactively #'markdown-table-move-row-down))
+   (t
+    (call-interactively #'markdown-move-subtree-down))))
+
+(defun markdown-promote ()
+  "Promote or move element at point to the left.
+Depending on the context, this function will promote a heading or
+list item at the point, move a table column to the left, or cycle
+markup."
+  (interactive)
+  (let (bounds)
+    (cond
+     ;; Promote atx heading subtree
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (markdown-promote-subtree))
+     ;; Promote setext heading
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (markdown-cycle-setext -1))
+     ;; Promote horizontal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (markdown-cycle-hr -1))
+     ;; Promote list item
+     ((setq bounds (markdown-cur-list-item-bounds))
+      (markdown-promote-list-item bounds))
+     ;; Move table column to the left
+     ((markdown-table-at-point-p)
+      (call-interactively #'markdown-table-move-column-left))
+     ;; Promote bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (markdown-cycle-bold))
+     ;; Promote italic
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (markdown-cycle-italic))
+     (t
+      (user-error "Nothing to promote at point")))))
+
+(defun markdown-demote ()
+  "Demote or move element at point to the right.
+Depending on the context, this function will demote a heading or
+list item at the point, move a table column to the right, or cycle
+or remove markup."
+  (interactive)
+  (let (bounds)
+    (cond
+     ;; Demote atx heading subtree
+     ((thing-at-point-looking-at markdown-regex-header-atx)
+      (markdown-demote-subtree))
+     ;; Demote setext heading
+     ((thing-at-point-looking-at markdown-regex-header-setext)
+      (markdown-cycle-setext 1))
+     ;; Demote horizontal rule
+     ((thing-at-point-looking-at markdown-regex-hr)
+      (markdown-cycle-hr 1))
+     ;; Demote list item
+     ((setq bounds (markdown-cur-list-item-bounds))
+      (markdown-demote-list-item bounds))
+     ;; Move table column to the right
+     ((markdown-table-at-point-p)
+      (call-interactively #'markdown-table-move-column-right))
+     ;; Demote bold
+     ((thing-at-point-looking-at markdown-regex-bold)
+      (markdown-cycle-bold))
+     ;; Demote italic
+     ((thing-at-point-looking-at markdown-regex-italic)
+      (markdown-cycle-italic))
+     (t
+      (user-error "Nothing to demote at point")))))
+
+
+;;; Commands ==================================================================
+
+(defun markdown (&optional output-buffer-name)
+  "Run `markdown-command' on buffer, sending output to OUTPUT-BUFFER-NAME.
+The output buffer name defaults to `markdown-output-buffer-name'.
+Return the name of the output buffer used."
+  (interactive)
+  (save-window-excursion
+    (let* ((commands (cond ((stringp markdown-command) (split-string markdown-command))
+                           ((listp markdown-command) markdown-command)))
+           (command (car-safe commands))
+           (command-args (cdr-safe commands))
+           begin-region end-region)
+      (if (use-region-p)
+          (setq begin-region (region-beginning)
+                end-region (region-end))
+        (setq begin-region (point-min)
+              end-region (point-max)))
+
+      (unless output-buffer-name
+        (setq output-buffer-name markdown-output-buffer-name))
+      (when (and (stringp command) (not (executable-find command)))
+        (user-error "Markdown command %s is not found" command))
+      (let ((exit-code
+             (cond
+              ;; Handle case when `markdown-command' does not read from stdin
+              ((and (stringp command) markdown-command-needs-filename)
+               (if (not buffer-file-name)
+                   (user-error "Must be visiting a file")
+                 ;; Don’t use ‘shell-command’ because it’s not guaranteed to
+                 ;; return the exit code of the process.
+                 (let ((command (if (listp markdown-command)
+                                    (string-join markdown-command " ")
+                                  markdown-command)))
+                   (shell-command-on-region
+                    ;; Pass an empty region so that stdin is empty.
+                    (point) (point)
+                    (concat command " "
+                            (shell-quote-argument buffer-file-name))
+                    output-buffer-name))))
+              ;; Pass region to `markdown-command' via stdin
+              (t
+               (let ((buf (get-buffer-create output-buffer-name)))
+                 (with-current-buffer buf
+                   (setq buffer-read-only nil)
+                   (erase-buffer))
+                 (if (stringp command)
+                     (if (not (null command-args))
+                         (apply #'call-process-region begin-region end-region command nil buf nil command-args)
+                       (call-process-region begin-region end-region command nil buf))
+                   (if markdown-command-needs-filename
+                       (if (not buffer-file-name)
+                           (user-error "Must be visiting a file")
+                         (funcall markdown-command begin-region end-region buf buffer-file-name))
+                     (funcall markdown-command begin-region end-region buf))
+                   ;; If the ‘markdown-command’ function didn’t signal an
+                   ;; error, assume it succeeded by binding ‘exit-code’ to 0.
+                   0))))))
+        ;; The exit code can be a signal description string, so don’t use ‘=’
+        ;; or ‘zerop’.
+        (unless (eq exit-code 0)
+          (user-error "%s failed with exit code %s"
+                      markdown-command exit-code))))
+    output-buffer-name))
+
+(defun markdown-standalone (&optional output-buffer-name)
+  "Special function to provide standalone HTML output.
+Insert the output in the buffer named OUTPUT-BUFFER-NAME."
+  (interactive)
+  (setq output-buffer-name (markdown output-buffer-name))
+  (with-current-buffer output-buffer-name
+    (set-buffer output-buffer-name)
+    (unless (markdown-output-standalone-p)
+      (markdown-add-xhtml-header-and-footer output-buffer-name))
+    (goto-char (point-min))
+    (html-mode))
+  output-buffer-name)
+
+(defun markdown-other-window (&optional output-buffer-name)
+  "Run `markdown-command' on current buffer and display in other window.
+When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
+that name."
+  (interactive)
+  (markdown-display-buffer-other-window
+   (markdown-standalone output-buffer-name)))
+
+(defun markdown-output-standalone-p ()
+  "Determine whether `markdown-command' output is standalone XHTML.
+Standalone XHTML output is identified by an occurrence of
+`markdown-xhtml-standalone-regexp' in the first five lines of output."
+  (save-excursion
+    (goto-char (point-min))
+    (save-match-data
+      (re-search-forward
+       markdown-xhtml-standalone-regexp
+       (save-excursion (goto-char (point-min)) (forward-line 4) (point))
+       t))))
+
+(defun markdown-stylesheet-link-string (stylesheet-path)
+  (concat "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\""
+          (or (and (string-prefix-p "~" stylesheet-path)
+                   (expand-file-name stylesheet-path))
+              stylesheet-path)
+          "\"  />"))
+
+(defun markdown-escape-title (title)
+  "Escape a minimum set of characters in TITLE so they don't clash with html."
+  (replace-regexp-in-string ">" "&gt;"
+    (replace-regexp-in-string "<" "&lt;"
+      (replace-regexp-in-string "&" "&amp;" title))))
+
+(defun markdown-add-xhtml-header-and-footer (title)
+  "Wrap XHTML header and footer with given TITLE around current buffer."
+  (goto-char (point-min))
+  (insert "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
+          "\t\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n\n"
+          "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n\n"
+          "<head>\n<title>")
+  (insert (markdown-escape-title title))
+  (insert "</title>\n")
+  (unless (= (length markdown-content-type) 0)
+    (insert
+     (format
+      "<meta http-equiv=\"Content-Type\" content=\"%s;charset=%s\"/>\n"
+      markdown-content-type
+      (or (and markdown-coding-system
+               (coding-system-get markdown-coding-system
+                                  'mime-charset))
+          (coding-system-get buffer-file-coding-system
+                             'mime-charset)
+          "utf-8"))))
+  (if (> (length markdown-css-paths) 0)
+      (insert (mapconcat #'markdown-stylesheet-link-string
+                         markdown-css-paths "\n")))
+  (when (> (length markdown-xhtml-header-content) 0)
+    (insert markdown-xhtml-header-content))
+  (insert "\n</head>\n\n"
+          "<body>\n\n")
+  (when (> (length markdown-xhtml-body-preamble) 0)
+    (insert markdown-xhtml-body-preamble "\n"))
+  (goto-char (point-max))
+  (when (> (length markdown-xhtml-body-epilogue) 0)
+    (insert "\n" markdown-xhtml-body-epilogue))
+  (insert "\n"
+          "</body>\n"
+          "</html>\n"))
+
+(defun markdown-preview (&optional output-buffer-name)
+  "Run `markdown-command' on the current buffer and view output in browser.
+When OUTPUT-BUFFER-NAME is given, insert the output in the buffer with
+that name."
+  (interactive)
+  (browse-url-of-buffer
+   (markdown-standalone (or output-buffer-name markdown-output-buffer-name))))
+
+(defun markdown-export-file-name (&optional extension)
+  "Attempt to generate a filename for Markdown output.
+The file extension will be EXTENSION if given, or .html by default.
+If the current buffer is visiting a file, we construct a new
+output filename based on that filename.  Otherwise, return nil."
+  (when (buffer-file-name)
+    (unless extension
+      (setq extension ".html"))
+    (let ((candidate
+           (concat
+            (cond
+             ((buffer-file-name)
+              (file-name-sans-extension (buffer-file-name)))
+             (t (buffer-name)))
+            extension)))
+      (cond
+       ((equal candidate (buffer-file-name))
+        (concat candidate extension))
+       (t
+        candidate)))))
+
+(defun markdown-export (&optional output-file)
+  "Run Markdown on the current buffer, save to file, and return the filename.
+If OUTPUT-FILE is given, use that as the filename.  Otherwise, use the filename
+generated by `markdown-export-file-name', which will be constructed using the
+current filename, but with the extension removed and replaced with .html."
+  (interactive)
+  (unless output-file
+    (setq output-file (markdown-export-file-name ".html")))
+  (when output-file
+    (let* ((init-buf (current-buffer))
+           (init-point (point))
+           (init-buf-string (buffer-string))
+           (output-buffer (find-file-noselect output-file))
+           (output-buffer-name (buffer-name output-buffer)))
+      (run-hooks 'markdown-before-export-hook)
+      (markdown-standalone output-buffer-name)
+      (with-current-buffer output-buffer
+        (run-hooks 'markdown-after-export-hook)
+        (save-buffer)
+        (when markdown-export-kill-buffer (kill-buffer)))
+      ;; if modified, restore initial buffer
+      (when (buffer-modified-p init-buf)
+        (erase-buffer)
+        (insert init-buf-string)
+        (save-buffer)
+        (goto-char init-point))
+      output-file)))
+
+(defun markdown-export-and-preview ()
+  "Export to XHTML using `markdown-export' and browse the resulting file."
+  (interactive)
+  (browse-url-of-file (markdown-export)))
+
+(defvar-local markdown-live-preview-buffer nil
+  "Buffer used to preview markdown output in `markdown-live-preview-export'.")
+
+(defvar-local markdown-live-preview-source-buffer nil
+  "Source buffer from which current buffer was generated.
+This is the inverse of `markdown-live-preview-buffer'.")
+
+(defvar markdown-live-preview-currently-exporting nil)
+
+(defun markdown-live-preview-get-filename ()
+  "Standardize the filename exported by `markdown-live-preview-export'."
+  (markdown-export-file-name ".html"))
+
+(defun markdown-live-preview-window-eww (file)
+  "Preview FILE with eww.
+To be used with `markdown-live-preview-window-function'."
+  (when (and (bound-and-true-p eww-auto-rename-buffer)
+             markdown-live-preview-buffer)
+    (kill-buffer markdown-live-preview-buffer))
+  (eww-open-file file)
+  ;; #737 if `eww-auto-rename-buffer' is non-nil, the buffer name is not  "*eww*"
+  ;; Try to find the buffer whose name ends with "eww*"
+  (if (bound-and-true-p eww-auto-rename-buffer)
+      (cl-loop for buf in (buffer-list)
+               when (string-match-p "eww\\*\\'" (buffer-name buf))
+               return buf)
+    (get-buffer "*eww*")))
+
+(defun markdown-visual-lines-between-points (beg end)
+  (save-excursion
+    (goto-char beg)
+    (cl-loop with count = 0
+             while (progn (end-of-visual-line)
+                          (and (< (point) end) (line-move-visual 1 t)))
+             do (cl-incf count)
+             finally return count)))
+
+(defun markdown-live-preview-window-serialize (buf)
+  "Get window point and scroll data for all windows displaying BUF."
+  (when (buffer-live-p buf)
+    (with-current-buffer buf
+      (mapcar
+       (lambda (win)
+         (with-selected-window win
+           (let* ((start (window-start))
+                  (pt (window-point))
+                  (pt-or-sym (cond ((= pt (point-min)) 'min)
+                                   ((= pt (point-max)) 'max)
+                                   (t pt)))
+                  (diff (markdown-visual-lines-between-points
+                         start pt)))
+             (list win pt-or-sym diff))))
+       (get-buffer-window-list buf)))))
+
+(defun markdown-get-point-back-lines (pt num-lines)
+  (save-excursion
+    (goto-char pt)
+    (line-move-visual (- num-lines) t)
+    ;; in testing, can occasionally overshoot the number of lines to traverse
+    (let ((actual-num-lines (markdown-visual-lines-between-points (point) pt)))
+      (when (> actual-num-lines num-lines)
+        (line-move-visual (- actual-num-lines num-lines) t)))
+    (point)))
+
+(defun markdown-live-preview-window-deserialize (window-posns)
+  "Apply window point and scroll data from WINDOW-POSNS.
+WINDOW-POSNS is provided by `markdown-live-preview-window-serialize'."
+  (cl-destructuring-bind (win pt-or-sym diff) window-posns
+    (when (window-live-p win)
+      (with-current-buffer markdown-live-preview-buffer
+        (set-window-buffer win (current-buffer))
+        (cl-destructuring-bind (actual-pt actual-diff)
+            (cl-case pt-or-sym
+              (min (list (point-min) 0))
+              (max (list (point-max) diff))
+              (t   (list pt-or-sym diff)))
+          (set-window-start
+           win (markdown-get-point-back-lines actual-pt actual-diff))
+          (set-window-point win actual-pt))))))
+
+(defun markdown-live-preview-export ()
+  "Export to XHTML using `markdown-export'.
+Browse the resulting file within Emacs using
+`markdown-live-preview-window-function' Return the buffer
+displaying the rendered output."
+  (interactive)
+  (let ((filename (markdown-live-preview-get-filename)))
+    (when filename
+      (let* ((markdown-live-preview-currently-exporting t)
+             (cur-buf (current-buffer))
+             (export-file (markdown-export filename))
+             ;; get positions in all windows currently displaying output buffer
+             (window-data
+              (markdown-live-preview-window-serialize
+               markdown-live-preview-buffer)))
+        (save-window-excursion
+          (let ((output-buffer
+                 (funcall markdown-live-preview-window-function export-file)))
+            (with-current-buffer output-buffer
+              (setq markdown-live-preview-source-buffer cur-buf)
+              (add-hook 'kill-buffer-hook
+                        #'markdown-live-preview-remove-on-kill t t))
+            (with-current-buffer cur-buf
+              (setq markdown-live-preview-buffer output-buffer))))
+        (with-current-buffer cur-buf
+          ;; reset all windows displaying output buffer to where they were,
+          ;; now with the new output
+          (mapc #'markdown-live-preview-window-deserialize window-data)
+          ;; delete html editing buffer
+          (let ((buf (get-file-buffer export-file))) (when buf (kill-buffer buf)))
+          (when (and export-file (file-exists-p export-file)
+                     (eq markdown-live-preview-delete-export
+                         'delete-on-export))
+            (delete-file export-file))
+          markdown-live-preview-buffer)))))
+
+(defun markdown-live-preview-remove ()
+  (when (buffer-live-p markdown-live-preview-buffer)
+    (kill-buffer markdown-live-preview-buffer))
+  (setq markdown-live-preview-buffer nil)
+  ;; if set to 'delete-on-export, the output has already been deleted
+  (when (eq markdown-live-preview-delete-export 'delete-on-destroy)
+    (let ((outfile-name (markdown-live-preview-get-filename)))
+      (when (and outfile-name (file-exists-p outfile-name))
+        (delete-file outfile-name)))))
+
+(defun markdown-get-other-window ()
+  "Find another window to display preview or output content."
+  (cond
+   ((memq markdown-split-window-direction '(vertical below))
+    (or (window-in-direction 'below) (split-window-vertically)))
+   ((memq markdown-split-window-direction '(horizontal right))
+    (or (window-in-direction 'right) (split-window-horizontally)))
+   (t (split-window-sensibly (get-buffer-window)))))
+
+(defun markdown-display-buffer-other-window (buf)
+  "Display preview or output buffer BUF in another window."
+  (if (and display-buffer-alist (eq markdown-split-window-direction 'any))
+      (display-buffer buf)
+    (let ((cur-buf (current-buffer))
+          (window (markdown-get-other-window)))
+      (set-window-buffer window buf)
+      (set-buffer cur-buf))))
+
+(defun markdown-live-preview-if-markdown ()
+  (when (and (derived-mode-p 'markdown-mode)
+             markdown-live-preview-mode)
+    (unless markdown-live-preview-currently-exporting
+      (if (buffer-live-p markdown-live-preview-buffer)
+          (markdown-live-preview-export)
+        (markdown-display-buffer-other-window
+         (markdown-live-preview-export))))))
+
+(defun markdown-live-preview-remove-on-kill ()
+  (cond ((and (derived-mode-p 'markdown-mode)
+              markdown-live-preview-mode)
+         (markdown-live-preview-remove))
+        (markdown-live-preview-source-buffer
+         (with-current-buffer markdown-live-preview-source-buffer
+           (setq markdown-live-preview-buffer nil))
+         (setq markdown-live-preview-source-buffer nil))))
+
+(defun markdown-live-preview-switch-to-output ()
+  "Turn on `markdown-live-preview-mode' and switch to output buffer.
+The output buffer is opened in another window."
+  (interactive)
+  (if markdown-live-preview-mode
+      (markdown-display-buffer-other-window (markdown-live-preview-export)))
+  (markdown-live-preview-mode))
+
+(defun markdown-live-preview-re-export ()
+  "Re-export the current live previewed content.
+If the current buffer is a buffer displaying the exported version of a
+`markdown-live-preview-mode' buffer, call `markdown-live-preview-export' and
+update this buffer's contents."
+  (interactive)
+  (when markdown-live-preview-source-buffer
+    (with-current-buffer markdown-live-preview-source-buffer
+      (markdown-live-preview-export))))
+
+(defun markdown-open ()
+  "Open file for the current buffer with `markdown-open-command'."
+  (interactive)
+  (unless markdown-open-command
+    (user-error "Variable `markdown-open-command' must be set"))
+  (if (stringp markdown-open-command)
+      (if (not buffer-file-name)
+          (user-error "Must be visiting a file")
+        (save-buffer)
+        (let ((exit-code (call-process markdown-open-command nil nil nil
+                                       buffer-file-name)))
+          ;; The exit code can be a signal description string, so don’t use ‘=’
+          ;; or ‘zerop’.
+          (unless (eq exit-code 0)
+            (user-error "%s failed with exit code %s"
+                        markdown-open-command exit-code))))
+    (funcall markdown-open-command))
+  nil)
+
+(defun markdown-kill-ring-save ()
+  "Run Markdown on file and store output in the kill ring."
+  (interactive)
+  (save-window-excursion
+    (markdown)
+    (with-current-buffer markdown-output-buffer-name
+      (kill-ring-save (point-min) (point-max)))))
+
+
+;;; Links =====================================================================
+
+(defun markdown-backward-to-link-start ()
+  "Backward link start position if current position is in link title."
+  ;; Issue #305
+  (when (eq (get-text-property (point) 'face) 'markdown-link-face)
+    (skip-chars-backward "^[")
+    (forward-char -1)))
+
+(defun markdown-link-p ()
+  "Return non-nil when `point' is at a non-wiki link.
+See `markdown-wiki-link-p' for more information."
+  (save-excursion
+    (let ((case-fold-search nil))
+      (when (and (not (markdown-wiki-link-p)) (not (markdown-code-block-at-point-p)))
+        (markdown-backward-to-link-start)
+        (or (thing-at-point-looking-at markdown-regex-link-inline)
+            (thing-at-point-looking-at markdown-regex-link-reference)
+            (thing-at-point-looking-at markdown-regex-uri)
+            (thing-at-point-looking-at markdown-regex-angle-uri))))))
+
+(defun markdown-link-at-pos (pos)
+  "Return properties of link or image at position POS.
+Value is a list of elements describing the link:
+ 0. beginning position
+ 1. end position
+ 2. link text
+ 3. URL
+ 4. reference label
+ 5. title text
+ 6. bang (nil or \"!\")"
+  (save-excursion
+    (goto-char pos)
+    (markdown-backward-to-link-start)
+    (let (begin end text url reference title bang)
+      (cond
+       ;; Inline image or link at point.
+       ((thing-at-point-looking-at markdown-regex-link-inline)
+        (setq bang (match-string-no-properties 1)
+              begin (match-beginning 0)
+              text (match-string-no-properties 3)
+              url (match-string-no-properties 6))
+        ;; consider nested parentheses
+        ;; if link target contains parentheses, (match-end 0) isn't correct end position of the link
+        (let* ((close-pos (scan-sexps (match-beginning 5) 1))
+               (destination-part (string-trim (buffer-substring-no-properties (1+ (match-beginning 5)) (1- close-pos)))))
+          (setq end close-pos)
+          ;; A link can contain spaces if it is wrapped with angle brackets
+          (cond ((string-match "\\`<\\(.+\\)>\\'" destination-part)
+                 (setq url (match-string-no-properties 1 destination-part)))
+                ((string-match "\\([^ ]+\\)\\s-+\\(.+\\)" destination-part)
+                 (setq url (match-string-no-properties 1 destination-part)
+                       title (substring (match-string-no-properties 2 destination-part) 1 -1)))
+                (t (setq url destination-part)))
+          (setq url (url-unhex-string url))))
+       ;; Reference link at point.
+       ((thing-at-point-looking-at markdown-regex-link-reference)
+        (setq bang (match-string-no-properties 1)
+              begin (match-beginning 0)
+              end (match-end 0)
+              text (match-string-no-properties 3))
+        (when (char-equal (char-after (match-beginning 5)) ?\[)
+          (setq reference (match-string-no-properties 6))))
+       ;; Angle bracket URI at point.
+       ((thing-at-point-looking-at markdown-regex-angle-uri)
+        (setq begin (match-beginning 0)
+              end (match-end 0)
+              url (match-string-no-properties 2)))
+       ;; Plain URI at point.
+       ((thing-at-point-looking-at markdown-regex-uri)
+        (setq begin (match-beginning 0)
+              end (match-end 0)
+              url (match-string-no-properties 1))))
+      (list begin end text url reference title bang))))
+
+(defun markdown-link-url ()
+  "Return the URL part of the regular (non-wiki) link at point.
+Works with both inline and reference style links, and with images.
+If point is not at a link or the link reference is not defined
+returns nil."
+  (let* ((values (markdown-link-at-pos (point)))
+         (text (nth 2 values))
+         (url (nth 3 values))
+         (ref (nth 4 values)))
+    (or url (and ref (car (markdown-reference-definition
+                           (downcase (if (string= ref "") text ref))))))))
+
+(defun markdown--browse-url (url)
+  (let* ((struct (url-generic-parse-url url))
+         (full (url-fullness struct))
+         (file url))
+    ;; Parse URL, determine fullness, strip query string
+    (setq file (car (url-path-and-query struct)))
+    ;; Open full URLs in browser, files in Emacs
+    (if full
+        (browse-url url)
+      (when (and file (> (length file) 0))
+        (let ((link-file (funcall markdown-translate-filename-function file)))
+          (if (and markdown-open-image-command (string-match-p (image-file-name-regexp) link-file))
+              (if (functionp markdown-open-image-command)
+                  (funcall markdown-open-image-command link-file)
+                (process-file markdown-open-image-command nil nil nil link-file))
+            (find-file link-file)))))))
+
+(defun markdown-follow-link-at-point (&optional event)
+  "Open the non-wiki link at point or EVENT.
+If the link is a complete URL, open in browser with `browse-url'.
+Otherwise, open with `find-file' after stripping anchor and/or query string.
+Translate filenames using `markdown-filename-translate-function'."
+  (interactive (list last-command-event))
+  (if event (posn-set-point (event-start event)))
+  (if (markdown-link-p)
+      (or (run-hook-with-args-until-success 'markdown-follow-link-functions (markdown-link-url))
+          (markdown--browse-url (markdown-link-url)))
+    (user-error "Point is not at a Markdown link or URL")))
+
+(defun markdown-fontify-inline-links (last)
+  "Add text properties to next inline link from point to LAST."
+  (when (markdown-match-generic-links last nil)
+    (let* ((link-start (match-beginning 3))
+           (link-end (match-end 3))
+           (url-start (match-beginning 6))
+           (url-end (match-end 6))
+           (url (match-string-no-properties 6))
+           (title-start (match-beginning 7))
+           (title-end (match-end 7))
+           (title (match-string-no-properties 7))
+           ;; Markup part
+           (mp (list 'invisible 'markdown-markup
+                     'rear-nonsticky t
+                     'font-lock-multiline t))
+           ;; Link part (without face)
+           (lp (list 'keymap markdown-mode-mouse-map
+                     'mouse-face 'markdown-highlight-face
+                     'font-lock-multiline t
+                     'help-echo (if title (concat title "\n" url) url)))
+           ;; URL part
+           (up (list 'keymap markdown-mode-mouse-map
+                     'invisible 'markdown-markup
+                     'mouse-face 'markdown-highlight-face
+                     'font-lock-multiline t))
+           ;; URL composition character
+           (url-char (markdown--first-displayable markdown-url-compose-char))
+           ;; Title part
+           (tp (list 'invisible 'markdown-markup
+                     'font-lock-multiline t)))
+      (dolist (g '(1 2 4 5 8))
+        (when (match-end g)
+          (add-text-properties (match-beginning g) (match-end g) mp)
+          (add-face-text-property (match-beginning g) (match-end g) 'markdown-markup-face)))
+      ;; Preserve existing faces applied to link part (e.g., inline code)
+      (when link-start
+        (add-text-properties link-start link-end lp)
+        (add-face-text-property link-start link-end 'markdown-link-face))
+      (when url-start
+        (add-text-properties url-start url-end up)
+        (add-face-text-property url-start url-end 'markdown-url-face))
+      (when title-start
+        (add-text-properties url-end title-end tp)
+        (add-face-text-property url-end title-end 'markdown-link-title-face))
+      (when (and markdown-hide-urls url-start)
+        (compose-region url-start (or title-end url-end) url-char))
+      t)))
+
+(defun markdown-fontify-reference-links (last)
+  "Add text properties to next reference link from point to LAST."
+  (when (markdown-match-generic-links last t)
+    (let* ((link-start (match-beginning 3))
+           (link-end (match-end 3))
+           (ref-start (match-beginning 6))
+           (ref-end (match-end 6))
+           ;; Markup part
+           (mp (list 'invisible 'markdown-markup
+                     'rear-nonsticky t
+                     'font-lock-multiline t))
+           ;; Link part
+           (lp (list 'keymap markdown-mode-mouse-map
+                     'mouse-face 'markdown-highlight-face
+                     'font-lock-multiline t
+                     'help-echo (lambda (_ __ pos)
+                                  (save-match-data
+                                    (save-excursion
+                                      (goto-char pos)
+                                      (or (markdown-link-url)
+                                          "Undefined reference"))))))
+           ;; URL composition character
+           (url-char (markdown--first-displayable markdown-url-compose-char))
+           ;; Reference part
+           (rp (list 'invisible 'markdown-markup
+                     'font-lock-multiline t)))
+      (dolist (g '(1 2 4 5 8))
+        (when (match-end g)
+          (add-text-properties (match-beginning g) (match-end g) mp)
+          (add-face-text-property (match-beginning g) (match-end g) 'markdown-markup-face)))
+      (when link-start
+        (add-text-properties link-start link-end lp)
+        (add-face-text-property link-start link-end 'markdown-link-face))
+      (when ref-start
+        (add-text-properties ref-start ref-end rp)
+        (add-face-text-property ref-start ref-end 'markdown-reference-face)
+        (when (and markdown-hide-urls (> (- ref-end ref-start) 2))
+          (compose-region ref-start ref-end url-char)))
+      t)))
+
+(defun markdown-fontify-angle-uris (last)
+  "Add text properties to angle URIs from point to LAST."
+  (when (markdown-match-angle-uris last)
+    (let* ((url-start (match-beginning 2))
+           (url-end (match-end 2))
+           ;; Markup part
+           (mp (list 'face 'markdown-markup-face
+                     'invisible 'markdown-markup
+                     'rear-nonsticky t
+                     'font-lock-multiline t))
+           ;; URI part
+           (up (list 'keymap markdown-mode-mouse-map
+                     'face 'markdown-plain-url-face
+                     'mouse-face 'markdown-highlight-face
+                     'font-lock-multiline t)))
+      (dolist (g '(1 3))
+        (add-text-properties (match-beginning g) (match-end g) mp))
+      (add-text-properties url-start url-end up)
+      t)))
+
+(defun markdown-fontify-plain-uris (last)
+  "Add text properties to plain URLs from point to LAST."
+  (when (markdown-match-plain-uris last)
+    (let* ((start (match-beginning 0))
+           (end (match-end 0))
+           (props (list 'keymap markdown-mode-mouse-map
+                        'face 'markdown-plain-url-face
+                        'mouse-face 'markdown-highlight-face
+                        'rear-nonsticky t
+                        'font-lock-multiline t)))
+      (add-text-properties start end props)
+      t)))
+
+(defun markdown-toggle-url-hiding (&optional arg)
+  "Toggle the display or hiding of URLs.
+With a prefix argument ARG, enable URL hiding if ARG is positive,
+and disable it otherwise."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-hide-urls
+        (if (eq arg 'toggle)
+            (not markdown-hide-urls)
+          (> (prefix-numeric-value arg) 0)))
+  (when (called-interactively-p 'interactive)
+    (message "markdown-mode URL hiding %s" (if markdown-hide-urls "enabled" "disabled")))
+  (markdown-reload-extensions))
+
+
+;;; Wiki Links ================================================================
+
+(defun markdown-wiki-link-p ()
+  "Return non-nil if wiki links are enabled and `point' is at a true wiki link.
+A true wiki link name matches `markdown-regex-wiki-link' but does
+not match the current file name after conversion.  This modifies
+the data returned by `match-data'.  Note that the potential wiki
+link name must be available via `match-string'."
+  (when markdown-enable-wiki-links
+    (let ((case-fold-search nil))
+      (and (thing-at-point-looking-at markdown-regex-wiki-link)
+           (not (markdown-code-block-at-point-p))
+           (or (not buffer-file-name)
+               (not (string-equal (buffer-file-name)
+                                  (markdown-convert-wiki-link-to-filename
+                                   (markdown-wiki-link-link)))))))))
+
+(defun markdown-wiki-link-link ()
+  "Return the link part of the wiki link using current match data.
+The location of the link component depends on the value of
+`markdown-wiki-link-alias-first'."
+  (if markdown-wiki-link-alias-first
+      (or (match-string-no-properties 5) (match-string-no-properties 3))
+    (match-string-no-properties 3)))
+
+(defun markdown-wiki-link-alias ()
+  "Return the alias or text part of the wiki link using current match data.
+The location of the alias component depends on the value of
+`markdown-wiki-link-alias-first'."
+  (if markdown-wiki-link-alias-first
+      (match-string-no-properties 3)
+    (or (match-string-no-properties 5) (match-string-no-properties 3))))
+
+(defun markdown--wiki-link-search-types ()
+  (let ((ret (and markdown-wiki-link-search-type
+                  (cl-copy-list markdown-wiki-link-search-type))))
+    (when (and markdown-wiki-link-search-subdirectories
+               (not (memq 'sub-directories markdown-wiki-link-search-type)))
+      (push 'sub-directories ret))
+    (when (and markdown-wiki-link-search-parent-directories
+               (not (memq 'parent-directories markdown-wiki-link-search-type)))
+      (push 'parent-directories ret))
+    ret))
+
+(defun markdown--project-root ()
+  (or (cl-loop for dir in '(".git" ".hg" ".svn")
+               when (locate-dominating-file default-directory dir)
+               return it)
+      (progn
+        (require 'project)
+        (let ((project (project-current t)))
+          (with-no-warnings
+            (if (fboundp 'project-root)
+                (project-root project)
+              (car (project-roots project))))))))
+
+(defun markdown-convert-wiki-link-to-filename (name)
+  "Generate a filename from the wiki link NAME.
+Spaces in NAME are replaced with `markdown-link-space-sub-char'.
+When in `gfm-mode', follow GitHub's conventions where [[Test Test]]
+and [[test test]] both map to Test-test.ext.  Look in the current
+directory first, then in subdirectories if
+`markdown-wiki-link-search-subdirectories' is non-nil, and then
+in parent directories if
+`markdown-wiki-link-search-parent-directories' is non-nil."
+  (save-match-data
+    ;; This function must not overwrite match data(PR #590)
+    (let* ((basename (replace-regexp-in-string
+                      "[[:space:]\n]" markdown-link-space-sub-char name))
+           (basename (if (derived-mode-p 'gfm-mode)
+                         (concat (upcase (substring basename 0 1))
+                                 (downcase (substring basename 1 nil)))
+                       basename))
+           (search-types (markdown--wiki-link-search-types))
+           directory extension default candidates dir)
+      (when buffer-file-name
+        (setq directory (file-name-directory buffer-file-name)
+              extension (file-name-extension buffer-file-name)))
+      (setq default (concat basename
+                            (when extension (concat "." extension))))
+      (cond
+       ;; Look in current directory first.
+       ((or (null buffer-file-name)
+            (file-exists-p default))
+        default)
+       ;; Possibly search in subdirectories, next.
+       ((and (memq 'sub-directories search-types)
+             (setq candidates
+                   (directory-files-recursively
+                    directory (concat "^" default "$"))))
+        (car candidates))
+       ;; Possibly search in parent directories as a last resort.
+       ((and (memq 'parent-directories search-types)
+             (setq dir (locate-dominating-file directory default)))
+        (concat dir default))
+       ((and (memq 'project search-types)
+             (setq candidates
+                   (directory-files-recursively
+                    (markdown--project-root) (concat "^" default "$"))))
+        (car candidates))
+       ;; If nothing is found, return default in current directory.
+       (t default)))))
+
+(defun markdown-follow-wiki-link (name &optional other)
+  "Follow the wiki link NAME.
+Convert the name to a file name and call `find-file'.  Ensure that
+the new buffer remains in `markdown-mode'.  Open the link in another
+window when OTHER is non-nil."
+  (let ((filename (markdown-convert-wiki-link-to-filename name))
+        (wp (when buffer-file-name
+              (file-name-directory buffer-file-name))))
+    (if (not wp)
+        (user-error "Must be visiting a file")
+      (when other (other-window 1))
+      (let ((default-directory wp))
+        (find-file filename)))
+    (unless (derived-mode-p 'markdown-mode)
+      (markdown-mode))))
+
+(defun markdown-follow-wiki-link-at-point (&optional arg)
+  "Find Wiki Link at point.
+With prefix argument ARG, open the file in other window.
+See `markdown-wiki-link-p' and `markdown-follow-wiki-link'."
+  (interactive "P")
+  (if (markdown-wiki-link-p)
+      (markdown-follow-wiki-link (markdown-wiki-link-link) arg)
+    (user-error "Point is not at a Wiki Link")))
+
+(defun markdown-highlight-wiki-link (from to face)
+  "Highlight the wiki link in the region between FROM and TO using FACE."
+  (put-text-property from to 'font-lock-face face))
+
+(defun markdown-unfontify-region-wiki-links (from to)
+  "Remove wiki link faces from the region specified by FROM and TO."
+  (interactive "*r")
+  (let ((modified (buffer-modified-p)))
+    (remove-text-properties from to '(font-lock-face markdown-link-face))
+    (remove-text-properties from to '(font-lock-face markdown-missing-link-face))
+    ;; remove-text-properties marks the buffer modified in emacs 24.3,
+    ;; undo that if it wasn't originally marked modified
+    (set-buffer-modified-p modified)))
+
+(defun markdown-fontify-region-wiki-links (from to)
+  "Search region given by FROM and TO for wiki links and fontify them.
+If a wiki link is found check to see if the backing file exists
+and highlight accordingly."
+  (goto-char from)
+  (save-match-data
+    (while (re-search-forward markdown-regex-wiki-link to t)
+      (when (not (markdown-code-block-at-point-p))
+        (let ((highlight-beginning (match-beginning 1))
+              (highlight-end (match-end 1))
+              (file-name
+               (markdown-convert-wiki-link-to-filename
+                (markdown-wiki-link-link))))
+          (if (condition-case nil (file-exists-p file-name) (error nil))
+              (markdown-highlight-wiki-link
+               highlight-beginning highlight-end 'markdown-link-face)
+            (markdown-highlight-wiki-link
+             highlight-beginning highlight-end 'markdown-missing-link-face)))))))
+
+(defun markdown-extend-changed-region (from to)
+  "Extend region given by FROM and TO so that we can fontify all links.
+The region is extended to the first newline before and the first
+newline after."
+  ;; start looking for the first new line before 'from
+  (goto-char from)
+  (re-search-backward "\n" nil t)
+  (let ((new-from (point-min))
+        (new-to (point-max)))
+    (if (not (= (point) from))
+        (setq new-from (point)))
+    ;; do the same thing for the first new line after 'to
+    (goto-char to)
+    (re-search-forward "\n" nil t)
+    (if (not (= (point) to))
+        (setq new-to (point)))
+    (cl-values new-from new-to)))
+
+(defun markdown-check-change-for-wiki-link (from to)
+  "Check region between FROM and TO for wiki links and re-fontify as needed."
+  (interactive "*r")
+  (let* ((modified (buffer-modified-p))
+         (buffer-undo-list t)
+         (inhibit-read-only t)
+         deactivate-mark
+         buffer-file-truename)
+    (unwind-protect
+        (save-excursion
+          (save-match-data
+            (save-restriction
+              (cursor-intangible-mode +1) ;; inhibit-point-motion-hooks is obsoleted since Emacs 29
+              ;; Extend the region to fontify so that it starts
+              ;; and ends at safe places.
+              (cl-multiple-value-bind (new-from new-to)
+                  (markdown-extend-changed-region from to)
+                (goto-char new-from)
+                ;; Only refontify when the range contains text with a
+                ;; wiki link face or if the wiki link regexp matches.
+                (when (or (markdown-range-property-any
+                           new-from new-to 'font-lock-face
+                           '(markdown-link-face markdown-missing-link-face))
+                          (re-search-forward
+                           markdown-regex-wiki-link new-to t))
+                  ;; Unfontify existing fontification (start from scratch)
+                  (markdown-unfontify-region-wiki-links new-from new-to)
+                  ;; Now do the fontification.
+                  (markdown-fontify-region-wiki-links new-from new-to))))))
+      (cursor-intangible-mode -1)
+      (and (not modified)
+           (buffer-modified-p)
+           (set-buffer-modified-p nil)))))
+
+(defun markdown-check-change-for-wiki-link-after-change (from to _)
+  "Check region between FROM and TO for wiki links and re-fontify as needed.
+Designed to be used with the `after-change-functions' hook."
+  (markdown-check-change-for-wiki-link from to))
+
+(defun markdown-fontify-buffer-wiki-links ()
+  "Refontify all wiki links in the buffer."
+  (interactive)
+  (markdown-check-change-for-wiki-link (point-min) (point-max)))
+
+(defun markdown-toggle-wiki-links (&optional arg)
+  "Toggle support for wiki links.
+With a prefix argument ARG, enable wiki link support if ARG is positive,
+and disable it otherwise."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-enable-wiki-links
+        (if (eq arg 'toggle)
+            (not markdown-enable-wiki-links)
+          (> (prefix-numeric-value arg) 0)))
+  (when (called-interactively-p 'interactive)
+    (message "markdown-mode wiki link support %s" (if markdown-enable-wiki-links "enabled" "disabled")))
+  (markdown-reload-extensions))
+
+(defun markdown-setup-wiki-link-hooks ()
+  "Add or remove hooks for fontifying wiki links.
+These are only enabled when `markdown-wiki-link-fontify-missing' is non-nil."
+  ;; Anytime text changes make sure it gets fontified correctly
+  (if (and markdown-enable-wiki-links
+           markdown-wiki-link-fontify-missing)
+      (add-hook 'after-change-functions
+                #'markdown-check-change-for-wiki-link-after-change t t)
+    (remove-hook 'after-change-functions
+                 #'markdown-check-change-for-wiki-link-after-change t))
+  ;; If we left the buffer there is a really good chance we were
+  ;; creating one of the wiki link documents. Make sure we get
+  ;; refontified when we come back.
+  (if (and markdown-enable-wiki-links
+           markdown-wiki-link-fontify-missing)
+      (progn
+        (add-hook 'window-configuration-change-hook
+                  #'markdown-fontify-buffer-wiki-links t t)
+        (markdown-fontify-buffer-wiki-links))
+    (remove-hook 'window-configuration-change-hook
+                 #'markdown-fontify-buffer-wiki-links t)
+    (markdown-unfontify-region-wiki-links (point-min) (point-max))))
+
+
+;;; Following & Doing =========================================================
+
+(defun markdown-follow-thing-at-point (arg)
+  "Follow thing at point if possible, such as a reference link or wiki link.
+Opens inline and reference links in a browser.  Opens wiki links
+to other files in the current window, or the another window if
+ARG is non-nil.
+See `markdown-follow-link-at-point' and
+`markdown-follow-wiki-link-at-point'."
+  (interactive "P")
+  (cond ((markdown-link-p)
+         (markdown-follow-link-at-point))
+        ((markdown-wiki-link-p)
+         (markdown-follow-wiki-link-at-point arg))
+        (t
+         (let* ((values (markdown-link-at-pos (point)))
+                (url (nth 3 values)))
+           (unless url
+             (user-error "Nothing to follow at point"))
+           (markdown--browse-url url)))))
+
+(defun markdown-do ()
+  "Do something sensible based on context at point.
+Jumps between reference links and definitions; between footnote
+markers and footnote text."
+  (interactive)
+  (cond
+   ;; Footnote definition
+   ((markdown-footnote-text-positions)
+    (markdown-footnote-return))
+   ;; Footnote marker
+   ((markdown-footnote-marker-positions)
+    (markdown-footnote-goto-text))
+   ;; Reference link
+   ((thing-at-point-looking-at markdown-regex-link-reference)
+    (markdown-reference-goto-definition))
+   ;; Reference definition
+   ((thing-at-point-looking-at markdown-regex-reference-definition)
+    (markdown-reference-goto-link (match-string-no-properties 2)))
+   ;; Link
+   ((or (markdown-link-p) (markdown-wiki-link-p))
+    (markdown-follow-thing-at-point nil))
+   ;; GFM task list item
+   ((markdown-gfm-task-list-item-at-point)
+    (markdown-toggle-gfm-checkbox))
+   ;; Align table
+   ((markdown-table-at-point-p)
+    (call-interactively #'markdown-table-align))
+   ;; Otherwise
+   (t
+    (markdown-insert-gfm-checkbox))))
+
+
+;;; Miscellaneous =============================================================
+
+(defun markdown-compress-whitespace-string (str)
+  "Compress whitespace in STR and return result.
+Leading and trailing whitespace is removed.  Sequences of multiple
+spaces, tabs, and newlines are replaced with single spaces."
+  (replace-regexp-in-string "\\(^[ \t\n]+\\|[ \t\n]+$\\)" ""
+                            (replace-regexp-in-string "[ \t\n]+" " " str)))
+
+(defun markdown--substitute-command-keys (string)
+  "Like `substitute-command-keys' but, but prefers control characters.
+First pass STRING to `substitute-command-keys' and then
+substitute `C-i` for `TAB` and `C-m` for `RET`."
+  (replace-regexp-in-string
+   "\\<TAB\\>" "C-i"
+   (replace-regexp-in-string
+    "\\<RET\\>" "C-m" (substitute-command-keys string) t) t))
+
+(defun markdown-line-number-at-pos (&optional pos)
+  "Return (narrowed) buffer line number at position POS.
+If POS is nil, use current buffer location.
+This is an exact copy of `line-number-at-pos' for use in emacs21."
+  (let ((opoint (or pos (point))) start)
+    (save-excursion
+      (goto-char (point-min))
+      (setq start (point))
+      (goto-char opoint)
+      (forward-line 0)
+      (1+ (count-lines start (point))))))
+
+(defun markdown-inside-link-p ()
+  "Return t if point is within a link."
+  (save-match-data
+    (thing-at-point-looking-at (markdown-make-regex-link-generic))))
+
+(defun markdown-line-is-reference-definition-p ()
+  "Return whether the current line is a (non-footnote) reference definition."
+  (save-excursion
+    (move-beginning-of-line 1)
+    (and (looking-at-p markdown-regex-reference-definition)
+         (not (looking-at-p "[ \t]*\\[^")))))
+
+(defun markdown-adaptive-fill-function ()
+  "Return prefix for filling paragraph or nil if not determined."
+  (cond
+   ;; List item inside blockquote
+   ((looking-at "^[ \t]*>[ \t]*\\(\\(?:[0-9]+\\|#\\)\\.\\|[*+:-]\\)[ \t]+")
+    (replace-regexp-in-string
+     "[0-9\\.*+-]" " " (match-string-no-properties 0)))
+   ;; Blockquote
+   ((looking-at markdown-regex-blockquote)
+    (buffer-substring-no-properties (match-beginning 0) (match-end 2)))
+   ;; List items
+   ((looking-at markdown-regex-list)
+    (match-string-no-properties 0))
+   ;; Footnote definition
+   ((looking-at-p markdown-regex-footnote-definition)
+    "    ") ; four spaces
+   ;; No match
+   (t nil)))
+
+(defun markdown-fill-paragraph (&optional justify)
+  "Fill paragraph at or after point.
+This function is like \\[fill-paragraph], but it skips Markdown
+code blocks.  If the point is in a code block, or just before one,
+do not fill.  Otherwise, call `fill-paragraph' as usual. If
+JUSTIFY is non-nil, justify text as well.  Since this function
+handles filling itself, it always returns t so that
+`fill-paragraph' doesn't run."
+  (interactive "P")
+  (unless (or (markdown-code-block-at-point-p)
+              (save-excursion
+                (back-to-indentation)
+                (skip-syntax-forward "-")
+                (markdown-code-block-at-point-p)))
+    (let ((fill-prefix (save-excursion
+                         (goto-char (line-beginning-position))
+                         (when (looking-at "\\([ \t]*>[ \t]*\\(?:>[ \t]*\\)+\\)")
+                           (match-string-no-properties 1)))))
+      (fill-paragraph justify)))
+  t)
+
+(defun markdown-fill-forward-paragraph (&optional arg)
+  "Function used by `fill-paragraph' to move over ARG paragraphs.
+This is a `fill-forward-paragraph-function' for `markdown-mode'.
+It is called with a single argument specifying the number of
+paragraphs to move.  Just like `forward-paragraph', it should
+return the number of paragraphs left to move."
+  (or arg (setq arg 1))
+  (if (> arg 0)
+      ;; With positive ARG, move across ARG non-code-block paragraphs,
+      ;; one at a time.  When passing a code block, don't decrement ARG.
+      (while (and (not (eobp))
+                  (> arg 0)
+                  (= (forward-paragraph 1) 0)
+                  (or (markdown-code-block-at-pos (line-beginning-position 0))
+                      (setq arg (1- arg)))))
+    ;; Move backward by one paragraph with negative ARG (always -1).
+    (let ((start (point)))
+      (setq arg (forward-paragraph arg))
+      (while (and (not (eobp))
+                  (progn (move-to-left-margin) (not (eobp)))
+                  (looking-at-p paragraph-separate))
+        (forward-line 1))
+      (cond
+       ;; Move point past whitespace following list marker.
+       ((looking-at markdown-regex-list)
+        (goto-char (match-end 0)))
+       ;; Move point past whitespace following pipe at beginning of line
+       ;; to handle Pandoc line blocks.
+       ((looking-at "^|\\s-*")
+        (goto-char (match-end 0)))
+       ;; Return point if the paragraph passed was a code block.
+       ((markdown-code-block-at-pos (line-beginning-position 2))
+        (goto-char start)))))
+  arg)
+
+(defun markdown--inhibit-electric-quote ()
+  "Function added to `electric-quote-inhibit-functions'.
+Return non-nil if the quote has been inserted inside a code block
+or span."
+  (let ((pos (1- (point))))
+    (or (markdown-inline-code-at-pos pos)
+        (markdown-code-block-at-pos pos))))
+
+
+;;; Extension Framework =======================================================
+
+(defun markdown-reload-extensions ()
+  "Check settings, update font-lock keywords and hooks, and re-fontify buffer."
+  (interactive)
+  (when (derived-mode-p 'markdown-mode)
+    ;; Refontify buffer
+    (font-lock-flush)
+    ;; Add or remove hooks related to extensions
+    (markdown-setup-wiki-link-hooks)))
+
+(defun markdown-handle-local-variables ()
+  "Run in `hack-local-variables-hook' to update font lock rules.
+Checks to see if there is actually a ‘markdown-mode’ file local variable
+before regenerating font-lock rules for extensions."
+  (when (or (assoc 'markdown-enable-wiki-links file-local-variables-alist)
+            (assoc 'markdown-enable-math file-local-variables-alist))
+    (when (assoc 'markdown-enable-math file-local-variables-alist)
+      (markdown-toggle-math markdown-enable-math))
+    (markdown-reload-extensions)))
+
+
+;;; Math Support ==============================================================
+
+(defconst markdown-mode-font-lock-keywords-math
+  (list
+   ;; Equation reference (eq:foo)
+   '("\\((eq:\\)\\([[:alnum:]:_]+\\)\\()\\)" . ((1 markdown-markup-face)
+                                                (2 markdown-reference-face)
+                                                (3 markdown-markup-face)))
+   ;; Equation reference \eqref{foo}
+   '("\\(\\\\eqref{\\)\\([[:alnum:]:_]+\\)\\(}\\)" . ((1 markdown-markup-face)
+                                                      (2 markdown-reference-face)
+                                                      (3 markdown-markup-face))))
+  "Font lock keywords to add and remove when toggling math support.")
+
+(defun markdown-toggle-math (&optional arg)
+  "Toggle support for inline and display LaTeX math expressions.
+With a prefix argument ARG, enable math mode if ARG is positive,
+and disable it otherwise.  If called from Lisp, enable the mode
+if ARG is omitted or nil."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-enable-math
+        (if (eq arg 'toggle)
+            (not markdown-enable-math)
+          (> (prefix-numeric-value arg) 0)))
+  (if markdown-enable-math
+      (font-lock-add-keywords
+       'markdown-mode markdown-mode-font-lock-keywords-math)
+    (font-lock-remove-keywords
+     'markdown-mode markdown-mode-font-lock-keywords-math))
+  (when (called-interactively-p 'interactive)
+    (message "markdown-mode math support %s" (if markdown-enable-math "enabled" "disabled")))
+  (markdown-reload-extensions))
+
+
+;;; GFM Checkboxes ============================================================
+
+(define-button-type 'markdown-gfm-checkbox-button
+  'follow-link t
+  'face 'markdown-gfm-checkbox-face
+  'mouse-face 'markdown-highlight-face
+  'action #'markdown-toggle-gfm-checkbox-button)
+
+(defun markdown-gfm-task-list-item-at-point (&optional bounds)
+  "Return non-nil if there is a GFM task list item at the point.
+Optionally, the list item BOUNDS may be given if available, as
+returned by `markdown-cur-list-item-bounds'.  When a task list item
+is found, the return value is the same value returned by
+`markdown-cur-list-item-bounds'."
+  (unless bounds
+    (setq bounds (markdown-cur-list-item-bounds)))
+  (> (length (nth 5 bounds)) 0))
+
+(defun markdown-insert-gfm-checkbox ()
+  "Add GFM checkbox at point.
+Returns t if added.
+Returns nil if non-applicable."
+  (interactive)
+  (let ((bounds (markdown-cur-list-item-bounds)))
+    (if bounds
+        (unless (cl-sixth bounds)
+          (let ((pos (+ (cl-first bounds) (cl-fourth bounds)))
+                (markup "[ ] "))
+            (if (< pos (point))
+                (save-excursion
+                  (goto-char pos)
+                  (insert markup))
+              (goto-char pos)
+              (insert markup))
+            (syntax-propertize (+ (cl-second bounds) 4))
+            t))
+      (unless (save-excursion
+                (back-to-indentation)
+                (or (markdown-list-item-at-point-p)
+                    (markdown-heading-at-point)
+                    (markdown-in-comment-p)
+                    (markdown-code-block-at-point-p)))
+        (let ((pos (save-excursion
+                     (back-to-indentation)
+                     (point)))
+              (markup (concat (or (save-excursion
+                                    (beginning-of-line 0)
+                                    (cl-fifth (markdown-cur-list-item-bounds)))
+                                  markdown-unordered-list-item-prefix)
+                              "[ ] ")))
+          (if (< pos (point))
+              (save-excursion
+                (goto-char pos)
+                (insert markup))
+            (goto-char pos)
+            (insert markup))
+          (syntax-propertize (line-end-position))
+          t)))))
+
+(defun markdown-toggle-gfm-checkbox ()
+  "Toggle GFM checkbox at point.
+Returns the resulting status as a string, either \"[x]\" or \"[ ]\".
+Returns nil if there is no task list item at the point."
+  (interactive)
+  (save-match-data
+    (save-excursion
+      (let ((bounds (markdown-cur-list-item-bounds)))
+        (when bounds
+          ;; Move to beginning of task list item
+          (goto-char (cl-first bounds))
+          ;; Advance to column of first non-whitespace after marker
+          (forward-char (cl-fourth bounds))
+          (cond ((looking-at "\\[ \\]")
+                 (replace-match
+                  (if markdown-gfm-uppercase-checkbox "[X]" "[x]")
+                  nil t)
+                 (match-string-no-properties 0))
+                ((looking-at "\\[[xX]\\]")
+                 (replace-match "[ ]" nil t)
+                 (match-string-no-properties 0))))))))
+
+(defun markdown-toggle-gfm-checkbox-button (button)
+  "Toggle GFM checkbox BUTTON on click."
+  (save-match-data
+    (save-excursion
+      (goto-char (button-start button))
+      (markdown-toggle-gfm-checkbox))))
+
+(defun markdown-make-gfm-checkboxes-buttons (start end)
+  "Make GFM checkboxes buttons in region between START and END."
+  (save-excursion
+    (goto-char start)
+    (let ((case-fold-search t))
+      (save-excursion
+        (while (re-search-forward markdown-regex-gfm-checkbox end t)
+          (make-button (match-beginning 1) (match-end 1)
+                       :type 'markdown-gfm-checkbox-button))))))
+
+;; Called when any modification is made to buffer text.
+(defun markdown-gfm-checkbox-after-change-function (beg end _)
+  "Add to `after-change-functions' to setup GFM checkboxes as buttons.
+BEG and END are the limits of scanned region."
+  (save-excursion
+    (save-match-data
+      ;; Rescan between start of line from `beg' and start of line after `end'.
+      (markdown-make-gfm-checkboxes-buttons
+       (progn (goto-char beg) (beginning-of-line) (point))
+       (progn (goto-char end) (forward-line 1) (point))))))
+
+(defun markdown-remove-gfm-checkbox-overlays ()
+  "Remove all GFM checkbox overlays in buffer."
+  (save-excursion
+    (save-restriction
+      (widen)
+      (remove-overlays nil nil 'face 'markdown-gfm-checkbox-face))))
+
+
+;;; Display inline image ======================================================
+
+(defvar-local markdown-inline-image-overlays nil)
+
+(defun markdown-remove-inline-images ()
+  "Remove inline image overlays from image links in the buffer.
+This can be toggled with `markdown-toggle-inline-images'
+or \\[markdown-toggle-inline-images]."
+  (interactive)
+  (mapc #'delete-overlay markdown-inline-image-overlays)
+  (setq markdown-inline-image-overlays nil)
+  (when (fboundp 'clear-image-cache) (clear-image-cache)))
+
+(defcustom markdown-display-remote-images nil
+  "If non-nil, download and display remote images.
+See also `markdown-inline-image-overlays'.
+
+Only image URLs specified with a protocol listed in
+`markdown-remote-image-protocols' are displayed."
+  :group 'markdown
+  :type 'boolean)
+
+(defcustom markdown-remote-image-protocols '("https")
+  "List of protocols to use to download remote images.
+See also `markdown-display-remote-images'."
+  :group 'markdown
+  :type '(repeat string))
+
+(defvar markdown--remote-image-cache
+  (make-hash-table :test 'equal)
+  "A map from URLs to image paths.")
+
+(defun markdown--get-remote-image (url)
+  "Retrieve the image path for a given URL."
+  (or (gethash url markdown--remote-image-cache)
+      (let ((dl-path (make-temp-file "markdown-mode--image")))
+        (require 'url)
+        (url-copy-file url dl-path t)
+        (puthash url dl-path markdown--remote-image-cache))))
+
+(defun markdown-display-inline-images ()
+  "Add inline image overlays to image links in the buffer.
+This can be toggled with `markdown-toggle-inline-images'
+or \\[markdown-toggle-inline-images]."
+  (interactive)
+  (unless (display-images-p)
+    (error "Cannot show images"))
+  (save-excursion
+    (save-restriction
+      (widen)
+      (goto-char (point-min))
+      (while (re-search-forward markdown-regex-link-inline nil t)
+        (let* ((start (match-beginning 0))
+               (imagep (match-beginning 1))
+               (end (match-end 0))
+               (file (match-string-no-properties 6)))
+          (when (and imagep
+                     (not (zerop (length file))))
+            (unless (file-exists-p file)
+              (let* ((download-file (funcall markdown-translate-filename-function file))
+                     (valid-url (ignore-errors
+                                  (member (downcase (url-type (url-generic-parse-url download-file)))
+                                          markdown-remote-image-protocols))))
+                (if (and markdown-display-remote-images valid-url)
+                    (setq file (markdown--get-remote-image download-file))
+                  (when (not valid-url)
+                    ;; strip query parameter
+                    (setq file (replace-regexp-in-string "?.+\\'" "" file))
+                    (unless (file-exists-p file)
+                      (setq file (url-unhex-string file)))))))
+            (when (file-exists-p file)
+              (let* ((abspath (if (file-name-absolute-p file)
+                                  file
+                                (concat default-directory file)))
+                     (image
+                      (cond ((and markdown-max-image-size
+                                  (image-type-available-p 'imagemagick))
+                             (create-image
+                              abspath 'imagemagick nil
+                              :max-width (car markdown-max-image-size)
+                              :max-height (cdr markdown-max-image-size)))
+                            (markdown-max-image-size
+                             (create-image abspath nil nil
+                                           :max-width (car markdown-max-image-size)
+                                           :max-height (cdr markdown-max-image-size)))
+                            (t (create-image abspath)))))
+                (when image
+                  (let ((ov (make-overlay start end)))
+                    (overlay-put ov 'display image)
+                    (overlay-put ov 'face 'default)
+                    (push ov markdown-inline-image-overlays)))))))))))
+
+(defun markdown-toggle-inline-images ()
+  "Toggle inline image overlays in the buffer."
+  (interactive)
+  (if markdown-inline-image-overlays
+      (markdown-remove-inline-images)
+    (markdown-display-inline-images)))
+
+
+;;; GFM Code Block Fontification ==============================================
+
+(defcustom markdown-fontify-code-blocks-natively nil
+  "When non-nil, fontify code in code blocks using the native major mode.
+This only works for fenced code blocks where the language is
+specified where we can automatically determine the appropriate
+mode to use.  The language to mode mapping may be customized by
+setting the variable `markdown-code-lang-modes'."
+  :group 'markdown
+  :type 'boolean
+  :safe #'booleanp
+  :package-version '(markdown-mode . "2.3"))
+
+(defcustom markdown-fontify-code-block-default-mode nil
+  "Default mode to use to fontify code blocks.
+This mode is used when automatic detection fails, such as for GFM
+code blocks with no language specified."
+  :group 'markdown
+  :type '(choice function (const :tag "None" nil))
+  :package-version '(markdown-mode . "2.4"))
+
+(defun markdown-toggle-fontify-code-blocks-natively (&optional arg)
+  "Toggle the native fontification of code blocks.
+With a prefix argument ARG, enable if ARG is positive,
+and disable otherwise."
+  (interactive (list (or current-prefix-arg 'toggle)))
+  (setq markdown-fontify-code-blocks-natively
+        (if (eq arg 'toggle)
+            (not markdown-fontify-code-blocks-natively)
+          (> (prefix-numeric-value arg) 0)))
+  (when (called-interactively-p 'interactive)
+    (message "markdown-mode native code block fontification %s"
+             (if markdown-fontify-code-blocks-natively "enabled" "disabled")))
+  (markdown-reload-extensions))
+
+;; This is based on `org-src-lang-modes' from org-src.el
+(defcustom markdown-code-lang-modes
+  '(("ocaml" . tuareg-mode) ("elisp" . emacs-lisp-mode) ("ditaa" . artist-mode)
+    ("asymptote" . asy-mode) ("dot" . fundamental-mode) ("sqlite" . sql-mode)
+    ("calc" . fundamental-mode) ("C" . c-mode) ("cpp" . c++-mode)
+    ("C++" . c++-mode) ("screen" . shell-script-mode) ("shell" . sh-mode)
+    ("bash" . sh-mode))
+  "Alist mapping languages to their major mode.
+The key is the language name, the value is the major mode.  For
+many languages this is simple, but for language where this is not
+the case, this variable provides a way to simplify things on the
+user side.  For example, there is no ocaml-mode in Emacs, but the
+mode to use is `tuareg-mode'."
+  :group 'markdown
+  :type '(repeat
+          (cons
+           (string "Language name")
+           (symbol "Major mode")))
+  :package-version '(markdown-mode . "2.3"))
+
+(defun markdown-get-lang-mode (lang)
+  "Return major mode that should be used for LANG.
+LANG is a string, and the returned major mode is a symbol."
+  (cl-find-if
+   #'markdown--lang-mode-predicate
+   (nconc (list (cdr (assoc lang markdown-code-lang-modes))
+                (cdr (assoc (downcase lang) markdown-code-lang-modes)))
+          (and (fboundp 'treesit-language-available-p)
+               (list (and (treesit-language-available-p (intern lang))
+                          (intern (concat lang "-ts-mode")))
+                     (and (treesit-language-available-p (intern (downcase lang)))
+                          (intern (concat (downcase lang) "-ts-mode")))))
+          (list
+           (intern (concat lang "-mode"))
+           (intern (concat (downcase lang) "-mode"))))))
+
+(defun markdown--lang-mode-predicate (mode)
+  (and mode
+       (fboundp mode)
+       (or
+        ;; https://github.com/jrblevin/markdown-mode/issues/787
+        ;; major-mode-remap-alist was introduced at Emacs 29.1
+        (cl-loop for pair in (bound-and-true-p major-mode-remap-alist)
+                 for func = (cdr pair)
+                 thereis (and (atom func) (eq mode func)))
+        ;; https://github.com/jrblevin/markdown-mode/issues/761
+        (cl-loop for pair in auto-mode-alist
+                 for func = (cdr pair)
+                 thereis (and (atom func) (eq mode func))))))
+
+(defun markdown-fontify-code-blocks-generic (matcher last)
+  "Add text properties to next code block from point to LAST.
+Use matching function MATCHER."
+  (when (funcall matcher last)
+    (save-excursion
+      (save-match-data
+        (let* ((start (match-beginning 0))
+               (end (match-end 0))
+               ;; Find positions outside opening and closing backquotes.
+               (bol-prev (progn (goto-char start)
+                                (if (bolp) (line-beginning-position 0) (line-beginning-position))))
+               (eol-next (progn (goto-char end)
+                                (if (bolp) (line-beginning-position 2) (line-beginning-position 3))))
+               lang)
+          (if (and markdown-fontify-code-blocks-natively
+                   (or (setq lang (markdown-code-block-lang))
+                       markdown-fontify-code-block-default-mode))
+              (markdown-fontify-code-block-natively lang start end)
+            (add-text-properties start end '(face markdown-pre-face)))
+          ;; Set background for block as well as opening and closing lines.
+          (font-lock-append-text-property
+           bol-prev eol-next 'face 'markdown-code-face)
+          ;; Set invisible property for lines before and after, including newline.
+          (add-text-properties bol-prev start '(invisible markdown-markup))
+          (add-text-properties end eol-next '(invisible markdown-markup)))))
+    t))
+
+(defun markdown-fontify-gfm-code-blocks (last)
+  "Add text properties to next GFM code block from point to LAST."
+  (markdown-fontify-code-blocks-generic 'markdown-match-gfm-code-blocks last))
+
+(defun markdown-fontify-fenced-code-blocks (last)
+  "Add text properties to next tilde fenced code block from point to LAST."
+  (markdown-fontify-code-blocks-generic 'markdown-match-fenced-code-blocks last))
+
+;; Based on `org-src-font-lock-fontify-block' from org-src.el.
+(defun markdown-fontify-code-block-natively (lang start end)
+  "Fontify given GFM or fenced code block.
+This function is called by Emacs for automatic fontification when
+`markdown-fontify-code-blocks-natively' is non-nil.  LANG is the
+language used in the block. START and END specify the block
+position."
+  (let ((lang-mode (if lang (markdown-get-lang-mode lang)
+                     markdown-fontify-code-block-default-mode)))
+    (when (fboundp lang-mode)
+      (let ((string (buffer-substring-no-properties start end))
+            (modified (buffer-modified-p))
+            (markdown-buffer (current-buffer)) pos next)
+        (remove-text-properties start end '(face nil))
+        (with-current-buffer
+            (get-buffer-create
+             (concat " markdown-code-fontification:" (symbol-name lang-mode)))
+          ;; Make sure that modification hooks are not inhibited in
+          ;; the org-src-fontification buffer in case we're called
+          ;; from `jit-lock-function' (Bug#25132).
+          (let ((inhibit-modification-hooks nil))
+            (delete-region (point-min) (point-max))
+            (insert string " ")) ;; so there's a final property change
+          (unless (eq major-mode lang-mode) (funcall lang-mode))
+          (font-lock-ensure)
+          (setq pos (point-min))
+          (while (setq next (next-single-property-change pos 'face))
+            (let ((val (get-text-property pos 'face)))
+              (when val
+                (put-text-property
+                 (+ start (1- pos)) (1- (+ start next)) 'face
+                 val markdown-buffer)))
+            (setq pos next)))
+        (add-text-properties
+         start end
+         '(font-lock-fontified t fontified t font-lock-multiline t))
+        (set-buffer-modified-p modified)))))
+
+(require 'edit-indirect nil t)
+(defvar edit-indirect-guess-mode-function)
+(defvar edit-indirect-after-commit-functions)
+
+(defun markdown--edit-indirect-after-commit-function (beg end)
+  "Corrective logic run on code block content from lines BEG to END.
+Restores code block indentation from BEG to END, and ensures trailing newlines
+at the END of code blocks."
+  ;; ensure trailing newlines
+  (goto-char end)
+  (unless (eq (char-before) ?\n)
+    (insert "\n"))
+  ;; restore code block indentation
+  (goto-char (- beg 1))
+  (let ((block-indentation (current-indentation)))
+    (when (> block-indentation 0)
+      (indent-rigidly beg end block-indentation)))
+  (font-lock-ensure))
+
+(defun markdown-edit-code-block ()
+  "Edit Markdown code block in an indirect buffer."
+  (interactive)
+  (save-excursion
+    (if (fboundp 'edit-indirect-region)
+        (let* ((bounds (markdown-get-enclosing-fenced-block-construct))
+               (begin (and bounds (not (null (nth 0 bounds))) (goto-char (nth 0 bounds)) (line-beginning-position 2)))
+               (end (and bounds(not (null (nth 1 bounds)))  (goto-char (nth 1 bounds)) (line-beginning-position 1))))
+          (if (and begin end)
+              (let* ((indentation (and (goto-char (nth 0 bounds)) (current-indentation)))
+                     (lang (markdown-code-block-lang))
+                     (mode (or (and lang (markdown-get-lang-mode lang))
+                               markdown-edit-code-block-default-mode))
+                     (edit-indirect-guess-mode-function
+                      (lambda (_parent-buffer _beg _end)
+                        (funcall mode)))
+                     (indirect-buf (edit-indirect-region begin end 'display-buffer)))
+                ;; reset `sh-shell' when indirect buffer
+                (when (and (not (member system-type '(ms-dos windows-nt)))
+                           (member mode '(shell-script-mode sh-mode))
+                           (member lang (append
+                                         (mapcar (lambda (e) (symbol-name (car e)))
+                                                 sh-ancestor-alist)
+                                         '("csh" "rc" "sh"))))
+                  (with-current-buffer indirect-buf
+                    (sh-set-shell lang)))
+                (when (> indentation 0) ;; un-indent in edit-indirect buffer
+                  (with-current-buffer indirect-buf
+                    (indent-rigidly (point-min) (point-max) (- indentation)))))
+            (user-error "Not inside a GFM or tilde fenced code block")))
+      (when (y-or-n-p "Package edit-indirect needed to edit code blocks. Install it now? ")
+        (progn (package-refresh-contents)
+               (package-install 'edit-indirect)
+               (markdown-edit-code-block))))))
+
+
+;;; Table Editing =============================================================
+
+;; These functions were originally adapted from `org-table.el'.
+
+;; General helper functions
+
+(defmacro markdown--with-gensyms (symbols &rest body)
+  (declare (debug (sexp body)) (indent 1))
+  `(let ,(mapcar (lambda (s)
+                   `(,s (make-symbol (concat "--" (symbol-name ',s)))))
+                 symbols)
+     ,@body))
+
+(defun markdown--split-string (string &optional separators)
+  "Splits STRING into substrings at SEPARATORS.
+SEPARATORS is a regular expression. If nil it defaults to
+`split-string-default-separators'. This version returns no empty
+strings if there are matches at the beginning and end of string."
+  (let ((start 0) notfirst list)
+    (while (and (string-match
+                 (or separators split-string-default-separators)
+                 string
+                 (if (and notfirst
+                          (= start (match-beginning 0))
+                          (< start (length string)))
+                     (1+ start) start))
+                (< (match-beginning 0) (length string)))
+      (setq notfirst t)
+      (or (eq (match-beginning 0) 0)
+          (and (eq (match-beginning 0) (match-end 0))
+               (eq (match-beginning 0) start))
+          (push (substring string start (match-beginning 0)) list))
+      (setq start (match-end 0)))
+    (or (eq start (length string))
+        (push (substring string start) list))
+    (nreverse list)))
+
+(defun markdown--string-width (s)
+  "Return width of string S.
+This version ignores characters with invisibility property
+`markdown-markup'."
+  (let (b)
+    (when (or (eq t buffer-invisibility-spec)
+              (member 'markdown-markup buffer-invisibility-spec))
+      (while (setq b (text-property-any
+                      0 (length s)
+                      'invisible 'markdown-markup s))
+        (setq s (concat
+                 (substring s 0 b)
+                 (substring s (or (next-single-property-change
+                                   b 'invisible s)
+                                  (length s))))))))
+  (string-width s))
+
+(defun markdown--remove-invisible-markup (s)
+  "Remove Markdown markup from string S.
+This version removes characters with invisibility property
+`markdown-markup'."
+  (let (b)
+    (while (setq b (text-property-any
+                    0 (length s)
+                    'invisible 'markdown-markup s))
+      (setq s (concat
+               (substring s 0 b)
+               (substring s (or (next-single-property-change
+                                 b 'invisible s)
+                                (length s)))))))
+  s)
+
+;; Functions for maintaining tables
+
+(defvar markdown-table-at-point-p-function #'markdown--table-at-point-p
+  "Function to decide if point is inside a table.
+
+The indirection serves to differentiate between standard markdown
+tables and gfm tables which are less strict about the markup.")
+
+(defconst markdown-table-line-regexp "^[ \t]*|"
+  "Regexp matching any line inside a table.")
+
+(defconst markdown-table-hline-regexp "^[ \t]*|[-:]"
+  "Regexp matching hline inside a table.")
+
+(defconst markdown-table-dline-regexp "^[ \t]*|[^-:]"
+  "Regexp matching dline inside a table.")
+
+(defun markdown-table-at-point-p ()
+  "Return non-nil when point is inside a table."
+  (funcall markdown-table-at-point-p-function))
+
+(defun markdown--table-at-point-p ()
+  "Return non-nil when point is inside a table."
+  (save-excursion
+    (beginning-of-line)
+    (and (looking-at-p markdown-table-line-regexp)
+         (not (markdown-code-block-at-point-p)))))
+
+(defconst gfm-table-line-regexp "^.?*|"
+  "Regexp matching any line inside a table.")
+
+(defconst gfm-table-hline-regexp "^-+\\(|-\\)+"
+  "Regexp matching hline inside a table.")
+
+;; GFM simplified tables syntax is as follows:
+;; - A header line for the column names, this is any text
+;;   separated by `|'.
+;; - Followed by a string -|-|- ..., the number of dashes is optional
+;;   but must be higher than 1. The number of separators should match
+;;   the number of columns.
+;; - Followed by the rows of data, which has the same format as the
+;;   header line.
+;; Example:
+;;
+;; foo | bar
+;; ------|---------
+;; bar | baz
+;; bar | baz
+(defun gfm--table-at-point-p ()
+  "Return non-nil when point is inside a gfm-compatible table."
+  (or (markdown--table-at-point-p)
+      (save-excursion
+        (beginning-of-line)
+        (when (looking-at-p gfm-table-line-regexp)
+          ;; we might be at the first line of the table, check if the
+          ;; line below is the hline
+          (or (save-excursion
+                (forward-line 1)
+                (looking-at-p gfm-table-hline-regexp))
+              ;; go up to find the header
+              (catch 'done
+                (while (looking-at-p gfm-table-line-regexp)
+                  (cond
+                   ((looking-at-p gfm-table-hline-regexp)
+                    (throw 'done t))
+                   ((bobp)
+                    (throw 'done nil)))
+                  (forward-line -1))
+                nil))))))
+
+(defun markdown-table-hline-at-point-p ()
+  "Return non-nil when point is on a hline in a table.
+This function assumes point is on a table."
+  (save-excursion
+    (beginning-of-line)
+    (looking-at-p markdown-table-hline-regexp)))
+
+(defun markdown-table-begin ()
+  "Find the beginning of the table and return its position.
+This function assumes point is on a table."
+  (save-excursion
+    (while (and (not (bobp))
+                (markdown-table-at-point-p))
+      (forward-line -1))
+    (unless (or (eobp)
+                (markdown-table-at-point-p))
+      (forward-line 1))
+    (point)))
+
+(defun markdown-table-end ()
+  "Find the end of the table and return its position.
+This function assumes point is on a table."
+  (save-excursion
+    (while (and (not (eobp))
+                (markdown-table-at-point-p))
+      (forward-line 1))
+    (point)))
+
+(defun markdown-table-get-dline ()
+  "Return index of the table data line at point.
+This function assumes point is on a table."
+  (let ((pos (point)) (end (markdown-table-end)) (cnt 0))
+    (save-excursion
+      (goto-char (markdown-table-begin))
+      (while (and (re-search-forward
+                   markdown-table-dline-regexp end t)
+                  (setq cnt (1+ cnt))
+                  (< (line-end-position) pos))))
+    cnt))
+
+(defun markdown--thing-at-wiki-link (pos)
+  (when markdown-enable-wiki-links
+    (save-excursion
+      (save-match-data
+        (goto-char pos)
+        (thing-at-point-looking-at markdown-regex-wiki-link)))))
+
+(defun markdown-table-get-column ()
+  "Return table column at point.
+This function assumes point is on a table."
+  (let ((pos (point)) (cnt 0))
+    (save-excursion
+      (beginning-of-line)
+      (while (search-forward "|" pos t)
+        (when (and (not (looking-back "\\\\|" (line-beginning-position)))
+                   (not (markdown--thing-at-wiki-link (match-beginning 0))))
+          (setq cnt (1+ cnt)))))
+    cnt))
+
+(defun markdown-table-get-cell (&optional n)
+  "Return the content of the cell in column N of current row.
+N defaults to column at point. This function assumes point is on
+a table."
+  (and n (markdown-table-goto-column n))
+  (skip-chars-backward "^|\n") (backward-char 1)
+  (if (looking-at "|[^|\r\n]*")
+      (let* ((pos (match-beginning 0))
+             (val (buffer-substring (1+ pos) (match-end 0))))
+        (goto-char (min (line-end-position) (+ 2 pos)))
+        ;; Trim whitespaces
+        (setq val (replace-regexp-in-string "\\`[ \t]+" "" val)
+              val (replace-regexp-in-string "[ \t]+\\'" "" val)))
+    (forward-char 1) ""))
+
+(defun markdown-table-goto-dline (n)
+  "Go to the Nth data line in the table at point.
+Return t when the line exists, nil otherwise. This function
+assumes point is on a table."
+  (goto-char (markdown-table-begin))
+  (let ((end (markdown-table-end)) (cnt 0))
+    (while (and (re-search-forward
+                 markdown-table-dline-regexp end t)
+                (< (setq cnt (1+ cnt)) n)))
+    (= cnt n)))
+
+(defun markdown-table-goto-column (n &optional on-delim)
+  "Go to the Nth column in the table line at point.
+With optional argument ON-DELIM, stop with point before the left
+delimiter of the cell. If there are less than N cells, just go
+beyond the last delimiter. This function assumes point is on a
+table."
+  (beginning-of-line 1)
+  (when (> n 0)
+    (while (and (> n 0) (search-forward "|" (line-end-position) t))
+      (when (and (not (looking-back "\\\\|" (line-beginning-position)))
+                 (not (markdown--thing-at-wiki-link (match-beginning 0))))
+        (cl-decf n)))
+    (if on-delim
+        (backward-char 1)
+      (when (looking-at " ") (forward-char 1)))))
+
+(defmacro markdown-table-save-cell (&rest body)
+  "Save cell at point, execute BODY and restore cell.
+This function assumes point is on a table."
+  (declare (debug (body)))
+  (markdown--with-gensyms (line column)
+    `(let ((,line (copy-marker (line-beginning-position)))
+           (,column (markdown-table-get-column)))
+       (unwind-protect
+           (progn ,@body)
+         (goto-char ,line)
+         (markdown-table-goto-column ,column)
+         (set-marker ,line nil)))))
+
+(defun markdown-table-blank-line (s)
+  "Convert a table line S into a line with blank cells."
+  (if (string-match "^[ \t]*|-" s)
+      (setq s (mapconcat
+               (lambda (x) (if (member x '(?| ?+)) "|" " "))
+               s ""))
+    (with-temp-buffer
+      (insert s)
+      (goto-char (point-min))
+      (when (re-search-forward "|" nil t)
+        (let ((cur (point))
+              ret)
+          (while (re-search-forward "|" nil t)
+            (when (and (not (eql (char-before (match-beginning 0)) ?\\))
+                       (not (markdown--thing-at-wiki-link (match-beginning 0))))
+              (push (make-string (- (match-beginning 0) cur) ? ) ret)
+              (setq cur (match-end 0))))
+          (format "|%s|" (string-join (nreverse ret) "|")))))))
+
+(defun markdown-table-colfmt (fmtspec)
+  "Process column alignment specifier FMTSPEC for tables."
+  (when (stringp fmtspec)
+    (mapcar (lambda (x)
+              (cond ((string-match-p "^:.*:$" x) 'c)
+                    ((string-match-p "^:"     x) 'l)
+                    ((string-match-p ":$"     x) 'r)
+                    (t 'd)))
+            (markdown--split-string fmtspec "\\s-*|\\s-*"))))
+
+(defun markdown--first-column-p (bar-pos)
+  (save-excursion
+    (save-match-data
+      (goto-char bar-pos)
+      (looking-back "^\\s-*" (line-beginning-position)))))
+
+(defun markdown--table-line-to-columns (line)
+  (with-temp-buffer
+    (insert line)
+    (goto-char (point-min))
+    (let ((cur (point))
+          ret)
+      (while (and (re-search-forward "\\s-*\\(|\\)\\s-*" nil t))
+        (when (not (markdown--face-p (match-beginning 1) '(markdown-inline-code-face)))
+          (if (markdown--first-column-p (match-beginning 1))
+              (setq cur (match-end 0))
+            (cond ((eql (char-before (match-beginning 1)) ?\\)
+                   ;; keep spaces
+                   (goto-char (match-end 1)))
+                  ((markdown--thing-at-wiki-link (match-beginning 1))) ;; do nothing
+                  (t
+                   (push (buffer-substring-no-properties cur (match-beginning 0)) ret)
+                   (setq cur (match-end 0)))))))
+      (when (< cur (length line))
+        (push (buffer-substring-no-properties cur (point-max)) ret))
+      (nreverse ret))))
+
+(defsubst markdown--is-delimiter-row (line)
+  (and (string-match-p "\\`[ \t]*|[ \t]*[-:]" line)
+       (cl-loop for c across line
+                always (member c '(?| ?- ?: ?\t ? )))))
+
+(defun markdown-table-align ()
+  "Align table at point.
+This function assumes point is on a table."
+  (interactive)
+  (let ((begin (markdown-table-begin))
+        (end (copy-marker (markdown-table-end))))
+    (markdown-table-save-cell
+     (goto-char begin)
+     (let* (fmtspec
+            ;; Store table indent
+            (indent (progn (looking-at "[ \t]*") (match-string 0)))
+            ;; Split table in lines and save column format specifier
+            (lines (mapcar (lambda (line)
+                             (if (markdown--is-delimiter-row line)
+                                 (progn (setq fmtspec (or fmtspec line)) nil)
+                               line))
+                           (markdown--split-string (buffer-substring begin end) "\n")))
+            ;; Split lines in cells
+            (cells (mapcar (lambda (l) (markdown--table-line-to-columns l))
+                           (remq nil lines)))
+            ;; Calculate maximum number of cells in a line
+            (maxcells (if cells
+                          (apply #'max (mapcar #'length cells))
+                        (user-error "Empty table")))
+            ;; Empty cells to fill short lines
+            (emptycells (make-list maxcells ""))
+            maxwidths)
+       ;; Calculate maximum width for each column
+       (dotimes (i maxcells)
+         (let ((column (mapcar (lambda (x) (or (nth i x) "")) cells)))
+           (push (apply #'max 1 (mapcar #'markdown--string-width column))
+                 maxwidths)))
+       (setq maxwidths (nreverse maxwidths))
+       ;; Process column format specifier
+       (setq fmtspec (markdown-table-colfmt fmtspec))
+       ;; Compute formats needed for output of table lines
+       (let ((hfmt (concat indent "|"))
+             (rfmt (concat indent "|"))
+             hfmt1 rfmt1 fmt)
+         (dolist (width maxwidths (setq hfmt (concat (substring hfmt 0 -1) "|")))
+           (setq fmt (pop fmtspec))
+           (cond ((equal fmt 'l) (setq hfmt1 ":%s-|" rfmt1 " %%-%ds |"))
+                 ((equal fmt 'r) (setq hfmt1 "-%s:|" rfmt1  " %%%ds |"))
+                 ((equal fmt 'c) (setq hfmt1 ":%s:|" rfmt1 " %%-%ds |"))
+                 (t              (setq hfmt1 "-%s-|" rfmt1 " %%-%ds |")))
+           (setq rfmt (concat rfmt (format rfmt1 width)))
+           (setq hfmt (concat hfmt (format hfmt1 (make-string width ?-)))))
+         ;; Replace modified lines only
+         (dolist (line lines)
+           (let ((line (if line
+                           (apply #'format rfmt (append (pop cells) emptycells))
+                         hfmt))
+                 (previous (buffer-substring (point) (line-end-position))))
+             (if (equal previous line)
+                 (forward-line)
+               (insert line "\n")
+               (delete-region (point) (line-beginning-position 2))))))
+       (set-marker end nil)))))
+
+(defun markdown-table-insert-row (&optional arg)
+  "Insert a new row above the row at point into the table.
+With optional argument ARG, insert below the current row."
+  (interactive "P")
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let* ((line (buffer-substring
+                (line-beginning-position) (line-end-position)))
+         (new (markdown-table-blank-line line)))
+    (beginning-of-line (if arg 2 1))
+    (unless (bolp) (insert "\n"))
+    (insert-before-markers new "\n")
+    (beginning-of-line 0)
+    (re-search-forward "| ?" (line-end-position) t)))
+
+(defun markdown-table-delete-row ()
+  "Delete row or horizontal line at point from the table."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let ((col (current-column)))
+    (kill-region (line-beginning-position)
+                 (min (1+ (line-end-position)) (point-max)))
+    (unless (markdown-table-at-point-p) (beginning-of-line 0))
+    (move-to-column col)))
+
+(defun markdown-table-move-row (&optional up)
+  "Move table line at point down.
+With optional argument UP, move it up."
+  (interactive "P")
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let* ((col (current-column)) (pos (point))
+         (tonew (if up 0 2)) txt)
+    (beginning-of-line tonew)
+    (unless (markdown-table-at-point-p)
+      (goto-char pos) (user-error "Cannot move row further"))
+    (goto-char pos) (beginning-of-line 1) (setq pos (point))
+    (setq txt (buffer-substring (point) (1+ (line-end-position))))
+    (delete-region (point) (1+ (line-end-position)))
+    (beginning-of-line tonew)
+    (insert txt) (beginning-of-line 0)
+    (move-to-column col)))
+
+(defun markdown-table-move-row-up ()
+  "Move table row at point up."
+  (interactive)
+  (markdown-table-move-row 'up))
+
+(defun markdown-table-move-row-down ()
+  "Move table row at point down."
+  (interactive)
+  (markdown-table-move-row nil))
+
+(defun markdown-table-insert-column ()
+  "Insert a new table column."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let* ((col (max 1 (markdown-table-get-column)))
+         (begin (markdown-table-begin))
+         (end (copy-marker (markdown-table-end))))
+    (markdown-table-save-cell
+     (goto-char begin)
+     (while (< (point) end)
+       (markdown-table-goto-column col t)
+       (if (markdown-table-hline-at-point-p)
+           (insert "|---")
+         (insert "|   "))
+       (forward-line)))
+    (set-marker end nil)
+    (when markdown-table-align-p
+      (markdown-table-align))))
+
+(defun markdown-table-delete-column ()
+  "Delete column at point from table."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let ((col (markdown-table-get-column))
+        (begin (markdown-table-begin))
+        (end (copy-marker (markdown-table-end))))
+    (markdown-table-save-cell
+     (goto-char begin)
+     (while (< (point) end)
+       (markdown-table-goto-column col t)
+       (and (looking-at "|\\(?:\\\\|\\|[^|\n]\\)+|")
+            (replace-match "|"))
+       (forward-line)))
+    (set-marker end nil)
+    (markdown-table-goto-column (max 1 (1- col)))
+    (when markdown-table-align-p
+      (markdown-table-align))))
+
+(defun markdown-table-move-column (&optional left)
+  "Move table column at point to the right.
+With optional argument LEFT, move it to the left."
+  (interactive "P")
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let* ((col (markdown-table-get-column))
+         (col1 (if left (1- col) col))
+         (colpos (if left (1- col) (1+ col)))
+         (begin (markdown-table-begin))
+         (end (copy-marker (markdown-table-end))))
+    (when (and left (= col 1))
+      (user-error "Cannot move column further left"))
+    (when (and (not left) (looking-at "[^|\n]*|[^|\n]*$"))
+      (user-error "Cannot move column further right"))
+    (markdown-table-save-cell
+     (goto-char begin)
+     (while (< (point) end)
+       (markdown-table-goto-column col1 t)
+       (when (looking-at "|\\(\\(?:\\\\|\\|[^|\n]\\|\\)+\\)|\\(\\(?:\\\\|\\|[^|\n]\\|\\)+\\)|")
+         (replace-match "|\\2|\\1|"))
+       (forward-line)))
+    (set-marker end nil)
+    (markdown-table-goto-column colpos)
+    (when markdown-table-align-p
+      (markdown-table-align))))
+
+(defun markdown-table-move-column-left ()
+  "Move table column at point to the left."
+  (interactive)
+  (markdown-table-move-column 'left))
+
+(defun markdown-table-move-column-right ()
+  "Move table column at point to the right."
+  (interactive)
+  (markdown-table-move-column nil))
+
+(defun markdown-table-next-row ()
+  "Go to the next row (same column) in the table.
+Create new table lines if required."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (if (or (looking-at "[ \t]*$")
+          (save-excursion (skip-chars-backward " \t") (bolp)))
+      (newline)
+    (when markdown-table-align-p
+      (markdown-table-align))
+    (let ((col (markdown-table-get-column)))
+      (beginning-of-line 2)
+      (if (or (not (markdown-table-at-point-p))
+              (markdown-table-hline-at-point-p))
+          (progn
+            (beginning-of-line 0)
+            (markdown-table-insert-row 'below)))
+      (markdown-table-goto-column col)
+      (skip-chars-backward "^|\n\r")
+      (when (looking-at " ") (forward-char 1)))))
+
+(defun markdown-table-forward-cell ()
+  "Go to the next cell in the table.
+Create new table lines if required."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (when markdown-table-align-p
+    (markdown-table-align))
+  (let ((end (markdown-table-end)))
+    (when (markdown-table-hline-at-point-p) (end-of-line 1))
+    (condition-case nil
+        (progn
+          (re-search-forward "\\(?:^\\|[^\\]\\)|" end)
+          (when (looking-at "[ \t]*$")
+            (re-search-forward "\\(?:^\\|[^\\]:\\)|" end))
+          (when (and (looking-at "[-:]")
+                     (re-search-forward "^\\(?:[ \t]*\\|[^\\]\\)|\\([^-:]\\)" end t))
+            (goto-char (match-beginning 1)))
+          (if (looking-at "[-:]")
+              (progn
+                (beginning-of-line 0)
+                (markdown-table-insert-row 'below))
+            (when (looking-at " ") (forward-char 1))))
+      (error (markdown-table-insert-row 'below)))))
+
+(defun markdown-table-backward-cell ()
+  "Go to the previous cell in the table."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (when markdown-table-align-p
+    (markdown-table-align))
+  (when (markdown-table-hline-at-point-p) (beginning-of-line 1))
+  (condition-case nil
+      (progn
+        (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin))
+        ;; When this function is called while in the first cell in a
+        ;; table, the point will now be at the beginning of a line. In
+        ;; this case, we need to move past one additional table
+        ;; boundary, the end of the table on the previous line.
+        (when (= (point) (line-beginning-position))
+          (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin)))
+        (re-search-backward "\\(?:^\\|[^\\]\\)|" (markdown-table-begin)))
+    (error (user-error "Cannot move to previous table cell")))
+  (when (looking-at "\\(?:^\\|[^\\]\\)| ?") (goto-char (match-end 0)))
+
+  ;; This may have dropped point on the hline.
+  (when (markdown-table-hline-at-point-p)
+    (markdown-table-backward-cell)))
+
+(defun markdown-table-transpose ()
+  "Transpose table at point.
+Horizontal separator lines will be eliminated."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  (let* ((table (buffer-substring-no-properties
+                 (markdown-table-begin) (markdown-table-end)))
+         ;; Convert table to Lisp structure
+         (table (delq nil
+                      (mapcar
+                       (lambda (x)
+                         (unless (string-match-p
+                                  markdown-table-hline-regexp x)
+                           (markdown--table-line-to-columns x)))
+                       (markdown--split-string table "[ \t]*\n[ \t]*"))))
+         (dline_old (markdown-table-get-dline))
+         (col_old (markdown-table-get-column))
+         (contents (mapcar (lambda (_)
+                             (let ((tp table))
+                               (mapcar
+                                (lambda (_)
+                                  (prog1
+                                      (pop (car tp))
+                                    (setq tp (cdr tp))))
+                                table)))
+                           (car table))))
+    (goto-char (markdown-table-begin))
+    (save-excursion
+      (re-search-forward "|") (backward-char)
+      (delete-region (point) (markdown-table-end))
+      (insert (mapconcat
+               (lambda(x)
+                 (concat "| " (mapconcat 'identity x " | " ) " |\n"))
+               contents "")))
+    (markdown-table-goto-dline col_old)
+    (markdown-table-goto-column dline_old))
+  (when markdown-table-align-p
+    (markdown-table-align)))
+
+(defun markdown-table-sort-lines (&optional sorting-type)
+  "Sort table lines according to the column at point.
+
+The position of point indicates the column to be used for
+sorting, and the range of lines is the range between the nearest
+horizontal separator lines, or the entire table of no such lines
+exist. If point is before the first column, user will be prompted
+for the sorting column. If there is an active region, the mark
+specifies the first line and the sorting column, while point
+should be in the last line to be included into the sorting.
+
+The command then prompts for the sorting type which can be
+alphabetically or numerically. Sorting in reverse order is also
+possible.
+
+If SORTING-TYPE is specified when this function is called from a
+Lisp program, no prompting will take place. SORTING-TYPE must be
+a character, any of (?a ?A ?n ?N) where the capital letters
+indicate that sorting should be done in reverse order."
+  (interactive)
+  (unless (markdown-table-at-point-p)
+    (user-error "Not at a table"))
+  ;; Set sorting type and column used for sorting
+  (let ((column (let ((c (markdown-table-get-column)))
+                  (cond ((> c 0) c)
+                        ((called-interactively-p 'any)
+                         (read-number "Use column N for sorting: "))
+                        (t 1))))
+        (sorting-type
+         (or sorting-type
+             (progn
+               ;; workaround #641
+               ;; Emacs < 28 hides prompt message by another message. This erases it.
+               (message "")
+               (read-char-exclusive
+                "Sort type: [a]lpha [n]umeric (A/N means reversed): ")))))
+    (save-restriction
+      ;; Narrow buffer to appropriate sorting area
+      (if (region-active-p)
+          (narrow-to-region
+           (save-excursion
+             (progn
+               (goto-char (region-beginning)) (line-beginning-position)))
+           (save-excursion
+             (progn
+               (goto-char (region-end)) (line-end-position))))
+        (let ((start (markdown-table-begin))
+              (end (markdown-table-end)))
+          (narrow-to-region
+           (save-excursion
+             (if (re-search-backward
+                  markdown-table-hline-regexp start t)
+                 (line-beginning-position 2)
+               start))
+           (if (save-excursion (re-search-forward
+                                markdown-table-hline-regexp end t))
+               (match-beginning 0)
+             end))))
+      ;; Determine arguments for `sort-subr'
+      (let* ((extract-key-from-cell
+              (cl-case sorting-type
+                ((?a ?A) #'markdown--remove-invisible-markup) ;; #'identity)
+                ((?n ?N) #'string-to-number)
+                (t (user-error "Invalid sorting type: %c" sorting-type))))
+             (predicate
+              (cl-case sorting-type
+                ((?n ?N) #'<)
+                ((?a ?A) #'string<))))
+        ;; Sort selected area
+        (goto-char (point-min))
+        (sort-subr (memq sorting-type '(?A ?N))
+                   (lambda ()
+                     (forward-line)
+                     (while (and (not (eobp))
+                                 (not (looking-at
+                                       markdown-table-dline-regexp)))
+                       (forward-line)))
+                   #'end-of-line
+                   (lambda ()
+                     (funcall extract-key-from-cell
+                              (markdown-table-get-cell column)))
+                   nil
+                   predicate)
+        (goto-char (point-min))))))
+
+(defun markdown-table-convert-region (begin end &optional separator)
+  "Convert region from BEGIN to END to table with SEPARATOR.
+
+If every line contains at least one TAB character, the function
+assumes that the material is tab separated (TSV). If every line
+contains a comma, comma-separated values (CSV) are assumed. If
+not, lines are split at whitespace into cells.
+
+You can use a prefix argument to force a specific separator:
+\\[universal-argument] once forces CSV, \\[universal-argument]
+twice forces TAB, and \\[universal-argument] three times will
+prompt for a regular expression to match the separator, and a
+numeric argument N indicates that at least N consecutive
+spaces, or alternatively a TAB should be used as the separator."
+
+  (interactive "r\nP")
+  (let* ((begin (min begin end)) (end (max begin end)) re)
+    (goto-char begin) (beginning-of-line 1)
+    (setq begin (point-marker))
+    (goto-char end)
+    (if (bolp) (backward-char 1) (end-of-line 1))
+    (setq end (point-marker))
+    (when (equal separator '(64))
+      (setq separator (read-regexp "Regexp for cell separator: ")))
+    (unless separator
+      ;; Get the right cell separator
+      (goto-char begin)
+      (setq separator
+            (cond
+             ((not (re-search-forward "^[^\n\t]+$" end t)) '(16))
+             ((not (re-search-forward "^[^\n,]+$" end t)) '(4))
+             (t 1))))
+    (goto-char begin)
+    (if (equal separator '(4))
+        ;; Parse CSV
+        (while (< (point) end)
+          (cond
+           ((looking-at "^") (insert "| "))
+           ((looking-at "[ \t]*$") (replace-match " |") (beginning-of-line 2))
+           ((looking-at "[ \t]*\"\\([^\"\n]*\\)\"")
+            (replace-match "\\1") (if (looking-at "\"") (insert "\"")))
+           ((looking-at "[^,\n]+") (goto-char (match-end 0)))
+           ((looking-at "[ \t]*,") (replace-match " | "))
+           (t (beginning-of-line 2))))
+      (setq re
+            (cond
+             ((equal separator '(4))  "^\\|\"?[ \t]*,[ \t]*\"?")
+             ((equal separator '(16)) "^\\|\t")
+             ((integerp separator)
+              (if (< separator 1)
+                  (user-error "Cell separator must contain one or more spaces")
+                (format "^ *\\| *\t *\\| \\{%d,\\}\\|$" separator)))
+             ((stringp separator) (format "^ *\\|%s" separator))
+             (t (error "Invalid cell separator"))))
+      (let (finish)
+        (while (and (not finish) (re-search-forward re end t))
+          (if (eolp)
+              (progn
+                (replace-match "|" t t)
+                (forward-line 1)
+                (when (eobp)
+                  (setq finish t)))
+            (replace-match "| " t t)))))
+    (goto-char begin)
+    (when markdown-table-align-p
+      (markdown-table-align))))
+
+(defun markdown-insert-table (&optional rows columns align)
+  "Insert an empty pipe table.
+Optional arguments ROWS, COLUMNS, and ALIGN specify number of
+rows and columns and the column alignment."
+  (interactive)
+  (let* ((rows (or rows (read-number "Number of Rows: ")))
+         (columns (or columns (read-number "Number of Columns: ")))
+         (align (or align (read-string "Alignment ([l]eft, [r]ight, [c]enter, or RET for default): ")))
+         (align (cond ((equal align "l") ":--")
+                      ((equal align "r") "--:")
+                      ((equal align "c") ":-:")
+                      (t "---")))
+         (pos (point))
+         (indent (make-string (current-column) ?\ ))
+         (line (concat
+                (apply 'concat indent "|"
+                       (make-list columns "   |")) "\n"))
+         (hline (apply 'concat indent "|"
+                       (make-list columns (concat align "|")))))
+    (if (string-match
+         "^[ \t]*$" (buffer-substring-no-properties
+                     (line-beginning-position) (point)))
+        (beginning-of-line 1)
+      (newline))
+    (dotimes (_ rows) (insert line))
+    (goto-char pos)
+    (if (> rows 1)
+        (progn
+          (end-of-line 1) (insert (concat "\n" hline)) (goto-char pos)))
+    (markdown-table-forward-cell)))
+
+
+;;; ElDoc Support =============================================================
+
+(defun markdown-eldoc-function (&rest _ignored)
+  "Return a helpful string when appropriate based on context.
+* Report URL when point is at a hidden URL.
+* Report language name when point is a code block with hidden markup."
+  (cond
+   ;; Hidden URL or reference for inline link
+   ((and (or (thing-at-point-looking-at markdown-regex-link-inline)
+             (thing-at-point-looking-at markdown-regex-link-reference))
+         (or markdown-hide-urls markdown-hide-markup))
+    (let* ((imagep (string-equal (match-string 1) "!"))
+           (referencep (string-equal (match-string 5) "["))
+           (link (match-string-no-properties 6))
+           (edit-keys (markdown--substitute-command-keys
+                       (if imagep
+                           "\\[markdown-insert-image]"
+                         "\\[markdown-insert-link]")))
+           (edit-str (propertize edit-keys 'face 'font-lock-constant-face))
+           (object (if referencep "reference" "URL")))
+      (format "Hidden %s (%s to edit): %s" object edit-str
+              (if referencep
+                  (concat
+                   (propertize "[" 'face 'markdown-markup-face)
+                   (propertize link 'face 'markdown-reference-face)
+                   (propertize "]" 'face 'markdown-markup-face))
+                (propertize link 'face 'markdown-url-face)))))
+   ;; Hidden language name for fenced code blocks
+   ((and (markdown-code-block-at-point-p)
+         (not (get-text-property (point) 'markdown-pre))
+         markdown-hide-markup)
+    (let ((lang (save-excursion (markdown-code-block-lang))))
+      (unless lang (setq lang "[unspecified]"))
+      (format "Hidden code block language: %s (%s to toggle markup)"
+              (propertize lang 'face 'markdown-language-keyword-face)
+              (markdown--substitute-command-keys
+               "\\[markdown-toggle-markup-hiding]"))))))
+
+(defun markdown--image-media-handler (mimetype data)
+  (let* ((ext (symbol-name (mailcap-mime-type-to-extension mimetype)))
+         (filename (read-string "Insert filename for image: "))
+         (link-text (read-string "Link text: "))
+         (filepath (file-name-with-extension filename ext))
+         (dir (file-name-directory filepath)))
+    (when (and dir (not (file-directory-p dir)))
+      (make-directory dir t))
+    (with-temp-file filepath
+      (insert data))
+    (when (string-match-p "\\s-" filepath)
+      (setq filepath (concat "<" filepath ">")))
+    (markdown-insert-inline-image link-text filepath)))
+
+(defun markdown--file-media-handler (_mimetype data)
+  (let* ((data (split-string data "[\0\r\n]" t "^file://"))
+         (files (cdr data)))
+    (while (not (null files))
+      (let* ((file (url-unhex-string (car files)))
+             (file (file-relative-name file))
+             (prompt (format "Link text(%s): " (file-name-nondirectory file)))
+             (link-text (read-string prompt)))
+        (when (string-match-p "\\s-" file)
+          (setq file (concat "<" file ">")))
+        (markdown-insert-inline-image link-text file)
+        (when (not (null (cdr files)))
+          (insert " "))
+        (setq files (cdr files))))))
+
+(defun markdown--dnd-local-file-handler (url _action)
+  (require 'mailcap)
+  (require 'dnd)
+  (let* ((filename (dnd-get-local-file-name url))
+         (mimetype (mailcap-file-name-to-mime-type filename))
+         (file (file-relative-name filename))
+         (link-text "link text"))
+    (when (string-match-p "\\s-" file)
+      (setq file (concat "<" file ">")))
+    (if (string-prefix-p "image/" mimetype)
+        (markdown-insert-inline-image link-text file)
+      (markdown-insert-inline-link link-text file))))
+
+
+;;; Mode Definition  ==========================================================
+
+(defun markdown-show-version ()
+  "Show the version number in the minibuffer."
+  (interactive)
+  (message "markdown-mode, version %s" markdown-mode-version))
+
+(defun markdown-mode-info ()
+  "Open the `markdown-mode' homepage."
+  (interactive)
+  (browse-url "https://jblevins.org/projects/markdown-mode/"))
+
+;;;###autoload
+(define-derived-mode markdown-mode text-mode "Markdown"
+  "Major mode for editing Markdown files."
+  (when buffer-read-only
+    (when (or (not (buffer-file-name)) (file-writable-p (buffer-file-name)))
+      (setq-local buffer-read-only nil)))
+  ;; Natural Markdown tab width
+  (setq tab-width 4)
+  ;; Comments
+  (setq-local comment-start "<!-- ")
+  (setq-local comment-end " -->")
+  (setq-local comment-start-skip "<!--[ \t]*")
+  (setq-local comment-column 0)
+  (setq-local comment-auto-fill-only-comments nil)
+  (setq-local comment-use-syntax t)
+  ;; Sentence
+  (setq-local sentence-end-base "[.?!…‽][]\"'”’)}»›*_`~]*")
+  ;; Syntax
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'markdown-syntax-propertize-extend-region nil t)
+  (add-hook 'jit-lock-after-change-extend-region-functions
+            #'markdown-font-lock-extend-region-function t t)
+  (setq-local syntax-propertize-function #'markdown-syntax-propertize)
+  (syntax-propertize (point-max)) ;; Propertize before hooks run, etc.
+  ;; Font lock.
+  (setq font-lock-defaults
+        '(markdown-mode-font-lock-keywords
+          nil nil nil nil
+          (font-lock-multiline . t)
+          (font-lock-syntactic-face-function . markdown-syntactic-face)
+          (font-lock-extra-managed-props
+           . (composition display invisible rear-nonsticky
+                          keymap help-echo mouse-face))))
+  (if markdown-hide-markup
+      (add-to-invisibility-spec 'markdown-markup)
+    (remove-from-invisibility-spec 'markdown-markup))
+  ;; Wiki links
+  (markdown-setup-wiki-link-hooks)
+  ;; Math mode
+  (when markdown-enable-math (markdown-toggle-math t))
+  ;; Add a buffer-local hook to reload after file-local variables are read
+  (add-hook 'hack-local-variables-hook #'markdown-handle-local-variables nil t)
+  ;; For imenu support
+  (setq imenu-create-index-function
+        (if markdown-nested-imenu-heading-index
+            #'markdown-imenu-create-nested-index
+          #'markdown-imenu-create-flat-index))
+
+  ;; Defun movement
+  (setq-local beginning-of-defun-function #'markdown-beginning-of-defun)
+  (setq-local end-of-defun-function #'markdown-end-of-defun)
+  ;; Paragraph filling
+  (setq-local fill-paragraph-function #'markdown-fill-paragraph)
+  (setq-local paragraph-start
+              ;; Should match start of lines that start or separate paragraphs
+              (mapconcat #'identity
+                         '(
+                           "\f" ; starts with a literal line-feed
+                           "[ \t\f]*$" ; space-only line
+                           "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
+                           "[ \t]*[*+-][ \t]+" ; unordered list item
+                           "[ \t]*\\(?:[0-9]+\\|#\\)\\.[ \t]+" ; ordered list item
+                           "[ \t]*\\[\\S-*\\]:[ \t]+" ; link ref def
+                           "[ \t]*:[ \t]+" ; definition
+                           "^|" ; table or Pandoc line block
+                           )
+                         "\\|"))
+  (setq-local paragraph-separate
+              ;; Should match lines that separate paragraphs without being
+              ;; part of any paragraph:
+              (mapconcat #'identity
+                         '("[ \t\f]*$" ; space-only line
+                           "\\(?:[ \t]*>\\)+[ \t\f]*$"; empty line in blockquote
+                           ;; The following is not ideal, but the Fill customization
+                           ;; options really only handle paragraph-starting prefixes,
+                           ;; not paragraph-ending suffixes:
+                           ".*  $" ; line ending in two spaces
+                           "^#+"
+                           "^\\(?:   \\)?[-=]+[ \t]*$" ;; setext
+                           "[ \t]*\\[\\^\\S-*\\]:[ \t]*$") ; just the start of a footnote def
+                         "\\|"))
+  (setq-local adaptive-fill-first-line-regexp "\\`[ \t]*[A-Z]?>[ \t]*?\\'")
+  (setq-local adaptive-fill-regexp "\\s-*")
+  (setq-local adaptive-fill-function #'markdown-adaptive-fill-function)
+  (setq-local fill-forward-paragraph-function #'markdown-fill-forward-paragraph)
+  ;; Outline mode
+  (setq-local outline-regexp markdown-regex-header)
+  (setq-local outline-level #'markdown-outline-level)
+  ;; Cause use of ellipses for invisible text.
+  (add-to-invisibility-spec '(outline . t))
+  ;; ElDoc support
+  (if (boundp 'eldoc-documentation-functions)
+      (add-hook 'eldoc-documentation-functions #'markdown-eldoc-function nil t)
+    (add-function :before-until (local 'eldoc-documentation-function)
+                  #'markdown-eldoc-function))
+  ;; Inhibiting line-breaking:
+  ;; Separating out each condition into a separate function so that users can
+  ;; override if desired (with remove-hook)
+  (add-hook 'fill-nobreak-predicate
+            #'markdown-line-is-reference-definition-p nil t)
+  (add-hook 'fill-nobreak-predicate
+            #'markdown-pipe-at-bol-p nil t)
+
+  ;; Indentation
+  (setq-local indent-line-function markdown-indent-function)
+  (setq-local indent-region-function #'markdown--indent-region)
+
+  ;; Flyspell
+  (setq-local flyspell-generic-check-word-predicate
+              #'markdown-flyspell-check-word-p)
+
+  ;; Electric quoting
+  (add-hook 'electric-quote-inhibit-functions
+            #'markdown--inhibit-electric-quote nil :local)
+
+  ;; drag and drop handler
+  (setq-local dnd-protocol-alist  (cons '("^file:///" . markdown--dnd-local-file-handler)
+                                        dnd-protocol-alist))
+
+  ;; media handler
+  (when (version< "29" emacs-version)
+    (yank-media-handler "image/.*" #'markdown--image-media-handler)
+    ;; TODO support other than GNOME, like KDE etc
+    (yank-media-handler "x-special/gnome-copied-files" #'markdown--file-media-handler))
+
+  ;; Make checkboxes buttons
+  (when markdown-make-gfm-checkboxes-buttons
+    (markdown-make-gfm-checkboxes-buttons (point-min) (point-max))
+    (add-hook 'after-change-functions #'markdown-gfm-checkbox-after-change-function t t)
+    (add-hook 'change-major-mode-hook #'markdown-remove-gfm-checkbox-overlays t t))
+
+  ;; edit-indirect
+  (add-hook 'edit-indirect-after-commit-functions
+            #'markdown--edit-indirect-after-commit-function
+            nil 'local)
+
+  ;; Marginalized headings
+  (when markdown-marginalize-headers
+    (add-hook 'window-configuration-change-hook
+              #'markdown-marginalize-update-current nil t))
+
+  ;; add live preview export hook
+  (add-hook 'after-save-hook #'markdown-live-preview-if-markdown t t)
+  (add-hook 'kill-buffer-hook #'markdown-live-preview-remove-on-kill t t)
+
+  ;; Add a custom keymap for `visual-line-mode' so that activating
+  ;; this minor mode does not override markdown-mode's keybindings.
+  ;; FIXME: Probably `visual-line-mode' should take care of this.
+  (let ((oldmap (cdr (assoc 'visual-line-mode minor-mode-map-alist)))
+        (newmap (make-sparse-keymap)))
+    (set-keymap-parent newmap oldmap)
+    (define-key newmap [remap move-beginning-of-line] nil)
+    (define-key newmap [remap move-end-of-line] nil)
+    (make-local-variable 'minor-mode-overriding-map-alist)
+    (push `(visual-line-mode . ,newmap) minor-mode-overriding-map-alist)))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist
+             '("\\.\\(?:md\\|markdown\\|mkd\\|mdown\\|mkdn\\|mdwn\\)\\'" . markdown-mode))
+
+
+;;; GitHub Flavored Markdown Mode  ============================================
+
+(defun gfm--electric-pair-fence-code-block ()
+  (when (and electric-pair-mode
+             (not markdown-gfm-use-electric-backquote)
+             (eql last-command-event ?`)
+             (let ((count 0))
+               (while (eql (char-before (- (point) count)) ?`)
+                 (cl-incf count))
+               (= count 3))
+             (eql (char-after) ?`))
+    (save-excursion (insert (make-string 2 ?`)))))
+
+(defvar gfm-mode-hook nil
+  "Hook run when entering GFM mode.")
+
+;;;###autoload
+(define-derived-mode gfm-mode markdown-mode "GFM"
+  "Major mode for editing GitHub Flavored Markdown files."
+  (setq markdown-link-space-sub-char "-")
+  (setq markdown-wiki-link-search-subdirectories t)
+  (setq-local markdown-table-at-point-p-function #'gfm--table-at-point-p)
+  (add-hook 'post-self-insert-hook #'gfm--electric-pair-fence-code-block 'append t)
+  (markdown-gfm-parse-buffer-for-languages))
+
+
+;;; Viewing modes =============================================================
+
+(defcustom markdown-hide-markup-in-view-modes t
+  "Enable hidden markup mode in `markdown-view-mode' and `gfm-view-mode'."
+  :group 'markdown
+  :type 'boolean
+  :safe #'booleanp)
+
+(defvar markdown-view-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map (kbd "p") #'markdown-outline-previous)
+    (define-key map (kbd "n") #'markdown-outline-next)
+    (define-key map (kbd "f") #'markdown-outline-next-same-level)
+    (define-key map (kbd "b") #'markdown-outline-previous-same-level)
+    (define-key map (kbd "u") #'markdown-outline-up)
+    (define-key map (kbd "DEL") #'scroll-down-command)
+    (define-key map (kbd "SPC") #'scroll-up-command)
+    (define-key map (kbd ">") #'end-of-buffer)
+    (define-key map (kbd "<") #'beginning-of-buffer)
+    (define-key map (kbd "q") #'kill-this-buffer)
+    (define-key map (kbd "?") #'describe-mode)
+    map)
+  "Keymap for `markdown-view-mode'.")
+
+(defun markdown--filter-visible (beg end &optional delete)
+  (let ((result "")
+        (invisible-faces '(markdown-header-delimiter-face markdown-header-rule-face)))
+    (while (< beg end)
+      (when (markdown--face-p beg invisible-faces)
+        (cl-incf beg)
+        (while (and (markdown--face-p beg invisible-faces) (< beg end))
+          (cl-incf beg)))
+      (let ((next (next-single-char-property-change beg 'invisible)))
+        (unless (get-char-property beg 'invisible)
+          (setq result (concat result (buffer-substring beg (min end next)))))
+        (setq beg next)))
+    (prog1 result
+      (when delete
+        (let ((inhibit-read-only t))
+          (delete-region beg end))))))
+
+;;;###autoload
+(define-derived-mode markdown-view-mode markdown-mode "Markdown-View"
+  "Major mode for viewing Markdown content."
+  (setq-local markdown-hide-markup markdown-hide-markup-in-view-modes)
+  (add-to-invisibility-spec 'markdown-markup)
+  (setq-local filter-buffer-substring-function #'markdown--filter-visible)
+  (read-only-mode 1))
+
+(defvar gfm-view-mode-map
+  markdown-view-mode-map
+  "Keymap for `gfm-view-mode'.")
+
+;;;###autoload
+(define-derived-mode gfm-view-mode gfm-mode "GFM-View"
+  "Major mode for viewing GitHub Flavored Markdown content."
+  (setq-local markdown-hide-markup markdown-hide-markup-in-view-modes)
+  (setq-local markdown-fontify-code-blocks-natively t)
+  (setq-local filter-buffer-substring-function #'markdown--filter-visible)
+  (add-to-invisibility-spec 'markdown-markup)
+  (read-only-mode 1))
+
+
+;;; Live Preview Mode  ========================================================
+;;;###autoload
+(define-minor-mode markdown-live-preview-mode
+  "Toggle native previewing on save for a specific markdown file."
+  :lighter " MD-Preview"
+  (if markdown-live-preview-mode
+      (if (markdown-live-preview-get-filename)
+          (markdown-display-buffer-other-window (markdown-live-preview-export))
+        (markdown-live-preview-mode -1)
+        (user-error "Buffer %s does not visit a file" (current-buffer)))
+    (markdown-live-preview-remove)))
+
+
+(provide 'markdown-mode)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; coding: utf-8
+;; End:
+;;; markdown-mode.el ends here
diff --git a/emacs/elpa/markdown-mode-20240501.1057/markdown-mode.elc b/emacs/elpa/markdown-mode-20240501.1057/markdown-mode.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-pkg.el b/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-pkg.el
@@ -1,14 +0,0 @@
-(define-package "nerd-icons" "20240412.1831" "Emacs Nerd Font Icons Library"
-  '((emacs "24.3"))
-  :commit "fb395120e9de33b276d16caaccaefd98d4340b92" :authors
-  '(("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com"))
-  :maintainers
-  '(("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com"))
-  :maintainer
-  '("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")
-  :keywords
-  '("lisp")
-  :url "https://github.com/rainstormstudio/nerd-icons.el")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons.el b/emacs/elpa/nerd-icons-20240412.1831/nerd-icons.el
@@ -1,1308 +0,0 @@
-;;; nerd-icons.el --- Emacs Nerd Font Icons Library -*- lexical-binding: t -*-
-
-;; Copyright (C) 2023 Hongyu Ding <rainstormstudio@yahoo.com>
-
-;; Author: Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang <seagle0128@gmail.com>
-;; Keywords: lisp
-;; Version: 0.1.0
-;; Package-Requires: ((emacs "24.3"))
-;; URL: https://github.com/rainstormstudio/nerd-icons.el
-;; Keywords: convenient, lisp
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This package was inspired by
-
-;; - `all-the-icons', found at https://github.com/Alexander-Miller/treemacs/blob/master/src/extra/treemacs-all-the-icons.el
-;; - `vim-devicons' for Vim, found at https://github.com/ryanoasis/vim-devicons
-;; - `nvim-web-devicons' for NeoVim, found at https://github.com/nvim-tree/nvim-web-devicons
-
-;; This package provides an interface to the Nerd Fonts
-
-;; - `nerd-fonts', found at https://github.com/ryanoasis/nerd-fonts
-
-;;; Code:
-
-(require 'cl-lib)
-
-(require 'nerd-icons-data)
-(require 'nerd-icons-faces)
-
-(declare-function set-fontset-font "src/fontset.c")
-
-(defgroup nerd-icons nil
-  "Manage how Nerd Fonts formats icons."
-  :prefix "nerd-icons-"
-  :group 'appearance
-  :group 'convenience)
-
-(defcustom nerd-icons-color-icons t
-  "Whether or not to include a foreground color when formatting the icon."
-  :group 'nerd-icons
-  :type 'boolean)
-
-(defcustom nerd-icons-scale-factor 1.0
-  "The base Scale Factor for the `height' face property of an icon."
-  :group 'nerd-icons
-  :type 'number)
-
-(defcustom nerd-icons-default-adjust 0.0
-  "The default adjustment to be made to the `raise' display property of an icon."
-  :group 'nerd-icons
-  :type 'number)
-
-(defcustom nerd-icons--cache-limit 2048
-  "Maximum cache size for functions cached by `nerd-icons-cache'."
-  :group 'nerd-icons
-  :type 'integer)
-
-(defcustom nerd-icons-font-family "Symbols Nerd Font Mono"
-  "The Nerd Font for display icons."
-  :group 'nerd-icons
-  :type 'string)
-
-(defcustom nerd-icons-fonts-subdirectory nil
-  "The subdirectory within the system fonts folder where the icons are installed."
-  :group 'nerd-icons
-  :type 'directory)
-
-(defvar nerd-icons-font-names '("NFM.ttf")
-  "List of defined font file names.")
-
-(defvar nerd-icons-glyph-sets '() "List of defined icon glyph sets.")
-
-(defvar nerd-icons-extension-icon-alist
-  '(
-    ("fish"           nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-lpink)
-    ("zsh"            nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-lcyan)
-    ("sh"             nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-purple)
-    ("bat"            nerd-icons-codicon "nf-cod-terminal_cmd"   :face nerd-icons-lsilver)
-    ("cmd"            nerd-icons-codicon "nf-cod-terminal_cmd"   :face nerd-icons-lsilver)
-    ;; Meta
-    ("tags"           nerd-icons-octicon "nf-oct-tag"            :face nerd-icons-blue)
-    ("log"            nerd-icons-octicon "nf-oct-log"            :face nerd-icons-maroon)
-    ;; Config
-    ("node"           nerd-icons-devicon "nf-dev-nodejs_small"   :face nerd-icons-green)
-    ("babelrc"        nerd-icons-mdicon "nf-md-babel"            :face nerd-icons-yellow)
-    ("bashrc"         nerd-icons-mdicon "nf-md-bash"             :face nerd-icons-dpink)
-    ("bowerrc"        nerd-icons-devicon "nf-dev-bower"          :face nerd-icons-silver)
-    ("cr"             nerd-icons-sucicon "nf-seti-crystal"       :face nerd-icons-yellow)
-    ("ecr"            nerd-icons-sucicon "nf-seti-crystal"       :face nerd-icons-yellow)
-    ("ini"            nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
-    ("properties"     nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
-    ("eslintignore"   nerd-icons-mdicon "nf-md-eslint"           :face nerd-icons-purple)
-    ("eslint"         nerd-icons-mdicon "nf-md-eslint"           :face nerd-icons-lpurple)
-    ("git"            nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
-    ("gitattributes"  nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
-    ("gitignore"      nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
-    ("gitmodules"     nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
-    ("mk"             nerd-icons-devicon "nf-dev-gnu"            :face nerd-icons-dorange)
-    ;; ("cmake"    nerd-icons-devicon "cmake") TODO: cmake
-    ("dockerignore"   nerd-icons-devicon "nf-dev-docker"         :face nerd-icons-dblue)
-    ("xml"            nerd-icons-faicon "nf-fa-file_code_o"      :face nerd-icons-lorange)
-    ("json"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
-    ("jsonl"          nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
-    ("cson"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
-    ("yml"            nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dyellow)
-    ("yaml"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dyellow)
-    ("toml"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-orange)
-    ("conf"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dorange)
-    ("editorconfig"   nerd-icons-sucicon "nf-seti-editorconfig"  :face nerd-icons-silver)
-    ;; ?
-    ("pkg"            nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
-    ("rpm"            nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
-    ("pkgbuild"       nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
-    ("elc"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
-    ("eln"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
-    ("gz"             nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-lmaroon)
-    ("zip"            nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
-    ("7z"             nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
-    ("zst"            nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
-    ("dat"            nerd-icons-faicon "nf-fa-bar_chart"        :face nerd-icons-cyan)
-    ("dmg"            nerd-icons-octicon "nf-oct-tools"          :face nerd-icons-lsilver)
-    ("dll"            nerd-icons-faicon "nf-fa-cogs"             :face nerd-icons-silver)
-    ("ds_store"       nerd-icons-faicon "nf-fa-cogs"             :face nerd-icons-silver)
-    ("exe"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
-    ("msg"            nerd-icons-octicon "nf-oct-mail"           :face nerd-icons-dsilver)
-    ;; Source Codes
-    ("ada"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
-    ("adb"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
-    ("adc"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
-    ("ads"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
-    ("gpr"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-green)
-    ("cgpr"           nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-green)
-    ("scpt"           nerd-icons-devicon "nf-dev-apple"          :face nerd-icons-pink)
-    ;; ("aup"         nerd-icons-fileicon "audacity") TODO: audacity
-    ("elm"            nerd-icons-sucicon "nf-seti-elm"           :face nerd-icons-blue)
-    ("erl"            nerd-icons-devicon "nf-dev-erlang"         :face nerd-icons-red)
-    ("hrl"            nerd-icons-devicon "nf-dev-erlang"         :face nerd-icons-dred)
-    ("eex"            nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
-    ("leex"           nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
-    ("heex"           nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
-    ("ex"             nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lpurple)
-    ("exs"            nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lred)
-    ("livemd"         nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lblue)
-    ("java"           nerd-icons-devicon "nf-dev-java"           :face nerd-icons-purple)
-    ("groovy"         nerd-icons-devicon "nf-dev-groovy"         :face nerd-icons-cyan)
-    ("gradle"         nerd-icons-sucicon "nf-seti-gradle"        :face nerd-icons-silver)
-    ("ebuild"         nerd-icons-mdicon "nf-md-gentoo"           :face nerd-icons-cyan)
-    ("eclass"         nerd-icons-mdicon "nf-md-gentoo"           :face nerd-icons-blue)
-    ("go"             nerd-icons-devicon "nf-dev-go"             :face nerd-icons-blue)
-    ("jl"             nerd-icons-sucicon "nf-seti-julia"         :face nerd-icons-purple)
-    ("magik"          nerd-icons-faicon "nf-fa-magic"            :face nerd-icons-blue)
-    ;; ("matlab"      nerd-icons-devicon "matlab") TODO: matlab
-    ("nix"            nerd-icons-mdicon "nf-md-nix"              :face nerd-icons-blue)
-    ("pl"             nerd-icons-sucicon "nf-seti-perl"          :face nerd-icons-lorange)
-    ("pm"             nerd-icons-sucicon "nf-seti-perl"          :face nerd-icons-lorange)
-    ;; ("pl6"         nerd-icons-devicon"raku") TODO: raku
-    ;; ("pm6"         nerd-icons-devicon "raku") TODO: raku
-    ("pod"            nerd-icons-devicon "nf-dev-perl"           :face nerd-icons-lgreen)
-    ("php"            nerd-icons-devicon "nf-dev-php"            :face nerd-icons-lsilver)
-    ;; ("pony"        nerd-icons-devicon "pony") TODO: pony
-    ("ps1"            nerd-icons-mdicon "nf-md-powershell"       :face nerd-icons-blue)
-    ("pro"            nerd-icons-sucicon "nf-seti-prolog"        :face nerd-icons-lmaroon)
-    ("proog"          nerd-icons-sucicon "nf-seti-prolog"        :face nerd-icons-lmaroon)
-    ("py"             nerd-icons-devicon "nf-dev-python"         :face nerd-icons-dblue)
-    ;; ("idr"         nerd-icons-devicon "idris") TODO: idris
-    ;; ("ipynb"       nerd-icons-devicon "jupyter") TODO: jupyter
-    ("gem"            nerd-icons-devicon "nf-dev-ruby"           :face nerd-icons-red)
-    ;; ("raku"        nerd-icons-devicon "raku") TODO: raku
-    ;; ("rakumod"     nerd-icons-devicon "raku") TODO: raku
-    ("rb"             nerd-icons-octicon "nf-oct-ruby"           :face nerd-icons-lred)
-    ("rs"             nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-maroon)
-    ("rlib"           nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-dmaroon)
-    ("r"              nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
-    ("rd"             nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
-    ("rdx"            nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
-    ("rsx"            nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
-    ("svelte"         nerd-icons-sucicon "nf-seti-svelte"        :face nerd-icons-red)
-    ("gql"            nerd-icons-mdicon "nf-md-graphql"          :face nerd-icons-dpink)
-    ("graphql"        nerd-icons-mdicon "nf-md-graphql"          :face nerd-icons-dpink)
-    ;; There seems to be a a bug with this font icon which does not
-    ;; let you propertise it without it reverting to being a lower
-    ;; case phi
-    ("c"              nerd-icons-sucicon "nf-custom-c"           :face nerd-icons-blue)
-    ("h"              nerd-icons-faicon "nf-fa-h_square"         :face nerd-icons-purple)
-    ("m"              nerd-icons-devicon "nf-dev-apple" )
-    ("mm"             nerd-icons-devicon "nf-dev-apple" )
-    ;;
-    ("cc"             nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
-    ("cpp"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
-    ("cxx"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
-    ("hh"             nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
-    ("hpp"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
-    ("hxx"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
-    ;; Lisps
-    ("cl"             nerd-icons-sucicon "nf-custom-common_lisp" :face nerd-icons-lorange)
-    ("l"              nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-orange)
-    ("lisp"           nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-orange)
-    ;; ("hy"             nerd-icons-sucicon "nf-custom-hy"          :face nerd-icons-blue)
-    ("el"             nerd-icons-sucicon "nf-custom-emacs"       :face nerd-icons-purple)
-    ("clj"            nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-blue)
-    ("cljc"           nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-blue)
-    ("cljs"           nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-lyellow)
-    ("coffee"         nerd-icons-devicon "nf-dev-coffeescript"   :face nerd-icons-maroon)
-    ("iced"           nerd-icons-devicon "nf-dev-coffeescript"   :face nerd-icons-lmaroon)
-    ("dart"           nerd-icons-devicon "nf-dev-dart"           :face nerd-icons-blue)
-    ("ledger"         nerd-icons-mdicon  "nf-md-file_table_box_multiple" :face nerd-icons-green)
-    ("rkt"            nerd-icons-sucicon "nf-custom-scheme"       :face nerd-icons-red)
-    ("scrbl"          nerd-icons-sucicon "nf-custom-scheme"       :face nerd-icons-blue)
-    ;; Stylesheeting
-    ("css"            nerd-icons-devicon "nf-dev-css3"           :face nerd-icons-yellow)
-    ("scss"           nerd-icons-mdicon "nf-md-sass"             :face nerd-icons-pink)
-    ("sass"           nerd-icons-mdicon "nf-md-sass"             :face nerd-icons-dpink)
-    ("less"           nerd-icons-devicon "nf-dev-less"           :face nerd-icons-dyellow)
-    ;; ("postcss"     nerd-icons-devicon "postcss") TODO: postcss
-    ;; ("sss"         nerd-icons-devicon "postcss") TODO: postcss
-    ("styl"           nerd-icons-devicon "nf-dev-stylus"         :face nerd-icons-lgreen)
-    ("csv"            nerd-icons-octicon "nf-oct-graph"          :face nerd-icons-dblue)
-    ;; haskell
-    ("hs"             nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
-    ("chs"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
-    ("lhs"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
-    ("hsc"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
-    ;; Web modes
-    ("inky-haml"      nerd-icons-sucicon "nf-seti-haml"          :face nerd-icons-lyellow)
-    ("haml"           nerd-icons-sucicon "nf-seti-haml"          :face nerd-icons-lyellow)
-    ("htm"            nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-orange)
-    ("html"           nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-orange)
-    ("inky-er"        nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
-    ("inky-erb"       nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
-    ("erb"            nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
-    ;; ("hbs"         nerd-icons-fileicon "moustache") TODO: moustache
-    ("inky-slim"      nerd-icons-codicon "nf-cod-dashboard"      :face nerd-icons-yellow)
-    ("slim"           nerd-icons-codicon "nf-cod-dashboard"      :face nerd-icons-yellow)
-    ("jade"           nerd-icons-sucicon "nf-seti-jade"          :face nerd-icons-red)
-    ("pug"            nerd-icons-sucicon "nf-seti-pug"           :face nerd-icons-red)
-    ;; Javascript
-    ;; ("d3js"        nerd-icons-devicon "d3") TODO: d3
-    ("re"             nerd-icons-sucicon "nf-seti-reasonml"      :face nerd-icons-red-alt)
-    ("rei"            nerd-icons-sucicon "nf-seti-reasonml"      :face nerd-icons-dred)
-    ("ml"             nerd-icons-sucicon "nf-seti-ocaml"         :face nerd-icons-lpink)
-    ("mli"            nerd-icons-sucicon "nf-seti-ocaml"         :face nerd-icons-dpink)
-    ("react"          nerd-icons-devicon "nf-dev-react"          :face nerd-icons-lblue)
-    ("ts"             nerd-icons-sucicon "nf-seti-typescript"    :face nerd-icons-blue-alt)
-    ("js"             nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-yellow)
-    ("es"             nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-yellow)
-    ("jsx"            nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-cyan-alt)
-    ("tsx"            nerd-icons-sucicon "nf-seti-typescript"    :face nerd-icons-blue-alt)
-    ("njs"            nerd-icons-mdicon "nf-md-nodejs"           :face nerd-icons-lgreen)
-    ("vue"            nerd-icons-sucicon "nf-seti-vue"           :face nerd-icons-lgreen)
-
-    ("sbt"            nerd-icons-sucicon "nf-seti-sbt"           :face nerd-icons-red)
-    ("scala"          nerd-icons-devicon "nf-dev-scala"          :face nerd-icons-red)
-    ("scm"            nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-red)
-    ("swift"          nerd-icons-devicon "nf-dev-swift"          :face nerd-icons-green)
-
-    ("tcl"            nerd-icons-mdicon "nf-md-feather"          :face nerd-icons-dred)
-    ("exp"            nerd-icons-mdicon "nf-md-feather"          :face nerd-icons-dred)
-
-    ("tf"             nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
-    ("tfvars"         nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
-    ("tfstate"        nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
-
-    ("asm"            nerd-icons-sucicon "nf-seti-asm"           :face nerd-icons-blue)
-    ;; Verilog(-AMS) and SystemVerilog(-AMS     ;; Verilog(-AMS) and SystemVerilog(-AMS)
-    ("v"              nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ("vams"           nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ("sv"             nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ("sva"            nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ("svh"            nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ("svams"          nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
-    ;; VHDL(-AMS     ;; VHDL(-AMS)
-    ("vhd"            nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
-    ("vhdl"           nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
-    ("vhms"           nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
-    ;; Cabal
-    ;; ("cabal"       nerd-icons-devicon "cabal") TODO: cabal
-    ;; Kotlin
-    ("kt"             nerd-icons-sucicon "nf-seti-kotlin"        :face nerd-icons-orange)
-    ("kts"            nerd-icons-sucicon "nf-seti-kotlin"        :face nerd-icons-orange)
-    ;; Nimrod
-    ("nim"            nerd-icons-sucicon "nf-seti-nim"           :face nerd-icons-yellow)
-    ("nims"           nerd-icons-sucicon "nf-seti-nim"           :face nerd-icons-yellow)
-    ;; SQL
-    ("sql"            nerd-icons-octicon "nf-oct-database"       :face nerd-icons-silver)
-    ;; Styles
-    ;; ("styles"      nerd-icons-devicon "style") TODO: style
-    ;; Lua
-    ("lua"            nerd-icons-sucicon "nf-seti-lua"           :face nerd-icons-dblue)
-    ;; ASCII doc
-    ;; ("adoc"        nerd-icons-devicon "asciidoc") TODO: asciidoc
-    ;; ("asciidoc"    nerd-icons-devicon "asciidoc") TODO: asciidoc
-    ;; Puppet
-    ("pp"             nerd-icons-sucicon "nf-seti-puppet"        :face nerd-icons-yellow)
-    ;; Jinja
-    ("j2"             nerd-icons-sucicon "nf-seti-jinja"         :face nerd-icons-silver)
-    ("jinja2"         nerd-icons-sucicon "nf-seti-jinja"         :face nerd-icons-silver)
-    ;; Docker
-    ("dockerfile"     nerd-icons-sucicon "nf-seti-docker"        :face nerd-icons-cyan)
-    ;; Vagrant
-    ;; ("vagrantfile" nerd-icons-fileicon "vagrant") TODO: vagrant
-    ;; GLSL
-    ("glsl"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-blue)
-    ("vert"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-blue)
-    ("tesc"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-purple)
-    ("tese"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-dpurple)
-    ("geom"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-green)
-    ("frag"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-red)
-    ("comp"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-dblue)
-    ;; CUDA
-    ("cu"             nerd-icons-sucicon "nf-custom-c"           :face nerd-icons-green)
-    ("cuh"            nerd-icons-faicon "nf-fa-h_square"         :face nerd-icons-green)
-    ;; Fortran
-    ("f90"            nerd-icons-mdicon "nf-md-language_fortran" :face nerd-icons-purple)
-    ;; C#
-    ("cs"             nerd-icons-mdicon "nf-md-language_csharp"  :face nerd-icons-dblue)
-    ("csx"            nerd-icons-mdicon "nf-md-language_csharp"  :face nerd-icons-dblue)
-    ;; F#
-    ("fs"             nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
-    ("fsi"            nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
-    ("fsx"            nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
-    ("fsscript"       nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
-    ;; zig
-    ("zig"            nerd-icons-sucicon "nf-seti-zig"           :face nerd-icons-orange)
-    ;; odin
-    ;; ("odin"        nerd-icons-fileicon "odin") TODO: odin
-    ;; File Types
-    ("ico"            nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-blue)
-    ("png"            nerd-icons-mdicon "nf-md-file_png_box"     :face nerd-icons-orange)
-    ("gif"            nerd-icons-mdicon "nf-md-file_gif_box"     :face nerd-icons-green)
-    ("jpeg"           nerd-icons-mdicon "nf-md-file_jpg_box"     :face nerd-icons-dblue)
-    ("jpg"            nerd-icons-mdicon "nf-md-file_jpg_box"     :face nerd-icons-dblue)
-    ("webp"           nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-dblue)
-    ("xpm"            nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-dgreen)
-    ;; Audio
-    ("mp3"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("wav"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("m4a"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("ogg"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("flac"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("opus"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("au"             nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("aif"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("aifc"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("aiff"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
-    ("svg"            nerd-icons-sucicon "nf-seti-svg"           :face nerd-icons-lgreen)
-    ;; Video
-    ("mov"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("mp4"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("ogv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-dblue)
-    ("mpg"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("mpeg"           nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("flv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("ogv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-dblue)
-    ("mkv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ("webm"           nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
-    ;; Fonts
-    ("ttf"            nerd-icons-faicon "nf-fa-font"             :face nerd-icons-dcyan)
-    ("woff"           nerd-icons-faicon "nf-fa-font"             :face nerd-icons-cyan)
-    ("woff2"          nerd-icons-faicon "nf-fa-font"             :face nerd-icons-cyan)
-    ;; Archives
-    ("iso"            nerd-icons-mdicon "nf-md-disc"            :face nerd-icons-orange)
-    ("tar"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
-    ("rar"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
-    ("tgz"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
-    ("jar"            nerd-icons-devicon "nf-dev-java"           :face nerd-icons-dpurple)
-    ;; Doc
-    ("pdf"            nerd-icons-codicon "nf-cod-file_pdf"       :face nerd-icons-dred)
-    ("text"           nerd-icons-faicon "nf-fa-file_text"        :face nerd-icons-cyan)
-    ("txt"            nerd-icons-faicon "nf-fa-file_text"        :face nerd-icons-cyan)
-    ("doc"            nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
-    ("docx"           nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
-    ("docm"           nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
-    ("texi"           nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
-    ("tex"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
-    ("ltx"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
-    ("dtx"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
-    ("sty"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
-    ("md"             nerd-icons-octicon "nf-oct-markdown"       :face nerd-icons-lblue)
-    ("bib"            nerd-icons-mdicon "nf-md-book"             :face nerd-icons-lblue)
-    ("org"            nerd-icons-sucicon "nf-custom-orgmode"     :face nerd-icons-lgreen)
-    ("org_archive"    nerd-icons-sucicon "nf-custom-orgmode"     :face nerd-icons-lgreen)
-    ("pps"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
-    ("ppt"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
-    ("pptsx"          nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
-    ("ppttx"          nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
-    ("knt"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-cyan)
-    ("xlsx"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
-    ("xlsm"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
-    ("xlsb"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
-    ("xltx"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
-    ("xltm"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
-    ("epub"           nerd-icons-mdicon "nf-md-book_open"        :face nerd-icons-green)
-    ("ly"             nerd-icons-faicon "nf-fa-music"            :face nerd-icons-green)
-    ;;
-    ("key"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
-    ("pem"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-orange)
-    ("p12"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-dorange)
-    ("crt"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
-    ("pub"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-blue)
-    ("gpg"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
-    ("kdbx"           nerd-icons-octicon "nf-oct-key"            :face nerd-icons-green)
-    ("cache"          nerd-icons-octicon "nf-oct-database"       :face nerd-icons-green)
-    ;; backup
-    ("backup"         nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)
-    ("old"            nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)
-    ("bak"            nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)))
-
-(defvar                        nerd-icons-regexp-icon-alist
-  '(
-    ;;
-    ("^TAGS$"                  nerd-icons-octicon "nf-oct-tag"               :face nerd-icons-blue)
-    ("^TODO$"                  nerd-icons-octicon "nf-oct-checklist"         :face nerd-icons-lyellow)
-    ("^LICENSE$"               nerd-icons-octicon "nf-oct-book"              :face nerd-icons-blue)
-    ("^readme"                 nerd-icons-octicon "nf-oct-book"              :face nerd-icons-lcyan)
-
-    ;; Config
-    ("nginx$"                  nerd-icons-devicon "nf-dev-nginx"             :face nerd-icons-dgreen)
-    ;; ("apache$"              nerd-icons-alltheicon "apache") TODO: apache
-
-    ;; C
-    ("^Makefile$"              nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-dorange)
-    ("^CMakeLists.txt$"        nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-red) ;; TODO: cmake
-    ("^CMakeCache.txt$"        nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-blue) ;; TODO: cmakecache
-    ("^meson.build$"           nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-purple) ;; TODO: meson
-    ("^meson_options.txt$"     nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-purple) ;; TODO: meson
-
-    ;; Docker
-    ("^\\.?Dockerfile"         nerd-icons-sucicon "nf-seti-docker"           :face nerd-icons-blue)
-
-    ;; Homebrew
-    ("^Brewfile$"              nerd-icons-faicon "nf-fa-beer"                :face nerd-icons-lsilver)
-
-    ;; ;; AWS
-    ("^stack.*.json$"          nerd-icons-devicon "nf-dev-aws"               :face nerd-icons-orange)
-    ("^serverless\\.yml$"      nerd-icons-faicon "nf-fa-bolt"                :face nerd-icons-yellow)
-
-    ;; lock files
-    ("~$"                      nerd-icons-octicon "nf-oct-lock"              :face nerd-icons-maroon)
-
-    ;; Source Codes
-    ("^mix.lock$"              nerd-icons-sucicon "nf-seti-elixir"           :face nerd-icons-lyellow)
-
-    ;; Ruby
-    ("^Gemfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?test\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?test_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
-    ("_?spec\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
-    ("_?spec_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
-
-    ("-?spec\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
-    ("-?test\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
-    ("-?spec\\.js$"            nerd-icons-mdicon "nf-md-language_javascript" :face nerd-icons-lpurple)
-    ("-?test\\.js$"            nerd-icons-mdicon "nf-md-language_javascript" :face nerd-icons-lpurple)
-    ("-?spec\\.jsx$"           nerd-icons-mdicon "nf-md-react"               :face nerd-icons-blue-alt)
-    ("-?test\\.jsx$"           nerd-icons-mdicon "nf-md-react"               :face nerd-icons-blue-alt)
-
-    ;; Git
-    ("^MERGE_"                 nerd-icons-octicon "nf-oct-git_merge"         :face nerd-icons-red)
-    ("^COMMIT_EDITMSG"         nerd-icons-octicon "nf-oct-git_commit"        :face nerd-icons-red)
-
-    ;; Stylesheeting
-    ("stylelint"               nerd-icons-sucicon "nf-seti-stylelint"        :face nerd-icons-lyellow)
-
-    ;; JavaScript
-    ("^package.json$"          nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-red)
-    ("^package.lock.json$"     nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-dred)
-    ("^yarn\\.lock"            nerd-icons-sucicon "nf-seti-yarn"             :face nerd-icons-blue-alt)
-    ("\\.npmignore$"           nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-dred)
-    ("^bower.json$"            nerd-icons-devicon "nf-dev-bower"             :face nerd-icons-lorange)
-    ("^gulpfile"               nerd-icons-devicon "nf-dev-gulp"              :face nerd-icons-lred)
-    ("^gruntfile"              nerd-icons-devicon "nf-dev-grunt"             :face nerd-icons-lyellow)
-    ("^webpack"                nerd-icons-mdicon "nf-md-webpack"             :face nerd-icons-lblue)
-
-    ;; Go
-    ("^go.mod$"                nerd-icons-sucicon "nf-seti-config"           :face nerd-icons-blue-alt)
-    ("^go.work$"               nerd-icons-sucicon "nf-seti-config"           :face nerd-icons-blue-alt)
-
-    ;; Groovy
-    ("Jenkinsfile\\'"          nerd-icons-devicon "nf-dev-groovy"            :face nerd-icons-cyan-alt)
-
-    ;; Emacs
-    ("bookmark"                nerd-icons-octicon "nf-oct-bookmark"          :face nerd-icons-lpink)
-
-    ("^\\*scratch\\*$"         nerd-icons-faicon "nf-fa-sticky_note"         :face nerd-icons-lyellow)
-    ("^\\*scratch.*"           nerd-icons-faicon "nf-fa-sticky_note"         :face nerd-icons-yellow)
-    ("^\\*new-tab\\*$"         nerd-icons-mdicon "nf-md-star"                :face nerd-icons-cyan)
-    ("Cask\\'"                 nerd-icons-sucicon "nf-custom-emacs"          :face nerd-icons-blue)
-    ("Eask\\'"                 nerd-icons-sucicon "nf-custom-emacs"          :face nerd-icons-blue)
-
-    ("^\\."                    nerd-icons-octicon "nf-oct-gear")))
-
-(defvar nerd-icons-default-file-icon
-  '(nerd-icons-faicon "nf-fa-file_o"))
-
-(defvar nerd-icons-dir-icon-alist
-  '(
-    ("trash"            nerd-icons-faicon "nf-fa-trash_o")
-    ("dropbox"          nerd-icons-faicon "nf-fa-dropbox")
-    ("google[ _-]drive" nerd-icons-mdicon "nf-md-folder_google_drive")
-    ("github"           nerd-icons-sucicon "nf-custom-folder_github")
-    ("^atom$"           nerd-icons-devicon "nf-dev-atom")
-    ("documents"        nerd-icons-mdicon "nf-md-folder_file")
-    ("download"         nerd-icons-mdicon "nf-md-folder_download")
-    ("desktop"          nerd-icons-octicon "nf-oct-device_desktop")
-    ("pictures"         nerd-icons-mdicon "nf-md-folder_image")
-    ("photos"           nerd-icons-faicon "nf-fa-camera_retro")
-    ("music"            nerd-icons-mdicon "nf-md-folder_music")
-    ("movies"           nerd-icons-faicon "nf-fa-film")
-    ("code"             nerd-icons-octicon "nf-oct-code")
-    ("workspace"        nerd-icons-octicon "nf-oct-code")
-    ;; ("test"             nerd-icons-devicon "test-dir")
-    ("\\.git"           nerd-icons-sucicon "nf-custom-folder_git")
-    ("\\.config"        nerd-icons-sucicon "nf-custom-folder_config")
-    (".?"               nerd-icons-sucicon "nf-custom-folder_oct")))
-
-(defvar nerd-icons-weather-icon-alist
-  '(
-    ("tornado"               nerd-icons-wicon "nf-weather-tornado")
-    ("hurricane"             nerd-icons-wicon "nf-weather-hurricane")
-    ("thunderstorms"         nerd-icons-wicon "nf-weather-thunderstorm")
-    ("sunny"                 nerd-icons-wicon "nf-weather-day_sunny")
-    ("rain.*snow"            nerd-icons-wicon "nf-weather-rain_mix")
-    ("rain.*hail"            nerd-icons-wicon "nf-weather-rain_mix")
-    ("sleet"                 nerd-icons-wicon "nf-weather-sleet")
-    ("hail"                  nerd-icons-wicon "nf-weather-hail")
-    ("drizzle"               nerd-icons-wicon "nf-weather-sprinkle")
-    ("rain"                  nerd-icons-wicon "nf-weather-showers")
-    ("showers"               nerd-icons-wicon "nf-weather-showers")
-    ("blowing.*snow"         nerd-icons-wicon "nf-weather-snow_wind")
-    ("snow"                  nerd-icons-wicon "nf-weather-snow")
-    ("dust"                  nerd-icons-wicon "nf-weather-dust")
-    ("fog"                   nerd-icons-wicon "nf-weather-fog")
-    ("haze"                  nerd-icons-wicon "nf-weather-day_haze")
-    ("smoky"                 nerd-icons-wicon "nf-weather-smoke")
-    ("blustery"              nerd-icons-wicon "nf-weather-cloudy_windy")
-    ("windy"                 nerd-icons-wicon "nf-weather-cloudy_gusts")
-    ("cold"                  nerd-icons-wicon "nf-weather-snowflake_cold")
-    ("partly.*cloudy.*night" nerd-icons-wicon "nf-weather-night_alt_partly_cloudy")
-    ("partly.*cloudy"        nerd-icons-wicon "nf-weather-day_cloudy_high")
-    ("cloudy.*night"         nerd-icons-wicon "nf-weather-night_alt_cloudy")
-    ("cxloudy.*day"          nerd-icons-wicon "nf-weather-day_cloudy")
-    ("cloudy"                nerd-icons-wicon "nf-weather-cloudy")
-    ("clear.*night"          nerd-icons-wicon "nf-weather-night_clear")
-    ("fair.*night"           nerd-icons-wicon "nf-weather-stars")
-    ("fair.*day"             nerd-icons-wicon "nf-weather-horizon")
-    ("hot"                   nerd-icons-wicon "nf-weather-hot")
-    ("not.*available"        nerd-icons-wicon "nf-weather-na")))
-
-(defvar nerd-icons-mode-icon-alist
-  '(
-    (emacs-lisp-mode                   nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-purple)
-    (circe-server-mode                 nerd-icons-faicon "nf-fa-commenting_o")
-    (circe-channel-mode                nerd-icons-faicon "nf-fa-commenting_o")
-    (circe-query-mode                  nerd-icons-faicon "nf-fa-commenting_o")
-    (crystal-mode                      nerd-icons-sucicon "nf-custom-crystal"         :face nerd-icons-yellow)
-    (erc-mode                          nerd-icons-faicon "nf-fa-commenting_o")
-    (inferior-emacs-lisp-mode          nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-lblue)
-    (dired-mode                        nerd-icons-octicon "nf-oct-file_directory")
-    (lisp-interaction-mode             nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-orange)
-    (sly-mrepl-mode                    nerd-icons-sucicon "nf-custom-common_lisp"     :face nerd-icons-orange)
-    (slime-repl-mode                   nerd-icons-sucicon "nf-custom-common_lisp"     :face nerd-icons-orange)
-    (org-mode                          nerd-icons-sucicon "nf-custom-orgmode"         :face nerd-icons-lgreen)
-    (ledger-mode                       nerd-icons-mdicon "nf-md-file_table_box_multiple"   :face nerd-icons-green)
-    (typescript-mode                   nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
-    (typescript-ts-mode                nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
-    (typescript-tsx-mode               nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
-    (tsx-ts-mode                       nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
-    (js-mode                           nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
-    (js-ts-mode                        nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
-    (js-jsx-mode                       nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
-    (js2-mode                          nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
-    (js3-mode                          nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
-    (rjsx-mode                         nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-cyan-alt)
-    (term-mode                         nerd-icons-devicon "nf-dev-terminal")
-    (vterm-mode                        nerd-icons-devicon "nf-dev-terminal")
-    (eshell-mode                       nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
-    (magit-refs-mode                   nerd-icons-devicon "nf-dev-git_branch"         :face nerd-icons-red)
-    (magit-process-mode                nerd-icons-octicon "nf-oct-mark_github")
-    (magit-diff-mode                   nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-lblue)
-    (ediff-mode                        nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-red)
-    (diff-mode                         nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-lred)
-    (comint-mode                       nerd-icons-faicon "nf-fa-terminal"             :face nerd-icons-lblue)
-    (eww-mode                          nerd-icons-faicon "nf-fa-firefox"              :face nerd-icons-red)
-    (xwidget-webkit-mode               nerd-icons-faicon "nf-fa-chrome"               :face nerd-icons-blue)
-    (org-agenda-mode                   nerd-icons-octicon "nf-oct-checklist"          :face nerd-icons-lgreen)
-    (cfw:calendar-mode                 nerd-icons-octicon "nf-oct-calendar")
-    (ibuffer-mode                      nerd-icons-faicon "nf-fa-files_o"              :face nerd-icons-dsilver)
-    (messages-buffer-mode              nerd-icons-faicon "nf-fa-file_o"               :face nerd-icons-dsilver)
-    (help-mode                         nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-purple)
-    (helpful-mode                      nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-purple)
-    (Info-mode                         nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-blue)
-    (benchmark-init/tree-mode          nerd-icons-faicon "nf-fa-dashboard")
-    (jenkins-mode                      nerd-icons-devicon "nf-dev-jenkins"            :face nerd-icons-blue)
-    (magit-popup-mode                  nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-red)
-    (magit-status-mode                 nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-lred)
-    (magit-log-mode                    nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-green)
-    (mu4e-compose-mode                 nerd-icons-octicon "nf-oct-pencil")
-    (mu4e-headers-mode                 nerd-icons-octicon "nf-oct-mail")
-    (mu4e-main-mode                    nerd-icons-octicon "nf-oct-mail")
-    (mu4e-view-mode                    nerd-icons-codicon "nf-cod-mail_read")
-    (sieve-mode                        nerd-icons-octicon "nf-oct-mail")
-    (gnus-group-mode                   nerd-icons-octicon "nf-oct-mail")
-    (gnus-summary-mode                 nerd-icons-octicon "nf-oct-mail")
-    (gnus-article-mode                 nerd-icons-codicon "nf-cod-mail_read")
-    (message-mode                      nerd-icons-octicon "nf-oct-pencil")
-    (package-menu-mode                 nerd-icons-faicon "nf-fa-archive"              :face nerd-icons-silver)
-    (paradox-menu-mode                 nerd-icons-faicon "nf-fa-archive"              :face nerd-icons-silver)
-    (Custom-mode                       nerd-icons-codicon "nf-cod-settings")
-
-    ;; Special matcher for Web Mode based on the `web-mode-content-type' of the current buffer
-    (web-mode                          nerd-icons--web-mode-icon)
-
-    (fundamental-mode                  nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-dsilver)
-    (special-mode                      nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-yellow)
-    (cask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
-    (eask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
-    (text-mode                         nerd-icons-faicon "nf-fa-file_text"            :face nerd-icons-cyan)
-    (enh-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (ruby-mode                         nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (ruby-ts-mode                      nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
-    (inf-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (projectile-rails-compilation-mode nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (rspec-compilation-mode            nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (rake-compilation-mode             nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
-    (sh-mode                           nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
-    (bash-ts-mode                      nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
-    (shell-mode                        nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
-    (fish-mode                         nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-lpink)
-    (bat-mode                          nerd-icons-codicon "nf-cod-terminal_cmd"       :face nerd-icons-lsilver)
-    (nginx-mode                        nerd-icons-devicon "nf-dev-nginx"              :face nerd-icons-dgreen)
-    ;; (apache-mode                    nerd-icons-alltheicon "apache"                 :face nerd-icons-dgreen)
-    (makefile-mode                     nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
-    (makefile-ts-mode                  nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
-    ;; (cmake-mode                     nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
-    ;; (cmake-ts-mode                  nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
-    (dockerfile-mode                   nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-blue)
-    (dockerfile-ts-mode                nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-blue)
-    (docker-compose-mode               nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-lblue)
-    (nxml-mode                         nerd-icons-faicon "nf-fa-file_code_o"          :face nerd-icons-lorange)
-    (conf-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-lyellow)
-    (json-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
-    (json-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
-    (jsonian-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
-    (yaml-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-dyellow)
-    (yaml-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-dyellow)
-    (toml-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-orange)
-    (toml-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-orange)
-    (elisp-byte-code-mode              nerd-icons-octicon "nf-oct-file_binary"        :face nerd-icons-dsilver)
-    (archive-mode                      nerd-icons-octicon "nf-oct-file_zip"           :face nerd-icons-lmaroon)
-    (elm-mode                          nerd-icons-sucicon "nf-custom-elm"             :face nerd-icons-blue)
-    (erlang-mode                       nerd-icons-devicon "nf-dev-erlang"             :face nerd-icons-red)
-    (elixir-mode                       nerd-icons-sucicon "nf-custom-elixir"          :face nerd-icons-lorange)
-    (elixir-ts-mode                    nerd-icons-sucicon "nf-custom-elixir"          :face nerd-icons-lorange)
-    (java-mode                         nerd-icons-devicon "nf-dev-java"               :face nerd-icons-purple)
-    (groovy-mode                       nerd-icons-devicon "nf-dev-groovy"             :face nerd-icons-cyan)
-    (java-ts-mode                      nerd-icons-devicon "nf-dev-java"               :face nerd-icons-purple)
-    (go-mode                           nerd-icons-devicon "nf-dev-go"                 :face nerd-icons-blue)
-    (go-ts-mode                        nerd-icons-devicon "nf-dev-go"                 :face nerd-icons-blue)
-    (go-dot-mod-mode                   nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
-    (go-mod-ts-mode                    nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
-    (go-dot-work-mode                  nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
-    (graphql-mode                      nerd-icons-sucicon "nf-seti-graphql"           :face nerd-icons-dpink)
-    ;; (matlab-mode                    nerd-icons-fileicon "matlab"                   :face nerd-icons-orange)
-    (nix-mode                          nerd-icons-mdicon "nf-md-nix"                  :face nerd-icons-blue)
-    (perl-mode                         nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
-    (cperl-mode                        nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
-    (php-mode                          nerd-icons-devicon "nf-dev-php"                :face nerd-icons-lsilver)
-    (prolog-mode                       nerd-icons-devicon "nf-dev-prolog"             :face nerd-icons-lmaroon)
-    (python-mode                       nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
-    (python-ts-mode                    nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
-    (inferior-python-mode              nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
-    ;; (racket-mode                    nerd-icons-fileicon "racket"                   :face nerd-icons-red)
-    (rust-mode                         nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
-    (rustic-mode                       nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
-    (rust-ts-mode                      nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
-    (scala-mode                        nerd-icons-devicon "nf-dev-scala"              :face nerd-icons-red)
-    ;; (scheme-mode                    nerd-icons-fileicon   "scheme"                 :face nerd-icons-red)
-    (swift-mode                        nerd-icons-devicon "nf-dev-swift"              :face nerd-icons-green)
-    (svelte-mode                       nerd-icons-sucicon "nf-seti-svelte"            :face nerd-icons-red)
-    (ada-mode                          nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-blue)
-    (ada-ts-mode                       nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-blue)
-    (gpr-mode                          nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-green)
-    (gpr-ts-mode                       nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-green)
-    (c-mode                            nerd-icons-sucicon "nf-custom-c"               :face nerd-icons-blue)
-    (c-ts-mode                         nerd-icons-sucicon "nf-custom-c"               :face nerd-icons-blue)
-    (c++-mode                          nerd-icons-sucicon "nf-custom-cpp"             :face nerd-icons-blue)
-    (c++-ts-mode                       nerd-icons-sucicon "nf-custom-cpp"             :face nerd-icons-blue)
-    (csharp-mode                       nerd-icons-mdicon "nf-md-language_csharp"      :face nerd-icons-dblue)
-    (csharp-ts-mode                    nerd-icons-mdicon "nf-md-language_csharp"      :face nerd-icons-dblue)
-    (clojure-mode                      nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-blue)
-    (clojure-ts-mode                   nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-blue)
-    (cider-repl-mode                   nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-green)
-    (clojurec-mode                     nerd-icons-sucicon "nf-seti-clojure"           :face nerd-icons-blue)
-    (clojurec-ts-mode                  nerd-icons-sucicon "nf-seti-clojure"           :face nerd-icons-blue)
-    (clojurescript-mode                nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-lyellow)
-    (clojurescript-ts-mode             nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-lyellow)
-    (coffee-mode                       nerd-icons-devicon "nf-dev-coffeescript"       :face nerd-icons-maroon)
-    (lisp-mode                         nerd-icons-sucicon "nf-custom-scheme"          :face nerd-icons-orange)
-    (css-mode                          nerd-icons-devicon "nf-dev-css3"               :face nerd-icons-yellow)
-    (css-ts-mode                       nerd-icons-devicon "nf-dev-css3"               :face nerd-icons-yellow)
-    (scss-mode                         nerd-icons-mdicon "nf-md-sass"                 :face nerd-icons-pink)
-    (sass-mode                         nerd-icons-mdicon "nf-md-sass"                 :face nerd-icons-dpink)
-    (less-css-mode                     nerd-icons-devicon "nf-dev-less"               :face nerd-icons-dyellow)
-    (stylus-mode                       nerd-icons-devicon "nf-dev-stylus"             :face nerd-icons-lgreen)
-    (csv-mode                          nerd-icons-octicon "nf-oct-graph"              :face nerd-icons-dblue)
-    (haskell-mode                      nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
-    (haskell-c2hs-mode                 nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
-    (literate-haskell-mode             nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
-    (haml-mode                         nerd-icons-sucicon "nf-seti-haml"              :face nerd-icons-lyellow)
-    (html-mode                         nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-orange)
-    (html-ts-mode                      nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-orange)
-    (rhtml-mode                        nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-lred)
-    ;; (mustache-mode                  nerd-icons-fileicon "moustache"                :face nerd-icons-green)
-    (slim-mode                         nerd-icons-codicon "nf-cod-dashboard"          :face nerd-icons-yellow)
-    (jade-mode                         nerd-icons-sucicon "nf-seti-jade"              :face nerd-icons-red)
-    (pug-mode                          nerd-icons-sucicon "nf-seti-pug"               :face nerd-icons-red)
-    (react-mode                        nerd-icons-devicon "nf-dev-react"              :face nerd-icons-lblue)
-    (image-mode                        nerd-icons-octicon "nf-oct-file_media"         :face nerd-icons-blue)
-    (texinfo-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (markdown-mode                     nerd-icons-octicon "nf-oct-markdown"           :face nerd-icons-lblue)
-    (markdown-ts-mode                  nerd-icons-octicon "nf-oct-markdown"           :face nerd-icons-lblue)
-    ;; (bibtex-mode                    nerd-icons-fileicon "bib"                      :face nerd-icons-maroon)
-    (compilation-mode                  nerd-icons-faicon "nf-fa-cogs")
-    (objc-mode                         nerd-icons-faicon "nf-fa-apple")
-    (tuareg-mode                       nerd-icons-sucicon "nf-seti-ocaml")
-    (purescript-mode                   nerd-icons-sucicon "nf-seti-purescript")
-    (verilog-mode                      nerd-icons-mdicon "nf-md-chip"                 :face nerd-icons-red)
-    (verilog-ts-mode                   nerd-icons-mdicon "nf-md-chip"                 :face nerd-icons-red)
-    (vhdl-mode                         nerd-icons-octicon "nf-oct-cpu"                :face nerd-icons-blue)
-    (vhdl-ts-mode                      nerd-icons-octicon "nf-oct-cpu"                :face nerd-icons-blue)
-    ;; (haskell-cabal-mode             nerd-icons-fileicon "cabal"                    :face nerd-icons-lblue)
-    (kotlin-mode                       nerd-icons-sucicon "nf-custom-kotlin"          :face nerd-icons-orange)
-    (kotlin-ts-mode                    nerd-icons-sucicon "nf-custom-kotlin"          :face nerd-icons-orange)
-    (nim-mode                          nerd-icons-sucicon "nf-seti-nim"               :face nerd-icons-yellow)
-    (sql-mode                          nerd-icons-devicon  "nf-dev-database"          :face nerd-icons-silver)
-    (lua-mode                          nerd-icons-sucicon "nf-seti-lua"               :face nerd-icons-dblue)
-    (lua-ts-mode                       nerd-icons-sucicon "nf-seti-lua"               :face nerd-icons-dblue)
-    ;; (adoc-mode                      nerd-icons-fileicon "asciidoc"                 :face nerd-icons-lblue)
-    (puppet-mode                       nerd-icons-sucicon "nf-custom-puppet"          :face nerd-icons-yellow)
-    (jinja2-mode                       nerd-icons-sucicon "nf-seti-jinja"             :face nerd-icons-silver)
-    (powershell-mode                   nerd-icons-mdicon "nf-md-powershell"           :face nerd-icons-blue)
-    (tex-mode                          nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (latex-mode                        nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (latex-ts-mode                     nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (doctex-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    ;; Modes provided by AUCTeX 14.1 and higher
-    (TeX-mode                          nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (LaTeX-mode                        nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (docTeX-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (ConTeXt-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (AmSTeX-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (plain-TeX-mode                    nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (Texinfo-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (japanese-plain-TeX-mode           nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (japanese-LaTeX-mode               nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
-    (dart-mode                         nerd-icons-devicon "nf-dev-dart"               :face nerd-icons-blue)
-    (fsharp-mode                       nerd-icons-devicon "nf-dev-fsharp"             :face nerd-icons-blue)
-    (asm-mode                          nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
-    (fasm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
-    (masm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
-    (nasm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
-    (gas-mode                          nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
-    ;; (tcl-mode                       nerd-icons-fileicon "tcl"                      :face nerd-icons-dred)
-    ;; (cuda-mode                      nerd-icons-fileicon "nvidia"                   :face nerd-icons-green)
-    (f90-mode                          nerd-icons-mdicon "nf-md-language_fortran"     :face nerd-icons-purple)
-    ;; (hy-mode                        nerd-icons-fileicon "hy"                       :face nerd-icons-blue)
-    (glsl-mode                         nerd-icons-faicon "nf-fa-paint_brush"          :face nerd-icons-green)
-    (zig-mode                          nerd-icons-sucicon "nf-seti-zig"               :face nerd-icons-orange)
-    ;; (odin-mode                      nerd-icons-fileicon "odin"                     :face nerd-icons-lblue)
-    (pdf-view-mode                     nerd-icons-codicon  "nf-cod-file_pdf"          :face nerd-icons-dred)
-    (doc-view-mode                     nerd-icons-mdicon   "nf-md-file_document"      :face nerd-icons-lred)
-    (calibre-library-mode              nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-dblue)
-    (calibre-edit-mode                 nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-lred)
-    (calibredb-search-mode             nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-dblue)
-    (calibredb-show-mode               nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-lblue)
-    (osm-mode                          nerd-icons-mdicon   "nf-md-map_search"         :face nerd-icons-lgreen)
-    (spacemacs-buffer-mode             nerd-icons-sucicon  "nf-custom-emacs"          :face nerd-icons-purple)
-
-    (elfeed-search-mode                nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
-    (elfeed-summary-mode               nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
-    (elfeed-show-mode                  nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-yellow)
-    (newsticker-treeview-mode          nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
-    (newsticker-treeview-list-mode     nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-lorange)
-    (newsticker-treeview-item-mode     nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-yellow)
-
-    (emms-browser-mode                 nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (emms-lyrics-mode                  nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (emms-show-all-mode                nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (emms-metaplaylist-mode            nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (emms-tag-editor-mode              nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (emms-playlist-mode                nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
-    (lilypond-mode                     nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-green)
-    (bongo-playlist-mode               nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (bongo-library-mode                nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (mingus-playlist-mode              nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (mingus-help-mode                  nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (mingus-browse-mode                nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (mingus-burn-mode                  nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (simple-mpc-mode                   nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
-    (telega-root-mode                  nerd-icons-faicon "nf-fae-telegram"            :face nerd-icons-purple)
-    (telega-chat-mode                  nerd-icons-faicon "nf-fae-telegram"            :face nerd-icons-blue)
-    (mastodon-mode                     nerd-icons-mdicon "nf-md-mastodon"             :face nerd-icons-blue)
-
-    (fanyi-mode                        nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
-    (osx-dictionary-mode               nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
-    (youdao-dictionary-mode            nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
-
-    (magik-mode                        nerd-icons-faicon "nf-fa-magic"                :face nerd-icons-blue)
-    (magik-ts-mode                     nerd-icons-faicon "nf-fa-magic"                :face nerd-icons-blue)
-    (magik-session-mode                nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-blue)
-    (magik-cb-mode                     nerd-icons-faicon "nf-fa-book"                 :face nerd-icons-blue)
-    ;; (meson-mode                     nerd-icons-fileicon "meson"                    :face nerd-icons-purple)
-    ;; (man-common                     nerd-icons-fileicon "man-page"                 :face nerd-icons-blue)
-    (heex-mode                         nerd-icons-sucicon "nf-seti-elixir"            :face nerd-icons-lorange)
-    (heex-ts-mode                      nerd-icons-sucicon "nf-seti-elixir"            :face nerd-icons-lorange)
-    (julia-mode                        nerd-icons-sucicon "nf-seti-julia"             :face nerd-icons-purple)
-    (julia-ts-mode                     nerd-icons-sucicon "nf-seti-julia"             :face nerd-icons-purple)
-    (flycheck-error-list               nerd-icons-faicon "nf-fa-list_alt"             :face nerd-icons-lred)))
-
-(defvar                                                       nerd-icons-url-alist
-  '(
-    ;; Social media and communities
-    ("^\\(https?://\\)?\\(www\\.\\)?del\\.icio\\.us"          nerd-icons-faicon "nf-fa-delicious")
-    ("^\\(https?://\\)?\\(www\\.\\)?behance\\.net"            nerd-icons-faicon "nf-fa-behance")
-    ("^\\(https?://\\)?\\(www\\.\\)?dribbble\\.com"           nerd-icons-faicon "nf-fa-dribbble")
-    ("^\\(https?://\\)?\\(www\\.\\)?facebook\\.com"           nerd-icons-faicon "nf-fa-facebook_official")
-    ("^\\(https?://\\)?\\(www\\.\\)?glide\\.me"               nerd-icons-faicon "nf-fa-glide_g")
-    ("^\\(https?://\\)?\\(www\\.\\)?plus\\.google\\.com"      nerd-icons-faicon "nf-fa-google_plus")
-    ("linkedin\\.com"                                         nerd-icons-faicon "nf-fa-linkedin")
-    ("^\\(https?://\\)?\\(www\\.\\)?ok\\.ru"                  nerd-icons-faicon "nf-fa-odnoklassniki")
-    ("^\\(https?://\\)?\\(www\\.\\)?reddit\\.com"             nerd-icons-faicon "nf-fa-reddit_alien")
-    ("^\\(https?://\\)?\\(www\\.\\)?slack\\.com"              nerd-icons-faicon "nf-fa-slack")
-    ("^\\(https?://\\)?\\(www\\.\\)?snapchat\\.com"           nerd-icons-faicon "nf-fa-snapchat_ghost")
-    ("^\\(https?://\\)?\\(www\\.\\)?weibo\\.com"              nerd-icons-faicon "nf-fa-weibo")
-    ("^\\(https?://\\)?\\(www\\.\\)?twitter\\.com"            nerd-icons-faicon "nf-fa-twitter")
-    ;; Blogging
-    ("joomla\\.org"                                           nerd-icons-faicon "nf-fa-joomla")
-    ("^\\(https?://\\)?\\(www\\.\\)?medium\\.com"             nerd-icons-faicon "nf-fa-medium")
-    ("tumblr\\.com"                                           nerd-icons-faicon "nf-fa-tumblr")
-    ("^wordpress\\.com"                                       nerd-icons-faicon "nf-fa-wordpress")
-    ;; Programming
-    ("^\\(https?://\\)?\\(www\\.\\)?bitbucket\\.org"          nerd-icons-faicon "nf-fa-bitbucket")
-    ("^\\(https?://\\)?\\(www\\.\\)?codepen\\.io"             nerd-icons-faicon "nf-fa-codepen")
-    ("^\\(https?://\\)?\\(www\\.\\)?codiepie\\.com"           nerd-icons-faicon "nf-fa-codiepie")
-    ("^\\(https?://\\)?\\(www\\.\\)?gist\\.github\\.com"      nerd-icons-octicon "nf-oct-logo_gist")
-    ("^\\(https?://\\)?\\(www\\.\\)?github\\.com"             nerd-icons-octicon "nf-oct-mark_github")
-    ("^\\(https?://\\)?\\(www\\.\\)?gitlab\\.com"             nerd-icons-faicon "nf-fa-gitlab")
-    ("^\\(https?://\\)?\\(www\\.\\)?news\\.ycombinator\\.com" nerd-icons-faicon "nf-fa-hacker_news")
-    ("^\\(https?://\\)?\\(www\\.\\)?jsfiddle\\.net"           nerd-icons-faicon "nf-fa-jsfiddle")
-    ("^\\(https?://\\)?\\(www\\.\\)?maxcdn\\.com"             nerd-icons-faicon "nf-fa-maxcdn")
-    ("^\\(https?://\\)?\\(www\\.\\)?stackoverflow\\.com"      nerd-icons-faicon "nf-fa-stack_overflow")
-    ;; Video
-    ("^\\(https?://\\)?\\(www\\.\\)?twitch\\.tv"              nerd-icons-faicon "nf-fa-twitch")
-    ("^\\(https?://\\)?\\(www\\.\\)?vimeo\\.com"              nerd-icons-faicon "nf-fa-vimeo")
-    ("^\\(https?://\\)?\\(www\\.\\)?youtube\\.com"            nerd-icons-faicon "nf-fa-youtube")
-    ("^\\(https?://\\)?\\(www\\.\\)?youtu\\.be"               nerd-icons-faicon "nf-fa-youtube")
-    ("^\\(https?://\\)?\\(www\\.\\)?vine\\.co"                nerd-icons-faicon "nf-fa-vine")
-    ;; Sound
-    ("^\\(https?://\\)?\\(www\\.\\)?last\\.fm"                nerd-icons-faicon "nf-fa-lastfm")
-    ("^\\(https?://\\)?\\(www\\.\\)?mixcloud\\.com"           nerd-icons-faicon "nf-fa-mixcloud")
-    ("^\\(https?://\\)?\\(www\\.\\)?soundcloud\\.com"         nerd-icons-faicon "nf-fa-soundcloud")
-    ("spotify\\.com"                                          nerd-icons-faicon "nf-fa-spotify")
-    ;; Shopping
-    ("^\\(https?://\\)?\\(www\\.\\)?amazon\\."                nerd-icons-faicon "nf-fa-amazon")
-    ("^\\(https?://\\)?\\(www\\.\\)?opencart\\.com"           nerd-icons-faicon "nf-fa-opencart")
-    ("^\\(https?://\\)?\\(www\\.\\)?paypal\\.com"             nerd-icons-faicon "nf-fa-paypal")
-    ("^\\(https?://\\)?\\(www\\.\\)?shirtsinbulk\\.com"       nerd-icons-faicon "nf-fa-shitsinbulk")
-    ;; Images
-    ("^\\(https?://\\)?\\(www\\.\\)?500px\\.com"              nerd-icons-faicon "nf-fa-500px")
-    ("^\\(https?://\\)?\\(www\\.\\)?deviantart\\.com"         nerd-icons-faicon "nf-fa-deviantart")
-    ("^\\(https?://\\)?\\(www\\.\\)?flickr\\.com"             nerd-icons-faicon "nf-fa-flickr")
-    ("^\\(https?://\\)?\\(www\\.\\)?instagram\\.com"          nerd-icons-faicon "nf-fa-instagram")
-    ("^\\(https?://\\)?\\(www\\.\\)?pinterest\\."             nerd-icons-faicon "nf-fa-pinterest")
-    ;; Information and books
-    ("^\\(https?://\\)?\\(www\\.\\)?digg\\.com"               nerd-icons-faicon "nf-fa-digg")
-    ("^\\(https?://\\)?\\(www\\.\\)?foursquare\\.com"         nerd-icons-faicon "nf-fa-foursquare")
-    ("^\\(https?://\\)?\\(www\\.\\)?getpocket\\.com"          nerd-icons-faicon "nf-fa-get_pocket")
-    ("^\\(https?://\\)?\\(www\\.\\)?scribd\\.com"             nerd-icons-faicon "nf-fa-scribd")
-    ("^\\(https?://\\)?\\(www\\.\\)?slideshare\\.net"         nerd-icons-faicon "nf-fa-slideshare")
-    ("stackexchange\\.com"                                    nerd-icons-faicon "nf-fa-stack_exchange")
-    ("^\\(https?://\\)?\\(www\\.\\)?stumbleupon\\.com"        nerd-icons-faicon "nf-fa-stumbleupon")
-    ("^\\(https?://\\)?\\(www\\.\\)?tripadvisor\\."           nerd-icons-faicon "nf-fa-tripadvisor")
-    ("^\\(https?://\\)?\\(www\\.\\)?yelp\\."                  nerd-icons-faicon "nf-fa-yelp")
-
-    ("wikipedia\\.org"                                        nerd-icons-faicon "nf-fa-wikipedia_w")
-    ;; Various companies and tools
-    ("^\\(https?://\\)?\\(www\\.\\)?angel\\.co"               nerd-icons-faicon "nf-fa-angellist")
-    ("^\\(https?://\\)?\\(www\\.\\)?apple\\.com"              nerd-icons-faicon "nf-fa-apple")
-    ("^\\(https?://\\)?\\(www\\.\\)?buysellads\\.com"         nerd-icons-faicon "nf-fa-buysellads")
-    ("^\\(https?://\\)?\\(www\\.\\)?connectdevelop\\.com"     nerd-icons-faicon "nf-fa-connectdevelop")
-    ("^\\(https?://\\)?\\(www\\.\\)?dashcube\\.com"           nerd-icons-faicon "nf-fa-dashcube")
-    ("^\\(https?://\\)?\\(www\\.\\)?dropbox\\.com"            nerd-icons-faicon "nf-fa-dropbox")
-    ("^\\(https?://\\)?\\(www\\.\\)?enviragallery\\.com"      nerd-icons-faicon "nf-fa-envira")
-    ("^\\(https?://\\)?\\(www\\.\\)?fortawesome\\.com"        nerd-icons-faicon "nf-fa-fort_awesome")
-    ("^\\(https?://\\)?\\(www\\.\\)?forumbee\\.com"           nerd-icons-faicon "nf-fa-forumbee")
-    ("^\\(https?://\\)?\\(www\\.\\)?gratipay\\.com"           nerd-icons-faicon "nf-fa-gratipay")
-    ("^\\(https?://\\)?\\(www\\.\\)?modx\\.com"               nerd-icons-faicon "nf-fa-modx")
-    ("^\\(https?://\\)?\\(www\\.\\)?pagelines\\.com"          nerd-icons-faicon "nf-fa-pagelines")
-    ("^\\(https?://\\)?\\(www\\.\\)?producthunt\\.com"        nerd-icons-faicon "nf-fa-product_hunt")
-    ("sellsy\\.com"                                           nerd-icons-faicon "nf-fa-sellsy")
-    ("^\\(https?://\\)?\\(www\\.\\)?simplybuilt\\.com"        nerd-icons-faicon "nf-fa-simplybuilt")
-    ("^\\(https?://\\)?\\(www\\.\\)?skyatlas\\.com"           nerd-icons-faicon "nf-fa-skyatlas")
-    ("^\\(https?://\\)?\\(www\\.\\)?skype\\.com"              nerd-icons-faicon "nf-fa-skype")
-    ("steampowered\\.com"                                     nerd-icons-faicon "nf-fa-steam")
-    ("^\\(https?://\\)?\\(www\\.\\)?themeisle\\.com"          nerd-icons-faicon "nf-fa-themeisle")
-    ("^\\(https?://\\)?\\(www\\.\\)?trello\\.com"             nerd-icons-faicon "nf-fa-trello")
-    ("^\\(https?://\\)?\\(www\\.\\)?whatsapp\\.com"           nerd-icons-faicon "nf-fa-whatsapp")
-    ("^\\(https?://\\)?\\(www\\.\\)?ycombinator\\.com"        nerd-icons-faicon "nf-fa-y_combinator")
-    ("yahoo\\.com"                                            nerd-icons-faicon "nf-fa-yahoo")
-    ("^\\(https?://\\)?\\(www\\.\\)?yoast\\.com"              nerd-icons-faicon "nf-fa-yoast")
-    ;; Catch all
-    ("android"                                                nerd-icons-faicon "nf-fa-android")
-    ("creativecommons"                                        nerd-icons-faicon "nf-fa-creative_commons")
-    ("forums?"                                                nerd-icons-codicon "nf-cod-comment_discussion")
-    ("\\.pdf$"                                                nerd-icons-codicon "nf-cod-file_pdf" :face nerd-icons-dred)
-    ("google"                                                 nerd-icons-faicon "nf-fa-google")
-    ("\\.rss"                                                 nerd-icons-faicon "nf-fa-rss")))
-
-(defun nerd-icons-auto-mode-match? (&optional file)
-  "Whether or not FILE's `major-mode' match against its `auto-mode-alist'."
-  (let* ((file (or file (buffer-file-name) (buffer-name)))
-         (auto-mode (nerd-icons-match-to-alist file auto-mode-alist)))
-    (eq major-mode auto-mode)))
-
-(defun nerd-icons-match-to-alist (file alist)
-  "Match FILE against an entry in ALIST using `string-match'."
-  (cdr (cl-find-if (lambda (it) (string-match (car it) file)) alist)))
-
-(defun nerd-icons-dir-is-submodule (dir)
-  "Checker whether or not DIR is a git submodule."
-  (let* ((gitmodule-dir (locate-dominating-file dir ".gitmodules"))
-         (modules-file  (expand-file-name (format "%s.gitmodules" gitmodule-dir)))
-         (module-search (format "submodule \".*?%s\"" (file-name-base dir))))
-
-    (when (and gitmodule-dir (file-exists-p (format "%s/.git" dir)))
-      (with-temp-buffer
-        (insert-file-contents modules-file)
-        (search-forward-regexp module-search (point-max) t)))))
-
-(defun nerd-icons--read-candidates ()
-  "Helper to build a list of candidates for all glyph sets."
-  (cl-reduce 'append (mapcar (lambda (it) (nerd-icons--read-candidates-for-glyph-set it t)) nerd-icons-glyph-sets)))
-
-(defun nerd-icons--read-candidates-for-glyph-set (glyph-set &optional show-glyph-set)
-  "Helper to build read candidates for GLYPH-SET.
-
-If SHOW-GLYPH-SET is non-nil, displays the icons glyph set in the candidate
-string."
-  (let ((data   (funcall (nerd-icons--data-name glyph-set)))
-        (icon-f (nerd-icons--function-name glyph-set)))
-    (mapcar
-     (lambda (it)
-       (let* ((icon-name (car it))
-
-              (icon-display (funcall icon-f icon-name))
-              (icon-glyph-set (if show-glyph-set (format "\t[%s]" glyph-set) ""))
-
-              (candidate-name (format "%s\t%s%s" icon-display icon-name icon-glyph-set))
-              (candidate-icon (funcall (nerd-icons--function-name glyph-set) icon-name)))
-         (cons candidate-name candidate-icon)))
-     data)))
-
-;;;###autoload
-(defun nerd-icons-install-fonts (&optional pfx)
-  "Helper function to download and install the latests fonts based on OS.
-The provided Nerd Font is Symbols Nerd Font Mono.
-When PFX is non-nil, ignore the prompt and just install"
-  (interactive "P")
-  (when (or pfx (yes-or-no-p "This will download and install fonts, are you sure you want to do this?"))
-    (let* ((url-format "https://raw.githubusercontent.com/rainstormstudio/nerd-icons.el/main/fonts/%s")
-           (font-dest (cond
-                       ;; Default Linux install directories
-                       ((member system-type '(gnu gnu/linux gnu/kfreebsd))
-                        (concat (or (getenv "XDG_DATA_HOME")
-                                    (concat (getenv "HOME") "/.local/share"))
-                                "/fonts/"
-                                nerd-icons-fonts-subdirectory))
-                       ;; Default MacOS install directory
-                       ((eq system-type 'darwin)
-                        (concat (getenv "HOME")
-                                "/Library/Fonts/"
-                                nerd-icons-fonts-subdirectory))))
-           (known-dest? (stringp font-dest))
-           (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/"))))
-
-      (unless (file-directory-p font-dest) (mkdir font-dest t))
-
-      (mapc (lambda (font)
-              (url-copy-file (format url-format font) (expand-file-name font font-dest) t))
-            nerd-icons-font-names)
-      (when known-dest?
-        (message "Fonts downloaded, updating font cache... <fc-cache -f -v> ")
-        (shell-command-to-string (format "fc-cache -f -v")))
-      (message "%s Successfully %s `nerd-icons' fonts to `%s'!"
-               (nerd-icons-wicon "nf-weather-stars" :v-adjust 0.0)
-               (if known-dest? "installed" "downloaded")
-               font-dest))))
-
-;;;###autoload
-(defun nerd-icons-insert (&optional arg glyph-set)
-  "Interactive icon insertion function.
-When Prefix ARG is non-nil, insert the propertized icon.
-When GLYPH-SET is non-nil, limit the candidates to the icon set matching it."
-  (interactive "P")
-  (let* ((standard-output (current-buffer))
-         (candidates (if glyph-set
-                         (nerd-icons--read-candidates-for-glyph-set glyph-set)
-                       (nerd-icons--read-candidates)))
-         (prompt     (if glyph-set
-                         (format "%s Icon: " (funcall (nerd-icons--glyph-set-name glyph-set)))
-                       "Icon : "))
-         (selection (completing-read prompt candidates nil t))
-         (result    (cdr (assoc selection candidates))))
-
-    (if arg (prin1 result) (insert result))))
-
-;;;###autoload
-(defun nerd-icons-icon-for-dir (dir &rest arg-overrides)
-  "Get the formatted icon for DIR.
-ARG-OVERRIDES should be a plist containining `:height',
-`:v-adjust' or `:face' properties like in the normal icon
-inserting functions."
-  (let* ((dir (or dir default-directory "/"))
-         (dirname (file-name-base (directory-file-name dir)))
-         (path (if (file-name-absolute-p dir) dir (expand-file-name dir)))
-         (icon (nerd-icons-match-to-alist dirname nerd-icons-dir-icon-alist))
-         (args (cdr icon)))
-    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
-    (cond
-     ((file-remote-p path)
-      (apply #'nerd-icons-codicon "nf-cod-remote" (cdr args)))
-     ((file-symlink-p path)
-      (apply #'nerd-icons-codicon "nf-cod-file_symlink_directory" (cdr args)))
-     ((nerd-icons-dir-is-submodule path)
-      (apply #'nerd-icons-codicon "nf-cod-file_submodule" (cdr args)))
-     ((file-exists-p (format "%s/.git" path))
-      (apply #'nerd-icons-octicon "nf-oct-repo" (cdr args)))
-     (t (apply (car icon) args)))))
-
-;;;###autoload
-(defun nerd-icons-icon-for-file (file &rest arg-overrides)
-  "Get the formatted icon for FILE.
-ARG-OVERRIDES should be a plist containining `:height',
-`:v-adjust' or `:face' properties like in the normal icon
-inserting functions."
-  (let* ((name (file-name-nondirectory file))
-         (ext (file-name-extension name))
-         (icon (or (nerd-icons-match-to-alist name nerd-icons-regexp-icon-alist)
-                   (and ext
-                        (cdr (assoc (downcase ext)
-                                    nerd-icons-extension-icon-alist)))
-                   nerd-icons-default-file-icon))
-         (args (cdr icon)))
-    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
-    (apply (car icon) args)))
-
-;;;###autoload
-(defun nerd-icons-icon-for-extension (ext &rest arg-overrides)
-  "Get the formatted icon for EXT.
-ARG-OVERRIDES should be a plist containining `:height',
-`:v-adjust' or `:face' properties like in the normal icon
-inserting functions."
-  (let* ((icon (or
-                (and ext
-                     (cdr (assoc (downcase ext)
-                                 nerd-icons-extension-icon-alist)))
-                nerd-icons-default-file-icon))
-         (args (cdr icon)))
-    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
-    (apply (car icon) args)))
-
-;;;###autoload
-(defun nerd-icons-icon-for-mode (mode &rest arg-overrides)
-  "Get the formatted icon for MODE.
-ARG-OVERRIDES should be a plist containining `:height',
-`:v-adjust' or `:face' properties like in the normal icon
-inserting functions."
-  (let* ((icon (or (cdr (or (assoc mode nerd-icons-mode-icon-alist)
-                            (assoc (get mode 'derived-mode-parent) nerd-icons-mode-icon-alist)))
-                   nerd-icons-default-file-icon))
-         (args (cdr icon)))
-    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
-    (if icon (apply (car icon) args) mode)))
-
-;;;###autoload
-(defun nerd-icons-icon-for-url (url &rest arg-overrides)
-  "Get the formatted icon for URL.
-If an icon for URL isn't found in `nerd-icons-url-alist', a globe is used.
-ARG-OVERRIDES should be a plist containining `:height',
-`:v-adjust' or `:face' properties like in the normal icon
-inserting functions."
-  (let* ((icon (nerd-icons-match-to-alist url nerd-icons-url-alist))
-         (args (cdr icon)))
-    (unless icon
-      (setq icon '(nerd-icons-faicon "nf-fa-globe"))
-      (setq args (cdr icon)))
-    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
-    (apply (car icon) args)))
-
-;;;###autoload
-(defun nerd-icons-icon-for-buffer ()
-  "Get the formatted icon for the current buffer.
-
-This function prioritises the use of the buffers file extension to
-discern the icon when its `major-mode' matches its auto mode,
-otherwise it will use the buffers `major-mode' to decide its
-icon."
-  (nerd-icons--icon-info-for-buffer))
-
-(defun nerd-icons-cache (func)
-  "Set a cache for FUNC.  Does not work on interactive functions."
-  (unless (get func 'nerd-icons--cached)
-    (let ((cache (make-hash-table :test #'equal
-                                  :size nerd-icons--cache-limit))
-          (orig-fn (symbol-function func)))
-      (fset func
-            (lambda (&rest args)
-              (or (gethash args cache)
-                  (progn
-                    (when (> (hash-table-count cache)
-                             nerd-icons--cache-limit)
-                      (clrhash cache))
-                    (puthash args (apply orig-fn args) cache)))))))
-
-  (put func 'nerd-icons--cached t))
-
-(nerd-icons-cache #'nerd-icons-icon-for-dir)
-(nerd-icons-cache #'nerd-icons-icon-for-file)
-(nerd-icons-cache #'nerd-icons-icon-for-extension)
-(nerd-icons-cache #'nerd-icons-icon-for-mode)
-(nerd-icons-cache #'nerd-icons-icon-for-url)
-
-(defun nerd-icons--icon-info-for-buffer (&optional f)
-  "Get icon info for the current buffer.
-When F is provided, the info function is calculated with the format
-`nerd-icons-icon-%s-for-file' or `nerd-icons-icon-%s-for-mode'."
-  (let* ((base-f (concat "nerd-icons-icon" (when f (format "-%s" f))))
-         (file-f (intern (concat base-f "-for-file")))
-         (mode-f (intern (concat base-f "-for-mode"))))
-    (if (and (buffer-file-name)
-             (nerd-icons-auto-mode-match?))
-        (funcall file-f (file-name-nondirectory (buffer-file-name)))
-      (funcall mode-f major-mode))))
-
-;; Weather icons
-(defun nerd-icons-icon-for-weather (weather)
-  "Get an icon for a WEATHER status."
-  (let ((icon (nerd-icons-match-to-alist weather nerd-icons-weather-icon-alist)))
-    (if icon (apply (car icon) (cdr icon)) weather)))
-
-;; For `web-mode'
-(defun nerd-icons--web-mode-icon (&rest arg-overrides)
-  "Get icon for a `web-mode' buffer with ARG-OVERRIDES."
-  (nerd-icons--web-mode arg-overrides))
-(defun nerd-icons--web-mode-icon-family ()
-  "Get icon family for a `web-mode' buffer."
-  (nerd-icons--web-mode t))
-
-(defvar web-mode-content-type)          ; external
-(defun nerd-icons--web-mode (&optional arg-overrides)
-  "Return icon or FAMILY for `web-mode' based on `web-mode-content-type'.
-Providing ARG-OVERRIDES will modify the creation of the icon."
-  (let ((non-nil-args (cl-reduce (lambda (acc it) (if it (append acc (list it)) acc))
-                                 arg-overrides :initial-value '())))
-    (cond
-     ((equal web-mode-content-type "jsx")
-      (apply 'nerd-icons-devicon (append '("javascript") non-nil-args)))
-     ((equal web-mode-content-type "javascript")
-      (apply 'nerd-icons-devicon (append '("javascript") non-nil-args)))
-     ((equal web-mode-content-type "json")
-      (apply 'nerd-icons-devicon (append '("nf-dev-less") non-nil-args)))
-     ((equal web-mode-content-type "xml")
-      (apply 'nerd-icons-faicon (append '("nf-fa-file_code_o") non-nil-args)))
-     ((equal web-mode-content-type "css")
-      (apply 'nerd-icons-devicon (append '("nf-dev-css3") non-nil-args)))
-     (t
-      (apply 'nerd-icons-devicon (append '("nf-dev-html5") non-nil-args))))))
-
-(eval-and-compile
-  (defun nerd-icons--function-name (name)
-    "Get the symbol for an icon function name for icon set NAME."
-    (intern (concat "nerd-icons-" (downcase (symbol-name name)))))
-
-  (defun nerd-icons--family-name (name)
-    "Get the symbol for an icon family function for icon set NAME."
-    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-family")))
-
-  (defun nerd-icons--glyph-set-name (name)
-    "Get the symbol for an icon glyph set function for icon set NAME."
-    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-glyph-set")))
-
-  (defun nerd-icons--data-name (name)
-    "Get the symbol for an icon family function for icon set NAME."
-    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-data")))
-
-  (defun nerd-icons--insert-function-name (name)
-    "Get the symbol for an icon insert function for icon set NAME."
-    (intern (concat "nerd-icons-insert-" (downcase (symbol-name name))))))
-
-(defun nerd-icons-insert-icons-for (family &optional height duration)
-  "Insert all of the available icons associated with FAMILY.
-If a HEIGHT is provided it will render the icons at this height.
-This is useful both to see the icons more clearly and to test
-different height rendering.  If DURATION is provided, it will
-pause for DURATION seconds between printing each character."
-  (let* ((data-f    (nerd-icons--data-name family))
-         (insert-f  (nerd-icons--function-name family))
-
-         (height (or height 1.0))
-         (data (funcall data-f)))
-    (mapc
-     (lambda (it)
-       (insert (format "%s - %s\n" (funcall insert-f (car it) :height height) (car it)))
-       (when duration (sit-for duration)))
-     data)))
-
-(defun nerd-icons-set-font (&optional font-family frame)
-  "Modify nerd font charsets to use FONT-FAMILY for FRAME."
-  (let ((font-f (or font-family nerd-icons-font-family))
-        (charsets '((#xe5fa . #xe6b2)  ;; Seti-UI + Custom
-                    (#xe700 . #xe7c5)  ;; Devicons
-                    (#xf000 . #xf2e0)  ;; Font Awesome
-                    (#xe200 . #xe2a9)  ;; Font Awesome Extension
-                    (#xf500 . #xfd46) (#xf0001 . #xf1af0) ;; Material Design Icons
-                    (#xe300 . #xe3eb)  ;; Weather
-                    (#xf400 . #xf4a8) #x2665 #x26a1 #xf27c  ;; Octicons
-                    (#xe0a0 . #xe0a2) (#xe0b0 . #xe0b3)  ;; Powerline Symbols
-                    #xe0a3 (#xe0b4 . #xe0c8) (#xe0cc . #xe0d2) #xe0d4  ;; Powerline Extra Symbols
-                    (#x23fb . #x23fe) #x2b58  ;; IEC Power Symbols
-                    (#xf300 . #xf372)  ;; Font Logos
-                    (#xe000 . #xe00a)  ;; Pomicons
-                    (#xea60 . #xebeb))))  ;; Codicons
-    (cl-loop for charset in charsets do
-             (set-fontset-font
-              (frame-parameter nil 'font)
-              charset
-              (font-spec :family font-f
-                         :weight nil
-                         :size   nil)
-              frame
-              'prepend))))
-
-(defmacro nerd-icons-define-icon (name alist family glyph-set)
-  "Macro to generate functions for inserting icons for icon set NAME.
-
-NAME defines is the name of the iconset and will produce a
-function of the for `nerd-icon-NAME'.
-
-ALIST is the alist containing maps between icon names and the
-UniCode for the character.  All of these can be found in the data
-directory of this package.
-
-FAMILY is the font family to use for the icons.
-GLYPH-SET is the glyph set of the icon."
-  `(progn
-     (add-to-list 'nerd-icons-glyph-sets (quote ,name))
-     (defun ,(nerd-icons--family-name name) () ,family)
-     (defun ,(nerd-icons--glyph-set-name name) () ,glyph-set)
-     (defun ,(nerd-icons--data-name name) () ,alist)
-     (defun ,(nerd-icons--function-name name) (icon-name &rest args)
-       (let ((icon (cdr (assoc icon-name ,alist)))
-             (other-face (when nerd-icons-color-icons (plist-get args :face)))
-             (height (* nerd-icons-scale-factor (or (plist-get args :height) 1.0)))
-             (v-adjust (* nerd-icons-scale-factor (or (plist-get args :v-adjust) nerd-icons-default-adjust)))
-             (family ,family))
-         (unless icon
-           (error "Unable to find icon with name `%s' in icon set `%s'" icon-name (quote ,name)))
-         (let ((face (if other-face
-                         `(:family ,family :height ,height :inherit ,other-face)
-                       `(:family ,family :height ,height))))
-           (propertize icon
-                       'face face
-                       'font-lock-face face
-                       'display `(raise ,v-adjust)
-                       'rear-nonsticky t))))
-     (defun ,(nerd-icons--insert-function-name name) (&optional arg)
-       ,(format "Insert a %s icon at point." glyph-set)
-       (interactive "P")
-       (nerd-icons-insert arg (quote ,name)))))
-
-(nerd-icons-define-icon ipsicon nerd-icons/ipsicon-alist nerd-icons-font-family "IEC Power Symbols")
-(nerd-icons-define-icon octicon nerd-icons/octicon-alist nerd-icons-font-family "Octicons")
-(nerd-icons-define-icon pomicon nerd-icons/pomicon-alist nerd-icons-font-family "Pomicons")
-(nerd-icons-define-icon powerline nerd-icons/powerline-alist nerd-icons-font-family "Powerline Symbols")
-(nerd-icons-define-icon faicon nerd-icons/faicon-alist nerd-icons-font-family "Font Awesome")
-(nerd-icons-define-icon wicon nerd-icons/wicon-alist nerd-icons-font-family "Weather")
-(nerd-icons-define-icon sucicon nerd-icons/sucicon-alist nerd-icons-font-family "Seti-UI + Custom")
-(nerd-icons-define-icon devicon nerd-icons/devicon-alist nerd-icons-font-family "Devicons")
-(nerd-icons-define-icon codicon nerd-icons/codicon-alist nerd-icons-font-family "Codicons")
-(nerd-icons-define-icon flicon nerd-icons/flicon-alist nerd-icons-font-family "Font Logos")
-(nerd-icons-define-icon mdicon nerd-icons/mdicon-alist nerd-icons-font-family "Material Design Icons")
-
-(provide 'nerd-icons)
-;;; nerd-icons.el ends here
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons.elc b/emacs/elpa/nerd-icons-20240412.1831/nerd-icons.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-codicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-codicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-codicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-codicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-devicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-devicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-devicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-devicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-faicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-faicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-faicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-faicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-flicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-flicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-flicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-flicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-ipsicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-ipsicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-ipsicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-ipsicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-mdicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-mdicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-mdicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-mdicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-octicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-octicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-octicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-octicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-pomicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-pomicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-pomicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-pomicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-powerline.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-powerline.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-powerline.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-powerline.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-sucicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-sucicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-sucicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-sucicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-wicon.el b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-wicon.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/data/nerd-icons-data-wicon.elc b/emacs/elpa/nerd-icons-20240520.1050/data/nerd-icons-data-wicon.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-autoloads.el b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-autoloads.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-data.el b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-data.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-data.elc b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-data.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-faces.el b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-faces.el
diff --git a/emacs/elpa/nerd-icons-20240412.1831/nerd-icons-faces.elc b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-faces.elc
Binary files differ.
diff --git a/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-pkg.el b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons-pkg.el
@@ -0,0 +1,14 @@
+(define-package "nerd-icons" "20240520.1050" "Emacs Nerd Font Icons Library"
+  '((emacs "24.3"))
+  :commit "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e" :authors
+  '(("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com"))
+  :maintainers
+  '(("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com"))
+  :maintainer
+  '("Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang" . "seagle0128@gmail.com")
+  :keywords
+  '("lisp")
+  :url "https://github.com/rainstormstudio/nerd-icons.el")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/nerd-icons-20240520.1050/nerd-icons.el b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons.el
@@ -0,0 +1,1315 @@
+;;; nerd-icons.el --- Emacs Nerd Font Icons Library -*- lexical-binding: t -*-
+
+;; Copyright (C) 2023 Hongyu Ding <rainstormstudio@yahoo.com>
+
+;; Author: Hongyu Ding <rainstormstudio@yahoo.com>, Vincent Zhang <seagle0128@gmail.com>
+;; Keywords: lisp
+;; Version: 0.1.0
+;; Package-Requires: ((emacs "24.3"))
+;; URL: https://github.com/rainstormstudio/nerd-icons.el
+;; Keywords: convenient, lisp
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This package was inspired by
+
+;; - `all-the-icons', found at https://github.com/Alexander-Miller/treemacs/blob/master/src/extra/treemacs-all-the-icons.el
+;; - `vim-devicons' for Vim, found at https://github.com/ryanoasis/vim-devicons
+;; - `nvim-web-devicons' for NeoVim, found at https://github.com/nvim-tree/nvim-web-devicons
+
+;; This package provides an interface to the Nerd Fonts
+
+;; - `nerd-fonts', found at https://github.com/ryanoasis/nerd-fonts
+
+;;; Code:
+
+(require 'cl-lib)
+
+(require 'nerd-icons-data)
+(require 'nerd-icons-faces)
+
+(declare-function set-fontset-font "src/fontset.c")
+
+(defgroup nerd-icons nil
+  "Manage how Nerd Fonts formats icons."
+  :prefix "nerd-icons-"
+  :group 'appearance
+  :group 'convenience)
+
+(defcustom nerd-icons-color-icons t
+  "Whether or not to include a foreground color when formatting the icon."
+  :group 'nerd-icons
+  :type 'boolean)
+
+(defcustom nerd-icons-scale-factor 1.0
+  "The base Scale Factor for the `height' face property of an icon."
+  :group 'nerd-icons
+  :type 'number)
+
+(defcustom nerd-icons-default-adjust 0.0
+  "The default adjustment to be made to the `raise' display property of an icon."
+  :group 'nerd-icons
+  :type 'number)
+
+(defcustom nerd-icons--cache-limit 2048
+  "Maximum cache size for functions cached by `nerd-icons-cache'."
+  :group 'nerd-icons
+  :type 'integer)
+
+(defcustom nerd-icons-font-family "Symbols Nerd Font Mono"
+  "The Nerd Font for display icons."
+  :group 'nerd-icons
+  :type 'string)
+
+(defcustom nerd-icons-fonts-subdirectory nil
+  "The subdirectory within the system fonts folder where the icons are installed."
+  :group 'nerd-icons
+  :type 'directory)
+
+(defvar nerd-icons-font-names '("NFM.ttf")
+  "List of defined font file names.")
+
+(defvar nerd-icons-glyph-sets '() "List of defined icon glyph sets.")
+
+(defvar nerd-icons-extension-icon-alist
+  '(
+    ("fish"           nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-lpink)
+    ("zsh"            nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-lcyan)
+    ("sh"             nerd-icons-devicon "nf-dev-terminal"       :face nerd-icons-purple)
+    ("bat"            nerd-icons-codicon "nf-cod-terminal_cmd"   :face nerd-icons-lsilver)
+    ("cmd"            nerd-icons-codicon "nf-cod-terminal_cmd"   :face nerd-icons-lsilver)
+    ;; Meta
+    ("tags"           nerd-icons-octicon "nf-oct-tag"            :face nerd-icons-blue)
+    ("log"            nerd-icons-octicon "nf-oct-log"            :face nerd-icons-maroon)
+    ;; Config
+    ("node"           nerd-icons-devicon "nf-dev-nodejs_small"   :face nerd-icons-green)
+    ("babelrc"        nerd-icons-mdicon "nf-md-babel"            :face nerd-icons-yellow)
+    ("bashrc"         nerd-icons-mdicon "nf-md-bash"             :face nerd-icons-dpink)
+    ("bowerrc"        nerd-icons-devicon "nf-dev-bower"          :face nerd-icons-silver)
+    ("cr"             nerd-icons-sucicon "nf-seti-crystal"       :face nerd-icons-yellow)
+    ("ecr"            nerd-icons-sucicon "nf-seti-crystal"       :face nerd-icons-yellow)
+    ("ini"            nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
+    ("properties"     nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
+    ("eslintignore"   nerd-icons-mdicon "nf-md-eslint"           :face nerd-icons-purple)
+    ("eslint"         nerd-icons-mdicon "nf-md-eslint"           :face nerd-icons-lpurple)
+    ("git"            nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
+    ("gitattributes"  nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
+    ("gitignore"      nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
+    ("gitmodules"     nerd-icons-sucicon "nf-seti-git"            :face nerd-icons-lred)
+    ("mk"             nerd-icons-devicon "nf-dev-gnu"            :face nerd-icons-dorange)
+    ;; ("cmake"    nerd-icons-devicon "cmake") TODO: cmake
+    ("dockerignore"   nerd-icons-devicon "nf-dev-docker"         :face nerd-icons-dblue)
+    ("xml"            nerd-icons-faicon "nf-fa-file_code_o"      :face nerd-icons-lorange)
+    ("json"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
+    ("jsonl"          nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
+    ("cson"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-yellow)
+    ("yml"            nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dyellow)
+    ("yaml"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dyellow)
+    ("toml"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-orange)
+    ("conf"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-dorange)
+    ("editorconfig"   nerd-icons-sucicon "nf-seti-editorconfig"  :face nerd-icons-silver)
+    ;; ?
+    ("pkg"            nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
+    ("rpm"            nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
+    ("pkgbuild"       nerd-icons-octicon "nf-oct-package"        :face nerd-icons-dsilver)
+    ("elc"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
+    ("eln"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
+    ("gz"             nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-lmaroon)
+    ("zip"            nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
+    ("7z"             nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
+    ("zst"            nerd-icons-octicon "nf-oct-file_zip"       :face nerd-icons-lmaroon)
+    ("dat"            nerd-icons-faicon "nf-fa-bar_chart"        :face nerd-icons-cyan)
+    ("dmg"            nerd-icons-octicon "nf-oct-tools"          :face nerd-icons-lsilver)
+    ("dll"            nerd-icons-faicon "nf-fa-cogs"             :face nerd-icons-silver)
+    ("ds_store"       nerd-icons-faicon "nf-fa-cogs"             :face nerd-icons-silver)
+    ("exe"            nerd-icons-octicon "nf-oct-file_binary"    :face nerd-icons-dsilver)
+    ("msg"            nerd-icons-octicon "nf-oct-mail"           :face nerd-icons-dsilver)
+    ;; Source Codes
+    ("ada"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
+    ("adb"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
+    ("adc"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
+    ("ads"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-blue)
+    ("gpr"            nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-green)
+    ("cgpr"           nerd-icons-sucicon "nf-custom-ada"         :face nerd-icons-green)
+    ("scpt"           nerd-icons-devicon "nf-dev-apple"          :face nerd-icons-pink)
+    ;; ("aup"         nerd-icons-fileicon "audacity") TODO: audacity
+    ("elm"            nerd-icons-sucicon "nf-seti-elm"           :face nerd-icons-blue)
+    ("erl"            nerd-icons-devicon "nf-dev-erlang"         :face nerd-icons-red)
+    ("hrl"            nerd-icons-devicon "nf-dev-erlang"         :face nerd-icons-dred)
+    ("eex"            nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
+    ("leex"           nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
+    ("heex"           nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lorange)
+    ("ex"             nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lpurple)
+    ("exs"            nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lred)
+    ("livemd"         nerd-icons-sucicon "nf-seti-elixir"        :face nerd-icons-lblue)
+    ("java"           nerd-icons-devicon "nf-dev-java"           :face nerd-icons-purple)
+    ("groovy"         nerd-icons-devicon "nf-dev-groovy"         :face nerd-icons-cyan)
+    ("gradle"         nerd-icons-sucicon "nf-seti-gradle"        :face nerd-icons-silver)
+    ("ebuild"         nerd-icons-mdicon "nf-md-gentoo"           :face nerd-icons-cyan)
+    ("eclass"         nerd-icons-mdicon "nf-md-gentoo"           :face nerd-icons-blue)
+    ("go"             nerd-icons-devicon "nf-dev-go"             :face nerd-icons-blue)
+    ("jl"             nerd-icons-sucicon "nf-seti-julia"         :face nerd-icons-purple)
+    ("magik"          nerd-icons-faicon "nf-fa-magic"            :face nerd-icons-blue)
+    ;; ("matlab"      nerd-icons-devicon "matlab") TODO: matlab
+    ("nix"            nerd-icons-mdicon "nf-md-nix"              :face nerd-icons-blue)
+    ("pl"             nerd-icons-sucicon "nf-seti-perl"          :face nerd-icons-lorange)
+    ("pm"             nerd-icons-sucicon "nf-seti-perl"          :face nerd-icons-lorange)
+    ;; ("pl6"         nerd-icons-devicon"raku") TODO: raku
+    ;; ("pm6"         nerd-icons-devicon "raku") TODO: raku
+    ("pod"            nerd-icons-devicon "nf-dev-perl"           :face nerd-icons-lgreen)
+    ("php"            nerd-icons-devicon "nf-dev-php"            :face nerd-icons-lsilver)
+    ;; ("pony"        nerd-icons-devicon "pony") TODO: pony
+    ("ps1"            nerd-icons-mdicon "nf-md-powershell"       :face nerd-icons-blue)
+    ("pro"            nerd-icons-sucicon "nf-seti-prolog"        :face nerd-icons-lmaroon)
+    ("proog"          nerd-icons-sucicon "nf-seti-prolog"        :face nerd-icons-lmaroon)
+    ("py"             nerd-icons-devicon "nf-dev-python"         :face nerd-icons-dblue)
+    ;; ("idr"         nerd-icons-devicon "idris") TODO: idris
+    ;; ("ipynb"       nerd-icons-devicon "jupyter") TODO: jupyter
+    ("gem"            nerd-icons-devicon "nf-dev-ruby"           :face nerd-icons-red)
+    ;; ("raku"        nerd-icons-devicon "raku") TODO: raku
+    ;; ("rakumod"     nerd-icons-devicon "raku") TODO: raku
+    ("rb"             nerd-icons-octicon "nf-oct-ruby"           :face nerd-icons-lred)
+    ("rs"             nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-maroon)
+    ("rlib"           nerd-icons-devicon "nf-dev-rust"           :face nerd-icons-dmaroon)
+    ("r"              nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
+    ("rd"             nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
+    ("rdx"            nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
+    ("rsx"            nerd-icons-sucicon "nf-seti-r"             :face nerd-icons-lblue)
+    ("svelte"         nerd-icons-sucicon "nf-seti-svelte"        :face nerd-icons-red)
+    ("gql"            nerd-icons-mdicon "nf-md-graphql"          :face nerd-icons-dpink)
+    ("graphql"        nerd-icons-mdicon "nf-md-graphql"          :face nerd-icons-dpink)
+    ;; There seems to be a a bug with this font icon which does not
+    ;; let you propertise it without it reverting to being a lower
+    ;; case phi
+    ("c"              nerd-icons-sucicon "nf-custom-c"           :face nerd-icons-blue)
+    ("h"              nerd-icons-faicon "nf-fa-h_square"         :face nerd-icons-purple)
+    ("m"              nerd-icons-devicon "nf-dev-apple" )
+    ("mm"             nerd-icons-devicon "nf-dev-apple" )
+    ;;
+    ("cc"             nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
+    ("cpp"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
+    ("cxx"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-blue)
+    ("hh"             nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
+    ("hpp"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
+    ("hxx"            nerd-icons-sucicon "nf-custom-cpp"         :face nerd-icons-purple)
+    ;; Lisps
+    ("cl"             nerd-icons-sucicon "nf-custom-common_lisp" :face nerd-icons-lorange)
+    ("l"              nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-orange)
+    ("lisp"           nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-orange)
+    ;; ("hy"             nerd-icons-sucicon "nf-custom-hy"          :face nerd-icons-blue)
+    ("el"             nerd-icons-sucicon "nf-custom-emacs"       :face nerd-icons-purple)
+    ("clj"            nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-blue)
+    ("cljc"           nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-blue)
+    ("cljs"           nerd-icons-devicon "nf-dev-clojure"        :face nerd-icons-lyellow)
+    ("coffee"         nerd-icons-devicon "nf-dev-coffeescript"   :face nerd-icons-maroon)
+    ("iced"           nerd-icons-devicon "nf-dev-coffeescript"   :face nerd-icons-lmaroon)
+    ("dart"           nerd-icons-devicon "nf-dev-dart"           :face nerd-icons-blue)
+    ("ledger"         nerd-icons-mdicon  "nf-md-file_table_box_multiple" :face nerd-icons-green)
+    ("rkt"            nerd-icons-sucicon "nf-custom-scheme"       :face nerd-icons-red)
+    ("scrbl"          nerd-icons-sucicon "nf-custom-scheme"       :face nerd-icons-blue)
+    ;; Stylesheeting
+    ("css"            nerd-icons-devicon "nf-dev-css3"           :face nerd-icons-yellow)
+    ("scss"           nerd-icons-mdicon "nf-md-sass"             :face nerd-icons-pink)
+    ("sass"           nerd-icons-mdicon "nf-md-sass"             :face nerd-icons-dpink)
+    ("less"           nerd-icons-devicon "nf-dev-less"           :face nerd-icons-dyellow)
+    ;; ("postcss"     nerd-icons-devicon "postcss") TODO: postcss
+    ;; ("sss"         nerd-icons-devicon "postcss") TODO: postcss
+    ("styl"           nerd-icons-devicon "nf-dev-stylus"         :face nerd-icons-lgreen)
+    ("csv"            nerd-icons-octicon "nf-oct-graph"          :face nerd-icons-dblue)
+    ;; haskell
+    ("hs"             nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
+    ("chs"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
+    ("lhs"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
+    ("hsc"            nerd-icons-devicon "nf-dev-haskell"        :face nerd-icons-red)
+    ;; Web modes
+    ("inky-haml"      nerd-icons-sucicon "nf-seti-haml"          :face nerd-icons-lyellow)
+    ("haml"           nerd-icons-sucicon "nf-seti-haml"          :face nerd-icons-lyellow)
+    ("htm"            nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-orange)
+    ("html"           nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-orange)
+    ("inky-er"        nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
+    ("inky-erb"       nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
+    ("erb"            nerd-icons-devicon "nf-dev-html5"          :face nerd-icons-lred)
+    ;; ("hbs"         nerd-icons-fileicon "moustache") TODO: moustache
+    ("inky-slim"      nerd-icons-codicon "nf-cod-dashboard"      :face nerd-icons-yellow)
+    ("slim"           nerd-icons-codicon "nf-cod-dashboard"      :face nerd-icons-yellow)
+    ("jade"           nerd-icons-sucicon "nf-seti-jade"          :face nerd-icons-red)
+    ("pug"            nerd-icons-sucicon "nf-seti-pug"           :face nerd-icons-red)
+    ;; Javascript
+    ;; ("d3js"        nerd-icons-devicon "d3") TODO: d3
+    ("re"             nerd-icons-sucicon "nf-seti-reasonml"      :face nerd-icons-red-alt)
+    ("rei"            nerd-icons-sucicon "nf-seti-reasonml"      :face nerd-icons-dred)
+    ("ml"             nerd-icons-sucicon "nf-seti-ocaml"         :face nerd-icons-lpink)
+    ("mli"            nerd-icons-sucicon "nf-seti-ocaml"         :face nerd-icons-dpink)
+    ("react"          nerd-icons-devicon "nf-dev-react"          :face nerd-icons-lblue)
+    ("ts"             nerd-icons-sucicon "nf-seti-typescript"    :face nerd-icons-blue-alt)
+    ("js"             nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-yellow)
+    ("es"             nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-yellow)
+    ("jsx"            nerd-icons-devicon "nf-dev-javascript"     :face nerd-icons-cyan-alt)
+    ("tsx"            nerd-icons-sucicon "nf-seti-typescript"    :face nerd-icons-blue-alt)
+    ("njs"            nerd-icons-mdicon "nf-md-nodejs"           :face nerd-icons-lgreen)
+    ("vue"            nerd-icons-sucicon "nf-seti-vue"           :face nerd-icons-lgreen)
+
+    ("sbt"            nerd-icons-sucicon "nf-seti-sbt"           :face nerd-icons-red)
+    ("scala"          nerd-icons-devicon "nf-dev-scala"          :face nerd-icons-red)
+    ("scm"            nerd-icons-sucicon "nf-custom-scheme"      :face nerd-icons-red)
+    ("swift"          nerd-icons-devicon "nf-dev-swift"          :face nerd-icons-green)
+
+    ("tcl"            nerd-icons-mdicon "nf-md-feather"          :face nerd-icons-dred)
+    ("exp"            nerd-icons-mdicon "nf-md-feather"          :face nerd-icons-dred)
+
+    ("tf"             nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
+    ("tfvars"         nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
+    ("tfstate"        nerd-icons-mdicon "nf-md-terraform"        :face nerd-icons-purple-alt)
+
+    ("asm"            nerd-icons-sucicon "nf-seti-asm"           :face nerd-icons-blue)
+    ;; Verilog(-AMS) and SystemVerilog(-AMS     ;; Verilog(-AMS) and SystemVerilog(-AMS)
+    ("v"              nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ("vams"           nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ("sv"             nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ("sva"            nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ("svh"            nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ("svams"          nerd-icons-mdicon "nf-md-chip"             :face nerd-icons-red)
+    ;; VHDL(-AMS     ;; VHDL(-AMS)
+    ("vhd"            nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
+    ("vhdl"           nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
+    ("vhms"           nerd-icons-octicon "nf-oct-cpu"            :face nerd-icons-blue)
+    ;; Cabal
+    ;; ("cabal"       nerd-icons-devicon "cabal") TODO: cabal
+    ;; Kotlin
+    ("kt"             nerd-icons-sucicon "nf-seti-kotlin"        :face nerd-icons-orange)
+    ("kts"            nerd-icons-sucicon "nf-seti-kotlin"        :face nerd-icons-orange)
+    ;; Nimrod
+    ("nim"            nerd-icons-sucicon "nf-seti-nim"           :face nerd-icons-yellow)
+    ("nims"           nerd-icons-sucicon "nf-seti-nim"           :face nerd-icons-yellow)
+    ;; SQL
+    ("sql"            nerd-icons-octicon "nf-oct-database"       :face nerd-icons-silver)
+    ;; Styles
+    ;; ("styles"      nerd-icons-devicon "style") TODO: style
+    ;; Lua
+    ("lua"            nerd-icons-sucicon "nf-seti-lua"           :face nerd-icons-dblue)
+    ;; ASCII doc
+    ;; ("adoc"        nerd-icons-devicon "asciidoc") TODO: asciidoc
+    ;; ("asciidoc"    nerd-icons-devicon "asciidoc") TODO: asciidoc
+    ;; Puppet
+    ("pp"             nerd-icons-sucicon "nf-seti-puppet"        :face nerd-icons-yellow)
+    ;; Jinja
+    ("j2"             nerd-icons-sucicon "nf-seti-jinja"         :face nerd-icons-silver)
+    ("jinja2"         nerd-icons-sucicon "nf-seti-jinja"         :face nerd-icons-silver)
+    ;; Docker
+    ("dockerfile"     nerd-icons-sucicon "nf-seti-docker"        :face nerd-icons-cyan)
+    ;; Vagrant
+    ;; ("vagrantfile" nerd-icons-fileicon "vagrant") TODO: vagrant
+    ;; GLSL
+    ("glsl"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-blue)
+    ("vert"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-blue)
+    ("tesc"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-purple)
+    ("tese"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-dpurple)
+    ("geom"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-green)
+    ("frag"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-red)
+    ("comp"           nerd-icons-faicon "nf-fa-paint_brush"      :face nerd-icons-dblue)
+    ;; CUDA
+    ("cu"             nerd-icons-sucicon "nf-custom-c"           :face nerd-icons-green)
+    ("cuh"            nerd-icons-faicon "nf-fa-h_square"         :face nerd-icons-green)
+    ;; Fortran
+    ("f90"            nerd-icons-mdicon "nf-md-language_fortran" :face nerd-icons-purple)
+    ;; C#
+    ("cs"             nerd-icons-mdicon "nf-md-language_csharp"  :face nerd-icons-dblue)
+    ("csx"            nerd-icons-mdicon "nf-md-language_csharp"  :face nerd-icons-dblue)
+    ;; F#
+    ("fs"             nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
+    ("fsi"            nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
+    ("fsx"            nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
+    ("fsscript"       nerd-icons-devicon "nf-dev-fsharp"         :face nerd-icons-blue-alt)
+    ;; Godot / GDScript
+    ("gd"             nerd-icons-sucicon "nf-seti-godot"         :face nerd-icons-blue)
+    ("tscn"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-orange)
+    ("tres"           nerd-icons-codicon "nf-cod-settings"       :face nerd-icons-orange)
+    ;; zig
+    ("zig"            nerd-icons-sucicon "nf-seti-zig"           :face nerd-icons-orange)
+    ;; odin
+    ;; ("odin"        nerd-icons-fileicon "odin") TODO: odin
+    ;; File Types
+    ("ico"            nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-blue)
+    ("png"            nerd-icons-mdicon "nf-md-file_png_box"     :face nerd-icons-orange)
+    ("gif"            nerd-icons-mdicon "nf-md-file_gif_box"     :face nerd-icons-green)
+    ("jpeg"           nerd-icons-mdicon "nf-md-file_jpg_box"     :face nerd-icons-dblue)
+    ("jpg"            nerd-icons-mdicon "nf-md-file_jpg_box"     :face nerd-icons-dblue)
+    ("webp"           nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-dblue)
+    ("xpm"            nerd-icons-octicon "nf-oct-file_media"     :face nerd-icons-dgreen)
+    ;; Audio
+    ("mp3"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("wav"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("m4a"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("ogg"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("flac"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("opus"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("au"             nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("aif"            nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("aifc"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("aiff"           nerd-icons-faicon "nf-fa-music"            :face nerd-icons-dred)
+    ("svg"            nerd-icons-sucicon "nf-seti-svg"           :face nerd-icons-lgreen)
+    ;; Video
+    ("mov"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("mp4"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("ogv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-dblue)
+    ("mpg"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("mpeg"           nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("flv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("ogv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-dblue)
+    ("mkv"            nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ("webm"           nerd-icons-faicon "nf-fa-film"             :face nerd-icons-blue)
+    ;; Fonts
+    ("ttf"            nerd-icons-faicon "nf-fa-font"             :face nerd-icons-dcyan)
+    ("woff"           nerd-icons-faicon "nf-fa-font"             :face nerd-icons-cyan)
+    ("woff2"          nerd-icons-faicon "nf-fa-font"             :face nerd-icons-cyan)
+    ;; Archives
+    ("iso"            nerd-icons-mdicon "nf-md-disc"            :face nerd-icons-orange)
+    ("tar"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
+    ("rar"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
+    ("tgz"            nerd-icons-mdicon "nf-md-zip_box"          :face nerd-icons-orange)
+    ("jar"            nerd-icons-devicon "nf-dev-java"           :face nerd-icons-dpurple)
+    ;; Doc
+    ("pdf"            nerd-icons-codicon "nf-cod-file_pdf"       :face nerd-icons-dred)
+    ("text"           nerd-icons-faicon "nf-fa-file_text"        :face nerd-icons-cyan)
+    ("txt"            nerd-icons-faicon "nf-fa-file_text"        :face nerd-icons-cyan)
+    ("doc"            nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
+    ("docx"           nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
+    ("docm"           nerd-icons-mdicon "nf-md-file_word"        :face nerd-icons-blue)
+    ("texi"           nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
+    ("tex"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
+    ("ltx"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
+    ("dtx"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
+    ("sty"            nerd-icons-sucicon "nf-seti-tex"           :face nerd-icons-lred)
+    ("md"             nerd-icons-octicon "nf-oct-markdown"       :face nerd-icons-lblue)
+    ("bib"            nerd-icons-mdicon "nf-md-book"             :face nerd-icons-lblue)
+    ("org"            nerd-icons-sucicon "nf-custom-orgmode"     :face nerd-icons-lgreen)
+    ("org_archive"    nerd-icons-sucicon "nf-custom-orgmode"     :face nerd-icons-lgreen)
+    ("pps"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
+    ("ppt"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
+    ("pptsx"          nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
+    ("ppttx"          nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-orange)
+    ("knt"            nerd-icons-mdicon "nf-md-file_powerpoint"  :face nerd-icons-cyan)
+    ("xlsx"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
+    ("xlsm"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
+    ("xlsb"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
+    ("xltx"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
+    ("xltm"           nerd-icons-mdicon "nf-md-file_excel"       :face nerd-icons-dgreen)
+    ("epub"           nerd-icons-mdicon "nf-md-book_open"        :face nerd-icons-green)
+    ("ly"             nerd-icons-faicon "nf-fa-music"            :face nerd-icons-green)
+    ;;
+    ("key"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
+    ("pem"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-orange)
+    ("p12"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-dorange)
+    ("crt"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
+    ("pub"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-blue)
+    ("gpg"            nerd-icons-octicon "nf-oct-key"            :face nerd-icons-lblue)
+    ("kdbx"           nerd-icons-octicon "nf-oct-key"            :face nerd-icons-green)
+    ("cache"          nerd-icons-octicon "nf-oct-database"       :face nerd-icons-green)
+    ;; backup
+    ("backup"         nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)
+    ("old"            nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)
+    ("bak"            nerd-icons-mdicon "nf-md-file_restore"     :face nerd-icons-lblue)))
+
+(defvar                        nerd-icons-regexp-icon-alist
+  '(
+    ;;
+    ("^TAGS$"                  nerd-icons-octicon "nf-oct-tag"               :face nerd-icons-blue)
+    ("^TODO$"                  nerd-icons-octicon "nf-oct-checklist"         :face nerd-icons-lyellow)
+    ("^LICENSE$"               nerd-icons-octicon "nf-oct-book"              :face nerd-icons-blue)
+    ("^readme"                 nerd-icons-octicon "nf-oct-book"              :face nerd-icons-lcyan)
+
+    ;; Config
+    ("nginx$"                  nerd-icons-devicon "nf-dev-nginx"             :face nerd-icons-dgreen)
+    ;; ("apache$"              nerd-icons-alltheicon "apache") TODO: apache
+
+    ;; C
+    ("^Makefile$"              nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-dorange)
+    ("^CMakeLists.txt$"        nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-red) ;; TODO: cmake
+    ("^CMakeCache.txt$"        nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-blue) ;; TODO: cmakecache
+    ("^meson.build$"           nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-purple) ;; TODO: meson
+    ("^meson_options.txt$"     nerd-icons-sucicon "nf-seti-makefile"         :face nerd-icons-purple) ;; TODO: meson
+
+    ;; Docker
+    ("^\\.?Dockerfile"         nerd-icons-sucicon "nf-seti-docker"           :face nerd-icons-blue)
+
+    ;; Homebrew
+    ("^Brewfile$"              nerd-icons-faicon "nf-fa-beer"                :face nerd-icons-lsilver)
+
+    ;; ;; AWS
+    ("^stack.*.json$"          nerd-icons-devicon "nf-dev-aws"               :face nerd-icons-orange)
+    ("^serverless\\.yml$"      nerd-icons-faicon "nf-fa-bolt"                :face nerd-icons-yellow)
+
+    ;; lock files
+    ("~$"                      nerd-icons-octicon "nf-oct-lock"              :face nerd-icons-maroon)
+
+    ;; Source Codes
+    ("^mix.lock$"              nerd-icons-sucicon "nf-seti-elixir"           :face nerd-icons-lyellow)
+
+    ;; Ruby
+    ("^Gemfile\\(\\.lock\\)?$" nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
+    ("_?test\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
+    ("_?test_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
+    ("_?spec\\.rb$"            nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-red)
+    ("_?spec_helper\\.rb$"     nerd-icons-octicon "nf-oct-ruby"              :face nerd-icons-dred)
+
+    ("-?spec\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
+    ("-?test\\.ts$"            nerd-icons-mdicon "nf-md-language_typescript" :face nerd-icons-blue)
+    ("-?spec\\.js$"            nerd-icons-mdicon "nf-md-language_javascript" :face nerd-icons-lpurple)
+    ("-?test\\.js$"            nerd-icons-mdicon "nf-md-language_javascript" :face nerd-icons-lpurple)
+    ("-?spec\\.jsx$"           nerd-icons-mdicon "nf-md-react"               :face nerd-icons-blue-alt)
+    ("-?test\\.jsx$"           nerd-icons-mdicon "nf-md-react"               :face nerd-icons-blue-alt)
+
+    ;; Git
+    ("^MERGE_"                 nerd-icons-octicon "nf-oct-git_merge"         :face nerd-icons-red)
+    ("^COMMIT_EDITMSG"         nerd-icons-octicon "nf-oct-git_commit"        :face nerd-icons-red)
+
+    ;; Stylesheeting
+    ("stylelint"               nerd-icons-sucicon "nf-seti-stylelint"        :face nerd-icons-lyellow)
+
+    ;; JavaScript
+    ("^package.json$"          nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-red)
+    ("^package.lock.json$"     nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-dred)
+    ("^yarn\\.lock"            nerd-icons-sucicon "nf-seti-yarn"             :face nerd-icons-blue-alt)
+    ("\\.npmignore$"           nerd-icons-devicon "nf-dev-npm"               :face nerd-icons-dred)
+    ("^bower.json$"            nerd-icons-devicon "nf-dev-bower"             :face nerd-icons-lorange)
+    ("^gulpfile"               nerd-icons-devicon "nf-dev-gulp"              :face nerd-icons-lred)
+    ("^gruntfile"              nerd-icons-devicon "nf-dev-grunt"             :face nerd-icons-lyellow)
+    ("^webpack"                nerd-icons-mdicon "nf-md-webpack"             :face nerd-icons-lblue)
+
+    ;; Go
+    ("^go.mod$"                nerd-icons-sucicon "nf-seti-config"           :face nerd-icons-blue-alt)
+    ("^go.work$"               nerd-icons-sucicon "nf-seti-config"           :face nerd-icons-blue-alt)
+
+    ;; Groovy
+    ("Jenkinsfile\\'"          nerd-icons-devicon "nf-dev-groovy"            :face nerd-icons-cyan-alt)
+
+    ;; Emacs
+    ("bookmark"                nerd-icons-octicon "nf-oct-bookmark"          :face nerd-icons-lpink)
+
+    ("^\\*scratch\\*$"         nerd-icons-faicon "nf-fa-sticky_note"         :face nerd-icons-lyellow)
+    ("^\\*scratch.*"           nerd-icons-faicon "nf-fa-sticky_note"         :face nerd-icons-yellow)
+    ("^\\*new-tab\\*$"         nerd-icons-mdicon "nf-md-star"                :face nerd-icons-cyan)
+    ("Cask\\'"                 nerd-icons-sucicon "nf-custom-emacs"          :face nerd-icons-blue)
+    ("Eask\\'"                 nerd-icons-sucicon "nf-custom-emacs"          :face nerd-icons-blue)
+
+    ("^\\."                    nerd-icons-octicon "nf-oct-gear")))
+
+(defvar nerd-icons-default-file-icon
+  '(nerd-icons-faicon "nf-fa-file_o"))
+
+(defvar nerd-icons-dir-icon-alist
+  '(
+    ("trash"            nerd-icons-faicon "nf-fa-trash_o")
+    ("dropbox"          nerd-icons-faicon "nf-fa-dropbox")
+    ("google[ _-]drive" nerd-icons-mdicon "nf-md-folder_google_drive")
+    ("github"           nerd-icons-sucicon "nf-custom-folder_github")
+    ("^atom$"           nerd-icons-devicon "nf-dev-atom")
+    ("documents"        nerd-icons-mdicon "nf-md-folder_file")
+    ("download"         nerd-icons-mdicon "nf-md-folder_download")
+    ("desktop"          nerd-icons-octicon "nf-oct-device_desktop")
+    ("pictures"         nerd-icons-mdicon "nf-md-folder_image")
+    ("photos"           nerd-icons-faicon "nf-fa-camera_retro")
+    ("music"            nerd-icons-mdicon "nf-md-folder_music")
+    ("movies"           nerd-icons-faicon "nf-fa-film")
+    ("code"             nerd-icons-octicon "nf-oct-code")
+    ("workspace"        nerd-icons-octicon "nf-oct-code")
+    ;; ("test"             nerd-icons-devicon "test-dir")
+    ("\\.git"           nerd-icons-sucicon "nf-custom-folder_git")
+    ("\\.config"        nerd-icons-sucicon "nf-custom-folder_config")
+    (".?"               nerd-icons-sucicon "nf-custom-folder_oct")))
+
+(defvar nerd-icons-weather-icon-alist
+  '(
+    ("tornado"               nerd-icons-wicon "nf-weather-tornado")
+    ("hurricane"             nerd-icons-wicon "nf-weather-hurricane")
+    ("thunderstorms"         nerd-icons-wicon "nf-weather-thunderstorm")
+    ("sunny"                 nerd-icons-wicon "nf-weather-day_sunny")
+    ("rain.*snow"            nerd-icons-wicon "nf-weather-rain_mix")
+    ("rain.*hail"            nerd-icons-wicon "nf-weather-rain_mix")
+    ("sleet"                 nerd-icons-wicon "nf-weather-sleet")
+    ("hail"                  nerd-icons-wicon "nf-weather-hail")
+    ("drizzle"               nerd-icons-wicon "nf-weather-sprinkle")
+    ("rain"                  nerd-icons-wicon "nf-weather-showers")
+    ("showers"               nerd-icons-wicon "nf-weather-showers")
+    ("blowing.*snow"         nerd-icons-wicon "nf-weather-snow_wind")
+    ("snow"                  nerd-icons-wicon "nf-weather-snow")
+    ("dust"                  nerd-icons-wicon "nf-weather-dust")
+    ("fog"                   nerd-icons-wicon "nf-weather-fog")
+    ("haze"                  nerd-icons-wicon "nf-weather-day_haze")
+    ("smoky"                 nerd-icons-wicon "nf-weather-smoke")
+    ("blustery"              nerd-icons-wicon "nf-weather-cloudy_windy")
+    ("windy"                 nerd-icons-wicon "nf-weather-cloudy_gusts")
+    ("cold"                  nerd-icons-wicon "nf-weather-snowflake_cold")
+    ("partly.*cloudy.*night" nerd-icons-wicon "nf-weather-night_alt_partly_cloudy")
+    ("partly.*cloudy"        nerd-icons-wicon "nf-weather-day_cloudy_high")
+    ("cloudy.*night"         nerd-icons-wicon "nf-weather-night_alt_cloudy")
+    ("cxloudy.*day"          nerd-icons-wicon "nf-weather-day_cloudy")
+    ("cloudy"                nerd-icons-wicon "nf-weather-cloudy")
+    ("clear.*night"          nerd-icons-wicon "nf-weather-night_clear")
+    ("fair.*night"           nerd-icons-wicon "nf-weather-stars")
+    ("fair.*day"             nerd-icons-wicon "nf-weather-horizon")
+    ("hot"                   nerd-icons-wicon "nf-weather-hot")
+    ("not.*available"        nerd-icons-wicon "nf-weather-na")))
+
+(defvar nerd-icons-mode-icon-alist
+  '(
+    (emacs-lisp-mode                   nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-purple)
+    (circe-server-mode                 nerd-icons-faicon "nf-fa-commenting_o")
+    (circe-channel-mode                nerd-icons-faicon "nf-fa-commenting_o")
+    (circe-query-mode                  nerd-icons-faicon "nf-fa-commenting_o")
+    (crystal-mode                      nerd-icons-sucicon "nf-custom-crystal"         :face nerd-icons-yellow)
+    (erc-mode                          nerd-icons-faicon "nf-fa-commenting_o")
+    (inferior-emacs-lisp-mode          nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-lblue)
+    (dired-mode                        nerd-icons-octicon "nf-oct-file_directory")
+    (lisp-interaction-mode             nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-orange)
+    (sly-mrepl-mode                    nerd-icons-sucicon "nf-custom-common_lisp"     :face nerd-icons-orange)
+    (slime-repl-mode                   nerd-icons-sucicon "nf-custom-common_lisp"     :face nerd-icons-orange)
+    (org-mode                          nerd-icons-sucicon "nf-custom-orgmode"         :face nerd-icons-lgreen)
+    (ledger-mode                       nerd-icons-mdicon "nf-md-file_table_box_multiple"   :face nerd-icons-green)
+    (typescript-mode                   nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
+    (typescript-ts-mode                nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
+    (typescript-tsx-mode               nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
+    (tsx-ts-mode                       nerd-icons-mdicon "nf-md-language_typescript"  :face nerd-icons-blue-alt)
+    (js-mode                           nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
+    (js-ts-mode                        nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
+    (js-jsx-mode                       nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
+    (js2-mode                          nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
+    (js3-mode                          nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-yellow)
+    (rjsx-mode                         nerd-icons-devicon "nf-dev-javascript"         :face nerd-icons-cyan-alt)
+    (term-mode                         nerd-icons-devicon "nf-dev-terminal")
+    (vterm-mode                        nerd-icons-devicon "nf-dev-terminal")
+    (eshell-mode                       nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
+    (magit-refs-mode                   nerd-icons-devicon "nf-dev-git_branch"         :face nerd-icons-red)
+    (magit-process-mode                nerd-icons-octicon "nf-oct-mark_github")
+    (magit-diff-mode                   nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-lblue)
+    (ediff-mode                        nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-red)
+    (diff-mode                         nerd-icons-devicon "nf-dev-git_compare"        :face nerd-icons-lred)
+    (comint-mode                       nerd-icons-faicon "nf-fa-terminal"             :face nerd-icons-lblue)
+    (eww-mode                          nerd-icons-faicon "nf-fa-firefox"              :face nerd-icons-red)
+    (xwidget-webkit-mode               nerd-icons-faicon "nf-fa-chrome"               :face nerd-icons-blue)
+    (org-agenda-mode                   nerd-icons-octicon "nf-oct-checklist"          :face nerd-icons-lgreen)
+    (cfw:calendar-mode                 nerd-icons-octicon "nf-oct-calendar")
+    (ibuffer-mode                      nerd-icons-faicon "nf-fa-files_o"              :face nerd-icons-dsilver)
+    (messages-buffer-mode              nerd-icons-faicon "nf-fa-file_o"               :face nerd-icons-dsilver)
+    (help-mode                         nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-purple)
+    (helpful-mode                      nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-purple)
+    (Info-mode                         nerd-icons-faicon "nf-fa-info"                 :face nerd-icons-blue)
+    (benchmark-init/tree-mode          nerd-icons-faicon "nf-fa-dashboard")
+    (jenkins-mode                      nerd-icons-devicon "nf-dev-jenkins"            :face nerd-icons-blue)
+    (magit-popup-mode                  nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-red)
+    (magit-status-mode                 nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-lred)
+    (magit-log-mode                    nerd-icons-sucicon "nf-seti-git"               :face nerd-icons-green)
+    (mu4e-compose-mode                 nerd-icons-octicon "nf-oct-pencil")
+    (mu4e-headers-mode                 nerd-icons-octicon "nf-oct-mail")
+    (mu4e-main-mode                    nerd-icons-octicon "nf-oct-mail")
+    (mu4e-view-mode                    nerd-icons-codicon "nf-cod-mail_read")
+    (sieve-mode                        nerd-icons-octicon "nf-oct-mail")
+    (gnus-group-mode                   nerd-icons-octicon "nf-oct-mail")
+    (gnus-summary-mode                 nerd-icons-octicon "nf-oct-mail")
+    (gnus-article-mode                 nerd-icons-codicon "nf-cod-mail_read")
+    (message-mode                      nerd-icons-octicon "nf-oct-pencil")
+    (package-menu-mode                 nerd-icons-faicon "nf-fa-archive"              :face nerd-icons-silver)
+    (paradox-menu-mode                 nerd-icons-faicon "nf-fa-archive"              :face nerd-icons-silver)
+    (Custom-mode                       nerd-icons-codicon "nf-cod-settings")
+
+    ;; Special matcher for Web Mode based on the `web-mode-content-type' of the current buffer
+    (web-mode                          nerd-icons--web-mode-icon)
+
+    (fundamental-mode                  nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-dsilver)
+    (special-mode                      nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-yellow)
+    (cask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
+    (eask-mode                         nerd-icons-sucicon "nf-custom-emacs"           :face nerd-icons-blue)
+    (text-mode                         nerd-icons-faicon "nf-fa-file_text"            :face nerd-icons-cyan)
+    (enh-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
+    (ruby-mode                         nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
+    (ruby-ts-mode                      nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-lred)
+    (inf-ruby-mode                     nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
+    (projectile-rails-compilation-mode nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
+    (rspec-compilation-mode            nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
+    (rake-compilation-mode             nerd-icons-devicon "nf-dev-ruby"               :face nerd-icons-red)
+    (sh-mode                           nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
+    (bash-ts-mode                      nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
+    (shell-mode                        nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-purple)
+    (fish-mode                         nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-lpink)
+    (bat-mode                          nerd-icons-codicon "nf-cod-terminal_cmd"       :face nerd-icons-lsilver)
+    (nginx-mode                        nerd-icons-devicon "nf-dev-nginx"              :face nerd-icons-dgreen)
+    ;; (apache-mode                    nerd-icons-alltheicon "apache"                 :face nerd-icons-dgreen)
+    (makefile-mode                     nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
+    (makefile-ts-mode                  nerd-icons-devicon "nf-dev-gnu"                :face nerd-icons-dorange)
+    ;; (cmake-mode                     nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
+    ;; (cmake-ts-mode                  nerd-icons-fileicon "cmake"                    :face nerd-icons-red)
+    (dockerfile-mode                   nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-blue)
+    (dockerfile-ts-mode                nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-blue)
+    (docker-compose-mode               nerd-icons-sucicon "nf-seti-docker"            :face nerd-icons-lblue)
+    (nxml-mode                         nerd-icons-faicon "nf-fa-file_code_o"          :face nerd-icons-lorange)
+    (conf-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-lyellow)
+    (json-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
+    (json-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
+    (jsonian-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-yellow)
+    (yaml-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-dyellow)
+    (yaml-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-dyellow)
+    (toml-mode                         nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-orange)
+    (toml-ts-mode                      nerd-icons-codicon "nf-cod-settings"           :face nerd-icons-orange)
+    (elisp-byte-code-mode              nerd-icons-octicon "nf-oct-file_binary"        :face nerd-icons-dsilver)
+    (archive-mode                      nerd-icons-octicon "nf-oct-file_zip"           :face nerd-icons-lmaroon)
+    (elm-mode                          nerd-icons-sucicon "nf-custom-elm"             :face nerd-icons-blue)
+    (erlang-mode                       nerd-icons-devicon "nf-dev-erlang"             :face nerd-icons-red)
+    (elixir-mode                       nerd-icons-sucicon "nf-custom-elixir"          :face nerd-icons-lorange)
+    (elixir-ts-mode                    nerd-icons-sucicon "nf-custom-elixir"          :face nerd-icons-lorange)
+    (java-mode                         nerd-icons-devicon "nf-dev-java"               :face nerd-icons-purple)
+    (groovy-mode                       nerd-icons-devicon "nf-dev-groovy"             :face nerd-icons-cyan)
+    (java-ts-mode                      nerd-icons-devicon "nf-dev-java"               :face nerd-icons-purple)
+    (go-mode                           nerd-icons-devicon "nf-dev-go"                 :face nerd-icons-blue)
+    (go-ts-mode                        nerd-icons-devicon "nf-dev-go"                 :face nerd-icons-blue)
+    (go-dot-mod-mode                   nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
+    (go-mod-ts-mode                    nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
+    (go-dot-work-mode                  nerd-icons-sucicon "nf-seti-config"            :face nerd-icons-blue-alt)
+    (graphql-mode                      nerd-icons-sucicon "nf-seti-graphql"           :face nerd-icons-dpink)
+    ;; (matlab-mode                    nerd-icons-fileicon "matlab"                   :face nerd-icons-orange)
+    (nix-mode                          nerd-icons-mdicon "nf-md-nix"                  :face nerd-icons-blue)
+    (perl-mode                         nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
+    (cperl-mode                        nerd-icons-devicon "nf-dev-perl"               :face nerd-icons-lorange)
+    (php-mode                          nerd-icons-devicon "nf-dev-php"                :face nerd-icons-lsilver)
+    (php-ts-mode                       nerd-icons-devicon "nf-dev-php"                :face nerd-icons-lsilver)
+    (prolog-mode                       nerd-icons-devicon "nf-dev-prolog"             :face nerd-icons-lmaroon)
+    (python-mode                       nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
+    (python-ts-mode                    nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
+    (inferior-python-mode              nerd-icons-devicon "nf-dev-python"             :face nerd-icons-dblue)
+    ;; (racket-mode                    nerd-icons-fileicon "racket"                   :face nerd-icons-red)
+    (rust-mode                         nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
+    (rustic-mode                       nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
+    (rust-ts-mode                      nerd-icons-devicon "nf-dev-rust"               :face nerd-icons-maroon)
+    (scala-mode                        nerd-icons-devicon "nf-dev-scala"              :face nerd-icons-red)
+    ;; (scheme-mode                    nerd-icons-fileicon   "scheme"                 :face nerd-icons-red)
+    (swift-mode                        nerd-icons-devicon "nf-dev-swift"              :face nerd-icons-green)
+    (svelte-mode                       nerd-icons-sucicon "nf-seti-svelte"            :face nerd-icons-red)
+    (ada-mode                          nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-blue)
+    (ada-ts-mode                       nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-blue)
+    (gpr-mode                          nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-green)
+    (gpr-ts-mode                       nerd-icons-sucicon "nf-custom-ada"             :face nerd-icons-green)
+    (c-mode                            nerd-icons-sucicon "nf-custom-c"               :face nerd-icons-blue)
+    (c-ts-mode                         nerd-icons-sucicon "nf-custom-c"               :face nerd-icons-blue)
+    (c++-mode                          nerd-icons-sucicon "nf-custom-cpp"             :face nerd-icons-blue)
+    (c++-ts-mode                       nerd-icons-sucicon "nf-custom-cpp"             :face nerd-icons-blue)
+    (csharp-mode                       nerd-icons-mdicon "nf-md-language_csharp"      :face nerd-icons-dblue)
+    (csharp-ts-mode                    nerd-icons-mdicon "nf-md-language_csharp"      :face nerd-icons-dblue)
+    (clojure-mode                      nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-blue)
+    (clojure-ts-mode                   nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-blue)
+    (cider-repl-mode                   nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-green)
+    (clojurec-mode                     nerd-icons-sucicon "nf-seti-clojure"           :face nerd-icons-blue)
+    (clojurec-ts-mode                  nerd-icons-sucicon "nf-seti-clojure"           :face nerd-icons-blue)
+    (clojurescript-mode                nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-lyellow)
+    (clojurescript-ts-mode             nerd-icons-devicon "nf-dev-clojure_alt"        :face nerd-icons-lyellow)
+    (coffee-mode                       nerd-icons-devicon "nf-dev-coffeescript"       :face nerd-icons-maroon)
+    (lisp-mode                         nerd-icons-sucicon "nf-custom-scheme"          :face nerd-icons-orange)
+    (css-mode                          nerd-icons-devicon "nf-dev-css3"               :face nerd-icons-yellow)
+    (css-ts-mode                       nerd-icons-devicon "nf-dev-css3"               :face nerd-icons-yellow)
+    (scss-mode                         nerd-icons-mdicon "nf-md-sass"                 :face nerd-icons-pink)
+    (sass-mode                         nerd-icons-mdicon "nf-md-sass"                 :face nerd-icons-dpink)
+    (less-css-mode                     nerd-icons-devicon "nf-dev-less"               :face nerd-icons-dyellow)
+    (stylus-mode                       nerd-icons-devicon "nf-dev-stylus"             :face nerd-icons-lgreen)
+    (csv-mode                          nerd-icons-octicon "nf-oct-graph"              :face nerd-icons-dblue)
+    (gdscript-mode                     nerd-icons-sucicon "nf-seti-godot"             :face nerd-icons-blue)
+    (gdscript-ts-mode                  nerd-icons-sucicon "nf-seti-godot"             :face nerd-icons-blue)
+    (haskell-mode                      nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
+    (haskell-c2hs-mode                 nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
+    (literate-haskell-mode             nerd-icons-devicon "nf-dev-haskell"            :face nerd-icons-red)
+    (haml-mode                         nerd-icons-sucicon "nf-seti-haml"              :face nerd-icons-lyellow)
+    (html-mode                         nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-orange)
+    (html-ts-mode                      nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-orange)
+    (rhtml-mode                        nerd-icons-devicon "nf-dev-html5"              :face nerd-icons-lred)
+    ;; (mustache-mode                  nerd-icons-fileicon "moustache"                :face nerd-icons-green)
+    (slim-mode                         nerd-icons-codicon "nf-cod-dashboard"          :face nerd-icons-yellow)
+    (jade-mode                         nerd-icons-sucicon "nf-seti-jade"              :face nerd-icons-red)
+    (pug-mode                          nerd-icons-sucicon "nf-seti-pug"               :face nerd-icons-red)
+    (react-mode                        nerd-icons-devicon "nf-dev-react"              :face nerd-icons-lblue)
+    (image-mode                        nerd-icons-octicon "nf-oct-file_media"         :face nerd-icons-blue)
+    (texinfo-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (markdown-mode                     nerd-icons-octicon "nf-oct-markdown"           :face nerd-icons-lblue)
+    (markdown-ts-mode                  nerd-icons-octicon "nf-oct-markdown"           :face nerd-icons-lblue)
+    ;; (bibtex-mode                    nerd-icons-fileicon "bib"                      :face nerd-icons-maroon)
+    (compilation-mode                  nerd-icons-faicon "nf-fa-cogs")
+    (objc-mode                         nerd-icons-faicon "nf-fa-apple")
+    (tuareg-mode                       nerd-icons-sucicon "nf-seti-ocaml")
+    (purescript-mode                   nerd-icons-sucicon "nf-seti-purescript")
+    (verilog-mode                      nerd-icons-mdicon "nf-md-chip"                 :face nerd-icons-red)
+    (verilog-ts-mode                   nerd-icons-mdicon "nf-md-chip"                 :face nerd-icons-red)
+    (vhdl-mode                         nerd-icons-octicon "nf-oct-cpu"                :face nerd-icons-blue)
+    (vhdl-ts-mode                      nerd-icons-octicon "nf-oct-cpu"                :face nerd-icons-blue)
+    ;; (haskell-cabal-mode             nerd-icons-fileicon "cabal"                    :face nerd-icons-lblue)
+    (kotlin-mode                       nerd-icons-sucicon "nf-custom-kotlin"          :face nerd-icons-orange)
+    (kotlin-ts-mode                    nerd-icons-sucicon "nf-custom-kotlin"          :face nerd-icons-orange)
+    (nim-mode                          nerd-icons-sucicon "nf-seti-nim"               :face nerd-icons-yellow)
+    (sql-mode                          nerd-icons-devicon  "nf-dev-database"          :face nerd-icons-silver)
+    (lua-mode                          nerd-icons-sucicon "nf-seti-lua"               :face nerd-icons-dblue)
+    (lua-ts-mode                       nerd-icons-sucicon "nf-seti-lua"               :face nerd-icons-dblue)
+    ;; (adoc-mode                      nerd-icons-fileicon "asciidoc"                 :face nerd-icons-lblue)
+    (puppet-mode                       nerd-icons-sucicon "nf-custom-puppet"          :face nerd-icons-yellow)
+    (jinja2-mode                       nerd-icons-sucicon "nf-seti-jinja"             :face nerd-icons-silver)
+    (powershell-mode                   nerd-icons-mdicon "nf-md-powershell"           :face nerd-icons-blue)
+    (tex-mode                          nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (latex-mode                        nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (latex-ts-mode                     nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (doctex-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    ;; Modes provided by AUCTeX 14.1 and higher
+    (TeX-mode                          nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (LaTeX-mode                        nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (docTeX-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (ConTeXt-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (AmSTeX-mode                       nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (plain-TeX-mode                    nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (Texinfo-mode                      nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (japanese-plain-TeX-mode           nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (japanese-LaTeX-mode               nerd-icons-sucicon "nf-seti-tex"               :face nerd-icons-lred)
+    (dart-mode                         nerd-icons-devicon "nf-dev-dart"               :face nerd-icons-blue)
+    (fsharp-mode                       nerd-icons-devicon "nf-dev-fsharp"             :face nerd-icons-blue)
+    (asm-mode                          nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
+    (fasm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
+    (masm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
+    (nasm-mode                         nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
+    (gas-mode                          nerd-icons-sucicon "nf-seti-asm"               :face nerd-icons-blue)
+    ;; (tcl-mode                       nerd-icons-fileicon "tcl"                      :face nerd-icons-dred)
+    ;; (cuda-mode                      nerd-icons-fileicon "nvidia"                   :face nerd-icons-green)
+    (f90-mode                          nerd-icons-mdicon "nf-md-language_fortran"     :face nerd-icons-purple)
+    ;; (hy-mode                        nerd-icons-fileicon "hy"                       :face nerd-icons-blue)
+    (glsl-mode                         nerd-icons-faicon "nf-fa-paint_brush"          :face nerd-icons-green)
+    (zig-mode                          nerd-icons-sucicon "nf-seti-zig"               :face nerd-icons-orange)
+    ;; (odin-mode                      nerd-icons-fileicon "odin"                     :face nerd-icons-lblue)
+    (pdf-view-mode                     nerd-icons-codicon  "nf-cod-file_pdf"          :face nerd-icons-dred)
+    (doc-view-mode                     nerd-icons-mdicon   "nf-md-file_document"      :face nerd-icons-lred)
+    (calibre-library-mode              nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-dblue)
+    (calibre-edit-mode                 nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-lred)
+    (calibredb-search-mode             nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-dblue)
+    (calibredb-show-mode               nerd-icons-codicon  "nf-cod-library"           :face nerd-icons-lblue)
+    (osm-mode                          nerd-icons-mdicon   "nf-md-map_search"         :face nerd-icons-lgreen)
+    (spacemacs-buffer-mode             nerd-icons-sucicon  "nf-custom-emacs"          :face nerd-icons-purple)
+
+    (elfeed-search-mode                nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
+    (elfeed-summary-mode               nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
+    (elfeed-show-mode                  nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-yellow)
+    (newsticker-treeview-mode          nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-orange)
+    (newsticker-treeview-list-mode     nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-lorange)
+    (newsticker-treeview-item-mode     nerd-icons-faicon   "nf-fa-rss_square"         :face nerd-icons-yellow)
+
+    (emms-browser-mode                 nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (emms-lyrics-mode                  nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (emms-show-all-mode                nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (emms-metaplaylist-mode            nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (emms-tag-editor-mode              nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (emms-playlist-mode                nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-silver)
+    (lilypond-mode                     nerd-icons-faicon   "nf-fa-music"              :face nerd-icons-green)
+    (bongo-playlist-mode               nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (bongo-library-mode                nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (mingus-playlist-mode              nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (mingus-help-mode                  nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (mingus-browse-mode                nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (mingus-burn-mode                  nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (simple-mpc-mode                   nerd-icons-faicon "nf-fa-music"                :face nerd-icons-silver)
+    (telega-root-mode                  nerd-icons-faicon "nf-fae-telegram"            :face nerd-icons-purple)
+    (telega-chat-mode                  nerd-icons-faicon "nf-fae-telegram"            :face nerd-icons-blue)
+    (mastodon-mode                     nerd-icons-mdicon "nf-md-mastodon"             :face nerd-icons-blue)
+
+    (fanyi-mode                        nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
+    (osx-dictionary-mode               nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
+    (youdao-dictionary-mode            nerd-icons-codicon "nf-cod-library"            :face nerd-icons-lcyan)
+
+    (magik-mode                        nerd-icons-faicon "nf-fa-magic"                :face nerd-icons-blue)
+    (magik-ts-mode                     nerd-icons-faicon "nf-fa-magic"                :face nerd-icons-blue)
+    (magik-session-mode                nerd-icons-devicon "nf-dev-terminal"           :face nerd-icons-blue)
+    (magik-cb-mode                     nerd-icons-faicon "nf-fa-book"                 :face nerd-icons-blue)
+    ;; (meson-mode                     nerd-icons-fileicon "meson"                    :face nerd-icons-purple)
+    ;; (man-common                     nerd-icons-fileicon "man-page"                 :face nerd-icons-blue)
+    (heex-mode                         nerd-icons-sucicon "nf-seti-elixir"            :face nerd-icons-lorange)
+    (heex-ts-mode                      nerd-icons-sucicon "nf-seti-elixir"            :face nerd-icons-lorange)
+    (julia-mode                        nerd-icons-sucicon "nf-seti-julia"             :face nerd-icons-purple)
+    (julia-ts-mode                     nerd-icons-sucicon "nf-seti-julia"             :face nerd-icons-purple)
+    (flycheck-error-list               nerd-icons-faicon "nf-fa-list_alt"             :face nerd-icons-lred)))
+
+(defvar nerd-icons-url-alist
+  '(
+    ;; Social media and communities
+    ("^\\(https?://\\)?\\(www\\.\\)?del\\.icio\\.us"          nerd-icons-faicon "nf-fa-delicious")
+    ("^\\(https?://\\)?\\(www\\.\\)?behance\\.net"            nerd-icons-faicon "nf-fa-behance")
+    ("^\\(https?://\\)?\\(www\\.\\)?dribbble\\.com"           nerd-icons-faicon "nf-fa-dribbble")
+    ("^\\(https?://\\)?\\(www\\.\\)?facebook\\.com"           nerd-icons-faicon "nf-fa-facebook_official")
+    ("^\\(https?://\\)?\\(www\\.\\)?glide\\.me"               nerd-icons-faicon "nf-fa-glide_g")
+    ("^\\(https?://\\)?\\(www\\.\\)?plus\\.google\\.com"      nerd-icons-faicon "nf-fa-google_plus")
+    ("linkedin\\.com"                                         nerd-icons-faicon "nf-fa-linkedin")
+    ("^\\(https?://\\)?\\(www\\.\\)?ok\\.ru"                  nerd-icons-faicon "nf-fa-odnoklassniki")
+    ("^\\(https?://\\)?\\(www\\.\\)?reddit\\.com"             nerd-icons-faicon "nf-fa-reddit_alien")
+    ("^\\(https?://\\)?\\(www\\.\\)?slack\\.com"              nerd-icons-faicon "nf-fa-slack")
+    ("^\\(https?://\\)?\\(www\\.\\)?snapchat\\.com"           nerd-icons-faicon "nf-fa-snapchat_ghost")
+    ("^\\(https?://\\)?\\(www\\.\\)?weibo\\.com"              nerd-icons-faicon "nf-fa-weibo")
+    ("^\\(https?://\\)?\\(www\\.\\)?twitter\\.com"            nerd-icons-faicon "nf-fa-twitter")
+    ;; Blogging
+    ("joomla\\.org"                                           nerd-icons-faicon "nf-fa-joomla")
+    ("^\\(https?://\\)?\\(www\\.\\)?medium\\.com"             nerd-icons-faicon "nf-fa-medium")
+    ("tumblr\\.com"                                           nerd-icons-faicon "nf-fa-tumblr")
+    ("^wordpress\\.com"                                       nerd-icons-faicon "nf-fa-wordpress")
+    ;; Programming
+    ("^\\(https?://\\)?\\(www\\.\\)?bitbucket\\.org"          nerd-icons-faicon "nf-fa-bitbucket")
+    ("^\\(https?://\\)?\\(www\\.\\)?codepen\\.io"             nerd-icons-faicon "nf-fa-codepen")
+    ("^\\(https?://\\)?\\(www\\.\\)?codiepie\\.com"           nerd-icons-faicon "nf-fa-codiepie")
+    ("^\\(https?://\\)?\\(www\\.\\)?gist\\.github\\.com"      nerd-icons-octicon "nf-oct-logo_gist")
+    ("^\\(https?://\\)?\\(www\\.\\)?github\\.com"             nerd-icons-octicon "nf-oct-mark_github")
+    ("^\\(https?://\\)?\\(www\\.\\)?gitlab\\.com"             nerd-icons-faicon "nf-fa-gitlab")
+    ("^\\(https?://\\)?\\(www\\.\\)?news\\.ycombinator\\.com" nerd-icons-faicon "nf-fa-hacker_news")
+    ("^\\(https?://\\)?\\(www\\.\\)?jsfiddle\\.net"           nerd-icons-faicon "nf-fa-jsfiddle")
+    ("^\\(https?://\\)?\\(www\\.\\)?maxcdn\\.com"             nerd-icons-faicon "nf-fa-maxcdn")
+    ("^\\(https?://\\)?\\(www\\.\\)?stackoverflow\\.com"      nerd-icons-faicon "nf-fa-stack_overflow")
+    ;; Video
+    ("^\\(https?://\\)?\\(www\\.\\)?twitch\\.tv"              nerd-icons-faicon "nf-fa-twitch")
+    ("^\\(https?://\\)?\\(www\\.\\)?vimeo\\.com"              nerd-icons-faicon "nf-fa-vimeo")
+    ("^\\(https?://\\)?\\(www\\.\\)?youtube\\.com"            nerd-icons-faicon "nf-fa-youtube")
+    ("^\\(https?://\\)?\\(www\\.\\)?youtu\\.be"               nerd-icons-faicon "nf-fa-youtube")
+    ("^\\(https?://\\)?\\(www\\.\\)?vine\\.co"                nerd-icons-faicon "nf-fa-vine")
+    ;; Sound
+    ("^\\(https?://\\)?\\(www\\.\\)?last\\.fm"                nerd-icons-faicon "nf-fa-lastfm")
+    ("^\\(https?://\\)?\\(www\\.\\)?mixcloud\\.com"           nerd-icons-faicon "nf-fa-mixcloud")
+    ("^\\(https?://\\)?\\(www\\.\\)?soundcloud\\.com"         nerd-icons-faicon "nf-fa-soundcloud")
+    ("spotify\\.com"                                          nerd-icons-faicon "nf-fa-spotify")
+    ;; Shopping
+    ("^\\(https?://\\)?\\(www\\.\\)?amazon\\."                nerd-icons-faicon "nf-fa-amazon")
+    ("^\\(https?://\\)?\\(www\\.\\)?opencart\\.com"           nerd-icons-faicon "nf-fa-opencart")
+    ("^\\(https?://\\)?\\(www\\.\\)?paypal\\.com"             nerd-icons-faicon "nf-fa-paypal")
+    ("^\\(https?://\\)?\\(www\\.\\)?shirtsinbulk\\.com"       nerd-icons-faicon "nf-fa-shitsinbulk")
+    ;; Images
+    ("^\\(https?://\\)?\\(www\\.\\)?500px\\.com"              nerd-icons-faicon "nf-fa-500px")
+    ("^\\(https?://\\)?\\(www\\.\\)?deviantart\\.com"         nerd-icons-faicon "nf-fa-deviantart")
+    ("^\\(https?://\\)?\\(www\\.\\)?flickr\\.com"             nerd-icons-faicon "nf-fa-flickr")
+    ("^\\(https?://\\)?\\(www\\.\\)?instagram\\.com"          nerd-icons-faicon "nf-fa-instagram")
+    ("^\\(https?://\\)?\\(www\\.\\)?pinterest\\."             nerd-icons-faicon "nf-fa-pinterest")
+    ;; Information and books
+    ("^\\(https?://\\)?\\(www\\.\\)?digg\\.com"               nerd-icons-faicon "nf-fa-digg")
+    ("^\\(https?://\\)?\\(www\\.\\)?foursquare\\.com"         nerd-icons-faicon "nf-fa-foursquare")
+    ("^\\(https?://\\)?\\(www\\.\\)?getpocket\\.com"          nerd-icons-faicon "nf-fa-get_pocket")
+    ("^\\(https?://\\)?\\(www\\.\\)?scribd\\.com"             nerd-icons-faicon "nf-fa-scribd")
+    ("^\\(https?://\\)?\\(www\\.\\)?slideshare\\.net"         nerd-icons-faicon "nf-fa-slideshare")
+    ("stackexchange\\.com"                                    nerd-icons-faicon "nf-fa-stack_exchange")
+    ("^\\(https?://\\)?\\(www\\.\\)?stumbleupon\\.com"        nerd-icons-faicon "nf-fa-stumbleupon")
+    ("^\\(https?://\\)?\\(www\\.\\)?tripadvisor\\."           nerd-icons-faicon "nf-fa-tripadvisor")
+    ("^\\(https?://\\)?\\(www\\.\\)?yelp\\."                  nerd-icons-faicon "nf-fa-yelp")
+
+    ("wikipedia\\.org"                                        nerd-icons-faicon "nf-fa-wikipedia_w")
+    ;; Various companies and tools
+    ("^\\(https?://\\)?\\(www\\.\\)?angel\\.co"               nerd-icons-faicon "nf-fa-angellist")
+    ("^\\(https?://\\)?\\(www\\.\\)?apple\\.com"              nerd-icons-faicon "nf-fa-apple")
+    ("^\\(https?://\\)?\\(www\\.\\)?buysellads\\.com"         nerd-icons-faicon "nf-fa-buysellads")
+    ("^\\(https?://\\)?\\(www\\.\\)?connectdevelop\\.com"     nerd-icons-faicon "nf-fa-connectdevelop")
+    ("^\\(https?://\\)?\\(www\\.\\)?dashcube\\.com"           nerd-icons-faicon "nf-fa-dashcube")
+    ("^\\(https?://\\)?\\(www\\.\\)?dropbox\\.com"            nerd-icons-faicon "nf-fa-dropbox")
+    ("^\\(https?://\\)?\\(www\\.\\)?enviragallery\\.com"      nerd-icons-faicon "nf-fa-envira")
+    ("^\\(https?://\\)?\\(www\\.\\)?fortawesome\\.com"        nerd-icons-faicon "nf-fa-fort_awesome")
+    ("^\\(https?://\\)?\\(www\\.\\)?forumbee\\.com"           nerd-icons-faicon "nf-fa-forumbee")
+    ("^\\(https?://\\)?\\(www\\.\\)?gratipay\\.com"           nerd-icons-faicon "nf-fa-gratipay")
+    ("^\\(https?://\\)?\\(www\\.\\)?modx\\.com"               nerd-icons-faicon "nf-fa-modx")
+    ("^\\(https?://\\)?\\(www\\.\\)?pagelines\\.com"          nerd-icons-faicon "nf-fa-pagelines")
+    ("^\\(https?://\\)?\\(www\\.\\)?producthunt\\.com"        nerd-icons-faicon "nf-fa-product_hunt")
+    ("sellsy\\.com"                                           nerd-icons-faicon "nf-fa-sellsy")
+    ("^\\(https?://\\)?\\(www\\.\\)?simplybuilt\\.com"        nerd-icons-faicon "nf-fa-simplybuilt")
+    ("^\\(https?://\\)?\\(www\\.\\)?skyatlas\\.com"           nerd-icons-faicon "nf-fa-skyatlas")
+    ("^\\(https?://\\)?\\(www\\.\\)?skype\\.com"              nerd-icons-faicon "nf-fa-skype")
+    ("steampowered\\.com"                                     nerd-icons-faicon "nf-fa-steam")
+    ("^\\(https?://\\)?\\(www\\.\\)?themeisle\\.com"          nerd-icons-faicon "nf-fa-themeisle")
+    ("^\\(https?://\\)?\\(www\\.\\)?trello\\.com"             nerd-icons-faicon "nf-fa-trello")
+    ("^\\(https?://\\)?\\(www\\.\\)?whatsapp\\.com"           nerd-icons-faicon "nf-fa-whatsapp")
+    ("^\\(https?://\\)?\\(www\\.\\)?ycombinator\\.com"        nerd-icons-faicon "nf-fa-y_combinator")
+    ("yahoo\\.com"                                            nerd-icons-faicon "nf-fa-yahoo")
+    ("^\\(https?://\\)?\\(www\\.\\)?yoast\\.com"              nerd-icons-faicon "nf-fa-yoast")
+    ;; Catch all
+    ("android"                                                nerd-icons-faicon "nf-fa-android")
+    ("creativecommons"                                        nerd-icons-faicon "nf-fa-creative_commons")
+    ("forums?"                                                nerd-icons-codicon "nf-cod-comment_discussion")
+    ("\\.pdf$"                                                nerd-icons-codicon "nf-cod-file_pdf" :face nerd-icons-dred)
+    ("google"                                                 nerd-icons-faicon "nf-fa-google")
+    ("\\.rss"                                                 nerd-icons-faicon "nf-fa-rss")))
+
+(defun nerd-icons-auto-mode-match? (&optional file)
+  "Whether or not FILE's `major-mode' match against its `auto-mode-alist'."
+  (let* ((file (or file (buffer-file-name) (buffer-name)))
+         (auto-mode (nerd-icons-match-to-alist file auto-mode-alist)))
+    (eq major-mode auto-mode)))
+
+(defun nerd-icons-match-to-alist (file alist)
+  "Match FILE against an entry in ALIST using `string-match'."
+  (cdr (cl-find-if (lambda (it) (string-match (car it) file)) alist)))
+
+(defun nerd-icons-dir-is-submodule (dir)
+  "Checker whether or not DIR is a git submodule."
+  (let* ((gitmodule-dir (locate-dominating-file dir ".gitmodules"))
+         (modules-file  (expand-file-name (format "%s.gitmodules" gitmodule-dir)))
+         (module-search (format "submodule \".*?%s\"" (file-name-base dir))))
+
+    (when (and gitmodule-dir (file-exists-p (format "%s/.git" dir)))
+      (with-temp-buffer
+        (insert-file-contents modules-file)
+        (search-forward-regexp module-search (point-max) t)))))
+
+(defun nerd-icons--read-candidates ()
+  "Helper to build a list of candidates for all glyph sets."
+  (cl-reduce 'append (mapcar (lambda (it) (nerd-icons--read-candidates-for-glyph-set it t)) nerd-icons-glyph-sets)))
+
+(defun nerd-icons--read-candidates-for-glyph-set (glyph-set &optional show-glyph-set)
+  "Helper to build read candidates for GLYPH-SET.
+
+If SHOW-GLYPH-SET is non-nil, displays the icons glyph set in the candidate
+string."
+  (let ((data   (funcall (nerd-icons--data-name glyph-set)))
+        (icon-f (nerd-icons--function-name glyph-set)))
+    (mapcar
+     (lambda (it)
+       (let* ((icon-name (car it))
+
+              (icon-display (funcall icon-f icon-name))
+              (icon-glyph-set (if show-glyph-set (format "\t[%s]" glyph-set) ""))
+
+              (candidate-name (format "%s\t%s%s" icon-display icon-name icon-glyph-set))
+              (candidate-icon (funcall (nerd-icons--function-name glyph-set) icon-name)))
+         (cons candidate-name candidate-icon)))
+     data)))
+
+;;;###autoload
+(defun nerd-icons-install-fonts (&optional pfx)
+  "Helper function to download and install the latests fonts based on OS.
+The provided Nerd Font is Symbols Nerd Font Mono.
+When PFX is non-nil, ignore the prompt and just install"
+  (interactive "P")
+  (when (or pfx (yes-or-no-p "This will download and install fonts, are you sure you want to do this?"))
+    (let* ((url-format "https://raw.githubusercontent.com/rainstormstudio/nerd-icons.el/main/fonts/%s")
+           (font-dest (cond
+                       ;; Default Linux install directories
+                       ((member system-type '(gnu gnu/linux gnu/kfreebsd))
+                        (concat (or (getenv "XDG_DATA_HOME")
+                                    (concat (getenv "HOME") "/.local/share"))
+                                "/fonts/"
+                                nerd-icons-fonts-subdirectory))
+                       ;; Default MacOS install directory
+                       ((eq system-type 'darwin)
+                        (concat (getenv "HOME")
+                                "/Library/Fonts/"
+                                nerd-icons-fonts-subdirectory))))
+           (known-dest? (stringp font-dest))
+           (font-dest (or font-dest (read-directory-name "Font installation directory: " "~/"))))
+
+      (unless (file-directory-p font-dest) (mkdir font-dest t))
+
+      (mapc (lambda (font)
+              (url-copy-file (format url-format font) (expand-file-name font font-dest) t))
+            nerd-icons-font-names)
+      (when known-dest?
+        (message "Fonts downloaded, updating font cache... <fc-cache -f -v> ")
+        (shell-command-to-string (format "fc-cache -f -v")))
+      (message "%s Successfully %s `nerd-icons' fonts to `%s'!"
+               (nerd-icons-wicon "nf-weather-stars" :v-adjust 0.0)
+               (if known-dest? "installed" "downloaded")
+               font-dest))))
+
+;;;###autoload
+(defun nerd-icons-insert (&optional arg glyph-set)
+  "Interactive icon insertion function.
+When Prefix ARG is non-nil, insert the propertized icon.
+When GLYPH-SET is non-nil, limit the candidates to the icon set matching it."
+  (interactive "P")
+  (let* ((standard-output (current-buffer))
+         (candidates (if glyph-set
+                         (nerd-icons--read-candidates-for-glyph-set glyph-set)
+                       (nerd-icons--read-candidates)))
+         (prompt     (if glyph-set
+                         (format "%s Icon: " (funcall (nerd-icons--glyph-set-name glyph-set)))
+                       "Icon : "))
+         (selection (completing-read prompt candidates nil t))
+         (result    (cdr (assoc selection candidates))))
+
+    (if arg (prin1 result) (insert result))))
+
+;;;###autoload
+(defun nerd-icons-icon-for-dir (dir &rest arg-overrides)
+  "Get the formatted icon for DIR.
+ARG-OVERRIDES should be a plist containining `:height',
+`:v-adjust' or `:face' properties like in the normal icon
+inserting functions."
+  (let* ((dir (or dir default-directory "/"))
+         (dirname (file-name-base (directory-file-name dir)))
+         (path (if (file-name-absolute-p dir) dir (expand-file-name dir)))
+         (icon (nerd-icons-match-to-alist dirname nerd-icons-dir-icon-alist))
+         (args (cdr icon)))
+    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
+    (cond
+     ((file-remote-p path)
+      (apply #'nerd-icons-codicon "nf-cod-remote" (cdr args)))
+     ((file-symlink-p path)
+      (apply #'nerd-icons-codicon "nf-cod-file_symlink_directory" (cdr args)))
+     ((nerd-icons-dir-is-submodule path)
+      (apply #'nerd-icons-codicon "nf-cod-file_submodule" (cdr args)))
+     ((file-exists-p (format "%s/.git" path))
+      (apply #'nerd-icons-octicon "nf-oct-repo" (cdr args)))
+     (t (apply (car icon) args)))))
+
+;;;###autoload
+(defun nerd-icons-icon-for-file (file &rest arg-overrides)
+  "Get the formatted icon for FILE.
+ARG-OVERRIDES should be a plist containining `:height',
+`:v-adjust' or `:face' properties like in the normal icon
+inserting functions."
+  (let* ((name (file-name-nondirectory file))
+         (ext (file-name-extension name))
+         (icon (or (nerd-icons-match-to-alist name nerd-icons-regexp-icon-alist)
+                   (and ext
+                        (cdr (assoc (downcase ext)
+                                    nerd-icons-extension-icon-alist)))
+                   nerd-icons-default-file-icon))
+         (args (cdr icon)))
+    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
+    (apply (car icon) args)))
+
+;;;###autoload
+(defun nerd-icons-icon-for-extension (ext &rest arg-overrides)
+  "Get the formatted icon for EXT.
+ARG-OVERRIDES should be a plist containining `:height',
+`:v-adjust' or `:face' properties like in the normal icon
+inserting functions."
+  (let* ((icon (or
+                (and ext
+                     (cdr (assoc (downcase ext)
+                                 nerd-icons-extension-icon-alist)))
+                nerd-icons-default-file-icon))
+         (args (cdr icon)))
+    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
+    (apply (car icon) args)))
+
+;;;###autoload
+(defun nerd-icons-icon-for-mode (mode &rest arg-overrides)
+  "Get the formatted icon for MODE.
+ARG-OVERRIDES should be a plist containining `:height',
+`:v-adjust' or `:face' properties like in the normal icon
+inserting functions."
+  (let* ((icon (or (cdr (or (assoc mode nerd-icons-mode-icon-alist)
+                            (assoc (get mode 'derived-mode-parent) nerd-icons-mode-icon-alist)))
+                   nerd-icons-default-file-icon))
+         (args (cdr icon)))
+    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
+    (if icon (apply (car icon) args) mode)))
+
+;;;###autoload
+(defun nerd-icons-icon-for-url (url &rest arg-overrides)
+  "Get the formatted icon for URL.
+If an icon for URL isn't found in `nerd-icons-url-alist', a globe is used.
+ARG-OVERRIDES should be a plist containining `:height',
+`:v-adjust' or `:face' properties like in the normal icon
+inserting functions."
+  (let* ((icon (nerd-icons-match-to-alist url nerd-icons-url-alist))
+         (args (cdr icon)))
+    (unless icon
+      (setq icon '(nerd-icons-faicon "nf-fa-globe"))
+      (setq args (cdr icon)))
+    (when arg-overrides (setq args (append `(,(car args)) arg-overrides (cdr args))))
+    (apply (car icon) args)))
+
+;;;###autoload
+(defun nerd-icons-icon-for-buffer ()
+  "Get the formatted icon for the current buffer.
+
+This function prioritises the use of the buffers file extension to
+discern the icon when its `major-mode' matches its auto mode,
+otherwise it will use the buffers `major-mode' to decide its
+icon."
+  (nerd-icons--icon-info-for-buffer))
+
+(defun nerd-icons-cache (func)
+  "Set a cache for FUNC.  Does not work on interactive functions."
+  (unless (get func 'nerd-icons--cached)
+    (let ((cache (make-hash-table :test #'equal
+                                  :size nerd-icons--cache-limit))
+          (orig-fn (symbol-function func)))
+      (fset func
+            (lambda (&rest args)
+              (or (gethash args cache)
+                  (progn
+                    (when (> (hash-table-count cache)
+                             nerd-icons--cache-limit)
+                      (clrhash cache))
+                    (puthash args (apply orig-fn args) cache)))))))
+
+  (put func 'nerd-icons--cached t))
+
+(nerd-icons-cache #'nerd-icons-icon-for-dir)
+(nerd-icons-cache #'nerd-icons-icon-for-file)
+(nerd-icons-cache #'nerd-icons-icon-for-extension)
+(nerd-icons-cache #'nerd-icons-icon-for-mode)
+(nerd-icons-cache #'nerd-icons-icon-for-url)
+
+(defun nerd-icons--icon-info-for-buffer (&optional f)
+  "Get icon info for the current buffer.
+When F is provided, the info function is calculated with the format
+`nerd-icons-icon-%s-for-file' or `nerd-icons-icon-%s-for-mode'."
+  (let* ((base-f (concat "nerd-icons-icon" (when f (format "-%s" f))))
+         (file-f (intern (concat base-f "-for-file")))
+         (mode-f (intern (concat base-f "-for-mode"))))
+    (if (and (buffer-file-name)
+             (nerd-icons-auto-mode-match?))
+        (funcall file-f (file-name-nondirectory (buffer-file-name)))
+      (funcall mode-f major-mode))))
+
+;; Weather icons
+(defun nerd-icons-icon-for-weather (weather)
+  "Get an icon for a WEATHER status."
+  (let ((icon (nerd-icons-match-to-alist weather nerd-icons-weather-icon-alist)))
+    (if icon (apply (car icon) (cdr icon)) weather)))
+
+;; For `web-mode'
+(defun nerd-icons--web-mode-icon (&rest arg-overrides)
+  "Get icon for a `web-mode' buffer with ARG-OVERRIDES."
+  (nerd-icons--web-mode arg-overrides))
+(defun nerd-icons--web-mode-icon-family ()
+  "Get icon family for a `web-mode' buffer."
+  (nerd-icons--web-mode t))
+
+(defvar web-mode-content-type)          ; external
+(defun nerd-icons--web-mode (&optional arg-overrides)
+  "Return icon or FAMILY for `web-mode' based on `web-mode-content-type'.
+Providing ARG-OVERRIDES will modify the creation of the icon."
+  (let ((non-nil-args (cl-reduce (lambda (acc it) (if it (append acc (list it)) acc))
+                                 arg-overrides :initial-value '())))
+    (cond
+     ((equal web-mode-content-type "jsx")
+      (apply 'nerd-icons-devicon (append '("javascript") non-nil-args)))
+     ((equal web-mode-content-type "javascript")
+      (apply 'nerd-icons-devicon (append '("javascript") non-nil-args)))
+     ((equal web-mode-content-type "json")
+      (apply 'nerd-icons-devicon (append '("nf-dev-less") non-nil-args)))
+     ((equal web-mode-content-type "xml")
+      (apply 'nerd-icons-faicon (append '("nf-fa-file_code_o") non-nil-args)))
+     ((equal web-mode-content-type "css")
+      (apply 'nerd-icons-devicon (append '("nf-dev-css3") non-nil-args)))
+     (t
+      (apply 'nerd-icons-devicon (append '("nf-dev-html5") non-nil-args))))))
+
+(eval-and-compile
+  (defun nerd-icons--function-name (name)
+    "Get the symbol for an icon function name for icon set NAME."
+    (intern (concat "nerd-icons-" (downcase (symbol-name name)))))
+
+  (defun nerd-icons--family-name (name)
+    "Get the symbol for an icon family function for icon set NAME."
+    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-family")))
+
+  (defun nerd-icons--glyph-set-name (name)
+    "Get the symbol for an icon glyph set function for icon set NAME."
+    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-glyph-set")))
+
+  (defun nerd-icons--data-name (name)
+    "Get the symbol for an icon family function for icon set NAME."
+    (intern (concat "nerd-icons-" (downcase (symbol-name name)) "-data")))
+
+  (defun nerd-icons--insert-function-name (name)
+    "Get the symbol for an icon insert function for icon set NAME."
+    (intern (concat "nerd-icons-insert-" (downcase (symbol-name name))))))
+
+(defun nerd-icons-insert-icons-for (family &optional height duration)
+  "Insert all of the available icons associated with FAMILY.
+If a HEIGHT is provided it will render the icons at this height.
+This is useful both to see the icons more clearly and to test
+different height rendering.  If DURATION is provided, it will
+pause for DURATION seconds between printing each character."
+  (let* ((data-f    (nerd-icons--data-name family))
+         (insert-f  (nerd-icons--function-name family))
+
+         (height (or height 1.0))
+         (data (funcall data-f)))
+    (mapc
+     (lambda (it)
+       (insert (format "%s - %s\n" (funcall insert-f (car it) :height height) (car it)))
+       (when duration (sit-for duration)))
+     data)))
+
+(defun nerd-icons-set-font (&optional font-family frame)
+  "Modify nerd font charsets to use FONT-FAMILY for FRAME."
+  (let ((font-f (or font-family nerd-icons-font-family))
+        (charsets '((#xe5fa . #xe6b2)  ;; Seti-UI + Custom
+                    (#xe700 . #xe7c5)  ;; Devicons
+                    (#xf000 . #xf2e0)  ;; Font Awesome
+                    (#xe200 . #xe2a9)  ;; Font Awesome Extension
+                    (#xf500 . #xfd46) (#xf0001 . #xf1af0) ;; Material Design Icons
+                    (#xe300 . #xe3eb)  ;; Weather
+                    (#xf400 . #xf4a8) #x2665 #x26a1 #xf27c  ;; Octicons
+                    (#xe0a0 . #xe0a2) (#xe0b0 . #xe0b3)  ;; Powerline Symbols
+                    #xe0a3 (#xe0b4 . #xe0c8) (#xe0cc . #xe0d2) #xe0d4  ;; Powerline Extra Symbols
+                    (#x23fb . #x23fe) #x2b58  ;; IEC Power Symbols
+                    (#xf300 . #xf372)  ;; Font Logos
+                    (#xe000 . #xe00a)  ;; Pomicons
+                    (#xea60 . #xebeb))))  ;; Codicons
+    (cl-loop for charset in charsets do
+             (set-fontset-font
+              (frame-parameter nil 'font)
+              charset
+              (font-spec :family font-f
+                         :weight nil
+                         :size   nil)
+              frame
+              'prepend))))
+
+(defmacro nerd-icons-define-icon (name alist family glyph-set)
+  "Macro to generate functions for inserting icons for icon set NAME.
+
+NAME defines is the name of the iconset and will produce a
+function of the for `nerd-icon-NAME'.
+
+ALIST is the alist containing maps between icon names and the
+UniCode for the character.  All of these can be found in the data
+directory of this package.
+
+FAMILY is the font family to use for the icons.
+GLYPH-SET is the glyph set of the icon."
+  `(progn
+     (add-to-list 'nerd-icons-glyph-sets (quote ,name))
+     (defun ,(nerd-icons--family-name name) () ,family)
+     (defun ,(nerd-icons--glyph-set-name name) () ,glyph-set)
+     (defun ,(nerd-icons--data-name name) () ,alist)
+     (defun ,(nerd-icons--function-name name) (icon-name &rest args)
+       (let ((icon (cdr (assoc icon-name ,alist)))
+             (other-face (when nerd-icons-color-icons (plist-get args :face)))
+             (height (* nerd-icons-scale-factor (or (plist-get args :height) 1.0)))
+             (v-adjust (* nerd-icons-scale-factor (or (plist-get args :v-adjust) nerd-icons-default-adjust)))
+             (family ,family))
+         (unless icon
+           (error "Unable to find icon with name `%s' in icon set `%s'" icon-name (quote ,name)))
+         (let ((face (if other-face
+                         `(:family ,family :height ,height :inherit ,other-face)
+                       `(:family ,family :height ,height))))
+           (propertize icon
+                       'face face
+                       'font-lock-face face
+                       'display `(raise ,v-adjust)
+                       'rear-nonsticky t))))
+     (defun ,(nerd-icons--insert-function-name name) (&optional arg)
+       ,(format "Insert a %s icon at point." glyph-set)
+       (interactive "P")
+       (nerd-icons-insert arg (quote ,name)))))
+
+(nerd-icons-define-icon ipsicon nerd-icons/ipsicon-alist nerd-icons-font-family "IEC Power Symbols")
+(nerd-icons-define-icon octicon nerd-icons/octicon-alist nerd-icons-font-family "Octicons")
+(nerd-icons-define-icon pomicon nerd-icons/pomicon-alist nerd-icons-font-family "Pomicons")
+(nerd-icons-define-icon powerline nerd-icons/powerline-alist nerd-icons-font-family "Powerline Symbols")
+(nerd-icons-define-icon faicon nerd-icons/faicon-alist nerd-icons-font-family "Font Awesome")
+(nerd-icons-define-icon wicon nerd-icons/wicon-alist nerd-icons-font-family "Weather")
+(nerd-icons-define-icon sucicon nerd-icons/sucicon-alist nerd-icons-font-family "Seti-UI + Custom")
+(nerd-icons-define-icon devicon nerd-icons/devicon-alist nerd-icons-font-family "Devicons")
+(nerd-icons-define-icon codicon nerd-icons/codicon-alist nerd-icons-font-family "Codicons")
+(nerd-icons-define-icon flicon nerd-icons/flicon-alist nerd-icons-font-family "Font Logos")
+(nerd-icons-define-icon mdicon nerd-icons/mdicon-alist nerd-icons-font-family "Material Design Icons")
+
+(provide 'nerd-icons)
+;;; nerd-icons.el ends here
diff --git a/emacs/elpa/nerd-icons-20240520.1050/nerd-icons.elc b/emacs/elpa/nerd-icons-20240520.1050/nerd-icons.elc
Binary files differ.
diff --git a/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch-pkg.el b/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch-pkg.el
@@ -1,17 +0,0 @@
-(define-package "ol-notmuch" "20240415.1546" "Links to notmuch messages"
-  '((emacs "25.1")
-    (compat "29.1.4.1")
-    (notmuch "0.37")
-    (org "9.6.5"))
-  :commit "05f3fc9ea77d32892726c94cd7a876733890da91" :authors
-  '(("Matthieu Lemerre" . "racin@free.fr"))
-  :maintainers
-  '(("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev"))
-  :maintainer
-  '("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev")
-  :keywords
-  '("hypermedia" "mail")
-  :url "https://git.sr.ht/~tarsius/ol-notmuch")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch.el b/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch.el
@@ -1,145 +0,0 @@
-;;; ol-notmuch.el --- Links to notmuch messages  -*- lexical-binding:t -*-
-
-;; Copyright (C) 2010-2011 Matthieu Lemerre
-;; Copyright (C) 2010-2021 The Org Contributors
-;; Copyright (C) 2021-2024 Jonas Bernoulli
-
-;; Author: Matthieu Lemerre <racin@free.fr>
-;; Maintainer: Jonas Bernoulli <emacs.ol-notmuch@jonas.bernoulli.dev>
-;; Homepage: https://git.sr.ht/~tarsius/ol-notmuch
-;; Keywords: hypermedia mail
-
-;; Package-Requires: (
-;;     (emacs "25.1")
-;;     (compat "29.1.4.1")
-;;     (notmuch "0.37")
-;;     (org "9.6.5"))
-
-;; SPDX-License-Identifier: GPL-3.0-or-later
-
-;; This file 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 file 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 file.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This file implements links to notmuch messages and "searches".  A
-;; search is a query to be performed by notmuch; it is the equivalent
-;; to folders in other mail clients.  Similarly, mails are referred to
-;; by a query, so both a link can refer to several mails.
-
-;; Links have one the following forms
-;; - notmuch:<search terms>
-;; - notmuch-search:<search terms>.
-
-;; The first form open the queries in `notmuch-show-mode', whereas the
-;; second link open it in `notmuch-search-mode'.  Note that queries are
-;; performed at the time the link is opened, and the result may be
-;; different from when the link was stored.
-
-;;; Code:
-
-(require 'compat)
-
-(require 'notmuch)
-(require 'ol)
-
-;;; Message links
-
-(defcustom org-notmuch-open-function #'org-notmuch-follow-link
-  "Function used to follow notmuch links.
-Should accept a notmuch search string as the sole argument."
-  :group 'org-notmuch
-  :type 'function)
-
-;;;###autoload
-(with-eval-after-load 'org
-  (org-link-set-parameters "notmuch"
-                           :store  #'org-notmuch-store-link
-                           :follow #'org-notmuch-open))
-
-;;;###autoload
-(defun org-notmuch-store-link ()
-  "Store a link to one or more notmuch messages."
-  (when (memq major-mode '(notmuch-show-mode notmuch-tree-mode))
-    ;; The value is passed around using variable `org-store-link-plist'.
-    (org-link-store-props
-     :type       "notmuch"
-     :message-id (notmuch-show-get-message-id t)
-     :subject    (notmuch-show-get-subject)
-     :from       (notmuch-show-get-from)
-     :to         (notmuch-show-get-to)
-     :date       (org-trim (notmuch-show-get-date)))
-    (org-link-add-props :link (org-link-email-description "notmuch:id:%m"))
-    (org-link-add-props :description (org-link-email-description))
-    org-store-link-plist))
-
-;;;###autoload
-(defun org-notmuch-open (path _)
-  "Follow a notmuch message link specified by PATH."
-  (funcall org-notmuch-open-function path))
-
-(defun org-notmuch-follow-link (search)
-  "Follow a notmuch link to SEARCH.
-Can link to more than one message, if so all matching messages are shown."
-  (notmuch-show search))
-
-;;; Search links
-
-;;;###autoload
-(with-eval-after-load 'org
-  (org-link-set-parameters "notmuch-search"
-                           :store  #'org-notmuch-search-store-link
-                           :follow #'org-notmuch-search-open))
-
-;;;###autoload
-(defun org-notmuch-search-store-link ()
-  "Store a link to a notmuch search."
-  (when (eq major-mode 'notmuch-search-mode)
-    (org-link-store-props
-     :type        "notmuch-search"
-     :link        (concat "notmuch-search:"  notmuch-search-query-string)
-     :description (concat "Notmuch search: " notmuch-search-query-string))))
-
-;;;###autoload
-(defun org-notmuch-search-open (path _)
-  "Follow a notmuch search link specified by PATH."
-  (notmuch-search path))
-
-;;; Tree links
-
-;;;###autoload
-(with-eval-after-load 'org
-  (org-link-set-parameters "notmuch-tree"
-                           :store  #'org-notmuch-tree-store-link
-                           :follow #'org-notmuch-tree-open))
-
-;;;###autoload
-(defun org-notmuch-tree-store-link ()
-  "Store a link to a notmuch tree."
-  (when (eq major-mode 'notmuch-tree-mode)
-    (org-link-store-props
-     :type        "notmuch-tree"
-     :link        (concat "notmuch-tree:"  (notmuch-tree-get-query))
-     :description (concat "Notmuch tree: " (notmuch-tree-get-query)))))
-
-;;;###autoload
-(defun org-notmuch-tree-open (path _)
-  "Follow a notmuch tree link specified by PATH."
-  (notmuch-tree path))
-
-;;; _
-(provide 'ol-notmuch)
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-;;; ol-notmuch.el ends here
diff --git a/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch-autoloads.el b/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch-autoloads.el
diff --git a/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch-pkg.el b/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch-pkg.el
@@ -0,0 +1,17 @@
+(define-package "ol-notmuch" "20240503.1711" "Links to notmuch messages"
+  '((emacs "25.1")
+    (compat "29.1.4.1")
+    (notmuch "0.37")
+    (org "9.6.5"))
+  :commit "f176ad73496ee086688ec5eeafcfff9372a833bc" :authors
+  '(("Matthieu Lemerre" . "racin@free.fr"))
+  :maintainers
+  '(("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev"))
+  :maintainer
+  '("Jonas Bernoulli" . "emacs.ol-notmuch@jonas.bernoulli.dev")
+  :keywords
+  '("hypermedia" "mail")
+  :url "https://git.sr.ht/~tarsius/ol-notmuch")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch.el b/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch.el
@@ -0,0 +1,145 @@
+;;; ol-notmuch.el --- Links to notmuch messages  -*- lexical-binding:t -*-
+
+;; Copyright (C) 2010-2011 Matthieu Lemerre
+;; Copyright (C) 2010-2021 The Org Contributors
+;; Copyright (C) 2021-2024 Jonas Bernoulli
+
+;; Author: Matthieu Lemerre <racin@free.fr>
+;; Maintainer: Jonas Bernoulli <emacs.ol-notmuch@jonas.bernoulli.dev>
+;; Homepage: https://git.sr.ht/~tarsius/ol-notmuch
+;; Keywords: hypermedia mail
+
+;; Package-Requires: (
+;;     (emacs "25.1")
+;;     (compat "29.1.4.1")
+;;     (notmuch "0.37")
+;;     (org "9.6.5"))
+
+;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;; This file 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 file 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 file.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This file implements links to notmuch messages and "searches".  A
+;; search is a query to be performed by notmuch; it is the equivalent
+;; to folders in other mail clients.  Similarly, mails are referred to
+;; by a query, so both a link can refer to several mails.
+
+;; Links have one of the following forms:
+;; - notmuch:<search terms>
+;; - notmuch-search:<search terms>.
+
+;; The first form opens the queries in `notmuch-show-mode', whereas the
+;; second link opens it in `notmuch-search-mode'.  Note that queries are
+;; performed at the time the link is opened, and the result may be
+;; different from when the link was stored.
+
+;;; Code:
+
+(require 'compat)
+
+(require 'notmuch)
+(require 'ol)
+
+;;; Message links
+
+(defcustom org-notmuch-open-function #'org-notmuch-follow-link
+  "Function used to follow notmuch links.
+Should accept a notmuch search string as the sole argument."
+  :group 'org-notmuch
+  :type 'function)
+
+;;;###autoload
+(with-eval-after-load 'org
+  (org-link-set-parameters "notmuch"
+                           :store  #'org-notmuch-store-link
+                           :follow #'org-notmuch-open))
+
+;;;###autoload
+(defun org-notmuch-store-link ()
+  "Store a link to one or more notmuch messages."
+  (when (memq major-mode '(notmuch-show-mode notmuch-tree-mode))
+    ;; The value is passed around using variable `org-store-link-plist'.
+    (org-link-store-props
+     :type       "notmuch"
+     :message-id (notmuch-show-get-message-id t)
+     :subject    (notmuch-show-get-subject)
+     :from       (notmuch-show-get-from)
+     :to         (notmuch-show-get-to)
+     :date       (org-trim (notmuch-show-get-date)))
+    (org-link-add-props :link (org-link-email-description "notmuch:id:%m"))
+    (org-link-add-props :description (org-link-email-description))
+    org-store-link-plist))
+
+;;;###autoload
+(defun org-notmuch-open (path _)
+  "Follow a notmuch message link specified by PATH."
+  (funcall org-notmuch-open-function path))
+
+(defun org-notmuch-follow-link (search)
+  "Follow a notmuch link to SEARCH.
+Can link to more than one message, if so all matching messages are shown."
+  (notmuch-show search))
+
+;;; Search links
+
+;;;###autoload
+(with-eval-after-load 'org
+  (org-link-set-parameters "notmuch-search"
+                           :store  #'org-notmuch-search-store-link
+                           :follow #'org-notmuch-search-open))
+
+;;;###autoload
+(defun org-notmuch-search-store-link ()
+  "Store a link to a notmuch search."
+  (when (eq major-mode 'notmuch-search-mode)
+    (org-link-store-props
+     :type        "notmuch-search"
+     :link        (concat "notmuch-search:"  notmuch-search-query-string)
+     :description (concat "Notmuch search: " notmuch-search-query-string))))
+
+;;;###autoload
+(defun org-notmuch-search-open (path _)
+  "Follow a notmuch search link specified by PATH."
+  (notmuch-search path))
+
+;;; Tree links
+
+;;;###autoload
+(with-eval-after-load 'org
+  (org-link-set-parameters "notmuch-tree"
+                           :store  #'org-notmuch-tree-store-link
+                           :follow #'org-notmuch-tree-open))
+
+;;;###autoload
+(defun org-notmuch-tree-store-link ()
+  "Store a link to a notmuch tree."
+  (when (eq major-mode 'notmuch-tree-mode)
+    (org-link-store-props
+     :type        "notmuch-tree"
+     :link        (concat "notmuch-tree:"  (notmuch-tree-get-query))
+     :description (concat "Notmuch tree: " (notmuch-tree-get-query)))))
+
+;;;###autoload
+(defun org-notmuch-tree-open (path _)
+  "Follow a notmuch tree link specified by PATH."
+  (notmuch-tree path))
+
+;;; _
+(provide 'ol-notmuch)
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+;;; ol-notmuch.el ends here
diff --git a/emacs/elpa/ol-notmuch-20240415.1546/ol-notmuch.elc b/emacs/elpa/ol-notmuch-20240503.1711/ol-notmuch.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/epdfinfo b/emacs/elpa/pdf-tools-20240411.1703/epdfinfo
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-tools-pkg.el b/emacs/elpa/pdf-tools-20240411.1703/pdf-tools-pkg.el
@@ -1,16 +0,0 @@
-(define-package "pdf-tools" "20240411.1703" "Support library for PDF documents"
-  '((emacs "26.3")
-    (tablist "1.0")
-    (let-alist "1.0.4"))
-  :commit "94e9f20a78f64a83daf641891923681a52d03919" :authors
-  '(("Andreas Politz" . "mail@andreas-politz.de"))
-  :maintainers
-  '(("Vedang Manerikar" . "vedang.manerikar@gmail.com"))
-  :maintainer
-  '("Vedang Manerikar" . "vedang.manerikar@gmail.com")
-  :keywords
-  '("files" "multimedia")
-  :url "http://github.com/vedang/pdf-tools/")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-view.el b/emacs/elpa/pdf-tools-20240411.1703/pdf-view.el
@@ -1,1826 +0,0 @@
-;;; pdf-view.el --- View PDF documents. -*- lexical-binding:t -*-
-
-;; Copyright (C) 2013  Andreas Politz
-
-;; Author: Andreas Politz <politza@fh-trier.de>
-;; Keywords: files, doc-view, pdf
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;  Functions related to viewing PDF documents.
-
-;;; Code:
-
-(require 'image-mode)
-(require 'pdf-macs)
-(require 'pdf-util)
-(require 'pdf-info)
-(require 'pdf-cache)
-(require 'jka-compr)
-(require 'bookmark)
-(require 'password-cache)
-
-(declare-function cua-copy-region "cua-base")
-(declare-function pdf-tools-pdf-buffer-p "pdf-tools")
-
-;; * ================================================================== *
-;; * Customizations
-;; * ================================================================== *
-
-(defgroup pdf-view nil
-  "View PDF documents."
-  :group 'pdf-tools)
-
-(defcustom pdf-view-display-size 'fit-width
-  "The desired size of displayed pages.
-
-This may be one of `fit-height', `fit-width', `fit-page' or a
-number as a scale factor applied to the document's size.  Any
-other value behaves like `fit-width'."
-  :group 'pdf-view
-  :type '(choice number
-                 (const fit-height)
-                 (const fit-width)
-                 (const fit-page)))
-
-(make-variable-buffer-local 'pdf-view-display-size)
-
-(defcustom pdf-view-resize-factor 1.25
-  "Fractional amount of resizing of one resize command."
-  :group 'pdf-view
-  :type 'number)
-
-(defcustom pdf-view-continuous t
-  "In Continuous mode reaching the page edge advances to next/previous page.
-
-When non-nil, scrolling a line upward at the bottom edge of the page
-moves to the next page, and scrolling a line downward at the top edge
-of the page moves to the previous page."
-  :type 'boolean
-  :group 'pdf-view)
-
-(defcustom pdf-view-bounding-box-margin 0.05
-  "Fractional margin used for slicing with the bounding-box."
-  :group 'pdf-view
-  :type 'number)
-
-(defcustom pdf-view-use-imagemagick nil
-  "Whether imagemagick should be used for rendering.
-
-This variable has no effect, if imagemagick was not compiled into
-Emacs or if imagemagick is the only way to display PNG images.
-FIXME: Explain dis-/advantages of imagemagick and png."
-  :group 'pdf-view
-  :type 'boolean)
-
-(defcustom pdf-view-use-scaling t
-  "Whether images should be allowed to be scaled for rendering.
-
-This variable affects both the reuse of higher-resolution images
-as lower-resolution ones by down-scaling the image.  As well as
-the rendering of higher-resolution for high-resolution displays,
-if available."
-  :group 'pdf-view
-  :type 'boolean)
-
-(defface pdf-view-region
-  '((((background dark)) (:inherit region))
-    (((background light)) (:inherit region)))
-  "Face used to determine the colors of the region."
-  :group 'pdf-view
-  :group 'pdf-tools-faces)
-
-(defface pdf-view-rectangle
-  '((((background dark)) (:inherit highlight))
-    (((background light)) (:inherit highlight)))
-  "Face used to determine the colors of the highlighted rectangle."
-  :group 'pdf-view
-  :group 'pdf-tools-faces)
-
-(defcustom pdf-view-midnight-colors '("#839496" . "#002b36" )
-  "Colors used when command `pdf-view-midnight-minor-mode' is activated.
-
-This should be a cons \(FOREGROUND . BACKGROUND\) of colors."
-  :group 'pdf-view
-  :type '(cons (color :tag "Foreground")
-               (color :tag "Background")))
-
-(defcustom pdf-view-midnight-invert t
-  "In midnight mode invert the image color lightness maintaining hue.
-
-This is particularly useful if you are viewing documents with
-color coded data in plots.  This will maintain the colors such
-that blue and red will remain these colors in the inverted
-rendering. This inversion is non-trivial. This makes use of the
-OKLab color space which is well calibrated to have equal
-perceptual brightness across hue, but not all colors are within
-the RGB gamut after inversion, causing some colors to saturate.
-Nevertheless, this seems to work well in most cases."
-  :group 'pdf-view
-  :type 'boolean)
-
-(defcustom pdf-view-change-page-hook nil
-  "Hook run after changing to another page, but before displaying it.
-
-See also `pdf-view-before-change-page-hook' and
-`pdf-view-after-change-page-hook'."
-  :group 'pdf-view
-  :type 'hook)
-
-(defcustom pdf-view-before-change-page-hook nil
-  "Hook run before changing to another page.
-
-See also `pdf-view-change-page-hook' and
-`pdf-view-after-change-page-hook'."
-  :group 'pdf-view
-  :type 'hook)
-
-(defcustom pdf-view-after-change-page-hook nil
-  "Hook run after changing to and displaying another page.
-
-See also `pdf-view-change-page-hook' and
-`pdf-view-before-change-page-hook'."
-  :group 'pdf-view
-  :type 'hook)
-
-(defcustom pdf-view-use-dedicated-register t
-  "Whether to use dedicated register for PDF positions.
-
-If this is non-nil, the commands `pdf-view-position-to-register'
-and `pdf-view-jump-to-register' use the buffer-local variable
-`pdf-view-register-alist' to store resp. retrieve marked
-positions.  Otherwise the common variable `register-alist' is
-used."
-  :group 'pdf-view
-  :type 'boolean)
-
-(defcustom pdf-view-image-relief 0
-  "Add a shadow rectangle around the page's image.
-
-See :relief property in Info node `(elisp) Image Descriptors'."
-  :group 'pdf-view
-  :type '(integer :tag "Pixel")
-  :link '(info-link "(elisp) Image Descriptors"))
-
-(defcustom pdf-view-max-image-width 4800
-  "Maximum width of any image displayed in pixel."
-  :group 'pdf-view
-  :type '(integer :tag "Pixel"))
-
-(defcustom pdf-view-use-unicode-ligther t
-  "Decide whether to use unicode symbols in the mode-line.
-
-On some systems finding a font which supports those symbols can
-take some time.  If you don't want to spend that time waiting and
-don't care for a nicer looking mode-line, set this variable to
-nil.
-
-Note, that this option has only an effect when this library is
-loaded."
-  :group 'pdf-view
-  :type 'boolean)
-
-(defcustom pdf-view-incompatible-modes
-  '(linum-mode linum-relative-mode helm-linum-relative-mode
-	           nlinum-mode nlinum-hl-mode nlinum-relative-mode yalinum-mode
-               display-line-numbers-mode)
-  "A list of modes incompatible with `pdf-view-mode'.
-
-Issue a warning, if one of them is active in a PDF buffer."
-  :group 'pdf-view
-  :type '(repeat symbol))
-
-(defcustom pdf-view-selection-style 'word
-  "The current default selection style.
-
-Must be one of `glyph', `word', or `line'."
-  :group 'pdf-view
-  :type '(choice (const glyph)
-                 (const word)
-                 (const line)))
-
-
-;; * ================================================================== *
-;; * Internal variables and macros
-;; * ================================================================== *
-
-(defvar-local pdf-view-active-region nil
-  "The active region as a list of edges.
-
-Edge values are relative coordinates.")
-
-(defvar-local pdf-view--have-rectangle-region nil
-  "Non-nil if the region is currently rendered as a rectangle.
-
-This variable is set in `pdf-view-mouse-set-region' and used in
-`pdf-view-mouse-extend-region' to determine the right choice
-regarding display of the region in the later function.")
-
-(defvar-local pdf-view--buffer-file-name nil
-  "Local copy of remote file or nil.")
-
-(defvar-local pdf-view--server-file-name nil
-  "The servers notion of this buffer's filename.")
-
-(defvar-local pdf-view--next-page-timer nil
-  "Timer used in `pdf-view-next-page-command'.")
-
-(defvar-local pdf-view--hotspot-functions nil
-  "Alist of hotspot functions.")
-
-(defvar-local pdf-view--current-rotation nil
-  "Current rotation of the page.")
-
-(defvar-local pdf-view-register-alist nil
-  "Local, dedicated register for PDF positions.")
-
-(defun pdf-view-current-pagelabel (&optional window)
-  (nth (1- (pdf-view-current-page window)) (pdf-info-pagelabels)))
-
-(defun pdf-view-active-region-p nil
-  "Return t if there are active regions."
-  (not (null pdf-view-active-region)))
-
-(defmacro pdf-view-assert-active-region ()
-  "Signal an error if there are no active regions."
-  `(unless (pdf-view-active-region-p)
-     (error "The region is not active")))
-
-(defconst pdf-view-have-image-mode-pixel-vscroll
-  (>= emacs-major-version 27)
-  "Whether `image-mode' scrolls vertically by pixels.")
-
-
-;; * ================================================================== *
-;; * Major Mode
-;; * ================================================================== *
-
-(defvar pdf-view-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map image-mode-map)
-    (define-key map (kbd "Q")         'kill-this-buffer)
-    ;; Navigation in the document
-    (define-key map (kbd "n")         'pdf-view-next-page-command)
-    (define-key map (kbd "p")         'pdf-view-previous-page-command)
-    (define-key map (kbd "<next>")    'forward-page)
-    (define-key map (kbd "<prior>")   'backward-page)
-    (define-key map [remap forward-page]  'pdf-view-next-page-command)
-    (define-key map [remap backward-page] 'pdf-view-previous-page-command)
-    (define-key map (kbd "SPC")       'pdf-view-scroll-up-or-next-page)
-    (define-key map (kbd "S-SPC")     'pdf-view-scroll-down-or-previous-page)
-    (define-key map (kbd "DEL")       'pdf-view-scroll-down-or-previous-page)
-    (define-key map (kbd "C-n")       'pdf-view-next-line-or-next-page)
-    (define-key map (kbd "<down>")    'pdf-view-next-line-or-next-page)
-    (define-key map [remap next-line] 'pdf-view-next-line-or-next-page)
-    (define-key map (kbd "C-p")           'pdf-view-previous-line-or-previous-page)
-    (define-key map (kbd "<up>")          'pdf-view-previous-line-or-previous-page)
-    (define-key map [remap previous-line] 'pdf-view-previous-line-or-previous-page)
-    (define-key map (kbd "M-<")                 'pdf-view-first-page)
-    (define-key map [remap beginning-of-buffer] 'pdf-view-first-page)
-    (define-key map (kbd "M->")                 'pdf-view-last-page)
-    (define-key map [remap end-of-buffer]       'pdf-view-last-page)
-    (define-key map [remap goto-line] 'pdf-view-goto-page)
-    (define-key map (kbd "M-g l")     'pdf-view-goto-label)
-    (define-key map (kbd "RET")       'image-next-line)
-    ;; Zoom in/out.
-    (define-key map "+"               'pdf-view-enlarge)
-    (define-key map "="               'pdf-view-enlarge)
-    (define-key map "-"               'pdf-view-shrink)
-    (define-key map "0"               'pdf-view-scale-reset)
-    ;; Fit the image to the window
-    (define-key map "W"               'pdf-view-fit-width-to-window)
-    (define-key map "H"               'pdf-view-fit-height-to-window)
-    (define-key map "P"               'pdf-view-fit-page-to-window)
-    ;; Slicing the image
-    (define-key map (kbd "s m")       'pdf-view-set-slice-using-mouse)
-    (define-key map (kbd "s b")       'pdf-view-set-slice-from-bounding-box)
-    (define-key map (kbd "s r")       'pdf-view-reset-slice)
-    ;; Rotation.
-    (define-key map (kbd "R")              #'pdf-view-rotate)
-    ;; Reconvert
-    (define-key map (kbd "C-c C-c")   'doc-view-mode)
-    (define-key map (kbd "g")         'revert-buffer)
-    ;; Region
-    (define-key map [down-mouse-1] 'pdf-view-mouse-set-region)
-    (define-key map [M-down-mouse-1] 'pdf-view-mouse-set-region-rectangle)
-    (define-key map [C-down-mouse-1] 'pdf-view-mouse-extend-region)
-    (define-key map [remap kill-region] 'pdf-view-kill-ring-save)
-    (define-key map [remap kill-ring-save] 'pdf-view-kill-ring-save)
-    (define-key map [remap mark-whole-buffer] 'pdf-view-mark-whole-page)
-    ;; Other
-    (define-key map (kbd "C-c C-d") 'pdf-view-dark-minor-mode)
-    (define-key map (kbd "m") 'pdf-view-position-to-register)
-    (define-key map (kbd "'") 'pdf-view-jump-to-register)
-
-    (define-key map (kbd "C-c C-i") 'pdf-view-extract-region-image)
-    ;; Rendering
-    (define-key map (kbd "C-c C-r m") 'pdf-view-midnight-minor-mode)
-    (define-key map (kbd "C-c C-r t") 'pdf-view-themed-minor-mode)
-    (define-key map (kbd "C-c C-r p") 'pdf-view-printer-minor-mode)
-    map)
-  "Keymap used by `pdf-view-mode' when displaying a doc as a set of images.")
-
-(defvar pdf-tools-enabled-modes)
-(define-derived-mode pdf-view-mode special-mode "PDFView"
-  "Major mode in PDF buffers.
-
-PDFView Mode is an Emacs PDF viewer.  It displays PDF files as
-PNG images in Emacs buffers."
-  :group 'pdf-view
-  :abbrev-table nil
-  :syntax-table nil
-  ;; Setup a local copy for remote files.
-  (when (and (or jka-compr-really-do-compress
-                 (let ((file-name-handler-alist nil))
-                   (not (and buffer-file-name
-                             (file-readable-p buffer-file-name)))))
-             (pdf-tools-pdf-buffer-p))
-    (let ((tempfile (pdf-util-make-temp-file)))
-      (write-region nil nil tempfile nil 'no-message)
-      (setq-local pdf-view--buffer-file-name tempfile)))
-  ;; Decryption needs to be done before any other function calls into
-  ;; pdf-info.el (e.g. from the mode-line during redisplay during
-  ;; waiting for process output).
-  (pdf-view-decrypt-document)
-
-  ;; Setup scroll functions
-  (if (boundp 'mwheel-scroll-up-function) ; not --without-x build
-      (setq-local mwheel-scroll-up-function
-                  #'pdf-view-scroll-up-or-next-page))
-  (if (boundp 'mwheel-scroll-down-function)
-      (setq-local mwheel-scroll-down-function
-                  #'pdf-view-scroll-down-or-previous-page))
-
-  ;; Disable pixel-scroll-precision-mode locally if enabled
-  (if (bound-and-true-p pixel-scroll-precision-mode)
-      (set (make-local-variable 'pixel-scroll-precision-mode) nil))
-  (if (boundp 'mwheel-coalesce-scroll-events)
-      (setq-local mwheel-coalesce-scroll-events t))
-
-  ;; If the Emacs theme is dark, add `pdf-view-dark-minor-mode' to the
-  ;; list of `pdf-tools-enabled-modes'. See an interesting discussion
-  ;; at: https://github.com/vedang/pdf-tools/issues/166 about how this
-  ;; avoids a segfault crash in MacOS Ventura. IF you know why this
-  ;; happens, please get in touch via the linked issue.
-
-  (when (eq 'dark (frame-parameter nil 'background-mode))
-    (add-to-list 'pdf-tools-enabled-modes 'pdf-view-dark-minor-mode))
-
-  ;; Clearing overlays
-  (add-hook 'change-major-mode-hook
-            (lambda ()
-              (remove-overlays (point-min) (point-max) 'pdf-view t))
-            nil t)
-  (remove-overlays (point-min) (point-max) 'pdf-view t) ;Just in case.
-
-  ;; Setup other local variables.
-  (setq-local mode-line-position
-              '(" P" (:eval (number-to-string (pdf-view-current-page)))
-                ;; Avoid errors during redisplay.
-                "/" (:eval (or (ignore-errors
-                                 (number-to-string (pdf-cache-number-of-pages)))
-                               "???"))))
-  (setq-local auto-hscroll-mode nil)
-  (setq-local pdf-view--server-file-name (pdf-view-buffer-file-name))
-  ;; High values of scroll-conservatively seem to trigger
-  ;; some display bug in xdisp.c:try_scrolling .
-  (setq-local scroll-conservatively 0)
-  (setq-local cursor-type nil)
-  (setq-local buffer-read-only t)
-  (setq-local view-read-only nil)
-  (setq-local bookmark-make-record-function
-              'pdf-view-bookmark-make-record)
-  (setq-local revert-buffer-function #'pdf-view-revert-buffer)
-  ;; No auto-save at the moment.
-  (setq-local buffer-auto-save-file-name nil)
-  ;; Disable image rescaling.
-  (when (boundp 'image-scaling-factor)
-    (setq-local image-scaling-factor 1))
-  ;; No undo at the moment.
-  (unless buffer-undo-list
-    (buffer-disable-undo))
-  ;; Enable transient-mark-mode, so region deactivation when quitting
-  ;; will work.
-  (setq-local transient-mark-mode t)
-
-  (add-hook 'window-configuration-change-hook
-            'pdf-view-redisplay-some-windows nil t)
-  (add-hook 'deactivate-mark-hook 'pdf-view-deactivate-region nil t)
-  (add-hook 'write-contents-functions
-            'pdf-view--write-contents-function nil t)
-  (add-hook 'kill-buffer-hook 'pdf-view-close-document nil t)
-  (pdf-view-add-hotspot-function
-   'pdf-view-text-regions-hotspots-function -9)
-
-  ;; Keep track of display info
-  (add-hook 'image-mode-new-window-functions
-            'pdf-view-new-window-function nil t)
-  (image-mode-setup-winprops)
-
-  ;; Issue a warning in the future about incompatible modes.
-  (run-with-timer 1 nil (lambda (buffer)
-                          (when (buffer-live-p buffer)
-                            (pdf-view-check-incompatible-modes buffer)))
-		  (current-buffer)))
-
-(advice-add 'cua-copy-region
-	        :before-until
-	        #'cua-copy-region--pdf-view-advice)
-
-(defun cua-copy-region--pdf-view-advice (&rest _)
-  "If the current buffer is in `pdf-view' mode, call `pdf-view-kill-ring-save'."
-  (when (eq major-mode 'pdf-view-mode)
-    (pdf-view-kill-ring-save)
-    t))
-
-(defun pdf-view-check-incompatible-modes (&optional buffer)
-  "Check BUFFER for incompatible modes, maybe issue a warning."
-  (with-current-buffer (or buffer (current-buffer))
-    (let ((modes
-	   (cl-remove-if-not
-	    (lambda (mode) (and (symbolp mode)
-				(boundp mode)
-				(symbol-value mode)))
-	    pdf-view-incompatible-modes)))
-      (when modes
-	(display-warning
-	 'pdf-view
-	 (format "These modes are incompatible with `pdf-view-mode',
-	please deactivate them (or customize pdf-view-incompatible-modes): %s"
-		 (mapconcat #'symbol-name modes ",")))))))
-
-(defun pdf-view-decrypt-document ()
-  "Read a password, if the document is encrypted and open it."
-  (interactive)
-  (when (pdf-info-encrypted-p)
-    (let ((fn (buffer-file-name))
-          (prompt "Enter password for pdf document: ")
-          (i 3)
-          key password)
-
-      (when fn
-        (setq prompt (format "Enter password for `%s': "
-                             (abbreviate-file-name fn)))
-        (setq key (concat "/pdf-tools" fn))
-        ;; First, try with a cached password
-        (when (setq password (password-read-from-cache key))
-          (ignore-errors (pdf-info-open nil password))
-          (when (pdf-info-encrypted-p)
-            (password-cache-remove key))))
-
-      (while (and (> i 0)
-                  (pdf-info-encrypted-p))
-        (setq i (1- i))
-        ;; Cached password was not present or valid, try reading a new password
-        ;; without cache.
-        (setq password (password-read prompt))
-        (setq prompt "Invalid password, try again: ")
-        (ignore-errors (pdf-info-open nil password)))
-      (pdf-info-open nil password)
-      (when key
-        (password-cache-add key password))))
-  nil)
-
-(defun pdf-view-buffer-file-name ()
-  "Return the local filename of the PDF in the current buffer.
-
-This may be different from variable `buffer-file-name' when
-operating on a local copy of a remote file."
-  (or pdf-view--buffer-file-name
-      (buffer-file-name)))
-
-(defun pdf-view--write-contents-function ()
-  "Function for `write-contents-functions' to save the buffer."
-  (when (pdf-util-pdf-buffer-p)
-    (let ((tempfile (pdf-info-save pdf-view--server-file-name)))
-      (unwind-protect
-          (progn
-            ;; Order matters here: We need to first copy the new
-            ;; content (tempfile) to the PDF, and then close the PDF.
-            ;; Since while closing the file (and freeing its resources
-            ;; in the process), it may be immediately reopened due to
-            ;; redisplay happening inside the pdf-info-close function
-            ;; (while waiting for a response from the process.).
-            (copy-file tempfile (or (buffer-file-name)
-                                    (read-file-name
-                                     "File name to save PDF to: "))
-                       t)
-            (pdf-info-close pdf-view--server-file-name)
-
-            (when pdf-view--buffer-file-name
-              (copy-file tempfile pdf-view--buffer-file-name t))
-            (clear-visited-file-modtime)
-            (set-buffer-modified-p nil)
-            (setq pdf-view--server-file-name
-                  (pdf-view-buffer-file-name))
-            t)
-        (when (file-exists-p tempfile)
-          (delete-file tempfile))))))
-
-(defun pdf-view--after-revert ()
-  "Reload the local copy in case of a remote file, and close the document."
-  (when pdf-view--buffer-file-name
-    (write-region nil nil pdf-view--buffer-file-name nil 'no-message))
-  (pdf-info-close))
-
-(defun pdf-view-revert-buffer (&optional ignore-auto noconfirm)
-  "Revert buffer while preserving current modes.
-
-Optional parameters IGNORE-AUTO and NOCONFIRM are defined as in
-`revert-buffer'."
-  (interactive (list (not current-prefix-arg)))
-  ;; Bind to default so that we can use pdf-view-revert-buffer as
-  ;; revert-buffer-function.  A binding of nil is needed in Emacs 24.3, but in
-  ;; later versions the semantics that nil means the default function should
-  ;; not relied upon.
-  (let ((revert-buffer-function (when (fboundp #'revert-buffer--default)
-                                  #'revert-buffer--default))
-        (after-revert-hook
-         (cons #'pdf-view--after-revert
-               after-revert-hook)))
-    (prog1
-        (revert-buffer ignore-auto noconfirm 'preserve-modes)
-      (pdf-view-decrypt-document)
-      (pdf-view-redisplay t))))
-
-(defun pdf-view-close-document ()
-  "Return immediately after closing document.
-
-This function always succeeds.  See also `pdf-info-close', which
-does not return immediately."
-  (when (pdf-info-running-p)
-    (let ((pdf-info-asynchronous 'ignore))
-      (ignore-errors
-        (pdf-info-close)))))
-
-
-;; * ================================================================== *
-;; * Scaling
-;; * ================================================================== *
-
-(defun pdf-view-fit-page-to-window ()
-  "Fit PDF to window.
-
-Choose the larger of PDF's height and width, and fits that
-dimension to window."
-  (interactive)
-  (setq pdf-view-display-size 'fit-page)
-  (image-set-window-vscroll 0)
-  (image-set-window-hscroll 0)
-  (pdf-view-redisplay t))
-
-(defun pdf-view-fit-height-to-window ()
-  "Fit PDF height to window."
-  (interactive)
-  (setq pdf-view-display-size 'fit-height)
-  (image-set-window-vscroll 0)
-  (pdf-view-redisplay t))
-
-(defun pdf-view-fit-width-to-window ()
-  "Fit PDF size to window."
-  (interactive)
-  (setq pdf-view-display-size 'fit-width)
-  (image-set-window-hscroll 0)
-  (pdf-view-redisplay t))
-
-(defun pdf-view-enlarge (factor)
-  "Enlarge PDF by FACTOR.
-
-When called interactively, uses the value of
-`pdf-view-resize-factor'.
-
-For example, (pdf-view-enlarge 1.25) increases size by 25%."
-  (interactive
-   (list (float pdf-view-resize-factor)))
-  (let* ((size (pdf-view-image-size))
-         (pagesize (pdf-cache-pagesize
-                    (pdf-view-current-page)))
-         (scale (/ (float (car size))
-                   (float (car pagesize)))))
-    (setq pdf-view-display-size
-          (* factor scale))
-    (pdf-view-redisplay t)))
-
-(defun pdf-view-shrink (factor)
-  "Shrink PDF by FACTOR.
-
-When called interactively, uses the value of
-`pdf-view-resize-factor'.
-
-For example, (pdf-view-shrink 1.25) decreases size by 20%."
-  (interactive
-   (list (float pdf-view-resize-factor)))
-  (pdf-view-enlarge (/ 1.0 factor)))
-
-(defun pdf-view-scale-reset ()
-  "Reset PDF to its default set."
-  (interactive)
-  (setq pdf-view-display-size 1.0)
-  (pdf-view-redisplay t))
-
-
-;; * ================================================================== *
-;; * Rotation
-;; * ================================================================== *
-(defun pdf-view-rotate (angle)
-  "Rotate the current page by ANGLE degrees clockwise.
-When called interactively, angle defaults to 90.  Moreover, if
-called interactively with a prefix argument, then rotate
-anti-clockwise."
-  (interactive (list (if current-prefix-arg -90 90)))
-  (setq-local pdf-view--current-rotation
-              (mod (+ (or pdf-view--current-rotation 0)
-                      angle)
-                   360))
-  (pdf-view-redisplay t))
-
-
-;; * ================================================================== *
-;; * Moving by pages and scrolling
-;; * ================================================================== *
-
-(defvar pdf-view-inhibit-redisplay nil)
-(defvar pdf-view-inhibit-hotspots nil)
-
-(defun pdf-view-goto-page (page &optional window)
-  "Go to PAGE in PDF.
-
-If optional parameter WINDOW, go to PAGE in all `pdf-view'
-windows."
-  (interactive
-   (list (if current-prefix-arg
-             (prefix-numeric-value current-prefix-arg)
-           (read-number "Page: "))))
-  (unless (and (>= page 1)
-               (<= page (pdf-cache-number-of-pages)))
-    (error "No such page: %d" page))
-  (unless window
-    (setq window
-          (if (pdf-util-pdf-window-p)
-              (selected-window)
-            t)))
-  (save-selected-window
-    ;; Select the window for the hooks below.
-    (when (window-live-p window)
-      (select-window window 'norecord))
-    (let ((changing-p
-           (not (eq page (pdf-view-current-page window)))))
-      (when changing-p
-        (run-hooks 'pdf-view-before-change-page-hook)
-        (setf (pdf-view-current-page window) page)
-        (run-hooks 'pdf-view-change-page-hook))
-      (when (window-live-p window)
-        (pdf-view-redisplay window))
-      (when changing-p
-        (pdf-view-deactivate-region)
-        (force-mode-line-update)
-        (run-hooks 'pdf-view-after-change-page-hook))))
-  nil)
-
-(defun pdf-view-next-page (&optional n)
-  "View the next page in the PDF.
-
-Optional parameter N moves N pages forward."
-  (interactive "p")
-  (pdf-view-goto-page (+ (pdf-view-current-page)
-                         (or n 1))))
-
-(defun pdf-view-previous-page (&optional n)
-  "View the previous page in the PDF.
-
-Optional parameter N moves N pages backward."
-  (interactive "p")
-  (pdf-view-next-page (- (or n 1))))
-
-(defun pdf-view-next-page-command (&optional n)
-  "View the next page in the PDF.
-
-Optional parameter N moves N pages forward.
-
-This command is a wrapper for `pdf-view-next-page' that will
-indicate to the user if they are on the last page and more."
-  (declare (interactive-only pdf-view-next-page))
-  (interactive "p")
-  (unless n (setq n 1))
-  (when (> (+ (pdf-view-current-page) n)
-           (pdf-cache-number-of-pages))
-    (user-error "Last page"))
-  (when (< (+ (pdf-view-current-page) n) 1)
-    (user-error "First page"))
-  (let ((pdf-view-inhibit-redisplay t))
-    (pdf-view-goto-page
-     (+ (pdf-view-current-page) n)))
-  (force-mode-line-update)
-  (sit-for 0)
-  (when pdf-view--next-page-timer
-    (cancel-timer pdf-view--next-page-timer)
-    (setq pdf-view--next-page-timer nil))
-  (if (or (not (input-pending-p))
-          (and (> n 0)
-               (= (pdf-view-current-page)
-                  (pdf-cache-number-of-pages)))
-          (and (< n 0)
-               (= (pdf-view-current-page) 1)))
-      (pdf-view-redisplay)
-    (setq pdf-view--next-page-timer
-          (run-with-idle-timer 0.001 nil 'pdf-view-redisplay (selected-window)))))
-
-(defun pdf-view-previous-page-command (&optional n)
-  "View the previous page in the PDF.
-
-Optional parameter N moves N pages backward.
-
-This command is a wrapper for `pdf-view-previous-page'."
-  (declare (interactive-only pdf-view-previous-page))
-  (interactive "p")
-  (with-no-warnings
-    (pdf-view-next-page-command (- (or n 1)))))
-
-(defun pdf-view-first-page ()
-  "View the first page."
-  (interactive)
-  (pdf-view-goto-page 1))
-
-(defun pdf-view-last-page ()
-  "View the last page."
-  (interactive)
-  (pdf-view-goto-page (pdf-cache-number-of-pages)))
-
-(defun pdf-view-scroll-up-or-next-page (&optional arg)
-  "Scroll page up ARG lines if possible, else go to the next page.
-
-When `pdf-view-continuous' is non-nil, scrolling upward at the
-bottom edge of the page moves to the next page.  Otherwise, go to
-next page only on typing SPC (ARG is nil)."
-  (interactive "P")
-  (if (or pdf-view-continuous (null arg))
-      (let ((hscroll (window-hscroll))
-            (cur-page (pdf-view-current-page))
-            (win-scroll (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll))
-            (img-scroll (image-scroll-up arg)))
-        (when (or
-               ;; There is no next line for the image to scroll to
-               (and img-scroll (= win-scroll img-scroll))
-               ;; Workaround rounding/off-by-one issues.
-               (memq pdf-view-display-size
-                     '(fit-height fit-page)))
-          (pdf-view-next-page)
-          (when (/= cur-page (pdf-view-current-page))
-            (image-bob)
-            (image-bol 1))
-          (image-set-window-hscroll hscroll)))
-    (image-scroll-up arg)))
-
-(defun pdf-view-scroll-down-or-previous-page (&optional arg)
-  "Scroll page down ARG lines if possible, else go to the previous page.
-
-When `pdf-view-continuous' is non-nil, scrolling downward at the
-top edge of the page moves to the previous page.  Otherwise, go
-to previous page only on typing DEL (ARG is nil)."
-  (interactive "P")
-  (if (or pdf-view-continuous (null arg))
-      (let ((hscroll (window-hscroll))
-            (cur-page (pdf-view-current-page))
-            (win-scroll (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll))
-            (img-scroll (image-scroll-down arg)))
-        (when (or
-               ;; There is no previous line for the image to scroll to
-               (and img-scroll (= win-scroll img-scroll))
-               ;; Workaround rounding/off-by-one issues.
-               (memq pdf-view-display-size
-                     '(fit-height fit-page)))
-          (pdf-view-previous-page)
-          (when (/= cur-page (pdf-view-current-page))
-            (image-eob)
-            (image-bol 1))
-          (image-set-window-hscroll hscroll)))
-    (image-scroll-down arg)))
-
-(defun pdf-view-next-line-or-next-page (&optional arg)
-  "Scroll upward by ARG lines if possible, else go to the next page.
-
-When `pdf-view-continuous' is non-nil, scrolling a line upward
-at the bottom edge of the page moves to the next page."
-  (interactive "p")
-  (if pdf-view-continuous
-      (let ((hscroll (window-hscroll))
-            (cur-page (pdf-view-current-page)))
-        (when (= (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll)
-                 (image-next-line arg))
-          (pdf-view-next-page)
-          (when (/= cur-page (pdf-view-current-page))
-            (image-bob)
-            (image-bol 1))
-          (image-set-window-hscroll hscroll)))
-    (image-next-line 1)))
-
-(defun pdf-view-previous-line-or-previous-page (&optional arg)
-  "Scroll downward by ARG lines if possible, else go to the previous page.
-
-When `pdf-view-continuous' is non-nil, scrolling a line downward
-at the top edge of the page moves to the previous page."
-  (interactive "p")
-  (if pdf-view-continuous
-      (let ((hscroll (window-hscroll))
-            (cur-page (pdf-view-current-page)))
-        (when (= (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll)
-                 (image-previous-line arg))
-          (pdf-view-previous-page)
-          (when (/= cur-page (pdf-view-current-page))
-            (image-eob)
-            (image-bol 1))
-          (image-set-window-hscroll hscroll)))
-    (image-previous-line arg)))
-
-(defun pdf-view-goto-label (label)
-  "Go to the page corresponding to LABEL.
-
-Usually, the label of a document's page is the same as its
-displayed page number."
-  (interactive
-   (list (let ((labels (pdf-info-pagelabels)))
-           (completing-read "Goto label: " labels nil t))))
-  (let ((index (cl-position label (pdf-info-pagelabels) :test 'equal)))
-    (unless index
-      (error "No such label: %s" label))
-    (pdf-view-goto-page (1+ index))))
-
-(defun pdf-view-center-in-window ()
-  "Center PDF in window horizontally."
-  (interactive)
-  (image-set-window-hscroll
-   (/ (* (- (car (pdf-view-image-size))
-            (window-pixel-width))
-         (window-width))
-      2 (window-pixel-width))) ; convert from pixel to character width
-  (pdf-view-redisplay t))
-
-(defun pdf-view-align-left ()
-  "Align left edge of pdf with left edge of window."
-  (interactive)
-  (image-set-window-hscroll 0)
-  (pdf-view-redisplay t))
-
-(defun pdf-view-align-right ()
-  "Align right edge of pdf with right edge of window."
-  (interactive)
-  (image-set-window-hscroll
-   (/ (* (- (car (pdf-view-image-size))
-            (window-pixel-width))
-         (window-width))
-      (window-pixel-width))) ; convert from pixel to character width
-  (pdf-view-redisplay t))
-
-
-;; * ================================================================== *
-;; * Slicing
-;; * ================================================================== *
-
-(defun pdf-view-set-slice (x y width height &optional window)
-  "Set the slice of the pages that should be displayed in WINDOW.
-
-WINDOW defaults to `selected-window' if not provided.
-X, Y, WIDTH and HEIGHT should be relative coordinates, i.e. in
-\[0;1\].  To reset the slice use `pdf-view-reset-slice'."
-  (unless (equal (pdf-view-current-slice window)
-                 (list x y width height))
-    (setf (pdf-view-current-slice window)
-          (mapcar (lambda (v)
-                    (max 0 (min 1 v)))
-                  (list x y width height)))
-    (pdf-view-redisplay window)))
-
-(defun pdf-view-set-slice-using-mouse ()
-  "Set the slice of the images that should be displayed.
-
-Set the slice by pressing `mouse-1' at its top-left corner and
-dragging it to its bottom-right corner.  See also
-`pdf-view-set-slice' and `pdf-view-reset-slice'."
-  (interactive)
-  (let ((size (pdf-view-image-size))
-        x y w h done)
-    (while (not done)
-      (let ((e (read-event
-                (concat "Press mouse-1 at the top-left corner and "
-                        "drag it to the bottom-right corner!"))))
-        (when (eq (car e) 'drag-mouse-1)
-          (setq x (car (posn-object-x-y (event-start e))))
-          (setq y (cdr (posn-object-x-y (event-start e))))
-          (setq w (- (car (posn-object-x-y (event-end e))) x))
-          (setq h (- (cdr (posn-object-x-y (event-end e))) y))
-          (setq done t))))
-    (apply 'pdf-view-set-slice
-           (pdf-util-scale
-            (list x y w h)
-            (cons (/ 1.0 (float (car size)))
-                  (/ 1.0 (float (cdr size))))))))
-
-(defun pdf-view-set-slice-from-bounding-box (&optional window)
-  "Set the slice from the page's bounding-box.
-
-WINDOW defaults to `selected-window' if not provided.
-
-The result is that the margins are almost completely cropped,
-much more accurate than could be done manually using
-`pdf-view-set-slice-using-mouse'.
-
-See also `pdf-view-bounding-box-margin'."
-  (interactive)
-  (let* ((bb (pdf-cache-boundingbox (pdf-view-current-page window)))
-         (margin (max 0 (or pdf-view-bounding-box-margin 0)))
-         (slice (list (- (nth 0 bb)
-                         (/ margin 2.0))
-                      (- (nth 1 bb)
-                         (/ margin 2.0))
-                      (+ (- (nth 2 bb) (nth 0 bb))
-                         margin)
-                      (+ (- (nth 3 bb) (nth 1 bb))
-                         margin))))
-    (apply 'pdf-view-set-slice
-           (append slice (and window (list window))))))
-
-(defun pdf-view-reset-slice (&optional window)
-  "Reset the current slice and redisplay WINDOW.
-
-WINDOW defaults to `selected-window' if not provided.
-
-After calling this function the whole page will be visible
-again."
-  (interactive)
-  (when (pdf-view-current-slice window)
-    (setf (pdf-view-current-slice window) nil)
-    (pdf-view-redisplay window))
-  nil)
-
-(define-minor-mode pdf-view-auto-slice-minor-mode
-  "Automatically slice pages according to their bounding boxes.
-
-See also `pdf-view-set-slice-from-bounding-box'."
-  :group 'pdf-view
-  (pdf-util-assert-pdf-buffer)
-  (cond
-   (pdf-view-auto-slice-minor-mode
-    (dolist (win (get-buffer-window-list nil nil t))
-      (when (pdf-util-pdf-window-p win)
-        (pdf-view-set-slice-from-bounding-box win)))
-    (add-hook 'pdf-view-change-page-hook
-              'pdf-view-set-slice-from-bounding-box nil t))
-   (t
-    (progn (remove-hook 'pdf-view-change-page-hook
-                        'pdf-view-set-slice-from-bounding-box t)
-           (pdf-view-reset-slice)))))
-
-
-;; * ================================================================== *
-;; * Display
-;; * ================================================================== *
-
-(defun pdf-view-image-type ()
-  "Return the image type that should be used.
-
-The return value is either `imagemagick' (if available and wanted
-or if png is not available) or `png'.
-
-Signal an error, if neither `imagemagick' nor `png' is available.
-
-See also `pdf-view-use-imagemagick'."
-  (cond ((and pdf-view-use-imagemagick
-              (fboundp 'imagemagick-types))
-         'imagemagick)
-        ((image-type-available-p 'image-io)
-         'image-io)
-        ((image-type-available-p 'png)
-         'png)
-        ((fboundp 'imagemagick-types)
-         'imagemagick)
-        (t
-         (error "PNG image supported not compiled into Emacs"))))
-
-(defmacro pdf-view-create-image (data &rest props)
-  ;; TODO: add DATA and PROPS to docstring.
-  "Like `create-image', but with set DATA-P and TYPE arguments."
-  (declare (indent 1) (debug t))
-  (let ((image-data (make-symbol "data")))
-    `(let ((,image-data ,data))
-       (apply #'create-image ,image-data (pdf-view-image-type) t ,@props
-              (cl-list*
-               :relief (or pdf-view-image-relief 0)
-               (when (and (eq (framep-on-display) 'mac)
-                          (= (pdf-util-frame-scale-factor) 2))
-                 (list :data-2x ,image-data)))))))
-
-(defun pdf-view-create-page (page &optional window)
-  "Create an image of PAGE for display on WINDOW."
-  (let* ((size (pdf-view-desired-image-size page window))
-         (data (pdf-cache-renderpage
-                page (car size)
-                (if pdf-view-use-scaling
-                    (* 2 (car size))
-                  (car size))))
-         (hotspots (pdf-view-apply-hotspot-functions
-                    window page size)))
-    (pdf-view-create-image data
-      :width (car size)
-      :rotation (or pdf-view--current-rotation 0)
-      :map hotspots
-      :pointer 'arrow)))
-
-(defun pdf-view-image-size (&optional displayed-p window)
-  ;; TODO: add WINDOW to docstring.
-  "Return the size in pixel of the current image.
-
-If DISPLAYED-P is non-nil, return the size of the displayed
-image.  These values may be different, if slicing is used."
-  (if displayed-p
-      (with-selected-window (or window (selected-window))
-        (image-display-size
-         (image-get-display-property) t))
-    (image-size (pdf-view-current-image window) t)))
-
-(defun pdf-view-image-offset (&optional window)
-  ;; TODO: add WINDOW to docstring.
-  "Return the offset of the current image.
-
-It is equal to \(LEFT . TOP\) of the current slice in pixel."
-  (let* ((slice (pdf-view-current-slice window)))
-    (cond
-     (slice
-      (pdf-util-scale-relative-to-pixel
-       (cons (nth 0 slice) (nth 1 slice))
-       window))
-     (t
-      (cons 0 0)))))
-
-(defun pdf-view-display-page (page &optional window)
-  "Display page PAGE in WINDOW."
-  (setf (pdf-view-window-needs-redisplay window) nil)
-  (pdf-view-display-image
-   (pdf-view-create-page page window)
-   window))
-
-(defun pdf-view-display-image (image &optional window inhibit-slice-p)
-  ;; TODO: write documentation!
-  (let ((ol (pdf-view-current-overlay window)))
-    (when (window-live-p (overlay-get ol 'window))
-      (let* ((size (image-size image t))
-             (slice (if (not inhibit-slice-p)
-                        (pdf-view-current-slice window)))
-             (displayed-width (floor
-                               (if slice
-                                   (* (nth 2 slice)
-                                      (car (image-size image)))
-                                 (car (image-size image))))))
-        (setf (pdf-view-current-image window) image)
-        (move-overlay ol (point-min) (point-max))
-        ;; In case the window is wider than the image, center the image
-        ;; horizontally.
-        (overlay-put ol 'before-string
-                     (when (> (window-width window)
-                              displayed-width)
-                       (propertize " " 'display
-                                   `(space :align-to
-                                           ,(/ (- (window-width window)
-                                                  displayed-width) 2)))))
-        (overlay-put ol 'display
-                     (if slice
-                         (list (cons 'slice
-                                     (pdf-util-scale slice size 'round))
-                               image)
-                       image))
-        (let* ((win (overlay-get ol 'window))
-               (hscroll (image-mode-window-get 'hscroll win))
-               (vscroll (image-mode-window-get 'vscroll win)))
-          ;; Reset scroll settings, in case they were changed.
-          (if hscroll (set-window-hscroll win hscroll))
-          (if vscroll (set-window-vscroll
-                       win vscroll pdf-view-have-image-mode-pixel-vscroll)))))))
-
-(defun pdf-view-redisplay (&optional window)
-  "Redisplay page in WINDOW.
-
-If WINDOW is t, redisplay pages in all windows."
-  (unless pdf-view-inhibit-redisplay
-    (if (not (eq t window))
-        (pdf-view-display-page
-         (pdf-view-current-page window)
-         window)
-      (dolist (win (get-buffer-window-list nil nil t))
-        (pdf-view-display-page
-         (pdf-view-current-page win)
-         win))
-      (when (consp image-mode-winprops-alist)
-        (dolist (window (mapcar #'car image-mode-winprops-alist))
-          (unless (or (not (window-live-p window))
-                      (eq (current-buffer)
-                          (window-buffer window)))
-            (setf (pdf-view-window-needs-redisplay window) t)))))
-    (force-mode-line-update)))
-
-(defun pdf-view-redisplay-pages (&rest pages)
-  "Redisplay PAGES in all windows."
-  (pdf-util-assert-pdf-buffer)
-  (dolist (window (get-buffer-window-list nil nil t))
-    (when (memq (pdf-view-current-page window)
-                pages)
-      (pdf-view-redisplay window))))
-
-(defun pdf-view-maybe-redisplay-resized-windows ()
-  "Redisplay some windows needing redisplay."
-  (unless (or (numberp pdf-view-display-size)
-              (pdf-view-active-region-p)
-              (> (minibuffer-depth) 0))
-    (dolist (window (get-buffer-window-list nil nil t))
-      (let ((stored (pdf-view-current-window-size window))
-            (size (cons (window-width window)
-                        (window-height window))))
-        (unless (equal size stored)
-          (setf (pdf-view-current-window-size window) size)
-          (unless (or (null stored)
-                      (and (eq pdf-view-display-size 'fit-width)
-                           (eq (car size) (car stored)))
-                      (and (eq pdf-view-display-size 'fit-height)
-                           (eq (cdr size) (cdr stored))))
-            (pdf-view-redisplay window)))))))
-
-(defun pdf-view-redisplay-some-windows ()
-  (pdf-view-maybe-redisplay-resized-windows)
-  (dolist (window (get-buffer-window-list nil nil t))
-    (when (pdf-view-window-needs-redisplay window)
-      (pdf-view-redisplay window))))
-
-(defun pdf-view-new-window-function (winprops)
-  ;; TODO: write documentation!
-  ;; (message "New window %s for buf %s" (car winprops) (current-buffer))
-  (cl-assert (or (eq t (car winprops))
-                 (eq (window-buffer (car winprops)) (current-buffer))))
-  (let ((ol (image-mode-window-get 'overlay winprops)))
-    (if ol
-        (progn
-          (setq ol (copy-overlay ol))
-          ;; `ol' might actually be dead.
-          (move-overlay ol (point-min) (point-max)))
-      (setq ol (make-overlay (point-min) (point-max) nil t))
-      (overlay-put ol 'pdf-view t))
-    (overlay-put ol 'window (car winprops))
-    (unless (windowp (car winprops))
-      ;; It's a pseudo entry.  Let's make sure it's not displayed (the
-      ;; `window' property is only effective if its value is a window).
-      (cl-assert (eq t (car winprops)))
-      (delete-overlay ol))
-    (image-mode-window-put 'overlay ol winprops)
-    ;; Clean up some overlays.
-    (dolist (ov (overlays-in (point-min) (point-max)))
-      (when (and (windowp (overlay-get ov 'window))
-                 (not (window-live-p (overlay-get ov 'window))))
-        (delete-overlay ov)))
-    (when (and (windowp (car winprops))
-               (null (image-mode-window-get 'image winprops)))
-      ;; We're not displaying an image yet, so let's do so.  This
-      ;; happens when the buffer is displayed for the first time.
-      (with-selected-window (car winprops)
-        (pdf-view-goto-page
-         (or (image-mode-window-get 'page t) 1))))))
-
-(defun pdf-view-desired-image-size (&optional page window)
-  ;; TODO: write documentation!
-  (let* ((pagesize (pdf-cache-pagesize
-                    (or page (pdf-view-current-page window))))
-         (slice (pdf-view-current-slice window))
-         (width-scale (/ (/ (float (window-body-width window t))
-                            (or (nth 2 slice) 1.0))
-                         (float (car pagesize))))
-         (height (- (nth 3 (window-inside-pixel-edges window))
-                    (nth 1 (window-inside-pixel-edges window))
-                    1))
-         (height-scale (/ (/ (float height)
-                             (or (nth 3 slice) 1.0))
-                          (float (cdr pagesize))))
-         (scale width-scale))
-    (if (numberp pdf-view-display-size)
-        (setq scale (float pdf-view-display-size))
-      (cl-case pdf-view-display-size
-        (fit-page
-         (setq scale (min height-scale width-scale)))
-        (fit-height
-         (setq scale height-scale))
-        (t
-         (setq scale width-scale))))
-    (let ((width (floor (* (car pagesize) scale)))
-          (height (floor (* (cdr pagesize) scale))))
-      (when (> width (max 1 (or pdf-view-max-image-width width)))
-        (setq width pdf-view-max-image-width
-              height (* height (/ (float pdf-view-max-image-width) width))))
-      (cons (max 1 width) (max 1 height)))))
-
-(defun pdf-view-text-regions-hotspots-function (page size)
-  "Return a list of hotspots for text regions on PAGE using SIZE.
-
-This will display a text cursor, when hovering over them."
-  (local-set-key [pdf-view-text-region t]
-                 'pdf-util-image-map-mouse-event-proxy)
-  (mapcar (lambda (region)
-            (let ((e (pdf-util-scale region size 'round)))
-              `((rect . ((,(nth 0 e) . ,(nth 1 e))
-                         . (,(nth 2 e) . ,(nth 3 e))))
-                pdf-view-text-region
-                (pointer text))))
-          (pdf-cache-textregions page)))
-
-(define-minor-mode pdf-view-dark-minor-mode
-  "Mode for PDF documents with dark background.
-
-This tells the various modes to use their face's dark colors."
-  :group 'pdf-view
-  (pdf-util-assert-pdf-buffer)
-  ;; FIXME: This should really be run in a hook.
-  (when (bound-and-true-p pdf-isearch-active-mode)
-    (with-no-warnings
-      (pdf-isearch-redisplay)
-      (pdf-isearch-message
-       (if pdf-view-dark-minor-mode "dark mode" "light mode")))))
-
-(define-minor-mode pdf-view-printer-minor-mode
-  "Display the PDF as it would be printed."
-  :group 'pdf-view
-  :lighter " Prn"
-  (pdf-util-assert-pdf-buffer)
-  (let ((enable (lambda ()
-                  (pdf-info-setoptions :render/printed t))))
-    (cond
-     (pdf-view-printer-minor-mode
-      (add-hook 'after-save-hook enable nil t)
-      (add-hook 'after-revert-hook enable nil t))
-     (t
-      (remove-hook 'after-save-hook enable t)
-      (remove-hook 'after-revert-hook enable t))))
-  (pdf-info-setoptions :render/printed pdf-view-printer-minor-mode)
-  (pdf-cache-clear-images)
-  (pdf-view-redisplay t))
-
-(define-minor-mode pdf-view-midnight-minor-mode
-  "Apply a color-filter appropriate for past midnight reading.
-
-The colors are determined by the variable
-`pdf-view-midnight-colors', which see. "
-  :group 'pdf-view
-  :lighter " Mid"
-  (pdf-util-assert-pdf-buffer)
-  ;; FIXME: Maybe these options should be passed stateless to pdf-info-renderpage ?
-  (let ((enable (lambda ()
-                  (pdf-info-setoptions
-                   :render/foreground (or (car pdf-view-midnight-colors) "black")
-                   :render/background (or (cdr pdf-view-midnight-colors) "white")
-                   :render/usecolors
-                   (if pdf-view-midnight-invert
-                       ;; If midnight invert is enabled, pass "2" indicating
-                       ;; that :render/foreground and :render/background should
-                       ;; be ignored and to instead invert the PDF (preserving
-                       ;; hue)
-                       2
-                     ;; If invert is not enabled, pass "1" indictating that
-                     ;; :render/foreground and :render/background should be used
-                     1)))))
-    (cond
-     (pdf-view-midnight-minor-mode
-      (add-hook 'after-save-hook enable nil t)
-      (add-hook 'after-revert-hook enable nil t)
-      (funcall enable))
-     (t
-      (remove-hook 'after-save-hook enable t)
-      (remove-hook 'after-revert-hook enable t)
-      (pdf-info-setoptions
-       ;; Value "0" indicates that colors should remain unchanged
-       :render/usecolors 0))))
-  (pdf-cache-clear-images)
-  (pdf-view-redisplay t))
-
-(defun pdf-view-set-theme-background ()
-  "Set the buffer's color filter to correspond to the current Emacs theme."
-  (pdf-util-assert-pdf-buffer)
-  (pdf-info-setoptions
-   :render/foreground (face-foreground 'default nil)
-   :render/background (face-background 'default nil)
-   :render/usecolors 1))
-
-(defun pdf-view-refresh-themed-buffer (&optional get-theme)
-  "Refresh the current buffer to activate applied colors.
-
-When GET-THEME is non-nil, also reset the applied colors to the
-current theme's colors."
-  (pdf-util-assert-pdf-buffer)
-  (pdf-cache-clear-images)
-  (when get-theme
-	(pdf-view-set-theme-background))
-  (pdf-view-redisplay t))
-
-(define-minor-mode pdf-view-themed-minor-mode
-  "Synchronize color filter with the present Emacs theme.
-
-The colors are determined by the `face-foreground' and
-`face-background' of the currently active theme."
-  :group 'pdf-view
-  :lighter " Thm"
-  (pdf-util-assert-pdf-buffer)
-  (cond
-   (pdf-view-themed-minor-mode
-    (add-hook 'after-save-hook #'pdf-view-set-theme-background nil t)
-    (add-hook 'after-revert-hook #'pdf-view-set-theme-background nil t))
-   (t
-    (remove-hook 'after-save-hook #'pdf-view-set-theme-background t)
-    (remove-hook 'after-revert-hook #'pdf-view-set-theme-background t)
-    (pdf-info-setoptions :render/usecolors 0)))
-  (pdf-view-refresh-themed-buffer pdf-view-themed-minor-mode))
-
-(when pdf-view-use-unicode-ligther
-  ;; This check uses an implementation detail, which hopefully gets the
-  ;; right answer.
-  (and (fontp (char-displayable-p ?⎙))
-       (setcdr (assq 'pdf-view-printer-minor-mode minor-mode-alist)
-               (list " ⎙" )))
-  (and (fontp (char-displayable-p ?🌙))
-       (setcdr (assq 'pdf-view-midnight-minor-mode minor-mode-alist)
-               (list  " 🌙" ))))
-
-
-;; * ================================================================== *
-;; * Hotspot handling
-;; * ================================================================== *
-
-(defun pdf-view-add-hotspot-function (fn &optional layer)
-  "Register FN as a hotspot function in the current buffer, using LAYER.
-
-FN will be called in the PDF buffer with the page-number and the
-image size \(WIDTH . HEIGHT\) as arguments.  It should return a
-list of hotspots applicable to the the :map image-property.
-
-LAYER determines the order: Functions in a higher LAYER will
-supersede hotspots in lower ones."
-  (push (cons (or layer 0) fn)
-        pdf-view--hotspot-functions))
-
-(defun pdf-view-remove-hotspot-function (fn)
-  "Unregister FN as a hotspot function in the current buffer."
-  (setq pdf-view--hotspot-functions
-        (cl-remove fn pdf-view--hotspot-functions
-                   :key 'cdr)))
-
-(defun pdf-view-sorted-hotspot-functions ()
-  ;; TODO: write documentation!
-  (mapcar 'cdr (cl-sort (copy-sequence pdf-view--hotspot-functions)
-                        '> :key 'car)))
-
-(defun pdf-view-apply-hotspot-functions (window page image-size)
-  ;; TODO: write documentation!
-  (unless pdf-view-inhibit-hotspots
-    (save-selected-window
-      (when window (select-window window 'norecord))
-      (apply 'nconc
-             (mapcar (lambda (fn)
-                       (funcall fn page image-size))
-                     (pdf-view-sorted-hotspot-functions))))))
-
-
-;; * ================================================================== *
-;; * Region
-;; * ================================================================== *
-
-(defun pdf-view--push-mark ()
-  ;; TODO: write documentation!
-  (let (mark-ring)
-    (push-mark-command nil))
-  (setq deactivate-mark nil))
-
-(defun pdf-view-active-region (&optional deactivate-p)
-  "Return the active region, a list of edges.
-
-Deactivate the region if DEACTIVATE-P is non-nil."
-  (pdf-view-assert-active-region)
-  (prog1
-      pdf-view-active-region
-    (when deactivate-p
-      (pdf-view-deactivate-region))))
-
-(defun pdf-view-deactivate-region ()
-  "Deactivate the region."
-  (interactive)
-  (when pdf-view-active-region
-    (setq pdf-view-active-region nil)
-    (deactivate-mark)
-    (pdf-view-redisplay t)))
-
-(defun pdf-view-mouse-set-region (event &optional allow-extend-p
-                                        rectangle-p
-                                        selection-style)
-  "Select a region of text using the mouse with mouse event EVENT.
-
-Allow for stacking of regions, if ALLOW-EXTEND-P is non-nil.
-
-Create a rectangular region, if RECTANGLE-P is non-nil.
-
-Overwrite `pdf-view-selection-style' with SELECTION-STYLE,
-which is one of `glyph', `word', or `line'.
-
-Stores the region in `pdf-view-active-region'."
-  (interactive "@e")
-  (setq pdf-view--have-rectangle-region rectangle-p)
-  (unless (and (eventp event)
-               (mouse-event-p event))
-    (signal 'wrong-type-argument (list 'mouse-event-p event)))
-  (unless (and allow-extend-p
-               (or (null (get this-command 'pdf-view-region-window))
-                   (equal (get this-command 'pdf-view-region-window)
-                          (selected-window))))
-    (pdf-view-deactivate-region))
-  (put this-command 'pdf-view-region-window
-       (selected-window))
-  (let* ((window (selected-window))
-         (pos (event-start event))
-         (begin-inside-image-p t)
-         (begin (if (posn-image pos)
-                    (posn-object-x-y pos)
-                  (setq begin-inside-image-p nil)
-                  (posn-x-y pos)))
-         (abs-begin (posn-x-y pos))
-         (selection-style (or selection-style pdf-view-selection-style))
-         pdf-view-continuous
-         region)
-    (when (pdf-util-track-mouse-dragging (event 0.05)
-            (let* ((pos (event-start event))
-                   (end (posn-object-x-y pos))
-                   (end-inside-image-p
-                    (and (eq window (posn-window pos))
-                         (posn-image pos))))
-              (when (or end-inside-image-p
-                        begin-inside-image-p)
-                (cond
-                 ((and end-inside-image-p
-                       (not begin-inside-image-p))
-                  ;; Started selection outside the image, setup begin.
-                  (let* ((xy (posn-x-y pos))
-                         (dxy (cons (- (car xy) (car begin))
-                                    (- (cdr xy) (cdr begin))))
-                         (size (pdf-view-image-size t)))
-                    (setq begin (cons (max 0 (min (car size)
-                                                  (- (car end) (car dxy))))
-                                      (max 0 (min (cdr size)
-                                                  (- (cdr end) (cdr dxy)))))
-                          ;; Store absolute position for later.
-                          abs-begin (cons (- (car xy)
-                                             (- (car end)
-                                                (car begin)))
-                                          (- (cdr xy)
-                                             (- (cdr end)
-                                                (cdr begin))))
-                          begin-inside-image-p t)))
-                 ((and begin-inside-image-p
-                       (not end-inside-image-p))
-                  ;; Moved outside the image, setup end.
-                  (let* ((xy (posn-x-y pos))
-                         (dxy (cons (- (car xy) (car abs-begin))
-                                    (- (cdr xy) (cdr abs-begin))))
-                         (size (pdf-view-image-size t)))
-                    (setq end (cons (max 0 (min (car size)
-                                                (+ (car begin) (car dxy))))
-                                    (max 0 (min (cdr size)
-                                                (+ (cdr begin) (cdr dxy)))))))))
-                (let ((iregion (if rectangle-p
-                                   (list (min (car begin) (car end))
-                                         (min (cdr begin) (cdr end))
-                                         (max (car begin) (car end))
-                                         (max (cdr begin) (cdr end)))
-                                 (list (car begin) (cdr begin)
-                                       (car end) (cdr end)))))
-                  (setq region
-                        (pdf-util-scale-pixel-to-relative iregion))
-                  (pdf-view-display-region
-                   (cons region pdf-view-active-region)
-                   rectangle-p
-                   selection-style)
-                  (pdf-util-scroll-to-edges iregion)))))
-      (setq pdf-view-active-region
-            (append pdf-view-active-region
-                    (list region)))
-      (pdf-view--push-mark))))
-
-(defun pdf-view-mouse-extend-region (event)
-  "Extend the currently active region with mouse event EVENT."
-  (interactive "@e")
-  (pdf-view-mouse-set-region
-   event t pdf-view--have-rectangle-region))
-
-(defun pdf-view-mouse-set-region-rectangle (event)
-  "Like `pdf-view-mouse-set-region' but displays as a rectangle.
-
-EVENT is the mouse event.
-
-This is more useful for commands like
-`pdf-view-extract-region-image'."
-  (interactive "@e")
-  (pdf-view-mouse-set-region event nil t))
-
-(defun pdf-view-display-region (&optional region rectangle-p selection-style)
-  ;; TODO: write documentation!
-  (unless region
-    (pdf-view-assert-active-region)
-    (setq region pdf-view-active-region))
-  (let ((colors (pdf-util-face-colors
-                 (if rectangle-p 'pdf-view-rectangle 'pdf-view-region)
-                 (bound-and-true-p pdf-view-dark-minor-mode)))
-        (page (pdf-view-current-page))
-        (width (car (pdf-view-image-size))))
-    (pdf-view-display-image
-     (pdf-view-create-image
-         (if rectangle-p
-             (pdf-info-renderpage-highlight
-              page width nil
-              `(,(car colors) ,(cdr colors) 0.35 ,@region))
-           (pdf-info-renderpage-text-regions
-            page width nil selection-style nil
-            `(,(car colors) ,(cdr colors) ,@region)))
-       :width width))))
-
-(defun pdf-view-kill-ring-save ()
-  "Copy the region to the `kill-ring'."
-  (interactive)
-  (pdf-view-assert-active-region)
-  (let* ((txt (pdf-view-active-region-text)))
-    (pdf-view-deactivate-region)
-    (kill-new (mapconcat 'identity txt "\n"))))
-
-(defun pdf-view-mark-whole-page ()
-  "Mark the whole page."
-  (interactive)
-  (pdf-view-deactivate-region)
-  (setq pdf-view-active-region
-        (list (list 0 0 1 1)))
-  (pdf-view--push-mark)
-  (pdf-view-display-region))
-
-(defun pdf-view-active-region-text ()
-  "Return the text of the active region as a list of strings."
-  (pdf-view-assert-active-region)
-  (mapcar
-   (lambda (edges)
-     (pdf-info-gettext
-      (pdf-view-current-page)
-      edges
-      pdf-view-selection-style))
-   pdf-view-active-region))
-
-(defun pdf-view-extract-region-image (regions &optional page size
-                                              output-buffer no-display-p)
-  ;; TODO: what is "resp."? Avoid contractions.
-  "Create a PNG image of REGIONS.
-
-REGIONS should have the same form as `pdf-view-active-region',
-which see.  PAGE and SIZE are the page resp. base-size of the
-image from which the image-regions will be created; they default
-to `pdf-view-current-page' resp. `pdf-view-image-size'.
-
-Put the image in OUTPUT-BUFFER, defaulting to \"*PDF region
-image*\" and display it, unless NO-DISPLAY-P is non-nil.
-
-In case of multiple regions, the resulting image is constructed
-by joining them horizontally.  For this operation (and this only)
-the `convert' program is used."
-
-  (interactive
-   (list (if (pdf-view-active-region-p)
-             (pdf-view-active-region t)
-           '((0 0 1 1)))))
-  (unless page
-    (setq page (pdf-view-current-page)))
-  (unless size
-    (setq size (pdf-view-image-size)))
-  (unless output-buffer
-    (setq output-buffer (get-buffer-create "*PDF image*")))
-  (let* ((images (mapcar (lambda (edges)
-                           (let ((file (make-temp-file "pdf-view"))
-                                 (coding-system-for-write 'binary))
-                             (write-region
-                              (pdf-info-renderpage
-                               page (car size)
-                               :crop-to edges)
-                              nil file nil 'no-message)
-                             file))
-                         regions))
-         result)
-    (unwind-protect
-        (progn
-          (if (= (length images) 1)
-              (setq result (car images))
-            (setq result (make-temp-file "pdf-view"))
-            ;; Join the images horizontally with a gap of 10 pixel.
-            (pdf-util-convert
-             "-noop" ;; workaround limitations of this function
-             result
-             :commands `("("
-                         ,@images
-                         "-background" "white"
-                         "-splice" "0x10+0+0"
-                         ")"
-                         "-gravity" "Center"
-                         "-append"
-                         "+gravity"
-                         "-chop" "0x10+0+0")
-             :apply '((0 0 0 0))))
-          (with-current-buffer output-buffer
-            (let ((inhibit-read-only t))
-              (erase-buffer))
-            (set-buffer-multibyte nil)
-            (insert-file-contents-literally result)
-            (image-mode)
-            (unless no-display-p
-              (pop-to-buffer (current-buffer)))))
-      (dolist (f (cons result images))
-        (when (file-exists-p f)
-          (delete-file f))))))
-
-(defun pdf-view-set-selection-style (&optional style)
-  "Set `pdf-view-selection-style' to STYLE in the current buffer.
-
-When called interactively or without an argument, cycle between
-the selection styles."
-  (interactive)
-  (unless style
-    (setq style (or (cadr (memq pdf-view-selection-style '(glyph word line)))
-                    'glyph))
-    (message "Setting selection style to `%s'." style))
-  (pdf-view-deactivate-region)
-  (setq-local pdf-view-selection-style style))
-
-
-;; * ================================================================== *
-;; * Bookmark + Register Integration
-;; * ================================================================== *
-
-(defun pdf-view-bookmark-make-record  (&optional no-page no-slice no-size no-origin)
-  ;; TODO: add NO-PAGE, NO-SLICE, NO-SIZE, NO-ORIGIN to the docstring.
-  "Create a bookmark PDF record.
-
-The optional, boolean args exclude certain attributes."
-  (let ((displayed-p (eq (current-buffer)
-                         (window-buffer))))
-    (cons (buffer-name)
-          (append (bookmark-make-record-default nil t 1)
-                  `(,(unless no-page
-                       (cons 'page (pdf-view-current-page)))
-                    ,(unless no-slice
-                       (cons 'slice (and displayed-p
-                                         (pdf-view-current-slice))))
-                    ,(unless no-size
-                       (cons 'size pdf-view-display-size))
-                    ,(unless no-origin
-                       (cons 'origin
-                             (and displayed-p
-                                  (let ((edges (pdf-util-image-displayed-edges nil t)))
-                                    (pdf-util-scale-pixel-to-relative
-                                     (cons (car edges) (cadr edges)) nil t)))))
-                    (handler . pdf-view-bookmark-jump-handler))))))
-
-;;;###autoload
-(defun pdf-view-bookmark-jump-handler (bmk)
-  "The bookmark handler-function interface for bookmark BMK.
-
-See also `pdf-view-bookmark-make-record'."
-  (let ((page (bookmark-prop-get bmk 'page))
-        (slice (bookmark-prop-get bmk 'slice))
-        (size (bookmark-prop-get bmk 'size))
-        (origin (bookmark-prop-get bmk 'origin))
-        (file (bookmark-prop-get bmk 'filename))
-        (show-fn-sym (make-symbol "pdf-view-bookmark-after-jump-hook")))
-    (fset show-fn-sym
-          (lambda ()
-            (remove-hook 'bookmark-after-jump-hook show-fn-sym)
-            (unless (derived-mode-p 'pdf-view-mode)
-              (pdf-view-mode))
-            (with-selected-window
-                (or (get-buffer-window (current-buffer) 0)
-                    (selected-window))
-              (when size
-                (setq-local pdf-view-display-size size))
-              (when slice
-                (apply 'pdf-view-set-slice slice))
-              (when (numberp page)
-                (pdf-view-goto-page page))
-              (when origin
-                (let ((size (pdf-view-image-size t)))
-                  (image-set-window-hscroll
-                   (round (/ (* (car origin) (car size))
-                             (frame-char-width))))
-                  (image-set-window-vscroll
-                   (round (/ (* (cdr origin) (cdr size))
-                             (if pdf-view-have-image-mode-pixel-vscroll
-                                 1
-                               (frame-char-height))))))))))
-    (add-hook 'bookmark-after-jump-hook show-fn-sym)
-    (set-buffer (or (find-buffer-visiting file)
-                    (find-file-noselect file)))))
-
-(defun pdf-view-bookmark-jump (bmk)
-  "Switch to bookmark BMK.
-
-This function is like `bookmark-jump', but it always uses the
-selected window for display and does not run any hooks.  Also, it
-works only with bookmarks created by
-`pdf-view-bookmark-make-record'."
-
-  (let* ((file (bookmark-prop-get bmk 'filename))
-         (buffer (or (find-buffer-visiting file)
-                     (find-file-noselect file))))
-    (switch-to-buffer buffer)
-    (let (bookmark-after-jump-hook)
-      (pdf-view-bookmark-jump-handler bmk)
-      (run-hooks 'bookmark-after-jump-hook))))
-
-(defun pdf-view-registerv-make ()
-  "Create a PDF register entry of the current position."
-  (registerv-make
-   (pdf-view-bookmark-make-record nil t t)
-   :print-func 'pdf-view-registerv-print-func
-   :jump-func 'pdf-view-bookmark-jump
-   :insert-func (lambda (bmk)
-                  (insert (format "%S" bmk)))))
-
-(defun pdf-view-registerv-print-func (bmk)
-  "Print a textual representation of bookmark BMK.
-
-This function is used as the `:print-func' property with
-`registerv-make'."
-  (let* ((file (bookmark-prop-get bmk 'filename))
-         (buffer (find-buffer-visiting file))
-         (page (bookmark-prop-get bmk 'page))
-         (origin (bookmark-prop-get bmk 'origin)))
-    (princ (format "PDF position: %s, page %d, %d%%"
-                   (if buffer
-                       (buffer-name buffer)
-                     file)
-                   (or page 1)
-                   (if origin
-                       (round (* 100 (cdr origin)))
-                     0)))))
-
-(defmacro pdf-view-with-register-alist (&rest body)
-  "Setup the proper binding for `register-alist' in BODY.
-
-This macro may not work as desired when it is nested.  See also
-`pdf-view-use-dedicated-register'."
-  (declare (debug t) (indent 0))
-  (let ((dedicated-p (make-symbol "dedicated-p")))
-    `(let* ((,dedicated-p pdf-view-use-dedicated-register)
-            (register-alist
-             (if ,dedicated-p
-                 pdf-view-register-alist
-               register-alist)))
-       (unwind-protect
-           (progn ,@body)
-         (when ,dedicated-p
-           (setq pdf-view-register-alist register-alist))))))
-
-(defun pdf-view-position-to-register (register)
-  "Store current PDF position in register REGISTER.
-
-See also `point-to-register'."
-  (interactive
-   (list (pdf-view-with-register-alist
-           (register-read-with-preview "Position to register: "))))
-  (pdf-view-with-register-alist
-    (set-register register (pdf-view-registerv-make))))
-
-(defun pdf-view-jump-to-register (register &optional delete return-register)
-  ;; TODO: add RETURN-REGISTER to the docstring.
-  "Move point to a position stored in a REGISTER.
-
-Optional parameter DELETE is defined as in `jump-to-register'."
-  (interactive
-   (pdf-view-with-register-alist
-     (list
-      (register-read-with-preview "Jump to register: ")
-      current-prefix-arg
-      (and (or pdf-view-use-dedicated-register
-               (local-variable-p 'register-alist))
-           (characterp last-command-event)
-           last-command-event))))
-  (pdf-view-with-register-alist
-    (let ((return-pos (and return-register
-                           (pdf-view-registerv-make))))
-      (jump-to-register register delete)
-      (when return-register
-        (set-register return-register return-pos)))))
-
-(provide 'pdf-view)
-
-;;; pdf-view.el ends here
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-view.elc b/emacs/elpa/pdf-tools-20240411.1703/pdf-view.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/README b/emacs/elpa/pdf-tools-20240429.407/README
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/Makefile b/emacs/elpa/pdf-tools-20240429.407/build/Makefile
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/.gitignore b/emacs/elpa/pdf-tools-20240429.407/build/server/.gitignore
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/Makefile.am b/emacs/elpa/pdf-tools-20240429.407/build/server/Makefile.am
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/autobuild b/emacs/elpa/pdf-tools-20240429.407/build/server/autobuild
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/autogen.sh b/emacs/elpa/pdf-tools-20240429.407/build/server/autogen.sh
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/configure.ac b/emacs/elpa/pdf-tools-20240429.407/build/server/configure.ac
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/epdfinfo.c b/emacs/elpa/pdf-tools-20240429.407/build/server/epdfinfo.c
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/epdfinfo.h b/emacs/elpa/pdf-tools-20240429.407/build/server/epdfinfo.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/poppler-versions b/emacs/elpa/pdf-tools-20240429.407/build/server/poppler-versions
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser.c b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser.c
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser.h b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_advanced.h b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_advanced.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_local.h b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_local.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_readme.txt b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_readme.txt
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_utils.c b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_utils.c
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_utils.h b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_utils.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_parser_version.txt b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_parser_version.txt
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/synctex_version.h b/emacs/elpa/pdf-tools-20240429.407/build/server/synctex_version.h
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/.gitignore b/emacs/elpa/pdf-tools-20240429.407/build/server/test/.gitignore
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/.gitignore b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/.gitignore
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/lib/run-tests b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/lib/run-tests
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/lib/yes-or-enter b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/lib/yes-or-enter
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/Dockerfile.common.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/Dockerfile.common.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/arch.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/arch.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/centos.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/centos.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-10.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-10.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-11.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-11.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/debian-9.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/debian-9.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-26.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-26.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-27.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-27.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-28.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-28.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/emacs-29.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/emacs-29.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-34.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-34.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-35.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-35.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/fedora-36.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/fedora-36.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/freebsd.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/freebsd.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/gentoo.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/gentoo.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/macos.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/macos.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/msys2.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/msys2.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/nixos.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/nixos.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/openbsd.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/openbsd.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/opensuse.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/opensuse.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-18.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-18.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-20.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-20.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/ubuntu-22.Dockerfile.in b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/ubuntu-22.Dockerfile.in
diff --git a/emacs/elpa/pdf-tools-20240411.1703/build/server/test/docker/templates/void.Dockerfile.in.FAILING b/emacs/elpa/pdf-tools-20240429.407/build/server/test/docker/templates/void.Dockerfile.in.FAILING
diff --git a/emacs/elpa/pdf-tools-20240429.407/epdfinfo b/emacs/elpa/pdf-tools-20240429.407/epdfinfo
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-annot.el b/emacs/elpa/pdf-tools-20240429.407/pdf-annot.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-annot.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-annot.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-cache.el b/emacs/elpa/pdf-tools-20240429.407/pdf-cache.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-cache.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-cache.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-dev.el b/emacs/elpa/pdf-tools-20240429.407/pdf-dev.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-dev.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-dev.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-history.el b/emacs/elpa/pdf-tools-20240429.407/pdf-history.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-history.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-history.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-info.el b/emacs/elpa/pdf-tools-20240429.407/pdf-info.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-info.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-info.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-isearch.el b/emacs/elpa/pdf-tools-20240429.407/pdf-isearch.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-isearch.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-isearch.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-links.el b/emacs/elpa/pdf-tools-20240429.407/pdf-links.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-links.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-links.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-loader.el b/emacs/elpa/pdf-tools-20240429.407/pdf-loader.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-loader.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-loader.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-macs.el b/emacs/elpa/pdf-tools-20240429.407/pdf-macs.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-macs.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-macs.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-misc.el b/emacs/elpa/pdf-tools-20240429.407/pdf-misc.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-misc.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-misc.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-occur.el b/emacs/elpa/pdf-tools-20240429.407/pdf-occur.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-occur.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-occur.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-outline.el b/emacs/elpa/pdf-tools-20240429.407/pdf-outline.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-outline.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-outline.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-sync.el b/emacs/elpa/pdf-tools-20240429.407/pdf-sync.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-sync.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-sync.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-tools-autoloads.el b/emacs/elpa/pdf-tools-20240429.407/pdf-tools-autoloads.el
diff --git a/emacs/elpa/pdf-tools-20240429.407/pdf-tools-pkg.el b/emacs/elpa/pdf-tools-20240429.407/pdf-tools-pkg.el
@@ -0,0 +1,16 @@
+(define-package "pdf-tools" "20240429.407" "Support library for PDF documents"
+  '((emacs "26.3")
+    (tablist "1.0")
+    (let-alist "1.0.4"))
+  :commit "30b50544e55b8dbf683c2d932d5c33ac73323a16" :authors
+  '(("Andreas Politz" . "mail@andreas-politz.de"))
+  :maintainers
+  '(("Vedang Manerikar" . "vedang.manerikar@gmail.com"))
+  :maintainer
+  '("Vedang Manerikar" . "vedang.manerikar@gmail.com")
+  :keywords
+  '("files" "multimedia")
+  :url "http://github.com/vedang/pdf-tools/")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-tools.el b/emacs/elpa/pdf-tools-20240429.407/pdf-tools.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-tools.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-tools.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-util.el b/emacs/elpa/pdf-tools-20240429.407/pdf-util.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-util.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-util.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240429.407/pdf-view.el b/emacs/elpa/pdf-tools-20240429.407/pdf-view.el
@@ -0,0 +1,1826 @@
+;;; pdf-view.el --- View PDF documents. -*- lexical-binding:t -*-
+
+;; Copyright (C) 2013  Andreas Politz
+
+;; Author: Andreas Politz <politza@fh-trier.de>
+;; Keywords: files, doc-view, pdf
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;  Functions related to viewing PDF documents.
+
+;;; Code:
+
+(require 'image-mode)
+(require 'pdf-macs)
+(require 'pdf-util)
+(require 'pdf-info)
+(require 'pdf-cache)
+(require 'jka-compr)
+(require 'bookmark)
+(require 'password-cache)
+
+(declare-function cua-copy-region "cua-base")
+(declare-function pdf-tools-pdf-buffer-p "pdf-tools")
+
+;; * ================================================================== *
+;; * Customizations
+;; * ================================================================== *
+
+(defgroup pdf-view nil
+  "View PDF documents."
+  :group 'pdf-tools)
+
+(defcustom pdf-view-display-size 'fit-width
+  "The desired size of displayed pages.
+
+This may be one of `fit-height', `fit-width', `fit-page' or a
+number as a scale factor applied to the document's size.  Any
+other value behaves like `fit-width'."
+  :group 'pdf-view
+  :type '(choice number
+                 (const fit-height)
+                 (const fit-width)
+                 (const fit-page)))
+
+(make-variable-buffer-local 'pdf-view-display-size)
+
+(defcustom pdf-view-resize-factor 1.25
+  "Fractional amount of resizing of one resize command."
+  :group 'pdf-view
+  :type 'number)
+
+(defcustom pdf-view-continuous t
+  "In Continuous mode reaching the page edge advances to next/previous page.
+
+When non-nil, scrolling a line upward at the bottom edge of the page
+moves to the next page, and scrolling a line downward at the top edge
+of the page moves to the previous page."
+  :type 'boolean
+  :group 'pdf-view)
+
+(defcustom pdf-view-bounding-box-margin 0.05
+  "Fractional margin used for slicing with the bounding-box."
+  :group 'pdf-view
+  :type 'number)
+
+(defcustom pdf-view-use-imagemagick nil
+  "Whether imagemagick should be used for rendering.
+
+This variable has no effect, if imagemagick was not compiled into
+Emacs or if imagemagick is the only way to display PNG images.
+FIXME: Explain dis-/advantages of imagemagick and png."
+  :group 'pdf-view
+  :type 'boolean)
+
+(defcustom pdf-view-use-scaling t
+  "Whether images should be allowed to be scaled for rendering.
+
+This variable affects both the reuse of higher-resolution images
+as lower-resolution ones by down-scaling the image.  As well as
+the rendering of higher-resolution for high-resolution displays,
+if available."
+  :group 'pdf-view
+  :type 'boolean)
+
+(defface pdf-view-region
+  '((((background dark)) (:inherit region))
+    (((background light)) (:inherit region)))
+  "Face used to determine the colors of the region."
+  :group 'pdf-view
+  :group 'pdf-tools-faces)
+
+(defface pdf-view-rectangle
+  '((((background dark)) (:inherit highlight))
+    (((background light)) (:inherit highlight)))
+  "Face used to determine the colors of the highlighted rectangle."
+  :group 'pdf-view
+  :group 'pdf-tools-faces)
+
+(defcustom pdf-view-midnight-colors '("#839496" . "#002b36" )
+  "Colors used when command `pdf-view-midnight-minor-mode' is activated.
+
+This should be a cons \(FOREGROUND . BACKGROUND\) of colors."
+  :group 'pdf-view
+  :type '(cons (color :tag "Foreground")
+               (color :tag "Background")))
+
+(defcustom pdf-view-midnight-invert t
+  "In midnight mode invert the image color lightness maintaining hue.
+
+This is particularly useful if you are viewing documents with
+color coded data in plots.  This will maintain the colors such
+that blue and red will remain these colors in the inverted
+rendering. This inversion is non-trivial. This makes use of the
+OKLab color space which is well calibrated to have equal
+perceptual brightness across hue, but not all colors are within
+the RGB gamut after inversion, causing some colors to saturate.
+Nevertheless, this seems to work well in most cases."
+  :group 'pdf-view
+  :type 'boolean)
+
+(defcustom pdf-view-change-page-hook nil
+  "Hook run after changing to another page, but before displaying it.
+
+See also `pdf-view-before-change-page-hook' and
+`pdf-view-after-change-page-hook'."
+  :group 'pdf-view
+  :type 'hook)
+
+(defcustom pdf-view-before-change-page-hook nil
+  "Hook run before changing to another page.
+
+See also `pdf-view-change-page-hook' and
+`pdf-view-after-change-page-hook'."
+  :group 'pdf-view
+  :type 'hook)
+
+(defcustom pdf-view-after-change-page-hook nil
+  "Hook run after changing to and displaying another page.
+
+See also `pdf-view-change-page-hook' and
+`pdf-view-before-change-page-hook'."
+  :group 'pdf-view
+  :type 'hook)
+
+(defcustom pdf-view-use-dedicated-register t
+  "Whether to use dedicated register for PDF positions.
+
+If this is non-nil, the commands `pdf-view-position-to-register'
+and `pdf-view-jump-to-register' use the buffer-local variable
+`pdf-view-register-alist' to store resp. retrieve marked
+positions.  Otherwise the common variable `register-alist' is
+used."
+  :group 'pdf-view
+  :type 'boolean)
+
+(defcustom pdf-view-image-relief 0
+  "Add a shadow rectangle around the page's image.
+
+See :relief property in Info node `(elisp) Image Descriptors'."
+  :group 'pdf-view
+  :type '(integer :tag "Pixel")
+  :link '(info-link "(elisp) Image Descriptors"))
+
+(defcustom pdf-view-max-image-width 4800
+  "Maximum width of any image displayed in pixel."
+  :group 'pdf-view
+  :type '(integer :tag "Pixel"))
+
+(defcustom pdf-view-use-unicode-ligther t
+  "Decide whether to use unicode symbols in the mode-line.
+
+On some systems finding a font which supports those symbols can
+take some time.  If you don't want to spend that time waiting and
+don't care for a nicer looking mode-line, set this variable to
+nil.
+
+Note, that this option has only an effect when this library is
+loaded."
+  :group 'pdf-view
+  :type 'boolean)
+
+(defcustom pdf-view-incompatible-modes
+  '(linum-mode linum-relative-mode helm-linum-relative-mode
+	           nlinum-mode nlinum-hl-mode nlinum-relative-mode yalinum-mode
+               display-line-numbers-mode)
+  "A list of modes incompatible with `pdf-view-mode'.
+
+Issue a warning, if one of them is active in a PDF buffer."
+  :group 'pdf-view
+  :type '(repeat symbol))
+
+(defcustom pdf-view-selection-style 'word
+  "The current default selection style.
+
+Must be one of `glyph', `word', or `line'."
+  :group 'pdf-view
+  :type '(choice (const glyph)
+                 (const word)
+                 (const line)))
+
+
+;; * ================================================================== *
+;; * Internal variables and macros
+;; * ================================================================== *
+
+(defvar-local pdf-view-active-region nil
+  "The active region as a list of edges.
+
+Edge values are relative coordinates.")
+
+(defvar-local pdf-view--have-rectangle-region nil
+  "Non-nil if the region is currently rendered as a rectangle.
+
+This variable is set in `pdf-view-mouse-set-region' and used in
+`pdf-view-mouse-extend-region' to determine the right choice
+regarding display of the region in the later function.")
+
+(defvar-local pdf-view--buffer-file-name nil
+  "Local copy of remote file or nil.")
+
+(defvar-local pdf-view--server-file-name nil
+  "The servers notion of this buffer's filename.")
+
+(defvar-local pdf-view--next-page-timer nil
+  "Timer used in `pdf-view-next-page-command'.")
+
+(defvar-local pdf-view--hotspot-functions nil
+  "Alist of hotspot functions.")
+
+(defvar-local pdf-view--current-rotation nil
+  "Current rotation of the page.")
+
+(defvar-local pdf-view-register-alist nil
+  "Local, dedicated register for PDF positions.")
+
+(defun pdf-view-current-pagelabel (&optional window)
+  (nth (1- (pdf-view-current-page window)) (pdf-info-pagelabels)))
+
+(defun pdf-view-active-region-p nil
+  "Return t if there are active regions."
+  (not (null pdf-view-active-region)))
+
+(defmacro pdf-view-assert-active-region ()
+  "Signal an error if there are no active regions."
+  `(unless (pdf-view-active-region-p)
+     (error "The region is not active")))
+
+(defconst pdf-view-have-image-mode-pixel-vscroll
+  (>= emacs-major-version 27)
+  "Whether `image-mode' scrolls vertically by pixels.")
+
+
+;; * ================================================================== *
+;; * Major Mode
+;; * ================================================================== *
+
+(defvar pdf-view-mode-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map image-mode-map)
+    (define-key map (kbd "Q")         'kill-this-buffer)
+    ;; Navigation in the document
+    (define-key map (kbd "n")         'pdf-view-next-page-command)
+    (define-key map (kbd "p")         'pdf-view-previous-page-command)
+    (define-key map (kbd "<next>")    'forward-page)
+    (define-key map (kbd "<prior>")   'backward-page)
+    (define-key map [remap forward-page]  'pdf-view-next-page-command)
+    (define-key map [remap backward-page] 'pdf-view-previous-page-command)
+    (define-key map (kbd "SPC")       'pdf-view-scroll-up-or-next-page)
+    (define-key map (kbd "S-SPC")     'pdf-view-scroll-down-or-previous-page)
+    (define-key map (kbd "DEL")       'pdf-view-scroll-down-or-previous-page)
+    (define-key map (kbd "C-n")       'pdf-view-next-line-or-next-page)
+    (define-key map (kbd "<down>")    'pdf-view-next-line-or-next-page)
+    (define-key map [remap next-line] 'pdf-view-next-line-or-next-page)
+    (define-key map (kbd "C-p")           'pdf-view-previous-line-or-previous-page)
+    (define-key map (kbd "<up>")          'pdf-view-previous-line-or-previous-page)
+    (define-key map [remap previous-line] 'pdf-view-previous-line-or-previous-page)
+    (define-key map (kbd "M-<")                 'pdf-view-first-page)
+    (define-key map [remap beginning-of-buffer] 'pdf-view-first-page)
+    (define-key map (kbd "M->")                 'pdf-view-last-page)
+    (define-key map [remap end-of-buffer]       'pdf-view-last-page)
+    (define-key map [remap goto-line] 'pdf-view-goto-page)
+    (define-key map (kbd "M-g l")     'pdf-view-goto-label)
+    (define-key map (kbd "RET")       'image-next-line)
+    ;; Zoom in/out.
+    (define-key map "+"               'pdf-view-enlarge)
+    (define-key map "="               'pdf-view-enlarge)
+    (define-key map "-"               'pdf-view-shrink)
+    (define-key map "0"               'pdf-view-scale-reset)
+    ;; Fit the image to the window
+    (define-key map "W"               'pdf-view-fit-width-to-window)
+    (define-key map "H"               'pdf-view-fit-height-to-window)
+    (define-key map "P"               'pdf-view-fit-page-to-window)
+    ;; Slicing the image
+    (define-key map (kbd "s m")       'pdf-view-set-slice-using-mouse)
+    (define-key map (kbd "s b")       'pdf-view-set-slice-from-bounding-box)
+    (define-key map (kbd "s r")       'pdf-view-reset-slice)
+    ;; Rotation.
+    (define-key map (kbd "R")              #'pdf-view-rotate)
+    ;; Reconvert
+    (define-key map (kbd "C-c C-c")   'doc-view-mode)
+    (define-key map (kbd "g")         'revert-buffer)
+    ;; Region
+    (define-key map [down-mouse-1] 'pdf-view-mouse-set-region)
+    (define-key map [M-down-mouse-1] 'pdf-view-mouse-set-region-rectangle)
+    (define-key map [C-down-mouse-1] 'pdf-view-mouse-extend-region)
+    (define-key map [remap kill-region] 'pdf-view-kill-ring-save)
+    (define-key map [remap kill-ring-save] 'pdf-view-kill-ring-save)
+    (define-key map [remap mark-whole-buffer] 'pdf-view-mark-whole-page)
+    ;; Other
+    (define-key map (kbd "C-c C-d") 'pdf-view-dark-minor-mode)
+    (define-key map (kbd "m") 'pdf-view-position-to-register)
+    (define-key map (kbd "'") 'pdf-view-jump-to-register)
+
+    (define-key map (kbd "C-c C-i") 'pdf-view-extract-region-image)
+    ;; Rendering
+    (define-key map (kbd "C-c C-r m") 'pdf-view-midnight-minor-mode)
+    (define-key map (kbd "C-c C-r t") 'pdf-view-themed-minor-mode)
+    (define-key map (kbd "C-c C-r p") 'pdf-view-printer-minor-mode)
+    map)
+  "Keymap used by `pdf-view-mode' when displaying a doc as a set of images.")
+
+(defvar pdf-tools-enabled-modes)
+(define-derived-mode pdf-view-mode special-mode "PDFView"
+  "Major mode in PDF buffers.
+
+PDFView Mode is an Emacs PDF viewer.  It displays PDF files as
+PNG images in Emacs buffers."
+  :group 'pdf-view
+  :abbrev-table nil
+  :syntax-table nil
+  ;; Setup a local copy for remote files.
+  (when (and (or jka-compr-really-do-compress
+                 (let ((file-name-handler-alist nil))
+                   (not (and buffer-file-name
+                             (file-readable-p buffer-file-name)))))
+             (pdf-tools-pdf-buffer-p))
+    (let ((tempfile (pdf-util-make-temp-file)))
+      (write-region nil nil tempfile nil 'no-message)
+      (setq-local pdf-view--buffer-file-name tempfile)))
+  ;; Decryption needs to be done before any other function calls into
+  ;; pdf-info.el (e.g. from the mode-line during redisplay during
+  ;; waiting for process output).
+  (pdf-view-decrypt-document)
+
+  ;; Setup scroll functions
+  (if (boundp 'mwheel-scroll-up-function) ; not --without-x build
+      (setq-local mwheel-scroll-up-function
+                  #'pdf-view-scroll-up-or-next-page))
+  (if (boundp 'mwheel-scroll-down-function)
+      (setq-local mwheel-scroll-down-function
+                  #'pdf-view-scroll-down-or-previous-page))
+
+  ;; Disable pixel-scroll-precision-mode locally if enabled
+  (if (bound-and-true-p pixel-scroll-precision-mode)
+      (set (make-local-variable 'pixel-scroll-precision-mode) nil))
+  (if (boundp 'mwheel-coalesce-scroll-events)
+      (setq-local mwheel-coalesce-scroll-events t))
+
+  ;; If the Emacs theme is dark, add `pdf-view-dark-minor-mode' to the
+  ;; list of `pdf-tools-enabled-modes'. See an interesting discussion
+  ;; at: https://github.com/vedang/pdf-tools/issues/166 about how this
+  ;; avoids a segfault crash in MacOS Ventura. IF you know why this
+  ;; happens, please get in touch via the linked issue.
+
+  (when (eq 'dark (frame-parameter nil 'background-mode))
+    (add-to-list 'pdf-tools-enabled-modes 'pdf-view-dark-minor-mode))
+
+  ;; Clearing overlays
+  (add-hook 'change-major-mode-hook
+            (lambda ()
+              (remove-overlays (point-min) (point-max) 'pdf-view t))
+            nil t)
+  (remove-overlays (point-min) (point-max) 'pdf-view t) ;Just in case.
+
+  ;; Setup other local variables.
+  (setq-local mode-line-position
+              '(" P" (:eval (number-to-string (pdf-view-current-page)))
+                ;; Avoid errors during redisplay.
+                "/" (:eval (or (ignore-errors
+                                 (number-to-string (pdf-cache-number-of-pages)))
+                               "???"))))
+  (setq-local auto-hscroll-mode nil)
+  (setq-local pdf-view--server-file-name (pdf-view-buffer-file-name))
+  ;; High values of scroll-conservatively seem to trigger
+  ;; some display bug in xdisp.c:try_scrolling .
+  (setq-local scroll-conservatively 0)
+  (setq-local cursor-type nil)
+  (setq-local buffer-read-only t)
+  (setq-local view-read-only nil)
+  (setq-local bookmark-make-record-function
+              'pdf-view-bookmark-make-record)
+  (setq-local revert-buffer-function #'pdf-view-revert-buffer)
+  ;; No auto-save at the moment.
+  (setq-local buffer-auto-save-file-name nil)
+  ;; Disable image rescaling.
+  (when (boundp 'image-scaling-factor)
+    (setq-local image-scaling-factor 1))
+  ;; No undo at the moment.
+  (unless buffer-undo-list
+    (buffer-disable-undo))
+  ;; Enable transient-mark-mode, so region deactivation when quitting
+  ;; will work.
+  (setq-local transient-mark-mode t)
+
+  (add-hook 'window-configuration-change-hook
+            'pdf-view-redisplay-some-windows nil t)
+  (add-hook 'deactivate-mark-hook 'pdf-view-deactivate-region nil t)
+  (add-hook 'write-contents-functions
+            'pdf-view--write-contents-function nil t)
+  (add-hook 'kill-buffer-hook 'pdf-view-close-document nil t)
+  (pdf-view-add-hotspot-function
+   'pdf-view-text-regions-hotspots-function -9)
+
+  ;; Keep track of display info
+  (add-hook 'image-mode-new-window-functions
+            'pdf-view-new-window-function nil t)
+  (image-mode-setup-winprops)
+
+  ;; Issue a warning in the future about incompatible modes.
+  (run-with-timer 1 nil (lambda (buffer)
+                          (when (buffer-live-p buffer)
+                            (pdf-view-check-incompatible-modes buffer)))
+		  (current-buffer)))
+
+(advice-add 'cua-copy-region
+	        :before-until
+	        #'cua-copy-region--pdf-view-advice)
+
+(defun cua-copy-region--pdf-view-advice (&rest _)
+  "If the current buffer is in `pdf-view' mode, call `pdf-view-kill-ring-save'."
+  (when (eq major-mode 'pdf-view-mode)
+    (pdf-view-kill-ring-save)
+    t))
+
+(defun pdf-view-check-incompatible-modes (&optional buffer)
+  "Check BUFFER for incompatible modes, maybe issue a warning."
+  (with-current-buffer (or buffer (current-buffer))
+    (let ((modes
+	   (cl-remove-if-not
+	    (lambda (mode) (and (symbolp mode)
+				(boundp mode)
+				(symbol-value mode)))
+	    pdf-view-incompatible-modes)))
+      (when modes
+	(display-warning
+	 'pdf-view
+	 (format "These modes are incompatible with `pdf-view-mode',
+	please deactivate them (or customize pdf-view-incompatible-modes): %s"
+		 (mapconcat #'symbol-name modes ",")))))))
+
+(defun pdf-view-decrypt-document ()
+  "Read a password, if the document is encrypted and open it."
+  (interactive)
+  (when (pdf-info-encrypted-p)
+    (let ((fn (buffer-file-name))
+          (prompt "Enter password for pdf document: ")
+          (i 3)
+          key password)
+
+      (when fn
+        (setq prompt (format "Enter password for `%s': "
+                             (abbreviate-file-name fn)))
+        (setq key (concat "/pdf-tools" fn))
+        ;; First, try with a cached password
+        (when (setq password (password-read-from-cache key))
+          (ignore-errors (pdf-info-open nil password))
+          (when (pdf-info-encrypted-p)
+            (password-cache-remove key))))
+
+      (while (and (> i 0)
+                  (pdf-info-encrypted-p))
+        (setq i (1- i))
+        ;; Cached password was not present or valid, try reading a new password
+        ;; without cache.
+        (setq password (password-read prompt))
+        (setq prompt "Invalid password, try again: ")
+        (ignore-errors (pdf-info-open nil password)))
+      (pdf-info-open nil password)
+      (when key
+        (password-cache-add key password))))
+  nil)
+
+(defun pdf-view-buffer-file-name ()
+  "Return the local filename of the PDF in the current buffer.
+
+This may be different from variable `buffer-file-name' when
+operating on a local copy of a remote file."
+  (or pdf-view--buffer-file-name
+      (buffer-file-name)))
+
+(defun pdf-view--write-contents-function ()
+  "Function for `write-contents-functions' to save the buffer."
+  (when (pdf-util-pdf-buffer-p)
+    (let ((tempfile (pdf-info-save pdf-view--server-file-name)))
+      (unwind-protect
+          (progn
+            ;; Order matters here: We need to first copy the new
+            ;; content (tempfile) to the PDF, and then close the PDF.
+            ;; Since while closing the file (and freeing its resources
+            ;; in the process), it may be immediately reopened due to
+            ;; redisplay happening inside the pdf-info-close function
+            ;; (while waiting for a response from the process.).
+            (copy-file tempfile (or (buffer-file-name)
+                                    (read-file-name
+                                     "File name to save PDF to: "))
+                       t)
+            (pdf-info-close pdf-view--server-file-name)
+
+            (when pdf-view--buffer-file-name
+              (copy-file tempfile pdf-view--buffer-file-name t))
+            (clear-visited-file-modtime)
+            (set-buffer-modified-p nil)
+            (setq pdf-view--server-file-name
+                  (pdf-view-buffer-file-name))
+            t)
+        (when (file-exists-p tempfile)
+          (delete-file tempfile))))))
+
+(defun pdf-view--after-revert ()
+  "Reload the local copy in case of a remote file, and close the document."
+  (when pdf-view--buffer-file-name
+    (write-region nil nil pdf-view--buffer-file-name nil 'no-message))
+  (pdf-info-close))
+
+(defun pdf-view-revert-buffer (&optional ignore-auto noconfirm)
+  "Revert buffer while preserving current modes.
+
+Optional parameters IGNORE-AUTO and NOCONFIRM are defined as in
+`revert-buffer'."
+  (interactive (list (not current-prefix-arg)))
+  ;; Bind to default so that we can use pdf-view-revert-buffer as
+  ;; revert-buffer-function.  A binding of nil is needed in Emacs 24.3, but in
+  ;; later versions the semantics that nil means the default function should
+  ;; not relied upon.
+  (let ((revert-buffer-function (when (fboundp #'revert-buffer--default)
+                                  #'revert-buffer--default))
+        (after-revert-hook
+         (cons #'pdf-view--after-revert
+               after-revert-hook)))
+    (prog1
+        (revert-buffer ignore-auto noconfirm 'preserve-modes)
+      (pdf-view-decrypt-document)
+      (pdf-view-redisplay t))))
+
+(defun pdf-view-close-document ()
+  "Return immediately after closing document.
+
+This function always succeeds.  See also `pdf-info-close', which
+does not return immediately."
+  (when (pdf-info-running-p)
+    (let ((pdf-info-asynchronous 'ignore))
+      (ignore-errors
+        (pdf-info-close)))))
+
+
+;; * ================================================================== *
+;; * Scaling
+;; * ================================================================== *
+
+(defun pdf-view-fit-page-to-window ()
+  "Fit PDF to window.
+
+Choose the larger of PDF's height and width, and fits that
+dimension to window."
+  (interactive)
+  (setq pdf-view-display-size 'fit-page)
+  (image-set-window-vscroll 0)
+  (image-set-window-hscroll 0)
+  (pdf-view-redisplay t))
+
+(defun pdf-view-fit-height-to-window ()
+  "Fit PDF height to window."
+  (interactive)
+  (setq pdf-view-display-size 'fit-height)
+  (image-set-window-vscroll 0)
+  (pdf-view-redisplay t))
+
+(defun pdf-view-fit-width-to-window ()
+  "Fit PDF size to window."
+  (interactive)
+  (setq pdf-view-display-size 'fit-width)
+  (image-set-window-hscroll 0)
+  (pdf-view-redisplay t))
+
+(defun pdf-view-enlarge (factor)
+  "Enlarge PDF by FACTOR.
+
+When called interactively, uses the value of
+`pdf-view-resize-factor'.
+
+For example, (pdf-view-enlarge 1.25) increases size by 25%."
+  (interactive
+   (list (float pdf-view-resize-factor)))
+  (let* ((size (pdf-view-image-size))
+         (pagesize (pdf-cache-pagesize
+                    (pdf-view-current-page)))
+         (scale (/ (float (car size))
+                   (float (car pagesize)))))
+    (setq pdf-view-display-size
+          (* factor scale))
+    (pdf-view-redisplay t)))
+
+(defun pdf-view-shrink (factor)
+  "Shrink PDF by FACTOR.
+
+When called interactively, uses the value of
+`pdf-view-resize-factor'.
+
+For example, (pdf-view-shrink 1.25) decreases size by 20%."
+  (interactive
+   (list (float pdf-view-resize-factor)))
+  (pdf-view-enlarge (/ 1.0 factor)))
+
+(defun pdf-view-scale-reset ()
+  "Reset PDF to its default set."
+  (interactive)
+  (setq pdf-view-display-size 1.0)
+  (pdf-view-redisplay t))
+
+
+;; * ================================================================== *
+;; * Rotation
+;; * ================================================================== *
+(defun pdf-view-rotate (angle)
+  "Rotate the current page by ANGLE degrees clockwise.
+When called interactively, angle defaults to 90.  Moreover, if
+called interactively with a prefix argument, then rotate
+anti-clockwise."
+  (interactive (list (if current-prefix-arg -90 90)))
+  (setq-local pdf-view--current-rotation
+              (mod (+ (or pdf-view--current-rotation 0)
+                      angle)
+                   360))
+  (pdf-view-redisplay t))
+
+
+;; * ================================================================== *
+;; * Moving by pages and scrolling
+;; * ================================================================== *
+
+(defvar pdf-view-inhibit-redisplay nil)
+(defvar pdf-view-inhibit-hotspots nil)
+
+(defun pdf-view-goto-page (page &optional window)
+  "Go to PAGE in PDF.
+
+If optional parameter WINDOW, go to PAGE in all `pdf-view'
+windows."
+  (interactive
+   (list (if current-prefix-arg
+             (prefix-numeric-value current-prefix-arg)
+           (read-number "Page: "))))
+  (unless (and (>= page 1)
+               (<= page (pdf-cache-number-of-pages)))
+    (error "No such page: %d" page))
+  (unless window
+    (setq window
+          (if (pdf-util-pdf-window-p)
+              (selected-window)
+            t)))
+  (save-selected-window
+    ;; Select the window for the hooks below.
+    (when (window-live-p window)
+      (select-window window 'norecord))
+    (let ((changing-p
+           (not (eq page (pdf-view-current-page window)))))
+      (when changing-p
+        (run-hooks 'pdf-view-before-change-page-hook)
+        (setf (pdf-view-current-page window) page)
+        (run-hooks 'pdf-view-change-page-hook))
+      (when (window-live-p window)
+        (pdf-view-redisplay window))
+      (when changing-p
+        (pdf-view-deactivate-region)
+        (force-mode-line-update)
+        (run-hooks 'pdf-view-after-change-page-hook))))
+  nil)
+
+(defun pdf-view-next-page (&optional n)
+  "View the next page in the PDF.
+
+Optional parameter N moves N pages forward."
+  (interactive "p")
+  (pdf-view-goto-page (+ (pdf-view-current-page)
+                         (or n 1))))
+
+(defun pdf-view-previous-page (&optional n)
+  "View the previous page in the PDF.
+
+Optional parameter N moves N pages backward."
+  (interactive "p")
+  (pdf-view-next-page (- (or n 1))))
+
+(defun pdf-view-next-page-command (&optional n)
+  "View the next page in the PDF.
+
+Optional parameter N moves N pages forward.
+
+This command is a wrapper for `pdf-view-next-page' that will
+indicate to the user if they are on the last page and more."
+  (declare (interactive-only pdf-view-next-page))
+  (interactive "p")
+  (unless n (setq n 1))
+  (when (> (+ (pdf-view-current-page) n)
+           (pdf-cache-number-of-pages))
+    (user-error "Last page"))
+  (when (< (+ (pdf-view-current-page) n) 1)
+    (user-error "First page"))
+  (let ((pdf-view-inhibit-redisplay t))
+    (pdf-view-goto-page
+     (+ (pdf-view-current-page) n)))
+  (force-mode-line-update)
+  (sit-for 0)
+  (when pdf-view--next-page-timer
+    (cancel-timer pdf-view--next-page-timer)
+    (setq pdf-view--next-page-timer nil))
+  (if (or (not (input-pending-p))
+          (and (> n 0)
+               (= (pdf-view-current-page)
+                  (pdf-cache-number-of-pages)))
+          (and (< n 0)
+               (= (pdf-view-current-page) 1)))
+      (pdf-view-redisplay)
+    (setq pdf-view--next-page-timer
+          (run-with-idle-timer 0.001 nil 'pdf-view-redisplay (selected-window)))))
+
+(defun pdf-view-previous-page-command (&optional n)
+  "View the previous page in the PDF.
+
+Optional parameter N moves N pages backward.
+
+This command is a wrapper for `pdf-view-previous-page'."
+  (declare (interactive-only pdf-view-previous-page))
+  (interactive "p")
+  (with-no-warnings
+    (pdf-view-next-page-command (- (or n 1)))))
+
+(defun pdf-view-first-page ()
+  "View the first page."
+  (interactive)
+  (pdf-view-goto-page 1))
+
+(defun pdf-view-last-page ()
+  "View the last page."
+  (interactive)
+  (pdf-view-goto-page (pdf-cache-number-of-pages)))
+
+(defun pdf-view-scroll-up-or-next-page (&optional arg)
+  "Scroll page up ARG lines if possible, else go to the next page.
+
+When `pdf-view-continuous' is non-nil, scrolling upward at the
+bottom edge of the page moves to the next page.  Otherwise, go to
+next page only on typing SPC (ARG is nil)."
+  (interactive "P")
+  (if (or pdf-view-continuous (null arg))
+      (let ((hscroll (window-hscroll))
+            (cur-page (pdf-view-current-page))
+            (win-scroll (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll))
+            (img-scroll (image-scroll-up arg)))
+        (when (or
+               ;; There is no next line for the image to scroll to
+               (and img-scroll (= win-scroll img-scroll))
+               ;; Workaround rounding/off-by-one issues.
+               (memq pdf-view-display-size
+                     '(fit-height fit-page)))
+          (pdf-view-next-page)
+          (when (/= cur-page (pdf-view-current-page))
+            (image-bob)
+            (image-bol 1))
+          (image-set-window-hscroll hscroll)))
+    (image-scroll-up arg)))
+
+(defun pdf-view-scroll-down-or-previous-page (&optional arg)
+  "Scroll page down ARG lines if possible, else go to the previous page.
+
+When `pdf-view-continuous' is non-nil, scrolling downward at the
+top edge of the page moves to the previous page.  Otherwise, go
+to previous page only on typing DEL (ARG is nil)."
+  (interactive "P")
+  (if (or pdf-view-continuous (null arg))
+      (let ((hscroll (window-hscroll))
+            (cur-page (pdf-view-current-page))
+            (win-scroll (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll))
+            (img-scroll (image-scroll-down arg)))
+        (when (or
+               ;; There is no previous line for the image to scroll to
+               (and img-scroll (= win-scroll img-scroll))
+               ;; Workaround rounding/off-by-one issues.
+               (memq pdf-view-display-size
+                     '(fit-height fit-page)))
+          (pdf-view-previous-page)
+          (when (/= cur-page (pdf-view-current-page))
+            (image-eob)
+            (image-bol 1))
+          (image-set-window-hscroll hscroll)))
+    (image-scroll-down arg)))
+
+(defun pdf-view-next-line-or-next-page (&optional arg)
+  "Scroll upward by ARG lines if possible, else go to the next page.
+
+When `pdf-view-continuous' is non-nil, scrolling a line upward
+at the bottom edge of the page moves to the next page."
+  (interactive "p")
+  (if pdf-view-continuous
+      (let ((hscroll (window-hscroll))
+            (cur-page (pdf-view-current-page)))
+        (when (= (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll)
+                 (image-next-line arg))
+          (pdf-view-next-page)
+          (when (/= cur-page (pdf-view-current-page))
+            (image-bob)
+            (image-bol 1))
+          (image-set-window-hscroll hscroll)))
+    (image-next-line arg)))
+
+(defun pdf-view-previous-line-or-previous-page (&optional arg)
+  "Scroll downward by ARG lines if possible, else go to the previous page.
+
+When `pdf-view-continuous' is non-nil, scrolling a line downward
+at the top edge of the page moves to the previous page."
+  (interactive "p")
+  (if pdf-view-continuous
+      (let ((hscroll (window-hscroll))
+            (cur-page (pdf-view-current-page)))
+        (when (= (window-vscroll nil pdf-view-have-image-mode-pixel-vscroll)
+                 (image-previous-line arg))
+          (pdf-view-previous-page)
+          (when (/= cur-page (pdf-view-current-page))
+            (image-eob)
+            (image-bol 1))
+          (image-set-window-hscroll hscroll)))
+    (image-previous-line arg)))
+
+(defun pdf-view-goto-label (label)
+  "Go to the page corresponding to LABEL.
+
+Usually, the label of a document's page is the same as its
+displayed page number."
+  (interactive
+   (list (let ((labels (pdf-info-pagelabels)))
+           (completing-read "Goto label: " labels nil t))))
+  (let ((index (cl-position label (pdf-info-pagelabels) :test 'equal)))
+    (unless index
+      (error "No such label: %s" label))
+    (pdf-view-goto-page (1+ index))))
+
+(defun pdf-view-center-in-window ()
+  "Center PDF in window horizontally."
+  (interactive)
+  (image-set-window-hscroll
+   (/ (* (- (car (pdf-view-image-size))
+            (window-pixel-width))
+         (window-width))
+      2 (window-pixel-width))) ; convert from pixel to character width
+  (pdf-view-redisplay t))
+
+(defun pdf-view-align-left ()
+  "Align left edge of pdf with left edge of window."
+  (interactive)
+  (image-set-window-hscroll 0)
+  (pdf-view-redisplay t))
+
+(defun pdf-view-align-right ()
+  "Align right edge of pdf with right edge of window."
+  (interactive)
+  (image-set-window-hscroll
+   (/ (* (- (car (pdf-view-image-size))
+            (window-pixel-width))
+         (window-width))
+      (window-pixel-width))) ; convert from pixel to character width
+  (pdf-view-redisplay t))
+
+
+;; * ================================================================== *
+;; * Slicing
+;; * ================================================================== *
+
+(defun pdf-view-set-slice (x y width height &optional window)
+  "Set the slice of the pages that should be displayed in WINDOW.
+
+WINDOW defaults to `selected-window' if not provided.
+X, Y, WIDTH and HEIGHT should be relative coordinates, i.e. in
+\[0;1\].  To reset the slice use `pdf-view-reset-slice'."
+  (unless (equal (pdf-view-current-slice window)
+                 (list x y width height))
+    (setf (pdf-view-current-slice window)
+          (mapcar (lambda (v)
+                    (max 0 (min 1 v)))
+                  (list x y width height)))
+    (pdf-view-redisplay window)))
+
+(defun pdf-view-set-slice-using-mouse ()
+  "Set the slice of the images that should be displayed.
+
+Set the slice by pressing `mouse-1' at its top-left corner and
+dragging it to its bottom-right corner.  See also
+`pdf-view-set-slice' and `pdf-view-reset-slice'."
+  (interactive)
+  (let ((size (pdf-view-image-size))
+        x y w h done)
+    (while (not done)
+      (let ((e (read-event
+                (concat "Press mouse-1 at the top-left corner and "
+                        "drag it to the bottom-right corner!"))))
+        (when (eq (car e) 'drag-mouse-1)
+          (setq x (car (posn-object-x-y (event-start e))))
+          (setq y (cdr (posn-object-x-y (event-start e))))
+          (setq w (- (car (posn-object-x-y (event-end e))) x))
+          (setq h (- (cdr (posn-object-x-y (event-end e))) y))
+          (setq done t))))
+    (apply 'pdf-view-set-slice
+           (pdf-util-scale
+            (list x y w h)
+            (cons (/ 1.0 (float (car size)))
+                  (/ 1.0 (float (cdr size))))))))
+
+(defun pdf-view-set-slice-from-bounding-box (&optional window)
+  "Set the slice from the page's bounding-box.
+
+WINDOW defaults to `selected-window' if not provided.
+
+The result is that the margins are almost completely cropped,
+much more accurate than could be done manually using
+`pdf-view-set-slice-using-mouse'.
+
+See also `pdf-view-bounding-box-margin'."
+  (interactive)
+  (let* ((bb (pdf-cache-boundingbox (pdf-view-current-page window)))
+         (margin (max 0 (or pdf-view-bounding-box-margin 0)))
+         (slice (list (- (nth 0 bb)
+                         (/ margin 2.0))
+                      (- (nth 1 bb)
+                         (/ margin 2.0))
+                      (+ (- (nth 2 bb) (nth 0 bb))
+                         margin)
+                      (+ (- (nth 3 bb) (nth 1 bb))
+                         margin))))
+    (apply 'pdf-view-set-slice
+           (append slice (and window (list window))))))
+
+(defun pdf-view-reset-slice (&optional window)
+  "Reset the current slice and redisplay WINDOW.
+
+WINDOW defaults to `selected-window' if not provided.
+
+After calling this function the whole page will be visible
+again."
+  (interactive)
+  (when (pdf-view-current-slice window)
+    (setf (pdf-view-current-slice window) nil)
+    (pdf-view-redisplay window))
+  nil)
+
+(define-minor-mode pdf-view-auto-slice-minor-mode
+  "Automatically slice pages according to their bounding boxes.
+
+See also `pdf-view-set-slice-from-bounding-box'."
+  :group 'pdf-view
+  (pdf-util-assert-pdf-buffer)
+  (cond
+   (pdf-view-auto-slice-minor-mode
+    (dolist (win (get-buffer-window-list nil nil t))
+      (when (pdf-util-pdf-window-p win)
+        (pdf-view-set-slice-from-bounding-box win)))
+    (add-hook 'pdf-view-change-page-hook
+              'pdf-view-set-slice-from-bounding-box nil t))
+   (t
+    (progn (remove-hook 'pdf-view-change-page-hook
+                        'pdf-view-set-slice-from-bounding-box t)
+           (pdf-view-reset-slice)))))
+
+
+;; * ================================================================== *
+;; * Display
+;; * ================================================================== *
+
+(defun pdf-view-image-type ()
+  "Return the image type that should be used.
+
+The return value is either `imagemagick' (if available and wanted
+or if png is not available) or `png'.
+
+Signal an error, if neither `imagemagick' nor `png' is available.
+
+See also `pdf-view-use-imagemagick'."
+  (cond ((and pdf-view-use-imagemagick
+              (fboundp 'imagemagick-types))
+         'imagemagick)
+        ((image-type-available-p 'image-io)
+         'image-io)
+        ((image-type-available-p 'png)
+         'png)
+        ((fboundp 'imagemagick-types)
+         'imagemagick)
+        (t
+         (error "PNG image supported not compiled into Emacs"))))
+
+(defmacro pdf-view-create-image (data &rest props)
+  ;; TODO: add DATA and PROPS to docstring.
+  "Like `create-image', but with set DATA-P and TYPE arguments."
+  (declare (indent 1) (debug t))
+  (let ((image-data (make-symbol "data")))
+    `(let ((,image-data ,data))
+       (apply #'create-image ,image-data (pdf-view-image-type) t ,@props
+              (cl-list*
+               :relief (or pdf-view-image-relief 0)
+               (when (and (eq (framep-on-display) 'mac)
+                          (= (pdf-util-frame-scale-factor) 2))
+                 (list :data-2x ,image-data)))))))
+
+(defun pdf-view-create-page (page &optional window)
+  "Create an image of PAGE for display on WINDOW."
+  (let* ((size (pdf-view-desired-image-size page window))
+         (data (pdf-cache-renderpage
+                page (car size)
+                (if pdf-view-use-scaling
+                    (* 2 (car size))
+                  (car size))))
+         (hotspots (pdf-view-apply-hotspot-functions
+                    window page size)))
+    (pdf-view-create-image data
+      :width (car size)
+      :rotation (or pdf-view--current-rotation 0)
+      :map hotspots
+      :pointer 'arrow)))
+
+(defun pdf-view-image-size (&optional displayed-p window)
+  ;; TODO: add WINDOW to docstring.
+  "Return the size in pixel of the current image.
+
+If DISPLAYED-P is non-nil, return the size of the displayed
+image.  These values may be different, if slicing is used."
+  (if displayed-p
+      (with-selected-window (or window (selected-window))
+        (image-display-size
+         (image-get-display-property) t))
+    (image-size (pdf-view-current-image window) t)))
+
+(defun pdf-view-image-offset (&optional window)
+  ;; TODO: add WINDOW to docstring.
+  "Return the offset of the current image.
+
+It is equal to \(LEFT . TOP\) of the current slice in pixel."
+  (let* ((slice (pdf-view-current-slice window)))
+    (cond
+     (slice
+      (pdf-util-scale-relative-to-pixel
+       (cons (nth 0 slice) (nth 1 slice))
+       window))
+     (t
+      (cons 0 0)))))
+
+(defun pdf-view-display-page (page &optional window)
+  "Display page PAGE in WINDOW."
+  (setf (pdf-view-window-needs-redisplay window) nil)
+  (pdf-view-display-image
+   (pdf-view-create-page page window)
+   window))
+
+(defun pdf-view-display-image (image &optional window inhibit-slice-p)
+  ;; TODO: write documentation!
+  (let ((ol (pdf-view-current-overlay window)))
+    (when (window-live-p (overlay-get ol 'window))
+      (let* ((size (image-size image t))
+             (slice (if (not inhibit-slice-p)
+                        (pdf-view-current-slice window)))
+             (displayed-width (floor
+                               (if slice
+                                   (* (nth 2 slice)
+                                      (car (image-size image)))
+                                 (car (image-size image))))))
+        (setf (pdf-view-current-image window) image)
+        (move-overlay ol (point-min) (point-max))
+        ;; In case the window is wider than the image, center the image
+        ;; horizontally.
+        (overlay-put ol 'before-string
+                     (when (> (window-width window)
+                              displayed-width)
+                       (propertize " " 'display
+                                   `(space :align-to
+                                           ,(/ (- (window-width window)
+                                                  displayed-width) 2)))))
+        (overlay-put ol 'display
+                     (if slice
+                         (list (cons 'slice
+                                     (pdf-util-scale slice size 'round))
+                               image)
+                       image))
+        (let* ((win (overlay-get ol 'window))
+               (hscroll (image-mode-window-get 'hscroll win))
+               (vscroll (image-mode-window-get 'vscroll win)))
+          ;; Reset scroll settings, in case they were changed.
+          (if hscroll (set-window-hscroll win hscroll))
+          (if vscroll (set-window-vscroll
+                       win vscroll pdf-view-have-image-mode-pixel-vscroll)))))))
+
+(defun pdf-view-redisplay (&optional window)
+  "Redisplay page in WINDOW.
+
+If WINDOW is t, redisplay pages in all windows."
+  (unless pdf-view-inhibit-redisplay
+    (if (not (eq t window))
+        (pdf-view-display-page
+         (pdf-view-current-page window)
+         window)
+      (dolist (win (get-buffer-window-list nil nil t))
+        (pdf-view-display-page
+         (pdf-view-current-page win)
+         win))
+      (when (consp image-mode-winprops-alist)
+        (dolist (window (mapcar #'car image-mode-winprops-alist))
+          (unless (or (not (window-live-p window))
+                      (eq (current-buffer)
+                          (window-buffer window)))
+            (setf (pdf-view-window-needs-redisplay window) t)))))
+    (force-mode-line-update)))
+
+(defun pdf-view-redisplay-pages (&rest pages)
+  "Redisplay PAGES in all windows."
+  (pdf-util-assert-pdf-buffer)
+  (dolist (window (get-buffer-window-list nil nil t))
+    (when (memq (pdf-view-current-page window)
+                pages)
+      (pdf-view-redisplay window))))
+
+(defun pdf-view-maybe-redisplay-resized-windows ()
+  "Redisplay some windows needing redisplay."
+  (unless (or (numberp pdf-view-display-size)
+              (pdf-view-active-region-p)
+              (> (minibuffer-depth) 0))
+    (dolist (window (get-buffer-window-list nil nil t))
+      (let ((stored (pdf-view-current-window-size window))
+            (size (cons (window-width window)
+                        (window-height window))))
+        (unless (equal size stored)
+          (setf (pdf-view-current-window-size window) size)
+          (unless (or (null stored)
+                      (and (eq pdf-view-display-size 'fit-width)
+                           (eq (car size) (car stored)))
+                      (and (eq pdf-view-display-size 'fit-height)
+                           (eq (cdr size) (cdr stored))))
+            (pdf-view-redisplay window)))))))
+
+(defun pdf-view-redisplay-some-windows ()
+  (pdf-view-maybe-redisplay-resized-windows)
+  (dolist (window (get-buffer-window-list nil nil t))
+    (when (pdf-view-window-needs-redisplay window)
+      (pdf-view-redisplay window))))
+
+(defun pdf-view-new-window-function (winprops)
+  ;; TODO: write documentation!
+  ;; (message "New window %s for buf %s" (car winprops) (current-buffer))
+  (cl-assert (or (eq t (car winprops))
+                 (eq (window-buffer (car winprops)) (current-buffer))))
+  (let ((ol (image-mode-window-get 'overlay winprops)))
+    (if ol
+        (progn
+          (setq ol (copy-overlay ol))
+          ;; `ol' might actually be dead.
+          (move-overlay ol (point-min) (point-max)))
+      (setq ol (make-overlay (point-min) (point-max) nil t))
+      (overlay-put ol 'pdf-view t))
+    (overlay-put ol 'window (car winprops))
+    (unless (windowp (car winprops))
+      ;; It's a pseudo entry.  Let's make sure it's not displayed (the
+      ;; `window' property is only effective if its value is a window).
+      (cl-assert (eq t (car winprops)))
+      (delete-overlay ol))
+    (image-mode-window-put 'overlay ol winprops)
+    ;; Clean up some overlays.
+    (dolist (ov (overlays-in (point-min) (point-max)))
+      (when (and (windowp (overlay-get ov 'window))
+                 (not (window-live-p (overlay-get ov 'window))))
+        (delete-overlay ov)))
+    (when (and (windowp (car winprops))
+               (null (image-mode-window-get 'image winprops)))
+      ;; We're not displaying an image yet, so let's do so.  This
+      ;; happens when the buffer is displayed for the first time.
+      (with-selected-window (car winprops)
+        (pdf-view-goto-page
+         (or (image-mode-window-get 'page t) 1))))))
+
+(defun pdf-view-desired-image-size (&optional page window)
+  ;; TODO: write documentation!
+  (let* ((pagesize (pdf-cache-pagesize
+                    (or page (pdf-view-current-page window))))
+         (slice (pdf-view-current-slice window))
+         (width-scale (/ (/ (float (window-body-width window t))
+                            (or (nth 2 slice) 1.0))
+                         (float (car pagesize))))
+         (height (- (nth 3 (window-inside-pixel-edges window))
+                    (nth 1 (window-inside-pixel-edges window))
+                    1))
+         (height-scale (/ (/ (float height)
+                             (or (nth 3 slice) 1.0))
+                          (float (cdr pagesize))))
+         (scale width-scale))
+    (if (numberp pdf-view-display-size)
+        (setq scale (float pdf-view-display-size))
+      (cl-case pdf-view-display-size
+        (fit-page
+         (setq scale (min height-scale width-scale)))
+        (fit-height
+         (setq scale height-scale))
+        (t
+         (setq scale width-scale))))
+    (let ((width (floor (* (car pagesize) scale)))
+          (height (floor (* (cdr pagesize) scale))))
+      (when (> width (max 1 (or pdf-view-max-image-width width)))
+        (setq width pdf-view-max-image-width
+              height (* height (/ (float pdf-view-max-image-width) width))))
+      (cons (max 1 width) (max 1 height)))))
+
+(defun pdf-view-text-regions-hotspots-function (page size)
+  "Return a list of hotspots for text regions on PAGE using SIZE.
+
+This will display a text cursor, when hovering over them."
+  (local-set-key [pdf-view-text-region t]
+                 'pdf-util-image-map-mouse-event-proxy)
+  (mapcar (lambda (region)
+            (let ((e (pdf-util-scale region size 'round)))
+              `((rect . ((,(nth 0 e) . ,(nth 1 e))
+                         . (,(nth 2 e) . ,(nth 3 e))))
+                pdf-view-text-region
+                (pointer text))))
+          (pdf-cache-textregions page)))
+
+(define-minor-mode pdf-view-dark-minor-mode
+  "Mode for PDF documents with dark background.
+
+This tells the various modes to use their face's dark colors."
+  :group 'pdf-view
+  (pdf-util-assert-pdf-buffer)
+  ;; FIXME: This should really be run in a hook.
+  (when (bound-and-true-p pdf-isearch-active-mode)
+    (with-no-warnings
+      (pdf-isearch-redisplay)
+      (pdf-isearch-message
+       (if pdf-view-dark-minor-mode "dark mode" "light mode")))))
+
+(define-minor-mode pdf-view-printer-minor-mode
+  "Display the PDF as it would be printed."
+  :group 'pdf-view
+  :lighter " Prn"
+  (pdf-util-assert-pdf-buffer)
+  (let ((enable (lambda ()
+                  (pdf-info-setoptions :render/printed t))))
+    (cond
+     (pdf-view-printer-minor-mode
+      (add-hook 'after-save-hook enable nil t)
+      (add-hook 'after-revert-hook enable nil t))
+     (t
+      (remove-hook 'after-save-hook enable t)
+      (remove-hook 'after-revert-hook enable t))))
+  (pdf-info-setoptions :render/printed pdf-view-printer-minor-mode)
+  (pdf-cache-clear-images)
+  (pdf-view-redisplay t))
+
+(define-minor-mode pdf-view-midnight-minor-mode
+  "Apply a color-filter appropriate for past midnight reading.
+
+The colors are determined by the variable
+`pdf-view-midnight-colors', which see. "
+  :group 'pdf-view
+  :lighter " Mid"
+  (pdf-util-assert-pdf-buffer)
+  ;; FIXME: Maybe these options should be passed stateless to pdf-info-renderpage ?
+  (let ((enable (lambda ()
+                  (pdf-info-setoptions
+                   :render/foreground (or (car pdf-view-midnight-colors) "black")
+                   :render/background (or (cdr pdf-view-midnight-colors) "white")
+                   :render/usecolors
+                   (if pdf-view-midnight-invert
+                       ;; If midnight invert is enabled, pass "2" indicating
+                       ;; that :render/foreground and :render/background should
+                       ;; be ignored and to instead invert the PDF (preserving
+                       ;; hue)
+                       2
+                     ;; If invert is not enabled, pass "1" indictating that
+                     ;; :render/foreground and :render/background should be used
+                     1)))))
+    (cond
+     (pdf-view-midnight-minor-mode
+      (add-hook 'after-save-hook enable nil t)
+      (add-hook 'after-revert-hook enable nil t)
+      (funcall enable))
+     (t
+      (remove-hook 'after-save-hook enable t)
+      (remove-hook 'after-revert-hook enable t)
+      (pdf-info-setoptions
+       ;; Value "0" indicates that colors should remain unchanged
+       :render/usecolors 0))))
+  (pdf-cache-clear-images)
+  (pdf-view-redisplay t))
+
+(defun pdf-view-set-theme-background ()
+  "Set the buffer's color filter to correspond to the current Emacs theme."
+  (pdf-util-assert-pdf-buffer)
+  (pdf-info-setoptions
+   :render/foreground (face-foreground 'default nil)
+   :render/background (face-background 'default nil)
+   :render/usecolors 1))
+
+(defun pdf-view-refresh-themed-buffer (&optional get-theme)
+  "Refresh the current buffer to activate applied colors.
+
+When GET-THEME is non-nil, also reset the applied colors to the
+current theme's colors."
+  (pdf-util-assert-pdf-buffer)
+  (pdf-cache-clear-images)
+  (when get-theme
+	(pdf-view-set-theme-background))
+  (pdf-view-redisplay t))
+
+(define-minor-mode pdf-view-themed-minor-mode
+  "Synchronize color filter with the present Emacs theme.
+
+The colors are determined by the `face-foreground' and
+`face-background' of the currently active theme."
+  :group 'pdf-view
+  :lighter " Thm"
+  (pdf-util-assert-pdf-buffer)
+  (cond
+   (pdf-view-themed-minor-mode
+    (add-hook 'after-save-hook #'pdf-view-set-theme-background nil t)
+    (add-hook 'after-revert-hook #'pdf-view-set-theme-background nil t))
+   (t
+    (remove-hook 'after-save-hook #'pdf-view-set-theme-background t)
+    (remove-hook 'after-revert-hook #'pdf-view-set-theme-background t)
+    (pdf-info-setoptions :render/usecolors 0)))
+  (pdf-view-refresh-themed-buffer pdf-view-themed-minor-mode))
+
+(when pdf-view-use-unicode-ligther
+  ;; This check uses an implementation detail, which hopefully gets the
+  ;; right answer.
+  (and (fontp (char-displayable-p ?⎙))
+       (setcdr (assq 'pdf-view-printer-minor-mode minor-mode-alist)
+               (list " ⎙" )))
+  (and (fontp (char-displayable-p ?🌙))
+       (setcdr (assq 'pdf-view-midnight-minor-mode minor-mode-alist)
+               (list  " 🌙" ))))
+
+
+;; * ================================================================== *
+;; * Hotspot handling
+;; * ================================================================== *
+
+(defun pdf-view-add-hotspot-function (fn &optional layer)
+  "Register FN as a hotspot function in the current buffer, using LAYER.
+
+FN will be called in the PDF buffer with the page-number and the
+image size \(WIDTH . HEIGHT\) as arguments.  It should return a
+list of hotspots applicable to the the :map image-property.
+
+LAYER determines the order: Functions in a higher LAYER will
+supersede hotspots in lower ones."
+  (push (cons (or layer 0) fn)
+        pdf-view--hotspot-functions))
+
+(defun pdf-view-remove-hotspot-function (fn)
+  "Unregister FN as a hotspot function in the current buffer."
+  (setq pdf-view--hotspot-functions
+        (cl-remove fn pdf-view--hotspot-functions
+                   :key 'cdr)))
+
+(defun pdf-view-sorted-hotspot-functions ()
+  ;; TODO: write documentation!
+  (mapcar 'cdr (cl-sort (copy-sequence pdf-view--hotspot-functions)
+                        '> :key 'car)))
+
+(defun pdf-view-apply-hotspot-functions (window page image-size)
+  ;; TODO: write documentation!
+  (unless pdf-view-inhibit-hotspots
+    (save-selected-window
+      (when window (select-window window 'norecord))
+      (apply 'nconc
+             (mapcar (lambda (fn)
+                       (funcall fn page image-size))
+                     (pdf-view-sorted-hotspot-functions))))))
+
+
+;; * ================================================================== *
+;; * Region
+;; * ================================================================== *
+
+(defun pdf-view--push-mark ()
+  ;; TODO: write documentation!
+  (let (mark-ring)
+    (push-mark-command nil))
+  (setq deactivate-mark nil))
+
+(defun pdf-view-active-region (&optional deactivate-p)
+  "Return the active region, a list of edges.
+
+Deactivate the region if DEACTIVATE-P is non-nil."
+  (pdf-view-assert-active-region)
+  (prog1
+      pdf-view-active-region
+    (when deactivate-p
+      (pdf-view-deactivate-region))))
+
+(defun pdf-view-deactivate-region ()
+  "Deactivate the region."
+  (interactive)
+  (when pdf-view-active-region
+    (setq pdf-view-active-region nil)
+    (deactivate-mark)
+    (pdf-view-redisplay t)))
+
+(defun pdf-view-mouse-set-region (event &optional allow-extend-p
+                                        rectangle-p
+                                        selection-style)
+  "Select a region of text using the mouse with mouse event EVENT.
+
+Allow for stacking of regions, if ALLOW-EXTEND-P is non-nil.
+
+Create a rectangular region, if RECTANGLE-P is non-nil.
+
+Overwrite `pdf-view-selection-style' with SELECTION-STYLE,
+which is one of `glyph', `word', or `line'.
+
+Stores the region in `pdf-view-active-region'."
+  (interactive "@e")
+  (setq pdf-view--have-rectangle-region rectangle-p)
+  (unless (and (eventp event)
+               (mouse-event-p event))
+    (signal 'wrong-type-argument (list 'mouse-event-p event)))
+  (unless (and allow-extend-p
+               (or (null (get this-command 'pdf-view-region-window))
+                   (equal (get this-command 'pdf-view-region-window)
+                          (selected-window))))
+    (pdf-view-deactivate-region))
+  (put this-command 'pdf-view-region-window
+       (selected-window))
+  (let* ((window (selected-window))
+         (pos (event-start event))
+         (begin-inside-image-p t)
+         (begin (if (posn-image pos)
+                    (posn-object-x-y pos)
+                  (setq begin-inside-image-p nil)
+                  (posn-x-y pos)))
+         (abs-begin (posn-x-y pos))
+         (selection-style (or selection-style pdf-view-selection-style))
+         pdf-view-continuous
+         region)
+    (when (pdf-util-track-mouse-dragging (event 0.05)
+            (let* ((pos (event-start event))
+                   (end (posn-object-x-y pos))
+                   (end-inside-image-p
+                    (and (eq window (posn-window pos))
+                         (posn-image pos))))
+              (when (or end-inside-image-p
+                        begin-inside-image-p)
+                (cond
+                 ((and end-inside-image-p
+                       (not begin-inside-image-p))
+                  ;; Started selection outside the image, setup begin.
+                  (let* ((xy (posn-x-y pos))
+                         (dxy (cons (- (car xy) (car begin))
+                                    (- (cdr xy) (cdr begin))))
+                         (size (pdf-view-image-size t)))
+                    (setq begin (cons (max 0 (min (car size)
+                                                  (- (car end) (car dxy))))
+                                      (max 0 (min (cdr size)
+                                                  (- (cdr end) (cdr dxy)))))
+                          ;; Store absolute position for later.
+                          abs-begin (cons (- (car xy)
+                                             (- (car end)
+                                                (car begin)))
+                                          (- (cdr xy)
+                                             (- (cdr end)
+                                                (cdr begin))))
+                          begin-inside-image-p t)))
+                 ((and begin-inside-image-p
+                       (not end-inside-image-p))
+                  ;; Moved outside the image, setup end.
+                  (let* ((xy (posn-x-y pos))
+                         (dxy (cons (- (car xy) (car abs-begin))
+                                    (- (cdr xy) (cdr abs-begin))))
+                         (size (pdf-view-image-size t)))
+                    (setq end (cons (max 0 (min (car size)
+                                                (+ (car begin) (car dxy))))
+                                    (max 0 (min (cdr size)
+                                                (+ (cdr begin) (cdr dxy)))))))))
+                (let ((iregion (if rectangle-p
+                                   (list (min (car begin) (car end))
+                                         (min (cdr begin) (cdr end))
+                                         (max (car begin) (car end))
+                                         (max (cdr begin) (cdr end)))
+                                 (list (car begin) (cdr begin)
+                                       (car end) (cdr end)))))
+                  (setq region
+                        (pdf-util-scale-pixel-to-relative iregion))
+                  (pdf-view-display-region
+                   (cons region pdf-view-active-region)
+                   rectangle-p
+                   selection-style)
+                  (pdf-util-scroll-to-edges iregion)))))
+      (setq pdf-view-active-region
+            (append pdf-view-active-region
+                    (list region)))
+      (pdf-view--push-mark))))
+
+(defun pdf-view-mouse-extend-region (event)
+  "Extend the currently active region with mouse event EVENT."
+  (interactive "@e")
+  (pdf-view-mouse-set-region
+   event t pdf-view--have-rectangle-region))
+
+(defun pdf-view-mouse-set-region-rectangle (event)
+  "Like `pdf-view-mouse-set-region' but displays as a rectangle.
+
+EVENT is the mouse event.
+
+This is more useful for commands like
+`pdf-view-extract-region-image'."
+  (interactive "@e")
+  (pdf-view-mouse-set-region event nil t))
+
+(defun pdf-view-display-region (&optional region rectangle-p selection-style)
+  ;; TODO: write documentation!
+  (unless region
+    (pdf-view-assert-active-region)
+    (setq region pdf-view-active-region))
+  (let ((colors (pdf-util-face-colors
+                 (if rectangle-p 'pdf-view-rectangle 'pdf-view-region)
+                 (bound-and-true-p pdf-view-dark-minor-mode)))
+        (page (pdf-view-current-page))
+        (width (car (pdf-view-image-size))))
+    (pdf-view-display-image
+     (pdf-view-create-image
+         (if rectangle-p
+             (pdf-info-renderpage-highlight
+              page width nil
+              `(,(car colors) ,(cdr colors) 0.35 ,@region))
+           (pdf-info-renderpage-text-regions
+            page width nil selection-style nil
+            `(,(car colors) ,(cdr colors) ,@region)))
+       :width width))))
+
+(defun pdf-view-kill-ring-save ()
+  "Copy the region to the `kill-ring'."
+  (interactive)
+  (pdf-view-assert-active-region)
+  (let* ((txt (pdf-view-active-region-text)))
+    (pdf-view-deactivate-region)
+    (kill-new (mapconcat 'identity txt "\n"))))
+
+(defun pdf-view-mark-whole-page ()
+  "Mark the whole page."
+  (interactive)
+  (pdf-view-deactivate-region)
+  (setq pdf-view-active-region
+        (list (list 0 0 1 1)))
+  (pdf-view--push-mark)
+  (pdf-view-display-region))
+
+(defun pdf-view-active-region-text ()
+  "Return the text of the active region as a list of strings."
+  (pdf-view-assert-active-region)
+  (mapcar
+   (lambda (edges)
+     (pdf-info-gettext
+      (pdf-view-current-page)
+      edges
+      pdf-view-selection-style))
+   pdf-view-active-region))
+
+(defun pdf-view-extract-region-image (regions &optional page size
+                                              output-buffer no-display-p)
+  ;; TODO: what is "resp."? Avoid contractions.
+  "Create a PNG image of REGIONS.
+
+REGIONS should have the same form as `pdf-view-active-region',
+which see.  PAGE and SIZE are the page resp. base-size of the
+image from which the image-regions will be created; they default
+to `pdf-view-current-page' resp. `pdf-view-image-size'.
+
+Put the image in OUTPUT-BUFFER, defaulting to \"*PDF region
+image*\" and display it, unless NO-DISPLAY-P is non-nil.
+
+In case of multiple regions, the resulting image is constructed
+by joining them horizontally.  For this operation (and this only)
+the `convert' program is used."
+
+  (interactive
+   (list (if (pdf-view-active-region-p)
+             (pdf-view-active-region t)
+           '((0 0 1 1)))))
+  (unless page
+    (setq page (pdf-view-current-page)))
+  (unless size
+    (setq size (pdf-view-image-size)))
+  (unless output-buffer
+    (setq output-buffer (get-buffer-create "*PDF image*")))
+  (let* ((images (mapcar (lambda (edges)
+                           (let ((file (make-temp-file "pdf-view"))
+                                 (coding-system-for-write 'binary))
+                             (write-region
+                              (pdf-info-renderpage
+                               page (car size)
+                               :crop-to edges)
+                              nil file nil 'no-message)
+                             file))
+                         regions))
+         result)
+    (unwind-protect
+        (progn
+          (if (= (length images) 1)
+              (setq result (car images))
+            (setq result (make-temp-file "pdf-view"))
+            ;; Join the images horizontally with a gap of 10 pixel.
+            (pdf-util-convert
+             "-noop" ;; workaround limitations of this function
+             result
+             :commands `("("
+                         ,@images
+                         "-background" "white"
+                         "-splice" "0x10+0+0"
+                         ")"
+                         "-gravity" "Center"
+                         "-append"
+                         "+gravity"
+                         "-chop" "0x10+0+0")
+             :apply '((0 0 0 0))))
+          (with-current-buffer output-buffer
+            (let ((inhibit-read-only t))
+              (erase-buffer))
+            (set-buffer-multibyte nil)
+            (insert-file-contents-literally result)
+            (image-mode)
+            (unless no-display-p
+              (pop-to-buffer (current-buffer)))))
+      (dolist (f (cons result images))
+        (when (file-exists-p f)
+          (delete-file f))))))
+
+(defun pdf-view-set-selection-style (&optional style)
+  "Set `pdf-view-selection-style' to STYLE in the current buffer.
+
+When called interactively or without an argument, cycle between
+the selection styles."
+  (interactive)
+  (unless style
+    (setq style (or (cadr (memq pdf-view-selection-style '(glyph word line)))
+                    'glyph))
+    (message "Setting selection style to `%s'." style))
+  (pdf-view-deactivate-region)
+  (setq-local pdf-view-selection-style style))
+
+
+;; * ================================================================== *
+;; * Bookmark + Register Integration
+;; * ================================================================== *
+
+(defun pdf-view-bookmark-make-record  (&optional no-page no-slice no-size no-origin)
+  ;; TODO: add NO-PAGE, NO-SLICE, NO-SIZE, NO-ORIGIN to the docstring.
+  "Create a bookmark PDF record.
+
+The optional, boolean args exclude certain attributes."
+  (let ((displayed-p (eq (current-buffer)
+                         (window-buffer))))
+    (cons (buffer-name)
+          (append (bookmark-make-record-default nil t 1)
+                  `(,(unless no-page
+                       (cons 'page (pdf-view-current-page)))
+                    ,(unless no-slice
+                       (cons 'slice (and displayed-p
+                                         (pdf-view-current-slice))))
+                    ,(unless no-size
+                       (cons 'size pdf-view-display-size))
+                    ,(unless no-origin
+                       (cons 'origin
+                             (and displayed-p
+                                  (let ((edges (pdf-util-image-displayed-edges nil t)))
+                                    (pdf-util-scale-pixel-to-relative
+                                     (cons (car edges) (cadr edges)) nil t)))))
+                    (handler . pdf-view-bookmark-jump-handler))))))
+
+;;;###autoload
+(defun pdf-view-bookmark-jump-handler (bmk)
+  "The bookmark handler-function interface for bookmark BMK.
+
+See also `pdf-view-bookmark-make-record'."
+  (let ((page (bookmark-prop-get bmk 'page))
+        (slice (bookmark-prop-get bmk 'slice))
+        (size (bookmark-prop-get bmk 'size))
+        (origin (bookmark-prop-get bmk 'origin))
+        (file (bookmark-prop-get bmk 'filename))
+        (show-fn-sym (make-symbol "pdf-view-bookmark-after-jump-hook")))
+    (fset show-fn-sym
+          (lambda ()
+            (remove-hook 'bookmark-after-jump-hook show-fn-sym)
+            (unless (derived-mode-p 'pdf-view-mode)
+              (pdf-view-mode))
+            (with-selected-window
+                (or (get-buffer-window (current-buffer) 0)
+                    (selected-window))
+              (when size
+                (setq-local pdf-view-display-size size))
+              (when slice
+                (apply 'pdf-view-set-slice slice))
+              (when (numberp page)
+                (pdf-view-goto-page page))
+              (when origin
+                (let ((size (pdf-view-image-size t)))
+                  (image-set-window-hscroll
+                   (round (/ (* (car origin) (car size))
+                             (frame-char-width))))
+                  (image-set-window-vscroll
+                   (round (/ (* (cdr origin) (cdr size))
+                             (if pdf-view-have-image-mode-pixel-vscroll
+                                 1
+                               (frame-char-height))))))))))
+    (add-hook 'bookmark-after-jump-hook show-fn-sym)
+    (set-buffer (or (find-buffer-visiting file)
+                    (find-file-noselect file)))))
+
+(defun pdf-view-bookmark-jump (bmk)
+  "Switch to bookmark BMK.
+
+This function is like `bookmark-jump', but it always uses the
+selected window for display and does not run any hooks.  Also, it
+works only with bookmarks created by
+`pdf-view-bookmark-make-record'."
+
+  (let* ((file (bookmark-prop-get bmk 'filename))
+         (buffer (or (find-buffer-visiting file)
+                     (find-file-noselect file))))
+    (switch-to-buffer buffer)
+    (let (bookmark-after-jump-hook)
+      (pdf-view-bookmark-jump-handler bmk)
+      (run-hooks 'bookmark-after-jump-hook))))
+
+(defun pdf-view-registerv-make ()
+  "Create a PDF register entry of the current position."
+  (registerv-make
+   (pdf-view-bookmark-make-record nil t t)
+   :print-func 'pdf-view-registerv-print-func
+   :jump-func 'pdf-view-bookmark-jump
+   :insert-func (lambda (bmk)
+                  (insert (format "%S" bmk)))))
+
+(defun pdf-view-registerv-print-func (bmk)
+  "Print a textual representation of bookmark BMK.
+
+This function is used as the `:print-func' property with
+`registerv-make'."
+  (let* ((file (bookmark-prop-get bmk 'filename))
+         (buffer (find-buffer-visiting file))
+         (page (bookmark-prop-get bmk 'page))
+         (origin (bookmark-prop-get bmk 'origin)))
+    (princ (format "PDF position: %s, page %d, %d%%"
+                   (if buffer
+                       (buffer-name buffer)
+                     file)
+                   (or page 1)
+                   (if origin
+                       (round (* 100 (cdr origin)))
+                     0)))))
+
+(defmacro pdf-view-with-register-alist (&rest body)
+  "Setup the proper binding for `register-alist' in BODY.
+
+This macro may not work as desired when it is nested.  See also
+`pdf-view-use-dedicated-register'."
+  (declare (debug t) (indent 0))
+  (let ((dedicated-p (make-symbol "dedicated-p")))
+    `(let* ((,dedicated-p pdf-view-use-dedicated-register)
+            (register-alist
+             (if ,dedicated-p
+                 pdf-view-register-alist
+               register-alist)))
+       (unwind-protect
+           (progn ,@body)
+         (when ,dedicated-p
+           (setq pdf-view-register-alist register-alist))))))
+
+(defun pdf-view-position-to-register (register)
+  "Store current PDF position in register REGISTER.
+
+See also `point-to-register'."
+  (interactive
+   (list (pdf-view-with-register-alist
+           (register-read-with-preview "Position to register: "))))
+  (pdf-view-with-register-alist
+    (set-register register (pdf-view-registerv-make))))
+
+(defun pdf-view-jump-to-register (register &optional delete return-register)
+  ;; TODO: add RETURN-REGISTER to the docstring.
+  "Move point to a position stored in a REGISTER.
+
+Optional parameter DELETE is defined as in `jump-to-register'."
+  (interactive
+   (pdf-view-with-register-alist
+     (list
+      (register-read-with-preview "Jump to register: ")
+      current-prefix-arg
+      (and (or pdf-view-use-dedicated-register
+               (local-variable-p 'register-alist))
+           (characterp last-command-event)
+           last-command-event))))
+  (pdf-view-with-register-alist
+    (let ((return-pos (and return-register
+                           (pdf-view-registerv-make))))
+      (jump-to-register register delete)
+      (when return-register
+        (set-register return-register return-pos)))))
+
+(provide 'pdf-view)
+
+;;; pdf-view.el ends here
diff --git a/emacs/elpa/pdf-tools-20240429.407/pdf-view.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-view.elc
Binary files differ.
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-virtual.el b/emacs/elpa/pdf-tools-20240429.407/pdf-virtual.el
diff --git a/emacs/elpa/pdf-tools-20240411.1703/pdf-virtual.elc b/emacs/elpa/pdf-tools-20240429.407/pdf-virtual.elc
Binary files differ.
diff --git a/emacs/elpa/transient-20240421.1737/transient-pkg.el b/emacs/elpa/transient-20240421.1737/transient-pkg.el
@@ -1,16 +0,0 @@
-(define-package "transient" "20240421.1737" "Transient commands"
-  '((emacs "26.1")
-    (compat "29.1.4.4")
-    (seq "2.24"))
-  :commit "2dd0102ec3df901d421fc338e5c768467cc54ecf" :authors
-  '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
-  :maintainers
-  '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
-  :maintainer
-  '("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")
-  :keywords
-  '("extensions")
-  :url "https://github.com/magit/transient")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/transient-20240421.1737/transient.el b/emacs/elpa/transient-20240421.1737/transient.el
@@ -1,4490 +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: 0.6.0
-;; Package-Requires: ((emacs "26.1") (compat "29.1.4.4") (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' 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 static-if (condition then-form &rest else-forms)
-  "A conditional compilation macro.
-Evaluate CONDITION at macro-expansion time.  If it is non-nil,
-expand the macro to THEN-FORM.  Otherwise expand it to ELSE-FORMS
-enclosed in a `progn' form.  ELSE-FORMS may be empty."
-  (declare (indent 2)
-           (debug (sexp sexp &rest sexp)))
-  (if (eval condition lexical-binding)
-      then-form
-    (cons 'progn else-forms)))
-
-(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)
-    (window-parameters (no-other-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)
-    (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
-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.3.0")
-  :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."))
-  "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)
-   (inapt-face  :initarg :inapt-face  :initform 'transient-inapt-suffix)
-   (inapt                             :initform nil)
-   (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."))
-  "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.")
-
-;;;; 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)))
-    `(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)))
-    `(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-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 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)
-
-(defun transient--find-function-advised-original (fn func)
-  "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)))
-(advice-add 'find-function-advised-original :around
-            #'transient--find-function-advised-original)
-
-(eval-and-compile
-  (defun transient--expand-define-args (args &optional arglist nobody)
-    (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 "transient-define-infix: No function body allowed"))
-       ((not (eq (car-safe (nth (if declare 1 0) args)) 'interactive))
-        (error "transient-define-*: Interactive form missing")))
-      (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, `:info' or `:info*', got `%s'" car))
-       ((symbolp car)
-        (setq args (plist-put args :command (macroexp-quote pop))))
-       ((and (commandp car)
-             (not (stringp car)))
-        (let ((cmd pop)
-              (sym (intern
-                    (format "transient:%s:%s"
-                            prefix
-                            (let ((desc (plist-get args :description)))
-                              (if (and (stringp desc)
-                                       (length< desc 16))
-                                  desc
-                                (plist-get args :key)))))))
-          (setq args (plist-put
-                      args :command
-                      `(prog1 ',sym
-                         (put ',sym 'interactive-only t)
-                         (put ',sym 'completion-predicate #'transient--suffix-only)
-                         (defalias ',sym
-                           ,(if (eq (car-safe cmd) 'lambda)
-                                cmd
-                              (macroexp-quote 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))
-                (t
-                 (setq class 'transient-option)))))
-       (t
-        (error "Needed command or argument, 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)))))))
-    (unless (plist-get args :key)
-      (when-let ((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))))
-
-(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))
-    (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--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-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-keymap transient-map
-  :doc "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'."
-  :parent transient-base-map
-  "C-u"   #'universal-argument
-  "C--"   #'negative-argument
-  "C-t"   #'transient-show
-  "?"     #'transient-help
-  "C-h"   #'transient-help
-  ;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
-  "C-M-p" #'transient-history-prev
-  "C-M-n" #'transient-history-next)
-
-(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))))))))
-
-(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
-  "<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))
-               (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)
-  (cl-etypecase spec
-    (vector  (transient--init-group  levels spec))
-    (list    (transient--init-suffix levels spec))
-    (string  (list spec))))
-
-(defun transient--init-group (levels spec)
-  (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))
-               (suffixes (cl-mapcan (lambda (c) (transient--init-child levels c))
-                                    (transient-setup-children obj children))))
-      (progn ; work around debbugs#31840
-        (oset obj suffixes suffixes)
-        (list obj)))))
-
-(defun transient--init-suffix (levels spec)
-  (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 (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)
-    (unless (slot-boundp obj 'shortarg)
-      (when-let ((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)
-  (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 ((remain-in-minibuffer-window
-           (and (minibuffer-selected-window)
-                (selected-window))))
-      ;; Only delete the window if it has never shown another buffer.
-      (unless (eq (car (window-parameter transient--window 'quit-restore))
-                  'other)
-        (with-demoted-errors "Error while exiting transient: %S"
-          (delete-window transient--window)))
-      (when-let ((buffer (get-buffer transient--buffer-name)))
-        (kill-buffer buffer))
-      (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)))
-
-(static-if (>= emacs-major-version 30) ;transient--wrap-command
-    (defun transient--wrap-command ()
-      (cl-assert
-       (>= emacs-major-version 30) nil
-       "Emacs was downgraded, making it necessary to recompile Transient")
-      (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))))))
-
-  (defun transient--wrap-command ()
-    (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)))))))
-
-(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))
-  (setq transient-current-prefix nil)
-  (setq transient-current-command nil)
-  (setq transient-current-suffixes nil)
-  (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)
-                            (get-buffer transient--buffer-name)))))
-        (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
-                   (or (and (symbolp this-command) this-command)
-                       (if (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))))
-
-;;;; 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 (mapconcat #'identity 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)))))
-
-(cl-defgeneric transient-set-value (obj)
-  "Set the value of the transient prefix OBJ.")
-
-(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)))
-               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))
-        (buf (get-buffer-create transient--buffer-name))
-        (focus nil))
-    (with-current-buffer buf
-      (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 buf transient-display-buffer-action)))
-    (when (window-live-p transient--window)
-      (with-selected-window transient--window
-        (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, temporarly 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))
-        group)
-    (while (setq 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))
-  (transient--maybe-pad-keys group)
-  (dolist (suffix (oref group suffixes))
-    (let ((str (transient-with-shadowed-buffer (transient-format suffix))))
-      (insert str)
-      (unless (string-match-p ".\n\\'" str)
-        (insert ?\n)))))
-
-(cl-defmethod transient--insert-group ((group transient-columns))
-  (let* ((columns
-          (mapcar
-           (lambda (column)
-             (transient--maybe-pad-keys column group)
-             (transient-with-shadowed-buffer
-               (let* ((transient--pending-group column)
-                      (rows (mapcar #'transient-format (oref column suffixes))))
-                 (when-let ((desc (transient-format-description column)))
-                   (push desc rows))
-                 (flatten-tree rows))))
-           (oref group suffixes)))
-         (vp (or (oref transient--prefix variable-pitch)
-                 transient-align-variable-pitch))
-         (rs (apply #'max (mapcar #'length columns)))
-         (cs (length columns))
-         (cw (mapcar (let ((widths (oref transient--prefix column-widths)))
-                       (lambda (col)
-                         (apply
-                          #'max
-                          (if-let ((min (pop widths)))
-                              (if vp (* min (transient--pixel-width " ")) min)
-                            0)
-                          (mapcar (if vp #'transient--pixel-width #'length)
-                                  col))))
-                     columns))
-         (cc (transient--seq-reductions-from
-              (apply-partially #'+ (* 3 (if vp (transient--pixel-width " ") 1)))
-              cw 0)))
-    (if transient-force-single-column
-        (dotimes (c cs)
-          (dotimes (r rs)
-            (when-let ((cell (nth r (nth c columns))))
-              (unless (equal cell "")
-                (insert cell ?\n))))
-          (unless (= c (1- cs))
-            (insert ?\n)))
-      (dotimes (r rs)
-        (dotimes (c cs)
-          (if vp
-              (progn
-                (when-let ((cell (nth r (nth c columns))))
-                  (insert cell))
-                (if (= c (1- cs))
-                    (insert ?\n)
-                  (insert (propertize " " 'display
-                                      `(space :align-to (,(nth (1+ c) cc)))))))
-            (when (> c 0)
-              (insert (make-string (max 1 (- (nth c cc) (current-column)))
-                                   ?\s)))
-            (when-let ((cell (nth r (nth c columns))))
-              (insert cell))
-            (when (= c (1- cs))
-              (insert ?\n))))))))
-
-(cl-defmethod transient--insert-group ((group transient-subgroups))
-  (let* ((subgroups (oref group suffixes))
-         (n (length subgroups)))
-    (dotimes (s n)
-      (let ((subgroup (nth s subgroups)))
-        (transient--maybe-pad-keys subgroup group)
-        (transient--insert-group subgroup)
-        (when (< s (1- n))
-          (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-child))
-  "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."
-  (and-let* ((desc (oref obj description))
-             (desc (if (functionp desc)
-                       (if (= (car (transient--func-arity desc)) 1)
-                           (funcall desc obj)
-                         (funcall desc))
-                     desc)))
-    (if-let* ((face (transient--get-face obj 'face)))
-        (transient--add-face desc face t)
-      desc)))
-
-(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 (cl-call-next-method obj)))
-    (if (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))
-                  (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))))))
-
-(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--get-face (obj slot)
-  (and-let* (((slot-exists-p obj slot))
-             ((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--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 (cons (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-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))
-
-(defun transient--describe-function (fn)
-  (describe-function fn)
-  (unless (derived-mode-p 'help-mode)
-    (when-let* ((buf (get-buffer "*Help*"))
-                (win (or (and buf (get-buffer-window buf))
-                         (cl-find-if (lambda (win)
-                                       (with-current-buffer (window-buffer win)
-                                         (derived-mode-p 'help-mode)))
-                                     (window-list)))))
-      (select-window win))))
-
-(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)))
-
-;;; 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-20240421.1737/transient.elc b/emacs/elpa/transient-20240421.1737/transient.elc
Binary files differ.
diff --git a/emacs/elpa/transient-20240421.1737/dir b/emacs/elpa/transient-20240509.1849/dir
diff --git a/emacs/elpa/transient-20240421.1737/gpl.info b/emacs/elpa/transient-20240509.1849/gpl.info
diff --git a/emacs/elpa/transient-20240421.1737/transient-autoloads.el b/emacs/elpa/transient-20240509.1849/transient-autoloads.el
diff --git a/emacs/elpa/transient-20240509.1849/transient-pkg.el b/emacs/elpa/transient-20240509.1849/transient-pkg.el
@@ -0,0 +1,16 @@
+(define-package "transient" "20240509.1849" "Transient commands"
+  '((emacs "26.1")
+    (compat "29.1.4.4")
+    (seq "2.24"))
+  :commit "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e" :authors
+  '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
+  :maintainers
+  '(("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev"))
+  :maintainer
+  '("Jonas Bernoulli" . "emacs.transient@jonas.bernoulli.dev")
+  :keywords
+  '("extensions")
+  :url "https://github.com/magit/transient")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/transient-20240509.1849/transient.el b/emacs/elpa/transient-20240509.1849/transient.el
@@ -0,0 +1,4503 @@
+;;; 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: 0.6.0
+;; Package-Requires: ((emacs "26.1") (compat "29.1.4.4") (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' 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 static-if (condition then-form &rest else-forms)
+  "A conditional compilation macro.
+Evaluate CONDITION at macro-expansion time.  If it is non-nil,
+expand the macro to THEN-FORM.  Otherwise expand it to ELSE-FORMS
+enclosed in a `progn' form.  ELSE-FORMS may be empty."
+  (declare (indent 2)
+           (debug (sexp sexp &rest sexp)))
+  (if (eval condition lexical-binding)
+      then-form
+    (cons 'progn else-forms)))
+
+(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)
+    (window-parameters (no-other-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)
+    (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
+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.3.0")
+  :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.")
+
+;;;; 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)))
+    `(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)))
+    `(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-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 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)
+
+(defun transient--find-function-advised-original (fn func)
+  "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)))
+(advice-add 'find-function-advised-original :around
+            #'transient--find-function-advised-original)
+
+(eval-and-compile
+  (defun transient--expand-define-args (args &optional arglist nobody)
+    (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 "transient-define-infix: No function body allowed"))
+       ((not (eq (car-safe (nth (if declare 1 0) args)) 'interactive))
+        (error "transient-define-*: Interactive form missing")))
+      (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, `:info' or `:info*', got `%s'" car))
+       ((symbolp car)
+        (setq args (plist-put args :command (macroexp-quote pop))))
+       ((and (commandp car)
+             (not (stringp car)))
+        (let ((cmd pop)
+              (sym (intern
+                    (format "transient:%s:%s"
+                            prefix
+                            (let ((desc (plist-get args :description)))
+                              (if (and (stringp desc)
+                                       (length< desc 16))
+                                  desc
+                                (plist-get args :key)))))))
+          (setq args (plist-put
+                      args :command
+                      `(prog1 ',sym
+                         (put ',sym 'interactive-only t)
+                         (put ',sym 'completion-predicate #'transient--suffix-only)
+                         (defalias ',sym
+                           ,(if (eq (car-safe cmd) 'lambda)
+                                cmd
+                              (macroexp-quote 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))
+                (t
+                 (setq class 'transient-option)))))
+       (t
+        (error "Needed command or argument, 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)))))))
+    (unless (plist-get args :key)
+      (when-let ((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--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-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-keymap transient-map
+  :doc "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'."
+  :parent transient-base-map
+  "C-u"   #'universal-argument
+  "C--"   #'negative-argument
+  "C-t"   #'transient-show
+  "?"     #'transient-help
+  "C-h"   #'transient-help
+  ;; Also bound to "C-x p" and "C-x n" in transient-common-commands.
+  "C-M-p" #'transient-history-prev
+  "C-M-n" #'transient-history-next)
+
+(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
+  "<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)
+    (unless (slot-boundp obj 'shortarg)
+      (when-let ((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)
+  (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 ((remain-in-minibuffer-window
+           (and (minibuffer-selected-window)
+                (selected-window))))
+      ;; Only delete the window if it has never shown another buffer.
+      (unless (eq (car (window-parameter transient--window 'quit-restore))
+                  'other)
+        (with-demoted-errors "Error while exiting transient: %S"
+          (delete-window transient--window)))
+      (when-let ((buffer (get-buffer transient--buffer-name)))
+        (kill-buffer buffer))
+      (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)))
+
+(static-if (>= emacs-major-version 30) ;transient--wrap-command
+    (defun transient--wrap-command ()
+      (cl-assert
+       (>= emacs-major-version 30) nil
+       "Emacs was downgraded, making it necessary to recompile Transient")
+      (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))))))
+
+  (defun transient--wrap-command ()
+    (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)))))))
+
+(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))
+  (setq transient-current-prefix nil)
+  (setq transient-current-command nil)
+  (setq transient-current-suffixes nil)
+  (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)
+                            (get-buffer transient--buffer-name)))))
+        (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))))
+
+;;;; 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 (mapconcat #'identity 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)))))
+
+(cl-defgeneric transient-set-value (obj)
+  "Set the value of the transient prefix OBJ.")
+
+(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)))
+               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))
+        (buf (get-buffer-create transient--buffer-name))
+        (focus nil))
+    (with-current-buffer buf
+      (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 buf transient-display-buffer-action)))
+    (when (window-live-p transient--window)
+      (with-selected-window transient--window
+        (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, temporarly 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))
+  (transient--maybe-pad-keys group)
+  (dolist (suffix (oref group suffixes))
+    (let ((str (transient-with-shadowed-buffer (transient-format suffix))))
+      (insert str)
+      (unless (string-match-p ".\n\\'" str)
+        (insert ?\n)))))
+
+(cl-defmethod transient--insert-group ((group transient-columns))
+  (let* ((columns
+          (mapcar
+           (lambda (column)
+             (transient--maybe-pad-keys column group)
+             (transient-with-shadowed-buffer
+               (let* ((transient--pending-group column)
+                      (rows (mapcar #'transient-format (oref column suffixes))))
+                 (when-let ((desc (transient-format-description column)))
+                   (push desc rows))
+                 (flatten-tree rows))))
+           (oref group suffixes)))
+         (vp (or (oref transient--prefix variable-pitch)
+                 transient-align-variable-pitch))
+         (rs (apply #'max (mapcar #'length columns)))
+         (cs (length columns))
+         (cw (mapcar (let ((widths (oref transient--prefix column-widths)))
+                       (lambda (col)
+                         (apply
+                          #'max
+                          (if-let ((min (pop widths)))
+                              (if vp (* min (transient--pixel-width " ")) min)
+                            0)
+                          (mapcar (if vp #'transient--pixel-width #'length)
+                                  col))))
+                     columns))
+         (cc (transient--seq-reductions-from
+              (apply-partially #'+ (* 3 (if vp (transient--pixel-width " ") 1)))
+              cw 0)))
+    (if transient-force-single-column
+        (dotimes (c cs)
+          (dotimes (r rs)
+            (when-let ((cell (nth r (nth c columns))))
+              (unless (equal cell "")
+                (insert cell ?\n))))
+          (unless (= c (1- cs))
+            (insert ?\n)))
+      (dotimes (r rs)
+        (dotimes (c cs)
+          (if vp
+              (progn
+                (when-let ((cell (nth r (nth c columns))))
+                  (insert cell))
+                (if (= c (1- cs))
+                    (insert ?\n)
+                  (insert (propertize " " 'display
+                                      `(space :align-to (,(nth (1+ c) cc)))))))
+            (when (> c 0)
+              (insert (make-string (max 1 (- (nth c cc) (current-column)))
+                                   ?\s)))
+            (when-let ((cell (nth r (nth c columns))))
+              (insert cell))
+            (when (= c (1- cs))
+              (insert ?\n))))))))
+
+(cl-defmethod transient--insert-group ((group transient-subgroups))
+  (let* ((subgroups (oref group suffixes))
+         (n (length subgroups)))
+    (dotimes (s n)
+      (let ((subgroup (nth s subgroups)))
+        (transient--maybe-pad-keys subgroup group)
+        (transient--insert-group subgroup)
+        (when (< s (1- n))
+          (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-child))
+  "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."
+  (and-let* ((desc (oref obj description))
+             (desc (if (functionp desc)
+                       (if (= (car (transient--func-arity desc)) 1)
+                           (funcall desc obj)
+                         (funcall desc))
+                     desc)))
+    (if-let* ((face (transient--get-face obj 'face)))
+        (transient--add-face desc face t)
+      desc)))
+
+(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 (cl-call-next-method 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))
+                  (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))))))
+
+(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--get-face (obj slot)
+  (and-let* (((slot-exists-p obj slot))
+             ((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--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 (cons (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-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))
+
+(defun transient--describe-function (fn)
+  (describe-function fn)
+  (unless (derived-mode-p 'help-mode)
+    (when-let* ((buf (get-buffer "*Help*"))
+                (win (or (and buf (get-buffer-window buf))
+                         (cl-find-if (lambda (win)
+                                       (with-current-buffer (window-buffer win)
+                                         (derived-mode-p 'help-mode)))
+                                     (window-list)))))
+      (select-window win))))
+
+(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)))
+
+;;; 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-20240509.1849/transient.elc b/emacs/elpa/transient-20240509.1849/transient.elc
Binary files differ.
diff --git a/emacs/elpa/transient-20240421.1737/transient.info b/emacs/elpa/transient-20240509.1849/transient.info
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-pkg.el b/emacs/elpa/vertico-20240424.1959/vertico-pkg.el
@@ -1,15 +0,0 @@
-(define-package "vertico" "20240424.1959" "VERTical Interactive COmpletion"
-  '((emacs "27.1")
-    (compat "29.1.4.4"))
-  :commit "1def56a1e678ff9a8eeafafda9c474a5fbb097c4" :authors
-  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
-  :maintainers
-  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
-  :maintainer
-  '("Daniel Mendler" . "mail@daniel-mendler.de")
-  :keywords
-  '("convenience" "files" "matching" "completion")
-  :url "https://github.com/minad/vertico")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-autoloads.el b/emacs/elpa/vertico-20240511.2047/vertico-autoloads.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-buffer.el b/emacs/elpa/vertico-20240511.2047/vertico-buffer.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-buffer.elc b/emacs/elpa/vertico-20240511.2047/vertico-buffer.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-directory.el b/emacs/elpa/vertico-20240511.2047/vertico-directory.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-directory.elc b/emacs/elpa/vertico-20240511.2047/vertico-directory.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-flat.el b/emacs/elpa/vertico-20240511.2047/vertico-flat.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-flat.elc b/emacs/elpa/vertico-20240511.2047/vertico-flat.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-grid.el b/emacs/elpa/vertico-20240511.2047/vertico-grid.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-grid.elc b/emacs/elpa/vertico-20240511.2047/vertico-grid.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-indexed.el b/emacs/elpa/vertico-20240511.2047/vertico-indexed.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-indexed.elc b/emacs/elpa/vertico-20240511.2047/vertico-indexed.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-mouse.el b/emacs/elpa/vertico-20240511.2047/vertico-mouse.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-mouse.elc b/emacs/elpa/vertico-20240511.2047/vertico-mouse.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-multiform.el b/emacs/elpa/vertico-20240511.2047/vertico-multiform.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-multiform.elc b/emacs/elpa/vertico-20240511.2047/vertico-multiform.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240511.2047/vertico-pkg.el b/emacs/elpa/vertico-20240511.2047/vertico-pkg.el
@@ -0,0 +1,15 @@
+(define-package "vertico" "20240511.2047" "VERTical Interactive COmpletion"
+  '((emacs "27.1")
+    (compat "29.1.4.4"))
+  :commit "ba650a7ab90d66686ba787937ac9e71f749c598e" :authors
+  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
+  :maintainers
+  '(("Daniel Mendler" . "mail@daniel-mendler.de"))
+  :maintainer
+  '("Daniel Mendler" . "mail@daniel-mendler.de")
+  :keywords
+  '("convenience" "files" "matching" "completion")
+  :url "https://github.com/minad/vertico")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-quick.el b/emacs/elpa/vertico-20240511.2047/vertico-quick.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-quick.elc b/emacs/elpa/vertico-20240511.2047/vertico-quick.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-repeat.el b/emacs/elpa/vertico-20240511.2047/vertico-repeat.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-repeat.elc b/emacs/elpa/vertico-20240511.2047/vertico-repeat.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-reverse.el b/emacs/elpa/vertico-20240511.2047/vertico-reverse.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-reverse.elc b/emacs/elpa/vertico-20240511.2047/vertico-reverse.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-suspend.el b/emacs/elpa/vertico-20240511.2047/vertico-suspend.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-suspend.elc b/emacs/elpa/vertico-20240511.2047/vertico-suspend.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-unobtrusive.el b/emacs/elpa/vertico-20240511.2047/vertico-unobtrusive.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico-unobtrusive.elc b/emacs/elpa/vertico-20240511.2047/vertico-unobtrusive.elc
Binary files differ.
diff --git a/emacs/elpa/vertico-20240424.1959/vertico.el b/emacs/elpa/vertico-20240511.2047/vertico.el
diff --git a/emacs/elpa/vertico-20240424.1959/vertico.elc b/emacs/elpa/vertico-20240511.2047/vertico.elc
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeCache.txt b/emacs/elpa/vterm-20240325.1551/build/CMakeCache.txt
@@ -1,355 +0,0 @@
-# This is the CMakeCache file.
-# For build in directory: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-# It was generated by CMake: /usr/bin/cmake
-# You can edit this file to change values found and used by cmake.
-# If you do not want to change any of the values, simply exit the editor.
-# If you do want to change a value, simply edit, save, and exit the editor.
-# The syntax for the file is as follows:
-# KEY:TYPE=VALUE
-# KEY is the name of a variable in the cache.
-# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
-# VALUE is the current value for the KEY.
-
-########################
-# EXTERNAL cache entries
-########################
-
-//Path to a program.
-CMAKE_ADDR2LINE:FILEPATH=/usr/bin/addr2line
-
-//Path to a program.
-CMAKE_AR:FILEPATH=/usr/bin/ar
-
-//Build type (default RelWithDebInfo)
-CMAKE_BUILD_TYPE:STRING=RelWithDebInfo
-
-//Enable/Disable color output during build.
-CMAKE_COLOR_MAKEFILE:BOOL=ON
-
-//C compiler
-CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc
-
-//A wrapper around 'ar' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar
-
-//A wrapper around 'ranlib' adding the appropriate '--plugin' option
-// for the GCC compiler
-CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib
-
-//Flags used by the C compiler during all build types.
-CMAKE_C_FLAGS:STRING=
-
-//Flags used by the C compiler during DEBUG builds.
-CMAKE_C_FLAGS_DEBUG:STRING=-g
-
-//Flags used by the C compiler during MINSIZEREL builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
-
-//Flags used by the C compiler during RELEASE builds.
-CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
-
-//Flags used by the C compiler during RELWITHDEBINFO builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
-
-//Path to a program.
-CMAKE_DLLTOOL:FILEPATH=CMAKE_DLLTOOL-NOTFOUND
-
-//Flags used by the linker during all build types.
-CMAKE_EXE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during DEBUG builds.
-CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during MINSIZEREL builds.
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during RELEASE builds.
-CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during RELWITHDEBINFO builds.
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Enable/Disable output of compile commands during generation.
-CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
-
-//Value Computed by CMake.
-CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/pkgRedirects
-
-//Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=/usr/local
-
-//Path to a program.
-CMAKE_LINKER:FILEPATH=/usr/bin/ld
-
-//Path to a program.
-CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
-
-//Flags used by the linker during the creation of modules during
-// all build types.
-CMAKE_MODULE_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during the creation of modules during
-// DEBUG builds.
-CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during the creation of modules during
-// MINSIZEREL builds.
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during the creation of modules during
-// RELEASE builds.
-CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during the creation of modules during
-// RELWITHDEBINFO builds.
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_NM:FILEPATH=/usr/bin/nm
-
-//Path to a program.
-CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
-
-//Path to a program.
-CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
-
-//Value Computed by CMake
-CMAKE_PROJECT_DESCRIPTION:STATIC=
-
-//Value Computed by CMake
-CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
-
-//Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=emacs-libvterm
-
-//Path to a program.
-CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
-
-//Path to a program.
-CMAKE_READELF:FILEPATH=/usr/bin/readelf
-
-//Flags used by the linker during the creation of shared libraries
-// during all build types.
-CMAKE_SHARED_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during the creation of shared libraries
-// during DEBUG builds.
-CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during the creation of shared libraries
-// during MINSIZEREL builds.
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during the creation of shared libraries
-// during RELEASE builds.
-CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during the creation of shared libraries
-// during RELWITHDEBINFO builds.
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//If set, runtime paths are not added when installing shared libraries,
-// but are added when building.
-CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
-
-//If set, runtime paths are not added when using shared libraries.
-CMAKE_SKIP_RPATH:BOOL=NO
-
-//Flags used by the linker during the creation of static libraries
-// during all build types.
-CMAKE_STATIC_LINKER_FLAGS:STRING=
-
-//Flags used by the linker during the creation of static libraries
-// during DEBUG builds.
-CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
-
-//Flags used by the linker during the creation of static libraries
-// during MINSIZEREL builds.
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
-
-//Flags used by the linker during the creation of static libraries
-// during RELEASE builds.
-CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
-
-//Flags used by the linker during the creation of static libraries
-// during RELWITHDEBINFO builds.
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
-
-//Path to a program.
-CMAKE_STRIP:FILEPATH=/usr/bin/strip
-
-//Path to a program.
-CMAKE_TAPI:FILEPATH=CMAKE_TAPI-NOTFOUND
-
-//If this value is on, makefiles will be generated without the
-// .SILENT directive, and all commands will be echoed to the console
-// during the make.  This is useful for debugging only. With Visual
-// Studio IDE projects all commands are done without /nologo.
-CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
-
-//Git command line client
-GIT_EXECUTABLE:FILEPATH=/usr/bin/git
-
-//Path to a program.
-LIBTOOL:FILEPATH=/usr/bin/libtool
-
-//Path to a file.
-LIBVTERM_INCLUDE_DIR:PATH=LIBVTERM_INCLUDE_DIR-NOTFOUND
-
-//Use system libvterm instead of the vendored version.
-USE_SYSTEM_LIBVTERM:BOOL=ON
-
-//Value Computed by CMake
-emacs-libvterm_BINARY_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-//Value Computed by CMake
-emacs-libvterm_IS_TOP_LEVEL:STATIC=ON
-
-//Value Computed by CMake
-emacs-libvterm_SOURCE_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-//Dependencies for the target
-vterm-module_LIB_DEPENDS:STATIC=general;vterm;
-
-
-########################
-# INTERNAL cache entries
-########################
-
-//ADVANCED property for variable: CMAKE_ADDR2LINE
-CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_AR
-CMAKE_AR-ADVANCED:INTERNAL=1
-//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-//Major version of cmake used to create the current loaded cache
-CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
-//Minor version of cmake used to create the current loaded cache
-CMAKE_CACHE_MINOR_VERSION:INTERNAL=29
-//Patch version of cmake used to create the current loaded cache
-CMAKE_CACHE_PATCH_VERSION:INTERNAL=1
-//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
-CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
-//Path to CMake executable.
-CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
-//Path to cpack program executable.
-CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
-//Path to ctest program executable.
-CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
-//ADVANCED property for variable: CMAKE_C_COMPILER
-CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER_AR
-CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB
-CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS
-CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
-CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
-CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
-CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
-CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_DLLTOOL
-CMAKE_DLLTOOL-ADVANCED:INTERNAL=1
-//Path to cache edit program executable.
-CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
-//Executable file format
-CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
-CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
-CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
-CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
-CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
-CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1
-//Name of external makefile project generator.
-CMAKE_EXTRA_GENERATOR:INTERNAL=
-//Name of generator.
-CMAKE_GENERATOR:INTERNAL=Unix Makefiles
-//Generator instance identifier.
-CMAKE_GENERATOR_INSTANCE:INTERNAL=
-//Name of generator platform.
-CMAKE_GENERATOR_PLATFORM:INTERNAL=
-//Name of generator toolset.
-CMAKE_GENERATOR_TOOLSET:INTERNAL=
-//Source directory with the top level CMakeLists.txt file for this
-// project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-//Install .so files without execute permission.
-CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0
-//ADVANCED property for variable: CMAKE_LINKER
-CMAKE_LINKER-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
-CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
-CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
-CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
-CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
-CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_NM
-CMAKE_NM-ADVANCED:INTERNAL=1
-//number of local generators
-CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJCOPY
-CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_OBJDUMP
-CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
-//Platform information initialized
-CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_RANLIB
-CMAKE_RANLIB-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_READELF
-CMAKE_READELF-ADVANCED:INTERNAL=1
-//Path to CMake installation.
-CMAKE_ROOT:INTERNAL=/usr/share/cmake
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
-CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
-CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
-CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
-CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
-CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_SKIP_RPATH
-CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
-CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
-CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
-CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
-CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
-CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_STRIP
-CMAKE_STRIP-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: CMAKE_TAPI
-CMAKE_TAPI-ADVANCED:INTERNAL=1
-//uname command
-CMAKE_UNAME:INTERNAL=/usr/bin/uname
-//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
-CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
-//ADVANCED property for variable: GIT_EXECUTABLE
-GIT_EXECUTABLE-ADVANCED:INTERNAL=1
-//linker supports push/pop state
-_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED:INTERNAL=TRUE
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeCCompiler.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeCCompiler.cmake
@@ -1,80 +0,0 @@
-set(CMAKE_C_COMPILER "/usr/bin/cc")
-set(CMAKE_C_COMPILER_ARG1 "")
-set(CMAKE_C_COMPILER_ID "GNU")
-set(CMAKE_C_COMPILER_VERSION "13.2.1")
-set(CMAKE_C_COMPILER_VERSION_INTERNAL "")
-set(CMAKE_C_COMPILER_WRAPPER "")
-set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "17")
-set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "ON")
-set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert;c_std_17;c_std_23")
-set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes")
-set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros")
-set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert")
-set(CMAKE_C17_COMPILE_FEATURES "c_std_17")
-set(CMAKE_C23_COMPILE_FEATURES "c_std_23")
-
-set(CMAKE_C_PLATFORM_ID "Linux")
-set(CMAKE_C_SIMULATE_ID "")
-set(CMAKE_C_COMPILER_FRONTEND_VARIANT "GNU")
-set(CMAKE_C_SIMULATE_VERSION "")
-
-
-
-
-set(CMAKE_AR "/usr/bin/ar")
-set(CMAKE_C_COMPILER_AR "/usr/bin/gcc-ar")
-set(CMAKE_RANLIB "/usr/bin/ranlib")
-set(CMAKE_C_COMPILER_RANLIB "/usr/bin/gcc-ranlib")
-set(CMAKE_LINKER "/usr/bin/ld")
-set(CMAKE_LINKER_LINK "")
-set(CMAKE_LINKER_LLD "")
-set(CMAKE_C_COMPILER_LINKER "/usr/bin/ld")
-set(CMAKE_C_COMPILER_LINKER_ID "GNU")
-set(CMAKE_C_COMPILER_LINKER_VERSION 2.42.0)
-set(CMAKE_C_COMPILER_LINKER_FRONTEND_VARIANT GNU)
-set(CMAKE_MT "")
-set(CMAKE_TAPI "CMAKE_TAPI-NOTFOUND")
-set(CMAKE_COMPILER_IS_GNUCC 1)
-set(CMAKE_C_COMPILER_LOADED 1)
-set(CMAKE_C_COMPILER_WORKS TRUE)
-set(CMAKE_C_ABI_COMPILED TRUE)
-
-set(CMAKE_C_COMPILER_ENV_VAR "CC")
-
-set(CMAKE_C_COMPILER_ID_RUN 1)
-set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m)
-set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-set(CMAKE_C_LINKER_PREFERENCE 10)
-set(CMAKE_C_LINKER_DEPFILE_SUPPORTED FALSE)
-
-# Save compiler ABI information.
-set(CMAKE_C_SIZEOF_DATA_PTR "8")
-set(CMAKE_C_COMPILER_ABI "ELF")
-set(CMAKE_C_BYTE_ORDER "LITTLE_ENDIAN")
-set(CMAKE_C_LIBRARY_ARCHITECTURE "")
-
-if(CMAKE_C_SIZEOF_DATA_PTR)
-  set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
-endif()
-
-if(CMAKE_C_COMPILER_ABI)
-  set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
-endif()
-
-if(CMAKE_C_LIBRARY_ARCHITECTURE)
-  set(CMAKE_LIBRARY_ARCHITECTURE "")
-endif()
-
-set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "")
-if(CMAKE_C_CL_SHOWINCLUDES_PREFIX)
-  set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}")
-endif()
-
-
-
-
-
-set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed;/usr/include")
-set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;gcc_s;c;gcc;gcc_s")
-set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1;/usr/lib;/lib")
-set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "")
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeDetermineCompilerABI_C.bin b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeDetermineCompilerABI_C.bin
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeSystem.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CMakeSystem.cmake
@@ -1,15 +0,0 @@
-set(CMAKE_HOST_SYSTEM "Linux-6.8.2-arch2-1")
-set(CMAKE_HOST_SYSTEM_NAME "Linux")
-set(CMAKE_HOST_SYSTEM_VERSION "6.8.2-arch2-1")
-set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
-
-
-
-set(CMAKE_SYSTEM "Linux-6.8.2-arch2-1")
-set(CMAKE_SYSTEM_NAME "Linux")
-set(CMAKE_SYSTEM_VERSION "6.8.2-arch2-1")
-set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-
-set(CMAKE_CROSSCOMPILING "FALSE")
-
-set(CMAKE_SYSTEM_LOADED 1)
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/a.out b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/a.out
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeConfigureLog.yaml b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeConfigureLog.yaml
@@ -1,261 +0,0 @@
-
----
-events:
-  -
-    kind: "message-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/CMakeDetermineSystem.cmake:205 (message)"
-      - "CMakeLists.txt:4 (project)"
-    message: |
-      The system is: Linux - 6.8.2-arch2-1 - x86_64
-  -
-    kind: "message-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake:17 (message)"
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake:64 (__determine_compiler_id_test)"
-      - "/usr/share/cmake/Modules/CMakeDetermineCCompiler.cmake:123 (CMAKE_DETERMINE_COMPILER_ID)"
-      - "CMakeLists.txt:4 (project)"
-    message: |
-      Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
-      Compiler: /usr/bin/cc 
-      Build flags: 
-      Id flags:  
-      
-      The output was:
-      0
-      
-      
-      Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out"
-      
-      The C compiler identification is GNU, found in:
-        /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/a.out
-      
-  -
-    kind: "try_compile-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:64 (try_compile)"
-      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
-      - "CMakeLists.txt:4 (project)"
-    checks:
-      - "Detecting C compiler ABI info"
-    directories:
-      source: "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q"
-      binary: "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q"
-    cmakeVariables:
-      CMAKE_C_FLAGS: ""
-      CMAKE_C_FLAGS_DEBUG: "-g"
-      CMAKE_EXE_LINKER_FLAGS: ""
-    buildResult:
-      variable: "CMAKE_C_ABI_COMPILED"
-      cached: true
-      stdout: |
-        Change Dir: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q'
-        
-        Run Build Command(s): /usr/bin/cmake -E env VERBOSE=1 /usr/bin/make -f Makefile cmTC_7b926/fast
-        /usr/bin/make  -f CMakeFiles/cmTC_7b926.dir/build.make CMakeFiles/cmTC_7b926.dir/build
-        make[1]: Entering directory '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q'
-        Building C object CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o
-        /usr/bin/cc   -v -o CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake/Modules/CMakeCCompilerABI.c
-        Using built-in specs.
-        COLLECT_GCC=/usr/bin/cc
-        Target: x86_64-pc-linux-gnu
-        Configured with: /build/gcc/src/gcc/configure --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++ --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror
-        Thread model: posix
-        Supported LTO compression algorithms: zlib zstd
-        gcc version 13.2.1 20230801 (GCC) 
-        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/'
-         /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/cc1 -quiet -v /usr/share/cmake/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_7b926.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -o /tmp/ccyjakWQ.s
-        GNU C17 (GCC) version 13.2.1 20230801 (x86_64-pc-linux-gnu)
-        	compiled by GNU C version 13.2.1 20230801, GMP version 6.3.0, MPFR version 4.2.1, MPC version 1.3.1, isl version isl-0.26-GMP
-        
-        GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
-        ignoring nonexistent directory "/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../x86_64-pc-linux-gnu/include"
-        #include "..." search starts here:
-        #include <...> search starts here:
-         /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include
-         /usr/local/include
-         /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed
-         /usr/include
-        End of search list.
-        Compiler executable checksum: eb0b45108af02c02a078961940bce3e9
-        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/'
-         as -v --64 -o CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o /tmp/ccyjakWQ.s
-        GNU assembler version 2.42.0 (x86_64-pc-linux-gnu) using BFD version (GNU Binutils) 2.42.0
-        COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/
-        LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../:/lib/:/usr/lib/
-        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.'
-        Linking C executable cmTC_7b926
-        /usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_7b926.dir/link.txt --verbose=1
-        /usr/bin/cc  -v -Wl,-v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -o cmTC_7b926
-        Using built-in specs.
-        COLLECT_GCC=/usr/bin/cc
-        COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper
-        Target: x86_64-pc-linux-gnu
-        Configured with: /build/gcc/src/gcc/configure --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++ --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror
-        Thread model: posix
-        Supported LTO compression algorithms: zlib zstd
-        gcc version 13.2.1 20230801 (GCC) 
-        COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/
-        LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../:/lib/:/usr/lib/
-        COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_7b926' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_7b926.'
-         /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/collect2 -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper -plugin-opt=-fresolution=/tmp/cc2Ni7xM.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_7b926 /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../.. -v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o
-        collect2 version 13.2.1 20230801
-        /usr/bin/ld -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper -plugin-opt=-fresolution=/tmp/cc2Ni7xM.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_7b926 /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../.. -v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o
-        GNU ld (GNU Binutils) 2.42.0
-        COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_7b926' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_7b926.'
-        make[1]: Leaving directory '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q'
-        
-      exitCode: 0
-  -
-    kind: "message-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:134 (message)"
-      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
-      - "CMakeLists.txt:4 (project)"
-    message: |
-      Parsed C implicit include dir info: rv=done
-        found start of include info
-        found start of implicit include info
-          add: [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include]
-          add: [/usr/local/include]
-          add: [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed]
-          add: [/usr/include]
-        end of search list found
-        collapse include dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include]
-        collapse include dir [/usr/local/include] ==> [/usr/local/include]
-        collapse include dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed]
-        collapse include dir [/usr/include] ==> [/usr/include]
-        implicit include dirs: [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed;/usr/include]
-      
-      
-  -
-    kind: "message-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:170 (message)"
-      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
-      - "CMakeLists.txt:4 (project)"
-    message: |
-      Parsed C implicit link information:
-        link line regex: [^( *|.*[/\\])(ld[0-9]*(\\.[a-z]+)?|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\\]+-)?ld|collect2)[^/\\]*( |$)]
-        linker tool regex: [^[ 	]*(->|")?[ 	]*(([^"]*[/\\])?(ld[0-9]*(\\.[a-z]+)?))("|,| |$)]
-        ignore line: [Change Dir: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q']
-        ignore line: []
-        ignore line: [Run Build Command(s): /usr/bin/cmake -E env VERBOSE=1 /usr/bin/make -f Makefile cmTC_7b926/fast]
-        ignore line: [/usr/bin/make  -f CMakeFiles/cmTC_7b926.dir/build.make CMakeFiles/cmTC_7b926.dir/build]
-        ignore line: [make[1]: Entering directory '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeScratch/TryCompile-NFGs8q']
-        ignore line: [Building C object CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o]
-        ignore line: [/usr/bin/cc   -v -o CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake/Modules/CMakeCCompilerABI.c]
-        ignore line: [Using built-in specs.]
-        ignore line: [COLLECT_GCC=/usr/bin/cc]
-        ignore line: [Target: x86_64-pc-linux-gnu]
-        ignore line: [Configured with: /build/gcc/src/gcc/configure --enable-languages=ada c c++ d fortran go lto m2 objc obj-c++ --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror]
-        ignore line: [Thread model: posix]
-        ignore line: [Supported LTO compression algorithms: zlib zstd]
-        ignore line: [gcc version 13.2.1 20230801 (GCC) ]
-        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/']
-        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/cc1 -quiet -v /usr/share/cmake/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_7b926.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -o /tmp/ccyjakWQ.s]
-        ignore line: [GNU C17 (GCC) version 13.2.1 20230801 (x86_64-pc-linux-gnu)]
-        ignore line: [	compiled by GNU C version 13.2.1 20230801  GMP version 6.3.0  MPFR version 4.2.1  MPC version 1.3.1  isl version isl-0.26-GMP]
-        ignore line: []
-        ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
-        ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../x86_64-pc-linux-gnu/include"]
-        ignore line: [#include "..." search starts here:]
-        ignore line: [#include <...> search starts here:]
-        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include]
-        ignore line: [ /usr/local/include]
-        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include-fixed]
-        ignore line: [ /usr/include]
-        ignore line: [End of search list.]
-        ignore line: [Compiler executable checksum: eb0b45108af02c02a078961940bce3e9]
-        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/']
-        ignore line: [ as -v --64 -o CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o /tmp/ccyjakWQ.s]
-        ignore line: [GNU assembler version 2.42.0 (x86_64-pc-linux-gnu) using BFD version (GNU Binutils) 2.42.0]
-        ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/]
-        ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../:/lib/:/usr/lib/]
-        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.']
-        ignore line: [Linking C executable cmTC_7b926]
-        ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_7b926.dir/link.txt --verbose=1]
-        ignore line: [/usr/bin/cc  -v -Wl -v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -o cmTC_7b926]
-        ignore line: [Using built-in specs.]
-        ignore line: [COLLECT_GCC=/usr/bin/cc]
-        ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper]
-        ignore line: [Target: x86_64-pc-linux-gnu]
-        ignore line: [Configured with: /build/gcc/src/gcc/configure --enable-languages=ada c c++ d fortran go lto m2 objc obj-c++ --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://bugs.archlinux.org/ --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror]
-        ignore line: [Thread model: posix]
-        ignore line: [Supported LTO compression algorithms: zlib zstd]
-        ignore line: [gcc version 13.2.1 20230801 (GCC) ]
-        ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/]
-        ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../:/lib/:/usr/lib/]
-        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_7b926' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_7b926.']
-        link line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/collect2 -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper -plugin-opt=-fresolution=/tmp/cc2Ni7xM.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_7b926 /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../.. -v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o]
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/collect2] ==> ignore
-          arg [-plugin] ==> ignore
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/liblto_plugin.so] ==> ignore
-          arg [-plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper] ==> ignore
-          arg [-plugin-opt=-fresolution=/tmp/cc2Ni7xM.res] ==> ignore
-          arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
-          arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore
-          arg [-plugin-opt=-pass-through=-lc] ==> ignore
-          arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
-          arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore
-          arg [--build-id] ==> ignore
-          arg [--eh-frame-hdr] ==> ignore
-          arg [--hash-style=gnu] ==> ignore
-          arg [-m] ==> ignore
-          arg [elf_x86_64] ==> ignore
-          arg [-dynamic-linker] ==> ignore
-          arg [/lib64/ld-linux-x86-64.so.2] ==> ignore
-          arg [-pie] ==> ignore
-          arg [-o] ==> ignore
-          arg [cmTC_7b926] ==> ignore
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o]
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o]
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o]
-          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1]
-          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib]
-          arg [-L/lib/../lib] ==> dir [/lib/../lib]
-          arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib]
-          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../..] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../..]
-          arg [-v] ==> ignore
-          arg [CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o] ==> ignore
-          arg [-lgcc] ==> lib [gcc]
-          arg [--push-state] ==> ignore
-          arg [--as-needed] ==> ignore
-          arg [-lgcc_s] ==> lib [gcc_s]
-          arg [--pop-state] ==> ignore
-          arg [-lc] ==> lib [c]
-          arg [-lgcc] ==> lib [gcc]
-          arg [--push-state] ==> ignore
-          arg [--as-needed] ==> ignore
-          arg [-lgcc_s] ==> lib [gcc_s]
-          arg [--pop-state] ==> ignore
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o]
-          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o]
-        ignore line: [collect2 version 13.2.1 20230801]
-        ignore line: [/usr/bin/ld -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/lto-wrapper -plugin-opt=-fresolution=/tmp/cc2Ni7xM.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_7b926 /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../.. -v CMakeFiles/cmTC_7b926.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o]
-        linker tool for 'C': /usr/bin/ld
-        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/Scrt1.o] ==> [/usr/lib/Scrt1.o]
-        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crti.o] ==> [/usr/lib/crti.o]
-        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib/crtn.o] ==> [/usr/lib/crtn.o]
-        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1]
-        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../../../lib] ==> [/usr/lib]
-        collapse library dir [/lib/../lib] ==> [/lib]
-        collapse library dir [/usr/lib/../lib] ==> [/usr/lib]
-        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/../../..] ==> [/usr/lib]
-        implicit libs: [gcc;gcc_s;c;gcc;gcc_s]
-        implicit objs: [/usr/lib/Scrt1.o;/usr/lib/crti.o;/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtbeginS.o;/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/crtendS.o;/usr/lib/crtn.o]
-        implicit dirs: [/usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1;/usr/lib;/lib]
-        implicit fwks: []
-      
-      
-  -
-    kind: "message-v1"
-    backtrace:
-      - "/usr/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake:40 (message)"
-      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:207 (cmake_determine_linker_id)"
-      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
-      - "CMakeLists.txt:4 (project)"
-    message: |
-      Running the C compiler's linker: "/usr/bin/ld" "-v"
-      GNU ld (GNU Binutils) 2.42.0
-...
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeDirectoryInformation.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -1,16 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build")
-
-# Force unix paths in dependencies.
-set(CMAKE_FORCE_UNIX_PATHS 1)
-
-
-# The C and CXX include file regular expressions for this directory.
-set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
-set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
-set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
-set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeRuleHashes.txt b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/CMakeRuleHashes.txt
@@ -1,11 +0,0 @@
-# Hashes of file build rules.
-f8fc2cfdf3fe989a64ee7c9dc6597dd7 CMakeFiles/libvterm
-98b88b5ec784707ee5c6fbfb9f1852eb CMakeFiles/libvterm-complete
-e46e76ac12b5b7d9d9bc4636e40efc8f CMakeFiles/run
-319d0af8608852baf1e33a5721b84b6a libvterm-prefix/src/libvterm-stamp/libvterm-build
-a64f2043353f9ed897558ddd671ddc9f libvterm-prefix/src/libvterm-stamp/libvterm-configure
-3076910a727b6f6cb904ac09ab63e848 libvterm-prefix/src/libvterm-stamp/libvterm-download
-a713d8730fa68678e01e143c53734ae8 libvterm-prefix/src/libvterm-stamp/libvterm-install
-546df4f77b161e3bb021c62d6017aebc libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
-0aab6fbe7464c8398e29fcc5d235a517 libvterm-prefix/src/libvterm-stamp/libvterm-patch
-1c6a0acf82e4665e953a30d4a37c7680 libvterm-prefix/src/libvterm-stamp/libvterm-update
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile.cmake
@@ -1,131 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# The generator used is:
-set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
-
-# The top level Makefile was generated from the following files:
-set(CMAKE_MAKEFILE_DEPENDS
-  "CMakeCache.txt"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/CMakeLists.txt"
-  "CMakeFiles/3.29.1/CMakeCCompiler.cmake"
-  "CMakeFiles/3.29.1/CMakeSystem.cmake"
-  "libvterm-prefix/tmp/libvterm-mkdirs.cmake"
-  "/usr/share/cmake/Modules/CMakeCCompiler.cmake.in"
-  "/usr/share/cmake/Modules/CMakeCCompilerABI.c"
-  "/usr/share/cmake/Modules/CMakeCInformation.cmake"
-  "/usr/share/cmake/Modules/CMakeCommonLanguageInclude.cmake"
-  "/usr/share/cmake/Modules/CMakeCompilerIdDetection.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineCCompiler.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineCompileFeatures.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake"
-  "/usr/share/cmake/Modules/CMakeDetermineSystem.cmake"
-  "/usr/share/cmake/Modules/CMakeFindBinUtils.cmake"
-  "/usr/share/cmake/Modules/CMakeGenericSystem.cmake"
-  "/usr/share/cmake/Modules/CMakeInitializeConfigs.cmake"
-  "/usr/share/cmake/Modules/CMakeLanguageInformation.cmake"
-  "/usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake"
-  "/usr/share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake"
-  "/usr/share/cmake/Modules/CMakeParseLibraryArchitecture.cmake"
-  "/usr/share/cmake/Modules/CMakeSystem.cmake.in"
-  "/usr/share/cmake/Modules/CMakeSystemSpecificInformation.cmake"
-  "/usr/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake"
-  "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake"
-  "/usr/share/cmake/Modules/CMakeTestCompilerCommon.cmake"
-  "/usr/share/cmake/Modules/CMakeUnixFindMake.cmake"
-  "/usr/share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
-  "/usr/share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
-  "/usr/share/cmake/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Cray-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/CrayClang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/GHS-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/GNU-C.cmake"
-  "/usr/share/cmake/Modules/Compiler/GNU-FindBinUtils.cmake"
-  "/usr/share/cmake/Modules/Compiler/GNU.cmake"
-  "/usr/share/cmake/Modules/Compiler/HP-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/IAR-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
-  "/usr/share/cmake/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Intel-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/LCC-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/NVHPC-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/OrangeC-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/PGI-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/PathScale-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/TI-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/TIClang-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Tasking-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/Watcom-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/XL-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/XLClang-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
-  "/usr/share/cmake/Modules/ExternalProject.cmake"
-  "/usr/share/cmake/Modules/ExternalProject/PatchInfo.txt.in"
-  "/usr/share/cmake/Modules/ExternalProject/RepositoryInfo.txt.in"
-  "/usr/share/cmake/Modules/ExternalProject/UpdateInfo.txt.in"
-  "/usr/share/cmake/Modules/ExternalProject/cfgcmd.txt.in"
-  "/usr/share/cmake/Modules/ExternalProject/gitclone.cmake.in"
-  "/usr/share/cmake/Modules/ExternalProject/gitupdate.cmake.in"
-  "/usr/share/cmake/Modules/ExternalProject/mkdirs.cmake.in"
-  "/usr/share/cmake/Modules/ExternalProject/shared_internal_commands.cmake"
-  "/usr/share/cmake/Modules/FindGit.cmake"
-  "/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake"
-  "/usr/share/cmake/Modules/FindPackageMessage.cmake"
-  "/usr/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake"
-  "/usr/share/cmake/Modules/Internal/FeatureTesting.cmake"
-  "/usr/share/cmake/Modules/Platform/Linux-GNU-C.cmake"
-  "/usr/share/cmake/Modules/Platform/Linux-GNU.cmake"
-  "/usr/share/cmake/Modules/Platform/Linux-Initialize.cmake"
-  "/usr/share/cmake/Modules/Platform/Linux.cmake"
-  "/usr/share/cmake/Modules/Platform/UnixPaths.cmake"
-  )
-
-# The corresponding makefile is:
-set(CMAKE_MAKEFILE_OUTPUTS
-  "Makefile"
-  "CMakeFiles/cmake.check_cache"
-  )
-
-# Byproducts of CMake generate step:
-set(CMAKE_MAKEFILE_PRODUCTS
-  "CMakeFiles/3.29.1/CMakeSystem.cmake"
-  "CMakeFiles/3.29.1/CMakeCCompiler.cmake"
-  "CMakeFiles/3.29.1/CMakeCCompiler.cmake"
-  "libvterm-prefix/tmp/libvterm-mkdirs.cmake"
-  "libvterm-prefix/tmp/libvterm-gitclone.cmake"
-  "libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt"
-  "libvterm-prefix/tmp/libvterm-gitupdate.cmake"
-  "libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt"
-  "libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt"
-  "libvterm-prefix/tmp/libvterm-cfgcmd.txt"
-  "CMakeFiles/CMakeDirectoryInformation.cmake"
-  )
-
-# Dependency information for all targets:
-set(CMAKE_DEPEND_INFO_FILES
-  "CMakeFiles/vterm-module.dir/DependInfo.cmake"
-  "CMakeFiles/libvterm.dir/DependInfo.cmake"
-  "CMakeFiles/run.dir/DependInfo.cmake"
-  )
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile2 b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/Makefile2
@@ -1,167 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Disable VCS-based implicit rules.
-% : %,v
-
-# Disable VCS-based implicit rules.
-% : RCS/%
-
-# Disable VCS-based implicit rules.
-% : RCS/%,v
-
-# Disable VCS-based implicit rules.
-% : SCCS/s.%
-
-# Disable VCS-based implicit rules.
-% : s.%
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Command-line flag to silence nested $(MAKE).
-$(VERBOSE)MAKESILENT = -s
-
-#Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E rm -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-#=============================================================================
-# Directory level rules for the build root directory
-
-# The main recursive "all" target.
-all: CMakeFiles/vterm-module.dir/all
-all: CMakeFiles/libvterm.dir/all
-.PHONY : all
-
-# The main recursive "preinstall" target.
-preinstall:
-.PHONY : preinstall
-
-# The main recursive "clean" target.
-clean: CMakeFiles/vterm-module.dir/clean
-clean: CMakeFiles/libvterm.dir/clean
-clean: CMakeFiles/run.dir/clean
-.PHONY : clean
-
-#=============================================================================
-# Target rules for target CMakeFiles/vterm-module.dir
-
-# All Build rule for target.
-CMakeFiles/vterm-module.dir/all: CMakeFiles/libvterm.dir/all
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/depend
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=9,10,11,12 "Built target vterm-module"
-.PHONY : CMakeFiles/vterm-module.dir/all
-
-# Build rule for subdir invocation for target.
-CMakeFiles/vterm-module.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 12
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/vterm-module.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 0
-.PHONY : CMakeFiles/vterm-module.dir/rule
-
-# Convenience name for target.
-vterm-module: CMakeFiles/vterm-module.dir/rule
-.PHONY : vterm-module
-
-# clean rule for target.
-CMakeFiles/vterm-module.dir/clean:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/clean
-.PHONY : CMakeFiles/vterm-module.dir/clean
-
-#=============================================================================
-# Target rules for target CMakeFiles/libvterm.dir
-
-# All Build rule for target.
-CMakeFiles/libvterm.dir/all:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/depend
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=1,2,3,4,5,6,7,8 "Built target libvterm"
-.PHONY : CMakeFiles/libvterm.dir/all
-
-# Build rule for subdir invocation for target.
-CMakeFiles/libvterm.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 8
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/libvterm.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 0
-.PHONY : CMakeFiles/libvterm.dir/rule
-
-# Convenience name for target.
-libvterm: CMakeFiles/libvterm.dir/rule
-.PHONY : libvterm
-
-# clean rule for target.
-CMakeFiles/libvterm.dir/clean:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/clean
-.PHONY : CMakeFiles/libvterm.dir/clean
-
-#=============================================================================
-# Target rules for target CMakeFiles/run.dir
-
-# All Build rule for target.
-CMakeFiles/run.dir/all: CMakeFiles/vterm-module.dir/all
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/depend
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/build
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num= "Built target run"
-.PHONY : CMakeFiles/run.dir/all
-
-# Build rule for subdir invocation for target.
-CMakeFiles/run.dir/rule: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 12
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/run.dir/all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 0
-.PHONY : CMakeFiles/run.dir/rule
-
-# Convenience name for target.
-run: CMakeFiles/run.dir/rule
-.PHONY : run
-
-# clean rule for target.
-CMakeFiles/run.dir/clean:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/clean
-.PHONY : CMakeFiles/run.dir/clean
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/TargetDirectories.txt b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/TargetDirectories.txt
@@ -1,5 +0,0 @@
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/edit_cache.dir
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/rebuild_cache.dir
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.json b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.json
@@ -1,43 +0,0 @@
-{
-	"sources" : 
-	[
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm-complete.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-build.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-download.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-install.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch.rule"
-		},
-		{
-			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-update.rule"
-		}
-	],
-	"target" : 
-	{
-		"labels" : 
-		[
-			"libvterm"
-		],
-		"name" : "libvterm"
-	}
-}
-\ No newline at end of file
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.txt b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/Labels.txt
@@ -1,13 +0,0 @@
-# Target labels
- libvterm
-# Source files and their labels
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm-complete.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-build.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-download.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-install.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch.rule
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-update.rule
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/build.make b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/build.make
@@ -1,146 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Delete rule output on recipe failure.
-.DELETE_ON_ERROR:
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Disable VCS-based implicit rules.
-% : %,v
-
-# Disable VCS-based implicit rules.
-% : RCS/%
-
-# Disable VCS-based implicit rules.
-% : RCS/%,v
-
-# Disable VCS-based implicit rules.
-% : SCCS/s.%
-
-# Disable VCS-based implicit rules.
-% : s.%
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Command-line flag to silence nested $(MAKE).
-$(VERBOSE)MAKESILENT = -s
-
-#Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E rm -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-# Utility rule file for libvterm.
-
-# Include any custom commands dependencies for this target.
-include CMakeFiles/libvterm.dir/compiler_depend.make
-
-# Include the progress variables for this target.
-include CMakeFiles/libvterm.dir/progress.make
-
-CMakeFiles/libvterm: CMakeFiles/libvterm-complete
-
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-install
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-download
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-update
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-patch
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-configure
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-build
-CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-install
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Completed 'libvterm'"
-	/usr/bin/cmake -E make_directory /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles
-	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm-complete
-	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-done
-
-libvterm-prefix/src/libvterm-stamp/libvterm-build: libvterm-prefix/src/libvterm-stamp/libvterm-configure
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Performing build step for 'libvterm'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && make "CFLAGS='-fPIC'" "LDFLAGS='-static'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-build
-
-libvterm-prefix/src/libvterm-stamp/libvterm-configure: libvterm-prefix/tmp/libvterm-cfgcmd.txt
-libvterm-prefix/src/libvterm-stamp/libvterm-configure: libvterm-prefix/src/libvterm-stamp/libvterm-patch
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "No configure step for 'libvterm'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E echo_append
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure
-
-libvterm-prefix/src/libvterm-stamp/libvterm-download: libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
-libvterm-prefix/src/libvterm-stamp/libvterm-download: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Performing download step (git clone) for 'libvterm'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src && /usr/bin/cmake -P /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-download
-
-libvterm-prefix/src/libvterm-stamp/libvterm-install: libvterm-prefix/src/libvterm-stamp/libvterm-build
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "No install step for 'libvterm'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E echo_append
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-install
-
-libvterm-prefix/src/libvterm-stamp/libvterm-mkdir:
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Creating directories for 'libvterm'"
-	/usr/bin/cmake -Dcfgdir= -P /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
-	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
-
-libvterm-prefix/src/libvterm-stamp/libvterm-patch: libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt
-libvterm-prefix/src/libvterm-stamp/libvterm-patch: libvterm-prefix/src/libvterm-stamp/libvterm-update
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "No patch step for 'libvterm'"
-	/usr/bin/cmake -E echo_append
-	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch
-
-libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/tmp/libvterm-gitupdate.cmake
-libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
-libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/src/libvterm-stamp/libvterm-download
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Performing update step for 'libvterm'"
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -Dcan_fetch=YES -P /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
-
-libvterm: CMakeFiles/libvterm
-libvterm: CMakeFiles/libvterm-complete
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-build
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-configure
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-download
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-install
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-patch
-libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-update
-libvterm: CMakeFiles/libvterm.dir/build.make
-.PHONY : libvterm
-
-# Rule to build all files generated by this target.
-CMakeFiles/libvterm.dir/build: libvterm
-.PHONY : CMakeFiles/libvterm.dir/build
-
-CMakeFiles/libvterm.dir/clean:
-	$(CMAKE_COMMAND) -P CMakeFiles/libvterm.dir/cmake_clean.cmake
-.PHONY : CMakeFiles/libvterm.dir/clean
-
-CMakeFiles/libvterm.dir/depend:
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/DependInfo.cmake "--color=$(COLOR)"
-.PHONY : CMakeFiles/libvterm.dir/depend
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/build.make b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/build.make
@@ -1,87 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Delete rule output on recipe failure.
-.DELETE_ON_ERROR:
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Disable VCS-based implicit rules.
-% : %,v
-
-# Disable VCS-based implicit rules.
-% : RCS/%
-
-# Disable VCS-based implicit rules.
-% : RCS/%,v
-
-# Disable VCS-based implicit rules.
-% : SCCS/s.%
-
-# Disable VCS-based implicit rules.
-% : s.%
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Command-line flag to silence nested $(MAKE).
-$(VERBOSE)MAKESILENT = -s
-
-#Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E rm -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-# Utility rule file for run.
-
-# Include any custom commands dependencies for this target.
-include CMakeFiles/run.dir/compiler_depend.make
-
-# Include the progress variables for this target.
-include CMakeFiles/run.dir/progress.make
-
-CMakeFiles/run: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so
-	emacs -Q -L /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 -L /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build --eval \(require\ \'vterm\) --eval \(vterm\)
-
-run: CMakeFiles/run
-run: CMakeFiles/run.dir/build.make
-.PHONY : run
-
-# Rule to build all files generated by this target.
-CMakeFiles/run.dir/build: run
-.PHONY : CMakeFiles/run.dir/build
-
-CMakeFiles/run.dir/clean:
-	$(CMAKE_COMMAND) -P CMakeFiles/run.dir/cmake_clean.cmake
-.PHONY : CMakeFiles/run.dir/clean
-
-CMakeFiles/run.dir/depend:
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/DependInfo.cmake "--color=$(COLOR)"
-.PHONY : CMakeFiles/run.dir/depend
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/DependInfo.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/DependInfo.cmake
@@ -1,25 +0,0 @@
-
-# Consider dependencies only in project.
-set(CMAKE_DEPENDS_IN_PROJECT_ONLY OFF)
-
-# The set of languages for which implicit dependencies are needed:
-set(CMAKE_DEPENDS_LANGUAGES
-  )
-
-# The set of dependency files which are needed:
-set(CMAKE_DEPENDS_DEPENDENCY_FILES
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c" "CMakeFiles/vterm-module.dir/elisp.c.o" "gcc" "CMakeFiles/vterm-module.dir/elisp.c.o.d"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c" "CMakeFiles/vterm-module.dir/utf8.c.o" "gcc" "CMakeFiles/vterm-module.dir/utf8.c.o.d"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c" "CMakeFiles/vterm-module.dir/vterm-module.c.o" "gcc" "CMakeFiles/vterm-module.dir/vterm-module.c.o.d"
-  )
-
-# Targets to which this target links which contain Fortran sources.
-set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
-  )
-
-# Targets to which this target links which contain Fortran sources.
-set(CMAKE_Fortran_TARGET_FORWARD_LINKED_INFO_FILES
-  )
-
-# Fortran module output directory.
-set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/build.make b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/build.make
@@ -1,143 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Delete rule output on recipe failure.
-.DELETE_ON_ERROR:
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Disable VCS-based implicit rules.
-% : %,v
-
-# Disable VCS-based implicit rules.
-% : RCS/%
-
-# Disable VCS-based implicit rules.
-% : RCS/%,v
-
-# Disable VCS-based implicit rules.
-% : SCCS/s.%
-
-# Disable VCS-based implicit rules.
-% : s.%
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Command-line flag to silence nested $(MAKE).
-$(VERBOSE)MAKESILENT = -s
-
-#Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E rm -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-# Include any dependencies generated for this target.
-include CMakeFiles/vterm-module.dir/depend.make
-# Include any dependencies generated by the compiler for this target.
-include CMakeFiles/vterm-module.dir/compiler_depend.make
-
-# Include the progress variables for this target.
-include CMakeFiles/vterm-module.dir/progress.make
-
-# Include the compile flags for this target's objects.
-include CMakeFiles/vterm-module.dir/flags.make
-
-CMakeFiles/vterm-module.dir/vterm-module.c.o: CMakeFiles/vterm-module.dir/flags.make
-CMakeFiles/vterm-module.dir/vterm-module.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c
-CMakeFiles/vterm-module.dir/vterm-module.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/vterm-module.dir/vterm-module.c.o"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/vterm-module.c.o -MF CMakeFiles/vterm-module.dir/vterm-module.c.o.d -o CMakeFiles/vterm-module.dir/vterm-module.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c
-
-CMakeFiles/vterm-module.dir/vterm-module.c.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/vterm-module.c.i"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c > CMakeFiles/vterm-module.dir/vterm-module.c.i
-
-CMakeFiles/vterm-module.dir/vterm-module.c.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/vterm-module.c.s"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c -o CMakeFiles/vterm-module.dir/vterm-module.c.s
-
-CMakeFiles/vterm-module.dir/utf8.c.o: CMakeFiles/vterm-module.dir/flags.make
-CMakeFiles/vterm-module.dir/utf8.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c
-CMakeFiles/vterm-module.dir/utf8.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/vterm-module.dir/utf8.c.o"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/utf8.c.o -MF CMakeFiles/vterm-module.dir/utf8.c.o.d -o CMakeFiles/vterm-module.dir/utf8.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c
-
-CMakeFiles/vterm-module.dir/utf8.c.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/utf8.c.i"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c > CMakeFiles/vterm-module.dir/utf8.c.i
-
-CMakeFiles/vterm-module.dir/utf8.c.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/utf8.c.s"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c -o CMakeFiles/vterm-module.dir/utf8.c.s
-
-CMakeFiles/vterm-module.dir/elisp.c.o: CMakeFiles/vterm-module.dir/flags.make
-CMakeFiles/vterm-module.dir/elisp.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c
-CMakeFiles/vterm-module.dir/elisp.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/vterm-module.dir/elisp.c.o"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/elisp.c.o -MF CMakeFiles/vterm-module.dir/elisp.c.o.d -o CMakeFiles/vterm-module.dir/elisp.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c
-
-CMakeFiles/vterm-module.dir/elisp.c.i: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/elisp.c.i"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c > CMakeFiles/vterm-module.dir/elisp.c.i
-
-CMakeFiles/vterm-module.dir/elisp.c.s: cmake_force
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/elisp.c.s"
-	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c -o CMakeFiles/vterm-module.dir/elisp.c.s
-
-# Object files for target vterm-module
-vterm__module_OBJECTS = \
-"CMakeFiles/vterm-module.dir/vterm-module.c.o" \
-"CMakeFiles/vterm-module.dir/utf8.c.o" \
-"CMakeFiles/vterm-module.dir/elisp.c.o"
-
-# External object files for target vterm-module
-vterm__module_EXTERNAL_OBJECTS =
-
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: CMakeFiles/vterm-module.dir/vterm-module.c.o
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: CMakeFiles/vterm-module.dir/utf8.c.o
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: CMakeFiles/vterm-module.dir/elisp.c.o
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: CMakeFiles/vterm-module.dir/build.make
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: libvterm-prefix/src/libvterm/.libs/libvterm.a
-/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so: CMakeFiles/vterm-module.dir/link.txt
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking C shared module /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so"
-	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/vterm-module.dir/link.txt --verbose=$(VERBOSE)
-
-# Rule to build all files generated by this target.
-CMakeFiles/vterm-module.dir/build: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so
-.PHONY : CMakeFiles/vterm-module.dir/build
-
-CMakeFiles/vterm-module.dir/clean:
-	$(CMAKE_COMMAND) -P CMakeFiles/vterm-module.dir/cmake_clean.cmake
-.PHONY : CMakeFiles/vterm-module.dir/clean
-
-CMakeFiles/vterm-module.dir/depend:
-	cd /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551 /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/DependInfo.cmake "--color=$(COLOR)"
-.PHONY : CMakeFiles/vterm-module.dir/depend
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake
@@ -1,15 +0,0 @@
-file(REMOVE_RECURSE
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.pdb"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so"
-  "CMakeFiles/vterm-module.dir/elisp.c.o"
-  "CMakeFiles/vterm-module.dir/elisp.c.o.d"
-  "CMakeFiles/vterm-module.dir/utf8.c.o"
-  "CMakeFiles/vterm-module.dir/utf8.c.o.d"
-  "CMakeFiles/vterm-module.dir/vterm-module.c.o"
-  "CMakeFiles/vterm-module.dir/vterm-module.c.o.d"
-)
-
-# Per-language clean rules from dependency scanning.
-foreach(lang C)
-  include(CMakeFiles/vterm-module.dir/cmake_clean_${lang}.cmake OPTIONAL)
-endforeach()
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o.d b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/elisp.c.o.d
@@ -1,43 +0,0 @@
-CMakeFiles/vterm-module.dir/elisp.c.o: \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.c \
- /usr/include/stdc-predef.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/emacs-module.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stddef.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdint.h \
- /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
- /usr/include/features.h /usr/include/features-time64.h \
- /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h /usr/include/bits/wchar.h \
- /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
- /usr/include/bits/stdint-least.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdbool.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm/include/vterm.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h /usr/include/sys/types.h \
- /usr/include/bits/types/clock_t.h /usr/include/bits/types/clockid_t.h \
- /usr/include/bits/types/time_t.h /usr/include/bits/types/timer_t.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm/include/vterm_keycodes.h \
- /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdarg.h \
- /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/flags.make b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/flags.make
@@ -1,10 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# compile C with /usr/bin/cc
-C_DEFINES = -Dvterm_module_EXPORTS
-
-C_INCLUDES = -isystem /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm/include
-
-C_FLAGS = -O2 -g -DNDEBUG -std=gnu99 -fPIC -fvisibility=hidden
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/link.txt b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/link.txt
@@ -1 +0,0 @@
-/usr/bin/cc -fPIC -O2 -g -DNDEBUG -shared  -o /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.so "CMakeFiles/vterm-module.dir/vterm-module.c.o" "CMakeFiles/vterm-module.dir/utf8.c.o" "CMakeFiles/vterm-module.dir/elisp.c.o"  libvterm-prefix/src/libvterm/.libs/libvterm.a
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o.d b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/utf8.c.o.d
@@ -1,16 +0,0 @@
-CMakeFiles/vterm-module.dir/utf8.c.o: \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.c \
- /usr/include/stdc-predef.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdbool.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stddef.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdint.h \
- /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
- /usr/include/features.h /usr/include/features-time64.h \
- /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h /usr/include/bits/wchar.h \
- /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
- /usr/include/bits/stdint-least.h
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d b/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d
@@ -1,67 +0,0 @@
-CMakeFiles/vterm-module.dir/vterm-module.c.o: \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.c \
- /usr/include/stdc-predef.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/vterm-module.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/emacs-module.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stddef.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdint.h \
- /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
- /usr/include/features.h /usr/include/features-time64.h \
- /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/include/bits/types.h /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h /usr/include/bits/wchar.h \
- /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
- /usr/include/bits/stdint-least.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdbool.h \
- /usr/include/inttypes.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm/include/vterm.h \
- /usr/include/stdlib.h /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h /usr/include/sys/types.h \
- /usr/include/bits/types/clock_t.h /usr/include/bits/types/clockid_t.h \
- /usr/include/bits/types/time_t.h /usr/include/bits/types/timer_t.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h /usr/include/sys/select.h \
- /usr/include/bits/select.h /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm/include/vterm_keycodes.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/elisp.h \
- /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/utf8.h \
- /usr/include/assert.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \
- /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h \
- /usr/include/bits/struct_stat.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/limits.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/bits/posix1_lim.h \
- /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/bits/pthread_stack_min.h /usr/include/bits/posix2_lim.h \
- /usr/include/stdio.h \
- /usr/lib/gcc/x86_64-pc-linux-gnu/13.2.1/include/stdarg.h \
- /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \
- /usr/include/string.h /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h /usr/include/strings.h \
- /usr/include/termios.h /usr/include/bits/termios.h \
- /usr/include/bits/termios-struct.h /usr/include/bits/termios-c_cc.h \
- /usr/include/bits/termios-c_iflag.h /usr/include/bits/termios-c_oflag.h \
- /usr/include/bits/termios-baud.h /usr/include/bits/termios-c_cflag.h \
- /usr/include/bits/termios-c_lflag.h /usr/include/bits/termios-tcflow.h \
- /usr/include/bits/termios-misc.h /usr/include/sys/ttydefaults.h \
- /usr/include/unistd.h /usr/include/bits/posix_opt.h \
- /usr/include/bits/environments.h /usr/include/bits/confname.h \
- /usr/include/bits/getopt_posix.h /usr/include/bits/getopt_core.h \
- /usr/include/bits/unistd_ext.h
diff --git a/emacs/elpa/vterm-20240325.1551/build/Makefile b/emacs/elpa/vterm-20240325.1551/build/Makefile
@@ -1,263 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.29
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-# Allow only one "make -f Makefile2" at a time, but pass parallelism.
-.NOTPARALLEL:
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canonical targets will work.
-.SUFFIXES:
-
-# Disable VCS-based implicit rules.
-% : %,v
-
-# Disable VCS-based implicit rules.
-% : RCS/%
-
-# Disable VCS-based implicit rules.
-% : RCS/%,v
-
-# Disable VCS-based implicit rules.
-% : SCCS/s.%
-
-# Disable VCS-based implicit rules.
-% : s.%
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Command-line flag to silence nested $(MAKE).
-$(VERBOSE)MAKESILENT = -s
-
-#Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E rm -f
-
-# Escaping for special characters.
-EQUALS = =
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
-	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build//CMakeFiles/progress.marks
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named vterm-module
-
-# Build rule for target.
-vterm-module: cmake_check_build_system
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 vterm-module
-.PHONY : vterm-module
-
-# fast build rule for target.
-vterm-module/fast:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/build
-.PHONY : vterm-module/fast
-
-#=============================================================================
-# Target rules for targets named libvterm
-
-# Build rule for target.
-libvterm: cmake_check_build_system
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 libvterm
-.PHONY : libvterm
-
-# fast build rule for target.
-libvterm/fast:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/build
-.PHONY : libvterm/fast
-
-#=============================================================================
-# Target rules for targets named run
-
-# Build rule for target.
-run: cmake_check_build_system
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 run
-.PHONY : run
-
-# fast build rule for target.
-run/fast:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/build
-.PHONY : run/fast
-
-elisp.o: elisp.c.o
-.PHONY : elisp.o
-
-# target to build an object file
-elisp.c.o:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.o
-.PHONY : elisp.c.o
-
-elisp.i: elisp.c.i
-.PHONY : elisp.i
-
-# target to preprocess a source file
-elisp.c.i:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.i
-.PHONY : elisp.c.i
-
-elisp.s: elisp.c.s
-.PHONY : elisp.s
-
-# target to generate assembly for a file
-elisp.c.s:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.s
-.PHONY : elisp.c.s
-
-utf8.o: utf8.c.o
-.PHONY : utf8.o
-
-# target to build an object file
-utf8.c.o:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.o
-.PHONY : utf8.c.o
-
-utf8.i: utf8.c.i
-.PHONY : utf8.i
-
-# target to preprocess a source file
-utf8.c.i:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.i
-.PHONY : utf8.c.i
-
-utf8.s: utf8.c.s
-.PHONY : utf8.s
-
-# target to generate assembly for a file
-utf8.c.s:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.s
-.PHONY : utf8.c.s
-
-vterm-module.o: vterm-module.c.o
-.PHONY : vterm-module.o
-
-# target to build an object file
-vterm-module.c.o:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.o
-.PHONY : vterm-module.c.o
-
-vterm-module.i: vterm-module.c.i
-.PHONY : vterm-module.i
-
-# target to preprocess a source file
-vterm-module.c.i:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.i
-.PHONY : vterm-module.c.i
-
-vterm-module.s: vterm-module.c.s
-.PHONY : vterm-module.s
-
-# target to generate assembly for a file
-vterm-module.c.s:
-	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.s
-.PHONY : vterm-module.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... rebuild_cache"
-	@echo "... libvterm"
-	@echo "... run"
-	@echo "... vterm-module"
-	@echo "... elisp.o"
-	@echo "... elisp.i"
-	@echo "... elisp.s"
-	@echo "... utf8.o"
-	@echo "... utf8.i"
-	@echo "... utf8.s"
-	@echo "... vterm-module.o"
-	@echo "... vterm-module.i"
-	@echo "... vterm-module.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/cmake_install.cmake b/emacs/elpa/vterm-20240325.1551/build/cmake_install.cmake
@@ -1,54 +0,0 @@
-# Install script for directory: /home/dwrz/.config/emacs/elpa/vterm-20240325.1551
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "/usr/local")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  if(BUILD_TYPE)
-    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  else()
-    set(CMAKE_INSTALL_CONFIG_NAME "RelWithDebInfo")
-  endif()
-  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
-  if(COMPONENT)
-    message(STATUS "Install component: \"${COMPONENT}\"")
-    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  else()
-    set(CMAKE_INSTALL_COMPONENT)
-  endif()
-endif()
-
-# Install shared libraries without execute permission?
-if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  set(CMAKE_INSTALL_SO_NO_EXE "0")
-endif()
-
-# Is this installation the result of a crosscompile?
-if(NOT DEFINED CMAKE_CROSSCOMPILING)
-  set(CMAKE_CROSSCOMPILING "FALSE")
-endif()
-
-# Set default install directory permissions.
-if(NOT DEFINED CMAKE_OBJDUMP)
-  set(CMAKE_OBJDUMP "/usr/bin/objdump")
-endif()
-
-if(CMAKE_INSTALL_COMPONENT)
-  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-else()
-  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-endif()
-
-string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
-       "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/${CMAKE_INSTALL_MANIFEST}"
-     "${CMAKE_INSTALL_MANIFEST_CONTENT}")
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm
@@ -1 +0,0 @@
-Subproject commit 64f1775952dbe001e989f2ab679563b54f2fca55
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt
@@ -1,15 +0,0 @@
-# This is a generated file and its contents are an internal implementation detail.
-# The download step will be re-executed if anything in this file changes.
-# No other meaning or use of this file is supported.
-
-method=git
-command=/usr/bin/cmake;-P;/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
-source_dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm
-work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src
-repository=https://github.com/Sbozzolo/libvterm-mirror.git
-remote=origin
-init_submodules=TRUE
-recurse_submodules=--recursive
-submodules=
-CMP0097=
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
@@ -1,15 +0,0 @@
-# This is a generated file and its contents are an internal implementation detail.
-# The download step will be re-executed if anything in this file changes.
-# No other meaning or use of this file is supported.
-
-method=git
-command=/usr/bin/cmake;-P;/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
-source_dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm
-work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src
-repository=https://github.com/Sbozzolo/libvterm-mirror.git
-remote=origin
-init_submodules=TRUE
-recurse_submodules=--recursive
-submodules=
-CMP0097=
-
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
@@ -1,7 +0,0 @@
-# This is a generated file and its contents are an internal implementation detail.
-# The patch step will be re-executed if anything in this file changes.
-# No other meaning or use of this file is supported.
-
-command (connected)=/usr/bin/cmake;-Dcan_fetch=YES;-P;/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
-command (disconnected)=/usr/bin/cmake;-Dcan_fetch=NO;-P;/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
-work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
@@ -1,73 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-cmake_minimum_required(VERSION 3.5)
-
-if(EXISTS "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt" AND EXISTS "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt" AND
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt" IS_NEWER_THAN "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt")
-  message(STATUS
-    "Avoiding repeated git clone, stamp file is up to date: "
-    "'/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt'"
-  )
-  return()
-endif()
-
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E rm -rf "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-  RESULT_VARIABLE error_code
-)
-if(error_code)
-  message(FATAL_ERROR "Failed to remove directory: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm'")
-endif()
-
-# try the clone 3 times in case there is an odd git clone issue
-set(error_code 1)
-set(number_of_tries 0)
-while(error_code AND number_of_tries LESS 3)
-  execute_process(
-    COMMAND "/usr/bin/git"
-            clone --no-checkout --config "advice.detachedHead=false" "https://github.com/Sbozzolo/libvterm-mirror.git" "libvterm"
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src"
-    RESULT_VARIABLE error_code
-  )
-  math(EXPR number_of_tries "${number_of_tries} + 1")
-endwhile()
-if(number_of_tries GREATER 1)
-  message(STATUS "Had to git clone more than once: ${number_of_tries} times.")
-endif()
-if(error_code)
-  message(FATAL_ERROR "Failed to clone repository: 'https://github.com/Sbozzolo/libvterm-mirror.git'")
-endif()
-
-execute_process(
-  COMMAND "/usr/bin/git"
-          checkout "64f1775952dbe001e989f2ab679563b54f2fca55" --
-  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-  RESULT_VARIABLE error_code
-)
-if(error_code)
-  message(FATAL_ERROR "Failed to checkout tag: '64f1775952dbe001e989f2ab679563b54f2fca55'")
-endif()
-
-set(init_submodules TRUE)
-if(init_submodules)
-  execute_process(
-    COMMAND "/usr/bin/git" 
-            submodule update --recursive --init 
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    RESULT_VARIABLE error_code
-  )
-endif()
-if(error_code)
-  message(FATAL_ERROR "Failed to update submodules in: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm'")
-endif()
-
-# Complete success, update the script-last-run stamp file:
-#
-execute_process(
-  COMMAND ${CMAKE_COMMAND} -E copy "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt" "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt"
-  RESULT_VARIABLE error_code
-)
-if(error_code)
-  message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt'")
-endif()
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
@@ -1,292 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-cmake_minimum_required(VERSION 3.5)
-
-function(do_fetch)
-  message(VERBOSE "Fetching latest from the remote origin")
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git fetch --tags --force "origin"
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    COMMAND_ERROR_IS_FATAL LAST
-  )
-endfunction()
-
-function(get_hash_for_ref ref out_var err_var)
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git rev-parse "${ref}^0"
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    RESULT_VARIABLE error_code
-    OUTPUT_VARIABLE ref_hash
-    ERROR_VARIABLE error_msg
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if(error_code)
-    set(${out_var} "" PARENT_SCOPE)
-  else()
-    set(${out_var} "${ref_hash}" PARENT_SCOPE)
-  endif()
-  set(${err_var} "${error_msg}" PARENT_SCOPE)
-endfunction()
-
-get_hash_for_ref(HEAD head_sha error_msg)
-if(head_sha STREQUAL "")
-  message(FATAL_ERROR "Failed to get the hash for HEAD:\n${error_msg}")
-endif()
-
-
-execute_process(
-  COMMAND "/usr/bin/git" --git-dir=.git show-ref "64f1775952dbe001e989f2ab679563b54f2fca55"
-  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-  OUTPUT_VARIABLE show_ref_output
-)
-if(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/remotes/")
-  # Given a full remote/branch-name and we know about it already. Since
-  # branches can move around, we should always fetch, if permitted.
-  if(can_fetch)
-    do_fetch()
-  endif()
-  set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
-
-elseif(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/tags/")
-  # Given a tag name that we already know about. We don't know if the tag we
-  # have matches the remote though (tags can move), so we should fetch. As a
-  # special case to preserve backward compatibility, if we are already at the
-  # same commit as the tag we hold locally, don't do a fetch and assume the tag
-  # hasn't moved on the remote.
-  # FIXME: We should provide an option to always fetch for this case
-  get_hash_for_ref("64f1775952dbe001e989f2ab679563b54f2fca55" tag_sha error_msg)
-  if(tag_sha STREQUAL head_sha)
-    message(VERBOSE "Already at requested tag: ${tag_sha}")
-    return()
-  endif()
-
-  if(can_fetch)
-    do_fetch()
-  endif()
-  set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
-
-elseif(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/heads/")
-  # Given a branch name without any remote and we already have a branch by that
-  # name. We might already have that branch checked out or it might be a
-  # different branch. It isn't fully safe to use a bare branch name without the
-  # remote, so do a fetch (if allowed) and replace the ref with one that
-  # includes the remote.
-  if(can_fetch)
-    do_fetch()
-  endif()
-  set(checkout_name "origin/64f1775952dbe001e989f2ab679563b54f2fca55")
-
-else()
-  get_hash_for_ref("64f1775952dbe001e989f2ab679563b54f2fca55" tag_sha error_msg)
-  if(tag_sha STREQUAL head_sha)
-    # Have the right commit checked out already
-    message(VERBOSE "Already at requested ref: ${tag_sha}")
-    return()
-
-  elseif(tag_sha STREQUAL "")
-    # We don't know about this ref yet, so we have no choice but to fetch.
-    if(NOT can_fetch)
-      message(FATAL_ERROR
-        "Requested git ref \"64f1775952dbe001e989f2ab679563b54f2fca55\" is not present locally, and not "
-        "allowed to contact remote due to UPDATE_DISCONNECTED setting."
-      )
-    endif()
-
-    # We deliberately swallow any error message at the default log level
-    # because it can be confusing for users to see a failed git command.
-    # That failure is being handled here, so it isn't an error.
-    if(NOT error_msg STREQUAL "")
-      message(VERBOSE "${error_msg}")
-    endif()
-    do_fetch()
-    set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
-
-  else()
-    # We have the commit, so we know we were asked to find a commit hash
-    # (otherwise it would have been handled further above), but we don't
-    # have that commit checked out yet. We don't need to fetch from the remote.
-    set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
-    if(NOT error_msg STREQUAL "")
-      message(WARNING "${error_msg}")
-    endif()
-
-  endif()
-endif()
-
-set(git_update_strategy "REBASE")
-if(git_update_strategy STREQUAL "")
-  # Backward compatibility requires REBASE as the default behavior
-  set(git_update_strategy REBASE)
-endif()
-
-if(git_update_strategy MATCHES "^REBASE(_CHECKOUT)?$")
-  # Asked to potentially try to rebase first, maybe with fallback to checkout.
-  # We can't if we aren't already on a branch and we shouldn't if that local
-  # branch isn't tracking the one we want to checkout.
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git symbolic-ref -q HEAD
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    OUTPUT_VARIABLE current_branch
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    # Don't test for an error. If this isn't a branch, we get a non-zero error
-    # code but empty output.
-  )
-
-  if(current_branch STREQUAL "")
-    # Not on a branch, checkout is the only sensible option since any rebase
-    # would always fail (and backward compatibility requires us to checkout in
-    # this situation)
-    set(git_update_strategy CHECKOUT)
-
-  else()
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git for-each-ref "--format=%(upstream:short)" "${current_branch}"
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      OUTPUT_VARIABLE upstream_branch
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      COMMAND_ERROR_IS_FATAL ANY  # There is no error if no upstream is set
-    )
-    if(NOT upstream_branch STREQUAL checkout_name)
-      # Not safe to rebase when asked to checkout a different branch to the one
-      # we are tracking. If we did rebase, we could end up with arbitrary
-      # commits added to the ref we were asked to checkout if the current local
-      # branch happens to be able to rebase onto the target branch. There would
-      # be no error message and the user wouldn't know this was occurring.
-      set(git_update_strategy CHECKOUT)
-    endif()
-
-  endif()
-elseif(NOT git_update_strategy STREQUAL "CHECKOUT")
-  message(FATAL_ERROR "Unsupported git update strategy: ${git_update_strategy}")
-endif()
-
-
-# Check if stash is needed
-execute_process(
-  COMMAND "/usr/bin/git" --git-dir=.git status --porcelain
-  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-  RESULT_VARIABLE error_code
-  OUTPUT_VARIABLE repo_status
-)
-if(error_code)
-  message(FATAL_ERROR "Failed to get the status")
-endif()
-string(LENGTH "${repo_status}" need_stash)
-
-# If not in clean state, stash changes in order to be able to perform a
-# rebase or checkout without losing those changes permanently
-if(need_stash)
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git stash save --quiet;--include-untracked
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    COMMAND_ERROR_IS_FATAL ANY
-  )
-endif()
-
-if(git_update_strategy STREQUAL "CHECKOUT")
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git checkout "${checkout_name}"
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    COMMAND_ERROR_IS_FATAL ANY
-  )
-else()
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git rebase "${checkout_name}"
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    RESULT_VARIABLE error_code
-    OUTPUT_VARIABLE rebase_output
-    ERROR_VARIABLE  rebase_output
-  )
-  if(error_code)
-    # Rebase failed, undo the rebase attempt before continuing
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git rebase --abort
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    )
-
-    if(NOT git_update_strategy STREQUAL "REBASE_CHECKOUT")
-      # Not allowed to do a checkout as a fallback, so cannot proceed
-      if(need_stash)
-        execute_process(
-          COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
-          WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-          )
-      endif()
-      message(FATAL_ERROR "\nFailed to rebase in: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm'."
-                          "\nOutput from the attempted rebase follows:"
-                          "\n${rebase_output}"
-                          "\n\nYou will have to resolve the conflicts manually")
-    endif()
-
-    # Fall back to checkout. We create an annotated tag so that the user
-    # can manually inspect the situation and revert if required.
-    # We can't log the failed rebase output because MSVC sees it and
-    # intervenes, causing the build to fail even though it completes.
-    # Write it to a file instead.
-    string(TIMESTAMP tag_timestamp "%Y%m%dT%H%M%S" UTC)
-    set(tag_name _cmake_ExternalProject_moved_from_here_${tag_timestamp}Z)
-    set(error_log_file ${CMAKE_CURRENT_LIST_DIR}/rebase_error_${tag_timestamp}Z.log)
-    file(WRITE ${error_log_file} "${rebase_output}")
-    message(WARNING "Rebase failed, output has been saved to ${error_log_file}"
-                    "\nFalling back to checkout, previous commit tagged as ${tag_name}")
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git tag -a
-              -m "ExternalProject attempting to move from here to ${checkout_name}"
-              ${tag_name}
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      COMMAND_ERROR_IS_FATAL ANY
-    )
-
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git checkout "${checkout_name}"
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      COMMAND_ERROR_IS_FATAL ANY
-    )
-  endif()
-endif()
-
-if(need_stash)
-  # Put back the stashed changes
-  execute_process(
-    COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    RESULT_VARIABLE error_code
-    )
-  if(error_code)
-    # Stash pop --index failed: Try again dropping the index
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git reset --hard --quiet
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    )
-    execute_process(
-      COMMAND "/usr/bin/git" --git-dir=.git stash pop --quiet
-      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      RESULT_VARIABLE error_code
-    )
-    if(error_code)
-      # Stash pop failed: Restore previous state.
-      execute_process(
-        COMMAND "/usr/bin/git" --git-dir=.git reset --hard --quiet ${head_sha}
-        WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      )
-      execute_process(
-        COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
-        WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-      )
-      message(FATAL_ERROR "\nFailed to unstash changes in: '/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm'."
-                          "\nYou will have to resolve the conflicts manually")
-    endif()
-  endif()
-endif()
-
-set(init_submodules "TRUE")
-if(init_submodules)
-  execute_process(
-    COMMAND "/usr/bin/git"
-            --git-dir=.git 
-            submodule update --recursive --init 
-    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-    COMMAND_ERROR_IS_FATAL ANY
-  )
-endif()
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake b/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
@@ -1,22 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-cmake_minimum_required(VERSION 3.5)
-
-file(MAKE_DIRECTORY
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-build"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src"
-  "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp"
-)
-
-set(configSubDirs )
-foreach(subDir IN LISTS configSubDirs)
-    file(MAKE_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/${subDir}")
-endforeach()
-if(cfgdir)
-  file(MAKE_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp${cfgdir}") # cfgdir has leading slash
-endif()
diff --git a/emacs/elpa/vterm-20240325.1551/vterm-module.h b/emacs/elpa/vterm-20240325.1551/vterm-module.h
@@ -1,169 +0,0 @@
-#ifndef VTERM_MODULE_H
-#define VTERM_MODULE_H
-
-#include "emacs-module.h"
-#include <inttypes.h>
-#include <stdbool.h>
-#include <vterm.h>
-
-// https://gcc.gnu.org/wiki/Visibility
-#if defined _WIN32 || defined __CYGWIN__
-#ifdef __GNUC__
-#define VTERM_EXPORT __attribute__((dllexport))
-#else
-#define VTERM_EXPORT __declspec(dllexport)
-#endif
-#else
-#if __GNUC__ >= 4
-#define VTERM_EXPORT __attribute__((visibility("default")))
-#else
-#define VTERM_EXPORT
-#endif
-#endif
-
-VTERM_EXPORT int plugin_is_GPL_compatible;
-
-#define SB_MAX 100000 // Maximum 'scrollback' value.
-
-#ifndef MIN
-#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
-#endif
-#ifndef MAX
-#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
-#endif
-
-typedef struct LineInfo {
-  char *directory; /* working directory */
-
-  int prompt_col; /* end column of the prompt, if the current line contains the
-                   * prompt */
-} LineInfo;
-
-typedef struct ScrollbackLine {
-  size_t cols;
-  LineInfo *info;
-  VTermScreenCell cells[];
-} ScrollbackLine;
-
-typedef struct ElispCodeListNode {
-  char *code;
-  size_t code_len;
-  struct ElispCodeListNode *next;
-} ElispCodeListNode;
-
-/*  c , p , q , s , 0 , 1 , 2 , 3 , 4 , 5 , 6 , and 7  */
-/* clipboard, primary, secondary, select, or cut buffers 0 through 7 */
-#define SELECTION_BUF_LEN 4096
-
-typedef struct Cursor {
-  int row, col;
-  int cursor_type;
-  bool cursor_visible;
-  bool cursor_blink;
-  bool cursor_type_changed;
-  bool cursor_blink_changed;
-} Cursor;
-
-typedef struct Term {
-  VTerm *vt;
-  VTermScreen *vts;
-  // buffer used to:
-  //  - convert VTermScreen cell arrays into utf8 strings
-  //  - receive data from libvterm as a result of key presses.
-  ScrollbackLine **sb_buffer; // Scrollback buffer storage for libvterm
-  size_t sb_current;          // number of rows pushed to sb_buffer
-  size_t sb_size;             // sb_buffer size
-  // "virtual index" that points to the first sb_buffer row that we need to
-  // push to the terminal buffer when refreshing the scrollback. When negative,
-  // it actually points to entries that are no longer in sb_buffer (because the
-  // window height has increased) and must be deleted from the terminal buffer
-  int sb_pending;
-  int sb_pending_by_height_decr;
-  bool sb_clear_pending;
-  long linenum;
-  long linenum_added;
-
-  int invalid_start, invalid_end; // invalid rows in libvterm screen
-  bool is_invalidated;
-
-  Cursor cursor;
-  char *title;
-  bool title_changed;
-
-  char *directory;
-  bool directory_changed;
-
-  // Single-linked list of elisp_code.
-  // Newer commands are added at the tail.
-  ElispCodeListNode *elisp_code_first;
-  ElispCodeListNode **elisp_code_p_insert; // pointer to the position where new
-                                           // node should be inserted
-
-  /*  c , p , q , s , 0 , 1 , 2 , 3 , 4 , 5 , 6 , and 7  */
-  /* clipboard, primary, secondary, select, or cut buffers 0 through 7 */
-  int selection_mask; /* see VTermSelectionMask in vterm.h */
-  char *selection_data;
-  char selection_buf[SELECTION_BUF_LEN];
-
-  /* the size of dirs almost = window height, value = directory of that line */
-  LineInfo **lines;
-  int lines_len;
-
-  int width, height;
-  int height_resize;
-  bool resizing;
-  bool disable_bold_font;
-  bool disable_underline;
-  bool disable_inverse_video;
-  bool ignore_blink_cursor;
-
-  char *cmd_buffer;
-
-  int pty_fd;
-} Term;
-
-static bool compare_cells(VTermScreenCell *a, VTermScreenCell *b);
-static bool is_key(unsigned char *key, size_t len, char *key_description);
-static emacs_value render_text(emacs_env *env, Term *term, char *string,
-                               int len, VTermScreenCell *cell);
-static emacs_value render_fake_newline(emacs_env *env, Term *term);
-static emacs_value render_prompt(emacs_env *env, emacs_value text);
-static emacs_value cell_rgb_color(emacs_env *env, Term *term,
-                                  VTermScreenCell *cell, bool is_foreground);
-
-static int term_settermprop(VTermProp prop, VTermValue *val, void *user_data);
-
-static void term_redraw(Term *term, emacs_env *env);
-static void term_flush_output(Term *term, emacs_env *env);
-static void term_process_key(Term *term, emacs_env *env, unsigned char *key,
-                             size_t len, VTermModifier modifier);
-static void invalidate_terminal(Term *term, int start_row, int end_row);
-
-void term_finalize(void *object);
-
-emacs_value Fvterm_new(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
-                       void *data);
-emacs_value Fvterm_update(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
-                          void *data);
-emacs_value Fvterm_redraw(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
-                          void *data);
-emacs_value Fvterm_write_input(emacs_env *env, ptrdiff_t nargs,
-                               emacs_value args[], void *data);
-emacs_value Fvterm_set_size(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
-                            void *data);
-emacs_value Fvterm_set_pty_name(emacs_env *env, ptrdiff_t nargs,
-                                emacs_value args[], void *data);
-emacs_value Fvterm_get_icrnl(emacs_env *env, ptrdiff_t nargs,
-                             emacs_value args[], void *data);
-
-emacs_value Fvterm_get_pwd(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
-                           void *data);
-
-emacs_value Fvterm_get_prompt_point(emacs_env *env, ptrdiff_t nargs,
-                                    emacs_value args[], void *data);
-emacs_value Fvterm_reset_cursor_point(emacs_env *env, ptrdiff_t nargs,
-                                      emacs_value args[], void *data);
-
-VTERM_EXPORT int emacs_module_init(struct emacs_runtime *ert);
-
-#endif /* VTERM_MODULE_H */
diff --git a/emacs/elpa/vterm-20240325.1551/vterm-module.so b/emacs/elpa/vterm-20240325.1551/vterm-module.so
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/vterm-pkg.el b/emacs/elpa/vterm-20240325.1551/vterm-pkg.el
@@ -1,14 +0,0 @@
-(define-package "vterm" "20240325.1551" "Fully-featured terminal emulator"
-  '((emacs "25.1"))
-  :commit "ae4ae1aef2fcae98a37aad83f2a6aeeaeacedd4f" :authors
-  '(("Lukas Fürmetz" . "fuermetz@mailbox.org"))
-  :maintainers
-  '(("Lukas Fürmetz" . "fuermetz@mailbox.org"))
-  :maintainer
-  '("Lukas Fürmetz" . "fuermetz@mailbox.org")
-  :keywords
-  '("terminals")
-  :url "https://github.com/akermu/emacs-libvterm")
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/vterm-20240325.1551/vterm.elc b/emacs/elpa/vterm-20240325.1551/vterm.elc
Binary files differ.
diff --git a/emacs/elpa/vterm-20240325.1551/CMakeLists.txt b/emacs/elpa/vterm-20240520.231/CMakeLists.txt
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeCache.txt b/emacs/elpa/vterm-20240520.231/build/CMakeCache.txt
@@ -0,0 +1,355 @@
+# This is the CMakeCache file.
+# For build in directory: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+# It was generated by CMake: /usr/bin/cmake
+# You can edit this file to change values found and used by cmake.
+# If you do not want to change any of the values, simply exit the editor.
+# If you do want to change a value, simply edit, save, and exit the editor.
+# The syntax for the file is as follows:
+# KEY:TYPE=VALUE
+# KEY is the name of a variable in the cache.
+# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
+# VALUE is the current value for the KEY.
+
+########################
+# EXTERNAL cache entries
+########################
+
+//Path to a program.
+CMAKE_ADDR2LINE:FILEPATH=/usr/bin/addr2line
+
+//Path to a program.
+CMAKE_AR:FILEPATH=/usr/bin/ar
+
+//Build type (default RelWithDebInfo)
+CMAKE_BUILD_TYPE:STRING=RelWithDebInfo
+
+//Enable/Disable color output during build.
+CMAKE_COLOR_MAKEFILE:BOOL=ON
+
+//C compiler
+CMAKE_C_COMPILER:FILEPATH=/usr/bin/cc
+
+//A wrapper around 'ar' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_AR:FILEPATH=/usr/bin/gcc-ar
+
+//A wrapper around 'ranlib' adding the appropriate '--plugin' option
+// for the GCC compiler
+CMAKE_C_COMPILER_RANLIB:FILEPATH=/usr/bin/gcc-ranlib
+
+//Flags used by the C compiler during all build types.
+CMAKE_C_FLAGS:STRING=
+
+//Flags used by the C compiler during DEBUG builds.
+CMAKE_C_FLAGS_DEBUG:STRING=-g
+
+//Flags used by the C compiler during MINSIZEREL builds.
+CMAKE_C_FLAGS_MINSIZEREL:STRING=-Os -DNDEBUG
+
+//Flags used by the C compiler during RELEASE builds.
+CMAKE_C_FLAGS_RELEASE:STRING=-O3 -DNDEBUG
+
+//Flags used by the C compiler during RELWITHDEBINFO builds.
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG
+
+//Path to a program.
+CMAKE_DLLTOOL:FILEPATH=CMAKE_DLLTOOL-NOTFOUND
+
+//Flags used by the linker during all build types.
+CMAKE_EXE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during DEBUG builds.
+CMAKE_EXE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during MINSIZEREL builds.
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during RELEASE builds.
+CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during RELWITHDEBINFO builds.
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Enable/Disable output of compile commands during generation.
+CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
+
+//Value Computed by CMake.
+CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/pkgRedirects
+
+//Install path prefix, prepended onto install directories.
+CMAKE_INSTALL_PREFIX:PATH=/usr/local
+
+//Path to a program.
+CMAKE_LINKER:FILEPATH=/usr/bin/ld
+
+//Path to a program.
+CMAKE_MAKE_PROGRAM:FILEPATH=/usr/bin/make
+
+//Flags used by the linker during the creation of modules during
+// all build types.
+CMAKE_MODULE_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during the creation of modules during
+// DEBUG builds.
+CMAKE_MODULE_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during the creation of modules during
+// MINSIZEREL builds.
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during the creation of modules during
+// RELEASE builds.
+CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during the creation of modules during
+// RELWITHDEBINFO builds.
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_NM:FILEPATH=/usr/bin/nm
+
+//Path to a program.
+CMAKE_OBJCOPY:FILEPATH=/usr/bin/objcopy
+
+//Path to a program.
+CMAKE_OBJDUMP:FILEPATH=/usr/bin/objdump
+
+//Value Computed by CMake
+CMAKE_PROJECT_DESCRIPTION:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
+
+//Value Computed by CMake
+CMAKE_PROJECT_NAME:STATIC=emacs-libvterm
+
+//Path to a program.
+CMAKE_RANLIB:FILEPATH=/usr/bin/ranlib
+
+//Path to a program.
+CMAKE_READELF:FILEPATH=/usr/bin/readelf
+
+//Flags used by the linker during the creation of shared libraries
+// during all build types.
+CMAKE_SHARED_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during DEBUG builds.
+CMAKE_SHARED_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during MINSIZEREL builds.
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during RELEASE builds.
+CMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during the creation of shared libraries
+// during RELWITHDEBINFO builds.
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//If set, runtime paths are not added when installing shared libraries,
+// but are added when building.
+CMAKE_SKIP_INSTALL_RPATH:BOOL=NO
+
+//If set, runtime paths are not added when using shared libraries.
+CMAKE_SKIP_RPATH:BOOL=NO
+
+//Flags used by the linker during the creation of static libraries
+// during all build types.
+CMAKE_STATIC_LINKER_FLAGS:STRING=
+
+//Flags used by the linker during the creation of static libraries
+// during DEBUG builds.
+CMAKE_STATIC_LINKER_FLAGS_DEBUG:STRING=
+
+//Flags used by the linker during the creation of static libraries
+// during MINSIZEREL builds.
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL:STRING=
+
+//Flags used by the linker during the creation of static libraries
+// during RELEASE builds.
+CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING=
+
+//Flags used by the linker during the creation of static libraries
+// during RELWITHDEBINFO builds.
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING=
+
+//Path to a program.
+CMAKE_STRIP:FILEPATH=/usr/bin/strip
+
+//Path to a program.
+CMAKE_TAPI:FILEPATH=CMAKE_TAPI-NOTFOUND
+
+//If this value is on, makefiles will be generated without the
+// .SILENT directive, and all commands will be echoed to the console
+// during the make.  This is useful for debugging only. With Visual
+// Studio IDE projects all commands are done without /nologo.
+CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
+
+//Git command line client
+GIT_EXECUTABLE:FILEPATH=/usr/bin/git
+
+//Path to a program.
+LIBTOOL:FILEPATH=/usr/bin/libtool
+
+//Path to a file.
+LIBVTERM_INCLUDE_DIR:PATH=LIBVTERM_INCLUDE_DIR-NOTFOUND
+
+//Use system libvterm instead of the vendored version.
+USE_SYSTEM_LIBVTERM:BOOL=ON
+
+//Value Computed by CMake
+emacs-libvterm_BINARY_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+//Value Computed by CMake
+emacs-libvterm_IS_TOP_LEVEL:STATIC=ON
+
+//Value Computed by CMake
+emacs-libvterm_SOURCE_DIR:STATIC=/home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+//Dependencies for the target
+vterm-module_LIB_DEPENDS:STATIC=general;vterm;
+
+
+########################
+# INTERNAL cache entries
+########################
+
+//ADVANCED property for variable: CMAKE_ADDR2LINE
+CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_AR
+CMAKE_AR-ADVANCED:INTERNAL=1
+//This is the directory where this CMakeCache.txt was created
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+//Major version of cmake used to create the current loaded cache
+CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
+//Minor version of cmake used to create the current loaded cache
+CMAKE_CACHE_MINOR_VERSION:INTERNAL=29
+//Patch version of cmake used to create the current loaded cache
+CMAKE_CACHE_PATCH_VERSION:INTERNAL=3
+//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
+CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
+//Path to CMake executable.
+CMAKE_COMMAND:INTERNAL=/usr/bin/cmake
+//Path to cpack program executable.
+CMAKE_CPACK_COMMAND:INTERNAL=/usr/bin/cpack
+//Path to ctest program executable.
+CMAKE_CTEST_COMMAND:INTERNAL=/usr/bin/ctest
+//ADVANCED property for variable: CMAKE_C_COMPILER
+CMAKE_C_COMPILER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_AR
+CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB
+CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS
+CMAKE_C_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG
+CMAKE_C_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_MINSIZEREL
+CMAKE_C_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELEASE
+CMAKE_C_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_C_FLAGS_RELWITHDEBINFO
+CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_DLLTOOL
+CMAKE_DLLTOOL-ADVANCED:INTERNAL=1
+//Path to cache edit program executable.
+CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/ccmake
+//Executable file format
+CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
+CMAKE_EXE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_DEBUG
+CMAKE_EXE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
+CMAKE_EXE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELEASE
+CMAKE_EXE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS
+CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1
+//Name of external makefile project generator.
+CMAKE_EXTRA_GENERATOR:INTERNAL=
+//Name of generator.
+CMAKE_GENERATOR:INTERNAL=Unix Makefiles
+//Generator instance identifier.
+CMAKE_GENERATOR_INSTANCE:INTERNAL=
+//Name of generator platform.
+CMAKE_GENERATOR_PLATFORM:INTERNAL=
+//Name of generator toolset.
+CMAKE_GENERATOR_TOOLSET:INTERNAL=
+//Source directory with the top level CMakeLists.txt file for this
+// project
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/dwrz/.config/emacs/elpa/vterm-20240520.231
+//Install .so files without execute permission.
+CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0
+//ADVANCED property for variable: CMAKE_LINKER
+CMAKE_LINKER-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MAKE_PROGRAM
+CMAKE_MAKE_PROGRAM-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
+CMAKE_MODULE_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_DEBUG
+CMAKE_MODULE_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
+CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELEASE
+CMAKE_MODULE_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_NM
+CMAKE_NM-ADVANCED:INTERNAL=1
+//number of local generators
+CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
+//ADVANCED property for variable: CMAKE_OBJCOPY
+CMAKE_OBJCOPY-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_OBJDUMP
+CMAKE_OBJDUMP-ADVANCED:INTERNAL=1
+//Platform information initialized
+CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_RANLIB
+CMAKE_RANLIB-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_READELF
+CMAKE_READELF-ADVANCED:INTERNAL=1
+//Path to CMake installation.
+CMAKE_ROOT:INTERNAL=/usr/share/cmake
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
+CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
+CMAKE_SHARED_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
+CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELEASE
+CMAKE_SHARED_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_INSTALL_RPATH
+CMAKE_SKIP_INSTALL_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_SKIP_RPATH
+CMAKE_SKIP_RPATH-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS
+CMAKE_STATIC_LINKER_FLAGS-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_DEBUG
+CMAKE_STATIC_LINKER_FLAGS_DEBUG-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
+CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELEASE
+CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
+CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_STRIP
+CMAKE_STRIP-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: CMAKE_TAPI
+CMAKE_TAPI-ADVANCED:INTERNAL=1
+//uname command
+CMAKE_UNAME:INTERNAL=/usr/bin/uname
+//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
+CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: GIT_EXECUTABLE
+GIT_EXECUTABLE-ADVANCED:INTERNAL=1
+//linker supports push/pop state
+_CMAKE_LINKER_PUSHPOP_STATE_SUPPORTED:INTERNAL=TRUE
+
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeCCompiler.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeCCompiler.cmake
@@ -0,0 +1,80 @@
+set(CMAKE_C_COMPILER "/usr/bin/cc")
+set(CMAKE_C_COMPILER_ARG1 "")
+set(CMAKE_C_COMPILER_ID "GNU")
+set(CMAKE_C_COMPILER_VERSION "14.1.1")
+set(CMAKE_C_COMPILER_VERSION_INTERNAL "")
+set(CMAKE_C_COMPILER_WRAPPER "")
+set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "17")
+set(CMAKE_C_EXTENSIONS_COMPUTED_DEFAULT "ON")
+set(CMAKE_C_COMPILE_FEATURES "c_std_90;c_function_prototypes;c_std_99;c_restrict;c_variadic_macros;c_std_11;c_static_assert;c_std_17;c_std_23")
+set(CMAKE_C90_COMPILE_FEATURES "c_std_90;c_function_prototypes")
+set(CMAKE_C99_COMPILE_FEATURES "c_std_99;c_restrict;c_variadic_macros")
+set(CMAKE_C11_COMPILE_FEATURES "c_std_11;c_static_assert")
+set(CMAKE_C17_COMPILE_FEATURES "c_std_17")
+set(CMAKE_C23_COMPILE_FEATURES "c_std_23")
+
+set(CMAKE_C_PLATFORM_ID "Linux")
+set(CMAKE_C_SIMULATE_ID "")
+set(CMAKE_C_COMPILER_FRONTEND_VARIANT "GNU")
+set(CMAKE_C_SIMULATE_VERSION "")
+
+
+
+
+set(CMAKE_AR "/usr/bin/ar")
+set(CMAKE_C_COMPILER_AR "/usr/bin/gcc-ar")
+set(CMAKE_RANLIB "/usr/bin/ranlib")
+set(CMAKE_C_COMPILER_RANLIB "/usr/bin/gcc-ranlib")
+set(CMAKE_LINKER "/usr/bin/ld")
+set(CMAKE_LINKER_LINK "")
+set(CMAKE_LINKER_LLD "")
+set(CMAKE_C_COMPILER_LINKER "/usr/bin/ld")
+set(CMAKE_C_COMPILER_LINKER_ID "GNU")
+set(CMAKE_C_COMPILER_LINKER_VERSION 2.42.0)
+set(CMAKE_C_COMPILER_LINKER_FRONTEND_VARIANT GNU)
+set(CMAKE_MT "")
+set(CMAKE_TAPI "CMAKE_TAPI-NOTFOUND")
+set(CMAKE_COMPILER_IS_GNUCC 1)
+set(CMAKE_C_COMPILER_LOADED 1)
+set(CMAKE_C_COMPILER_WORKS TRUE)
+set(CMAKE_C_ABI_COMPILED TRUE)
+
+set(CMAKE_C_COMPILER_ENV_VAR "CC")
+
+set(CMAKE_C_COMPILER_ID_RUN 1)
+set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m)
+set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
+set(CMAKE_C_LINKER_PREFERENCE 10)
+set(CMAKE_C_LINKER_DEPFILE_SUPPORTED FALSE)
+
+# Save compiler ABI information.
+set(CMAKE_C_SIZEOF_DATA_PTR "8")
+set(CMAKE_C_COMPILER_ABI "ELF")
+set(CMAKE_C_BYTE_ORDER "LITTLE_ENDIAN")
+set(CMAKE_C_LIBRARY_ARCHITECTURE "")
+
+if(CMAKE_C_SIZEOF_DATA_PTR)
+  set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}")
+endif()
+
+if(CMAKE_C_COMPILER_ABI)
+  set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}")
+endif()
+
+if(CMAKE_C_LIBRARY_ARCHITECTURE)
+  set(CMAKE_LIBRARY_ARCHITECTURE "")
+endif()
+
+set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "")
+if(CMAKE_C_CL_SHOWINCLUDES_PREFIX)
+  set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}")
+endif()
+
+
+
+
+
+set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed;/usr/include")
+set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "gcc;gcc_s;c;gcc;gcc_s")
+set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1;/usr/lib;/lib")
+set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "")
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeDetermineCompilerABI_C.bin b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeDetermineCompilerABI_C.bin
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeSystem.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CMakeSystem.cmake
@@ -0,0 +1,15 @@
+set(CMAKE_HOST_SYSTEM "Linux-6.9.1-arch1-1")
+set(CMAKE_HOST_SYSTEM_NAME "Linux")
+set(CMAKE_HOST_SYSTEM_VERSION "6.9.1-arch1-1")
+set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")
+
+
+
+set(CMAKE_SYSTEM "Linux-6.9.1-arch1-1")
+set(CMAKE_SYSTEM_NAME "Linux")
+set(CMAKE_SYSTEM_VERSION "6.9.1-arch1-1")
+set(CMAKE_SYSTEM_PROCESSOR "x86_64")
+
+set(CMAKE_CROSSCOMPILING "FALSE")
+
+set(CMAKE_SYSTEM_LOADED 1)
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/3.29.1/CompilerIdC/CMakeCCompilerId.c b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/CMakeCCompilerId.c
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/a.out b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/a.out
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeConfigureLog.yaml b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeConfigureLog.yaml
@@ -0,0 +1,261 @@
+
+---
+events:
+  -
+    kind: "message-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/CMakeDetermineSystem.cmake:205 (message)"
+      - "CMakeLists.txt:4 (project)"
+    message: |
+      The system is: Linux - 6.9.1-arch1-1 - x86_64
+  -
+    kind: "message-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake:17 (message)"
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake:64 (__determine_compiler_id_test)"
+      - "/usr/share/cmake/Modules/CMakeDetermineCCompiler.cmake:123 (CMAKE_DETERMINE_COMPILER_ID)"
+      - "CMakeLists.txt:4 (project)"
+    message: |
+      Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
+      Compiler: /usr/bin/cc 
+      Build flags: 
+      Id flags:  
+      
+      The output was:
+      0
+      
+      
+      Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out"
+      
+      The C compiler identification is GNU, found in:
+        /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/3.29.3/CompilerIdC/a.out
+      
+  -
+    kind: "try_compile-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:67 (try_compile)"
+      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
+      - "CMakeLists.txt:4 (project)"
+    checks:
+      - "Detecting C compiler ABI info"
+    directories:
+      source: "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx"
+      binary: "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx"
+    cmakeVariables:
+      CMAKE_C_FLAGS: ""
+      CMAKE_C_FLAGS_DEBUG: "-g"
+      CMAKE_EXE_LINKER_FLAGS: ""
+    buildResult:
+      variable: "CMAKE_C_ABI_COMPILED"
+      cached: true
+      stdout: |
+        Change Dir: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx'
+        
+        Run Build Command(s): /usr/bin/cmake -E env VERBOSE=1 /usr/bin/make -f Makefile cmTC_401a6/fast
+        /usr/bin/make  -f CMakeFiles/cmTC_401a6.dir/build.make CMakeFiles/cmTC_401a6.dir/build
+        make[1]: Entering directory '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx'
+        Building C object CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o
+        /usr/bin/cc   -v -o CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake/Modules/CMakeCCompilerABI.c
+        Using built-in specs.
+        COLLECT_GCC=/usr/bin/cc
+        Target: x86_64-pc-linux-gnu
+        Configured with: /build/gcc/src/gcc/configure --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://gitlab.archlinux.org/archlinux/packaging/packages/gcc/-/issues --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror
+        Thread model: posix
+        Supported LTO compression algorithms: zlib zstd
+        gcc version 14.1.1 20240507 (GCC) 
+        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/'
+         /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/cc1 -quiet -v /usr/share/cmake/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_401a6.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -o /tmp/ccaJnqJb.s
+        GNU C17 (GCC) version 14.1.1 20240507 (x86_64-pc-linux-gnu)
+        	compiled by GNU C version 14.1.1 20240507, GMP version 6.3.0, MPFR version 4.2.1, MPC version 1.3.1, isl version isl-0.26-GMP
+        
+        GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072
+        ignoring nonexistent directory "/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../x86_64-pc-linux-gnu/include"
+        #include "..." search starts here:
+        #include <...> search starts here:
+         /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include
+         /usr/local/include
+         /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed
+         /usr/include
+        End of search list.
+        Compiler executable checksum: 908f8163b2a59706e95751f49db6306c
+        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/'
+         as -v --64 -o CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o /tmp/ccaJnqJb.s
+        GNU assembler version 2.42.0 (x86_64-pc-linux-gnu) using BFD version (GNU Binutils) 2.42.0
+        COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/
+        LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../:/lib/:/usr/lib/
+        COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.'
+        Linking C executable cmTC_401a6
+        /usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_401a6.dir/link.txt --verbose=1
+        /usr/bin/cc  -v -Wl,-v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -o cmTC_401a6
+        Using built-in specs.
+        COLLECT_GCC=/usr/bin/cc
+        COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper
+        Target: x86_64-pc-linux-gnu
+        Configured with: /build/gcc/src/gcc/configure --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://gitlab.archlinux.org/archlinux/packaging/packages/gcc/-/issues --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror
+        Thread model: posix
+        Supported LTO compression algorithms: zlib zstd
+        gcc version 14.1.1 20240507 (GCC) 
+        COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/
+        LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../:/lib/:/usr/lib/
+        COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_401a6' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_401a6.'
+         /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/collect2 -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper -plugin-opt=-fresolution=/tmp/ccjhyeKn.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_401a6 /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../.. -v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o
+        collect2 version 14.1.1 20240507
+        /usr/bin/ld -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper -plugin-opt=-fresolution=/tmp/ccjhyeKn.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_401a6 /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../.. -v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o
+        GNU ld (GNU Binutils) 2.42.0
+        COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_401a6' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_401a6.'
+        make[1]: Leaving directory '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx'
+        
+      exitCode: 0
+  -
+    kind: "message-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:137 (message)"
+      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
+      - "CMakeLists.txt:4 (project)"
+    message: |
+      Parsed C implicit include dir info: rv=done
+        found start of include info
+        found start of implicit include info
+          add: [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include]
+          add: [/usr/local/include]
+          add: [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed]
+          add: [/usr/include]
+        end of search list found
+        collapse include dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include]
+        collapse include dir [/usr/local/include] ==> [/usr/local/include]
+        collapse include dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed]
+        collapse include dir [/usr/include] ==> [/usr/include]
+        implicit include dirs: [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include;/usr/local/include;/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed;/usr/include]
+      
+      
+  -
+    kind: "message-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:173 (message)"
+      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
+      - "CMakeLists.txt:4 (project)"
+    message: |
+      Parsed C implicit link information:
+        link line regex: [^( *|.*[/\\])(ld[0-9]*(\\.[a-z]+)?|CMAKE_LINK_STARTFILE-NOTFOUND|([^/\\]+-)?ld|collect2)[^/\\]*( |$)]
+        linker tool regex: [^[ 	]*(->|")?[ 	]*(([^"]*[/\\])?(ld[0-9]*(\\.[a-z]+)?))("|,| |$)]
+        ignore line: [Change Dir: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx']
+        ignore line: []
+        ignore line: [Run Build Command(s): /usr/bin/cmake -E env VERBOSE=1 /usr/bin/make -f Makefile cmTC_401a6/fast]
+        ignore line: [/usr/bin/make  -f CMakeFiles/cmTC_401a6.dir/build.make CMakeFiles/cmTC_401a6.dir/build]
+        ignore line: [make[1]: Entering directory '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeScratch/TryCompile-JioMZx']
+        ignore line: [Building C object CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o]
+        ignore line: [/usr/bin/cc   -v -o CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -c /usr/share/cmake/Modules/CMakeCCompilerABI.c]
+        ignore line: [Using built-in specs.]
+        ignore line: [COLLECT_GCC=/usr/bin/cc]
+        ignore line: [Target: x86_64-pc-linux-gnu]
+        ignore line: [Configured with: /build/gcc/src/gcc/configure --enable-languages=ada c c++ d fortran go lto m2 objc obj-c++ rust --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://gitlab.archlinux.org/archlinux/packaging/packages/gcc/-/issues --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror]
+        ignore line: [Thread model: posix]
+        ignore line: [Supported LTO compression algorithms: zlib zstd]
+        ignore line: [gcc version 14.1.1 20240507 (GCC) ]
+        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/']
+        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/cc1 -quiet -v /usr/share/cmake/Modules/CMakeCCompilerABI.c -quiet -dumpdir CMakeFiles/cmTC_401a6.dir/ -dumpbase CMakeCCompilerABI.c.c -dumpbase-ext .c -mtune=generic -march=x86-64 -version -o /tmp/ccaJnqJb.s]
+        ignore line: [GNU C17 (GCC) version 14.1.1 20240507 (x86_64-pc-linux-gnu)]
+        ignore line: [	compiled by GNU C version 14.1.1 20240507  GMP version 6.3.0  MPFR version 4.2.1  MPC version 1.3.1  isl version isl-0.26-GMP]
+        ignore line: []
+        ignore line: [GGC heuristics: --param ggc-min-expand=100 --param ggc-min-heapsize=131072]
+        ignore line: [ignoring nonexistent directory "/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../x86_64-pc-linux-gnu/include"]
+        ignore line: [#include "..." search starts here:]
+        ignore line: [#include <...> search starts here:]
+        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include]
+        ignore line: [ /usr/local/include]
+        ignore line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include-fixed]
+        ignore line: [ /usr/include]
+        ignore line: [End of search list.]
+        ignore line: [Compiler executable checksum: 908f8163b2a59706e95751f49db6306c]
+        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/']
+        ignore line: [ as -v --64 -o CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o /tmp/ccaJnqJb.s]
+        ignore line: [GNU assembler version 2.42.0 (x86_64-pc-linux-gnu) using BFD version (GNU Binutils) 2.42.0]
+        ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/]
+        ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../:/lib/:/usr/lib/]
+        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o' '-c' '-mtune=generic' '-march=x86-64' '-dumpdir' 'CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.']
+        ignore line: [Linking C executable cmTC_401a6]
+        ignore line: [/usr/bin/cmake -E cmake_link_script CMakeFiles/cmTC_401a6.dir/link.txt --verbose=1]
+        ignore line: [/usr/bin/cc  -v -Wl -v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -o cmTC_401a6]
+        ignore line: [Using built-in specs.]
+        ignore line: [COLLECT_GCC=/usr/bin/cc]
+        ignore line: [COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper]
+        ignore line: [Target: x86_64-pc-linux-gnu]
+        ignore line: [Configured with: /build/gcc/src/gcc/configure --enable-languages=ada c c++ d fortran go lto m2 objc obj-c++ rust --enable-bootstrap --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=https://gitlab.archlinux.org/archlinux/packaging/packages/gcc/-/issues --with-build-config=bootstrap-lto --with-linker-hash-style=gnu --with-system-zlib --enable-__cxa_atexit --enable-cet=auto --enable-checking=release --enable-clocale=gnu --enable-default-pie --enable-default-ssp --enable-gnu-indirect-function --enable-gnu-unique-object --enable-libstdcxx-backtrace --enable-link-serialization=1 --enable-linker-build-id --enable-lto --enable-multilib --enable-plugin --enable-shared --enable-threads=posix --disable-libssp --disable-libstdcxx-pch --disable-werror]
+        ignore line: [Thread model: posix]
+        ignore line: [Supported LTO compression algorithms: zlib zstd]
+        ignore line: [gcc version 14.1.1 20240507 (GCC) ]
+        ignore line: [COMPILER_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/]
+        ignore line: [LIBRARY_PATH=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/:/lib/../lib/:/usr/lib/../lib/:/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../:/lib/:/usr/lib/]
+        ignore line: [COLLECT_GCC_OPTIONS='-v' '-o' 'cmTC_401a6' '-mtune=generic' '-march=x86-64' '-dumpdir' 'cmTC_401a6.']
+        link line: [ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/collect2 -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper -plugin-opt=-fresolution=/tmp/ccjhyeKn.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_401a6 /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../.. -v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o]
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/collect2] ==> ignore
+          arg [-plugin] ==> ignore
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/liblto_plugin.so] ==> ignore
+          arg [-plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper] ==> ignore
+          arg [-plugin-opt=-fresolution=/tmp/ccjhyeKn.res] ==> ignore
+          arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
+          arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore
+          arg [-plugin-opt=-pass-through=-lc] ==> ignore
+          arg [-plugin-opt=-pass-through=-lgcc] ==> ignore
+          arg [-plugin-opt=-pass-through=-lgcc_s] ==> ignore
+          arg [--build-id] ==> ignore
+          arg [--eh-frame-hdr] ==> ignore
+          arg [--hash-style=gnu] ==> ignore
+          arg [-m] ==> ignore
+          arg [elf_x86_64] ==> ignore
+          arg [-dynamic-linker] ==> ignore
+          arg [/lib64/ld-linux-x86-64.so.2] ==> ignore
+          arg [-pie] ==> ignore
+          arg [-o] ==> ignore
+          arg [cmTC_401a6] ==> ignore
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o]
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o]
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o]
+          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1]
+          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib]
+          arg [-L/lib/../lib] ==> dir [/lib/../lib]
+          arg [-L/usr/lib/../lib] ==> dir [/usr/lib/../lib]
+          arg [-L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../..] ==> dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../..]
+          arg [-v] ==> ignore
+          arg [CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o] ==> ignore
+          arg [-lgcc] ==> lib [gcc]
+          arg [--push-state] ==> ignore
+          arg [--as-needed] ==> ignore
+          arg [-lgcc_s] ==> lib [gcc_s]
+          arg [--pop-state] ==> ignore
+          arg [-lc] ==> lib [c]
+          arg [-lgcc] ==> lib [gcc]
+          arg [--push-state] ==> ignore
+          arg [--as-needed] ==> ignore
+          arg [-lgcc_s] ==> lib [gcc_s]
+          arg [--pop-state] ==> ignore
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o]
+          arg [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o] ==> obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o]
+        ignore line: [collect2 version 14.1.1 20240507]
+        ignore line: [/usr/bin/ld -plugin /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/liblto_plugin.so -plugin-opt=/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/lto-wrapper -plugin-opt=-fresolution=/tmp/ccjhyeKn.res -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s -plugin-opt=-pass-through=-lc -plugin-opt=-pass-through=-lgcc -plugin-opt=-pass-through=-lgcc_s --build-id --eh-frame-hdr --hash-style=gnu -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 -pie -o cmTC_401a6 /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1 -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../.. -v CMakeFiles/cmTC_401a6.dir/CMakeCCompilerABI.c.o -lgcc --push-state --as-needed -lgcc_s --pop-state -lc -lgcc --push-state --as-needed -lgcc_s --pop-state /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o]
+        linker tool for 'C': /usr/bin/ld
+        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/Scrt1.o] ==> [/usr/lib/Scrt1.o]
+        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crti.o] ==> [/usr/lib/crti.o]
+        collapse obj [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib/crtn.o] ==> [/usr/lib/crtn.o]
+        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1] ==> [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1]
+        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../../../lib] ==> [/usr/lib]
+        collapse library dir [/lib/../lib] ==> [/lib]
+        collapse library dir [/usr/lib/../lib] ==> [/usr/lib]
+        collapse library dir [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/../../..] ==> [/usr/lib]
+        implicit libs: [gcc;gcc_s;c;gcc;gcc_s]
+        implicit objs: [/usr/lib/Scrt1.o;/usr/lib/crti.o;/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtbeginS.o;/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/crtendS.o;/usr/lib/crtn.o]
+        implicit dirs: [/usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1;/usr/lib;/lib]
+        implicit fwks: []
+      
+      
+  -
+    kind: "message-v1"
+    backtrace:
+      - "/usr/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake:40 (message)"
+      - "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake:210 (cmake_determine_linker_id)"
+      - "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake:26 (CMAKE_DETERMINE_COMPILER_ABI)"
+      - "CMakeLists.txt:4 (project)"
+    message: |
+      Running the C compiler's linker: "/usr/bin/ld" "-v"
+      GNU ld (GNU Binutils) 2.42.0
+...
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeDirectoryInformation.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -0,0 +1,16 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Relative path conversion top directories.
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/dwrz/.config/emacs/elpa/vterm-20240520.231")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build")
+
+# Force unix paths in dependencies.
+set(CMAKE_FORCE_UNIX_PATHS 1)
+
+
+# The C and CXX include file regular expressions for this directory.
+set(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$")
+set(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$")
+set(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN})
+set(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN})
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeRuleHashes.txt b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/CMakeRuleHashes.txt
@@ -0,0 +1,11 @@
+# Hashes of file build rules.
+c56347c0c0a5d5558355edfedbb0addb CMakeFiles/libvterm
+7c654afd9f54cd86fe3a771e836f4374 CMakeFiles/libvterm-complete
+8e0cd166af2af9ab5589fd6a71fda942 CMakeFiles/run
+876dc853fa5efbfca4eb9dd113878fbe libvterm-prefix/src/libvterm-stamp/libvterm-build
+cd77112783e71a7c94dfe4f48ef2c0b6 libvterm-prefix/src/libvterm-stamp/libvterm-configure
+81ea15769b9f5d5bcf70c7a5548f380d libvterm-prefix/src/libvterm-stamp/libvterm-download
+4f3762413143a822b7135db7fa36c7b1 libvterm-prefix/src/libvterm-stamp/libvterm-install
+84165b51911be120e3c17ae045b73b35 libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
+4c4fe69fc3b35a3e98a94c26dc8ed2d3 libvterm-prefix/src/libvterm-stamp/libvterm-patch
+514abc8701c1b8eb6befa44d003fc782 libvterm-prefix/src/libvterm-stamp/libvterm-update
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile.cmake
@@ -0,0 +1,131 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# The generator used is:
+set(CMAKE_DEPENDS_GENERATOR "Unix Makefiles")
+
+# The top level Makefile was generated from the following files:
+set(CMAKE_MAKEFILE_DEPENDS
+  "CMakeCache.txt"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/CMakeLists.txt"
+  "CMakeFiles/3.29.3/CMakeCCompiler.cmake"
+  "CMakeFiles/3.29.3/CMakeSystem.cmake"
+  "libvterm-prefix/tmp/libvterm-mkdirs.cmake"
+  "/usr/share/cmake/Modules/CMakeCCompiler.cmake.in"
+  "/usr/share/cmake/Modules/CMakeCCompilerABI.c"
+  "/usr/share/cmake/Modules/CMakeCInformation.cmake"
+  "/usr/share/cmake/Modules/CMakeCommonLanguageInclude.cmake"
+  "/usr/share/cmake/Modules/CMakeCompilerIdDetection.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineCCompiler.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineCompileFeatures.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake"
+  "/usr/share/cmake/Modules/CMakeDetermineSystem.cmake"
+  "/usr/share/cmake/Modules/CMakeFindBinUtils.cmake"
+  "/usr/share/cmake/Modules/CMakeGenericSystem.cmake"
+  "/usr/share/cmake/Modules/CMakeInitializeConfigs.cmake"
+  "/usr/share/cmake/Modules/CMakeLanguageInformation.cmake"
+  "/usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake"
+  "/usr/share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake"
+  "/usr/share/cmake/Modules/CMakeParseLibraryArchitecture.cmake"
+  "/usr/share/cmake/Modules/CMakeSystem.cmake.in"
+  "/usr/share/cmake/Modules/CMakeSystemSpecificInformation.cmake"
+  "/usr/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake"
+  "/usr/share/cmake/Modules/CMakeTestCCompiler.cmake"
+  "/usr/share/cmake/Modules/CMakeTestCompilerCommon.cmake"
+  "/usr/share/cmake/Modules/CMakeUnixFindMake.cmake"
+  "/usr/share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
+  "/usr/share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
+  "/usr/share/cmake/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Cray-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/CrayClang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/GHS-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/GNU-C.cmake"
+  "/usr/share/cmake/Modules/Compiler/GNU-FindBinUtils.cmake"
+  "/usr/share/cmake/Modules/Compiler/GNU.cmake"
+  "/usr/share/cmake/Modules/Compiler/HP-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/IAR-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
+  "/usr/share/cmake/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Intel-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/LCC-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/NVHPC-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/OrangeC-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/PGI-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/PathScale-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/TI-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/TIClang-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Tasking-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/Watcom-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/XL-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/XLClang-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
+  "/usr/share/cmake/Modules/ExternalProject.cmake"
+  "/usr/share/cmake/Modules/ExternalProject/PatchInfo.txt.in"
+  "/usr/share/cmake/Modules/ExternalProject/RepositoryInfo.txt.in"
+  "/usr/share/cmake/Modules/ExternalProject/UpdateInfo.txt.in"
+  "/usr/share/cmake/Modules/ExternalProject/cfgcmd.txt.in"
+  "/usr/share/cmake/Modules/ExternalProject/gitclone.cmake.in"
+  "/usr/share/cmake/Modules/ExternalProject/gitupdate.cmake.in"
+  "/usr/share/cmake/Modules/ExternalProject/mkdirs.cmake.in"
+  "/usr/share/cmake/Modules/ExternalProject/shared_internal_commands.cmake"
+  "/usr/share/cmake/Modules/FindGit.cmake"
+  "/usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake"
+  "/usr/share/cmake/Modules/FindPackageMessage.cmake"
+  "/usr/share/cmake/Modules/Internal/CMakeDetermineLinkerId.cmake"
+  "/usr/share/cmake/Modules/Internal/FeatureTesting.cmake"
+  "/usr/share/cmake/Modules/Platform/Linux-GNU-C.cmake"
+  "/usr/share/cmake/Modules/Platform/Linux-GNU.cmake"
+  "/usr/share/cmake/Modules/Platform/Linux-Initialize.cmake"
+  "/usr/share/cmake/Modules/Platform/Linux.cmake"
+  "/usr/share/cmake/Modules/Platform/UnixPaths.cmake"
+  )
+
+# The corresponding makefile is:
+set(CMAKE_MAKEFILE_OUTPUTS
+  "Makefile"
+  "CMakeFiles/cmake.check_cache"
+  )
+
+# Byproducts of CMake generate step:
+set(CMAKE_MAKEFILE_PRODUCTS
+  "CMakeFiles/3.29.3/CMakeSystem.cmake"
+  "CMakeFiles/3.29.3/CMakeCCompiler.cmake"
+  "CMakeFiles/3.29.3/CMakeCCompiler.cmake"
+  "libvterm-prefix/tmp/libvterm-mkdirs.cmake"
+  "libvterm-prefix/tmp/libvterm-gitclone.cmake"
+  "libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt"
+  "libvterm-prefix/tmp/libvterm-gitupdate.cmake"
+  "libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt"
+  "libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt"
+  "libvterm-prefix/tmp/libvterm-cfgcmd.txt"
+  "CMakeFiles/CMakeDirectoryInformation.cmake"
+  )
+
+# Dependency information for all targets:
+set(CMAKE_DEPEND_INFO_FILES
+  "CMakeFiles/vterm-module.dir/DependInfo.cmake"
+  "CMakeFiles/libvterm.dir/DependInfo.cmake"
+  "CMakeFiles/run.dir/DependInfo.cmake"
+  )
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile2 b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/Makefile2
@@ -0,0 +1,167 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+#=============================================================================
+# Directory level rules for the build root directory
+
+# The main recursive "all" target.
+all: CMakeFiles/vterm-module.dir/all
+all: CMakeFiles/libvterm.dir/all
+.PHONY : all
+
+# The main recursive "preinstall" target.
+preinstall:
+.PHONY : preinstall
+
+# The main recursive "clean" target.
+clean: CMakeFiles/vterm-module.dir/clean
+clean: CMakeFiles/libvterm.dir/clean
+clean: CMakeFiles/run.dir/clean
+.PHONY : clean
+
+#=============================================================================
+# Target rules for target CMakeFiles/vterm-module.dir
+
+# All Build rule for target.
+CMakeFiles/vterm-module.dir/all: CMakeFiles/libvterm.dir/all
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/depend
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/build
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=9,10,11,12 "Built target vterm-module"
+.PHONY : CMakeFiles/vterm-module.dir/all
+
+# Build rule for subdir invocation for target.
+CMakeFiles/vterm-module.dir/rule: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 12
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/vterm-module.dir/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 0
+.PHONY : CMakeFiles/vterm-module.dir/rule
+
+# Convenience name for target.
+vterm-module: CMakeFiles/vterm-module.dir/rule
+.PHONY : vterm-module
+
+# clean rule for target.
+CMakeFiles/vterm-module.dir/clean:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/clean
+.PHONY : CMakeFiles/vterm-module.dir/clean
+
+#=============================================================================
+# Target rules for target CMakeFiles/libvterm.dir
+
+# All Build rule for target.
+CMakeFiles/libvterm.dir/all:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/depend
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/build
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=1,2,3,4,5,6,7,8 "Built target libvterm"
+.PHONY : CMakeFiles/libvterm.dir/all
+
+# Build rule for subdir invocation for target.
+CMakeFiles/libvterm.dir/rule: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 8
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/libvterm.dir/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 0
+.PHONY : CMakeFiles/libvterm.dir/rule
+
+# Convenience name for target.
+libvterm: CMakeFiles/libvterm.dir/rule
+.PHONY : libvterm
+
+# clean rule for target.
+CMakeFiles/libvterm.dir/clean:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/clean
+.PHONY : CMakeFiles/libvterm.dir/clean
+
+#=============================================================================
+# Target rules for target CMakeFiles/run.dir
+
+# All Build rule for target.
+CMakeFiles/run.dir/all: CMakeFiles/vterm-module.dir/all
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/depend
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/build
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num= "Built target run"
+.PHONY : CMakeFiles/run.dir/all
+
+# Build rule for subdir invocation for target.
+CMakeFiles/run.dir/rule: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 12
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 CMakeFiles/run.dir/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 0
+.PHONY : CMakeFiles/run.dir/rule
+
+# Convenience name for target.
+run: CMakeFiles/run.dir/rule
+.PHONY : run
+
+# clean rule for target.
+CMakeFiles/run.dir/clean:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/clean
+.PHONY : CMakeFiles/run.dir/clean
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/TargetDirectories.txt b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/TargetDirectories.txt
@@ -0,0 +1,5 @@
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/edit_cache.dir
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/rebuild_cache.dir
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/cmake.check_cache b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/cmake.check_cache
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm-complete b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm-complete
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/DependInfo.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/DependInfo.cmake
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.json b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.json
@@ -0,0 +1,43 @@
+{
+	"sources" : 
+	[
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm-complete.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-build.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-download.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-install.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch.rule"
+		},
+		{
+			"file" : "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-update.rule"
+		}
+	],
+	"target" : 
+	{
+		"labels" : 
+		[
+			"libvterm"
+		],
+		"name" : "libvterm"
+	}
+}
+\ No newline at end of file
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.txt b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/Labels.txt
@@ -0,0 +1,13 @@
+# Target labels
+ libvterm
+# Source files and their labels
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm-complete.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-build.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-download.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-install.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch.rule
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-update.rule
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/build.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/build.make
@@ -0,0 +1,146 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+# Utility rule file for libvterm.
+
+# Include any custom commands dependencies for this target.
+include CMakeFiles/libvterm.dir/compiler_depend.make
+
+# Include the progress variables for this target.
+include CMakeFiles/libvterm.dir/progress.make
+
+CMakeFiles/libvterm: CMakeFiles/libvterm-complete
+
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-install
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-download
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-update
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-patch
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-configure
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-build
+CMakeFiles/libvterm-complete: libvterm-prefix/src/libvterm-stamp/libvterm-install
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Completed 'libvterm'"
+	/usr/bin/cmake -E make_directory /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles
+	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm-complete
+	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-done
+
+libvterm-prefix/src/libvterm-stamp/libvterm-build: libvterm-prefix/src/libvterm-stamp/libvterm-configure
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Performing build step for 'libvterm'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && make "CFLAGS='-fPIC'" "LDFLAGS='-static'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-build
+
+libvterm-prefix/src/libvterm-stamp/libvterm-configure: libvterm-prefix/tmp/libvterm-cfgcmd.txt
+libvterm-prefix/src/libvterm-stamp/libvterm-configure: libvterm-prefix/src/libvterm-stamp/libvterm-patch
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "No configure step for 'libvterm'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E echo_append
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure
+
+libvterm-prefix/src/libvterm-stamp/libvterm-download: libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
+libvterm-prefix/src/libvterm-stamp/libvterm-download: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Performing download step (git clone) for 'libvterm'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src && /usr/bin/cmake -P /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-download
+
+libvterm-prefix/src/libvterm-stamp/libvterm-install: libvterm-prefix/src/libvterm-stamp/libvterm-build
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "No install step for 'libvterm'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E echo_append
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-install
+
+libvterm-prefix/src/libvterm-stamp/libvterm-mkdir:
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Creating directories for 'libvterm'"
+	/usr/bin/cmake -Dcfgdir= -P /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
+	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
+
+libvterm-prefix/src/libvterm-stamp/libvterm-patch: libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt
+libvterm-prefix/src/libvterm-stamp/libvterm-patch: libvterm-prefix/src/libvterm-stamp/libvterm-update
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "No patch step for 'libvterm'"
+	/usr/bin/cmake -E echo_append
+	/usr/bin/cmake -E touch /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch
+
+libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/tmp/libvterm-gitupdate.cmake
+libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
+libvterm-prefix/src/libvterm-stamp/libvterm-update: libvterm-prefix/src/libvterm-stamp/libvterm-download
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Performing update step for 'libvterm'"
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm && /usr/bin/cmake -Dcan_fetch=YES -P /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
+
+libvterm: CMakeFiles/libvterm
+libvterm: CMakeFiles/libvterm-complete
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-build
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-configure
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-download
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-install
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-patch
+libvterm: libvterm-prefix/src/libvterm-stamp/libvterm-update
+libvterm: CMakeFiles/libvterm.dir/build.make
+.PHONY : libvterm
+
+# Rule to build all files generated by this target.
+CMakeFiles/libvterm.dir/build: libvterm
+.PHONY : CMakeFiles/libvterm.dir/build
+
+CMakeFiles/libvterm.dir/clean:
+	$(CMAKE_COMMAND) -P CMakeFiles/libvterm.dir/cmake_clean.cmake
+.PHONY : CMakeFiles/libvterm.dir/clean
+
+CMakeFiles/libvterm.dir/depend:
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/DependInfo.cmake "--color=$(COLOR)"
+.PHONY : CMakeFiles/libvterm.dir/depend
+
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/cmake_clean.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/cmake_clean.cmake
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/compiler_depend.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/compiler_depend.make
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/compiler_depend.ts b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/compiler_depend.ts
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/libvterm.dir/progress.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/libvterm.dir/progress.make
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/progress.marks b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/progress.marks
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/DependInfo.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/DependInfo.cmake
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/build.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/build.make
@@ -0,0 +1,87 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+# Utility rule file for run.
+
+# Include any custom commands dependencies for this target.
+include CMakeFiles/run.dir/compiler_depend.make
+
+# Include the progress variables for this target.
+include CMakeFiles/run.dir/progress.make
+
+CMakeFiles/run: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so
+	emacs -Q -L /home/dwrz/.config/emacs/elpa/vterm-20240520.231 -L /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build --eval \(require\ \'vterm\) --eval \(vterm\)
+
+run: CMakeFiles/run
+run: CMakeFiles/run.dir/build.make
+.PHONY : run
+
+# Rule to build all files generated by this target.
+CMakeFiles/run.dir/build: run
+.PHONY : CMakeFiles/run.dir/build
+
+CMakeFiles/run.dir/clean:
+	$(CMAKE_COMMAND) -P CMakeFiles/run.dir/cmake_clean.cmake
+.PHONY : CMakeFiles/run.dir/clean
+
+CMakeFiles/run.dir/depend:
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/DependInfo.cmake "--color=$(COLOR)"
+.PHONY : CMakeFiles/run.dir/depend
+
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/cmake_clean.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/cmake_clean.cmake
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/compiler_depend.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/compiler_depend.make
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/compiler_depend.ts b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/compiler_depend.ts
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/run.dir/progress.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/run.dir/progress.make
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/DependInfo.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/DependInfo.cmake
@@ -0,0 +1,25 @@
+
+# Consider dependencies only in project.
+set(CMAKE_DEPENDS_IN_PROJECT_ONLY OFF)
+
+# The set of languages for which implicit dependencies are needed:
+set(CMAKE_DEPENDS_LANGUAGES
+  )
+
+# The set of dependency files which are needed:
+set(CMAKE_DEPENDS_DEPENDENCY_FILES
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c" "CMakeFiles/vterm-module.dir/elisp.c.o" "gcc" "CMakeFiles/vterm-module.dir/elisp.c.o.d"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c" "CMakeFiles/vterm-module.dir/utf8.c.o" "gcc" "CMakeFiles/vterm-module.dir/utf8.c.o.d"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c" "CMakeFiles/vterm-module.dir/vterm-module.c.o" "gcc" "CMakeFiles/vterm-module.dir/vterm-module.c.o.d"
+  )
+
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
+  )
+
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_FORWARD_LINKED_INFO_FILES
+  )
+
+# Fortran module output directory.
+set(CMAKE_Fortran_TARGET_MODULE_DIR "")
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/build.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/build.make
@@ -0,0 +1,143 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Delete rule output on recipe failure.
+.DELETE_ON_ERROR:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+# Include any dependencies generated for this target.
+include CMakeFiles/vterm-module.dir/depend.make
+# Include any dependencies generated by the compiler for this target.
+include CMakeFiles/vterm-module.dir/compiler_depend.make
+
+# Include the progress variables for this target.
+include CMakeFiles/vterm-module.dir/progress.make
+
+# Include the compile flags for this target's objects.
+include CMakeFiles/vterm-module.dir/flags.make
+
+CMakeFiles/vterm-module.dir/vterm-module.c.o: CMakeFiles/vterm-module.dir/flags.make
+CMakeFiles/vterm-module.dir/vterm-module.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c
+CMakeFiles/vterm-module.dir/vterm-module.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building C object CMakeFiles/vterm-module.dir/vterm-module.c.o"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/vterm-module.c.o -MF CMakeFiles/vterm-module.dir/vterm-module.c.o.d -o CMakeFiles/vterm-module.dir/vterm-module.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c
+
+CMakeFiles/vterm-module.dir/vterm-module.c.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/vterm-module.c.i"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c > CMakeFiles/vterm-module.dir/vterm-module.c.i
+
+CMakeFiles/vterm-module.dir/vterm-module.c.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/vterm-module.c.s"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c -o CMakeFiles/vterm-module.dir/vterm-module.c.s
+
+CMakeFiles/vterm-module.dir/utf8.c.o: CMakeFiles/vterm-module.dir/flags.make
+CMakeFiles/vterm-module.dir/utf8.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c
+CMakeFiles/vterm-module.dir/utf8.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building C object CMakeFiles/vterm-module.dir/utf8.c.o"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/utf8.c.o -MF CMakeFiles/vterm-module.dir/utf8.c.o.d -o CMakeFiles/vterm-module.dir/utf8.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c
+
+CMakeFiles/vterm-module.dir/utf8.c.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/utf8.c.i"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c > CMakeFiles/vterm-module.dir/utf8.c.i
+
+CMakeFiles/vterm-module.dir/utf8.c.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/utf8.c.s"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c -o CMakeFiles/vterm-module.dir/utf8.c.s
+
+CMakeFiles/vterm-module.dir/elisp.c.o: CMakeFiles/vterm-module.dir/flags.make
+CMakeFiles/vterm-module.dir/elisp.c.o: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c
+CMakeFiles/vterm-module.dir/elisp.c.o: CMakeFiles/vterm-module.dir/compiler_depend.ts
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building C object CMakeFiles/vterm-module.dir/elisp.c.o"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -MD -MT CMakeFiles/vterm-module.dir/elisp.c.o -MF CMakeFiles/vterm-module.dir/elisp.c.o.d -o CMakeFiles/vterm-module.dir/elisp.c.o -c /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c
+
+CMakeFiles/vterm-module.dir/elisp.c.i: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing C source to CMakeFiles/vterm-module.dir/elisp.c.i"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -E /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c > CMakeFiles/vterm-module.dir/elisp.c.i
+
+CMakeFiles/vterm-module.dir/elisp.c.s: cmake_force
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling C source to assembly CMakeFiles/vterm-module.dir/elisp.c.s"
+	/usr/bin/cc $(C_DEFINES) $(C_INCLUDES) $(C_FLAGS) -S /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c -o CMakeFiles/vterm-module.dir/elisp.c.s
+
+# Object files for target vterm-module
+vterm__module_OBJECTS = \
+"CMakeFiles/vterm-module.dir/vterm-module.c.o" \
+"CMakeFiles/vterm-module.dir/utf8.c.o" \
+"CMakeFiles/vterm-module.dir/elisp.c.o"
+
+# External object files for target vterm-module
+vterm__module_EXTERNAL_OBJECTS =
+
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: CMakeFiles/vterm-module.dir/vterm-module.c.o
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: CMakeFiles/vterm-module.dir/utf8.c.o
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: CMakeFiles/vterm-module.dir/elisp.c.o
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: CMakeFiles/vterm-module.dir/build.make
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: libvterm-prefix/src/libvterm/.libs/libvterm.a
+/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so: CMakeFiles/vterm-module.dir/link.txt
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --bold --progress-dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking C shared module /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so"
+	$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/vterm-module.dir/link.txt --verbose=$(VERBOSE)
+
+# Rule to build all files generated by this target.
+CMakeFiles/vterm-module.dir/build: /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so
+.PHONY : CMakeFiles/vterm-module.dir/build
+
+CMakeFiles/vterm-module.dir/clean:
+	$(CMAKE_COMMAND) -P CMakeFiles/vterm-module.dir/cmake_clean.cmake
+.PHONY : CMakeFiles/vterm-module.dir/clean
+
+CMakeFiles/vterm-module.dir/depend:
+	cd /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231 /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/DependInfo.cmake "--color=$(COLOR)"
+.PHONY : CMakeFiles/vterm-module.dir/depend
+
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/cmake_clean.cmake
@@ -0,0 +1,15 @@
+file(REMOVE_RECURSE
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.pdb"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so"
+  "CMakeFiles/vterm-module.dir/elisp.c.o"
+  "CMakeFiles/vterm-module.dir/elisp.c.o.d"
+  "CMakeFiles/vterm-module.dir/utf8.c.o"
+  "CMakeFiles/vterm-module.dir/utf8.c.o.d"
+  "CMakeFiles/vterm-module.dir/vterm-module.c.o"
+  "CMakeFiles/vterm-module.dir/vterm-module.c.o.d"
+)
+
+# Per-language clean rules from dependency scanning.
+foreach(lang C)
+  include(CMakeFiles/vterm-module.dir/cmake_clean_${lang}.cmake OPTIONAL)
+endforeach()
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/compiler_depend.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/compiler_depend.make
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/compiler_depend.ts b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/compiler_depend.ts
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/depend.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/depend.make
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o.d b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/elisp.c.o.d
@@ -0,0 +1,43 @@
+CMakeFiles/vterm-module.dir/elisp.c.o: \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.c \
+ /usr/include/stdc-predef.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/emacs-module.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stddef.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/bits/time64.h /usr/include/bits/wchar.h \
+ /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdbool.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm/include/vterm.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/bits/floatn.h \
+ /usr/include/bits/floatn-common.h /usr/include/sys/types.h \
+ /usr/include/bits/types/clock_t.h /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/time_t.h /usr/include/bits/types/timer_t.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h /usr/include/bits/byteswap.h \
+ /usr/include/bits/uintn-identity.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/atomic_wide_counter.h /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm/include/vterm_keycodes.h \
+ /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdarg.h \
+ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/flags.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/flags.make
@@ -0,0 +1,10 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# compile C with /usr/bin/cc
+C_DEFINES = -Dvterm_module_EXPORTS
+
+C_INCLUDES = -isystem /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm/include
+
+C_FLAGS = -O2 -g -DNDEBUG -std=gnu99 -fPIC -fvisibility=hidden
+
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/link.txt b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/link.txt
@@ -0,0 +1 @@
+/usr/bin/cc -fPIC -O2 -g -DNDEBUG -shared  -o /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.so "CMakeFiles/vterm-module.dir/vterm-module.c.o" "CMakeFiles/vterm-module.dir/utf8.c.o" "CMakeFiles/vterm-module.dir/elisp.c.o"  libvterm-prefix/src/libvterm/.libs/libvterm.a
diff --git a/emacs/elpa/vterm-20240325.1551/build/CMakeFiles/vterm-module.dir/progress.make b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/progress.make
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o.d b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/utf8.c.o.d
@@ -0,0 +1,16 @@
+CMakeFiles/vterm-module.dir/utf8.c.o: \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.c \
+ /usr/include/stdc-predef.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdbool.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stddef.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/bits/time64.h /usr/include/bits/wchar.h \
+ /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdint-least.h
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d b/emacs/elpa/vterm-20240520.231/build/CMakeFiles/vterm-module.dir/vterm-module.c.o.d
@@ -0,0 +1,67 @@
+CMakeFiles/vterm-module.dir/vterm-module.c.o: \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.c \
+ /usr/include/stdc-predef.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/vterm-module.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/emacs-module.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stddef.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdint.h \
+ /usr/include/stdint.h /usr/include/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/bits/wordsize.h /usr/include/bits/timesize.h \
+ /usr/include/sys/cdefs.h /usr/include/bits/long-double.h \
+ /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/bits/time64.h /usr/include/bits/wchar.h \
+ /usr/include/bits/stdint-intn.h /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdbool.h \
+ /usr/include/inttypes.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm/include/vterm.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/bits/floatn.h \
+ /usr/include/bits/floatn-common.h /usr/include/sys/types.h \
+ /usr/include/bits/types/clock_t.h /usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/time_t.h /usr/include/bits/types/timer_t.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h /usr/include/bits/byteswap.h \
+ /usr/include/bits/uintn-identity.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/atomic_wide_counter.h /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h /usr/include/alloca.h \
+ /usr/include/bits/stdlib-bsearch.h /usr/include/bits/stdlib-float.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm/include/vterm_keycodes.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/elisp.h \
+ /home/dwrz/.config/emacs/elpa/vterm-20240520.231/utf8.h \
+ /usr/include/assert.h /usr/include/fcntl.h /usr/include/bits/fcntl.h \
+ /usr/include/bits/fcntl-linux.h /usr/include/bits/stat.h \
+ /usr/include/bits/struct_stat.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/limits.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/bits/posix1_lim.h \
+ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthread_stack_min.h /usr/include/bits/posix2_lim.h \
+ /usr/include/stdio.h \
+ /usr/lib/gcc/x86_64-pc-linux-gnu/14.1.1/include/stdarg.h \
+ /usr/include/bits/types/__fpos_t.h /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__fpos64_t.h /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/FILE.h /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/stdio.h \
+ /usr/include/string.h /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__locale_t.h /usr/include/strings.h \
+ /usr/include/termios.h /usr/include/bits/termios.h \
+ /usr/include/bits/termios-struct.h /usr/include/bits/termios-c_cc.h \
+ /usr/include/bits/termios-c_iflag.h /usr/include/bits/termios-c_oflag.h \
+ /usr/include/bits/termios-baud.h /usr/include/bits/termios-c_cflag.h \
+ /usr/include/bits/termios-c_lflag.h /usr/include/bits/termios-tcflow.h \
+ /usr/include/bits/termios-misc.h /usr/include/sys/ttydefaults.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/environments.h /usr/include/bits/confname.h \
+ /usr/include/bits/getopt_posix.h /usr/include/bits/getopt_core.h \
+ /usr/include/bits/unistd_ext.h
diff --git a/emacs/elpa/vterm-20240520.231/build/Makefile b/emacs/elpa/vterm-20240520.231/build/Makefile
@@ -0,0 +1,263 @@
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 3.29
+
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
+
+# Allow only one "make -f Makefile2" at a time, but pass parallelism.
+.NOTPARALLEL:
+
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Disable VCS-based implicit rules.
+% : %,v
+
+# Disable VCS-based implicit rules.
+% : RCS/%
+
+# Disable VCS-based implicit rules.
+% : RCS/%,v
+
+# Disable VCS-based implicit rules.
+% : SCCS/s.%
+
+# Disable VCS-based implicit rules.
+% : s.%
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Command-line flag to silence nested $(MAKE).
+$(VERBOSE)MAKESILENT = -s
+
+#Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /usr/bin/cmake
+
+# The command to remove a file.
+RM = /usr/bin/cmake -E rm -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
+	/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
+	/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build//CMakeFiles/progress.marks
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+#=============================================================================
+# Target rules for targets named vterm-module
+
+# Build rule for target.
+vterm-module: cmake_check_build_system
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 vterm-module
+.PHONY : vterm-module
+
+# fast build rule for target.
+vterm-module/fast:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/build
+.PHONY : vterm-module/fast
+
+#=============================================================================
+# Target rules for targets named libvterm
+
+# Build rule for target.
+libvterm: cmake_check_build_system
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 libvterm
+.PHONY : libvterm
+
+# fast build rule for target.
+libvterm/fast:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/libvterm.dir/build.make CMakeFiles/libvterm.dir/build
+.PHONY : libvterm/fast
+
+#=============================================================================
+# Target rules for targets named run
+
+# Build rule for target.
+run: cmake_check_build_system
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 run
+.PHONY : run
+
+# fast build rule for target.
+run/fast:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/run.dir/build.make CMakeFiles/run.dir/build
+.PHONY : run/fast
+
+elisp.o: elisp.c.o
+.PHONY : elisp.o
+
+# target to build an object file
+elisp.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.o
+.PHONY : elisp.c.o
+
+elisp.i: elisp.c.i
+.PHONY : elisp.i
+
+# target to preprocess a source file
+elisp.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.i
+.PHONY : elisp.c.i
+
+elisp.s: elisp.c.s
+.PHONY : elisp.s
+
+# target to generate assembly for a file
+elisp.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/elisp.c.s
+.PHONY : elisp.c.s
+
+utf8.o: utf8.c.o
+.PHONY : utf8.o
+
+# target to build an object file
+utf8.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.o
+.PHONY : utf8.c.o
+
+utf8.i: utf8.c.i
+.PHONY : utf8.i
+
+# target to preprocess a source file
+utf8.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.i
+.PHONY : utf8.c.i
+
+utf8.s: utf8.c.s
+.PHONY : utf8.s
+
+# target to generate assembly for a file
+utf8.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/utf8.c.s
+.PHONY : utf8.c.s
+
+vterm-module.o: vterm-module.c.o
+.PHONY : vterm-module.o
+
+# target to build an object file
+vterm-module.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.o
+.PHONY : vterm-module.c.o
+
+vterm-module.i: vterm-module.c.i
+.PHONY : vterm-module.i
+
+# target to preprocess a source file
+vterm-module.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.i
+.PHONY : vterm-module.c.i
+
+vterm-module.s: vterm-module.c.s
+.PHONY : vterm-module.s
+
+# target to generate assembly for a file
+vterm-module.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/vterm-module.dir/build.make CMakeFiles/vterm-module.dir/vterm-module.c.s
+.PHONY : vterm-module.c.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... rebuild_cache"
+	@echo "... libvterm"
+	@echo "... run"
+	@echo "... vterm-module"
+	@echo "... elisp.o"
+	@echo "... elisp.i"
+	@echo "... elisp.s"
+	@echo "... utf8.o"
+	@echo "... utf8.i"
+	@echo "... utf8.s"
+	@echo "... vterm-module.o"
+	@echo "... vterm-module.i"
+	@echo "... vterm-module.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
+
diff --git a/emacs/elpa/vterm-20240520.231/build/cmake_install.cmake b/emacs/elpa/vterm-20240520.231/build/cmake_install.cmake
@@ -0,0 +1,54 @@
+# Install script for directory: /home/dwrz/.config/emacs/elpa/vterm-20240520.231
+
+# Set the install prefix
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "/usr/local")
+endif()
+string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# Set the install configuration name.
+if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
+  if(BUILD_TYPE)
+    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
+           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
+  else()
+    set(CMAKE_INSTALL_CONFIG_NAME "RelWithDebInfo")
+  endif()
+  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
+endif()
+
+# Set the component getting installed.
+if(NOT CMAKE_INSTALL_COMPONENT)
+  if(COMPONENT)
+    message(STATUS "Install component: \"${COMPONENT}\"")
+    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
+  else()
+    set(CMAKE_INSTALL_COMPONENT)
+  endif()
+endif()
+
+# Install shared libraries without execute permission?
+if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+  set(CMAKE_INSTALL_SO_NO_EXE "0")
+endif()
+
+# Is this installation the result of a crosscompile?
+if(NOT DEFINED CMAKE_CROSSCOMPILING)
+  set(CMAKE_CROSSCOMPILING "FALSE")
+endif()
+
+# Set default install directory permissions.
+if(NOT DEFINED CMAKE_OBJDUMP)
+  set(CMAKE_OBJDUMP "/usr/bin/objdump")
+endif()
+
+if(CMAKE_INSTALL_COMPONENT)
+  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
+else()
+  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
+endif()
+
+string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
+       "${CMAKE_INSTALL_MANIFEST_FILES}")
+file(WRITE "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/${CMAKE_INSTALL_MANIFEST}"
+     "${CMAKE_INSTALL_MANIFEST_CONTENT}")
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm
@@ -0,0 +1 @@
+Subproject commit 64f1775952dbe001e989f2ab679563b54f2fca55
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-build b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-build
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-configure
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-done b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-done
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-download b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-download
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt
@@ -0,0 +1,15 @@
+# This is a generated file and its contents are an internal implementation detail.
+# The download step will be re-executed if anything in this file changes.
+# No other meaning or use of this file is supported.
+
+method=git
+command=/usr/bin/cmake;-P;/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
+source_dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm
+work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src
+repository=https://github.com/Sbozzolo/libvterm-mirror.git
+remote=origin
+init_submodules=TRUE
+recurse_submodules=--recursive
+submodules=
+CMP0097=
+
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt
@@ -0,0 +1,15 @@
+# This is a generated file and its contents are an internal implementation detail.
+# The download step will be re-executed if anything in this file changes.
+# No other meaning or use of this file is supported.
+
+method=git
+command=/usr/bin/cmake;-P;/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
+source_dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm
+work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src
+repository=https://github.com/Sbozzolo/libvterm-mirror.git
+remote=origin
+init_submodules=TRUE
+recurse_submodules=--recursive
+submodules=
+CMP0097=
+
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-install b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-install
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-mkdir
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-patch-info.txt
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-update-info.txt
@@ -0,0 +1,7 @@
+# This is a generated file and its contents are an internal implementation detail.
+# The patch step will be re-executed if anything in this file changes.
+# No other meaning or use of this file is supported.
+
+command (connected)=/usr/bin/cmake;-Dcan_fetch=YES;-P;/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
+command (disconnected)=/usr/bin/cmake;-Dcan_fetch=NO;-P;/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
+work_dir=/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm
diff --git a/emacs/elpa/vterm-20240325.1551/build/libvterm-prefix/tmp/libvterm-cfgcmd.txt b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-cfgcmd.txt
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitclone.cmake
@@ -0,0 +1,73 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+if(EXISTS "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt" AND EXISTS "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt" AND
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt" IS_NEWER_THAN "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt")
+  message(STATUS
+    "Avoiding repeated git clone, stamp file is up to date: "
+    "'/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt'"
+  )
+  return()
+endif()
+
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E rm -rf "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to remove directory: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm'")
+endif()
+
+# try the clone 3 times in case there is an odd git clone issue
+set(error_code 1)
+set(number_of_tries 0)
+while(error_code AND number_of_tries LESS 3)
+  execute_process(
+    COMMAND "/usr/bin/git"
+            clone --no-checkout --config "advice.detachedHead=false" "https://github.com/Sbozzolo/libvterm-mirror.git" "libvterm"
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src"
+    RESULT_VARIABLE error_code
+  )
+  math(EXPR number_of_tries "${number_of_tries} + 1")
+endwhile()
+if(number_of_tries GREATER 1)
+  message(STATUS "Had to git clone more than once: ${number_of_tries} times.")
+endif()
+if(error_code)
+  message(FATAL_ERROR "Failed to clone repository: 'https://github.com/Sbozzolo/libvterm-mirror.git'")
+endif()
+
+execute_process(
+  COMMAND "/usr/bin/git"
+          checkout "64f1775952dbe001e989f2ab679563b54f2fca55" --
+  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to checkout tag: '64f1775952dbe001e989f2ab679563b54f2fca55'")
+endif()
+
+set(init_submodules TRUE)
+if(init_submodules)
+  execute_process(
+    COMMAND "/usr/bin/git" 
+            submodule update --recursive --init 
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    RESULT_VARIABLE error_code
+  )
+endif()
+if(error_code)
+  message(FATAL_ERROR "Failed to update submodules in: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm'")
+endif()
+
+# Complete success, update the script-last-run stamp file:
+#
+execute_process(
+  COMMAND ${CMAKE_COMMAND} -E copy "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitinfo.txt" "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt"
+  RESULT_VARIABLE error_code
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to copy script-last-run stamp file: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/libvterm-gitclone-lastrun.txt'")
+endif()
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-gitupdate.cmake
@@ -0,0 +1,292 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+function(do_fetch)
+  message(VERBOSE "Fetching latest from the remote origin")
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git fetch --tags --force "origin"
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    COMMAND_ERROR_IS_FATAL LAST
+  )
+endfunction()
+
+function(get_hash_for_ref ref out_var err_var)
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git rev-parse "${ref}^0"
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    RESULT_VARIABLE error_code
+    OUTPUT_VARIABLE ref_hash
+    ERROR_VARIABLE error_msg
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(error_code)
+    set(${out_var} "" PARENT_SCOPE)
+  else()
+    set(${out_var} "${ref_hash}" PARENT_SCOPE)
+  endif()
+  set(${err_var} "${error_msg}" PARENT_SCOPE)
+endfunction()
+
+get_hash_for_ref(HEAD head_sha error_msg)
+if(head_sha STREQUAL "")
+  message(FATAL_ERROR "Failed to get the hash for HEAD:\n${error_msg}")
+endif()
+
+
+execute_process(
+  COMMAND "/usr/bin/git" --git-dir=.git show-ref "64f1775952dbe001e989f2ab679563b54f2fca55"
+  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+  OUTPUT_VARIABLE show_ref_output
+)
+if(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/remotes/")
+  # Given a full remote/branch-name and we know about it already. Since
+  # branches can move around, we should always fetch, if permitted.
+  if(can_fetch)
+    do_fetch()
+  endif()
+  set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
+
+elseif(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/tags/")
+  # Given a tag name that we already know about. We don't know if the tag we
+  # have matches the remote though (tags can move), so we should fetch. As a
+  # special case to preserve backward compatibility, if we are already at the
+  # same commit as the tag we hold locally, don't do a fetch and assume the tag
+  # hasn't moved on the remote.
+  # FIXME: We should provide an option to always fetch for this case
+  get_hash_for_ref("64f1775952dbe001e989f2ab679563b54f2fca55" tag_sha error_msg)
+  if(tag_sha STREQUAL head_sha)
+    message(VERBOSE "Already at requested tag: ${tag_sha}")
+    return()
+  endif()
+
+  if(can_fetch)
+    do_fetch()
+  endif()
+  set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
+
+elseif(show_ref_output MATCHES "^[a-z0-9]+[ \\t]+refs/heads/")
+  # Given a branch name without any remote and we already have a branch by that
+  # name. We might already have that branch checked out or it might be a
+  # different branch. It isn't fully safe to use a bare branch name without the
+  # remote, so do a fetch (if allowed) and replace the ref with one that
+  # includes the remote.
+  if(can_fetch)
+    do_fetch()
+  endif()
+  set(checkout_name "origin/64f1775952dbe001e989f2ab679563b54f2fca55")
+
+else()
+  get_hash_for_ref("64f1775952dbe001e989f2ab679563b54f2fca55" tag_sha error_msg)
+  if(tag_sha STREQUAL head_sha)
+    # Have the right commit checked out already
+    message(VERBOSE "Already at requested ref: ${tag_sha}")
+    return()
+
+  elseif(tag_sha STREQUAL "")
+    # We don't know about this ref yet, so we have no choice but to fetch.
+    if(NOT can_fetch)
+      message(FATAL_ERROR
+        "Requested git ref \"64f1775952dbe001e989f2ab679563b54f2fca55\" is not present locally, and not "
+        "allowed to contact remote due to UPDATE_DISCONNECTED setting."
+      )
+    endif()
+
+    # We deliberately swallow any error message at the default log level
+    # because it can be confusing for users to see a failed git command.
+    # That failure is being handled here, so it isn't an error.
+    if(NOT error_msg STREQUAL "")
+      message(VERBOSE "${error_msg}")
+    endif()
+    do_fetch()
+    set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
+
+  else()
+    # We have the commit, so we know we were asked to find a commit hash
+    # (otherwise it would have been handled further above), but we don't
+    # have that commit checked out yet. We don't need to fetch from the remote.
+    set(checkout_name "64f1775952dbe001e989f2ab679563b54f2fca55")
+    if(NOT error_msg STREQUAL "")
+      message(WARNING "${error_msg}")
+    endif()
+
+  endif()
+endif()
+
+set(git_update_strategy "REBASE")
+if(git_update_strategy STREQUAL "")
+  # Backward compatibility requires REBASE as the default behavior
+  set(git_update_strategy REBASE)
+endif()
+
+if(git_update_strategy MATCHES "^REBASE(_CHECKOUT)?$")
+  # Asked to potentially try to rebase first, maybe with fallback to checkout.
+  # We can't if we aren't already on a branch and we shouldn't if that local
+  # branch isn't tracking the one we want to checkout.
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git symbolic-ref -q HEAD
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    OUTPUT_VARIABLE current_branch
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    # Don't test for an error. If this isn't a branch, we get a non-zero error
+    # code but empty output.
+  )
+
+  if(current_branch STREQUAL "")
+    # Not on a branch, checkout is the only sensible option since any rebase
+    # would always fail (and backward compatibility requires us to checkout in
+    # this situation)
+    set(git_update_strategy CHECKOUT)
+
+  else()
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git for-each-ref "--format=%(upstream:short)" "${current_branch}"
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      OUTPUT_VARIABLE upstream_branch
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      COMMAND_ERROR_IS_FATAL ANY  # There is no error if no upstream is set
+    )
+    if(NOT upstream_branch STREQUAL checkout_name)
+      # Not safe to rebase when asked to checkout a different branch to the one
+      # we are tracking. If we did rebase, we could end up with arbitrary
+      # commits added to the ref we were asked to checkout if the current local
+      # branch happens to be able to rebase onto the target branch. There would
+      # be no error message and the user wouldn't know this was occurring.
+      set(git_update_strategy CHECKOUT)
+    endif()
+
+  endif()
+elseif(NOT git_update_strategy STREQUAL "CHECKOUT")
+  message(FATAL_ERROR "Unsupported git update strategy: ${git_update_strategy}")
+endif()
+
+
+# Check if stash is needed
+execute_process(
+  COMMAND "/usr/bin/git" --git-dir=.git status --porcelain
+  WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+  RESULT_VARIABLE error_code
+  OUTPUT_VARIABLE repo_status
+)
+if(error_code)
+  message(FATAL_ERROR "Failed to get the status")
+endif()
+string(LENGTH "${repo_status}" need_stash)
+
+# If not in clean state, stash changes in order to be able to perform a
+# rebase or checkout without losing those changes permanently
+if(need_stash)
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git stash save --quiet;--include-untracked
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    COMMAND_ERROR_IS_FATAL ANY
+  )
+endif()
+
+if(git_update_strategy STREQUAL "CHECKOUT")
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git checkout "${checkout_name}"
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    COMMAND_ERROR_IS_FATAL ANY
+  )
+else()
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git rebase "${checkout_name}"
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    RESULT_VARIABLE error_code
+    OUTPUT_VARIABLE rebase_output
+    ERROR_VARIABLE  rebase_output
+  )
+  if(error_code)
+    # Rebase failed, undo the rebase attempt before continuing
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git rebase --abort
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    )
+
+    if(NOT git_update_strategy STREQUAL "REBASE_CHECKOUT")
+      # Not allowed to do a checkout as a fallback, so cannot proceed
+      if(need_stash)
+        execute_process(
+          COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
+          WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+          )
+      endif()
+      message(FATAL_ERROR "\nFailed to rebase in: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm'."
+                          "\nOutput from the attempted rebase follows:"
+                          "\n${rebase_output}"
+                          "\n\nYou will have to resolve the conflicts manually")
+    endif()
+
+    # Fall back to checkout. We create an annotated tag so that the user
+    # can manually inspect the situation and revert if required.
+    # We can't log the failed rebase output because MSVC sees it and
+    # intervenes, causing the build to fail even though it completes.
+    # Write it to a file instead.
+    string(TIMESTAMP tag_timestamp "%Y%m%dT%H%M%S" UTC)
+    set(tag_name _cmake_ExternalProject_moved_from_here_${tag_timestamp}Z)
+    set(error_log_file ${CMAKE_CURRENT_LIST_DIR}/rebase_error_${tag_timestamp}Z.log)
+    file(WRITE ${error_log_file} "${rebase_output}")
+    message(WARNING "Rebase failed, output has been saved to ${error_log_file}"
+                    "\nFalling back to checkout, previous commit tagged as ${tag_name}")
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git tag -a
+              -m "ExternalProject attempting to move from here to ${checkout_name}"
+              ${tag_name}
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      COMMAND_ERROR_IS_FATAL ANY
+    )
+
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git checkout "${checkout_name}"
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      COMMAND_ERROR_IS_FATAL ANY
+    )
+  endif()
+endif()
+
+if(need_stash)
+  # Put back the stashed changes
+  execute_process(
+    COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    RESULT_VARIABLE error_code
+    )
+  if(error_code)
+    # Stash pop --index failed: Try again dropping the index
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git reset --hard --quiet
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    )
+    execute_process(
+      COMMAND "/usr/bin/git" --git-dir=.git stash pop --quiet
+      WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      RESULT_VARIABLE error_code
+    )
+    if(error_code)
+      # Stash pop failed: Restore previous state.
+      execute_process(
+        COMMAND "/usr/bin/git" --git-dir=.git reset --hard --quiet ${head_sha}
+        WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      )
+      execute_process(
+        COMMAND "/usr/bin/git" --git-dir=.git stash pop --index --quiet
+        WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+      )
+      message(FATAL_ERROR "\nFailed to unstash changes in: '/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm'."
+                          "\nYou will have to resolve the conflicts manually")
+    endif()
+  endif()
+endif()
+
+set(init_submodules "TRUE")
+if(init_submodules)
+  execute_process(
+    COMMAND "/usr/bin/git"
+            --git-dir=.git 
+            submodule update --recursive --init 
+    WORKING_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+    COMMAND_ERROR_IS_FATAL ANY
+  )
+endif()
diff --git a/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake b/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp/libvterm-mkdirs.cmake
@@ -0,0 +1,22 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+cmake_minimum_required(VERSION 3.5)
+
+file(MAKE_DIRECTORY
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-build"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/tmp"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src"
+  "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp"
+)
+
+set(configSubDirs )
+foreach(subDir IN LISTS configSubDirs)
+    file(MAKE_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp/${subDir}")
+endforeach()
+if(cfgdir)
+  file(MAKE_DIRECTORY "/home/dwrz/.config/emacs/elpa/vterm-20240520.231/build/libvterm-prefix/src/libvterm-stamp${cfgdir}") # cfgdir has leading slash
+endif()
diff --git a/emacs/elpa/vterm-20240325.1551/elisp.c b/emacs/elpa/vterm-20240520.231/elisp.c
diff --git a/emacs/elpa/vterm-20240325.1551/elisp.h b/emacs/elpa/vterm-20240520.231/elisp.h
diff --git a/emacs/elpa/vterm-20240325.1551/emacs-module.h b/emacs/elpa/vterm-20240520.231/emacs-module.h
diff --git a/emacs/elpa/vterm-20240325.1551/etc/emacs-vterm-bash.sh b/emacs/elpa/vterm-20240520.231/etc/emacs-vterm-bash.sh
diff --git a/emacs/elpa/vterm-20240325.1551/etc/emacs-vterm-zsh.sh b/emacs/elpa/vterm-20240520.231/etc/emacs-vterm-zsh.sh
diff --git a/emacs/elpa/vterm-20240325.1551/etc/emacs-vterm.fish b/emacs/elpa/vterm-20240520.231/etc/emacs-vterm.fish
diff --git a/emacs/elpa/vterm-20240325.1551/utf8.c b/emacs/elpa/vterm-20240520.231/utf8.c
diff --git a/emacs/elpa/vterm-20240325.1551/utf8.h b/emacs/elpa/vterm-20240520.231/utf8.h
diff --git a/emacs/elpa/vterm-20240325.1551/vterm-autoloads.el b/emacs/elpa/vterm-20240520.231/vterm-autoloads.el
diff --git a/emacs/elpa/vterm-20240325.1551/vterm-module.c b/emacs/elpa/vterm-20240520.231/vterm-module.c
diff --git a/emacs/elpa/vterm-20240520.231/vterm-module.h b/emacs/elpa/vterm-20240520.231/vterm-module.h
@@ -0,0 +1,171 @@
+#ifndef VTERM_MODULE_H
+#define VTERM_MODULE_H
+
+#include "emacs-module.h"
+#include <inttypes.h>
+#include <stdbool.h>
+#include <vterm.h>
+
+// https://gcc.gnu.org/wiki/Visibility
+#if defined _WIN32 || defined __CYGWIN__
+#ifdef __GNUC__
+#define VTERM_EXPORT __attribute__((dllexport))
+#else
+#define VTERM_EXPORT __declspec(dllexport)
+#endif
+#else
+#if __GNUC__ >= 4
+#define VTERM_EXPORT __attribute__((visibility("default")))
+#else
+#define VTERM_EXPORT
+#endif
+#endif
+
+VTERM_EXPORT int plugin_is_GPL_compatible;
+
+#ifndef SB_MAX
+#define SB_MAX 100000 // Maximum 'scrollback' value.
+#endif
+
+#ifndef MIN
+#define MIN(X, Y) ((X) < (Y) ? (X) : (Y))
+#endif
+#ifndef MAX
+#define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
+#endif
+
+typedef struct LineInfo {
+  char *directory; /* working directory */
+
+  int prompt_col; /* end column of the prompt, if the current line contains the
+                   * prompt */
+} LineInfo;
+
+typedef struct ScrollbackLine {
+  size_t cols;
+  LineInfo *info;
+  VTermScreenCell cells[];
+} ScrollbackLine;
+
+typedef struct ElispCodeListNode {
+  char *code;
+  size_t code_len;
+  struct ElispCodeListNode *next;
+} ElispCodeListNode;
+
+/*  c , p , q , s , 0 , 1 , 2 , 3 , 4 , 5 , 6 , and 7  */
+/* clipboard, primary, secondary, select, or cut buffers 0 through 7 */
+#define SELECTION_BUF_LEN 4096
+
+typedef struct Cursor {
+  int row, col;
+  int cursor_type;
+  bool cursor_visible;
+  bool cursor_blink;
+  bool cursor_type_changed;
+  bool cursor_blink_changed;
+} Cursor;
+
+typedef struct Term {
+  VTerm *vt;
+  VTermScreen *vts;
+  // buffer used to:
+  //  - convert VTermScreen cell arrays into utf8 strings
+  //  - receive data from libvterm as a result of key presses.
+  ScrollbackLine **sb_buffer; // Scrollback buffer storage for libvterm
+  size_t sb_current;          // number of rows pushed to sb_buffer
+  size_t sb_size;             // sb_buffer size
+  // "virtual index" that points to the first sb_buffer row that we need to
+  // push to the terminal buffer when refreshing the scrollback. When negative,
+  // it actually points to entries that are no longer in sb_buffer (because the
+  // window height has increased) and must be deleted from the terminal buffer
+  int sb_pending;
+  int sb_pending_by_height_decr;
+  bool sb_clear_pending;
+  long linenum;
+  long linenum_added;
+
+  int invalid_start, invalid_end; // invalid rows in libvterm screen
+  bool is_invalidated;
+
+  Cursor cursor;
+  char *title;
+  bool title_changed;
+
+  char *directory;
+  bool directory_changed;
+
+  // Single-linked list of elisp_code.
+  // Newer commands are added at the tail.
+  ElispCodeListNode *elisp_code_first;
+  ElispCodeListNode **elisp_code_p_insert; // pointer to the position where new
+                                           // node should be inserted
+
+  /*  c , p , q , s , 0 , 1 , 2 , 3 , 4 , 5 , 6 , and 7  */
+  /* clipboard, primary, secondary, select, or cut buffers 0 through 7 */
+  int selection_mask; /* see VTermSelectionMask in vterm.h */
+  char *selection_data;
+  char selection_buf[SELECTION_BUF_LEN];
+
+  /* the size of dirs almost = window height, value = directory of that line */
+  LineInfo **lines;
+  int lines_len;
+
+  int width, height;
+  int height_resize;
+  bool resizing;
+  bool disable_bold_font;
+  bool disable_underline;
+  bool disable_inverse_video;
+  bool ignore_blink_cursor;
+
+  char *cmd_buffer;
+
+  int pty_fd;
+} Term;
+
+static bool compare_cells(VTermScreenCell *a, VTermScreenCell *b);
+static bool is_key(unsigned char *key, size_t len, char *key_description);
+static emacs_value render_text(emacs_env *env, Term *term, char *string,
+                               int len, VTermScreenCell *cell);
+static emacs_value render_fake_newline(emacs_env *env, Term *term);
+static emacs_value render_prompt(emacs_env *env, emacs_value text);
+static emacs_value cell_rgb_color(emacs_env *env, Term *term,
+                                  VTermScreenCell *cell, bool is_foreground);
+
+static int term_settermprop(VTermProp prop, VTermValue *val, void *user_data);
+
+static void term_redraw(Term *term, emacs_env *env);
+static void term_flush_output(Term *term, emacs_env *env);
+static void term_process_key(Term *term, emacs_env *env, unsigned char *key,
+                             size_t len, VTermModifier modifier);
+static void invalidate_terminal(Term *term, int start_row, int end_row);
+
+void term_finalize(void *object);
+
+emacs_value Fvterm_new(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                       void *data);
+emacs_value Fvterm_update(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                          void *data);
+emacs_value Fvterm_redraw(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                          void *data);
+emacs_value Fvterm_write_input(emacs_env *env, ptrdiff_t nargs,
+                               emacs_value args[], void *data);
+emacs_value Fvterm_set_size(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                            void *data);
+emacs_value Fvterm_set_pty_name(emacs_env *env, ptrdiff_t nargs,
+                                emacs_value args[], void *data);
+emacs_value Fvterm_get_icrnl(emacs_env *env, ptrdiff_t nargs,
+                             emacs_value args[], void *data);
+
+emacs_value Fvterm_get_pwd(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
+                           void *data);
+
+emacs_value Fvterm_get_prompt_point(emacs_env *env, ptrdiff_t nargs,
+                                    emacs_value args[], void *data);
+emacs_value Fvterm_reset_cursor_point(emacs_env *env, ptrdiff_t nargs,
+                                      emacs_value args[], void *data);
+
+VTERM_EXPORT int emacs_module_init(struct emacs_runtime *ert);
+
+#endif /* VTERM_MODULE_H */
diff --git a/emacs/elpa/vterm-20240520.231/vterm-module.so b/emacs/elpa/vterm-20240520.231/vterm-module.so
Binary files differ.
diff --git a/emacs/elpa/vterm-20240520.231/vterm-pkg.el b/emacs/elpa/vterm-20240520.231/vterm-pkg.el
@@ -0,0 +1,14 @@
+(define-package "vterm" "20240520.231" "Fully-featured terminal emulator"
+  '((emacs "25.1"))
+  :commit "df057b1af2bb89a1deb288086f13be296af42090" :authors
+  '(("Lukas Fürmetz" . "fuermetz@mailbox.org"))
+  :maintainers
+  '(("Lukas Fürmetz" . "fuermetz@mailbox.org"))
+  :maintainer
+  '("Lukas Fürmetz" . "fuermetz@mailbox.org")
+  :keywords
+  '("terminals")
+  :url "https://github.com/akermu/emacs-libvterm")
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/vterm-20240325.1551/vterm.el b/emacs/elpa/vterm-20240520.231/vterm.el
diff --git a/emacs/elpa/vterm-20240520.231/vterm.elc b/emacs/elpa/vterm-20240520.231/vterm.elc
Binary files differ.
diff --git a/emacs/elpa/which-key-20240423.1320/which-key-pkg.el b/emacs/elpa/which-key-20240423.1320/which-key-pkg.el
@@ -1,11 +0,0 @@
-(define-package "which-key" "20240423.1320" "Display available keybindings in popup"
-  '((emacs "24.4"))
-  :commit "ba323d6712d54806aa82847d017e94eafcf99d6f" :authors
-  '(("Justin Burkett" . "justin@burkett.cc"))
-  :maintainers
-  '(("Justin Burkett" . "justin@burkett.cc"))
-  :maintainer
-  '("Justin Burkett" . "justin@burkett.cc"))
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
diff --git a/emacs/elpa/which-key-20240423.1320/which-key.el b/emacs/elpa/which-key-20240423.1320/which-key.el
@@ -1,2830 +0,0 @@
-;;; which-key.el --- Display available keybindings in popup  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2017-2024  Free Software Foundation, Inc.
-
-;; Author: Justin Burkett <justin@burkett.cc>
-;; Maintainer: Justin Burkett <justin@burkett.cc>
-;; Version: 3.6.0
-;; Keywords:
-;; Package-Requires: ((emacs "24.4"))
-
-;; 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 <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; which-key provides the minor mode which-key-mode for Emacs.  The mode displays
-;; the key bindings following your currently entered incomplete command (a
-;; prefix) in a popup.  For example, after enabling the minor mode if you enter
-;; C-x and wait for the default of 1 second the minibuffer will expand with all
-;; of the available key bindings that follow C-x (or as many as space allows
-;; given your settings).  This includes prefixes like C-x 8 which are shown in a
-;; different face.  Screenshots of what the popup will look like along with
-;; information about additional features can be found at
-;; https://github.com/justbur/emacs-which-key.
-;;
-
-;;; Code:
-
-(require 'cl-lib)
-(require 'button)
-(require 'regexp-opt)
-
-;; For compiler
-(defvar evil-operator-shortcut-map)
-(defvar evil-operator-state-map)
-(defvar evil-motion-state-map)
-(defvar golden-ratio-mode)
-(declare-function evil-get-command-property "ext:evil-common.el")
-
-;;; Options
-
-(defgroup which-key nil
-  "Customization options for which-key-mode."
-  :group 'help
-  :prefix "which-key-")
-
-(defcustom which-key-idle-delay 1.0
-  "Delay (in seconds) for which-key buffer to popup.
-This variable should be set before activating `which-key-mode'.
-
-A value of zero might lead to issues, so a non-zero value is
-recommended
-(see https://github.com/justbur/emacs-which-key/issues/134)."
-  :type 'float
-  :version "1.0")
-
-(defcustom which-key-idle-secondary-delay nil
-  "Seconds to wait for which-key to pop up after initial display.
-This makes it possible to shorten the delay for subsequent popups
-in the same key sequence. The default is for this value to be
-nil, which disables this behavior."
-  :type '(choice float (const :tag "Disabled" nil))
-  :version "1.0")
-
-(defcustom which-key-echo-keystrokes (if (and echo-keystrokes
-                                              (> (+ echo-keystrokes 0.01)
-                                                 which-key-idle-delay))
-                                         (/ (float which-key-idle-delay) 4)
-                                       echo-keystrokes)
-  "Value to use for `echo-keystrokes'.
-This only applies if `which-key-popup-type' is minibuffer or
-`which-key-show-prefix' is echo.  It needs to be less than
-`which-key-idle-delay' or else the keystroke echo will erase the
-which-key popup."
-  :type 'float
-  :version "1.0")
-
-(defcustom which-key-max-description-length 27
-  "Truncate the description of keys to this length.
-Either nil (no truncation), an integer (truncate after that many
-characters), a float (use that fraction of the available width),
-or a function, which takes one argument, the available width in
-characters, and whose return value has one of the types mentioned
-before.  Truncation is done using `which-key-ellipsis'."
-  :type '(choice (const :tag "Disable truncation" nil)
-		 (integer :tag "Width in characters")
-		 (float :tag "Use fraction of available width")
-		 function)
-  :version "1.0")
-
-(defcustom which-key-min-column-description-width 0
-  "Every column should at least have this width."
-  :type 'natnum
-  :version "1.0")
-
-(defcustom which-key-add-column-padding 0
-  "Additional spaces to add to the left of each key column."
-  :type 'integer
-  :version "1.0")
-
-(defcustom which-key-unicode-correction 3
-  "Correction for wide unicode characters.
-Since we measure width in terms of the number of characters,
-Unicode characters that are wider than ASCII characters throw off
-the calculation for available width in the which-key buffer.  This
-variable allows you to adjust for the wide unicode characters by
-artificially reducing the available width in the buffer.
-
-The default of 3 means allow for the total extra width
-contributed by any wide unicode characters to be up to one
-additional ASCII character in the which-key buffer.  Increase this
-number if you are seeing characters get cutoff on the right side
-of the which-key popup."
-  :type 'integer
-  :version "1.0")
-
-(defcustom which-key-dont-use-unicode nil
-  "If non-nil, don't use any unicode characters in default setup.
-For affected settings, see `which-key-replacement-alist', `which-key-ellipsis'
-`which-key-separator'."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-separator
-  (if which-key-dont-use-unicode " : " " → ")
-  "Separator to use between key and description.
-Default is \" → \", unless `which-key-dont-use-unicode' is non
-nil, in which case the default is \" : \"."
-  :type 'string
-  :version "1.0")
-
-(defcustom which-key-ellipsis
-  (if which-key-dont-use-unicode ".." "…")
-  "Ellipsis to use when truncating.
-Default is \"…\", unless `which-key-dont-use-unicode' is non nil,
-in which case the default is \"..\".  This can also be the empty
-string to truncate without using any ellipsis."
-  :type 'string
-  :version "1.0")
-
-(defcustom which-key-prefix-prefix "+"
-  "Prefix string to indicate a key bound to a keymap.
-Default is \"+\"."
-  :type 'string
-  :version "1.0")
-
-(defcustom which-key-compute-remaps nil
-  "If non-nil, show remapped commands.
-This applies to commands that have been remapped given the
-currently active keymaps."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-replacement-alist
-  (delq nil
-        `(((nil . "which-key-show-next-page-no-cycle") . (nil . "wk next pg"))
-          ,@(unless which-key-dont-use-unicode
-              '((("<left>") . ("←"))
-                (("<right>") . ("→"))))
-          (("<\\([[:alnum:]-]+\\)>") . ("\\1"))))
-  "ALIST for manipulating display of binding descriptions.
-Each element of the list is a nested cons cell with the format
-
-\(MATCH CONS . REPLACEMENT\).
-
-The MATCH CONS determines when a replacement should occur and
-REPLACEMENT determines how the replacement should occur. Each may
-have the format \(KEY REGEXP . BINDING REGEXP\). For the
-replacement to apply the key binding must match both the KEY
-REGEXP and the BINDING REGEXP. A value of nil in either position
-can be used to match every possibility. The replacement is
-performed by using `replace-regexp-in-string' on the KEY REGEXP
-from the MATCH CONS and REPLACEMENT when it is a cons cell, and
-then similarly for the BINDING REGEXP. A nil value in the BINDING
-REGEXP position cancels the replacement. For example, the entry
-
-\(\(nil . \"Prefix Command\"\) . \(nil . \"prefix\"\)\)
-
-matches any binding with the descriptions \"Prefix Command\" and
-replaces the description with \"prefix\", ignoring the
-corresponding key.
-
-REPLACEMENT may also be a function taking a cons cell
-\(KEY . BINDING\) and producing a new corresponding cons cell.
-
-If REPLACEMENT is anything other than a cons cell \(and non nil\)
-the key binding is ignored by which-key.
-
-Finally, you can multiple replacements to occur for a given key
-binding by setting `which-key-allow-multiple-replacements' to a
-non-nil value."
-  :type '(alist :key-type (cons (choice regexp (const nil))
-                                (choice regexp (const nil)))
-                :value-type (cons (choice string (const nil))
-                                  (choice string (const nil))))
-  :version "1.0")
-
-(defcustom which-key-allow-multiple-replacements nil
-  "Allow a key binding to be modified by multiple elements.
-When non-nil, this allows a single key binding to match multiple
-patterns in `which-key-replacement-alist'. When nil, only the
-first match is used to perform replacements from
-`which-key-replacement-alist'."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-show-docstrings nil
-  "If non-nil, show each command's docstring in the which-key popup.
-This will only display the docstring up to the first line
-break. If you set this variable to the symbol docstring-only,
-then the command's name with be omitted. You probably also want
-to adjust `which-key-max-description-length' at the same time if
-you use this feature."
-  :type '(radio
-          (const :tag "Do not show docstrings" nil)
-          (const :tag "Add docstring to command names" t)
-          (const :tag "Replace command name with docstring" docstring-only))
-  :version "1.0")
-
-(defcustom which-key-highlighted-command-list '()
-  "Rules used to highlight certain commands.
-If the element is a string, assume it is a regexp pattern for
-matching command names and use
-`which-key-highlighted-command-face' for any matching names. If
-the element is a cons cell, it should take the form (regexp .
-face to apply)."
-  :type  '(repeat (choice string (cons regexp face)))
-  :version "1.0")
-
-(defcustom which-key-special-keys '()
-  "These keys will automatically be truncated to one character.
-They also have `which-key-special-key-face' applied to them. This
-is disabled by default. An example configuration is
-
-\(setq which-key-special-keys \\='(\"SPC\" \"TAB\" \"RET\" \"ESC\" \"DEL\")\)"
-  :type '(repeat string)
-  :version "1.0")
-
-(defcustom which-key-buffer-name " *which-key*"
-  "Name of which-key buffer."
-  :type 'string
-  :version "1.0")
-
-(defcustom which-key-show-prefix 'echo
-  "Whether to and where to display the current prefix sequence.
-Possible choices are echo for echo area (the default), left, top
-and nil. Nil turns the feature off."
-  :type '(radio (const :tag "Left of the keys" left)
-                (const :tag "In the first line" top)
-                (const :tag "In the last line" bottom)
-                (const :tag "In the echo area" echo)
-                (const :tag "In the mode-line" mode-line)
-                (const :tag "Hide" nil))
-  :version "1.0")
-
-(defcustom which-key-popup-type 'side-window
-  "Supported types are minibuffer, side-window, frame, and custom."
-  :type '(radio (const :tag "Show in minibuffer" minibuffer)
-                (const :tag "Show in side window" side-window)
-                (const :tag "Show in popup frame" frame)
-                (const :tag "Use your custom display functions" custom))
-  :version "1.0")
-
-(defcustom which-key-min-display-lines 1
-  "Minimum number of horizontal lines to display in the which-key buffer."
-  :type 'integer
-  :version "1.0")
-
-(defcustom which-key-max-display-columns nil
-  "Maximum number of columns to display in the which-key buffer.
-A value of nil means don't impose a maximum."
-  :type '(choice integer (const :tag "Unbounded" nil))
-  :version "1.0")
-
-(defcustom which-key-side-window-location 'bottom
-  "Location of which-key popup when `which-key-popup-type' is side-window.
-Should be one of top, bottom, left or right.  You can also specify
-a list of two locations, like (right bottom).  In this case, the
-first location is tried.  If there is not enough room, the second
-location is tried."
-  :type '(radio (const right)
-                (const bottom)
-                (const left)
-                (const top)
-                (const (right bottom))
-                (const (bottom right)))
-  :version "1.0")
-
-(defcustom which-key-side-window-slot 0
-  "The `slot' to use for `display-buffer-in-side-window'.
-This applies when `which-key-popup-type' is `side-window'.
-Quoting from the docstring of `display-buffer-in-side-window',
-
-`slot' if non-nil, specifies the window slot where to display
-BUFFER.  A value of zero or nil means use the middle slot on the
-specified side.  A negative value means use a slot
-preceding (that is, above or on the left of) the middle slot.  A
-positive value means use a slot following (that is, below or on
-the right of) the middle slot.  The default is zero."
-  :type 'integer
-  :version "1.0")
-
-(defcustom which-key-side-window-max-width 0.333
-  "Maximum width of which-key popup when type is side-window.
-This variable can also be a number between 0 and 1. In that case,
-it denotes a percentage out of the frame's width."
-  :type 'float
-  :version "1.0")
-
-(defcustom which-key-side-window-max-height 0.25
-  "Maximum height of which-key popup when type is side-window.
-This variable can also be a number between 0 and 1. In that case, it denotes
-a percentage out of the frame's height."
-  :type 'float
-  :version "1.0")
-
-(defcustom which-key-frame-max-width 60
-  "Maximum width of which-key popup when type is frame."
-  :type 'natnum
-  :version "1.0")
-
-(defcustom which-key-frame-max-height 20
-  "Maximum height of which-key popup when type is frame."
-  :type 'natnum
-  :version "1.0")
-
-(defcustom which-key-allow-imprecise-window-fit (not (display-graphic-p))
-  "Allow which-key to use a simpler method for resizing the popup.
-If you are noticing lag when the which-key popup displays turning
-this on may help.
-
-See https://github.com/justbur/emacs-which-key/issues/130
-and https://github.com/justbur/emacs-which-key/issues/225."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-show-remaining-keys nil
-  "Show remaining keys in last slot, when keys are hidden."
-  :type '(radio (const :tag "Yes" t)
-                (const :tag "No" nil))
-  :version "1.0")
-
-(defcustom which-key-sort-order #'which-key-key-order
-  "Order in which the key bindings are sorted.
-If nil, do not resort the output from `describe-buffer-bindings'
-which groups by mode. Ordering options
-are
-
-1. `which-key-key-order': by key (default)
-2. `which-key-key-order-alpha': by key using alphabetical order
-3. `which-key-description-order': by description
-4. `which-key-prefix-then-key-order': prefix (no prefix first) then key
-5. `which-key-local-then-key-order': local binding then key
-
-See the README and the docstrings for those functions for more
-information."
-  :type '(choice (function-item which-key-key-order)
-                 (function-item which-key-key-order-alpha)
-                 (function-item which-key-description-order)
-                 (function-item which-key-prefix-then-key-order)
-                 (function-item which-key-local-then-key-order))
-  :version "1.0")
-
-(defcustom which-key-sort-uppercase-first t
-  "If non-nil, uppercase comes before lowercase in sorting.
-This applies to the function chosen in
-`which-key-sort-order'. Otherwise, the order is reversed."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-paging-prefixes '()
-  "Enable paging for these prefixes."
-  :type '(repeat string)
-  :version "1.0")
-
-(defcustom which-key-paging-key "<f5>"
-  "Key to use for changing pages.
-Bound after each of the prefixes in `which-key-paging-prefixes'"
-  :type 'string
-  :version "1.0")
-
-;; (defcustom which-key-undo-key nil
-;;   "Key (string) to use for undoing keypresses. Bound recursively
-;; in each of the maps in `which-key-undo-keymaps'."
-;;   :group 'which-key
-;;   :type 'string)
-
-;; (defcustom which-key-undo-keymaps '()
-;;   "Keymaps in which to bind `which-key-undo-key'"
-;;   :group 'which-key
-;;   :type '(repeat symbol))
-
-(defcustom which-key-use-C-h-commands t
-  "Use C-h (`help-char') for paging if non-nil.
-Normally `help-char' after a prefix calls
-`describe-prefix-bindings'. This changes that command to a
-which-key paging command when which-key-mode is active."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-show-early-on-C-h nil
-  "Allow C-h (`help-char') to trigger which-key popup before timer.
-Show the which-key buffer if `help-char' is pressed in the middle
-of a prefix before the which-key buffer would normally be
-triggered by the time. If combined with the following settings,
-which-key will effectively only show when triggered \"manually\"
-using C-h.
-
-\(setq `which-key-idle-delay' 10000)
-\(setq `which-key-idle-secondary-delay' 0.05)
-
-Note that `which-key-idle-delay' should be set before turning on
-`which-key-mode'."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-is-verbose nil
-  "Whether to warn about potential mistakes in configuration."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-preserve-window-configuration nil
-  "Save and restore window configuration around which-key popup display.
-If non-nil, save window configuration before which-key buffer is
-shown and restore it after which-key buffer is hidden. It
-prevents which-key from changing window position of visible
-buffers.  Only takken into account when popup type is
-side-window."
-  :type 'boolean
-  :version "1.0")
-
-(defvar which-key-C-h-map-prompt
-  (concat " \\<which-key-C-h-map>"
-          " \\[which-key-show-next-page-cycle]"
-          which-key-separator "next-page,"
-          " \\[which-key-show-previous-page-cycle]"
-          which-key-separator "previous-page,"
-          " \\[which-key-undo-key]"
-          which-key-separator "undo-key,"
-          " \\[which-key-toggle-docstrings]"
-          which-key-separator "toggle-docstrings,"
-          " \\[which-key-show-standard-help]"
-          which-key-separator "help,"
-          " \\[which-key-abort]"
-          which-key-separator "abort"
-          " 1..9"
-          which-key-separator "digit-arg")
-  "Prompt to display when invoking `which-key-C-h-map'.
-This string is fed into `substitute-command-keys'")
-
-(defvar which-key-C-h-map
-  (let ((map (make-sparse-keymap)))
-    (dolist (bind `(("\C-a" . which-key-abort)
-                    ("a" . which-key-abort)
-                    ("\C-d" . which-key-toggle-docstrings)
-                    ("d" . which-key-toggle-docstrings)
-                    (,(vector help-char) . which-key-show-standard-help)
-                    ("h" . which-key-show-standard-help)
-                    ("\C-n" . which-key-show-next-page-cycle)
-                    ("n" . which-key-show-next-page-cycle)
-                    ("\C-p" . which-key-show-previous-page-cycle)
-                    ("p" . which-key-show-previous-page-cycle)
-                    ("\C-u" . which-key-undo-key)
-                    ("u" . which-key-undo-key)
-                    ("1" . which-key-digit-argument)
-                    ("2" . which-key-digit-argument)
-                    ("3" . which-key-digit-argument)
-                    ("4" . which-key-digit-argument)
-                    ("5" . which-key-digit-argument)
-                    ("6" . which-key-digit-argument)
-                    ("7" . which-key-digit-argument)
-                    ("8" . which-key-digit-argument)
-                    ("9" . which-key-digit-argument)))
-      (define-key map (car bind) (cdr bind)))
-    map)
-  "Keymap for C-h commands.")
-
-(defvar which-key--paging-functions
-  (list #'which-key-C-h-dispatch
-        #'which-key-turn-page
-        #'which-key-show-next-page-cycle
-        #'which-key-show-next-page-no-cycle
-        #'which-key-show-previous-page-cycle
-        #'which-key-show-previous-page-no-cycle
-        #'which-key-undo-key
-        #'which-key-undo))
-
-(defvar which-key-persistent-popup nil
-  "Whether or not to disable `which-key--hide-popup'.")
-
-(defcustom which-key-hide-alt-key-translations t
-  "Hide key translations using Alt key if non nil.
-These translations are not relevant most of the times since a lot
-of terminals issue META modifier for the Alt key.
-
-See Info node `(emacs)Modifier Keys'."
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-delay-functions nil
-  "List of functions that may delay the which-key popup.
-A list of functions that may decide whether to delay the
-which-key popup based on the current incomplete key
-sequence. Each function in the list is run with two arguments,
-the current key sequence as produced by `key-description' and the
-length of the key sequence. If the popup should be delayed based
-on that key sequence, the function should return the delay time
-in seconds. Returning nil means no delay. The first function in
-this list to return a value is the value that is used.
-
-The delay time is effectively added to the normal
-`which-key-idle-delay'."
-  :type '(repeat function)
-  :version "1.0")
-
-(defcustom which-key-allow-regexps nil
-  "A list of regexp strings to use to filter key sequences.
-When non-nil, for a key sequence to trigger the which-key popup
-it must match one of the regexps in this list.  The format of the
-key sequences is what is produced by `key-description'."
-  :type '(repeat regexp)
-  :version "1.0")
-
-(defcustom which-key-inhibit-regexps nil
-  "A list of regexp strings to use to filter key sequences.
-When non-nil, for a key sequence to trigger the which-key popup
-it cannot match one of the regexps in this list. The format of
-the key sequences is what is produced by `key-description'."
-  :type '(repeat regexp)
-  :version "1.0")
-
-(defcustom which-key-show-transient-maps nil
-  "Show keymaps created by `set-transient-map' when applicable.
-
-More specifically, detect when `overriding-terminal-local-map' is
-set (this is the keymap used by `set-transient-map') and display
-it."
-  :type 'boolean
-  :version "1.0")
-
-(make-obsolete-variable
- 'which-key-enable-extended-define-key
- "which-key-enable-extended-define-key is obsolete and has no effect."
- "2021-06-21")
-
-;; Hooks
-(defcustom which-key-init-buffer-hook '()
-  "Hook run when which-key buffer is initialized."
-  :type 'hook
-  :version "1.0")
-
-;;;; Faces
-
-(defgroup which-key-faces nil
-  "Faces for which-key-mode"
-  :group 'which-key
-  :prefix "which-key-")
-
-(defface which-key-key-face
-  '((t . (:inherit font-lock-constant-face)))
-  "Face for which-key keys"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-separator-face
-  '((t . (:inherit font-lock-comment-face)))
-  "Face for the separator (default separator is an arrow)"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-note-face
-  '((t . (:inherit which-key-separator-face)))
-  "Face for notes or hints occasionally provided"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-command-description-face
-  '((t . (:inherit font-lock-function-name-face)))
-  "Face for the key description when it is a command"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-local-map-description-face
-  '((t . (:inherit which-key-command-description-face)))
-  "Face for the key description when it is found in `current-local-map'"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-highlighted-command-face
-  '((t . (:inherit which-key-command-description-face :underline t)))
-  "Default face for the command description when it is a command
-and it matches a string in `which-key-highlighted-command-list'."
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-group-description-face
-  '((t . (:inherit font-lock-keyword-face)))
-  "Face for the key description when it is a group or prefix."
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-special-key-face
-  '((t . (:inherit which-key-key-face :inverse-video t :weight bold)))
-  "Face for special keys (SPC, TAB, RET)"
-  :group 'which-key-faces
-  :version "1.0")
-
-(defface which-key-docstring-face
-  '((t . (:inherit which-key-note-face)))
-  "Face for docstrings."
-  :group 'which-key-faces
-  :version "1.0")
-
-;;;; Custom popup
-
-(defcustom which-key-custom-popup-max-dimensions-function nil
-  "Set a custom max-dimensions function.
-Will be passed the width of the active window and is expected to
-return the maximum height in lines and width in characters of the
-which-key popup in the form a cons cell (height . width)."
-  :group 'which-key
-  :type '(choice function (const nil))
-  :version "1.0")
-
-(defcustom which-key-custom-hide-popup-function nil
-  "Set a custom hide-popup function.
-It takes no arguments and the return value is ignored."
-  :group 'which-key
-  :type '(choice function (const nil))
-  :version "1.0")
-
-(defcustom which-key-custom-show-popup-function nil
-  "Set a custom show-popup function.
-Will be passed the required dimensions in the form (height .
-width) in lines and characters respectively.  The return value is
-ignored."
-  :group 'which-key
-  :type '(choice function (const nil))
-  :version "1.0")
-
-(defcustom which-key-lighter " WK"
-  "Minor mode lighter to use in the mode-line."
-  :group 'which-key
-  :type 'string
-  :version "1.0")
-
-(defvar which-key-inhibit nil
-  "Prevent which-key from popping up momentarily.
-This can be used by setting this to a non-nil value for the
-execution of a command, as in
-
-\(let \(\(which-key-inhibit t\)\)
-...\)")
-
-(defcustom which-key-inhibit-display-hook nil
-  "Hook run before display of which-key popup.
-Each function in the hook is run before displaying the which-key
-popup. If any function returns a non-nil value, the popup will
-not display."
-  :group 'which-key
-  :type 'hook
-  :version "1.0")
-
-(defvar which-key-keymap-history nil
-  "History of keymap selections.
-Used in functions like `which-key-show-keymap'.")
-
-;;; Internal Vars
-
-(defvar which-key--buffer nil
-  "Holds reference to which-key buffer.")
-(defvar which-key--timer nil
-  "Holds reference to open window timer.")
-(defvar which-key--secondary-timer-active nil
-  "Non-nil if the secondary timer is active.")
-(defvar which-key--paging-timer nil
-  "Holds reference to timer for paging.")
-(defvar which-key--frame nil
-  "Holds reference to which-key frame.
-Used when `which-key-popup-type' is frame.")
-(defvar which-key--echo-keystrokes-backup nil
-  "Backup the initial value of `echo-keystrokes'.")
-(defvar which-key--prefix-help-cmd-backup nil
-  "Backup the value of `prefix-help-command'.")
-(defvar which-key--last-try-2-loc nil
-  "Last location of side-window when two locations used.")
-(defvar which-key--automatic-display nil
-  "Non-nil if popup was triggered with automatic update.")
-(defvar which-key--debug-buffer-name nil
-  "If non-nil, use this buffer for debug messages.")
-(defvar which-key--multiple-locations nil)
-(defvar which-key--inhibit-next-operator-popup nil)
-(defvar which-key--prior-show-keymap-args nil)
-(defvar which-key--previous-frame-size nil)
-(defvar which-key--prefix-title-alist nil)
-(defvar which-key--evil-keys-regexp (eval-when-compile
-                                      (regexp-opt '("-state"))))
-(defvar which-key--ignore-non-evil-keys-regexp
-  (regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
-                "select-window" "switch-frame" "which-key")))
-(defvar which-key--ignore-keys-regexp
-  (regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
-                "select-window" "switch-frame" "-state"
-                "which-key")))
-
-(defvar which-key--pages-obj nil)
-(cl-defstruct which-key--pages
-  pages
-  height
-  widths
-  keys/page
-  page-nums
-  num-pages
-  total-keys
-  prefix
-  prefix-title)
-
-(defvar which-key--saved-window-configuration nil)
-
-(defun which-key--rotate (list n)
-  (let* ((len (length list))
-         (n (- len (mod n len))))
-    (append (last list n) (butlast list n))))
-
-(defun which-key--pages-set-current-page (pages-obj n)
-  (setf (which-key--pages-pages pages-obj)
-        (which-key--rotate (which-key--pages-pages pages-obj) n))
-  (setf (which-key--pages-widths pages-obj)
-        (which-key--rotate (which-key--pages-widths pages-obj) n))
-  (setf (which-key--pages-keys/page pages-obj)
-        (which-key--rotate (which-key--pages-keys/page pages-obj) n))
-  (setf (which-key--pages-page-nums pages-obj)
-        (which-key--rotate (which-key--pages-page-nums pages-obj) n))
-  pages-obj)
-
-(defsubst which-key--on-first-page ()
-  (= (which-key--pages-page-nums which-key--pages-obj) 1))
-
-(defsubst which-key--on-last-page ()
-  (= (which-key--pages-page-nums which-key--pages-obj)
-     (which-key--pages-num-pages which-key--pages-obj)))
-
-(defsubst which-key--current-prefix ()
-  (and which-key--pages-obj
-       (which-key--pages-prefix which-key--pages-obj)))
-
-(defmacro which-key--debug-message (&rest msg)
-  `(when which-key--debug-buffer-name
-     (let ((buf (get-buffer-create which-key--debug-buffer-name))
-           (fmt-msg (format ,@msg)))
-       (with-current-buffer buf
-         (goto-char (point-max))
-         (insert "\n" fmt-msg "\n")))))
-
-(defsubst which-key--safe-lookup-key (keymap key)
-  "Version of `lookup-key' that allows KEYMAP to be nil.
-Also convert numeric results of `lookup-key' to nil. KEY is not
-checked."
-  (when (keymapp keymap)
-    (let ((result (lookup-key keymap key)))
-      (when (and result (not (numberp result)))
-        result))))
-
-(defsubst which-key--safe-lookup-key-description (keymap key)
-  "Version of `lookup-key' that allows KEYMAP to be nil.
-Also convert numeric results of `lookup-key' to nil. KEY
-should be formatted as an input for `kbd'."
-  (let ((key (ignore-errors (kbd key))))
-    (when (and key (keymapp keymap))
-      (let ((result (lookup-key keymap key)))
-        (when (and result (not (numberp result)))
-          result)))))
-
-;;; Third-party library support
-
-(defun which-key--this-command-keys ()
-  "Version of `this-single-command-keys' corrected for key-chords."
-  (let ((this-command-keys (this-single-command-keys)))
-    (when (and (vectorp this-command-keys)
-               (> (length this-command-keys) 0)
-               (eq (aref this-command-keys 0) 'key-chord)
-               (bound-and-true-p key-chord-mode))
-      (setq this-command-keys (this-single-command-raw-keys)))
-    this-command-keys))
-
-(defcustom which-key-this-command-keys-function #'which-key--this-command-keys
-  "Function used to retrieve current key sequence.
-The purpose of allowing this variable to be customized is to
-allow which-key to support packages that insert non-standard
-`keys' into the key sequence being read by emacs."
-  :group 'which-key
-  :type 'function
-  :version "1.0")
-
-
-;;;; Evil
-
-(defvar evil-state nil)
-
-(defcustom which-key-allow-evil-operators (boundp 'evil-this-operator)
-  "Allow popup to show for evil operators.
-The popup is normally inhibited in the middle of commands, but
-setting this to non-nil will override this behavior for evil
-operators."
-  :group 'which-key
-  :type 'boolean
-  :version "1.0")
-
-(defcustom which-key-show-operator-state-maps nil
-  "Show the keys following an evil command that reads a motion.
-These are commands typically mapped to keys such as \"y\", \"d\"
-and \"c\" from normal state. This is experimental, because there
-might be some valid keys missing and it might be showing some
-invalid keys."
-  :group 'which-key
-  :type 'boolean
-  :version "1.0")
-
-(defun which-key-evil-this-operator-p ()
-  (and which-key-allow-evil-operators
-       (bound-and-true-p evil-this-operator)))
-
-(add-hook 'which-key-inhibit-display-hook
-          #'which-key-evil-this-operator-p)
-
-;;;; God-mode
-
-(defvar which-key--god-mode-support-enabled nil
-  "Support god-mode if non-nil.")
-
-(defvar which-key--god-mode-key-string nil
-  "String to use for god-mode support.")
-
-(defun which-key--god-mode-lookup-command-advice (orig-fun arg1 &rest args)
-  (setq which-key--god-mode-key-string arg1)
-  (unwind-protect
-      (apply orig-fun arg1 args)
-    (when (bound-and-true-p which-key-mode)
-      (which-key--hide-popup))))
-
-(defun which-key--god-mode-this-command-keys ()
-  "Version of `this-single-command-keys' corrected for god-mode."
-  (let ((this-command-keys (this-single-command-keys)))
-    (when (and which-key--god-mode-support-enabled
-               (bound-and-true-p god-local-mode)
-               (eq this-command 'god-mode-self-insert))
-      (setq this-command-keys (when which-key--god-mode-key-string
-                                (kbd which-key--god-mode-key-string))))
-    this-command-keys))
-
-(defun which-key-god-mode-self-insert-p ()
-  (and which-key--god-mode-support-enabled
-       (bound-and-true-p god-local-mode)
-       (eq this-command 'god-mode-self-insert)))
-
-(defun which-key-enable-god-mode-support (&optional disable)
-  "Enable support for god-mode if non-nil.
-This is experimental, so you need to explicitly opt-in for
-now.  Please report any problems at github.  If DISABLE is non-nil
-disable support."
-  (interactive "P")
-  (setq which-key--god-mode-support-enabled (null disable))
-  (if disable
-      (progn
-        (advice-remove 'god-mode-lookup-command
-                       #'which-key--god-mode-lookup-command-advice)
-        (remove-function which-key-this-command-keys-function
-                         #'which-key--god-mode-this-command-keys)
-        (remove-hook 'which-key-inhibit-display-hook
-                     #'which-key-god-mode-self-insert-p))
-    (advice-add 'god-mode-lookup-command :around
-                #'which-key--god-mode-lookup-command-advice)
-    (add-function :override which-key-this-command-keys-function
-                  #'which-key--god-mode-this-command-keys)
-    (add-hook 'which-key-inhibit-display-hook
-              #'which-key-god-mode-self-insert-p)))
-
-;;; Mode
-
-;;;###autoload
-(define-minor-mode which-key-mode
-  "Toggle which-key-mode."
-  :global t
-  :group 'which-key
-  :lighter which-key-lighter
-  :keymap (let ((map (make-sparse-keymap)))
-            (mapc
-             (lambda (prefix)
-               (define-key map
-                 (kbd (concat prefix " " which-key-paging-key))
-                 #'which-key-C-h-dispatch))
-             which-key-paging-prefixes)
-            map)
-  (if which-key-mode
-      (progn
-        (setq which-key--echo-keystrokes-backup echo-keystrokes)
-        (when (or (eq which-key-show-prefix 'echo)
-                  (eq which-key-popup-type 'minibuffer))
-          (which-key--setup-echo-keystrokes))
-        (unless (member prefix-help-command which-key--paging-functions)
-          (setq which-key--prefix-help-cmd-backup prefix-help-command))
-        (when (or which-key-use-C-h-commands
-                  which-key-show-early-on-C-h)
-          (setq prefix-help-command #'which-key-C-h-dispatch))
-        (when which-key-show-remaining-keys
-          (add-hook 'pre-command-hook #'which-key--lighter-restore))
-        (add-hook 'pre-command-hook #'which-key--hide-popup)
-        (add-hook 'window-size-change-functions
-                  #'which-key--hide-popup-on-frame-size-change)
-        (which-key--start-timer))
-    (setq echo-keystrokes which-key--echo-keystrokes-backup)
-    (when which-key--prefix-help-cmd-backup
-      (setq prefix-help-command which-key--prefix-help-cmd-backup))
-    (when which-key-show-remaining-keys
-      (remove-hook 'pre-command-hook #'which-key--lighter-restore))
-    (remove-hook 'pre-command-hook #'which-key--hide-popup)
-    (remove-hook 'window-size-change-functions
-                 #'which-key--hide-popup-on-frame-size-change)
-    (which-key--stop-timer)))
-
-(defun which-key--init-buffer ()
-  "Initialize which-key buffer"
-  (unless (buffer-live-p which-key--buffer)
-    (setq which-key--buffer (get-buffer-create which-key-buffer-name))
-    (with-current-buffer which-key--buffer
-      ;; suppress confusing minibuffer message
-      (let (message-log-max)
-        (toggle-truncate-lines 1)
-        (message ""))
-      (setq-local cursor-type nil)
-      (setq-local cursor-in-non-selected-windows nil)
-      (setq-local mode-line-format nil)
-      (setq-local header-line-format nil)
-      (setq-local word-wrap nil)
-      (setq-local show-trailing-whitespace nil)
-      (run-hooks 'which-key-init-buffer-hook))))
-
-(defun which-key--setup-echo-keystrokes ()
-  "Reduce `echo-keystrokes' if necessary.
-It will interfere if set too high."
-  (when (and echo-keystrokes
-             (> (abs (- echo-keystrokes which-key-echo-keystrokes)) 0.000001))
-    (if (> which-key-idle-delay which-key-echo-keystrokes)
-        (setq echo-keystrokes which-key-echo-keystrokes)
-      (setq which-key-echo-keystrokes (/ (float which-key-idle-delay) 4)
-            echo-keystrokes which-key-echo-keystrokes))))
-
-(defun which-key-remove-default-unicode-chars ()
-  "Remove default unicode chars from settings.
-Use of `which-key-dont-use-unicode' is preferred to this
-function, but it's included here in case someone cannot set that
-variable early enough in their configuration, if they are using a
-starter kit for example."
-  (when (string-equal which-key-separator " → ")
-    (setq which-key-separator " : ")))
-
-;;; Default configuration functions for use by users.
-
-;;;###autoload
-(defun which-key-setup-side-window-right ()
-  "Set up side-window on right."
-  (interactive)
-  (setq which-key-popup-type 'side-window
-        which-key-side-window-location 'right
-        which-key-show-prefix 'top))
-
-;;;###autoload
-(defun which-key-setup-side-window-right-bottom ()
-  "Set up side-window on right if space allows.
-Otherwise, use bottom."
-  (interactive)
-  (setq which-key-popup-type 'side-window
-        which-key-side-window-location '(right bottom)
-        which-key-show-prefix 'top))
-
-;;;###autoload
-(defun which-key-setup-side-window-bottom ()
-  "Set up side-window that opens on bottom."
-  (interactive)
-  (which-key--setup-echo-keystrokes)
-  (setq which-key-popup-type 'side-window
-        which-key-side-window-location 'bottom
-        which-key-show-prefix 'echo))
-
-;;;###autoload
-(defun which-key-setup-minibuffer ()
-  "Set up minibuffer display.
-Do not use this setup if you use the paging commands.  Instead use
-`which-key-setup-side-window-bottom', which is nearly identical
-but more functional."
-  (interactive)
-  (which-key--setup-echo-keystrokes)
-  (setq which-key-popup-type 'minibuffer
-        which-key-show-prefix 'left))
-
-;;; Helper functions to modify replacement lists.
-
-;;;###autoload
-(defun which-key-add-keymap-based-replacements (keymap key replacement &rest more)
-  "Replace the description of KEY using REPLACEMENT in KEYMAP.
-KEY should take a format suitable for use in `kbd'. REPLACEMENT
-should be a cons cell of the form \(STRING . COMMAND\) for each
-REPLACEMENT, where STRING is the replacement string and COMMAND
-is a symbol corresponding to the intended command to be
-replaced. COMMAND can be nil if the binding corresponds to a key
-prefix. An example is
-
-\(which-key-add-keymap-based-replacements global-map
-  \"C-x w\" \\='\(\"Save as\" . write-file\)\).
-
-For backwards compatibility, REPLACEMENT can also be a string,
-but the above format is preferred, and the option to use a string
-for REPLACEMENT will eventually be removed."
-  (declare (indent defun))
-  (while key
-    (let ((def
-           (cond
-            ((consp replacement) replacement)
-            ((stringp replacement)
-             (cons replacement
-                   (or (which-key--safe-lookup-key-description keymap key)
-                       (make-sparse-keymap))))
-            (t
-             (user-error "Replacement is neither a cons cell or a string")))))
-      (define-key keymap (kbd key) def))
-    (setq key (pop more)
-          replacement (pop more))))
-
-;;;###autoload
-(defun which-key-add-key-based-replacements
-    (key-sequence replacement &rest more)
-  "Replace the description of KEY-SEQUENCE with REPLACEMENT.
-KEY-SEQUENCE is a string suitable for use in `kbd'. REPLACEMENT
-may either be a string, as in
-
-\(which-key-add-key-based-replacements \"C-x 1\" \"maximize\"\)
-
-a cons of two strings as in
-
-\(which-key-add-key-based-replacements \"C-x 8\"
-                                        \\='(\"unicode\" . \"Unicode keys\")\)
-
-or a function that takes a \(KEY . BINDING\) cons and returns a
-replacement.
-
-In the second case, the second string is used to provide a longer
-name for the keys under a prefix.
-
-MORE allows you to specifcy additional KEY REPLACEMENT pairs.  All
-replacements are added to `which-key-replacement-alist'."
-  ;; TODO: Make interactive
-  (while key-sequence
-    ;; normalize key sequences before adding
-    (let ((key-seq (key-description (kbd key-sequence)))
-          (replace (or (and (functionp replacement) replacement)
-                       (car-safe replacement)
-                       replacement)))
-      (push (cons (cons (concat "\\`" (regexp-quote key-seq) "\\'") nil)
-                  (if (functionp replace) replace (cons nil replace)))
-            which-key-replacement-alist)
-      (when (and (not (functionp replacement)) (consp replacement))
-        (push (cons key-seq (cdr-safe replacement))
-              which-key--prefix-title-alist)))
-    (setq key-sequence (pop more) replacement (pop more))))
-(put 'which-key-add-key-based-replacements 'lisp-indent-function 'defun)
-
-;;;###autoload
-(defun which-key-add-major-mode-key-based-replacements
-    (mode key-sequence replacement &rest more)
-  "Functions like `which-key-add-key-based-replacements'.
-The difference is that MODE specifies the `major-mode' that must
-be active for KEY-SEQUENCE and REPLACEMENT (MORE contains
-addition KEY-SEQUENCE REPLACEMENT pairs) to apply."
-  (declare (indent defun))
-  ;; TODO: Make interactive
-  (when (not (symbolp mode))
-    (error "`%S' should be a symbol corresponding to a value of major-mode" mode))
-  (let ((mode-alist
-         (or (cdr-safe (assq mode which-key-replacement-alist)) (list)))
-        (title-mode-alist
-         (or (cdr-safe (assq mode which-key--prefix-title-alist)) (list))))
-    (while key-sequence
-      ;; normalize key sequences before adding
-      (let ((key-seq (key-description (kbd key-sequence)))
-            (replace (or (and (functionp replacement) replacement)
-                         (car-safe replacement)
-                         replacement)))
-        (push (cons (cons (concat "\\`" (regexp-quote key-seq) "\\'") nil)
-                    (if (functionp replace) replace (cons nil replace)))
-              mode-alist)
-        (when (and (not (functionp replacement)) (consp replacement))
-          (push (cons key-seq (cdr-safe replacement))
-                title-mode-alist)))
-      (setq key-sequence (pop more) replacement (pop more)))
-    (if (assq mode which-key-replacement-alist)
-        (setcdr (assq mode which-key-replacement-alist) mode-alist)
-      (push (cons mode mode-alist) which-key-replacement-alist))
-    (if (assq mode which-key--prefix-title-alist)
-        (setcdr (assq mode which-key--prefix-title-alist) title-mode-alist)
-      (push (cons mode title-mode-alist) which-key--prefix-title-alist))))
-
-(defun which-key-define-key-recursively (map key def &optional at-root)
-  "Recursively bind KEY in MAP to DEF on every level of MAP except the first.
-If AT-ROOT is non-nil the binding is also placed at the root of MAP."
-  (when at-root (define-key map key def))
-  (map-keymap
-   (lambda (_ev df)
-     (when (keymapp df)
-       (which-key-define-key-recursively df key def t)))
-   map))
-
-;;; Functions for computing window sizes
-
-(defun which-key--text-width-to-total (text-width)
-  "Convert window TEXT-WIDTH to window total-width.
-TEXT-WIDTH is the desired text width of the window.  The function
-calculates what total width is required for a window in the
-selected to have a text-width of TEXT-WIDTH columns.  The
-calculation considers possible fringes and scroll bars.  This
-function assumes that the desired window has the same character
-width as the frame."
-  (let ((char-width (frame-char-width)))
-    (+ text-width
-       (/ (frame-fringe-width) char-width)
-       (/ (frame-scroll-bar-width) char-width)
-       (if (which-key--char-enlarged-p) 1 0)
-       ;; add padding to account for possible wide (unicode) characters
-       3)))
-
-(defun which-key--total-width-to-text (total-width)
-  "Convert window TOTAL-WIDTH to window text-width.
-TOTAL-WIDTH is the desired total width of the window.  The function calculates
-what text width fits such a window.  The calculation considers possible fringes
-and scroll bars.  This function assumes that the desired window has the same
-character width as the frame."
-  (let ((char-width (frame-char-width)))
-    (- total-width
-       (/ (frame-fringe-width) char-width)
-       (/ (frame-scroll-bar-width) char-width)
-       (if (which-key--char-enlarged-p) 1 0)
-       ;; add padding to account for possible wide (unicode) characters
-       3)))
-
-(defun which-key--char-enlarged-p (&optional _frame)
-  (> (frame-char-width)
-     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
-
-(defun which-key--char-reduced-p (&optional _frame)
-  (< (frame-char-width)
-     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
-
-(defun which-key--char-exact-p (&optional _frame)
-  (= (frame-char-width)
-     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
-
-(defun which-key--width-or-percentage-to-width (width-or-percentage)
-  "Return window total width.
-If WIDTH-OR-PERCENTAGE is a whole number, return it unchanged.  Otherwise, it
-should be a percentage (a number between 0 and 1) out of the frame's width.
-More precisely, it should be a percentage out of the frame's root window's
-total width."
-  (if (natnump width-or-percentage)
-      width-or-percentage
-    (round (* width-or-percentage (window-total-width (frame-root-window))))))
-
-(defun which-key--height-or-percentage-to-height (height-or-percentage)
-  "Return window total height.
-If HEIGHT-OR-PERCENTAGE is a whole number, return it unchanged.  Otherwise, it
-should be a percentage (a number between 0 and 1) out of the frame's height.
-More precisely, it should be a percentage out of the frame's root window's
-total height."
-  (if (natnump height-or-percentage)
-      height-or-percentage
-    (round (* height-or-percentage (window-total-height (frame-root-window))))))
-
-(defun which-key--frame-size-changed-p ()
-  "Non-nil if a change in frame size is detected."
-  (let ((new-size (cons (frame-width) (frame-height))))
-    (cond ((null which-key--previous-frame-size)
-           (setq which-key--previous-frame-size new-size)
-           nil)
-          ((not (equal which-key--previous-frame-size new-size))
-           (setq which-key--previous-frame-size new-size)))))
-
-;;; Show/hide which-key buffer
-
-(defun which-key--hide-popup ()
-  "This function is called to hide the which-key buffer."
-  (unless (or which-key-persistent-popup
-              (member real-this-command which-key--paging-functions))
-    (setq which-key--last-try-2-loc nil)
-    (setq which-key--pages-obj nil)
-    (setq which-key--automatic-display nil)
-    (setq which-key--prior-show-keymap-args nil)
-    (when (and which-key-idle-secondary-delay which-key--secondary-timer-active)
-      (which-key--start-timer))
-    (which-key--lighter-restore)
-    (which-key--hide-popup-ignore-command)))
-
-(defun which-key--hide-popup-ignore-command ()
-  "`which-key--hide-popup' without the check of `real-this-command'."
-  (cl-case which-key-popup-type
-    ;; Not necessary to hide minibuffer
-    ;; (minibuffer (which-key--hide-buffer-minibuffer))
-    (side-window (which-key--hide-buffer-side-window))
-    (frame (which-key--hide-buffer-frame))
-    (custom (funcall which-key-custom-hide-popup-function))))
-
-(defun which-key--hide-popup-on-frame-size-change (&optional _)
-  "Hide which-key popup if the frame is resized (to trigger a new popup)."
-  (when (which-key--frame-size-changed-p)
-    (which-key--hide-popup)))
-
-(defun which-key--hide-buffer-side-window ()
-  "Hide which-key buffer when side-window popup is used."
-  (when (buffer-live-p which-key--buffer)
-    ;; in case which-key buffer was shown in an existing window, `quit-window'
-    ;; will re-show the previous buffer, instead of closing the window
-    (quit-windows-on which-key--buffer)
-    (when (and which-key-preserve-window-configuration
-               which-key--saved-window-configuration)
-      (set-window-configuration which-key--saved-window-configuration)
-      (setq which-key--saved-window-configuration nil))))
-
-(defun which-key--hide-buffer-frame ()
-  "Hide which-key buffer when frame popup is used."
-  (when (frame-live-p which-key--frame)
-    (delete-frame which-key--frame)))
-
-(defun which-key--popup-showing-p ()
-  (and (bufferp which-key--buffer)
-       (or (window-live-p (get-buffer-window which-key--buffer))
-           (let ((window (get-buffer-window which-key--buffer t)))
-             (and (window-live-p window)
-                  (frame-visible-p (window-frame window)))))))
-
-(defun which-key--show-popup (act-popup-dim)
-  "Show the which-key buffer.
-ACT-POPUP-DIM includes the dimensions, (height . width) of the
-buffer text to be displayed in the popup.  Return nil if no window
-is shown, or if there is no need to start the closing timer."
-  (when (and (> (car act-popup-dim) 0)
-             (> (cdr act-popup-dim) 0))
-    (cl-case which-key-popup-type
-      ;; Not called for minibuffer
-      ;; (minibuffer (which-key--show-buffer-minibuffer act-popup-dim))
-      (side-window (which-key--show-buffer-side-window act-popup-dim))
-      (frame (which-key--show-buffer-frame act-popup-dim))
-      (custom (funcall which-key-custom-show-popup-function act-popup-dim)))))
-
-(defun which-key--fit-buffer-to-window-horizontally
-    (&optional window &rest params)
-  "Slightly modified version of `fit-buffer-to-window'.
-Use &rest params because `fit-buffer-to-window' has a different
-call signature in different emacs versions"
-  (let ((fit-window-to-buffer-horizontally t)
-        (window-min-height 1))
-    (apply #'fit-window-to-buffer window params)))
-
-(defun which-key--show-buffer-side-window (act-popup-dim)
-  "Show which-key buffer when popup type is side-window."
-  (when (and which-key-preserve-window-configuration
-             (not which-key--saved-window-configuration))
-    (setq which-key--saved-window-configuration (current-window-configuration)))
-  (let* ((height (car act-popup-dim))
-         (width (cdr act-popup-dim))
-         (alist
-          (if which-key-allow-imprecise-window-fit
-              `((window-width .  ,(which-key--text-width-to-total width))
-                (window-height . ,height)
-                (side . ,which-key-side-window-location)
-                (slot . ,which-key-side-window-slot))
-            `((window-width . which-key--fit-buffer-to-window-horizontally)
-              (window-height . (lambda (w) (fit-window-to-buffer w nil 1)))
-              (side . ,which-key-side-window-location)
-              (slot . ,which-key-side-window-slot)))))
-    (which-key--debug-message "Allow imprecise fit: %s
-Display window alist: %s"
-                              which-key-allow-imprecise-window-fit
-                              alist)
-    ;; Previously used `display-buffer-in-major-side-window' here, but
-    ;; apparently that is meant to be an internal function. See emacs bug #24828
-    ;; and advice given there.
-    (cond
-     ((eq which-key--multiple-locations t)
-      ;; possibly want to switch sides in this case so we can't reuse the window
-      (delete-windows-on which-key--buffer)
-      (display-buffer-in-side-window which-key--buffer alist))
-     ((get-buffer-window which-key--buffer)
-      (display-buffer-reuse-window which-key--buffer alist))
-     (t
-      (display-buffer-in-side-window which-key--buffer alist)))))
-
-(defun which-key--show-buffer-frame (act-popup-dim)
-  "Show which-key buffer when popup type is frame."
-  (let* (;(orig-window (selected-window))
-         (frame-height (+ (car act-popup-dim)
-                          (if (with-current-buffer which-key--buffer
-                                mode-line-format)
-                              1
-                            0)))
-         ;; without adding 2, frame sometimes isn't wide enough for the buffer.
-         ;; this is probably because of the fringes. however, setting fringes
-         ;; sizes to 0 (instead of adding 2) didn't always make the frame wide
-         ;; enough. don't know why it is so.
-         (frame-width (+ (cdr act-popup-dim) 2))
-         (new-window (if (and (frame-live-p which-key--frame)
-                              (eq which-key--buffer
-                                  (window-buffer
-                                   (frame-root-window which-key--frame))))
-                         (which-key--show-buffer-reuse-frame
-                          frame-height frame-width)
-                       (which-key--show-buffer-new-frame
-                        frame-height frame-width))))
-    (when new-window
-      ;; display successful
-      (setq which-key--frame (window-frame new-window))
-      new-window)))
-
-(defun which-key--show-buffer-new-frame (frame-height frame-width)
-  "Helper for `which-key--show-buffer-frame'."
-  (let* ((frame-params `((height . ,frame-height)
-                         (width . ,frame-width)
-                         ;; tell the window manager to respect the given sizes
-                         (user-size . t)
-                         ;; which-key frame doesn't need a minibuffer
-                         (minibuffer . nil)
-                         (name . "which-key")
-                         ;; no need for scroll bars in which-key frame
-                         (vertical-scroll-bars . nil)
-                         ;; (left-fringe . 0)
-                         ;; (right-fringe . 0)
-                         ;; (right-divider-width . 0)
-                         ;; make sure frame is visible
-                         (visibility . t)))
-         (alist `((pop-up-frame-parameters . ,frame-params)))
-         (orig-frame (selected-frame))
-         (new-window (display-buffer-pop-up-frame which-key--buffer alist)))
-    (when new-window
-      ;; display successful
-      (redirect-frame-focus (window-frame new-window) orig-frame)
-      new-window)))
-
-(defun which-key--show-buffer-reuse-frame (frame-height frame-width)
-  "Helper for `which-key--show-buffer-frame'."
-  (let ((window
-         (display-buffer-reuse-window
-          which-key--buffer `((reusable-frames . ,which-key--frame)))))
-    (when window
-      ;; display successful
-      (set-frame-size (window-frame window) frame-width frame-height)
-      window)))
-
-;;; Max dimension of available window functions
-
-(defun which-key--popup-max-dimensions ()
-  "Return maximum dimension available for popup.
-Dimension functions should return the maximum possible (height
-. width) of the intended popup. SELECTED-WINDOW-WIDTH is the
-width of currently active window, not the which-key buffer
-window."
-  (cl-ecase which-key-popup-type
-    (minibuffer (which-key--minibuffer-max-dimensions))
-    (side-window (which-key--side-window-max-dimensions))
-    (frame (which-key--frame-max-dimensions))
-    (custom (funcall which-key-custom-popup-max-dimensions-function
-                     (window-width)))))
-
-(defun which-key--minibuffer-max-dimensions ()
-  "Return max-dimensions of minibuffer (height . width).
-Measured in lines and characters respectively."
-  (cons
-   ;; height
-   (if (floatp max-mini-window-height)
-       (floor (* (frame-text-lines)
-                 max-mini-window-height))
-     max-mini-window-height)
-   ;; width
-   (max 0 (- (frame-text-cols) which-key-unicode-correction))))
-
-(defun which-key--side-window-max-dimensions ()
-  "Return max-dimensions of the side-window popup.
-The return value should be (height . width) in lines and
-characters respectively."
-  (cons
-   ;; height
-   (if (member which-key-side-window-location '(left right))
-       ;; 1 is a kludge to make sure there is no overlap
-       (- (frame-height) (window-text-height (minibuffer-window)) 1)
-     ;; (window-mode-line-height which-key--window))
-     ;; FIXME: change to something like
-     ;; (min which-*-height (calculate-max-height))
-     (which-key--height-or-percentage-to-height
-      which-key-side-window-max-height))
-   ;; width
-   (max 0
-        (- (if (memq which-key-side-window-location '(left right))
-               (which-key--total-width-to-text
-                (which-key--width-or-percentage-to-width
-                 which-key-side-window-max-width))
-             (which-key--total-width-to-text
-              (which-key--width-or-percentage-to-width
-               1.0)))
-           which-key-unicode-correction))))
-
-(defun which-key--frame-max-dimensions ()
-  "Return max-dimensions of the frame popup.
-The return value should be (height . width) in lines and
-characters respectively."
-  (cons which-key-frame-max-height which-key-frame-max-width))
-
-;;; Sorting functions
-
-(defun which-key--string< (a b &optional alpha)
-  (let ((da (downcase a))
-        (db (downcase b)))
-    (cond
-     ((and alpha (not which-key-sort-uppercase-first))
-      (if (string-equal da db)
-          (not (string-lessp a b))
-        (string-lessp da db)))
-     ((and alpha which-key-sort-uppercase-first)
-      (if (string-equal da db)
-          (string-lessp a b)
-        (string-lessp da db)))
-     ((not which-key-sort-uppercase-first)
-      (let ((aup (not (string-equal da a)))
-            (bup (not (string-equal db b))))
-        (if (eq aup bup)
-            (string-lessp a b)
-          bup)))
-     (t (string-lessp a b)))))
-
-(defun which-key--key-description< (a b &optional alpha)
-  "Key sorting function.
-Used for `which-key-key-order' and `which-key-key-order-alpha'."
-  (save-match-data
-    (let* ((a (which-key--extract-key a))
-           (b (which-key--extract-key b))
-           (rngrgxp "^\\([^ ]+\\) \\.\\. [^ ]+")
-           (a (if (string-match rngrgxp a) (match-string 1 a) a))
-           (b (if (string-match rngrgxp b) (match-string 1 b) b))
-           (aem? (string-equal a ""))
-           (bem? (string-equal b ""))
-           (a1? (= 1 (length a)))
-           (b1? (= 1 (length b)))
-           (srgxp "^\\(RET\\|SPC\\|TAB\\|DEL\\|LFD\\|ESC\\|NUL\\)")
-           (asp? (string-match-p srgxp a))
-           (bsp? (string-match-p srgxp b))
-           (prrgxp "^\\(M\\|C\\|S\\|A\\|H\\|s\\)-")
-           (apr? (string-match-p prrgxp a))
-           (bpr? (string-match-p prrgxp b))
-           (afn? (string-match-p "<f[0-9]+>" a))
-           (bfn? (string-match-p "<f[0-9]+>" b)))
-      (cond ((or aem? bem?) (and aem? (not bem?)))
-            ((and asp? bsp?)
-             (if (string-equal (substring a 0 3) (substring b 0 3))
-                 (which-key--key-description<
-                  (substring a 3) (substring b 3) alpha)
-               (which-key--string< a b alpha)))
-            ((or asp? bsp?) asp?)
-            ((and a1? b1?) (which-key--string< a b alpha))
-            ((or a1? b1?) a1?)
-            ((and afn? bfn?)
-             (< (string-to-number
-                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" a))
-                (string-to-number
-                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" b))))
-            ((or afn? bfn?) afn?)
-            ((and apr? bpr?)
-             (if (string-equal (substring a 0 2) (substring b 0 2))
-                 (which-key--key-description<
-                  (substring a 2) (substring b 2) alpha)
-               (which-key--string< a b alpha)))
-            ((or apr? bpr?) apr?)
-            (t (which-key--string< a b alpha))))))
-
-(defsubst which-key-key-order-alpha (acons bcons)
-  "Order key descriptions A and B.
-Order is lexicographic within a \"class\", where the classes and
-the ordering of classes are listed below.
-
-special (SPC,TAB,...) < single char < mod (C-,M-,...) < other.
-Sorts single characters alphabetically with lowercase coming
-before upper."
-  (which-key--key-description< (car acons) (car bcons) t))
-
-(defsubst which-key-key-order (acons bcons)
-  "Order key descriptions A and B.
-Order is lexicographic within a \"class\", where the classes and
-the ordering of classes are listed below.
-
-special (SPC,TAB,...) < single char < mod (C-,M-,...) < other."
-  (which-key--key-description< (car acons) (car bcons)))
-
-(defsubst which-key-description-order (acons bcons)
-  "Order descriptions of A and B.
-Uses `string-lessp' after applying lowercase."
-  (string-lessp (downcase (cdr acons)) (downcase (cdr bcons))))
-
-(defsubst which-key--group-p (description)
-  (or (string-equal description "prefix")
-      (string-match-p "^group:" description)
-      (keymapp (intern description))))
-
-(defun which-key-prefix-then-key-order (acons bcons)
-  "Order prefixes before non-prefixes.
-Within these categories order using `which-key-key-order'."
-  (let ((apref? (which-key--group-p (cdr acons)))
-        (bpref? (which-key--group-p (cdr bcons))))
-    (if (not (eq apref? bpref?))
-        (and (not apref?) bpref?)
-      (which-key-key-order acons bcons))))
-
-(defun which-key-prefix-then-key-order-reverse (acons bcons)
-  "Order prefixes before non-prefixes.
-Within these categories order using `which-key-key-order'."
-  (let ((apref? (which-key--group-p (cdr acons)))
-        (bpref? (which-key--group-p (cdr bcons))))
-    (if (not (eq apref? bpref?))
-        (and apref? (not bpref?))
-      (which-key-key-order acons bcons))))
-
-(defun which-key-local-then-key-order (acons bcons)
-  "Order local bindings before non-local ones.
-Within these categories order using `which-key-key-order'."
-  (let ((aloc? (which-key--local-binding-p acons))
-        (bloc? (which-key--local-binding-p bcons)))
-    (if (not (eq aloc? bloc?))
-        (and aloc? (not bloc?))
-      (which-key-key-order acons bcons))))
-
-;;; Functions for retrieving and formatting keys
-
-(defsubst which-key--string-width (maybe-string)
-  "If MAYBE-STRING is a string use `which-key--string-width' o/w return 0."
-  (if (stringp maybe-string) (string-width maybe-string) 0))
-
-(defsubst which-key--butlast-string (str)
-  (string-join (butlast (split-string str)) " "))
-
-(defun which-key--match-replacement (key-binding replacement)
-  ;; these are mode specific ones to ignore. The mode specific case is
-  ;; handled in the selection of alist
-  (when (and (consp key-binding) (not (symbolp (car replacement))))
-    (let ((key-regexp (caar replacement))
-          (binding-regexp (cdar replacement))
-          (case-fold-search nil))
-      (and (or (null key-regexp)
-               (string-match-p key-regexp
-                               (car key-binding)))
-           (or (null binding-regexp)
-               (string-match-p binding-regexp
-                               (cdr key-binding)))))))
-
-(defsubst which-key--replace-in-binding (key-binding repl)
-  (cond ((or (not (consp repl)) (null (cdr repl)))
-         key-binding)
-        ((functionp (cdr repl))
-         (funcall (cdr repl) key-binding))
-        ((consp (cdr repl))
-         (cons
-          (cond ((and (caar repl) (cadr repl))
-                 (replace-regexp-in-string
-                  (caar repl) (cadr repl) (car key-binding) t))
-                ((cadr repl) (cadr repl))
-                (t (car key-binding)))
-          (cond ((and (cdar repl) (cddr repl))
-                 (replace-regexp-in-string
-                  (cdar repl) (cddr repl) (cdr key-binding) t))
-                ((cddr repl) (cddr repl))
-                (t (cdr key-binding)))))))
-
-(defun which-key--replace-in-repl-list-once (key-binding repls)
-  (cl-dolist (repl repls)
-    (when (which-key--match-replacement key-binding repl)
-      (cl-return `(replaced . ,(which-key--replace-in-binding key-binding repl))))))
-
-(defun which-key--replace-in-repl-list-many (key-binding repls)
-  (let (found)
-    (dolist (repl repls)
-      (when (which-key--match-replacement key-binding repl)
-        (setq found t)
-        (setq key-binding (which-key--replace-in-binding key-binding repl))))
-    (when found `(replaced . ,key-binding))))
-
-(defun which-key--maybe-replace (key-binding)
-  "Use `which-key--replacement-alist' to maybe replace KEY-BINDING.
-KEY-BINDING is a cons cell of the form \(KEY . BINDING\) each of
-which are strings.  KEY is of the form produced by `key-binding'."
-  (let* ((replacer (if which-key-allow-multiple-replacements
-                       #'which-key--replace-in-repl-list-many
-                     #'which-key--replace-in-repl-list-once)))
-    (pcase
-        (apply replacer
-               (list key-binding
-                     (cdr-safe (assq major-mode which-key-replacement-alist))))
-      (`(replaced . ,repl)
-       (if which-key-allow-multiple-replacements
-           (pcase (apply replacer (list repl which-key-replacement-alist))
-             (`(replaced . ,repl) repl)
-             ('() repl))
-         repl))
-      ('()
-       (pcase (apply replacer (list key-binding which-key-replacement-alist))
-         (`(replaced . ,repl) repl)
-         ('() key-binding))))))
-
-(defsubst which-key--current-key-list (&optional key-str)
-  (append (listify-key-sequence (which-key--current-prefix))
-          (when key-str
-            (listify-key-sequence (kbd key-str)))))
-
-(defsubst which-key--current-key-string (&optional key-str)
-  (key-description (which-key--current-key-list key-str)))
-
-(defun which-key--local-binding-p (keydesc)
-  (eq (which-key--safe-lookup-key-description
-       (current-local-map)
-       (which-key--current-key-string (car keydesc)))
-      (intern (cdr keydesc))))
-
-(defun which-key--map-binding-p (map keydesc)
-  "Does MAP contain KEYDESC = (key . binding)?"
-  (or
-   (when (bound-and-true-p evil-state)
-     (let ((lookup
-            (which-key--safe-lookup-key-description
-             map
-             (which-key--current-key-string
-              (format "<%s-state> %s" evil-state (car keydesc))))))
-       (or (eq lookup (intern (cdr keydesc)))
-           (and (keymapp lookup) (string= (cdr keydesc) "Prefix Command")))))
-   (let ((lookup
-          (which-key--safe-lookup-key-description
-           map (which-key--current-key-string (car keydesc)))))
-     (or (eq lookup (intern (cdr keydesc)))
-         (and (keymapp lookup) (string= (cdr keydesc) "Prefix Command"))))))
-
-(defun which-key--maybe-get-prefix-title (keys)
-  "KEYS is a string produced by `key-description'.
-A title is possibly returned using
-`which-key--prefix-title-alist'.  An empty string is returned if
-no title exists."
-  (cond
-   ((not (string-equal keys ""))
-    (let* ((title-res
-            (cdr-safe (assoc-string keys which-key--prefix-title-alist)))
-           (repl-res
-            (cdr-safe (which-key--maybe-replace (cons keys ""))))
-           (binding (key-binding (kbd keys)))
-           (alternate (when (and binding (symbolp binding))
-                        (symbol-name binding))))
-      (cond (title-res title-res)
-            ((not (string-empty-p repl-res)) repl-res)
-            ((and (eq which-key-show-prefix 'echo) alternate)
-             alternate)
-            ((and (member which-key-show-prefix '(bottom top mode-line))
-                  (eq which-key-side-window-location 'bottom)
-                  echo-keystrokes)
-             (if alternate alternate
-               (concat "Following " keys)))
-            (t ""))))
-   (t "")))
-
-(defun which-key--propertize (string &rest properties)
-  "Version of `propertize' that checks type of STRING."
-  (when (stringp string)
-    (apply #'propertize string properties)))
-
-(defun which-key--propertize-key (key)
-  "Add a face to KEY.
-If KEY contains any \"special keys\" defined in
-`which-key-special-keys' then truncate and add the corresponding
-`which-key-special-key-face'."
-  (let ((key-w-face (which-key--propertize key 'face 'which-key-key-face))
-        (regexp (concat "\\("
-                        (mapconcat #'identity which-key-special-keys
-                                   "\\|")
-                        "\\)"))
-        (case-fold-search nil))
-    (save-match-data
-      (if (and which-key-special-keys
-               (string-match regexp key))
-          (let ((beg (match-beginning 0)) (end (match-end 0)))
-            (concat (substring key-w-face 0 beg)
-                    (which-key--propertize (substring key-w-face beg (1+ beg))
-                                           'face 'which-key-special-key-face)
-                    (substring key-w-face end
-                               (which-key--string-width key-w-face))))
-        key-w-face))))
-
-(defsubst which-key--truncate-description (desc avl-width)
-  "Truncate DESC description to `which-key-max-description-length'."
-  (let* ((max which-key-max-description-length)
-         (max (cl-etypecase max
-                (null nil)
-                (integer max)
-                (float (truncate (* max avl-width)))
-                (function (let ((val (funcall max avl-width)))
-                            (if (floatp val) (truncate val) val))))))
-    (if (and max (> (length desc) max))
-        (let ((dots (and (not (equal which-key-ellipsis ""))
-                         (which-key--propertize
-                          which-key-ellipsis 'face
-                          (get-text-property (1- (length desc)) 'face desc)))))
-          (if dots
-              (concat (substring desc 0 (- max (length dots))) dots)
-            (substring desc 0 max)))
-      desc)))
-
-(defun which-key--highlight-face (description)
-  "Return the highlight face for DESCRIPTION if it has one."
-  (let (face)
-    (dolist (el which-key-highlighted-command-list)
-      (unless face
-        (cond ((consp el)
-               (when (string-match-p (car el) description)
-                 (setq face (cdr el))))
-              ((stringp el)
-               (when (string-match-p el description)
-                 (setq face 'which-key-highlighted-command-face)))
-              (t
-               (message "which-key: warning: element %s of \
-which-key-highlighted-command-list is not a string or a cons
-cell" el)))))
-    face))
-
-(defun which-key--propertize-description
-    (description group local hl-face &optional original-description)
-  "Add face to DESCRIPTION.
-The face chosen depends on whether the description represents a
-group or a command. Also make some minor adjustments to the
-description string, like removing a \"group:\" prefix.
-
-ORIGINAL-DESCRIPTION is the description given by
-`describe-buffer-bindings'."
-  (when description
-    (let* ((desc description)
-           (desc (if (string-match-p "^group:" desc)
-                     (substring desc 6) desc))
-           (desc (if group (concat which-key-prefix-prefix desc) desc)))
-      (make-text-button
-       desc nil
-       'face (cond (hl-face hl-face)
-                   (group 'which-key-group-description-face)
-                   (local 'which-key-local-map-description-face)
-                   (t 'which-key-command-description-face))
-       'help-echo (cond
-                   ((and original-description
-                         (fboundp (intern original-description))
-                         (documentation (intern original-description))
-                         ;; tooltip-mode doesn't exist in emacs-nox
-                         (boundp 'tooltip-mode) tooltip-mode)
-                    (documentation (intern original-description)))
-                   ((and original-description
-                         (fboundp (intern original-description))
-                         (documentation (intern original-description))
-                         (let* ((doc (documentation
-                                      (intern original-description)))
-                                (str (replace-regexp-in-string "\n" " " doc))
-                                (max (floor (* (frame-width) 0.8))))
-                           (if (> (length str) max)
-                               (concat (substring str 0 max) "...")
-                             str)))))))))
-
-(defun which-key--extract-key (key-str)
-  "Pull the last key (or key range) out of KEY-STR."
-  (save-match-data
-    (let ((key-range-regexp "\\`.*\\([^ \t]+ \\.\\. [^ \t]+\\)\\'"))
-      (if (string-match key-range-regexp key-str)
-          (match-string 1 key-str)
-        (car (last (split-string key-str " ")))))))
-
-(defun which-key--maybe-add-docstring (current original)
-  "Maybe concat a docstring to CURRENT and return result.
-Specifically, do this if ORIGINAL is a command with a docstring
-and `which-key-show-docstrings' is non-nil.  If
-`which-key-show-docstrings' is the symbol docstring-only, just
-return the docstring."
-  (let* ((orig-sym (intern original))
-         (doc (when (commandp orig-sym)
-                (documentation orig-sym)))
-         (doc (when doc
-                (replace-regexp-in-string
-                 (concat "^\\(?::"
-                         (regexp-opt '("around" "override"
-                                       "after" "after-until" "after-while"
-                                       "before" "before-until" "before-while"
-                                       "filter-args" "filter-return"))
-                         " advice: [^\n]+\n"
-                         "\\)+\n")
-                 "" doc)))
-         (docstring (when doc
-                      (which-key--propertize (car (split-string doc "\n"))
-                                             'face 'which-key-docstring-face))))
-    (cond ((not (and which-key-show-docstrings docstring))
-           current)
-          ((eq which-key-show-docstrings 'docstring-only)
-           docstring)
-          (t
-           (format "%s %s" current docstring)))))
-
-(defun which-key--format-and-replace (unformatted &optional preserve-full-key)
-  "Make list of key bindings with separators and descriptions.
-Take a list of (key . desc) cons cells in UNFORMATTED, add
-faces and perform replacements according to the three replacement
-alists. Returns a list (key separator description)."
-  (let ((sep-w-face
-         (which-key--propertize which-key-separator
-                                'face 'which-key-separator-face))
-        (local-map (current-local-map))
-	(avl-width (cdr (which-key--popup-max-dimensions)))
-        new-list)
-    (dolist (key-binding unformatted)
-      (let* ((keys (car key-binding))
-             (orig-desc (cdr key-binding))
-             (group (which-key--group-p orig-desc))
-             (local (eq (which-key--safe-lookup-key-description
-                         local-map keys)
-                        (intern orig-desc)))
-             (hl-face (which-key--highlight-face orig-desc))
-             (key-binding (which-key--maybe-replace key-binding))
-             (final-desc (which-key--propertize-description
-                          (cdr key-binding) group local hl-face orig-desc)))
-        (when final-desc
-          (setq final-desc
-                (which-key--truncate-description
-                 (which-key--maybe-add-docstring final-desc orig-desc)
-		 avl-width)))
-        (when (consp key-binding)
-          (push
-           (list (which-key--propertize-key
-                  (if preserve-full-key
-                      (car key-binding)
-                    (which-key--extract-key (car key-binding))))
-                 sep-w-face
-                 final-desc)
-           new-list))))
-    (nreverse new-list)))
-
-(defun which-key--compute-binding (binding)
-  "Replace BINDING with remapped binding if it exists.
-Requires `which-key-compute-remaps' to be non-nil."
-  (copy-sequence (symbol-name
-                  (or (and which-key-compute-remaps
-                           (command-remapping binding))
-                      binding))))
-
-(defun which-key--get-menu-item-binding (def)
-  "Retrieve binding for menu-item"
-  ;; see `keymap--menu-item-binding'
-  (let* ((binding (nth 2 def))
-         (plist (nthcdr 3 def))
-         (filter (plist-get plist :filter)))
-    (if filter (funcall filter binding) binding)))
-
-(defun which-key--get-keymap-bindings-1
-    (keymap start &optional prefix filter all ignore-commands)
-  "See `which-key--get-keymap-bindings'."
-  (let ((bindings start)
-        (prefix-map (if prefix (lookup-key keymap prefix) keymap)))
-    (when (keymapp prefix-map)
-      (map-keymap
-       (lambda (ev def)
-         (let* ((key (vconcat prefix (list ev)))
-                (key-desc (key-description key)))
-           (cond
-            ((assoc key-desc bindings))
-            ((and (listp ignore-commands) (symbolp def) (memq def ignore-commands)))
-            ((or (string-match-p
-                  which-key--ignore-non-evil-keys-regexp key-desc)
-                 (eq ev 'menu-bar)))
-            ((and (keymapp def)
-                  (string-match-p which-key--evil-keys-regexp key-desc)))
-            ((and (keymapp def)
-                  (or all
-                      ;; event 27 is escape, so this will pick up meta
-                      ;; bindings and hopefully not too much more
-                      (eql ev 27)))
-             (setq bindings
-                   (which-key--get-keymap-bindings-1
-                    keymap bindings key nil all ignore-commands)))
-            (def
-             (let* ((def (if (eq 'menu-item (car-safe def))
-                             (which-key--get-menu-item-binding def)
-                           def))
-                    (binding
-                     (cons key-desc
-                           (cond
-                            ((symbolp def) (which-key--compute-binding def))
-                            ((keymapp def) "prefix")
-                            ((functionp def)
-                             (cond
-                              ((eq 'lambda (car-safe def)) "lambda")
-                              ((eq 'closure (car-safe def)) "closure")
-                              (t "function")))
-                            ((stringp def) def)
-                            ((vectorp def) (key-description def))
-                            ((and (consp def)
-                                  ;; looking for (STRING . DEFN)
-                                  (stringp (car def)))
-                             (concat (when (keymapp (cdr-safe def))
-                                       "group:")
-                                     (car def)))
-                            (t "unknown")))))
-               (when (or (null filter)
-                         (and (functionp filter)
-                              (funcall filter binding)))
-                 (push binding bindings)))))))
-       prefix-map))
-    bindings))
-
-(defun which-key--get-keymap-bindings
-    (keymap &optional start prefix filter all evil)
-  "Retrieve top-level bindings from KEYMAP.
-PREFIX limits bindings to those starting with this key
-sequence.  START is a list of existing bindings to add to.  If ALL
-is non-nil, recursively retrieve all bindings below PREFIX. If
-EVIL is non-nil, extract active evil bidings."
-  (let ((bindings start)
-        (ignore '(self-insert-command ignore ignore-event company-ignore))
-        (evil-map
-         (when (and evil (bound-and-true-p evil-local-mode))
-           (lookup-key keymap (kbd (format "<%s-state>" evil-state))))))
-    (when (keymapp evil-map)
-      (setq bindings (which-key--get-keymap-bindings-1
-                      evil-map bindings prefix filter all ignore)))
-    (which-key--get-keymap-bindings-1
-     keymap bindings prefix filter all ignore)))
-
-(defun which-key--get-current-bindings (&optional prefix filter)
-  "Generate a list of current active bindings."
-  (let (bindings)
-    (dolist (map (current-active-maps t) bindings)
-      (when (cdr map)
-        (setq bindings
-              (which-key--get-keymap-bindings
-               map bindings prefix filter))))))
-
-(defun which-key--get-bindings (&optional prefix keymap filter recursive)
-  "Collect key bindings.
-If KEYMAP is nil, collect from current buffer using the current
-key sequence as a prefix. Otherwise, collect from KEYMAP. FILTER
-is a function to use to filter the bindings. If RECURSIVE is
-non-nil, then bindings are collected recursively for all prefixes."
-  (let* ((unformatted
-          (cond ((keymapp keymap)
-                 (which-key--get-keymap-bindings
-                  keymap nil prefix filter recursive))
-                (keymap
-                 (error "%s is not a keymap" keymap))
-                (t
-                 (which-key--get-current-bindings prefix filter)))))
-    (when which-key-sort-order
-      (setq unformatted
-            (sort unformatted which-key-sort-order)))
-    (which-key--format-and-replace unformatted recursive)))
-
-;;; Functions for laying out which-key buffer pages
-
-(defun which-key--normalize-columns (columns)
-  "Pad COLUMNS to the same length using empty strings."
-  (let ((max-len (cl-reduce (lambda (a x) (max a (length x))) columns
-                            :initial-value 0)))
-    (mapcar
-     (lambda (c)
-       (if (< (length c) max-len)
-           (append c (make-list (- max-len (length c)) ""))
-         c))
-     columns)))
-
-(defsubst which-key--join-columns (columns)
-  "Transpose columns into rows, concat rows into lines and rows into page."
-  (let* ((padded (which-key--normalize-columns (nreverse columns)))
-         (rows (apply #'cl-mapcar #'list padded)))
-    (mapconcat (lambda (row) (mapconcat #'identity row " ")) rows "\n")))
-
-(defsubst which-key--max-len (keys index &optional initial-value)
-  "Find the max length of the INDEX element in each of KEYS."
-  (cl-reduce
-   (lambda (x y) (max x (which-key--string-width (nth index y))))
-   keys :initial-value (if initial-value initial-value 0)))
-
-(defun which-key--pad-column (col-keys avl-width)
-  "Pad cells of COL-KEYS to AVL-WIDTH.
-Take a column of (key separator description) COL-KEYS,
-calculate the max width in the column and pad all cells out to
-that width."
-  (let* ((col-key-width  (+ which-key-add-column-padding
-                            (which-key--max-len col-keys 0)))
-         (col-sep-width  (which-key--max-len col-keys 1))
-         (avl-width      (- avl-width col-key-width col-sep-width))
-         (col-desc-width (min avl-width
-                              (which-key--max-len
-                               col-keys 2
-                               which-key-min-column-description-width)))
-         (col-width      (+ col-key-width col-sep-width col-desc-width))
-         (col-format     (concat "%" (int-to-string col-key-width)
-                                 "s%s%-" (int-to-string col-desc-width) "s")))
-    (cons col-width
-          (mapcar (lambda (k) (apply #'format col-format k))
-                  col-keys))))
-
-(defun which-key--partition-list (n list)
-  "Partition LIST into N-sized sublists."
-  (let (res)
-    (while list
-      (setq res (cons (cl-subseq list 0 (min n (length list))) res)
-            list (nthcdr n list)))
-    (nreverse res)))
-
-(defun which-key--list-to-pages (keys avl-lines avl-width)
-  "Convert list of KEYS to columns based on dimensions AVL-LINES and AVL-WIDTH.
-Returns a `which-key--pages' object that holds the page strings,
-as well as metadata."
-  (let ((cols-w-widths (mapcar (lambda (c) (which-key--pad-column c avl-width))
-			       (which-key--partition-list avl-lines keys)))
-        (page-width 0) (n-pages 0) (n-keys 0) (n-columns 0)
-        page-cols pages page-widths keys/page col)
-    (if (> (apply #'max (mapcar #'car cols-w-widths)) avl-width)
-        ;; give up if no columns fit
-        nil
-      (while cols-w-widths
-        ;; start new page
-        (cl-incf n-pages)
-        (setq col (pop cols-w-widths))
-        (setq page-cols (list (cdr col)))
-        (setq page-width (car col))
-        (setq n-keys (length (cdr col)))
-        (setq n-columns 1)
-        ;; add additional columns as long as they fit
-        (while (and cols-w-widths
-                    (or (null which-key-max-display-columns)
-                        (< n-columns which-key-max-display-columns))
-                    (<= (+ page-width 1 (caar cols-w-widths)) avl-width))
-          (setq col (pop cols-w-widths))
-          (push (cdr col) page-cols)
-          (cl-incf page-width (1+ (car col)))
-          (cl-incf n-keys (length (cdr col)))
-          (cl-incf n-columns))
-        (push (which-key--join-columns page-cols) pages)
-        (push n-keys keys/page)
-        (push page-width page-widths))
-      (make-which-key--pages
-       :pages (nreverse pages)
-       :height (if (> n-pages 1) avl-lines (min avl-lines n-keys))
-       :widths (nreverse page-widths)
-       :keys/page (reverse keys/page)
-       :page-nums (number-sequence 1 n-pages)
-       :num-pages n-pages
-       :total-keys (apply #'+ keys/page)))))
-
-(defun which-key--create-pages-1
-    (keys available-lines available-width &optional min-lines vertical)
-  "Create page strings using `which-key--list-to-pages'.
-Will try to find the best number of rows and columns using the
-given dimensions and the length and widths of ITEMS. Use VERTICAL
-if the ITEMS are laid out vertically and the number of columns
-should be minimized."
-  (let ((result (which-key--list-to-pages
-                 keys available-lines available-width))
-        (min-lines (or min-lines 0))
-        found prev-result)
-    (if (or (null result)
-            vertical
-            (> (which-key--pages-num-pages result) 1)
-            (= 1 available-lines))
-        result
-      ;; simple search for a fitting page
-      (while (and (> available-lines min-lines)
-                  (not found))
-        (setq available-lines (cl-decf available-lines)
-              prev-result result
-              result (which-key--list-to-pages
-                      keys available-lines available-width)
-              found (> (which-key--pages-num-pages result) 1)))
-      (if found prev-result result))))
-
-(defun which-key--create-pages (keys &optional prefix-keys prefix-title)
-  "Create page strings using `which-key--list-to-pages'.
-Will try to find the best number of rows and columns using the
-given dimensions and the length and wdiths of KEYS. SEL-WIN-WIDTH
-is the width of the live window."
-  (let* ((max-dims (which-key--popup-max-dimensions))
-         (max-lines (car max-dims))
-         (max-width (cdr max-dims))
-         (prefix-desc (key-description prefix-keys))
-         (full-prefix (which-key--full-prefix prefix-desc))
-         (prefix (when (eq which-key-show-prefix 'left)
-                   (+ 2 (which-key--string-width full-prefix))))
-         (prefix-top-bottom (member which-key-show-prefix '(bottom top)))
-         (avl-lines (if prefix-top-bottom (- max-lines 1) max-lines))
-         (min-lines (min avl-lines which-key-min-display-lines))
-         (avl-width (if prefix (- max-width prefix) max-width))
-         (vertical (or (and (eq which-key-popup-type 'side-window)
-                            (member which-key-side-window-location '(left right)))
-                       (eq which-key-max-display-columns 1)))
-         result)
-    (setq result
-          (which-key--create-pages-1
-           keys avl-lines avl-width min-lines vertical))
-    (when (and result
-               (> (which-key--pages-num-pages result) 0))
-      (setf (which-key--pages-prefix result) prefix-keys)
-      (setf (which-key--pages-prefix-title result)
-            (or prefix-title
-                (which-key--maybe-get-prefix-title
-                 (key-description prefix-keys))))
-      (when prefix-top-bottom
-        ;; Add back the line earlier reserved for the page information.
-        (setf (which-key--pages-height result) max-lines))
-      (when (and (= (which-key--pages-num-pages result) 1)
-                 (> which-key-min-display-lines
-                    (which-key--pages-height result)))
-        ;; result is shorter than requested, so we artificially increase the
-        ;; height. See #325. Note this only has an effect if
-        ;; `which-key-allow-imprecise-window-fit' is non-nil.
-        (setf (which-key--pages-height result) which-key-min-display-lines))
-      (which-key--debug-message "Frame height: %s
-Frame pixel width: %s
-Frame char width: %s
-Frame width: %s
-Which-key initial width: %s
-Which-key adjusted width: %s
-Minibuffer height: %s
-Max dimensions: (%s, %s)
-Available for bindings: (%s, %s)
-Popup type info: (%s, %s, %s)
-Computed page widths: %s
-Actual lines: %s"
-                                (frame-height)
-                                (frame-pixel-width)
-                                (frame-char-width)
-                                (window-total-width (frame-root-window))
-                                (which-key--width-or-percentage-to-width
-                                  which-key-side-window-max-width)
-                                (which-key--total-width-to-text
-                                 (which-key--width-or-percentage-to-width
-                                  which-key-side-window-max-width))
-                                (window-text-height (minibuffer-window))
-                                max-lines
-                                max-width
-                                avl-lines
-                                avl-width
-                                which-key-popup-type
-                                which-key-side-window-location
-                                which-key-side-window-max-width
-                                (which-key--pages-widths result)
-                                (which-key--pages-height result))
-      result)))
-
-(defun which-key--lighter-status ()
-  "Possibly show number of keys and total in the mode line."
-  (when which-key-show-remaining-keys
-    (let ((n-shown (car (which-key--pages-keys/page which-key--pages-obj)))
-          (n-tot (which-key--pages-total-keys which-key--pages-obj)))
-      (setcar (cdr (assq 'which-key-mode minor-mode-alist))
-              (format " WK: %s/%s keys" n-shown n-tot)))))
-
-(defun which-key--lighter-restore ()
-  "Restore the lighter for which-key."
-  (when which-key-show-remaining-keys
-    (setcar (cdr (assq 'which-key-mode minor-mode-alist))
-            which-key-lighter)))
-
-(defun which-key--echo (text)
-  "Echo TEXT to minibuffer without logging."
-  (let (message-log-max)
-    (message "%s" text)))
-
-(defun which-key--next-page-hint (prefix-keys)
-  "Return string for next page hint."
-  (let* ((paging-key (concat prefix-keys " " which-key-paging-key))
-         (paging-key-bound (eq 'which-key-C-h-dispatch
-                               (key-binding (kbd paging-key))))
-         (key (key-description (vector help-char)))
-         (key (if paging-key-bound
-                  (concat key " or " which-key-paging-key)
-                key)))
-    (when (and which-key-use-C-h-commands
-               (not (equal (vector help-char)
-                           (vconcat (kbd prefix-keys)))))
-      (which-key--propertize (format "[%s paging/help]" key)
-                             'face 'which-key-note-face))))
-
-(eval-and-compile
-  (if (fboundp 'universal-argument--description)
-      (defalias 'which-key--universal-argument--description
-        #'universal-argument--description)
-    (defun which-key--universal-argument--description ()
-      ;; Backport of the definition of universal-argument--description in
-      ;; emacs25 on 2015-12-04
-      (when prefix-arg
-        (concat "C-u"
-                (pcase prefix-arg
-                  (`(-) " -")
-                  (`(,(and (pred integerp) n))
-                   (let ((str ""))
-                     (while (and (> n 4) (= (mod n 4) 0))
-                       (setq str (concat str " C-u"))
-                       (setq n (/ n 4)))
-                     (if (= n 4) str (format " %s" prefix-arg))))
-                  (_ (format " %s" prefix-arg))))))))
-
-(defun which-key--full-prefix (prefix-keys &optional -prefix-arg dont-prop-keys)
-  "Return a description of the full key sequence up to now.
-Include prefix arguments."
-  (let* ((left (eq which-key-show-prefix 'left))
-         (prefix-arg (if -prefix-arg -prefix-arg prefix-arg))
-         (str (concat
-               (which-key--universal-argument--description)
-               (when prefix-arg " ")
-               prefix-keys))
-         (dash (if (and (not (string= prefix-keys ""))
-                        (null left)) "-" "")))
-    (if (or (eq which-key-show-prefix 'echo) dont-prop-keys)
-        (concat str dash)
-      (concat (which-key--propertize-key str)
-              (which-key--propertize dash 'face 'which-key-key-face)))))
-
-(defun which-key--get-popup-map ()
-  "Generate transient-map for use in the top level binding display."
-  (unless which-key--automatic-display
-    (let ((map (make-sparse-keymap)))
-      (define-key map (kbd which-key-paging-key) #'which-key-C-h-dispatch)
-      (when which-key-use-C-h-commands
-        ;; Show next page even when C-h is pressed
-        (define-key map (vector help-char) #'which-key-C-h-dispatch))
-      map)))
-
-(defun which-key--process-page (pages-obj)
-  "Add information to the basic list of key bindings.
-Include, if applicable, the current prefix, the name of the current
-prefix, and a page count."
-  (let* ((page (car (which-key--pages-pages pages-obj)))
-         (height (which-key--pages-height pages-obj))
-         (n-pages (which-key--pages-num-pages pages-obj))
-         (page-n (car (which-key--pages-page-nums pages-obj)))
-         (prefix-desc (key-description (which-key--pages-prefix pages-obj)))
-         (prefix-title (which-key--pages-prefix-title pages-obj))
-         (full-prefix (which-key--full-prefix prefix-desc))
-         (nxt-pg-hint (which-key--next-page-hint prefix-desc))
-         ;; not used in left case
-         (status-line
-          (concat (which-key--propertize prefix-title 'face 'which-key-note-face)
-                  (when (< 1 n-pages)
-                    (which-key--propertize (format " (%s of %s)" page-n n-pages)
-                                           'face 'which-key-note-face)))))
-    (pcase which-key-show-prefix
-      (`left
-       (let* ((page-cnt (which-key--propertize (format "%s/%s" page-n n-pages)
-                                               'face 'which-key-separator-face))
-              (first-col-width (+ 2 (max (which-key--string-width full-prefix)
-                                         (which-key--string-width page-cnt))))
-              (prefix (format (concat "%-" (int-to-string first-col-width) "s")
-                              full-prefix))
-              (page-cnt (if (> n-pages 1)
-                            (format
-                             (concat "%-" (int-to-string first-col-width) "s")
-                             page-cnt)
-                          (make-string first-col-width 32)))
-              lines first-line new-end)
-         (if (= 1 height)
-             (cons (concat prefix page) nil)
-           (setq lines (split-string page "\n")
-                 first-line (concat prefix (car lines) "\n" page-cnt)
-                 new-end (concat "\n" (make-string first-col-width 32)))
-           (cons
-            (concat first-line (mapconcat #'identity (cdr lines) new-end))
-            nil))))
-      (`top
-       (cons
-        (concat (when (or (= 0 echo-keystrokes)
-                          (not (eq which-key-side-window-location 'bottom)))
-                  (concat full-prefix " "))
-                status-line " " nxt-pg-hint "\n" page)
-        nil))
-      (`bottom
-       (cons
-        (concat page "\n"
-                (when (or (= 0 echo-keystrokes)
-                          (not (eq which-key-side-window-location 'bottom)))
-                  (concat full-prefix " "))
-                status-line " " nxt-pg-hint)
-        nil))
-      (`echo
-       (cons page
-             (lambda ()
-               (which-key--echo
-                (concat full-prefix (when prefix-desc " ")
-                        status-line (when status-line " ")
-                        nxt-pg-hint)))))
-      (`mode-line
-       (cons page
-             (lambda ()
-               (with-current-buffer which-key--buffer
-                 (setq-local mode-line-format
-                             (concat " " full-prefix
-                                     " " status-line
-                                     " " nxt-pg-hint))))))
-      (_ (cons page nil)))))
-
-(defun which-key--show-page (&optional n)
-  "Show current page.
-N changes the current page to the Nth page relative to the
-current one."
-  (which-key--init-buffer) ;; in case it was killed
-  (let ((prefix-keys (which-key--current-key-string))
-        golden-ratio-mode)
-    (if (null which-key--pages-obj)
-        (message "%s- which-key can't show keys: There is not \
-enough space based on your settings and frame size." prefix-keys)
-      (when n
-        (setq which-key--pages-obj
-              (which-key--pages-set-current-page which-key--pages-obj n)))
-      (let ((page-echo (which-key--process-page which-key--pages-obj))
-            (height (which-key--pages-height which-key--pages-obj))
-            (width (car (which-key--pages-widths which-key--pages-obj))))
-        (which-key--lighter-status)
-        (if (eq which-key-popup-type 'minibuffer)
-            (which-key--echo (car page-echo))
-          (with-current-buffer which-key--buffer
-            (erase-buffer)
-            (insert (car page-echo))
-            (goto-char (point-min)))
-          (when (cdr page-echo) (funcall (cdr page-echo)))
-          (which-key--show-popup (cons height width)))))
-    ;; used for paging at top-level
-    (if (fboundp 'set-transient-map)
-        (set-transient-map (which-key--get-popup-map))
-      (with-no-warnings
-        (set-temporary-overlay-map (which-key--get-popup-map))))))
-
-;;; Paging functions
-
-;;;###autoload
-(defun which-key-reload-key-sequence (&optional key-seq)
-  "Simulate entering the key sequence KEY-SEQ.
-KEY-SEQ should be a list of events as produced by
-`listify-key-sequence'.  If nil, KEY-SEQ defaults to
-`which-key--current-key-list'. Any prefix arguments that were
-used are reapplied to the new key sequence."
-  (let* ((key-seq (or key-seq (which-key--current-key-list)))
-         (next-event (mapcar (lambda (ev) (cons t ev)) key-seq)))
-    (setq prefix-arg current-prefix-arg
-          unread-command-events next-event)))
-
-(defun which-key-turn-page (delta)
-  "Show the next page of keys."
-  (which-key-reload-key-sequence)
-  (if which-key--last-try-2-loc
-      (let ((which-key-side-window-location which-key--last-try-2-loc)
-            (which-key--multiple-locations t))
-        (which-key--show-page delta))
-    (which-key--show-page delta))
-  (which-key--start-paging-timer))
-
-;;;###autoload
-(defun which-key-show-standard-help (&optional _)
-  "Call the command in `which-key--prefix-help-cmd-backup'.
-Usually this is `describe-prefix-bindings'."
-  (interactive)
-  (let ((which-key-inhibit t)
-        (popup-showing (which-key--popup-showing-p)))
-    (which-key--hide-popup-ignore-command)
-    (cond ((and (eq which-key--prefix-help-cmd-backup
-                    'describe-prefix-bindings)
-                ;; If the popup is not showing, we call
-                ;; `describe-prefix-bindings' directly.
-                popup-showing)
-           ;; This is essentially what `describe-prefix-bindings' does. We can't
-           ;; use this function directly, because the prefix will not be correct
-           ;; when we enter using `which-key-C-h-dispatch'.
-           (describe-bindings (kbd (which-key--current-key-string))))
-          ((functionp which-key--prefix-help-cmd-backup)
-           (funcall which-key--prefix-help-cmd-backup)))))
-
-;;;###autoload
-(defun which-key-show-next-page-no-cycle ()
-  "Show next page of keys or `which-key-show-standard-help'."
-  (interactive)
-  (let ((which-key-inhibit t))
-    (if (which-key--on-last-page)
-        (which-key-show-standard-help)
-      (which-key-turn-page 1))))
-
-;;;###autoload
-(defun which-key-show-previous-page-no-cycle ()
-  "Show previous page of keys if one exists."
-  (interactive)
-  (let ((which-key-inhibit t))
-    (unless (which-key--on-first-page)
-      (which-key-turn-page -1))))
-
-;;;###autoload
-(defun which-key-show-next-page-cycle (&optional _)
-  "Show the next page of keys, cycling from end to beginning."
-  (interactive)
-  (let ((which-key-inhibit t))
-    (which-key-turn-page 1)))
-
-;;;###autoload
-(defun which-key-show-previous-page-cycle (&optional _)
-  "Show the previous page of keys, cycling from beginning to end."
-  (interactive)
-  (let ((which-key-inhibit t))
-    (which-key-turn-page -1)))
-
-;;;###autoload
-(defun which-key-show-top-level (&optional _)
-  "Show top-level bindings."
-  (interactive)
-  (which-key--create-buffer-and-show nil nil nil "Top-level bindings"))
-
-;;;###autoload
-(defun which-key-show-major-mode (&optional all)
-  "Show top-level bindings in the map of the current major mode.
-This function will also detect evil bindings made using
-`evil-define-key' in this map. These bindings will depend on the
-current evil state. "
-  (interactive "P")
-  (let ((map-sym (intern (format "%s-map" major-mode))))
-    (if (and (boundp map-sym) (keymapp (symbol-value map-sym)))
-        (which-key--show-keymap
-         "Major-mode bindings"
-         (symbol-value map-sym)
-         (apply-partially #'which-key--map-binding-p (symbol-value map-sym))
-         all)
-      (message "which-key: No map named %s" map-sym))))
-
-;;;###autoload
-(defun which-key-show-full-major-mode ()
-  "Show all bindings in the map of the current major mode.
-This function will also detect evil bindings made using
-`evil-define-key' in this map. These bindings will depend on the
-current evil state. "
-  (interactive)
-  (which-key-show-major-mode t))
-
-;;;###autoload
-(defun which-key-dump-bindings (prefix buffer-name)
-  "Dump bindings from PREFIX into buffer named BUFFER-NAME.
-PREFIX should be a string suitable for `kbd'."
-  (interactive "sPrefix: \nB")
-  (let* ((buffer (get-buffer-create buffer-name))
-         (keys (which-key--get-bindings (kbd prefix))))
-    (with-current-buffer buffer
-      (point-max)
-      (save-excursion
-        (dolist (key keys)
-          (insert (apply #'format "%s%s%s\n" key)))))
-    (switch-to-buffer-other-window buffer)))
-
-;;;###autoload
-(defun which-key-undo-key (&optional _)
-  "Undo last keypress and force which-key update."
-  (interactive)
-  (let* ((key-lst (butlast (which-key--current-key-list)))
-         (which-key-inhibit t))
-    (cond (which-key--prior-show-keymap-args
-           (if (keymapp (cdr (car-safe which-key--prior-show-keymap-args)))
-               (let ((args (pop which-key--prior-show-keymap-args)))
-                 (which-key--show-keymap (car args) (cdr args)))
-             (which-key--hide-popup)))
-          (key-lst
-           (which-key-reload-key-sequence key-lst)
-           (which-key--create-buffer-and-show (apply #'vector key-lst)))
-          (t (setq which-key--automatic-display nil)
-             (which-key-show-top-level)))))
-(defalias 'which-key-undo #'which-key-undo-key)
-
-(defun which-key-abort (&optional _)
-  "Abort key sequence."
-  (interactive)
-  (let ((which-key-inhibit t))
-    (which-key--hide-popup-ignore-command)
-    (keyboard-quit)))
-
-(defun which-key-digit-argument (key)
-  "Version of `digit-argument' for use in `which-key-C-h-map'."
-  (interactive)
-  (let ((last-command-event (string-to-char key)))
-    (digit-argument key))
-  (let ((current-prefix-arg prefix-arg))
-    (which-key-reload-key-sequence)))
-
-(defun which-key-toggle-docstrings (&optional _)
-  "Toggle the display of docstrings."
-  (interactive)
-  (unless (eq which-key-show-docstrings 'docstring-only)
-    (setq which-key-show-docstrings (null which-key-show-docstrings)))
-  (which-key-reload-key-sequence)
-  (which-key--create-buffer-and-show (which-key--current-prefix)))
-
-;;;###autoload
-(defun which-key-C-h-dispatch ()
-  "Dispatch C-h commands by looking up key in `which-key-C-h-map'.
-This command is always accessible (from any prefix) if
-`which-key-use-C-h-commands' is non nil."
-  (interactive)
-  (cond ((and (not (which-key--popup-showing-p))
-              which-key-show-early-on-C-h)
-         (let ((current-prefix
-                (butlast
-                 (listify-key-sequence
-                  (funcall which-key-this-command-keys-function)))))
-           (which-key-reload-key-sequence current-prefix)
-           (if which-key-idle-secondary-delay
-               (which-key--start-timer which-key-idle-secondary-delay t)
-             (which-key--start-timer 0.05 t))))
-        ((not (which-key--popup-showing-p))
-         (which-key-show-standard-help))
-        (t
-         (if (not (which-key--popup-showing-p))
-             (which-key-show-standard-help)
-           (let* ((prefix-keys (which-key--current-key-string))
-                  (full-prefix (which-key--full-prefix prefix-keys current-prefix-arg t))
-                  (prompt (concat (when (string-equal prefix-keys "")
-                                    (which-key--propertize
-                                     (concat " "
-                                             (which-key--pages-prefix-title
-                                              which-key--pages-obj))
-                                     'face 'which-key-note-face))
-                                  full-prefix
-                                  (which-key--propertize
-                                   (substitute-command-keys
-                                    which-key-C-h-map-prompt)
-                                   'face 'which-key-note-face)))
-                  (key (let ((key (read-key prompt)))
-                         (if (numberp key)
-                             (string key)
-                           (vector key))))
-                  (cmd (lookup-key which-key-C-h-map key))
-                  (which-key-inhibit t))
-             (if cmd (funcall cmd key) (which-key-turn-page 0)))))))
-
-;;; Update
-
-(defun which-key--any-match-p (regexps string)
-  "Non-nil if any of REGEXPS match STRING."
-  (catch 'match
-    (dolist (regexp regexps)
-      (when (string-match-p regexp string)
-        (throw 'match t)))))
-
-(defun which-key--try-2-side-windows
-    (bindings prefix-keys prefix-title loc1 loc2 &rest _ignore)
-  "Try to show BINDINGS (PAGE-N) in LOC1 first.
-Only if no bindings fit fallback to LOC2."
-  (let (pages1)
-    (let ((which-key-side-window-location loc1)
-          (which-key--multiple-locations t))
-      (setq pages1 (which-key--create-pages
-                    bindings prefix-keys prefix-title)))
-    (if pages1
-        (progn
-          (setq which-key--pages-obj pages1)
-          (let ((which-key-side-window-location loc1)
-                (which-key--multiple-locations t))
-            (which-key--show-page))
-          loc1)
-      (let ((which-key-side-window-location loc2)
-            (which-key--multiple-locations t))
-        (setq which-key--pages-obj
-              (which-key--create-pages bindings prefix-keys prefix-title))
-        (which-key--show-page)
-        loc2))))
-
-(defun which-key--read-keymap ()
-  "Read keymap symbol from minibuffer."
-  (intern
-   (completing-read "Keymap: " obarray
-                    (lambda (m)
-                      (and (boundp m)
-                           (keymapp (symbol-value m))
-                           (not (equal (symbol-value m)
-                                       (make-sparse-keymap)))))
-                    t
-                    (let ((sym (symbol-at-point)))
-                      (and (boundp sym)
-                           (keymapp (symbol-value sym))
-                           (symbol-name sym)))
-                    'which-key-keymap-history)))
-
-;;;###autoload
-(defun which-key-show-keymap (keymap &optional no-paging)
-  "Show the top-level bindings in KEYMAP using which-key.
-KEYMAP is selected interactively from all available keymaps.
-
-If NO-PAGING is non-nil, which-key will not intercept subsequent
-keypresses for the paging functionality."
-  (interactive (list (which-key--read-keymap)))
-  (which-key--show-keymap (symbol-name keymap)
-                          (symbol-value keymap)
-                          nil nil no-paging))
-
-;;;###autoload
-(defun which-key-show-full-keymap (keymap)
-  "Show all bindings in KEYMAP using which-key.
-KEYMAP is selected interactively from all available keymaps."
-  (interactive (list (which-key--read-keymap)))
-  (which-key--show-keymap (symbol-name keymap)
-                          (symbol-value keymap)
-                          nil t))
-
-;;;###autoload
-(defun which-key-show-minor-mode-keymap (&optional all)
-  "Show the top-level bindings in KEYMAP using which-key.
-KEYMAP is selected interactively by mode in
-`minor-mode-map-alist'."
-  (interactive)
-  (let ((mode-sym
-         (intern
-          (completing-read
-           "Minor Mode: "
-           (mapcar #'car
-                   (cl-remove-if-not
-                    (lambda (entry)
-                      (and (symbol-value (car entry))
-                           (not (equal (cdr entry) (make-sparse-keymap)))))
-                    minor-mode-map-alist))
-           nil t nil 'which-key-keymap-history))))
-    (which-key--show-keymap (symbol-name mode-sym)
-                            (cdr (assq mode-sym minor-mode-map-alist))
-                            all)))
-;;;###autoload
-(defun which-key-show-full-minor-mode-keymap ()
-  "Show all bindings in KEYMAP using which-key.
-KEYMAP is selected interactively by mode in
-`minor-mode-map-alist'."
-  (interactive)
-  (which-key-show-minor-mode-keymap t))
-
-(defun which-key--show-keymap
-    (keymap-name keymap &optional prior-args all no-paging filter)
-  (when prior-args (push prior-args which-key--prior-show-keymap-args))
-  (let ((bindings (which-key--get-bindings nil keymap filter all)))
-    (if (null bindings)
-        (message "which-key: No bindings found in %s" keymap-name)
-      (cond ((listp which-key-side-window-location)
-             (setq which-key--last-try-2-loc
-                   (apply #'which-key--try-2-side-windows
-                          bindings nil keymap-name
-                          which-key-side-window-location)))
-            (t (setq which-key--pages-obj
-                     (which-key--create-pages bindings nil keymap-name))
-               (which-key--show-page)))
-      (unless no-paging
-        (let* ((key (read-key))
-               (key-desc (key-description (list key)))
-               (next-def (lookup-key keymap (vector key))))
-          (cond ((and which-key-use-C-h-commands
-                      (numberp key) (= key help-char))
-                 (which-key-C-h-dispatch))
-                ((keymapp next-def)
-                 (which-key--hide-popup-ignore-command)
-                 (which-key--show-keymap
-                  (concat keymap-name " " key-desc)
-                  next-def
-                  (cons keymap-name keymap)))
-                (t (which-key--hide-popup))))))))
-
-(defun which-key--evil-operator-filter (binding)
-  (let ((def (intern (cdr binding))))
-    (and (functionp def)
-         (not (evil-get-command-property def :suppress-operator)))))
-
-(defun which-key--show-evil-operator-keymap ()
-  (if which-key--inhibit-next-operator-popup
-      (setq which-key--inhibit-next-operator-popup nil)
-    (let ((keymap
-           (make-composed-keymap (list evil-operator-shortcut-map
-                                       evil-operator-state-map
-                                       evil-motion-state-map))))
-      (when (keymapp keymap)
-        (let ((formatted-keys
-               (which-key--get-bindings
-                nil keymap #'which-key--evil-operator-filter)))
-          (cond ((null formatted-keys)
-                 (message "which-key: Keymap empty"))
-                ((listp which-key-side-window-location)
-                 (setq which-key--last-try-2-loc
-                       (apply #'which-key--try-2-side-windows
-                              formatted-keys nil "evil operator/motion keys"
-                              which-key-side-window-location)))
-                (t (setq which-key--pages-obj
-                         (which-key--create-pages
-                          formatted-keys
-                          nil "evil operator/motion keys"))
-                   (which-key--show-page)))))
-      (let ((key (read-key)))
-        (when (memq key '(?f ?F ?t ?T ?`))
-          ;; these keys trigger commands that read the next char manually
-          (setq which-key--inhibit-next-operator-popup t))
-        (cond ((and which-key-use-C-h-commands (numberp key) (= key help-char))
-               (which-key-C-h-dispatch))
-              ((and (numberp key) (= key ?\C-\[))
-               (which-key--hide-popup)
-               (keyboard-quit))
-              (t
-               (which-key--hide-popup)
-               (setq unread-command-events (vector key))))))))
-
-(defun which-key--create-buffer-and-show
-    (&optional prefix-keys from-keymap filter prefix-title)
-  "Fill `which-key--buffer' with key descriptions and reformat.
-Finally, show the buffer."
-  (let ((start-time (current-time))
-        (formatted-keys (which-key--get-bindings
-                         prefix-keys from-keymap filter))
-        (prefix-desc (key-description prefix-keys)))
-    (cond ((null formatted-keys)
-           (message "%s-  which-key: There are no keys to show" prefix-desc))
-          ((listp which-key-side-window-location)
-           (setq which-key--last-try-2-loc
-                 (apply #'which-key--try-2-side-windows
-                        formatted-keys prefix-keys prefix-title
-                        which-key-side-window-location)))
-          (t (setq which-key--pages-obj
-                   (which-key--create-pages
-                    formatted-keys prefix-keys prefix-title))
-             (which-key--show-page)))
-    (which-key--debug-message
-     "On prefix \"%s\" which-key took %.0f ms." prefix-desc
-     (* 1000 (float-time (time-since start-time))))))
-
-(defun which-key--update ()
-  "Function run by timer to possibly trigger `which-key--create-buffer-and-show'."
-  (let ((prefix-keys (funcall which-key-this-command-keys-function))
-        delay-time)
-    (cond ((and (> (length prefix-keys) 0)
-                (or (keymapp (key-binding prefix-keys))
-                    ;; Some keymaps are stored here like iso-transl-ctl-x-8-map
-                    (keymapp (which-key--safe-lookup-key
-                              key-translation-map prefix-keys))
-                    ;; just in case someone uses one of these
-                    (keymapp (which-key--safe-lookup-key
-                              function-key-map prefix-keys)))
-                (not which-key-inhibit)
-                (or (null which-key-allow-regexps)
-                    (which-key--any-match-p
-                     which-key-allow-regexps (key-description prefix-keys)))
-                (or (null which-key-inhibit-regexps)
-                    (not
-                     (which-key--any-match-p
-                      which-key-inhibit-regexps (key-description prefix-keys))))
-                ;; Do not display the popup if a command is currently being
-                ;; executed
-                (or (run-hook-with-args-until-success
-                     'which-key-inhibit-display-hook)
-                    (null this-command))
-                (let ((max-dim (which-key--popup-max-dimensions)))
-                  (> (min (car-safe max-dim) (cdr-safe max-dim)) 0)))
-           (when (and (not (equal prefix-keys (which-key--current-prefix)))
-                      (or (null which-key-delay-functions)
-                          (null (setq delay-time
-                                      (run-hook-with-args-until-success
-                                       'which-key-delay-functions
-                                       (key-description prefix-keys)
-                                       (length prefix-keys))))
-                          (sit-for delay-time)))
-             (setq which-key--automatic-display t)
-             (which-key--create-buffer-and-show prefix-keys)
-             (when (and which-key-idle-secondary-delay
-                        (not which-key--secondary-timer-active))
-               (which-key--start-timer which-key-idle-secondary-delay t))))
-          ((and which-key-show-transient-maps
-                ;; Assuming that if this is not true we're in
-                ;; `which-key-show-top-level', which would then be overwritten.
-                (> (length prefix-keys) 0)
-                (keymapp overriding-terminal-local-map)
-                ;; basic test for it being a hydra
-                (not (eq (lookup-key overriding-terminal-local-map "\C-u")
-                         'hydra--universal-argument)))
-           (which-key--create-buffer-and-show
-            nil overriding-terminal-local-map))
-          ((and which-key-show-operator-state-maps
-                (bound-and-true-p evil-state)
-                (eq evil-state 'operator)
-                (not (which-key--popup-showing-p)))
-           (which-key--show-evil-operator-keymap))
-          (which-key--automatic-display
-           (which-key--hide-popup)))))
-
-;;; Timers
-
-(defun which-key--start-timer (&optional delay secondary)
-  "Activate idle timer to trigger `which-key--update'."
-  (which-key--stop-timer)
-  (setq which-key--secondary-timer-active secondary)
-  (setq which-key--timer
-        (run-with-idle-timer (or delay which-key-idle-delay)
-                             t #'which-key--update)))
-
-(defun which-key--stop-timer ()
-  "Deactivate idle timer for `which-key--update'."
-  (when which-key--timer (cancel-timer which-key--timer)))
-
-(defun which-key--start-paging-timer ()
-  "Activate timer to restart which-key after paging."
-  (when which-key--paging-timer (cancel-timer which-key--paging-timer))
-  (which-key--stop-timer)
-  (setq which-key--paging-timer
-        (run-with-idle-timer
-         0.2 t (lambda ()
-                 (when (or (not (member real-last-command
-                                        which-key--paging-functions))
-                           (and (< 0 (length (this-single-command-keys)))
-                                (not (equal (which-key--current-prefix)
-                                            (funcall which-key-this-command-keys-function)))))
-                   (cancel-timer which-key--paging-timer)
-                   (if which-key-idle-secondary-delay
-                       ;; we haven't executed a command yet so the secandary
-                       ;; timer is more relevant here
-                       (which-key--start-timer which-key-idle-secondary-delay t)
-                     (which-key--start-timer)))))))
-
-(provide 'which-key)
-;;; which-key.el ends here
diff --git a/emacs/elpa/which-key-20240423.1320/which-key.elc b/emacs/elpa/which-key-20240423.1320/which-key.elc
Binary files differ.
diff --git a/emacs/elpa/which-key-20240423.1320/which-key-autoloads.el b/emacs/elpa/which-key-20240501.1251/which-key-autoloads.el
diff --git a/emacs/elpa/which-key-20240501.1251/which-key-pkg.el b/emacs/elpa/which-key-20240501.1251/which-key-pkg.el
@@ -0,0 +1,11 @@
+(define-package "which-key" "20240501.1251" "Display available keybindings in popup"
+  '((emacs "24.4"))
+  :commit "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a" :authors
+  '(("Justin Burkett" . "justin@burkett.cc"))
+  :maintainers
+  '(("Justin Burkett" . "justin@burkett.cc"))
+  :maintainer
+  '("Justin Burkett" . "justin@burkett.cc"))
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
diff --git a/emacs/elpa/which-key-20240501.1251/which-key.el b/emacs/elpa/which-key-20240501.1251/which-key.el
@@ -0,0 +1,2810 @@
+;;; which-key.el --- Display available keybindings in popup  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2017-2024  Free Software Foundation, Inc.
+
+;; Author: Justin Burkett <justin@burkett.cc>
+;; Maintainer: Justin Burkett <justin@burkett.cc>
+;; Version: 3.6.0
+;; Keywords:
+;; Package-Requires: ((emacs "24.4"))
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; which-key provides the minor mode which-key-mode for Emacs.  The mode displays
+;; the key bindings following your currently entered incomplete command (a
+;; prefix) in a popup.  For example, after enabling the minor mode if you enter
+;; C-x and wait for the default of 1 second the minibuffer will expand with all
+;; of the available key bindings that follow C-x (or as many as space allows
+;; given your settings).  This includes prefixes like C-x 8 which are shown in a
+;; different face.  Screenshots of what the popup will look like along with
+;; information about additional features can be found at
+;; https://github.com/justbur/emacs-which-key.
+;;
+
+;;; Code:
+
+(require 'cl-lib)
+(require 'button)
+(require 'regexp-opt)
+
+;; For compiler
+(defvar evil-operator-shortcut-map)
+(defvar evil-operator-state-map)
+(defvar evil-motion-state-map)
+(defvar golden-ratio-mode)
+(declare-function evil-get-command-property "ext:evil-common.el")
+
+;;; Options
+
+(defgroup which-key nil
+  "Customization options for which-key-mode."
+  :group 'help
+  :prefix "which-key-")
+
+(defcustom which-key-idle-delay 1.0
+  "Delay (in seconds) for which-key buffer to popup.
+This variable should be set before activating `which-key-mode'.
+
+A value of zero might lead to issues, so a non-zero value is
+recommended
+(see https://github.com/justbur/emacs-which-key/issues/134)."
+  :type 'float
+  :version "1.0")
+
+(defcustom which-key-idle-secondary-delay nil
+  "Seconds to wait for which-key to pop up after initial display.
+This makes it possible to shorten the delay for subsequent popups
+in the same key sequence. The default is for this value to be
+nil, which disables this behavior."
+  :type '(choice float (const :tag "Disabled" nil))
+  :version "1.0")
+
+(defcustom which-key-echo-keystrokes (if (and echo-keystrokes
+                                              (> (+ echo-keystrokes 0.01)
+                                                 which-key-idle-delay))
+                                         (/ (float which-key-idle-delay) 4)
+                                       echo-keystrokes)
+  "Value to use for `echo-keystrokes'.
+This only applies if `which-key-popup-type' is minibuffer or
+`which-key-show-prefix' is echo.  It needs to be less than
+`which-key-idle-delay' or else the keystroke echo will erase the
+which-key popup."
+  :type 'float
+  :version "1.0")
+
+(defcustom which-key-max-description-length 27
+  "Truncate the description of keys to this length.
+Either nil (no truncation), an integer (truncate after that many
+characters), a float (use that fraction of the available width),
+or a function, which takes one argument, the available width in
+characters, and whose return value has one of the types mentioned
+before.  Truncation is done using `which-key-ellipsis'."
+  :type '(choice (const :tag "Disable truncation" nil)
+		 (integer :tag "Width in characters")
+		 (float :tag "Use fraction of available width")
+		 function)
+  :version "1.0")
+
+(defcustom which-key-min-column-description-width 0
+  "Every column should at least have this width."
+  :type 'natnum
+  :version "1.0")
+
+(defcustom which-key-add-column-padding 0
+  "Additional spaces to add to the left of each key column."
+  :type 'integer
+  :version "1.0")
+
+(defcustom which-key-unicode-correction 3
+  "Correction for wide unicode characters.
+Since we measure width in terms of the number of characters,
+Unicode characters that are wider than ASCII characters throw off
+the calculation for available width in the which-key buffer.  This
+variable allows you to adjust for the wide unicode characters by
+artificially reducing the available width in the buffer.
+
+The default of 3 means allow for the total extra width
+contributed by any wide unicode characters to be up to one
+additional ASCII character in the which-key buffer.  Increase this
+number if you are seeing characters get cutoff on the right side
+of the which-key popup."
+  :type 'integer
+  :version "1.0")
+
+(defcustom which-key-dont-use-unicode nil
+  "If non-nil, don't use any unicode characters in default setup.
+For affected settings, see `which-key-replacement-alist', `which-key-ellipsis'
+`which-key-separator'."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-separator
+  (if which-key-dont-use-unicode " : " " → ")
+  "Separator to use between key and description.
+Default is \" → \", unless `which-key-dont-use-unicode' is non
+nil, in which case the default is \" : \"."
+  :type 'string
+  :version "1.0")
+
+(defcustom which-key-ellipsis
+  (if which-key-dont-use-unicode ".." "…")
+  "Ellipsis to use when truncating.
+Default is \"…\", unless `which-key-dont-use-unicode' is non nil,
+in which case the default is \"..\".  This can also be the empty
+string to truncate without using any ellipsis."
+  :type 'string
+  :version "1.0")
+
+(defcustom which-key-prefix-prefix "+"
+  "Prefix string to indicate a key bound to a keymap.
+Default is \"+\"."
+  :type 'string
+  :version "1.0")
+
+(defcustom which-key-compute-remaps nil
+  "If non-nil, show remapped commands.
+This applies to commands that have been remapped given the
+currently active keymaps."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-replacement-alist
+  `(((nil . "which-key-show-next-page-no-cycle") . (nil . "wk next pg"))
+    ,@(unless which-key-dont-use-unicode
+        '((("<left>") . ("←"))
+          (("<right>") . ("→"))))
+    (("<\\([[:alnum:]-]+\\)>") . ("\\1")))
+  "ALIST for manipulating display of binding descriptions.
+Each element of the list is a nested cons cell with the format
+
+\(MATCH CONS . REPLACEMENT\).
+
+The MATCH CONS determines when a replacement should occur and
+REPLACEMENT determines how the replacement should occur. Each may
+have the format \(KEY REGEXP . BINDING REGEXP\). For the
+replacement to apply the key binding must match both the KEY
+REGEXP and the BINDING REGEXP. A value of nil in either position
+can be used to match every possibility. The replacement is
+performed by using `replace-regexp-in-string' on the KEY REGEXP
+from the MATCH CONS and REPLACEMENT when it is a cons cell, and
+then similarly for the BINDING REGEXP. A nil value in the BINDING
+REGEXP position cancels the replacement. For example, the entry
+
+\(\(nil . \"Prefix Command\"\) . \(nil . \"prefix\"\)\)
+
+matches any binding with the descriptions \"Prefix Command\" and
+replaces the description with \"prefix\", ignoring the
+corresponding key.
+
+REPLACEMENT may also be a function taking a cons cell
+\(KEY . BINDING\) and producing a new corresponding cons cell.
+
+If REPLACEMENT is anything other than a cons cell \(and non nil\)
+the key binding is ignored by which-key.
+
+Finally, you can multiple replacements to occur for a given key
+binding by setting `which-key-allow-multiple-replacements' to a
+non-nil value."
+  :type '(alist :key-type (cons (choice regexp (const nil))
+                                (choice regexp (const nil)))
+                :value-type (cons (choice string (const nil))
+                                  (choice string (const nil))))
+  :version "1.0")
+
+(defcustom which-key-allow-multiple-replacements nil
+  "Allow a key binding to be modified by multiple elements.
+When non-nil, this allows a single key binding to match multiple
+patterns in `which-key-replacement-alist'. When nil, only the
+first match is used to perform replacements from
+`which-key-replacement-alist'."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-show-docstrings nil
+  "If non-nil, show each command's docstring in the which-key popup.
+This will only display the docstring up to the first line
+break. If you set this variable to the symbol docstring-only,
+then the command's name with be omitted. You probably also want
+to adjust `which-key-max-description-length' at the same time if
+you use this feature."
+  :type '(radio
+          (const :tag "Do not show docstrings" nil)
+          (const :tag "Add docstring to command names" t)
+          (const :tag "Replace command name with docstring" docstring-only))
+  :version "1.0")
+
+(defcustom which-key-highlighted-command-list '()
+  "Rules used to highlight certain commands.
+If the element is a string, assume it is a regexp pattern for
+matching command names and use
+`which-key-highlighted-command-face' for any matching names. If
+the element is a cons cell, it should take the form (regexp .
+face to apply)."
+  :type  '(repeat (choice string (cons regexp face)))
+  :version "1.0")
+
+(defcustom which-key-special-keys '()
+  "These keys will automatically be truncated to one character.
+They also have `which-key-special-key-face' applied to them. This
+is disabled by default. An example configuration is
+
+\(setq which-key-special-keys \\='(\"SPC\" \"TAB\" \"RET\" \"ESC\" \"DEL\")\)"
+  :type '(repeat string)
+  :version "1.0")
+
+(defcustom which-key-buffer-name " *which-key*"
+  "Name of which-key buffer."
+  :type 'string
+  :version "1.0")
+
+(defcustom which-key-show-prefix 'echo
+  "Whether to and where to display the current prefix sequence.
+Possible choices are echo for echo area (the default), left, top
+and nil. Nil turns the feature off."
+  :type '(radio (const :tag "Left of the keys" left)
+                (const :tag "In the first line" top)
+                (const :tag "In the last line" bottom)
+                (const :tag "In the echo area" echo)
+                (const :tag "In the mode-line" mode-line)
+                (const :tag "Hide" nil))
+  :version "1.0")
+
+(defcustom which-key-popup-type 'side-window
+  "Supported types are minibuffer, side-window, frame, and custom."
+  :type '(radio (const :tag "Show in minibuffer" minibuffer)
+                (const :tag "Show in side window" side-window)
+                (const :tag "Show in popup frame" frame)
+                (const :tag "Use your custom display functions" custom))
+  :version "1.0")
+
+(defcustom which-key-min-display-lines 1
+  "Minimum number of horizontal lines to display in the which-key buffer."
+  :type 'integer
+  :version "1.0")
+
+(defcustom which-key-max-display-columns nil
+  "Maximum number of columns to display in the which-key buffer.
+A value of nil means don't impose a maximum."
+  :type '(choice integer (const :tag "Unbounded" nil))
+  :version "1.0")
+
+(defcustom which-key-side-window-location 'bottom
+  "Location of which-key popup when `which-key-popup-type' is side-window.
+Should be one of top, bottom, left or right.  You can also specify
+a list of two locations, like (right bottom).  In this case, the
+first location is tried.  If there is not enough room, the second
+location is tried."
+  :type '(radio (const right)
+                (const bottom)
+                (const left)
+                (const top)
+                (const (right bottom))
+                (const (bottom right)))
+  :version "1.0")
+
+(defcustom which-key-side-window-slot 0
+  "The `slot' to use for `display-buffer-in-side-window'.
+This applies when `which-key-popup-type' is `side-window'.
+Quoting from the docstring of `display-buffer-in-side-window',
+
+`slot' if non-nil, specifies the window slot where to display
+BUFFER.  A value of zero or nil means use the middle slot on the
+specified side.  A negative value means use a slot
+preceding (that is, above or on the left of) the middle slot.  A
+positive value means use a slot following (that is, below or on
+the right of) the middle slot.  The default is zero."
+  :type 'integer
+  :version "1.0")
+
+(defcustom which-key-side-window-max-width 0.333
+  "Maximum width of which-key popup when type is side-window.
+This variable can also be a number between 0 and 1. In that case,
+it denotes a percentage out of the frame's width."
+  :type 'float
+  :version "1.0")
+
+(defcustom which-key-side-window-max-height 0.25
+  "Maximum height of which-key popup when type is side-window.
+This variable can also be a number between 0 and 1. In that case, it denotes
+a percentage out of the frame's height."
+  :type 'float
+  :version "1.0")
+
+(defcustom which-key-frame-max-width 60
+  "Maximum width of which-key popup when type is frame."
+  :type 'natnum
+  :version "1.0")
+
+(defcustom which-key-frame-max-height 20
+  "Maximum height of which-key popup when type is frame."
+  :type 'natnum
+  :version "1.0")
+
+(defcustom which-key-allow-imprecise-window-fit (not (display-graphic-p))
+  "Allow which-key to use a simpler method for resizing the popup.
+If you are noticing lag when the which-key popup displays turning
+this on may help.
+
+See https://github.com/justbur/emacs-which-key/issues/130
+and https://github.com/justbur/emacs-which-key/issues/225."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-show-remaining-keys nil
+  "Show remaining keys in last slot, when keys are hidden."
+  :type '(radio (const :tag "Yes" t)
+                (const :tag "No" nil))
+  :version "1.0")
+
+(defcustom which-key-sort-order #'which-key-key-order
+  "Order in which the key bindings are sorted.
+If nil, do not resort the output from `describe-buffer-bindings'
+which groups by mode. Ordering options
+are
+
+1. `which-key-key-order': by key (default)
+2. `which-key-key-order-alpha': by key using alphabetical order
+3. `which-key-description-order': by description
+4. `which-key-prefix-then-key-order': prefix (no prefix first) then key
+5. `which-key-local-then-key-order': local binding then key
+
+See the README and the docstrings for those functions for more
+information."
+  :type '(choice (function-item which-key-key-order)
+                 (function-item which-key-key-order-alpha)
+                 (function-item which-key-description-order)
+                 (function-item which-key-prefix-then-key-order)
+                 (function-item which-key-local-then-key-order))
+  :version "1.0")
+
+(defcustom which-key-sort-uppercase-first t
+  "If non-nil, uppercase comes before lowercase in sorting.
+This applies to the function chosen in
+`which-key-sort-order'. Otherwise, the order is reversed."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-paging-prefixes '()
+  "Enable paging for these prefixes."
+  :type '(repeat string)
+  :version "1.0")
+
+(defcustom which-key-paging-key "<f5>"
+  "Key to use for changing pages.
+Bound after each of the prefixes in `which-key-paging-prefixes'"
+  :type 'string
+  :version "1.0")
+
+;; (defcustom which-key-undo-key nil
+;;   "Key (string) to use for undoing keypresses. Bound recursively
+;; in each of the maps in `which-key-undo-keymaps'."
+;;   :group 'which-key
+;;   :type 'string)
+
+;; (defcustom which-key-undo-keymaps '()
+;;   "Keymaps in which to bind `which-key-undo-key'"
+;;   :group 'which-key
+;;   :type '(repeat symbol))
+
+(defcustom which-key-use-C-h-commands t
+  "Use C-h (`help-char') for paging if non-nil.
+Normally `help-char' after a prefix calls
+`describe-prefix-bindings'. This changes that command to a
+which-key paging command when which-key-mode is active."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-show-early-on-C-h nil
+  "Allow C-h (`help-char') to trigger which-key popup before timer.
+Show the which-key buffer if `help-char' is pressed in the middle
+of a prefix before the which-key buffer would normally be
+triggered by the time. If combined with the following settings,
+which-key will effectively only show when triggered \"manually\"
+using C-h.
+
+\(setq `which-key-idle-delay' 10000)
+\(setq `which-key-idle-secondary-delay' 0.05)
+
+Note that `which-key-idle-delay' should be set before turning on
+`which-key-mode'."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-is-verbose nil
+  "Whether to warn about potential mistakes in configuration."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-preserve-window-configuration nil
+  "Save and restore window configuration around which-key popup display.
+If non-nil, save window configuration before which-key buffer is
+shown and restore it after which-key buffer is hidden. It
+prevents which-key from changing window position of visible
+buffers.  Only takken into account when popup type is
+side-window."
+  :type 'boolean
+  :version "1.0")
+
+(defvar which-key-C-h-map-prompt
+  (concat " \\<which-key-C-h-map>"
+          " \\[which-key-show-next-page-cycle]"
+          which-key-separator "next-page,"
+          " \\[which-key-show-previous-page-cycle]"
+          which-key-separator "previous-page,"
+          " \\[which-key-undo-key]"
+          which-key-separator "undo-key,"
+          " \\[which-key-toggle-docstrings]"
+          which-key-separator "toggle-docstrings,"
+          " \\[which-key-show-standard-help]"
+          which-key-separator "help,"
+          " \\[which-key-abort]"
+          which-key-separator "abort"
+          " 1..9"
+          which-key-separator "digit-arg")
+  "Prompt to display when invoking `which-key-C-h-map'.
+This string is fed into `substitute-command-keys'")
+
+(defvar which-key-C-h-map
+  (let ((map (make-sparse-keymap)))
+    (dolist (bind `(("\C-a" . which-key-abort)
+                    ("a" . which-key-abort)
+                    ("\C-d" . which-key-toggle-docstrings)
+                    ("d" . which-key-toggle-docstrings)
+                    (,(vector help-char) . which-key-show-standard-help)
+                    ("h" . which-key-show-standard-help)
+                    ("\C-n" . which-key-show-next-page-cycle)
+                    ("n" . which-key-show-next-page-cycle)
+                    ("\C-p" . which-key-show-previous-page-cycle)
+                    ("p" . which-key-show-previous-page-cycle)
+                    ("\C-u" . which-key-undo-key)
+                    ("u" . which-key-undo-key)
+                    ("1" . which-key-digit-argument)
+                    ("2" . which-key-digit-argument)
+                    ("3" . which-key-digit-argument)
+                    ("4" . which-key-digit-argument)
+                    ("5" . which-key-digit-argument)
+                    ("6" . which-key-digit-argument)
+                    ("7" . which-key-digit-argument)
+                    ("8" . which-key-digit-argument)
+                    ("9" . which-key-digit-argument)))
+      (define-key map (car bind) (cdr bind)))
+    map)
+  "Keymap for C-h commands.")
+
+(defvar which-key--paging-functions
+  (list #'which-key-C-h-dispatch
+        #'which-key-turn-page
+        #'which-key-show-next-page-cycle
+        #'which-key-show-next-page-no-cycle
+        #'which-key-show-previous-page-cycle
+        #'which-key-show-previous-page-no-cycle
+        #'which-key-undo-key
+        #'which-key-undo))
+
+(defvar which-key-persistent-popup nil
+  "Whether or not to disable `which-key--hide-popup'.")
+
+(defcustom which-key-hide-alt-key-translations t
+  "Hide key translations using Alt key if non nil.
+These translations are not relevant most of the times since a lot
+of terminals issue META modifier for the Alt key.
+
+See Info node `(emacs)Modifier Keys'."
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-delay-functions nil
+  "List of functions that may delay the which-key popup.
+A list of functions that may decide whether to delay the
+which-key popup based on the current incomplete key
+sequence. Each function in the list is run with two arguments,
+the current key sequence as produced by `key-description' and the
+length of the key sequence. If the popup should be delayed based
+on that key sequence, the function should return the delay time
+in seconds. Returning nil means no delay. The first function in
+this list to return a value is the value that is used.
+
+The delay time is effectively added to the normal
+`which-key-idle-delay'."
+  :type '(repeat function)
+  :version "1.0")
+
+(defcustom which-key-allow-regexps nil
+  "A list of regexp strings to use to filter key sequences.
+When non-nil, for a key sequence to trigger the which-key popup
+it must match one of the regexps in this list.  The format of the
+key sequences is what is produced by `key-description'."
+  :type '(repeat regexp)
+  :version "1.0")
+
+(defcustom which-key-inhibit-regexps nil
+  "A list of regexp strings to use to filter key sequences.
+When non-nil, for a key sequence to trigger the which-key popup
+it cannot match one of the regexps in this list. The format of
+the key sequences is what is produced by `key-description'."
+  :type '(repeat regexp)
+  :version "1.0")
+
+(defcustom which-key-show-transient-maps nil
+  "Show keymaps created by `set-transient-map' when applicable.
+
+More specifically, detect when `overriding-terminal-local-map' is
+set (this is the keymap used by `set-transient-map') and display
+it."
+  :type 'boolean
+  :version "1.0")
+
+(make-obsolete-variable
+ 'which-key-enable-extended-define-key
+ "which-key-enable-extended-define-key is obsolete and has no effect."
+ "2021-06-21")
+
+;; Hooks
+(defcustom which-key-init-buffer-hook '()
+  "Hook run when which-key buffer is initialized."
+  :type 'hook
+  :version "1.0")
+
+;;;; Faces
+
+(defgroup which-key-faces nil
+  "Faces for which-key-mode"
+  :group 'which-key
+  :prefix "which-key-")
+
+(defface which-key-key-face
+  '((t . (:inherit font-lock-constant-face)))
+  "Face for which-key keys"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-separator-face
+  '((t . (:inherit font-lock-comment-face)))
+  "Face for the separator (default separator is an arrow)"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-note-face
+  '((t . (:inherit which-key-separator-face)))
+  "Face for notes or hints occasionally provided"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-command-description-face
+  '((t . (:inherit font-lock-function-name-face)))
+  "Face for the key description when it is a command"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-local-map-description-face
+  '((t . (:inherit which-key-command-description-face)))
+  "Face for the key description when it is found in `current-local-map'"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-highlighted-command-face
+  '((t . (:inherit which-key-command-description-face :underline t)))
+  "Default face for the command description when it is a command
+and it matches a string in `which-key-highlighted-command-list'."
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-group-description-face
+  '((t . (:inherit font-lock-keyword-face)))
+  "Face for the key description when it is a group or prefix."
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-special-key-face
+  '((t . (:inherit which-key-key-face :inverse-video t :weight bold)))
+  "Face for special keys (SPC, TAB, RET)"
+  :group 'which-key-faces
+  :version "1.0")
+
+(defface which-key-docstring-face
+  '((t . (:inherit which-key-note-face)))
+  "Face for docstrings."
+  :group 'which-key-faces
+  :version "1.0")
+
+;;;; Custom popup
+
+(defcustom which-key-custom-popup-max-dimensions-function nil
+  "Set a custom max-dimensions function.
+Will be passed the width of the active window and is expected to
+return the maximum height in lines and width in characters of the
+which-key popup in the form a cons cell (height . width)."
+  :group 'which-key
+  :type '(choice function (const nil))
+  :version "1.0")
+
+(defcustom which-key-custom-hide-popup-function nil
+  "Set a custom hide-popup function.
+It takes no arguments and the return value is ignored."
+  :group 'which-key
+  :type '(choice function (const nil))
+  :version "1.0")
+
+(defcustom which-key-custom-show-popup-function nil
+  "Set a custom show-popup function.
+Will be passed the required dimensions in the form (height .
+width) in lines and characters respectively.  The return value is
+ignored."
+  :group 'which-key
+  :type '(choice function (const nil))
+  :version "1.0")
+
+(defcustom which-key-lighter " WK"
+  "Minor mode lighter to use in the mode-line."
+  :group 'which-key
+  :type 'string
+  :version "1.0")
+
+(defvar which-key-inhibit nil
+  "Prevent which-key from popping up momentarily.
+This can be used by setting this to a non-nil value for the
+execution of a command, as in
+
+\(let \(\(which-key-inhibit t\)\)
+...\)")
+
+(defcustom which-key-inhibit-display-hook nil
+  "Hook run before display of which-key popup.
+Each function in the hook is run before displaying the which-key
+popup. If any function returns a non-nil value, the popup will
+not display."
+  :group 'which-key
+  :type 'hook
+  :version "1.0")
+
+(defvar which-key-keymap-history nil
+  "History of keymap selections.
+Used in functions like `which-key-show-keymap'.")
+
+;;; Internal Vars
+
+(defvar which-key--buffer nil
+  "Holds reference to which-key buffer.")
+(defvar which-key--timer nil
+  "Holds reference to open window timer.")
+(defvar which-key--secondary-timer-active nil
+  "Non-nil if the secondary timer is active.")
+(defvar which-key--paging-timer nil
+  "Holds reference to timer for paging.")
+(defvar which-key--frame nil
+  "Holds reference to which-key frame.
+Used when `which-key-popup-type' is frame.")
+(defvar which-key--echo-keystrokes-backup nil
+  "Backup the initial value of `echo-keystrokes'.")
+(defvar which-key--prefix-help-cmd-backup nil
+  "Backup the value of `prefix-help-command'.")
+(defvar which-key--last-try-2-loc nil
+  "Last location of side-window when two locations used.")
+(defvar which-key--automatic-display nil
+  "Non-nil if popup was triggered with automatic update.")
+(defvar which-key--debug-buffer-name nil
+  "If non-nil, use this buffer for debug messages.")
+(defvar which-key--multiple-locations nil)
+(defvar which-key--inhibit-next-operator-popup nil)
+(defvar which-key--prior-show-keymap-args nil)
+(defvar which-key--previous-frame-size nil)
+(defvar which-key--prefix-title-alist nil)
+(defvar which-key--evil-keys-regexp (eval-when-compile
+                                      (regexp-opt '("-state"))))
+(defvar which-key--ignore-non-evil-keys-regexp
+  (regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
+                "select-window" "switch-frame" "which-key")))
+(defvar which-key--ignore-keys-regexp
+  (regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
+                "select-window" "switch-frame" "-state"
+                "which-key")))
+
+(defvar which-key--pages-obj nil)
+(cl-defstruct which-key--pages
+  pages
+  height
+  widths
+  keys/page
+  page-nums
+  num-pages
+  total-keys
+  prefix
+  prefix-title)
+
+(defvar which-key--saved-window-configuration nil)
+
+(defun which-key--rotate (list n)
+  (let* ((len (length list))
+         (n (- len (mod n len))))
+    (append (last list n) (butlast list n))))
+
+(defun which-key--pages-set-current-page (pages-obj n)
+  (setf (which-key--pages-pages pages-obj)
+        (which-key--rotate (which-key--pages-pages pages-obj) n))
+  (setf (which-key--pages-widths pages-obj)
+        (which-key--rotate (which-key--pages-widths pages-obj) n))
+  (setf (which-key--pages-keys/page pages-obj)
+        (which-key--rotate (which-key--pages-keys/page pages-obj) n))
+  (setf (which-key--pages-page-nums pages-obj)
+        (which-key--rotate (which-key--pages-page-nums pages-obj) n))
+  pages-obj)
+
+(defsubst which-key--on-first-page ()
+  (= (which-key--pages-page-nums which-key--pages-obj) 1))
+
+(defsubst which-key--on-last-page ()
+  (= (which-key--pages-page-nums which-key--pages-obj)
+     (which-key--pages-num-pages which-key--pages-obj)))
+
+(defsubst which-key--current-prefix ()
+  (and which-key--pages-obj
+       (which-key--pages-prefix which-key--pages-obj)))
+
+(defmacro which-key--debug-message (&rest msg)
+  `(when which-key--debug-buffer-name
+     (let ((buf (get-buffer-create which-key--debug-buffer-name))
+           (fmt-msg (format ,@msg)))
+       (with-current-buffer buf
+         (goto-char (point-max))
+         (insert "\n" fmt-msg "\n")))))
+
+(defsubst which-key--safe-lookup-key (keymap key)
+  "Version of `lookup-key' that allows KEYMAP to be nil.
+Also convert numeric results of `lookup-key' to nil. KEY is not
+checked."
+  (when (keymapp keymap)
+    (let ((result (lookup-key keymap key)))
+      (when (and result (not (numberp result)))
+        result))))
+
+(defsubst which-key--safe-lookup-key-description (keymap key)
+  "Version of `lookup-key' that allows KEYMAP to be nil.
+Also convert numeric results of `lookup-key' to nil. KEY
+should be formatted as an input for `kbd'."
+  (let ((key (ignore-errors (kbd key))))
+    (when (and key (keymapp keymap))
+      (let ((result (lookup-key keymap key)))
+        (when (and result (not (numberp result)))
+          result)))))
+
+;;; Third-party library support
+
+(defun which-key--this-command-keys ()
+  "Version of `this-single-command-keys' corrected for key-chords."
+  (let ((this-command-keys (this-single-command-keys)))
+    (when (and (vectorp this-command-keys)
+               (> (length this-command-keys) 0)
+               (eq (aref this-command-keys 0) 'key-chord)
+               (bound-and-true-p key-chord-mode))
+      (setq this-command-keys (this-single-command-raw-keys)))
+    this-command-keys))
+
+(defcustom which-key-this-command-keys-function #'which-key--this-command-keys
+  "Function used to retrieve current key sequence.
+The purpose of allowing this variable to be customized is to
+allow which-key to support packages that insert non-standard
+`keys' into the key sequence being read by emacs."
+  :group 'which-key
+  :type 'function
+  :version "1.0")
+
+
+;;;; Evil
+
+(defvar evil-state nil)
+
+(defcustom which-key-allow-evil-operators (boundp 'evil-this-operator)
+  "Allow popup to show for evil operators.
+The popup is normally inhibited in the middle of commands, but
+setting this to non-nil will override this behavior for evil
+operators."
+  :group 'which-key
+  :type 'boolean
+  :version "1.0")
+
+(defcustom which-key-show-operator-state-maps nil
+  "Show the keys following an evil command that reads a motion.
+These are commands typically mapped to keys such as \"y\", \"d\"
+and \"c\" from normal state. This is experimental, because there
+might be some valid keys missing and it might be showing some
+invalid keys."
+  :group 'which-key
+  :type 'boolean
+  :version "1.0")
+
+(defun which-key-evil-this-operator-p ()
+  (and which-key-allow-evil-operators
+       (bound-and-true-p evil-this-operator)))
+
+(add-hook 'which-key-inhibit-display-hook
+          #'which-key-evil-this-operator-p)
+
+;;;; God-mode
+
+(defvar which-key--god-mode-support-enabled nil
+  "Support god-mode if non-nil.")
+
+(defvar which-key--god-mode-key-string nil
+  "String to use for god-mode support.")
+
+(defun which-key--god-mode-lookup-command-advice (orig-fun arg1 &rest args)
+  (setq which-key--god-mode-key-string arg1)
+  (unwind-protect
+      (apply orig-fun arg1 args)
+    (when (bound-and-true-p which-key-mode)
+      (which-key--hide-popup))))
+
+(defun which-key--god-mode-this-command-keys ()
+  "Version of `this-single-command-keys' corrected for god-mode."
+  (let ((this-command-keys (this-single-command-keys)))
+    (when (and which-key--god-mode-support-enabled
+               (bound-and-true-p god-local-mode)
+               (eq this-command 'god-mode-self-insert))
+      (setq this-command-keys (when which-key--god-mode-key-string
+                                (kbd which-key--god-mode-key-string))))
+    this-command-keys))
+
+(defun which-key-god-mode-self-insert-p ()
+  (and which-key--god-mode-support-enabled
+       (bound-and-true-p god-local-mode)
+       (eq this-command 'god-mode-self-insert)))
+
+(defun which-key-enable-god-mode-support (&optional disable)
+  "Enable support for god-mode if non-nil.
+This is experimental, so you need to explicitly opt-in for
+now.  Please report any problems at github.  If DISABLE is non-nil
+disable support."
+  (interactive "P")
+  (setq which-key--god-mode-support-enabled (null disable))
+  (if disable
+      (progn
+        (advice-remove 'god-mode-lookup-command
+                       #'which-key--god-mode-lookup-command-advice)
+        (remove-function which-key-this-command-keys-function
+                         #'which-key--god-mode-this-command-keys)
+        (remove-hook 'which-key-inhibit-display-hook
+                     #'which-key-god-mode-self-insert-p))
+    (advice-add 'god-mode-lookup-command :around
+                #'which-key--god-mode-lookup-command-advice)
+    (add-function :override which-key-this-command-keys-function
+                  #'which-key--god-mode-this-command-keys)
+    (add-hook 'which-key-inhibit-display-hook
+              #'which-key-god-mode-self-insert-p)))
+
+;;; Mode
+
+;;;###autoload
+(define-minor-mode which-key-mode
+  "Toggle which-key-mode."
+  :global t
+  :group 'which-key
+  :lighter which-key-lighter
+  :keymap (let ((map (make-sparse-keymap)))
+            (mapc
+             (lambda (prefix)
+               (define-key map
+                 (kbd (concat prefix " " which-key-paging-key))
+                 #'which-key-C-h-dispatch))
+             which-key-paging-prefixes)
+            map)
+  (if which-key-mode
+      (progn
+        (setq which-key--echo-keystrokes-backup echo-keystrokes)
+        (when (or (eq which-key-show-prefix 'echo)
+                  (eq which-key-popup-type 'minibuffer))
+          (which-key--setup-echo-keystrokes))
+        (unless (member prefix-help-command which-key--paging-functions)
+          (setq which-key--prefix-help-cmd-backup prefix-help-command))
+        (when (or which-key-use-C-h-commands
+                  which-key-show-early-on-C-h)
+          (setq prefix-help-command #'which-key-C-h-dispatch))
+        (when which-key-show-remaining-keys
+          (add-hook 'pre-command-hook #'which-key--lighter-restore))
+        (add-hook 'pre-command-hook #'which-key--hide-popup)
+        (add-hook 'window-size-change-functions
+                  #'which-key--hide-popup-on-frame-size-change)
+        (which-key--start-timer))
+    (setq echo-keystrokes which-key--echo-keystrokes-backup)
+    (when which-key--prefix-help-cmd-backup
+      (setq prefix-help-command which-key--prefix-help-cmd-backup))
+    (when which-key-show-remaining-keys
+      (remove-hook 'pre-command-hook #'which-key--lighter-restore))
+    (remove-hook 'pre-command-hook #'which-key--hide-popup)
+    (remove-hook 'window-size-change-functions
+                 #'which-key--hide-popup-on-frame-size-change)
+    (which-key--stop-timer)))
+
+(defun which-key--init-buffer ()
+  "Initialize which-key buffer"
+  (unless (buffer-live-p which-key--buffer)
+    (setq which-key--buffer (get-buffer-create which-key-buffer-name))
+    (with-current-buffer which-key--buffer
+      ;; suppress confusing minibuffer message
+      (let (message-log-max)
+        (toggle-truncate-lines 1)
+        (message ""))
+      (setq-local cursor-type nil)
+      (setq-local cursor-in-non-selected-windows nil)
+      (setq-local mode-line-format nil)
+      (setq-local header-line-format nil)
+      (setq-local word-wrap nil)
+      (setq-local show-trailing-whitespace nil)
+      (run-hooks 'which-key-init-buffer-hook))))
+
+(defun which-key--setup-echo-keystrokes ()
+  "Reduce `echo-keystrokes' if necessary.
+It will interfere if set too high."
+  (when (and echo-keystrokes
+             (> (abs (- echo-keystrokes which-key-echo-keystrokes)) 0.000001))
+    (if (> which-key-idle-delay which-key-echo-keystrokes)
+        (setq echo-keystrokes which-key-echo-keystrokes)
+      (setq which-key-echo-keystrokes (/ (float which-key-idle-delay) 4)
+            echo-keystrokes which-key-echo-keystrokes))))
+
+(defun which-key-remove-default-unicode-chars ()
+  "Remove default unicode chars from settings.
+Use of `which-key-dont-use-unicode' is preferred to this
+function, but it's included here in case someone cannot set that
+variable early enough in their configuration, if they are using a
+starter kit for example."
+  (when (string-equal which-key-separator " → ")
+    (setq which-key-separator " : ")))
+
+;;; Default configuration functions for use by users.
+
+;;;###autoload
+(defun which-key-setup-side-window-right ()
+  "Set up side-window on right."
+  (interactive)
+  (setq which-key-popup-type 'side-window
+        which-key-side-window-location 'right
+        which-key-show-prefix 'top))
+
+;;;###autoload
+(defun which-key-setup-side-window-right-bottom ()
+  "Set up side-window on right if space allows.
+Otherwise, use bottom."
+  (interactive)
+  (setq which-key-popup-type 'side-window
+        which-key-side-window-location '(right bottom)
+        which-key-show-prefix 'top))
+
+;;;###autoload
+(defun which-key-setup-side-window-bottom ()
+  "Set up side-window that opens on bottom."
+  (interactive)
+  (which-key--setup-echo-keystrokes)
+  (setq which-key-popup-type 'side-window
+        which-key-side-window-location 'bottom
+        which-key-show-prefix 'echo))
+
+;;;###autoload
+(defun which-key-setup-minibuffer ()
+  "Set up minibuffer display.
+Do not use this setup if you use the paging commands.  Instead use
+`which-key-setup-side-window-bottom', which is nearly identical
+but more functional."
+  (interactive)
+  (which-key--setup-echo-keystrokes)
+  (setq which-key-popup-type 'minibuffer
+        which-key-show-prefix 'left))
+
+;;; Helper functions to modify replacement lists.
+
+;;;###autoload
+(defun which-key-add-keymap-based-replacements (keymap key replacement &rest more)
+  "Replace the description of KEY using REPLACEMENT in KEYMAP.
+KEY should take a format suitable for use in `kbd'. REPLACEMENT
+should be a cons cell of the form \(STRING . COMMAND\) for each
+REPLACEMENT, where STRING is the replacement string and COMMAND
+is a symbol corresponding to the intended command to be
+replaced. COMMAND can be nil if the binding corresponds to a key
+prefix. An example is
+
+\(which-key-add-keymap-based-replacements global-map
+  \"C-x w\" \\='\(\"Save as\" . write-file\)\).
+
+For backwards compatibility, REPLACEMENT can also be a string,
+but the above format is preferred, and the option to use a string
+for REPLACEMENT will eventually be removed."
+  (declare (indent defun))
+  (while key
+    (let ((def
+           (cond
+            ((consp replacement) replacement)
+            ((stringp replacement)
+             (cons replacement
+                   (or (which-key--safe-lookup-key-description keymap key)
+                       (make-sparse-keymap))))
+            (t
+             (user-error "Replacement is neither a cons cell or a string")))))
+      (define-key keymap (kbd key) def))
+    (setq key (pop more)
+          replacement (pop more))))
+
+;;;###autoload
+(defun which-key-add-key-based-replacements
+    (key-sequence replacement &rest more)
+  "Replace the description of KEY-SEQUENCE with REPLACEMENT.
+KEY-SEQUENCE is a string suitable for use in `kbd'. REPLACEMENT
+may either be a string, as in
+
+\(which-key-add-key-based-replacements \"C-x 1\" \"maximize\"\)
+
+a cons of two strings as in
+
+\(which-key-add-key-based-replacements \"C-x 8\"
+                                        \\='(\"unicode\" . \"Unicode keys\")\)
+
+or a function that takes a \(KEY . BINDING\) cons and returns a
+replacement.
+
+In the second case, the second string is used to provide a longer
+name for the keys under a prefix.
+
+MORE allows you to specifcy additional KEY REPLACEMENT pairs.  All
+replacements are added to `which-key-replacement-alist'."
+  ;; TODO: Make interactive
+  (while key-sequence
+    ;; normalize key sequences before adding
+    (let ((key-seq (key-description (kbd key-sequence)))
+          (replace (or (and (functionp replacement) replacement)
+                       (car-safe replacement)
+                       replacement)))
+      (push (cons (cons (concat "\\`" (regexp-quote key-seq) "\\'") nil)
+                  (if (functionp replace) replace (cons nil replace)))
+            which-key-replacement-alist)
+      (when (and (not (functionp replacement)) (consp replacement))
+        (push (cons key-seq (cdr-safe replacement))
+              which-key--prefix-title-alist)))
+    (setq key-sequence (pop more) replacement (pop more))))
+(put 'which-key-add-key-based-replacements 'lisp-indent-function 'defun)
+
+;;;###autoload
+(defun which-key-add-major-mode-key-based-replacements
+    (mode key-sequence replacement &rest more)
+  "Functions like `which-key-add-key-based-replacements'.
+The difference is that MODE specifies the `major-mode' that must
+be active for KEY-SEQUENCE and REPLACEMENT (MORE contains
+addition KEY-SEQUENCE REPLACEMENT pairs) to apply."
+  (declare (indent defun))
+  ;; TODO: Make interactive
+  (when (not (symbolp mode))
+    (error "`%S' should be a symbol corresponding to a value of major-mode" mode))
+  (let ((mode-alist
+         (or (cdr-safe (assq mode which-key-replacement-alist)) (list)))
+        (title-mode-alist
+         (or (cdr-safe (assq mode which-key--prefix-title-alist)) (list))))
+    (while key-sequence
+      ;; normalize key sequences before adding
+      (let ((key-seq (key-description (kbd key-sequence)))
+            (replace (or (and (functionp replacement) replacement)
+                         (car-safe replacement)
+                         replacement)))
+        (push (cons (cons (concat "\\`" (regexp-quote key-seq) "\\'") nil)
+                    (if (functionp replace) replace (cons nil replace)))
+              mode-alist)
+        (when (and (not (functionp replacement)) (consp replacement))
+          (push (cons key-seq (cdr-safe replacement))
+                title-mode-alist)))
+      (setq key-sequence (pop more) replacement (pop more)))
+    (if (assq mode which-key-replacement-alist)
+        (setcdr (assq mode which-key-replacement-alist) mode-alist)
+      (push (cons mode mode-alist) which-key-replacement-alist))
+    (if (assq mode which-key--prefix-title-alist)
+        (setcdr (assq mode which-key--prefix-title-alist) title-mode-alist)
+      (push (cons mode title-mode-alist) which-key--prefix-title-alist))))
+
+(defun which-key-define-key-recursively (map key def &optional at-root)
+  "Recursively bind KEY in MAP to DEF on every level of MAP except the first.
+If AT-ROOT is non-nil the binding is also placed at the root of MAP."
+  (when at-root (define-key map key def))
+  (map-keymap
+   (lambda (_ev df)
+     (when (keymapp df)
+       (which-key-define-key-recursively df key def t)))
+   map))
+
+;;; Functions for computing window sizes
+
+(defun which-key--text-width-to-total (text-width)
+  "Convert window TEXT-WIDTH to window total-width.
+TEXT-WIDTH is the desired text width of the window.  The function
+calculates what total width is required for a window in the
+selected to have a text-width of TEXT-WIDTH columns.  The
+calculation considers possible fringes and scroll bars.  This
+function assumes that the desired window has the same character
+width as the frame."
+  (let ((char-width (frame-char-width)))
+    (+ text-width
+       (/ (frame-fringe-width) char-width)
+       (/ (frame-scroll-bar-width) char-width)
+       (if (which-key--char-enlarged-p) 1 0)
+       ;; add padding to account for possible wide (unicode) characters
+       3)))
+
+(defun which-key--total-width-to-text (total-width)
+  "Convert window TOTAL-WIDTH to window text-width.
+TOTAL-WIDTH is the desired total width of the window.  The function calculates
+what text width fits such a window.  The calculation considers possible fringes
+and scroll bars.  This function assumes that the desired window has the same
+character width as the frame."
+  (let ((char-width (frame-char-width)))
+    (- total-width
+       (/ (frame-fringe-width) char-width)
+       (/ (frame-scroll-bar-width) char-width)
+       (if (which-key--char-enlarged-p) 1 0)
+       ;; add padding to account for possible wide (unicode) characters
+       3)))
+
+(defun which-key--char-enlarged-p (&optional _frame)
+  (> (frame-char-width)
+     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
+
+(defun which-key--char-reduced-p (&optional _frame)
+  (< (frame-char-width)
+     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
+
+(defun which-key--char-exact-p (&optional _frame)
+  (= (frame-char-width)
+     (/ (float (frame-pixel-width)) (window-total-width (frame-root-window)))))
+
+(defun which-key--width-or-percentage-to-width (width-or-percentage)
+  "Return window total width.
+If WIDTH-OR-PERCENTAGE is a whole number, return it unchanged.  Otherwise, it
+should be a percentage (a number between 0 and 1) out of the frame's width.
+More precisely, it should be a percentage out of the frame's root window's
+total width."
+  (if (natnump width-or-percentage)
+      width-or-percentage
+    (round (* width-or-percentage (window-total-width (frame-root-window))))))
+
+(defun which-key--height-or-percentage-to-height (height-or-percentage)
+  "Return window total height.
+If HEIGHT-OR-PERCENTAGE is a whole number, return it unchanged.  Otherwise, it
+should be a percentage (a number between 0 and 1) out of the frame's height.
+More precisely, it should be a percentage out of the frame's root window's
+total height."
+  (if (natnump height-or-percentage)
+      height-or-percentage
+    (round (* height-or-percentage (window-total-height (frame-root-window))))))
+
+(defun which-key--frame-size-changed-p ()
+  "Non-nil if a change in frame size is detected."
+  (let ((new-size (cons (frame-width) (frame-height))))
+    (cond ((null which-key--previous-frame-size)
+           (setq which-key--previous-frame-size new-size)
+           nil)
+          ((not (equal which-key--previous-frame-size new-size))
+           (setq which-key--previous-frame-size new-size)))))
+
+;;; Show/hide which-key buffer
+
+(defun which-key--hide-popup ()
+  "This function is called to hide the which-key buffer."
+  (unless (or which-key-persistent-popup
+              (member real-this-command which-key--paging-functions))
+    (setq which-key--last-try-2-loc nil)
+    (setq which-key--pages-obj nil)
+    (setq which-key--automatic-display nil)
+    (setq which-key--prior-show-keymap-args nil)
+    (when (and which-key-idle-secondary-delay which-key--secondary-timer-active)
+      (which-key--start-timer))
+    (which-key--lighter-restore)
+    (which-key--hide-popup-ignore-command)))
+
+(defun which-key--hide-popup-ignore-command ()
+  "`which-key--hide-popup' without the check of `real-this-command'."
+  (cl-case which-key-popup-type
+    ;; Not necessary to hide minibuffer
+    ;; (minibuffer (which-key--hide-buffer-minibuffer))
+    (side-window (which-key--hide-buffer-side-window))
+    (frame (which-key--hide-buffer-frame))
+    (custom (funcall which-key-custom-hide-popup-function))))
+
+(defun which-key--hide-popup-on-frame-size-change (&optional _)
+  "Hide which-key popup if the frame is resized (to trigger a new popup)."
+  (when (which-key--frame-size-changed-p)
+    (which-key--hide-popup)))
+
+(defun which-key--hide-buffer-side-window ()
+  "Hide which-key buffer when side-window popup is used."
+  (when (buffer-live-p which-key--buffer)
+    ;; in case which-key buffer was shown in an existing window, `quit-window'
+    ;; will re-show the previous buffer, instead of closing the window
+    (quit-windows-on which-key--buffer)
+    (when (and which-key-preserve-window-configuration
+               which-key--saved-window-configuration)
+      (set-window-configuration which-key--saved-window-configuration)
+      (setq which-key--saved-window-configuration nil))))
+
+(defun which-key--hide-buffer-frame ()
+  "Hide which-key buffer when frame popup is used."
+  (when (frame-live-p which-key--frame)
+    (delete-frame which-key--frame)))
+
+(defun which-key--popup-showing-p ()
+  (and (bufferp which-key--buffer)
+       (or (window-live-p (get-buffer-window which-key--buffer))
+           (let ((window (get-buffer-window which-key--buffer t)))
+             (and (window-live-p window)
+                  (frame-visible-p (window-frame window)))))))
+
+(defun which-key--show-popup (act-popup-dim)
+  "Show the which-key buffer.
+ACT-POPUP-DIM includes the dimensions, (height . width) of the
+buffer text to be displayed in the popup.  Return nil if no window
+is shown, or if there is no need to start the closing timer."
+  (when (and (> (car act-popup-dim) 0)
+             (> (cdr act-popup-dim) 0))
+    (cl-case which-key-popup-type
+      ;; Not called for minibuffer
+      ;; (minibuffer (which-key--show-buffer-minibuffer act-popup-dim))
+      (side-window (which-key--show-buffer-side-window act-popup-dim))
+      (frame (which-key--show-buffer-frame act-popup-dim))
+      (custom (funcall which-key-custom-show-popup-function act-popup-dim)))))
+
+(defun which-key--fit-buffer-to-window-horizontally
+    (&optional window &rest params)
+  "Slightly modified version of `fit-buffer-to-window'.
+Use &rest params because `fit-buffer-to-window' has a different
+call signature in different emacs versions"
+  (let ((fit-window-to-buffer-horizontally t)
+        (window-min-height 1))
+    (apply #'fit-window-to-buffer window params)))
+
+(defun which-key--show-buffer-side-window (act-popup-dim)
+  "Show which-key buffer when popup type is side-window."
+  (when (and which-key-preserve-window-configuration
+             (not which-key--saved-window-configuration))
+    (setq which-key--saved-window-configuration (current-window-configuration)))
+  (let* ((height (car act-popup-dim))
+         (width (cdr act-popup-dim))
+         (alist
+          (if which-key-allow-imprecise-window-fit
+              `((window-width .  ,(which-key--text-width-to-total width))
+                (window-height . ,height)
+                (side . ,which-key-side-window-location)
+                (slot . ,which-key-side-window-slot))
+            `((window-width . which-key--fit-buffer-to-window-horizontally)
+              (window-height . (lambda (w) (fit-window-to-buffer w nil 1)))
+              (side . ,which-key-side-window-location)
+              (slot . ,which-key-side-window-slot)))))
+    (which-key--debug-message "Allow imprecise fit: %s
+Display window alist: %s"
+                              which-key-allow-imprecise-window-fit
+                              alist)
+    ;; Previously used `display-buffer-in-major-side-window' here, but
+    ;; apparently that is meant to be an internal function. See emacs bug #24828
+    ;; and advice given there.
+    (cond
+     ((eq which-key--multiple-locations t)
+      ;; possibly want to switch sides in this case so we can't reuse the window
+      (delete-windows-on which-key--buffer)
+      (display-buffer-in-side-window which-key--buffer alist))
+     ((get-buffer-window which-key--buffer)
+      (display-buffer-reuse-window which-key--buffer alist))
+     (t
+      (display-buffer-in-side-window which-key--buffer alist)))))
+
+(defun which-key--show-buffer-frame (act-popup-dim)
+  "Show which-key buffer when popup type is frame."
+  (let* (;(orig-window (selected-window))
+         (frame-height (+ (car act-popup-dim)
+                          (if (with-current-buffer which-key--buffer
+                                mode-line-format)
+                              1
+                            0)))
+         ;; without adding 2, frame sometimes isn't wide enough for the buffer.
+         ;; this is probably because of the fringes. however, setting fringes
+         ;; sizes to 0 (instead of adding 2) didn't always make the frame wide
+         ;; enough. don't know why it is so.
+         (frame-width (+ (cdr act-popup-dim) 2))
+         (new-window (if (and (frame-live-p which-key--frame)
+                              (eq which-key--buffer
+                                  (window-buffer
+                                   (frame-root-window which-key--frame))))
+                         (which-key--show-buffer-reuse-frame
+                          frame-height frame-width)
+                       (which-key--show-buffer-new-frame
+                        frame-height frame-width))))
+    (when new-window
+      ;; display successful
+      (setq which-key--frame (window-frame new-window))
+      new-window)))
+
+(defun which-key--show-buffer-new-frame (frame-height frame-width)
+  "Helper for `which-key--show-buffer-frame'."
+  (let* ((frame-params `((height . ,frame-height)
+                         (width . ,frame-width)
+                         ;; tell the window manager to respect the given sizes
+                         (user-size . t)
+                         ;; which-key frame doesn't need a minibuffer
+                         (minibuffer . nil)
+                         (name . "which-key")
+                         ;; no need for scroll bars in which-key frame
+                         (vertical-scroll-bars . nil)
+                         ;; (left-fringe . 0)
+                         ;; (right-fringe . 0)
+                         ;; (right-divider-width . 0)
+                         ;; make sure frame is visible
+                         (visibility . t)))
+         (alist `((pop-up-frame-parameters . ,frame-params)))
+         (orig-frame (selected-frame))
+         (new-window (display-buffer-pop-up-frame which-key--buffer alist)))
+    (when new-window
+      ;; display successful
+      (redirect-frame-focus (window-frame new-window) orig-frame)
+      new-window)))
+
+(defun which-key--show-buffer-reuse-frame (frame-height frame-width)
+  "Helper for `which-key--show-buffer-frame'."
+  (let ((window
+         (display-buffer-reuse-window
+          which-key--buffer `((reusable-frames . ,which-key--frame)))))
+    (when window
+      ;; display successful
+      (set-frame-size (window-frame window) frame-width frame-height)
+      window)))
+
+;;; Max dimension of available window functions
+
+(defun which-key--popup-max-dimensions ()
+  "Return maximum dimension available for popup.
+Dimension functions should return the maximum possible (height
+. width) of the intended popup. SELECTED-WINDOW-WIDTH is the
+width of currently active window, not the which-key buffer
+window."
+  (cl-ecase which-key-popup-type
+    (minibuffer (which-key--minibuffer-max-dimensions))
+    (side-window (which-key--side-window-max-dimensions))
+    (frame (which-key--frame-max-dimensions))
+    (custom (funcall which-key-custom-popup-max-dimensions-function
+                     (window-width)))))
+
+(defun which-key--minibuffer-max-dimensions ()
+  "Return max-dimensions of minibuffer (height . width).
+Measured in lines and characters respectively."
+  (cons
+   ;; height
+   (if (floatp max-mini-window-height)
+       (floor (* (frame-text-lines)
+                 max-mini-window-height))
+     max-mini-window-height)
+   ;; width
+   (max 0 (- (frame-text-cols) which-key-unicode-correction))))
+
+(defun which-key--side-window-max-dimensions ()
+  "Return max-dimensions of the side-window popup.
+The return value should be (height . width) in lines and
+characters respectively."
+  (cons
+   ;; height
+   (if (member which-key-side-window-location '(left right))
+       ;; 1 is a kludge to make sure there is no overlap
+       (- (frame-height) (window-text-height (minibuffer-window)) 1)
+     ;; (window-mode-line-height which-key--window))
+     ;; FIXME: change to something like
+     ;; (min which-*-height (calculate-max-height))
+     (which-key--height-or-percentage-to-height
+      which-key-side-window-max-height))
+   ;; width
+   (max 0
+        (- (if (memq which-key-side-window-location '(left right))
+               (which-key--total-width-to-text
+                (which-key--width-or-percentage-to-width
+                 which-key-side-window-max-width))
+             (which-key--total-width-to-text
+              (which-key--width-or-percentage-to-width
+               1.0)))
+           which-key-unicode-correction))))
+
+(defun which-key--frame-max-dimensions ()
+  "Return max-dimensions of the frame popup.
+The return value should be (height . width) in lines and
+characters respectively."
+  (cons which-key-frame-max-height which-key-frame-max-width))
+
+;;; Sorting functions
+
+(defun which-key--string< (a b &optional alpha)
+  (let ((da (downcase a))
+        (db (downcase b)))
+    (cond
+     ((and alpha (not which-key-sort-uppercase-first))
+      (if (string-equal da db)
+          (not (string-lessp a b))
+        (string-lessp da db)))
+     ((and alpha which-key-sort-uppercase-first)
+      (if (string-equal da db)
+          (string-lessp a b)
+        (string-lessp da db)))
+     ((not which-key-sort-uppercase-first)
+      (let ((aup (not (string-equal da a)))
+            (bup (not (string-equal db b))))
+        (if (eq aup bup)
+            (string-lessp a b)
+          bup)))
+     (t (string-lessp a b)))))
+
+(defun which-key--key-description< (a b &optional alpha)
+  "Key sorting function.
+Used for `which-key-key-order' and `which-key-key-order-alpha'."
+  (save-match-data
+    (let* ((a (which-key--extract-key a))
+           (b (which-key--extract-key b))
+           (rngrgxp "^\\([^ ]+\\) \\.\\. [^ ]+")
+           (a (if (string-match rngrgxp a) (match-string 1 a) a))
+           (b (if (string-match rngrgxp b) (match-string 1 b) b))
+           (aem? (string-equal a ""))
+           (bem? (string-equal b ""))
+           (a1? (= 1 (length a)))
+           (b1? (= 1 (length b)))
+           (srgxp "^\\(RET\\|SPC\\|TAB\\|DEL\\|LFD\\|ESC\\|NUL\\)")
+           (asp? (string-match-p srgxp a))
+           (bsp? (string-match-p srgxp b))
+           (prrgxp "^\\(M\\|C\\|S\\|A\\|H\\|s\\)-")
+           (apr? (string-match-p prrgxp a))
+           (bpr? (string-match-p prrgxp b))
+           (afn? (string-match-p "<f[0-9]+>" a))
+           (bfn? (string-match-p "<f[0-9]+>" b)))
+      (cond ((or aem? bem?) (and aem? (not bem?)))
+            ((and asp? bsp?)
+             (if (string-equal (substring a 0 3) (substring b 0 3))
+                 (which-key--key-description<
+                  (substring a 3) (substring b 3) alpha)
+               (which-key--string< a b alpha)))
+            ((or asp? bsp?) asp?)
+            ((and a1? b1?) (which-key--string< a b alpha))
+            ((or a1? b1?) a1?)
+            ((and afn? bfn?)
+             (< (string-to-number
+                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" a))
+                (string-to-number
+                 (replace-regexp-in-string "<f\\([0-9]+\\)>" "\\1" b))))
+            ((or afn? bfn?) afn?)
+            ((and apr? bpr?)
+             (if (string-equal (substring a 0 2) (substring b 0 2))
+                 (which-key--key-description<
+                  (substring a 2) (substring b 2) alpha)
+               (which-key--string< a b alpha)))
+            ((or apr? bpr?) apr?)
+            (t (which-key--string< a b alpha))))))
+
+(defsubst which-key-key-order-alpha (acons bcons)
+  "Order key descriptions A and B.
+Order is lexicographic within a \"class\", where the classes and
+the ordering of classes are listed below.
+
+special (SPC,TAB,...) < single char < mod (C-,M-,...) < other.
+Sorts single characters alphabetically with lowercase coming
+before upper."
+  (which-key--key-description< (car acons) (car bcons) t))
+
+(defsubst which-key-key-order (acons bcons)
+  "Order key descriptions A and B.
+Order is lexicographic within a \"class\", where the classes and
+the ordering of classes are listed below.
+
+special (SPC,TAB,...) < single char < mod (C-,M-,...) < other."
+  (which-key--key-description< (car acons) (car bcons)))
+
+(defsubst which-key-description-order (acons bcons)
+  "Order descriptions of A and B.
+Uses `string-lessp' after applying lowercase."
+  (string-lessp (downcase (cdr acons)) (downcase (cdr bcons))))
+
+(defsubst which-key--group-p (description)
+  (or (string-equal description "prefix")
+      (string-match-p "^group:" description)
+      (keymapp (intern description))))
+
+(defun which-key-prefix-then-key-order (acons bcons)
+  "Order prefixes before non-prefixes.
+Within these categories order using `which-key-key-order'."
+  (let ((apref? (which-key--group-p (cdr acons)))
+        (bpref? (which-key--group-p (cdr bcons))))
+    (if (not (eq apref? bpref?))
+        (and (not apref?) bpref?)
+      (which-key-key-order acons bcons))))
+
+(defun which-key-prefix-then-key-order-reverse (acons bcons)
+  "Order prefixes before non-prefixes.
+Within these categories order using `which-key-key-order'."
+  (let ((apref? (which-key--group-p (cdr acons)))
+        (bpref? (which-key--group-p (cdr bcons))))
+    (if (not (eq apref? bpref?))
+        (and apref? (not bpref?))
+      (which-key-key-order acons bcons))))
+
+(defun which-key-local-then-key-order (acons bcons)
+  "Order local bindings before non-local ones.
+Within these categories order using `which-key-key-order'."
+  (let ((aloc? (which-key--local-binding-p acons))
+        (bloc? (which-key--local-binding-p bcons)))
+    (if (not (eq aloc? bloc?))
+        (and aloc? (not bloc?))
+      (which-key-key-order acons bcons))))
+
+;;; Functions for retrieving and formatting keys
+
+(defsubst which-key--string-width (maybe-string)
+  "If MAYBE-STRING is a string use `which-key--string-width' o/w return 0."
+  (if (stringp maybe-string) (string-width maybe-string) 0))
+
+(defsubst which-key--butlast-string (str)
+  (string-join (butlast (split-string str)) " "))
+
+(defun which-key--match-replacement (key-binding replacement)
+  ;; these are mode specific ones to ignore. The mode specific case is
+  ;; handled in the selection of alist
+  (when (and (consp key-binding) (not (symbolp (car replacement))))
+    (let ((key-regexp (caar replacement))
+          (binding-regexp (cdar replacement))
+          (case-fold-search nil))
+      (and (or (null key-regexp)
+               (string-match-p key-regexp
+                               (car key-binding)))
+           (or (null binding-regexp)
+               (string-match-p binding-regexp
+                               (cdr key-binding)))))))
+
+(defsubst which-key--replace-in-binding (key-binding repl)
+  (cond ((or (not (consp repl)) (null (cdr repl)))
+         key-binding)
+        ((functionp (cdr repl))
+         (funcall (cdr repl) key-binding))
+        ((consp (cdr repl))
+         (cons
+          (cond ((and (caar repl) (cadr repl))
+                 (replace-regexp-in-string
+                  (caar repl) (cadr repl) (car key-binding) t))
+                ((cadr repl) (cadr repl))
+                (t (car key-binding)))
+          (cond ((and (cdar repl) (cddr repl))
+                 (replace-regexp-in-string
+                  (cdar repl) (cddr repl) (cdr key-binding) t))
+                ((cddr repl) (cddr repl))
+                (t (cdr key-binding)))))))
+
+(defun which-key--replace-in-repl-list-once (key-binding repls)
+  (cl-dolist (repl repls)
+    (when (which-key--match-replacement key-binding repl)
+      (cl-return `(replaced . ,(which-key--replace-in-binding key-binding repl))))))
+
+(defun which-key--replace-in-repl-list-many (key-binding repls)
+  (let (found)
+    (dolist (repl repls)
+      (when (which-key--match-replacement key-binding repl)
+        (setq found t)
+        (setq key-binding (which-key--replace-in-binding key-binding repl))))
+    (when found `(replaced . ,key-binding))))
+
+(defun which-key--maybe-replace (key-binding)
+  "Use `which-key--replacement-alist' to maybe replace KEY-BINDING.
+KEY-BINDING is a cons cell of the form \(KEY . BINDING\) each of
+which are strings.  KEY is of the form produced by `key-binding'."
+  (let* ((replacer (if which-key-allow-multiple-replacements
+                       #'which-key--replace-in-repl-list-many
+                     #'which-key--replace-in-repl-list-once)))
+    (pcase
+        (apply replacer
+               (list key-binding
+                     (cdr-safe (assq major-mode which-key-replacement-alist))))
+      (`(replaced . ,repl)
+       (if which-key-allow-multiple-replacements
+           (pcase (apply replacer (list repl which-key-replacement-alist))
+             (`(replaced . ,repl) repl)
+             ('() repl))
+         repl))
+      ('()
+       (pcase (apply replacer (list key-binding which-key-replacement-alist))
+         (`(replaced . ,repl) repl)
+         ('() key-binding))))))
+
+(defsubst which-key--current-key-list (&optional key-str)
+  (append (listify-key-sequence (which-key--current-prefix))
+          (when key-str
+            (listify-key-sequence (kbd key-str)))))
+
+(defsubst which-key--current-key-string (&optional key-str)
+  (key-description (which-key--current-key-list key-str)))
+
+(defun which-key--local-binding-p (keydesc)
+  (eq (which-key--safe-lookup-key-description
+       (current-local-map)
+       (which-key--current-key-string (car keydesc)))
+      (intern (cdr keydesc))))
+
+(defun which-key--map-binding-p (map keydesc)
+  "Does MAP contain KEYDESC = (key . binding)?"
+  (or
+   (when (bound-and-true-p evil-state)
+     (let ((lookup
+            (which-key--safe-lookup-key-description
+             map
+             (which-key--current-key-string
+              (format "<%s-state> %s" evil-state (car keydesc))))))
+       (or (eq lookup (intern (cdr keydesc)))
+           (and (keymapp lookup) (string= (cdr keydesc) "Prefix Command")))))
+   (let ((lookup
+          (which-key--safe-lookup-key-description
+           map (which-key--current-key-string (car keydesc)))))
+     (or (eq lookup (intern (cdr keydesc)))
+         (and (keymapp lookup) (string= (cdr keydesc) "Prefix Command"))))))
+
+(defun which-key--maybe-get-prefix-title (keys)
+  "KEYS is a string produced by `key-description'.
+A title is possibly returned using
+`which-key--prefix-title-alist'.  An empty string is returned if
+no title exists."
+  (cond
+   ((not (string-equal keys ""))
+    (let* ((title-res
+            (cdr-safe (assoc-string keys which-key--prefix-title-alist)))
+           (repl-res
+            (cdr-safe (which-key--maybe-replace (cons keys ""))))
+           (binding (key-binding (kbd keys)))
+           (alternate (when (and binding (symbolp binding))
+                        (symbol-name binding))))
+      (cond (title-res title-res)
+            ((not (string-empty-p repl-res)) repl-res)
+            ((and (eq which-key-show-prefix 'echo) alternate)
+             alternate)
+            ((and (member which-key-show-prefix '(bottom top mode-line))
+                  (eq which-key-side-window-location 'bottom)
+                  echo-keystrokes)
+             (if alternate alternate
+               (concat "Following " keys)))
+            (t ""))))
+   (t "")))
+
+(defun which-key--propertize (string &rest properties)
+  "Version of `propertize' that checks type of STRING."
+  (when (stringp string)
+    (apply #'propertize string properties)))
+
+(defun which-key--propertize-key (key)
+  "Add a face to KEY.
+If KEY contains any \"special keys\" defined in
+`which-key-special-keys' then truncate and add the corresponding
+`which-key-special-key-face'."
+  (let ((key-w-face (which-key--propertize key 'face 'which-key-key-face))
+        (regexp (concat "\\("
+                        (mapconcat #'identity which-key-special-keys
+                                   "\\|")
+                        "\\)"))
+        (case-fold-search nil))
+    (save-match-data
+      (if (and which-key-special-keys
+               (string-match regexp key))
+          (let ((beg (match-beginning 0)) (end (match-end 0)))
+            (concat (substring key-w-face 0 beg)
+                    (which-key--propertize (substring key-w-face beg (1+ beg))
+                                           'face 'which-key-special-key-face)
+                    (substring key-w-face end
+                               (which-key--string-width key-w-face))))
+        key-w-face))))
+
+(defsubst which-key--truncate-description (desc avl-width)
+  "Truncate DESC description to `which-key-max-description-length'."
+  (let* ((max which-key-max-description-length)
+         (max (cl-etypecase max
+                (null nil)
+                (integer max)
+                (float (truncate (* max avl-width)))
+                (function (let ((val (funcall max avl-width)))
+                            (if (floatp val) (truncate val) val))))))
+    (if (and max (> (length desc) max))
+        (let ((dots (and (not (equal which-key-ellipsis ""))
+                         (which-key--propertize
+                          which-key-ellipsis 'face
+                          (get-text-property (1- (length desc)) 'face desc)))))
+          (if dots
+              (concat (substring desc 0 (- max (length dots))) dots)
+            (substring desc 0 max)))
+      desc)))
+
+(defun which-key--highlight-face (description)
+  "Return the highlight face for DESCRIPTION if it has one."
+  (let (face)
+    (dolist (el which-key-highlighted-command-list)
+      (unless face
+        (cond ((consp el)
+               (when (string-match-p (car el) description)
+                 (setq face (cdr el))))
+              ((stringp el)
+               (when (string-match-p el description)
+                 (setq face 'which-key-highlighted-command-face)))
+              (t
+               (message "which-key: warning: element %s of \
+which-key-highlighted-command-list is not a string or a cons
+cell" el)))))
+    face))
+
+(defun which-key--propertize-description
+    (description group local hl-face &optional original-description)
+  "Add face to DESCRIPTION.
+The face chosen depends on whether the description represents a
+group or a command. Also make some minor adjustments to the
+description string, like removing a \"group:\" prefix.
+
+ORIGINAL-DESCRIPTION is the description given by
+`describe-buffer-bindings'."
+  (when description
+    (let* ((desc description)
+           (desc (if (string-match-p "^group:" desc)
+                     (substring desc 6) desc))
+           (desc (if group (concat which-key-prefix-prefix desc) desc)))
+      (make-text-button
+       desc nil
+       'face (cond (hl-face hl-face)
+                   (group 'which-key-group-description-face)
+                   (local 'which-key-local-map-description-face)
+                   (t 'which-key-command-description-face))
+       'help-echo (cond
+                   ((and original-description
+                         (fboundp (intern original-description))
+                         (documentation (intern original-description))
+                         ;; tooltip-mode doesn't exist in emacs-nox
+                         (boundp 'tooltip-mode) tooltip-mode)
+                    (documentation (intern original-description)))
+                   ((and original-description
+                         (fboundp (intern original-description))
+                         (documentation (intern original-description))
+                         (let* ((doc (documentation
+                                      (intern original-description)))
+                                (str (replace-regexp-in-string "\n" " " doc))
+                                (max (floor (* (frame-width) 0.8))))
+                           (if (> (length str) max)
+                               (concat (substring str 0 max) "...")
+                             str)))))))))
+
+(defun which-key--extract-key (key-str)
+  "Pull the last key (or key range) out of KEY-STR."
+  (save-match-data
+    (let ((key-range-regexp "\\`.*\\([^ \t]+ \\.\\. [^ \t]+\\)\\'"))
+      (if (string-match key-range-regexp key-str)
+          (match-string 1 key-str)
+        (car (last (split-string key-str " ")))))))
+
+(defun which-key--maybe-add-docstring (current original)
+  "Maybe concat a docstring to CURRENT and return result.
+Specifically, do this if ORIGINAL is a command with a docstring
+and `which-key-show-docstrings' is non-nil.  If
+`which-key-show-docstrings' is the symbol docstring-only, just
+return the docstring."
+  (let* ((orig-sym (intern original))
+         (doc (when (commandp orig-sym)
+                (documentation orig-sym)))
+         (doc (when doc
+                (replace-regexp-in-string
+                 (concat "^\\(?::"
+                         (regexp-opt '("around" "override"
+                                       "after" "after-until" "after-while"
+                                       "before" "before-until" "before-while"
+                                       "filter-args" "filter-return"))
+                         " advice: [^\n]+\n"
+                         "\\)+\n")
+                 "" doc)))
+         (docstring (when doc
+                      (which-key--propertize (car (split-string doc "\n"))
+                                             'face 'which-key-docstring-face))))
+    (cond ((not (and which-key-show-docstrings docstring))
+           current)
+          ((eq which-key-show-docstrings 'docstring-only)
+           docstring)
+          (t
+           (format "%s %s" current docstring)))))
+
+(defun which-key--format-and-replace (unformatted &optional preserve-full-key)
+  "Make list of key bindings with separators and descriptions.
+Take a list of (key . desc) cons cells in UNFORMATTED, add
+faces and perform replacements according to the three replacement
+alists. Returns a list (key separator description)."
+  (let ((sep-w-face
+         (which-key--propertize which-key-separator
+                                'face 'which-key-separator-face))
+        (local-map (current-local-map))
+	(avl-width (cdr (which-key--popup-max-dimensions)))
+        new-list)
+    (dolist (key-binding unformatted)
+      (let* ((keys (car key-binding))
+             (orig-desc (cdr key-binding))
+             (group (which-key--group-p orig-desc))
+             (local (eq (which-key--safe-lookup-key-description
+                         local-map keys)
+                        (intern orig-desc)))
+             (hl-face (which-key--highlight-face orig-desc))
+             (key-binding (which-key--maybe-replace key-binding))
+             (final-desc (which-key--propertize-description
+                          (cdr key-binding) group local hl-face orig-desc)))
+        (when final-desc
+          (setq final-desc
+                (which-key--truncate-description
+                 (which-key--maybe-add-docstring final-desc orig-desc)
+		 avl-width)))
+        (when (consp key-binding)
+          (push
+           (list (which-key--propertize-key
+                  (if preserve-full-key
+                      (car key-binding)
+                    (which-key--extract-key (car key-binding))))
+                 sep-w-face
+                 final-desc)
+           new-list))))
+    (nreverse new-list)))
+
+(defun which-key--compute-binding (binding)
+  "Replace BINDING with remapped binding if it exists.
+Requires `which-key-compute-remaps' to be non-nil."
+  (copy-sequence (symbol-name
+                  (or (and which-key-compute-remaps
+                           (command-remapping binding))
+                      binding))))
+
+(defun which-key--get-menu-item-binding (def)
+  "Retrieve binding for menu-item"
+  ;; see `keymap--menu-item-binding'
+  (let* ((binding (nth 2 def))
+         (plist (nthcdr 3 def))
+         (filter (plist-get plist :filter)))
+    (if filter (funcall filter binding) binding)))
+
+(defun which-key--get-keymap-bindings-1
+    (keymap start &optional prefix filter all ignore-commands)
+  "See `which-key--get-keymap-bindings'."
+  (let ((bindings start)
+        (prefix-map (if prefix (lookup-key keymap prefix) keymap)))
+    (when (keymapp prefix-map)
+      (map-keymap
+       (lambda (ev def)
+         (let* ((key (vconcat prefix (list ev)))
+                (key-desc (key-description key)))
+           (cond
+            ((assoc key-desc bindings))
+            ((and (listp ignore-commands) (symbolp def) (memq def ignore-commands)))
+            ((or (string-match-p
+                  which-key--ignore-non-evil-keys-regexp key-desc)
+                 (eq ev 'menu-bar)))
+            ((and (keymapp def)
+                  (string-match-p which-key--evil-keys-regexp key-desc)))
+            ((and (keymapp def)
+                  (or all
+                      ;; event 27 is escape, so this will pick up meta
+                      ;; bindings and hopefully not too much more
+                      (eql ev 27)))
+             (setq bindings
+                   (which-key--get-keymap-bindings-1
+                    keymap bindings key nil all ignore-commands)))
+            (def
+             (let* ((def (if (eq 'menu-item (car-safe def))
+                             (which-key--get-menu-item-binding def)
+                           def))
+                    (binding
+                     (cons key-desc
+                           (cond
+                            ((symbolp def) (which-key--compute-binding def))
+                            ((keymapp def) "prefix")
+                            ((functionp def)
+                             (cond
+                              ((eq 'lambda (car-safe def)) "lambda")
+                              ((eq 'closure (car-safe def)) "closure")
+                              (t "function")))
+                            ((stringp def) def)
+                            ((vectorp def) (key-description def))
+                            ((and (consp def)
+                                  ;; looking for (STRING . DEFN)
+                                  (stringp (car def)))
+                             (concat (when (keymapp (cdr-safe def))
+                                       "group:")
+                                     (car def)))
+                            (t "unknown")))))
+               (when (or (null filter)
+                         (and (functionp filter)
+                              (funcall filter binding)))
+                 (push binding bindings)))))))
+       prefix-map))
+    bindings))
+
+(defun which-key--get-keymap-bindings
+    (keymap &optional start prefix filter all evil)
+  "Retrieve top-level bindings from KEYMAP.
+PREFIX limits bindings to those starting with this key
+sequence.  START is a list of existing bindings to add to.  If ALL
+is non-nil, recursively retrieve all bindings below PREFIX. If
+EVIL is non-nil, extract active evil bidings."
+  (let ((bindings start)
+        (ignore '(self-insert-command ignore ignore-event company-ignore))
+        (evil-map
+         (when (and evil (bound-and-true-p evil-local-mode))
+           (lookup-key keymap (kbd (format "<%s-state>" evil-state))))))
+    (when (keymapp evil-map)
+      (setq bindings (which-key--get-keymap-bindings-1
+                      evil-map bindings prefix filter all ignore)))
+    (which-key--get-keymap-bindings-1
+     keymap bindings prefix filter all ignore)))
+
+(defun which-key--get-current-bindings (&optional prefix filter)
+  "Generate a list of current active bindings."
+  (let (bindings)
+    (dolist (map (current-active-maps t) bindings)
+      (when (cdr map)
+        (setq bindings
+              (which-key--get-keymap-bindings
+               map bindings prefix filter))))))
+
+(defun which-key--get-bindings (&optional prefix keymap filter recursive)
+  "Collect key bindings.
+If KEYMAP is nil, collect from current buffer using the current
+key sequence as a prefix. Otherwise, collect from KEYMAP. FILTER
+is a function to use to filter the bindings. If RECURSIVE is
+non-nil, then bindings are collected recursively for all prefixes."
+  (let* ((unformatted
+          (cond ((keymapp keymap)
+                 (which-key--get-keymap-bindings
+                  keymap nil prefix filter recursive))
+                (keymap
+                 (error "%s is not a keymap" keymap))
+                (t
+                 (which-key--get-current-bindings prefix filter)))))
+    (when which-key-sort-order
+      (setq unformatted
+            (sort unformatted which-key-sort-order)))
+    (which-key--format-and-replace unformatted recursive)))
+
+;;; Functions for laying out which-key buffer pages
+
+(defun which-key--normalize-columns (columns)
+  "Pad COLUMNS to the same length using empty strings."
+  (let ((max-len (cl-reduce (lambda (a x) (max a (length x))) columns
+                            :initial-value 0)))
+    (mapcar
+     (lambda (c)
+       (if (< (length c) max-len)
+           (append c (make-list (- max-len (length c)) ""))
+         c))
+     columns)))
+
+(defsubst which-key--join-columns (columns)
+  "Transpose columns into rows, concat rows into lines and rows into page."
+  (let* ((padded (which-key--normalize-columns (nreverse columns)))
+         (rows (apply #'cl-mapcar #'list padded)))
+    (mapconcat (lambda (row) (mapconcat #'identity row " ")) rows "\n")))
+
+(defsubst which-key--max-len (keys index &optional initial-value)
+  "Find the max length of the INDEX element in each of KEYS."
+  (cl-reduce
+   (lambda (x y) (max x (which-key--string-width (nth index y))))
+   keys :initial-value (if initial-value initial-value 0)))
+
+(defun which-key--pad-column (col-keys avl-width)
+  "Pad cells of COL-KEYS to AVL-WIDTH.
+Take a column of (key separator description) COL-KEYS,
+calculate the max width in the column and pad all cells out to
+that width."
+  (let* ((col-key-width  (+ which-key-add-column-padding
+                            (which-key--max-len col-keys 0)))
+         (col-sep-width  (which-key--max-len col-keys 1))
+         (avl-width      (- avl-width col-key-width col-sep-width))
+         (col-desc-width (min avl-width
+                              (which-key--max-len
+                               col-keys 2
+                               which-key-min-column-description-width)))
+         (col-width      (+ col-key-width col-sep-width col-desc-width))
+         (col-format     (concat "%" (int-to-string col-key-width)
+                                 "s%s%-" (int-to-string col-desc-width) "s")))
+    (cons col-width
+          (mapcar (lambda (k) (apply #'format col-format k))
+                  col-keys))))
+
+(defun which-key--partition-list (n list)
+  "Partition LIST into N-sized sublists."
+  (let (res)
+    (while list
+      (setq res (cons (cl-subseq list 0 (min n (length list))) res)
+            list (nthcdr n list)))
+    (nreverse res)))
+
+(defun which-key--list-to-pages (keys avl-lines avl-width)
+  "Convert list of KEYS to columns based on dimensions AVL-LINES and AVL-WIDTH.
+Returns a `which-key--pages' object that holds the page strings,
+as well as metadata."
+  (let ((cols-w-widths (mapcar (lambda (c) (which-key--pad-column c avl-width))
+			       (which-key--partition-list avl-lines keys)))
+        (page-width 0) (n-pages 0) (n-keys 0) (n-columns 0)
+        page-cols pages page-widths keys/page col)
+    (if (> (apply #'max (mapcar #'car cols-w-widths)) avl-width)
+        ;; give up if no columns fit
+        nil
+      (while cols-w-widths
+        ;; start new page
+        (cl-incf n-pages)
+        (setq col (pop cols-w-widths))
+        (setq page-cols (list (cdr col)))
+        (setq page-width (car col))
+        (setq n-keys (length (cdr col)))
+        (setq n-columns 1)
+        ;; add additional columns as long as they fit
+        (while (and cols-w-widths
+                    (or (null which-key-max-display-columns)
+                        (< n-columns which-key-max-display-columns))
+                    (<= (+ page-width 1 (caar cols-w-widths)) avl-width))
+          (setq col (pop cols-w-widths))
+          (push (cdr col) page-cols)
+          (cl-incf page-width (1+ (car col)))
+          (cl-incf n-keys (length (cdr col)))
+          (cl-incf n-columns))
+        (push (which-key--join-columns page-cols) pages)
+        (push n-keys keys/page)
+        (push page-width page-widths))
+      (make-which-key--pages
+       :pages (nreverse pages)
+       :height (if (> n-pages 1) avl-lines (min avl-lines n-keys))
+       :widths (nreverse page-widths)
+       :keys/page (reverse keys/page)
+       :page-nums (number-sequence 1 n-pages)
+       :num-pages n-pages
+       :total-keys (apply #'+ keys/page)))))
+
+(defun which-key--create-pages-1
+    (keys available-lines available-width &optional min-lines vertical)
+  "Create page strings using `which-key--list-to-pages'.
+Will try to find the best number of rows and columns using the
+given dimensions and the length and widths of ITEMS. Use VERTICAL
+if the ITEMS are laid out vertically and the number of columns
+should be minimized."
+  (let ((result (which-key--list-to-pages
+                 keys available-lines available-width))
+        (min-lines (or min-lines 0))
+        found prev-result)
+    (if (or (null result)
+            vertical
+            (> (which-key--pages-num-pages result) 1)
+            (= 1 available-lines))
+        result
+      ;; simple search for a fitting page
+      (while (and (> available-lines min-lines)
+                  (not found))
+        (setq available-lines (cl-decf available-lines)
+              prev-result result
+              result (which-key--list-to-pages
+                      keys available-lines available-width)
+              found (> (which-key--pages-num-pages result) 1)))
+      (if found prev-result result))))
+
+(defun which-key--create-pages (keys &optional prefix-keys prefix-title)
+  "Create page strings using `which-key--list-to-pages'.
+Will try to find the best number of rows and columns using the
+given dimensions and the length and wdiths of KEYS. SEL-WIN-WIDTH
+is the width of the live window."
+  (let* ((max-dims (which-key--popup-max-dimensions))
+         (max-lines (car max-dims))
+         (max-width (cdr max-dims))
+         (prefix-desc (key-description prefix-keys))
+         (full-prefix (which-key--full-prefix prefix-desc))
+         (prefix (when (eq which-key-show-prefix 'left)
+                   (+ 2 (which-key--string-width full-prefix))))
+         (prefix-top-bottom (member which-key-show-prefix '(bottom top)))
+         (avl-lines (if prefix-top-bottom (- max-lines 1) max-lines))
+         (min-lines (min avl-lines which-key-min-display-lines))
+         (avl-width (if prefix (- max-width prefix) max-width))
+         (vertical (or (and (eq which-key-popup-type 'side-window)
+                            (member which-key-side-window-location '(left right)))
+                       (eq which-key-max-display-columns 1)))
+         result)
+    (setq result
+          (which-key--create-pages-1
+           keys avl-lines avl-width min-lines vertical))
+    (when (and result
+               (> (which-key--pages-num-pages result) 0))
+      (setf (which-key--pages-prefix result) prefix-keys)
+      (setf (which-key--pages-prefix-title result)
+            (or prefix-title
+                (which-key--maybe-get-prefix-title
+                 (key-description prefix-keys))))
+      (when prefix-top-bottom
+        ;; Add back the line earlier reserved for the page information.
+        (setf (which-key--pages-height result) max-lines))
+      (when (and (= (which-key--pages-num-pages result) 1)
+                 (> which-key-min-display-lines
+                    (which-key--pages-height result)))
+        ;; result is shorter than requested, so we artificially increase the
+        ;; height. See #325. Note this only has an effect if
+        ;; `which-key-allow-imprecise-window-fit' is non-nil.
+        (setf (which-key--pages-height result) which-key-min-display-lines))
+      (which-key--debug-message "Frame height: %s
+Frame pixel width: %s
+Frame char width: %s
+Frame width: %s
+Which-key initial width: %s
+Which-key adjusted width: %s
+Minibuffer height: %s
+Max dimensions: (%s, %s)
+Available for bindings: (%s, %s)
+Popup type info: (%s, %s, %s)
+Computed page widths: %s
+Actual lines: %s"
+                                (frame-height)
+                                (frame-pixel-width)
+                                (frame-char-width)
+                                (window-total-width (frame-root-window))
+                                (which-key--width-or-percentage-to-width
+                                  which-key-side-window-max-width)
+                                (which-key--total-width-to-text
+                                 (which-key--width-or-percentage-to-width
+                                  which-key-side-window-max-width))
+                                (window-text-height (minibuffer-window))
+                                max-lines
+                                max-width
+                                avl-lines
+                                avl-width
+                                which-key-popup-type
+                                which-key-side-window-location
+                                which-key-side-window-max-width
+                                (which-key--pages-widths result)
+                                (which-key--pages-height result))
+      result)))
+
+(defun which-key--lighter-status ()
+  "Possibly show number of keys and total in the mode line."
+  (when which-key-show-remaining-keys
+    (let ((n-shown (car (which-key--pages-keys/page which-key--pages-obj)))
+          (n-tot (which-key--pages-total-keys which-key--pages-obj)))
+      (setcar (cdr (assq 'which-key-mode minor-mode-alist))
+              (format " WK: %s/%s keys" n-shown n-tot)))))
+
+(defun which-key--lighter-restore ()
+  "Restore the lighter for which-key."
+  (when which-key-show-remaining-keys
+    (setcar (cdr (assq 'which-key-mode minor-mode-alist))
+            which-key-lighter)))
+
+(defun which-key--echo (text)
+  "Echo TEXT to minibuffer without logging."
+  (let (message-log-max)
+    (message "%s" text)))
+
+(defun which-key--next-page-hint (prefix-keys)
+  "Return string for next page hint."
+  (let* ((paging-key (concat prefix-keys " " which-key-paging-key))
+         (paging-key-bound (eq 'which-key-C-h-dispatch
+                               (key-binding (kbd paging-key))))
+         (key (key-description (vector help-char)))
+         (key (if paging-key-bound
+                  (concat key " or " which-key-paging-key)
+                key)))
+    (when (and which-key-use-C-h-commands
+               (not (equal (vector help-char)
+                           (vconcat (kbd prefix-keys)))))
+      (which-key--propertize (format "[%s paging/help]" key)
+                             'face 'which-key-note-face))))
+
+(defun which-key--full-prefix (prefix-keys &optional -prefix-arg dont-prop-keys)
+  "Return a description of the full key sequence up to now.
+Include prefix arguments."
+  (let* ((left (eq which-key-show-prefix 'left))
+         (prefix-arg (if -prefix-arg -prefix-arg prefix-arg))
+         (str (concat
+               (universal-argument--description)
+               (when prefix-arg " ")
+               prefix-keys))
+         (dash (if (and (not (string= prefix-keys ""))
+                        (null left)) "-" "")))
+    (if (or (eq which-key-show-prefix 'echo) dont-prop-keys)
+        (concat str dash)
+      (concat (which-key--propertize-key str)
+              (which-key--propertize dash 'face 'which-key-key-face)))))
+
+(defun which-key--get-popup-map ()
+  "Generate transient-map for use in the top level binding display."
+  (unless which-key--automatic-display
+    (let ((map (make-sparse-keymap)))
+      (define-key map (kbd which-key-paging-key) #'which-key-C-h-dispatch)
+      (when which-key-use-C-h-commands
+        ;; Show next page even when C-h is pressed
+        (define-key map (vector help-char) #'which-key-C-h-dispatch))
+      map)))
+
+(defun which-key--process-page (pages-obj)
+  "Add information to the basic list of key bindings.
+Include, if applicable, the current prefix, the name of the current
+prefix, and a page count."
+  (let* ((page (car (which-key--pages-pages pages-obj)))
+         (height (which-key--pages-height pages-obj))
+         (n-pages (which-key--pages-num-pages pages-obj))
+         (page-n (car (which-key--pages-page-nums pages-obj)))
+         (prefix-desc (key-description (which-key--pages-prefix pages-obj)))
+         (prefix-title (which-key--pages-prefix-title pages-obj))
+         (full-prefix (which-key--full-prefix prefix-desc))
+         (nxt-pg-hint (which-key--next-page-hint prefix-desc))
+         ;; not used in left case
+         (status-line
+          (concat (which-key--propertize prefix-title 'face 'which-key-note-face)
+                  (when (< 1 n-pages)
+                    (which-key--propertize (format " (%s of %s)" page-n n-pages)
+                                           'face 'which-key-note-face)))))
+    (pcase which-key-show-prefix
+      (`left
+       (let* ((page-cnt (which-key--propertize (format "%s/%s" page-n n-pages)
+                                               'face 'which-key-separator-face))
+              (first-col-width (+ 2 (max (which-key--string-width full-prefix)
+                                         (which-key--string-width page-cnt))))
+              (prefix (format (concat "%-" (int-to-string first-col-width) "s")
+                              full-prefix))
+              (page-cnt (if (> n-pages 1)
+                            (format
+                             (concat "%-" (int-to-string first-col-width) "s")
+                             page-cnt)
+                          (make-string first-col-width 32)))
+              lines first-line new-end)
+         (if (= 1 height)
+             (cons (concat prefix page) nil)
+           (setq lines (split-string page "\n")
+                 first-line (concat prefix (car lines) "\n" page-cnt)
+                 new-end (concat "\n" (make-string first-col-width 32)))
+           (cons
+            (concat first-line (mapconcat #'identity (cdr lines) new-end))
+            nil))))
+      (`top
+       (cons
+        (concat (when (or (= 0 echo-keystrokes)
+                          (not (eq which-key-side-window-location 'bottom)))
+                  (concat full-prefix " "))
+                status-line " " nxt-pg-hint "\n" page)
+        nil))
+      (`bottom
+       (cons
+        (concat page "\n"
+                (when (or (= 0 echo-keystrokes)
+                          (not (eq which-key-side-window-location 'bottom)))
+                  (concat full-prefix " "))
+                status-line " " nxt-pg-hint)
+        nil))
+      (`echo
+       (cons page
+             (lambda ()
+               (which-key--echo
+                (concat full-prefix (when prefix-desc " ")
+                        status-line (when status-line " ")
+                        nxt-pg-hint)))))
+      (`mode-line
+       (cons page
+             (lambda ()
+               (with-current-buffer which-key--buffer
+                 (setq-local mode-line-format
+                             (concat " " full-prefix
+                                     " " status-line
+                                     " " nxt-pg-hint))))))
+      (_ (cons page nil)))))
+
+(defun which-key--show-page (&optional n)
+  "Show current page.
+N changes the current page to the Nth page relative to the
+current one."
+  (which-key--init-buffer) ;; in case it was killed
+  (let ((prefix-keys (which-key--current-key-string))
+        golden-ratio-mode)
+    (if (null which-key--pages-obj)
+        (message "%s- which-key can't show keys: There is not \
+enough space based on your settings and frame size." prefix-keys)
+      (when n
+        (setq which-key--pages-obj
+              (which-key--pages-set-current-page which-key--pages-obj n)))
+      (let ((page-echo (which-key--process-page which-key--pages-obj))
+            (height (which-key--pages-height which-key--pages-obj))
+            (width (car (which-key--pages-widths which-key--pages-obj))))
+        (which-key--lighter-status)
+        (if (eq which-key-popup-type 'minibuffer)
+            (which-key--echo (car page-echo))
+          (with-current-buffer which-key--buffer
+            (erase-buffer)
+            (insert (car page-echo))
+            (goto-char (point-min)))
+          (when (cdr page-echo) (funcall (cdr page-echo)))
+          (which-key--show-popup (cons height width)))))
+    ;; used for paging at top-level
+    (if (fboundp 'set-transient-map)
+        (set-transient-map (which-key--get-popup-map))
+      (with-no-warnings
+        (set-temporary-overlay-map (which-key--get-popup-map))))))
+
+;;; Paging functions
+
+;;;###autoload
+(defun which-key-reload-key-sequence (&optional key-seq)
+  "Simulate entering the key sequence KEY-SEQ.
+KEY-SEQ should be a list of events as produced by
+`listify-key-sequence'.  If nil, KEY-SEQ defaults to
+`which-key--current-key-list'. Any prefix arguments that were
+used are reapplied to the new key sequence."
+  (let* ((key-seq (or key-seq (which-key--current-key-list)))
+         (next-event (mapcar (lambda (ev) (cons t ev)) key-seq)))
+    (setq prefix-arg current-prefix-arg
+          unread-command-events next-event)))
+
+(defun which-key-turn-page (delta)
+  "Show the next page of keys."
+  (which-key-reload-key-sequence)
+  (if which-key--last-try-2-loc
+      (let ((which-key-side-window-location which-key--last-try-2-loc)
+            (which-key--multiple-locations t))
+        (which-key--show-page delta))
+    (which-key--show-page delta))
+  (which-key--start-paging-timer))
+
+;;;###autoload
+(defun which-key-show-standard-help (&optional _)
+  "Call the command in `which-key--prefix-help-cmd-backup'.
+Usually this is `describe-prefix-bindings'."
+  (interactive)
+  (let ((which-key-inhibit t)
+        (popup-showing (which-key--popup-showing-p)))
+    (which-key--hide-popup-ignore-command)
+    (cond ((and (eq which-key--prefix-help-cmd-backup
+                    'describe-prefix-bindings)
+                ;; If the popup is not showing, we call
+                ;; `describe-prefix-bindings' directly.
+                popup-showing)
+           ;; This is essentially what `describe-prefix-bindings' does. We can't
+           ;; use this function directly, because the prefix will not be correct
+           ;; when we enter using `which-key-C-h-dispatch'.
+           (describe-bindings (kbd (which-key--current-key-string))))
+          ((functionp which-key--prefix-help-cmd-backup)
+           (funcall which-key--prefix-help-cmd-backup)))))
+
+;;;###autoload
+(defun which-key-show-next-page-no-cycle ()
+  "Show next page of keys or `which-key-show-standard-help'."
+  (interactive)
+  (let ((which-key-inhibit t))
+    (if (which-key--on-last-page)
+        (which-key-show-standard-help)
+      (which-key-turn-page 1))))
+
+;;;###autoload
+(defun which-key-show-previous-page-no-cycle ()
+  "Show previous page of keys if one exists."
+  (interactive)
+  (let ((which-key-inhibit t))
+    (unless (which-key--on-first-page)
+      (which-key-turn-page -1))))
+
+;;;###autoload
+(defun which-key-show-next-page-cycle (&optional _)
+  "Show the next page of keys, cycling from end to beginning."
+  (interactive)
+  (let ((which-key-inhibit t))
+    (which-key-turn-page 1)))
+
+;;;###autoload
+(defun which-key-show-previous-page-cycle (&optional _)
+  "Show the previous page of keys, cycling from beginning to end."
+  (interactive)
+  (let ((which-key-inhibit t))
+    (which-key-turn-page -1)))
+
+;;;###autoload
+(defun which-key-show-top-level (&optional _)
+  "Show top-level bindings."
+  (interactive)
+  (which-key--create-buffer-and-show nil nil nil "Top-level bindings"))
+
+;;;###autoload
+(defun which-key-show-major-mode (&optional all)
+  "Show top-level bindings in the map of the current major mode.
+This function will also detect evil bindings made using
+`evil-define-key' in this map. These bindings will depend on the
+current evil state. "
+  (interactive "P")
+  (let ((map-sym (intern (format "%s-map" major-mode))))
+    (if (and (boundp map-sym) (keymapp (symbol-value map-sym)))
+        (which-key--show-keymap
+         "Major-mode bindings"
+         (symbol-value map-sym)
+         (apply-partially #'which-key--map-binding-p (symbol-value map-sym))
+         all)
+      (message "which-key: No map named %s" map-sym))))
+
+;;;###autoload
+(defun which-key-show-full-major-mode ()
+  "Show all bindings in the map of the current major mode.
+This function will also detect evil bindings made using
+`evil-define-key' in this map. These bindings will depend on the
+current evil state. "
+  (interactive)
+  (which-key-show-major-mode t))
+
+;;;###autoload
+(defun which-key-dump-bindings (prefix buffer-name)
+  "Dump bindings from PREFIX into buffer named BUFFER-NAME.
+PREFIX should be a string suitable for `kbd'."
+  (interactive "sPrefix: \nB")
+  (let* ((buffer (get-buffer-create buffer-name))
+         (keys (which-key--get-bindings (kbd prefix))))
+    (with-current-buffer buffer
+      (point-max)
+      (save-excursion
+        (dolist (key keys)
+          (insert (apply #'format "%s%s%s\n" key)))))
+    (switch-to-buffer-other-window buffer)))
+
+;;;###autoload
+(defun which-key-undo-key (&optional _)
+  "Undo last keypress and force which-key update."
+  (interactive)
+  (let* ((key-lst (butlast (which-key--current-key-list)))
+         (which-key-inhibit t))
+    (cond (which-key--prior-show-keymap-args
+           (if (keymapp (cdr (car-safe which-key--prior-show-keymap-args)))
+               (let ((args (pop which-key--prior-show-keymap-args)))
+                 (which-key--show-keymap (car args) (cdr args)))
+             (which-key--hide-popup)))
+          (key-lst
+           (which-key-reload-key-sequence key-lst)
+           (which-key--create-buffer-and-show (apply #'vector key-lst)))
+          (t (setq which-key--automatic-display nil)
+             (which-key-show-top-level)))))
+(defalias 'which-key-undo #'which-key-undo-key)
+
+(defun which-key-abort (&optional _)
+  "Abort key sequence."
+  (interactive)
+  (let ((which-key-inhibit t))
+    (which-key--hide-popup-ignore-command)
+    (keyboard-quit)))
+
+(defun which-key-digit-argument (key)
+  "Version of `digit-argument' for use in `which-key-C-h-map'."
+  (interactive)
+  (let ((last-command-event (string-to-char key)))
+    (digit-argument key))
+  (let ((current-prefix-arg prefix-arg))
+    (which-key-reload-key-sequence)))
+
+(defun which-key-toggle-docstrings (&optional _)
+  "Toggle the display of docstrings."
+  (interactive)
+  (unless (eq which-key-show-docstrings 'docstring-only)
+    (setq which-key-show-docstrings (null which-key-show-docstrings)))
+  (which-key-reload-key-sequence)
+  (which-key--create-buffer-and-show (which-key--current-prefix)))
+
+;;;###autoload
+(defun which-key-C-h-dispatch ()
+  "Dispatch C-h commands by looking up key in `which-key-C-h-map'.
+This command is always accessible (from any prefix) if
+`which-key-use-C-h-commands' is non nil."
+  (interactive)
+  (cond ((and (not (which-key--popup-showing-p))
+              which-key-show-early-on-C-h)
+         (let ((current-prefix
+                (butlast
+                 (listify-key-sequence
+                  (funcall which-key-this-command-keys-function)))))
+           (which-key-reload-key-sequence current-prefix)
+           (if which-key-idle-secondary-delay
+               (which-key--start-timer which-key-idle-secondary-delay t)
+             (which-key--start-timer 0.05 t))))
+        ((not (which-key--popup-showing-p))
+         (which-key-show-standard-help))
+        (t
+         (if (not (which-key--popup-showing-p))
+             (which-key-show-standard-help)
+           (let* ((prefix-keys (which-key--current-key-string))
+                  (full-prefix (which-key--full-prefix prefix-keys current-prefix-arg t))
+                  (prompt (concat (when (string-equal prefix-keys "")
+                                    (which-key--propertize
+                                     (concat " "
+                                             (which-key--pages-prefix-title
+                                              which-key--pages-obj))
+                                     'face 'which-key-note-face))
+                                  full-prefix
+                                  (which-key--propertize
+                                   (substitute-command-keys
+                                    which-key-C-h-map-prompt)
+                                   'face 'which-key-note-face)))
+                  (key (let ((key (read-key prompt)))
+                         (if (numberp key)
+                             (string key)
+                           (vector key))))
+                  (cmd (lookup-key which-key-C-h-map key))
+                  (which-key-inhibit t))
+             (if cmd (funcall cmd key) (which-key-turn-page 0)))))))
+
+;;; Update
+
+(defun which-key--any-match-p (regexps string)
+  "Non-nil if any of REGEXPS match STRING."
+  (catch 'match
+    (dolist (regexp regexps)
+      (when (string-match-p regexp string)
+        (throw 'match t)))))
+
+(defun which-key--try-2-side-windows
+    (bindings prefix-keys prefix-title loc1 loc2 &rest _ignore)
+  "Try to show BINDINGS (PAGE-N) in LOC1 first.
+Only if no bindings fit fallback to LOC2."
+  (let (pages1)
+    (let ((which-key-side-window-location loc1)
+          (which-key--multiple-locations t))
+      (setq pages1 (which-key--create-pages
+                    bindings prefix-keys prefix-title)))
+    (if pages1
+        (progn
+          (setq which-key--pages-obj pages1)
+          (let ((which-key-side-window-location loc1)
+                (which-key--multiple-locations t))
+            (which-key--show-page))
+          loc1)
+      (let ((which-key-side-window-location loc2)
+            (which-key--multiple-locations t))
+        (setq which-key--pages-obj
+              (which-key--create-pages bindings prefix-keys prefix-title))
+        (which-key--show-page)
+        loc2))))
+
+(defun which-key--read-keymap ()
+  "Read keymap symbol from minibuffer."
+  (intern
+   (completing-read "Keymap: " obarray
+                    (lambda (m)
+                      (and (boundp m)
+                           (keymapp (symbol-value m))
+                           (not (equal (symbol-value m)
+                                       (make-sparse-keymap)))))
+                    t
+                    (let ((sym (symbol-at-point)))
+                      (and (boundp sym)
+                           (keymapp (symbol-value sym))
+                           (symbol-name sym)))
+                    'which-key-keymap-history)))
+
+;;;###autoload
+(defun which-key-show-keymap (keymap &optional no-paging)
+  "Show the top-level bindings in KEYMAP using which-key.
+KEYMAP is selected interactively from all available keymaps.
+
+If NO-PAGING is non-nil, which-key will not intercept subsequent
+keypresses for the paging functionality."
+  (interactive (list (which-key--read-keymap)))
+  (which-key--show-keymap (symbol-name keymap)
+                          (symbol-value keymap)
+                          nil nil no-paging))
+
+;;;###autoload
+(defun which-key-show-full-keymap (keymap)
+  "Show all bindings in KEYMAP using which-key.
+KEYMAP is selected interactively from all available keymaps."
+  (interactive (list (which-key--read-keymap)))
+  (which-key--show-keymap (symbol-name keymap)
+                          (symbol-value keymap)
+                          nil t))
+
+;;;###autoload
+(defun which-key-show-minor-mode-keymap (&optional all)
+  "Show the top-level bindings in KEYMAP using which-key.
+KEYMAP is selected interactively by mode in
+`minor-mode-map-alist'."
+  (interactive)
+  (let ((mode-sym
+         (intern
+          (completing-read
+           "Minor Mode: "
+           (mapcar #'car
+                   (cl-remove-if-not
+                    (lambda (entry)
+                      (and (symbol-value (car entry))
+                           (not (equal (cdr entry) (make-sparse-keymap)))))
+                    minor-mode-map-alist))
+           nil t nil 'which-key-keymap-history))))
+    (which-key--show-keymap (symbol-name mode-sym)
+                            (cdr (assq mode-sym minor-mode-map-alist))
+                            all)))
+;;;###autoload
+(defun which-key-show-full-minor-mode-keymap ()
+  "Show all bindings in KEYMAP using which-key.
+KEYMAP is selected interactively by mode in
+`minor-mode-map-alist'."
+  (interactive)
+  (which-key-show-minor-mode-keymap t))
+
+(defun which-key--show-keymap
+    (keymap-name keymap &optional prior-args all no-paging filter)
+  (when prior-args (push prior-args which-key--prior-show-keymap-args))
+  (let ((bindings (which-key--get-bindings nil keymap filter all)))
+    (if (null bindings)
+        (message "which-key: No bindings found in %s" keymap-name)
+      (cond ((listp which-key-side-window-location)
+             (setq which-key--last-try-2-loc
+                   (apply #'which-key--try-2-side-windows
+                          bindings nil keymap-name
+                          which-key-side-window-location)))
+            (t (setq which-key--pages-obj
+                     (which-key--create-pages bindings nil keymap-name))
+               (which-key--show-page)))
+      (unless no-paging
+        (let* ((key (read-key))
+               (key-desc (key-description (list key)))
+               (next-def (lookup-key keymap (vector key))))
+          (cond ((and which-key-use-C-h-commands
+                      (numberp key) (= key help-char))
+                 (which-key-C-h-dispatch))
+                ((keymapp next-def)
+                 (which-key--hide-popup-ignore-command)
+                 (which-key--show-keymap
+                  (concat keymap-name " " key-desc)
+                  next-def
+                  (cons keymap-name keymap)))
+                (t (which-key--hide-popup))))))))
+
+(defun which-key--evil-operator-filter (binding)
+  (let ((def (intern (cdr binding))))
+    (and (functionp def)
+         (not (evil-get-command-property def :suppress-operator)))))
+
+(defun which-key--show-evil-operator-keymap ()
+  (if which-key--inhibit-next-operator-popup
+      (setq which-key--inhibit-next-operator-popup nil)
+    (let ((keymap
+           (make-composed-keymap (list evil-operator-shortcut-map
+                                       evil-operator-state-map
+                                       evil-motion-state-map))))
+      (when (keymapp keymap)
+        (let ((formatted-keys
+               (which-key--get-bindings
+                nil keymap #'which-key--evil-operator-filter)))
+          (cond ((null formatted-keys)
+                 (message "which-key: Keymap empty"))
+                ((listp which-key-side-window-location)
+                 (setq which-key--last-try-2-loc
+                       (apply #'which-key--try-2-side-windows
+                              formatted-keys nil "evil operator/motion keys"
+                              which-key-side-window-location)))
+                (t (setq which-key--pages-obj
+                         (which-key--create-pages
+                          formatted-keys
+                          nil "evil operator/motion keys"))
+                   (which-key--show-page)))))
+      (let ((key (read-key)))
+        (when (memq key '(?f ?F ?t ?T ?`))
+          ;; these keys trigger commands that read the next char manually
+          (setq which-key--inhibit-next-operator-popup t))
+        (cond ((and which-key-use-C-h-commands (numberp key) (= key help-char))
+               (which-key-C-h-dispatch))
+              ((and (numberp key) (= key ?\C-\[))
+               (which-key--hide-popup)
+               (keyboard-quit))
+              (t
+               (which-key--hide-popup)
+               (setq unread-command-events (vector key))))))))
+
+(defun which-key--create-buffer-and-show
+    (&optional prefix-keys from-keymap filter prefix-title)
+  "Fill `which-key--buffer' with key descriptions and reformat.
+Finally, show the buffer."
+  (let ((start-time (current-time))
+        (formatted-keys (which-key--get-bindings
+                         prefix-keys from-keymap filter))
+        (prefix-desc (key-description prefix-keys)))
+    (cond ((null formatted-keys)
+           (message "%s-  which-key: There are no keys to show" prefix-desc))
+          ((listp which-key-side-window-location)
+           (setq which-key--last-try-2-loc
+                 (apply #'which-key--try-2-side-windows
+                        formatted-keys prefix-keys prefix-title
+                        which-key-side-window-location)))
+          (t (setq which-key--pages-obj
+                   (which-key--create-pages
+                    formatted-keys prefix-keys prefix-title))
+             (which-key--show-page)))
+    (which-key--debug-message
+     "On prefix \"%s\" which-key took %.0f ms." prefix-desc
+     (* 1000 (float-time (time-since start-time))))))
+
+(defun which-key--update ()
+  "Function run by timer to possibly trigger `which-key--create-buffer-and-show'."
+  (let ((prefix-keys (funcall which-key-this-command-keys-function))
+        delay-time)
+    (cond ((and (> (length prefix-keys) 0)
+                (or (keymapp (key-binding prefix-keys))
+                    ;; Some keymaps are stored here like iso-transl-ctl-x-8-map
+                    (keymapp (which-key--safe-lookup-key
+                              key-translation-map prefix-keys))
+                    ;; just in case someone uses one of these
+                    (keymapp (which-key--safe-lookup-key
+                              function-key-map prefix-keys)))
+                (not which-key-inhibit)
+                (or (null which-key-allow-regexps)
+                    (which-key--any-match-p
+                     which-key-allow-regexps (key-description prefix-keys)))
+                (or (null which-key-inhibit-regexps)
+                    (not
+                     (which-key--any-match-p
+                      which-key-inhibit-regexps (key-description prefix-keys))))
+                ;; Do not display the popup if a command is currently being
+                ;; executed
+                (or (run-hook-with-args-until-success
+                     'which-key-inhibit-display-hook)
+                    (null this-command))
+                (let ((max-dim (which-key--popup-max-dimensions)))
+                  (> (min (car-safe max-dim) (cdr-safe max-dim)) 0)))
+           (when (and (not (equal prefix-keys (which-key--current-prefix)))
+                      (or (null which-key-delay-functions)
+                          (null (setq delay-time
+                                      (run-hook-with-args-until-success
+                                       'which-key-delay-functions
+                                       (key-description prefix-keys)
+                                       (length prefix-keys))))
+                          (sit-for delay-time)))
+             (setq which-key--automatic-display t)
+             (which-key--create-buffer-and-show prefix-keys)
+             (when (and which-key-idle-secondary-delay
+                        (not which-key--secondary-timer-active))
+               (which-key--start-timer which-key-idle-secondary-delay t))))
+          ((and which-key-show-transient-maps
+                ;; Assuming that if this is not true we're in
+                ;; `which-key-show-top-level', which would then be overwritten.
+                (> (length prefix-keys) 0)
+                (keymapp overriding-terminal-local-map)
+                ;; basic test for it being a hydra
+                (not (eq (lookup-key overriding-terminal-local-map "\C-u")
+                         'hydra--universal-argument)))
+           (which-key--create-buffer-and-show
+            nil overriding-terminal-local-map))
+          ((and which-key-show-operator-state-maps
+                (bound-and-true-p evil-state)
+                (eq evil-state 'operator)
+                (not (which-key--popup-showing-p)))
+           (which-key--show-evil-operator-keymap))
+          (which-key--automatic-display
+           (which-key--hide-popup)))))
+
+;;; Timers
+
+(defun which-key--start-timer (&optional delay secondary)
+  "Activate idle timer to trigger `which-key--update'."
+  (which-key--stop-timer)
+  (setq which-key--secondary-timer-active secondary)
+  (setq which-key--timer
+        (run-with-idle-timer (or delay which-key-idle-delay)
+                             t #'which-key--update)))
+
+(defun which-key--stop-timer ()
+  "Deactivate idle timer for `which-key--update'."
+  (when which-key--timer (cancel-timer which-key--timer)))
+
+(defun which-key--start-paging-timer ()
+  "Activate timer to restart which-key after paging."
+  (when which-key--paging-timer (cancel-timer which-key--paging-timer))
+  (which-key--stop-timer)
+  (setq which-key--paging-timer
+        (run-with-idle-timer
+         0.2 t (lambda ()
+                 (when (or (not (member real-last-command
+                                        which-key--paging-functions))
+                           (and (< 0 (length (this-single-command-keys)))
+                                (not (equal (which-key--current-prefix)
+                                            (funcall which-key-this-command-keys-function)))))
+                   (cancel-timer which-key--paging-timer)
+                   (if which-key-idle-secondary-delay
+                       ;; we haven't executed a command yet so the secandary
+                       ;; timer is more relevant here
+                       (which-key--start-timer which-key-idle-secondary-delay t)
+                     (which-key--start-timer)))))))
+
+(provide 'which-key)
+;;; which-key.el ends here
diff --git a/emacs/elpa/which-key-20240501.1251/which-key.elc b/emacs/elpa/which-key-20240501.1251/which-key.elc
Binary files differ.