From 9de2176ff2881f32424595280878cdcb186b2617 Mon Sep 17 00:00:00 2001 From: dalu Date: Sat, 17 Dec 2022 12:34:39 +0800 Subject: [PATCH 1/6] Emacsg: make: Use relative path to user-emacs-directory --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d280b49..f8a3cbe 100644 --- a/Makefile +++ b/Makefile @@ -27,16 +27,16 @@ helpall:: codespell-dry: @cd lib; codespell \ - --ignore-words ~/.emacs.d/etc/codespell/ignore-words \ - --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \ + --ignore-words ../etc/codespell/ignore-words \ + --exclude-file ../etc/codespell/ignore-lines \ --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \ - ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",") + etc/codespell/ignore-files | tr "\\n" ",") codespell-fix: @cd lib; codespell --write-changes \ - --ignore-words ~/.emacs.d/etc/codespell/ignore-words \ - --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \ + --ignore-words ../etc/codespell/ignore-words \ + --exclude-file ../etc/codespell/ignore-lines \ --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \ - ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",") + etc/codespell/ignore-files | tr "\\n" ",") endif From 15a3966c61c618f674812c1ebbab3095eac97591 Mon Sep 17 00:00:00 2001 From: Matt Beshara Date: Sun, 22 Jan 2023 18:37:10 +1100 Subject: [PATCH 2/6] Emacsg: make: Update name of Borg's default branch --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8a3cbe..ac8caa4 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ bootstrap-borg: @mkdir .git/modules @git clone https://github.com/emacscollective/borg lib/borg \ --separate-git-dir .git/modules/borg - @cd lib/borg; git symbolic-ref HEAD refs/heads/master + @cd lib/borg; git symbolic-ref HEAD refs/heads/main @cd lib/borg; git reset --hard HEAD else From 9c1c19c63ca4a71ada2887fda1d97f3a3a47b56b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 22 Jan 2023 19:02:41 +0100 Subject: [PATCH 3/6] Update 12 drones Update auto-compile to 1.7.2-14-g4cbd304 Update borg to v3.3.1-107-g79850a9 Update closql to v1.2.1-19-g1aba696 Update compat to 29.1.3.0-3-g0f4e986 Update diff-hl to 1.8.8-90-g8f2e4eb Update emacsql to 3.1.1-8-ge1baaf2 Update epkg to v3.3.3-60-g6d9967a Update git-modes to 1.4.0-12-g1533b38 Update llama to v0.2.0-11-g0ab76e3 Update magit to v3.3.0-501-gcd6fbe2887 Update transient to v0.3.7-189-gd800ce0 Update with-editor to v3.2.0-36-g391e76a256 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/compat | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/git-modes | 2 +- lib/llama | 2 +- lib/magit | 2 +- lib/transient | 2 +- lib/with-editor | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index a80a874..4cbd304 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit a80a8742bc322c67c32f32f9e7833817d1a126d2 +Subproject commit 4cbd304698a897baf438400c9a2b31d3dfb3a7f9 diff --git a/lib/borg b/lib/borg index fdce5ec..79850a9 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit fdce5ecc122afb7f4a4b56d11778d2d2e0de78a7 +Subproject commit 79850a9007fe156bac36bc2e5e05bc7be8276135 diff --git a/lib/closql b/lib/closql index 820e951..1aba696 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 820e95170acb79de0fb554577a0dc9b707e23aea +Subproject commit 1aba69658061ae67d5e39e846aaa02ed2749940f diff --git a/lib/compat b/lib/compat index 1573aa2..0f4e986 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit 1573aa2e6d478c30cc7f394b72cbaa4db77ef811 +Subproject commit 0f4e98628c4a4df608550f1152a60f19a762a838 diff --git a/lib/diff-hl b/lib/diff-hl index 68fb280..8f2e4eb 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 68fb280b300c5d8460cc7b9183e29fb3ec604136 +Subproject commit 8f2e4eb345f0639c8fc41e3f7576f77ba6987655 diff --git a/lib/emacsql b/lib/emacsql index 6b2e65b..e1baaf2 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 6b2e65bdf785364cf7c34c31fea5812e1e58c657 +Subproject commit e1baaf2f874df7f9259a8ecca978e03d3ddae5b5 diff --git a/lib/epkg b/lib/epkg index cfdc4fc..6d9967a 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit cfdc4fc3c63b663fd4c1643bd3b174cb4d79287c +Subproject commit 6d9967aecbde15c471474d96ac0c164e69a5e395 diff --git a/lib/git-modes b/lib/git-modes index be96ef1..1533b38 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit be96ef14fab6a2d76cca3ebf9a15b462a695923d +Subproject commit 1533b38a27959af29d28ff94291f5992e60517a2 diff --git a/lib/llama b/lib/llama index e919c6e..0ab76e3 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit e919c6e55c091c360d708295f9f832f896d3a457 +Subproject commit 0ab76e3d7b84f3dbf4c7914b05dbffa29de76dd5 diff --git a/lib/magit b/lib/magit index 99d9b30..cd6fbe2 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 99d9b3008adf72a0c2cdb7df70b5ae03ea9271c8 +Subproject commit cd6fbe28873c1ec973bfe51af0f3ade5d69e9ba6 diff --git a/lib/transient b/lib/transient index c6cf2f2..d800ce0 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit c6cf2f2705ab56cd89d807e723ce45b9fcdfb9e1 +Subproject commit d800ce01e62c896f4aef8ad14a03f49f781c5b38 diff --git a/lib/with-editor b/lib/with-editor index 4da1097..391e76a 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 4da109748da0828b79198701eb641d5b724153ce +Subproject commit 391e76a256aeec6b9e4cbd733088f30c677d965b From 1fdbd1aa7ee205d3402d901e2969b776819ec586 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 4 Mar 2023 13:25:39 +0100 Subject: [PATCH 4/6] dash: Remove duplicated use-package form --- init.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/init.el b/init.el index 6735099..c9b79a6 100644 --- a/init.el +++ b/init.el @@ -33,7 +33,9 @@ (require 'use-package) (setq use-package-verbose t)) -(use-package dash) +(use-package dash + :config (global-dash-fontify-mode)) + (use-package eieio) (use-package auto-compile @@ -70,9 +72,6 @@ ;;; Long tail -(use-package dash - :config (global-dash-fontify-mode)) - (use-package diff-hl :config (setq diff-hl-draw-borders nil) From 4c799656f5b5c9fe22dda0380b32ce1bf40f0999 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 22 May 2023 19:37:18 +0200 Subject: [PATCH 5/6] Update 14 drones Update auto-compile to 1.8.0 Update borg to v3.3.1-111-gf9b3413 Update closql to v1.2.1-26-g85ac7b8 Update compat to 29.1.4.1-19-ge3b9f66 Update dash to 2.19.1-32-g96eaba0 Update diff-hl to 1.9.2-5-gac746a6 Update emacsql to 3.1.1-42-g6401226 Update epkg to v3.3.3-74-ga72903c Update git-modes to 1.4.1 Update llama to v0.2.0-12-gf4a59f2 Update magit to v3.3.0-644-g5389cbcfff Update transient to v0.4.0-1-g6efa9fad Update use-package to 2.4.4-14-ga6e8564 Update with-editor to v3.3.0 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/compat | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/git-modes | 2 +- lib/llama | 2 +- lib/magit | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 4cbd304..36646df 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 4cbd304698a897baf438400c9a2b31d3dfb3a7f9 +Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404 diff --git a/lib/borg b/lib/borg index 79850a9..f9b3413 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 79850a9007fe156bac36bc2e5e05bc7be8276135 +Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3 diff --git a/lib/closql b/lib/closql index 1aba696..85ac7b8 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 1aba69658061ae67d5e39e846aaa02ed2749940f +Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905 diff --git a/lib/compat b/lib/compat index 0f4e986..e3b9f66 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit 0f4e98628c4a4df608550f1152a60f19a762a838 +Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb diff --git a/lib/dash b/lib/dash index 3df46d7..96eaba0 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 3df46d7d9fe74f52a661565888e4d31fd760f0df +Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a diff --git a/lib/diff-hl b/lib/diff-hl index 8f2e4eb..ac746a6 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 8f2e4eb345f0639c8fc41e3f7576f77ba6987655 +Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107 diff --git a/lib/emacsql b/lib/emacsql index e1baaf2..6401226 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit e1baaf2f874df7f9259a8ecca978e03d3ddae5b5 +Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42 diff --git a/lib/epkg b/lib/epkg index 6d9967a..a72903c 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 6d9967aecbde15c471474d96ac0c164e69a5e395 +Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09 diff --git a/lib/git-modes b/lib/git-modes index 1533b38..44d536b 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 1533b38a27959af29d28ff94291f5992e60517a2 +Subproject commit 44d536ba637235c9dd203410281397417a3e60b6 diff --git a/lib/llama b/lib/llama index 0ab76e3..f4a59f2 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit 0ab76e3d7b84f3dbf4c7914b05dbffa29de76dd5 +Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99 diff --git a/lib/magit b/lib/magit index cd6fbe2..5389cbc 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit cd6fbe28873c1ec973bfe51af0f3ade5d69e9ba6 +Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350 diff --git a/lib/transient b/lib/transient index d800ce0..6efa9fa 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit d800ce01e62c896f4aef8ad14a03f49f781c5b38 +Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba diff --git a/lib/use-package b/lib/use-package index bcf0984..a6e8564 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit bcf0984cf55b70fe6896c6a15f61df92b24f8ffd +Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c diff --git a/lib/with-editor b/lib/with-editor index 391e76a..bce8d1b 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 391e76a256aeec6b9e4cbd733088f30c677d965b +Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7 From 53b5fdc23c4a66506ad9b5416ea99597d261d114 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 22 May 2023 20:00:45 +0200 Subject: [PATCH 6/6] Emacsg: Move build and remote settings out of .gitmodules --- .borgconfig | 9 +++++++++ .dir-locals.el | 4 ++++ .gitmodules | 11 +++-------- .gitremotes | 2 ++ 4 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 .borgconfig create mode 100644 .dir-locals.el create mode 100644 .gitremotes diff --git a/.borgconfig b/.borgconfig new file mode 100644 index 0000000..d6cea4d --- /dev/null +++ b/.borgconfig @@ -0,0 +1,9 @@ +[submodule "dash"] + no-byte-compile = dash-functional.el + no-makeinfo = dash-template.texi +[submodule "emacsql"] + no-byte-compile = emacsql-pg.el +[submodule "magit"] + no-byte-compile = lisp/magit-libgit.el +[submodule "sqlite3"] + build-step = make diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100644 index 0000000..e6063c4 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,4 @@ +( + (auto-mode-alist + ("\\.\\(borgconfig\\|gitremotes\\)\\'" . gitconfig-mode)) + ) diff --git a/.gitmodules b/.gitmodules index 50386c5..94f9daf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[borg] - pushDefault = locutus - collective = emacsg +[include] + path = .gitremotes + path = .borgconfig [submodule "auto-compile"] path = lib/auto-compile url = git@github.com:emacscollective/auto-compile.git @@ -14,15 +14,12 @@ path = lib/compat url = https://git.sr.ht/~pkal/compat [submodule "dash"] - no-byte-compile = dash-functional.el - no-makeinfo = dash-template.texi path = lib/dash url = git@github.com:magnars/dash.el.git [submodule "diff-hl"] path = lib/diff-hl url = git@github.com:dgutov/diff-hl.git [submodule "emacsql"] - no-byte-compile = emacsql-pg.el path = lib/emacsql url = git@github.com:magit/emacsql.git [submodule "epkg"] @@ -35,11 +32,9 @@ path = lib/llama url = https://git.sr.ht/~tarsius/llama [submodule "magit"] - no-byte-compile = lisp/magit-libgit.el path = lib/magit url = git@github.com:magit/magit.git [submodule "sqlite3"] - build-step = make path = lib/sqlite3 url = git@github.com:pekingduck/emacs-sqlite3-api.git [submodule "transient"] diff --git a/.gitremotes b/.gitremotes new file mode 100644 index 0000000..ee62b6f --- /dev/null +++ b/.gitremotes @@ -0,0 +1,2 @@ +[borg] + pushDefault = locutus