Update packages, removed some

diff --git a/.gitmodules b/.gitmodules
index 95e4db315120fcd11a98a57f404d453a3592f30b..fcbd02072584565613808dcca1fee70fc66d7dfd 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -82,7 +82,7 @@
 [submodule "magit"]
        path = packages/magit
        url = https://github.com/magit/magit.git
-[submodule "emacs-async"]
+[submodule "async"]
        path = packages/async
        url = https://github.com/jwiegley/emacs-async.git
 [submodule "with-editor"]
@@ -91,7 +91,7 @@
 [submodule "elisp-slime-nav"]
        path = packages/elisp-slime-nav
        url = https://github.com/purcell/elisp-slime-nav.git
-[submodule "packages/ssh-file-modes"]
+[submodule "ssh-file-modes"]
        path = packages/ssh-file-modes
        url = https://github.com/petere/emacs-ssh-file-modes.git
 [submodule "jump-char"]
@@ -118,9 +118,6 @@
 [submodule "magit-popup"]
        path = packages/magit-popup
        url = https://github.com/magit/magit-popup.git
-[submodule "ghub"]
-       path = packages/ghub
-       url = https://github.com/magit/ghub.git
 [submodule "highlight-indent-guides"]
        path = packages/highlight-indent-guides
        url = https://github.com/DarthFennec/highlight-indent-guides.git

diff --git a/lisp/my-vc.el b/lisp/my-vc.el
index f05f2a374662e56b53e6dd91546da96b50c771d1..a523d1579bbf14e6928163ee30cfb2695c3be3c2 100644 (file)
--- a/lisp/my-vc.el
+++ b/lisp/my-vc.el
@@ -24,9 +24,6 @@
 (require 'magit)
 
 (setq magit-completing-read-function 'ivy-completing-read)
-(setq magit-display-file-buffer-function #'pop-to-buffer)
-(setcdr magit-file-mode-map nil)
-(global-magit-file-mode)
 (setq git-commit-finish-query-functions
       (delete #'git-commit-check-style-conventions git-commit-finish-query-functions))
 

diff --git a/packages/README.md b/packages/README.md
index 5111b9d46d74dcec7b050cdc1b78e03c1043b345..c096c5c10ab7deefae6d0df16fae0be4a38e3b5b 100644 (file)
--- a/packages/README.md
+++ b/packages/README.md
@@ -9,8 +9,8 @@ git submodule add --name name https://example.com/foo.git .emacs.d/packages/name
 git mv
 
 # Removing
+git submodule deinit
 git rm
-edit .git/config
 rm -rf .git/modules/<name>
 
 # Updating

diff --git a/packages/async b/packages/async
index 14f48de586b0977e3470f053b810d77b07ea427a..d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da 160000 (submodule)
--- a/packages/async
+++ b/packages/async
@@ -1 +1 @@
-Subproject commit 14f48de586b0977e3470f053b810d77b07ea427a
+Subproject commit d7e7f79ee42311a0187aa2ab4f4e2f8843fa28da

diff --git a/packages/change-inner b/packages/change-inner
index 52c543a4b9808c0d15b565fcdf646c9779de33e8..42cad58aed2caec260f8e8ff61f78a7d3db72d1b 160000 (submodule)
--- a/packages/change-inner
+++ b/packages/change-inner
@@ -1 +1 @@
-Subproject commit 52c543a4b9808c0d15b565fcdf646c9779de33e8
+Subproject commit 42cad58aed2caec260f8e8ff61f78a7d3db72d1b

diff --git a/packages/check.sh b/packages/check.sh
new file mode 100755 (executable)
index 0000000..8f0b17f
--- /dev/null
+++ b/packages/check.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+cd "$(dirname "$0")"
+
+grep submodule ../.git/config |cut -d'"' -f2|while read -r x; do ls "$x" &> /dev/null || echo ".git/config remove $x"; done
+
+find ../.git/modules/ -type d -name objects -printf '%h\n'|while read -r x; do x="$(basename "$x")"; ls "$x" &> /dev/null || echo "rm -rf .git/modules/$x"; done

diff --git a/packages/dash b/packages/dash
index b92ab5a39b987e4fe69317b9d9fda452300baf20..334a0b31cab6b42e4465ffdfc6f07c00cd227562 160000 (submodule)
--- a/packages/dash
+++ b/packages/dash
@@ -1 +1 @@
-Subproject commit b92ab5a39b987e4fe69317b9d9fda452300baf20
+Subproject commit 334a0b31cab6b42e4465ffdfc6f07c00cd227562

diff --git a/packages/dockerfile-mode b/packages/dockerfile-mode
index d31f7685ebc5832d957e25070a930aa42984327d..07dde72b0e356d772fb65b969bd6decfa166e4d7 160000 (submodule)
--- a/packages/dockerfile-mode
+++ b/packages/dockerfile-mode
@@ -1 +1 @@
-Subproject commit d31f7685ebc5832d957e25070a930aa42984327d
+Subproject commit 07dde72b0e356d772fb65b969bd6decfa166e4d7

diff --git a/packages/editorconfig b/packages/editorconfig
index 9bc1343ce8bd2cc84bf04b58a053b7ec700244c0..048c553999c90db0b6066b3ec647a79f4af9985d 160000 (submodule)
--- a/packages/editorconfig
+++ b/packages/editorconfig
@@ -1 +1 @@
-Subproject commit 9bc1343ce8bd2cc84bf04b58a053b7ec700244c0
+Subproject commit 048c553999c90db0b6066b3ec647a79f4af9985d

diff --git a/packages/expand-region b/packages/expand-region
index ea6b4cbb9985ddae532bd2faf9bb00570c9f2781..4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0 160000 (submodule)
--- a/packages/expand-region
+++ b/packages/expand-region
@@ -1 +1 @@
-Subproject commit ea6b4cbb9985ddae532bd2faf9bb00570c9f2781
+Subproject commit 4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0

diff --git a/packages/flycheck b/packages/flycheck
index 806f2a8c21231a0dddd0a48d27fa4021729ee365..01396a5eff9fa494285e0d3139838231c05e3948 160000 (submodule)
--- a/packages/flycheck
+++ b/packages/flycheck
@@ -1 +1 @@
-Subproject commit 806f2a8c21231a0dddd0a48d27fa4021729ee365
+Subproject commit 01396a5eff9fa494285e0d3139838231c05e3948

diff --git a/packages/ghub b/packages/ghub
deleted file mode 160000 (submodule)
index ca6b115..0000000
--- a/packages/ghub
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca6b115c46d8ab12ae76037d4dadfc92a62a9904

diff --git a/packages/git-gutter b/packages/git-gutter
index 2c3242116a42dbbe30fc0844d1ec3c41074cdaba..cca61a1c6b0c0fd6ecb1b0366711c618581eabb6 160000 (submodule)
--- a/packages/git-gutter
+++ b/packages/git-gutter
@@ -1 +1 @@
-Subproject commit 2c3242116a42dbbe30fc0844d1ec3c41074cdaba
+Subproject commit cca61a1c6b0c0fd6ecb1b0366711c618581eabb6

diff --git a/packages/git-modes b/packages/git-modes
index 55468314a5f6b77d2c96be62c7005ac94545e217..14adca24eb6b0b4e311ad144c5d41972c6b044b2 160000 (submodule)
--- a/packages/git-modes
+++ b/packages/git-modes
@@ -1 +1 @@
-Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217
+Subproject commit 14adca24eb6b0b4e311ad144c5d41972c6b044b2

diff --git a/packages/haskell-mode b/packages/haskell-mode
index e688ed4e265aeea61f38835359e55f7df1ffdd65..20f72ccc17c8233dbb7c94ebf52a2a59e7d97730 160000 (submodule)
--- a/packages/haskell-mode
+++ b/packages/haskell-mode
@@ -1 +1 @@
-Subproject commit e688ed4e265aeea61f38835359e55f7df1ffdd65
+Subproject commit 20f72ccc17c8233dbb7c94ebf52a2a59e7d97730

diff --git a/packages/js2-mode b/packages/js2-mode
index 40aab27581279d0fdbfeb9afeb85f39d401a927f..29979e5f3301796ba606759e39ee0b1b6a2a24f3 160000 (submodule)
--- a/packages/js2-mode
+++ b/packages/js2-mode
@@ -1 +1 @@
-Subproject commit 40aab27581279d0fdbfeb9afeb85f39d401a927f
+Subproject commit 29979e5f3301796ba606759e39ee0b1b6a2a24f3

diff --git a/packages/js2-refactor b/packages/js2-refactor
index d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28..a0977c4ce1918cc266db9d6cd7a2ab63f3a76b9a 160000 (submodule)
--- a/packages/js2-refactor
+++ b/packages/js2-refactor
@@ -1 +1 @@
-Subproject commit d4c40b5fc86d3edd7c6a7d83ac86483ee1cb7a28
+Subproject commit a0977c4ce1918cc266db9d6cd7a2ab63f3a76b9a

diff --git a/packages/json-snatcher b/packages/json-snatcher
index c4cecc0a5051bd364373aa499c47a1bb7a5ac51c..b28d1c0670636da6db508d03872d96ffddbc10f2 160000 (submodule)
--- a/packages/json-snatcher
+++ b/packages/json-snatcher
@@ -1 +1 @@
-Subproject commit c4cecc0a5051bd364373aa499c47a1bb7a5ac51c
+Subproject commit b28d1c0670636da6db508d03872d96ffddbc10f2

diff --git a/packages/ledger-mode b/packages/ledger-mode
index 805507fd6c14839be4efc7aee2017f9c03e36834..3495d1224ee73aa96c1d5bd131dc3a7f23d46336 160000 (submodule)
--- a/packages/ledger-mode
+++ b/packages/ledger-mode
@@ -1 +1 @@
-Subproject commit 805507fd6c14839be4efc7aee2017f9c03e36834
+Subproject commit 3495d1224ee73aa96c1d5bd131dc3a7f23d46336

diff --git a/packages/magit b/packages/magit
index d58d520e586b70172601ee2814a5e053ca74d1d9..d14c082354c796dd363550a03463e9382b7cfbf6 160000 (submodule)
--- a/packages/magit
+++ b/packages/magit
@@ -1 +1 @@
-Subproject commit d58d520e586b70172601ee2814a5e053ca74d1d9
+Subproject commit d14c082354c796dd363550a03463e9382b7cfbf6

diff --git a/packages/magit-transient b/packages/magit-transient
index f5d81ef0ed24be935f3c0192b746a1738d903d37..1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba 160000 (submodule)
--- a/packages/magit-transient
+++ b/packages/magit-transient
@@ -1 +1 @@
-Subproject commit f5d81ef0ed24be935f3c0192b746a1738d903d37
+Subproject commit 1e090b0cd4ea58c9fb5e807e4ebd7bdb9a7b66ba

diff --git a/packages/markdown-mode b/packages/markdown-mode
index 8c6775a000bf40d7c7b35a529011a99231a4a4f7..051734091aba17a54af96b81beebdbfc84c26459 160000 (submodule)
--- a/packages/markdown-mode
+++ b/packages/markdown-mode
@@ -1 +1 @@
-Subproject commit 8c6775a000bf40d7c7b35a529011a99231a4a4f7
+Subproject commit 051734091aba17a54af96b81beebdbfc84c26459

diff --git a/packages/multiple-cursors b/packages/multiple-cursors
index b880554d04b8f61165afba7d4de19ac9e39bb7ab..a9d7764f80b241978f3d4e76bc981ef10bab5d70 160000 (submodule)
--- a/packages/multiple-cursors
+++ b/packages/multiple-cursors
@@ -1 +1 @@
-Subproject commit b880554d04b8f61165afba7d4de19ac9e39bb7ab
+Subproject commit a9d7764f80b241978f3d4e76bc981ef10bab5d70

diff --git a/packages/pkgbuild-mode b/packages/pkgbuild-mode
index 887c01cb06420501c7780fb01a8a76bdb0864cca..8a5e95c8514315cb40c47f1acdb68a4ace921497 160000 (submodule)
--- a/packages/pkgbuild-mode
+++ b/packages/pkgbuild-mode
@@ -1 +1 @@
-Subproject commit 887c01cb06420501c7780fb01a8a76bdb0864cca
+Subproject commit 8a5e95c8514315cb40c47f1acdb68a4ace921497

diff --git a/packages/scala-mode b/packages/scala-mode
index 1d08e885b1489313666c7f15a3962432a4f757ee..402d6df56457e9c512c3d77c7bcb0d04c77715f1 160000 (submodule)
--- a/packages/scala-mode
+++ b/packages/scala-mode
@@ -1 +1 @@
-Subproject commit 1d08e885b1489313666c7f15a3962432a4f757ee
+Subproject commit 402d6df56457e9c512c3d77c7bcb0d04c77715f1

diff --git a/packages/shackle b/packages/shackle
index 171c3f437d853f34782b201d86ef765665b755e2..1c88d2a2fdd2efb3e990da69d6fedeaee5ff71a2 160000 (submodule)
--- a/packages/shackle
+++ b/packages/shackle
@@ -1 +1 @@
-Subproject commit 171c3f437d853f34782b201d86ef765665b755e2
+Subproject commit 1c88d2a2fdd2efb3e990da69d6fedeaee5ff71a2

diff --git a/packages/slime b/packages/slime
index fb12bac676ab51b75be19197e21ab4674479d627..68c58c0194ff03cd147fcec99f0ee90ba9178875 160000 (submodule)
--- a/packages/slime
+++ b/packages/slime
@@ -1 +1 @@
-Subproject commit fb12bac676ab51b75be19197e21ab4674479d627
+Subproject commit 68c58c0194ff03cd147fcec99f0ee90ba9178875

diff --git a/packages/swiper b/packages/swiper
index 7e4c56776f811f78b8eb95210156f8fbbdba67e7..e005666df39ca767e6d5ab71b1a55d8c08395259 160000 (submodule)
--- a/packages/swiper
+++ b/packages/swiper
@@ -1 +1 @@
-Subproject commit 7e4c56776f811f78b8eb95210156f8fbbdba67e7
+Subproject commit e005666df39ca767e6d5ab71b1a55d8c08395259

diff --git a/packages/with-editor b/packages/with-editor
index efafd482c21b90decbb0b682ed3159c86014d4f3..2848a90addae086b657605b84a7fbecf2c4c1c65 160000 (submodule)
--- a/packages/with-editor
+++ b/packages/with-editor
@@ -1 +1 @@
-Subproject commit efafd482c21b90decbb0b682ed3159c86014d4f3
+Subproject commit 2848a90addae086b657605b84a7fbecf2c4c1c65

diff --git a/packages/yaml-mode b/packages/yaml-mode
index 68fecb5f0dec712a10c8655df6881392a4613617..fc5e1c58f94472944c4aa838f00f6adcac6fa992 160000 (submodule)
--- a/packages/yaml-mode
+++ b/packages/yaml-mode
@@ -1 +1 @@
-Subproject commit 68fecb5f0dec712a10c8655df6881392a4613617
+Subproject commit fc5e1c58f94472944c4aa838f00f6adcac6fa992