Merge branch 'master' into drone/notmuch

2025-07-05 16:37:39 -04:00 · 2023-05-22 20:19:59 +02:00 · 2023-05-22 20:19:59 +02:00 · 1558588f95
commit 1558588f95
parent ef800cf1a8 53b5fdc23c
23 changed files with 55 additions and 44 deletions
--- a/.borgconfig
+++ b/.borgconfig
@ -0,0 +1,14 @@
+[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 "notmuch"]
+	load-path = emacs
+	build-step = ./configure
+	build-step = make
+	build-step = borg-update-autoloads
+[submodule "sqlite3"]
+	build-step = make
--- a/.dir-locals.el
+++ b/.dir-locals.el
@ -0,0 +1,4 @@
+(
+ (auto-mode-alist
+  ("\\.\\(borgconfig\\|gitremotes\\)\\'" . gitconfig-mode))
+ )
--- 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"]
@ -31,22 +28,16 @@
 [submodule "git-modes"]
 	path = lib/git-modes
 	url = git@github.com:magit/git-modes.git
+[submodule "llama"]
+	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 "notmuch"]
-	load-path = emacs
-	build-step = ./configure
-	build-step = make
-	build-step = borg-update-autoloads
 	path = lib/notmuch
 	url = https://git.notmuchmail.org/git/notmuch
-[submodule "packed"]
-	path = lib/packed
-	url = git@github.com:emacscollective/packed.git
 [submodule "sqlite3"]
-	build-step = make
 	path = lib/sqlite3
 	url = git@github.com:pekingduck/emacs-sqlite3-api.git
 [submodule "transient"]
--- a/.gitremotes
+++ b/.gitremotes
@ -0,0 +1,2 @@
+[borg]
+	pushDefault = locutus
--- a/19
+++ b/19
@ -10,9 +10,10 @@ help helpall::
 	@printf "\n"

 bootstrap-borg:
-	@git submodule--helper clone --name borg --path lib/borg \
-	--url git@github.com:emacscollective/borg.git
-	@cd lib/borg; git symbolic-ref HEAD refs/heads/master
+	@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/main
 	@cd lib/borg; git reset --hard HEAD

 else
@ -26,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
--- 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)
--- a/lib/auto-compile
+++ b/lib/auto-compile
@ -1 +1 @@
-Subproject commit 9caa1aeaa9c37faae87fc2e6b86e6be0dc1ab084
+Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404
--- a/lib/borg
+++ b/lib/borg
@ -1 +1 @@
-Subproject commit 032ddf33799dd0a2c89d1a3e9e04dc3cdc13320c
+Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3
--- a/lib/closql
+++ b/lib/closql
@ -1 +1 @@
-Subproject commit 820e95170acb79de0fb554577a0dc9b707e23aea
+Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905
--- a/lib/compat
+++ b/lib/compat
@ -1 +1 @@
-Subproject commit e827a9f3e2ba585de8b07cd246534a15ec414a8b
+Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb
--- a/lib/dash
+++ b/lib/dash
@ -1 +1 @@
-Subproject commit 3df46d7d9fe74f52a661565888e4d31fd760f0df
+Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a
--- a/lib/diff-hl
+++ b/lib/diff-hl
@ -1 +1 @@
-Subproject commit 68fb280b300c5d8460cc7b9183e29fb3ec604136
+Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107
--- a/lib/emacsql
+++ b/lib/emacsql
@ -1 +1 @@
-Subproject commit e318a6c8f65371e2ab667d811205a0d9a98dacbb
+Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42
--- a/lib/epkg
+++ b/lib/epkg
@ -1 +1 @@
-Subproject commit dbb2d6556b8d100633b8a8b71914df476279dc13
+Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09
--- a/lib/git-modes
+++ b/lib/git-modes
@ -1 +1 @@
-Subproject commit 4f9ad30f01cfb3f8460b786153f8569578c0f8dc
+Subproject commit 44d536ba637235c9dd203410281397417a3e60b6
--- a/lib/llama
+++ b/lib/llama
@ -0,0 +1 @@
+Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99
--- a/lib/magit
+++ b/lib/magit
@ -1 +1 @@
-Subproject commit 2a5815fee1ed091751b8bbfa242f7a78d7e5e039
+Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350
--- a/lib/packed
+++ b/lib/packed
@ -1 +0,0 @@
-Subproject commit c079fc64f46e514ab685c01fef22f13a33f90d0f
--- a/lib/sqlite3
+++ b/lib/sqlite3
@ -1 +1 @@
-Subproject commit 2f6095201b1d943d92cc017e100eec571a8d2aab
+Subproject commit ad6dc366b7cc7587965a7eeb7c1fb8b83679f81e
--- a/lib/transient
+++ b/lib/transient
@ -1 +1 @@
-Subproject commit ad953cc3c5b8a066d3da11a8527c035744f1385f
+Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba
--- a/lib/treepy
+++ b/lib/treepy
@ -1 +1 @@
-Subproject commit de1a2ddc3fd7152d0bfbd9e14312ff8a4864ab2b
+Subproject commit 7c4a0d21322506a4d4b2301b4274ec955b429b47
--- a/lib/use-package
+++ b/lib/use-package
@ -1 +1 @@
-Subproject commit 0be480ea77655304a4e6aa9d38d9d9a251b2bd32
+Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c
--- a/lib/with-editor
+++ b/lib/with-editor
@ -1 +1 @@
-Subproject commit 4ca225bf1c54d6dab2ba7e734f594419c7769e36
+Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7
				`@ -0,0 +1 @@`
				`Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99`
				`@ -1 +0,0 @@`
				`Subproject commit c079fc64f46e514ab685c01fef22f13a33f90d0f`