From 02df15b7c4f0536985db61437601fbadbf5e7eee Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:54:10 +0200 Subject: [PATCH 1/8] Assimilate compat --- .gitmodules | 3 +++ early-init.el | 1 + lib/compat | 1 + 3 files changed, 5 insertions(+) create mode 160000 lib/compat diff --git a/.gitmodules b/.gitmodules index d0d5a15..a300699 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,9 @@ [submodule "closql"] path = lib/closql url = git@github.com:emacscollective/closql.git +[submodule "compat"] + path = lib/compat + url = https://git.sr.ht/~pkal/compat [submodule "dash"] no-byte-compile = dash-functional.el no-makeinfo = dash-template.texi diff --git a/early-init.el b/early-init.el index 14f24aa..a3f41b7 100644 --- a/early-init.el +++ b/early-init.el @@ -3,6 +3,7 @@ (setq load-prefer-newer t) (let ((dir (file-name-directory (or load-file-name buffer-file-name)))) + (add-to-list 'load-path (expand-file-name "lib/compat" dir)) (add-to-list 'load-path (expand-file-name "lib/packed" dir)) (add-to-list 'load-path (expand-file-name "lib/auto-compile" dir))) (require 'auto-compile) diff --git a/lib/compat b/lib/compat new file mode 160000 index 0000000..8c51417 --- /dev/null +++ b/lib/compat @@ -0,0 +1 @@ +Subproject commit 8c514176612add24d1d5d8554510547ccc841a25 From 38bd872f9bb19091ab000d16d917a5aae6a73d53 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:55:22 +0200 Subject: [PATCH 2/8] Assimilate emacsql-sqlite-builtin and sqlite3 --- .gitmodules | 6 ++++++ lib/emacsql-sqlite-builtin | 1 + lib/sqlite3 | 1 + 3 files changed, 8 insertions(+) create mode 160000 lib/emacsql-sqlite-builtin create mode 160000 lib/sqlite3 diff --git a/.gitmodules b/.gitmodules index a300699..e2c0ba1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,9 @@ no-byte-compile = emacsql-pg.el path = lib/emacsql url = git@github.com:skeeto/emacsql.git +[submodule "emacsql-sqlite-builtin"] + path = lib/emacsql-sqlite-builtin + url = git@github.com:emacscollective/emacsql-sqlite-builtin.git [submodule "epkg"] path = lib/epkg url = git@github.com:emacscollective/epkg.git @@ -38,6 +41,9 @@ [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git +[submodule "sqlite3"] + path = lib/sqlite3 + url = git@github.com:pekingduck/emacs-sqlite3-api.git [submodule "transient"] path = lib/transient url = git@github.com:magit/transient.git diff --git a/lib/emacsql-sqlite-builtin b/lib/emacsql-sqlite-builtin new file mode 160000 index 0000000..3e820c6 --- /dev/null +++ b/lib/emacsql-sqlite-builtin @@ -0,0 +1 @@ +Subproject commit 3e820c66fdaa9937f9e612900954dcd6c7d01943 diff --git a/lib/sqlite3 b/lib/sqlite3 new file mode 160000 index 0000000..2f60952 --- /dev/null +++ b/lib/sqlite3 @@ -0,0 +1 @@ +Subproject commit 2f6095201b1d943d92cc017e100eec571a8d2aab From 6ef3a23fa934552cd5b0217b0f09afdcb7e4b151 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:56:06 +0200 Subject: [PATCH 3/8] Update 12 drones Update auto-compile to 1.7.1-11-gb204e2f Update borg to v3.3.1-55-g3cea55c Update closql to v1.2.1-13-g87d2eda Update dash to 2.19.1-20-g0ac1ecf Update diff-hl to 1.8.8-79-ge84209e Update emacsql to 3.0.0-19-g373975c Update epkg to v3.3.3-19-g4524f9a Update git-modes to 1.4.0-6-geca3bb4 Update magit to v3.3.0-390-gdbb2e9c8de Update packed to 3.0.4-9-g6a427d9 Update transient to v0.3.7-139-ga583d2b2 Update with-editor to v3.2.0-23-gcfcbc2731e --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/closql | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/git-modes | 2 +- lib/magit | 2 +- lib/packed | 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 ff21de7..b204e2f 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit ff21de70f3523afa2976d1e787e2febefeba2653 +Subproject commit b204e2f85aaa4d41af4eb1819633c9613f5172bf diff --git a/lib/borg b/lib/borg index c563966..3cea55c 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit c563966e969b19b10f08046f5c132eefa5534da4 +Subproject commit 3cea55cd44fe3b92034afa02315c4c37a42fbb2f diff --git a/lib/closql b/lib/closql index 15f906c..87d2eda 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 15f906c393db1a0fb6577afc3cf59466531eafef +Subproject commit 87d2edae8bc3d390bcfc5e909e9c13ff9fce994a diff --git a/lib/dash b/lib/dash index da167c5..0ac1ecf 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit da167c51e9fd167a48d06c7c0ee8e3ac7abd9718 +Subproject commit 0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341 diff --git a/lib/diff-hl b/lib/diff-hl index 6fa3af0..e84209e 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 6fa3af0843093f44e028584a93eef091ec7e79d2 +Subproject commit e84209e959a17c7b96148e099e391daa29a4835e diff --git a/lib/emacsql b/lib/emacsql index c82a0e6..373975c 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit c82a0e6b4d256a3743b718cfb640fa9efc045f6e +Subproject commit 373975cbccf7776af771e23f86043b236a330702 diff --git a/lib/epkg b/lib/epkg index 44bcdb0..4524f9a 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 44bcdb03bb11891f5966b39be942d76a4a57f5cf +Subproject commit 4524f9a8f19717c4afb84a184db7841b4ffcbf56 diff --git a/lib/git-modes b/lib/git-modes index 62fbf2e..eca3bb4 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 62fbf2e5b84ca789e7bc2f87939386023b5ba3df +Subproject commit eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5 diff --git a/lib/magit b/lib/magit index 2e73b66..dbb2e9c 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 2e73b66c2980abb9211d9881a8710c8ac5a33184 +Subproject commit dbb2e9c8de8806c3160e896e346d681168c5a64e diff --git a/lib/packed b/lib/packed index 51f22a6..6a427d9 160000 --- a/lib/packed +++ b/lib/packed @@ -1 +1 @@ -Subproject commit 51f22a68e23b87626d162c58a0afbc21ad22f210 +Subproject commit 6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82 diff --git a/lib/transient b/lib/transient index ecb815b..a583d2b 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit ecb815bcae22b99971d59c8f6cdd7a3b17637498 +Subproject commit a583d2b2f5f8963f08cb5a15a4d4dd55faa13585 diff --git a/lib/with-editor b/lib/with-editor index 36d3695..cfcbc27 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 36d36957628621e8340f755b22082e1f4ed8e2d7 +Subproject commit cfcbc2731e402b9169c0dc03e89b5b57aa988502 From 02f88db293e0288326931e57600178104e8740c7 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:56:58 +0200 Subject: [PATCH 4/8] Emacsg: Enable load-prefer-newer for make targets --- etc/borg/config.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 etc/borg/config.mk diff --git a/etc/borg/config.mk b/etc/borg/config.mk new file mode 100644 index 0000000..9c566cc --- /dev/null +++ b/etc/borg/config.mk @@ -0,0 +1 @@ +EMACS_EXTRA = --eval "(setq load-prefer-newer t)" From d92e5255c16ce79caf29d76815164d8967df382f Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:57:14 +0200 Subject: [PATCH 5/8] Emacsg: Make sure use-package-verbose is always respected Without this we the default value, nil, is in effect if init.el gets recompiled during startup. --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 62f2827..9e19101 100644 --- a/init.el +++ b/init.el @@ -29,7 +29,7 @@ (require 'borg) (borg-initialize)) -(progn ; `use-package' +(eval-and-compile ; `use-package' (require 'use-package) (setq use-package-verbose t)) From 352dce7c3d3fd7a8c424c95c2345e4e3e15d8906 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:58:20 +0200 Subject: [PATCH 6/8] Emacsg: Only show help for codespell targets when using helpall --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a4c25ce..0ab1a8c 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,18 @@ -include lib/borg/borg.mk -help:: - $(info make codespell-dry = run codespell, dry run) - $(info make codespell-fix = run codespell, write fixes) - 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 @cd lib/borg; git reset --hard HEAD +helpall:: + $(info Test and fix targets) + $(info --------------------) + $(info make codespell-dry = run codespell, dry run) + $(info make codespell-fix = run codespell, write fixes) + $(info ) + codespell-dry: @cd lib; codespell \ --ignore-words ~/.emacs.d/etc/codespell/ignore-words \ From 7f0c7a9e38648b180864256d1d0257b065e3304e Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 19:58:41 +0200 Subject: [PATCH 7/8] Emacsg: Fix link in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca6df32..0198ef9 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,6 @@ do so by forking the upstream repository, which is available from You might also want to adjust this description. [init]: https://emacsair.me/2016/05/17/assimilate-emacs-packages-as-git-submodules -[Borg]: https://gitlab.com/tarsius/borg +[Borg]: https://github.com/emacscollective/borg [manual]: https://emacsmirror.net/manual/borg [Github]: https://github.com/emacscollective/emacs.g From 3359fff3eb62ac8c9bfe9b69b50a0d44728f31df Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 10 Jun 2022 20:00:44 +0200 Subject: [PATCH 8/8] package: No longer add "org" ELPA to package-archives Org is now available from GNU Elpa. --- early-init.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/early-init.el b/early-init.el index a3f41b7..922a7ae 100644 --- a/early-init.el +++ b/early-init.el @@ -15,9 +15,6 @@ (with-eval-after-load 'package (add-to-list 'package-archives (cons "melpa" "https://melpa.org/packages/") - t) - (add-to-list 'package-archives - (cons "org" "https://orgmode.org/elpa/") t)) ;; Local Variables: