From 1af1abe5aa5aee0510aac6c5573a4ab55bfb19f8 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Mon, 17 Jul 2023 15:51:05 +0200 Subject: [PATCH 01/14] Update 11 drones Update auto-compile to 1.8.1-1-g6ed8e29 Update borg to v3.3.1-112-ge29d983 Update compat to 29.1.4.1-24-ge0ed957 Update dash to 2.19.1-35-gf46268c Update diff-hl to 1.9.2-10-gd9e34f7 Update epkg to v3.3.3-78-g5acd454 Update llama to v0.3.0-1-g5c454f1 Update magit to v3.3.0-670-gb3f473f31d Update transient to v0.4.1-1-ge163a904 Update treepy to 0.1.2-10-g75fe3ec Update with-editor to v3.3.0-3-ga485378183 --- lib/auto-compile | 2 +- lib/borg | 2 +- lib/compat | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/epkg | 2 +- lib/llama | 2 +- lib/magit | 2 +- lib/transient | 2 +- lib/treepy | 2 +- lib/with-editor | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 36646df..6ed8e29 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404 +Subproject commit 6ed8e29d23c6c91f8c98f18ff745d2475d6f6a38 diff --git a/lib/borg b/lib/borg index f9b3413..e29d983 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3 +Subproject commit e29d9839390c0f9e6c375acb4374430cf5595fdf diff --git a/lib/compat b/lib/compat index e3b9f66..e0ed957 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb +Subproject commit e0ed957c2f6e71e190659b5e1b08a6b466667d4d diff --git a/lib/dash b/lib/dash index 96eaba0..f46268c 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a +Subproject commit f46268c75cb7c18361d3cee942cd4dc14a03aef4 diff --git a/lib/diff-hl b/lib/diff-hl index ac746a6..d9e34f7 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107 +Subproject commit d9e34f7b8110b7f753c237d0d0b3f267f3ca4779 diff --git a/lib/epkg b/lib/epkg index a72903c..5acd454 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09 +Subproject commit 5acd45411b012b15ec1a042418c9024b091c3ad7 diff --git a/lib/llama b/lib/llama index f4a59f2..5c454f1 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99 +Subproject commit 5c454f1a83c698668942603e595cec36a5211768 diff --git a/lib/magit b/lib/magit index 5389cbc..b3f473f 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350 +Subproject commit b3f473f31d7bc7517abb9266efaf65bdc8a32532 diff --git a/lib/transient b/lib/transient index 6efa9fa..e163a90 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba +Subproject commit e163a904b5b98f9a43299805296934da27fc1f55 diff --git a/lib/treepy b/lib/treepy index 7c4a0d2..75fe3ec 160000 --- a/lib/treepy +++ b/lib/treepy @@ -1 +1 @@ -Subproject commit 7c4a0d21322506a4d4b2301b4274ec955b429b47 +Subproject commit 75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e diff --git a/lib/with-editor b/lib/with-editor index bce8d1b..a485378 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7 +Subproject commit a4853781835346aabf083d2d9cb87f656d01ccac From 2cded8f433b653ed014612328b9b1eb57f0db6d4 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Sun, 16 Jul 2023 10:34:50 -0500 Subject: [PATCH 02/14] compat: Get from new upstream repository Trying to check out the latest version of emacs.g, I ran into fatal: remote error: upload-pack: not our ref e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb fatal: Fetched in submodule path 'lib/compat', but it did not contain e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb. Direct fetching of that commit failed. Checking git history, I found this commit was described in 4c799656f5b5c9fe22dda0380b32ce1bf40f0999 as Update compat to 29.1.4.1-19-ge3b9f66 but the latest tag in the sr.ht repo is 28.1.2.2 from 10 months ago. As of 2023-07-16, checking ELPA https://elpa.gnu.org/packages/compat.html lists the package website as https://github.com/emacs-compat/compat and the GitHub repo does contain the missing commit, along with the version 29.x tags. https://git.sr.ht/~pkal/compat/commit/965027229c5e23748eac9e88bdd45397d56a1698 confirms development moved to GitHub. --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 94f9daf..b1dc814 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url = git@github.com:magit/closql.git [submodule "compat"] path = lib/compat - url = https://git.sr.ht/~pkal/compat + url = git@github.com:emacs-compat/compat.git [submodule "dash"] path = lib/dash url = git@github.com:magnars/dash.el.git From ba896d1565abc3fe43b7718ee285135bf34a9622 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:47 +0200 Subject: [PATCH 03/14] Update 13 drones Update auto-compile to v2.0.3 Update borg to v4.0.0-7-g7b88080 Update closql to v2.0.0 Update compat to 30.0.0.0-1-ge9203e1 Update dash to 2.19.1-45-g1de9dcb Update diff-hl to 1.10.0 Update emacsql to v4.0.1 Update epkg to v4.0.0-8-g8f51609 Update git-modes to v1.4.4 Update llama to v0.3.1-42-g732389e Update magit to v4.0.0-24-g461d5ba249 Update transient to v0.7.4-10-g3ec0692c Update with-editor to v3.4.1-8-g63e60d5877 --- 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/with-editor | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/auto-compile b/lib/auto-compile index 6ed8e29..5cc4e97 160000 --- a/lib/auto-compile +++ b/lib/auto-compile @@ -1 +1 @@ -Subproject commit 6ed8e29d23c6c91f8c98f18ff745d2475d6f6a38 +Subproject commit 5cc4e97443727554357f6c57614f12ca87419627 diff --git a/lib/borg b/lib/borg index e29d983..7b88080 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit e29d9839390c0f9e6c375acb4374430cf5595fdf +Subproject commit 7b88080eea47f6991e74df6e573d3fc88920ac59 diff --git a/lib/closql b/lib/closql index 85ac7b8..c1a346d 160000 --- a/lib/closql +++ b/lib/closql @@ -1 +1 @@ -Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905 +Subproject commit c1a346d56ecee16d1f0d7707f0d62c72604a8802 diff --git a/lib/compat b/lib/compat index e0ed957..e9203e1 160000 --- a/lib/compat +++ b/lib/compat @@ -1 +1 @@ -Subproject commit e0ed957c2f6e71e190659b5e1b08a6b466667d4d +Subproject commit e9203e164903a6bb7de3e58aa0d653bbcff9d3d1 diff --git a/lib/dash b/lib/dash index f46268c..1de9dcb 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit f46268c75cb7c18361d3cee942cd4dc14a03aef4 +Subproject commit 1de9dcb83eacfb162b6d9a118a4770b1281bcd84 diff --git a/lib/diff-hl b/lib/diff-hl index d9e34f7..b80ff9b 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit d9e34f7b8110b7f753c237d0d0b3f267f3ca4779 +Subproject commit b80ff9b4a772f7ea000e86fbf88175104ddf9557 diff --git a/lib/emacsql b/lib/emacsql index 6401226..e5f0928 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42 +Subproject commit e5f0928a047dba8e3a00b6333400422b301bac35 diff --git a/lib/epkg b/lib/epkg index 5acd454..8f51609 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 5acd45411b012b15ec1a042418c9024b091c3ad7 +Subproject commit 8f51609006a563222e64c3f61363061a8c2d7748 diff --git a/lib/git-modes b/lib/git-modes index 44d536b..f99010b 160000 --- a/lib/git-modes +++ b/lib/git-modes @@ -1 +1 @@ -Subproject commit 44d536ba637235c9dd203410281397417a3e60b6 +Subproject commit f99010bbeb8b6d8a0819fac0195a2ef0159d08f0 diff --git a/lib/llama b/lib/llama index 5c454f1..732389e 160000 --- a/lib/llama +++ b/lib/llama @@ -1 +1 @@ -Subproject commit 5c454f1a83c698668942603e595cec36a5211768 +Subproject commit 732389e3886b510c2661d7d4fd65e01837211e8a diff --git a/lib/magit b/lib/magit index b3f473f..461d5ba 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit b3f473f31d7bc7517abb9266efaf65bdc8a32532 +Subproject commit 461d5ba249b8178ae83f80596da4312e65010720 diff --git a/lib/transient b/lib/transient index e163a90..3ec0692 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit e163a904b5b98f9a43299805296934da27fc1f55 +Subproject commit 3ec0692c3122ab78e1967bbbfa377711a123abe6 diff --git a/lib/with-editor b/lib/with-editor index a485378..63e60d5 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit a4853781835346aabf083d2d9cb87f656d01ccac +Subproject commit 63e60d5877c97b5c4205816ddd2ba53dde109317 From c92316d9a076d669d2492556ebfc0174038ccdd1 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:48 +0200 Subject: [PATCH 04/14] Remove sqlite3 Built-in SQLite support is now preferred and supported by EmacSQL. --- .borgconfig | 2 -- .gitmodules | 3 --- lib/sqlite3 | 1 - 3 files changed, 6 deletions(-) delete mode 160000 lib/sqlite3 diff --git a/.borgconfig b/.borgconfig index d6cea4d..aca1c67 100644 --- a/.borgconfig +++ b/.borgconfig @@ -5,5 +5,3 @@ no-byte-compile = emacsql-pg.el [submodule "magit"] no-byte-compile = lisp/magit-libgit.el -[submodule "sqlite3"] - build-step = make diff --git a/.gitmodules b/.gitmodules index b1dc814..aa53d06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,9 +34,6 @@ [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.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/sqlite3 b/lib/sqlite3 deleted file mode 160000 index ad6dc36..0000000 --- a/lib/sqlite3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ad6dc366b7cc7587965a7eeb7c1fb8b83679f81e From 6e1651f0917ef0e5383c2df4bf6f6aa7ec359991 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:50 +0200 Subject: [PATCH 05/14] Remove use-package It is now built into Emacs. --- .gitmodules | 3 --- lib/use-package | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/use-package diff --git a/.gitmodules b/.gitmodules index aa53d06..cc052a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,9 +40,6 @@ [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git -[submodule "use-package"] - path = lib/use-package - url = git@github.com:jwiegley/use-package.git [submodule "with-editor"] path = lib/with-editor url = git@github.com:magit/with-editor.git diff --git a/lib/use-package b/lib/use-package deleted file mode 160000 index a6e8564..0000000 --- a/lib/use-package +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c From c1d51f7fd95553db00fe57d18072eefd7505f29a Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:51 +0200 Subject: [PATCH 06/14] llama: Update repository url --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index cc052a4..914274b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,7 +30,7 @@ url = git@github.com:magit/git-modes.git [submodule "llama"] path = lib/llama - url = https://git.sr.ht/~tarsius/llama + url = https://github.com/tarsius/llama.git [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git From 02bb4bea5af6ff30cce39aad694082759a7e0a4a Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:52 +0200 Subject: [PATCH 07/14] Emacsg: Load compat as an early bird --- init.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.el b/init.el index c9b79a6..79bd9da 100644 --- a/init.el +++ b/init.el @@ -33,6 +33,8 @@ (require 'use-package) (setq use-package-verbose t)) +(use-package compat) + (use-package dash :config (global-dash-fontify-mode)) From fdca5af9b0982f44511c77a884d99437e267fcca Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:54 +0200 Subject: [PATCH 08/14] Emacsg: Clean up early load-path additions `auto-compile' no longer depends on `packed' and `compat'. --- early-init.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/early-init.el b/early-init.el index 922a7ae..02a2438 100644 --- a/early-init.el +++ b/early-init.el @@ -2,10 +2,10 @@ (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))) +(add-to-list 'load-path + (expand-file-name + "lib/auto-compile" + (file-name-directory (or load-file-name buffer-file-name)))) (require 'auto-compile) (auto-compile-on-load-mode) (auto-compile-on-save-mode) From 9fde15d57781af04c343ba7d152b772c0d525be6 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:55 +0200 Subject: [PATCH 09/14] Emacsg: Use https repository urls --- .gitmodules | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitmodules b/.gitmodules index 914274b..bd3d716 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,43 +3,43 @@ path = .borgconfig [submodule "auto-compile"] path = lib/auto-compile - url = git@github.com:emacscollective/auto-compile.git + url = https://github.com/emacscollective/auto-compile.git [submodule "borg"] path = lib/borg - url = git@github.com:emacscollective/borg.git + url = https://github.com/emacscollective/borg.git [submodule "closql"] path = lib/closql - url = git@github.com:magit/closql.git + url = https://github.com/magit/closql.git [submodule "compat"] path = lib/compat - url = git@github.com:emacs-compat/compat.git + url = https://github.com/emacs-compat/compat.git [submodule "dash"] path = lib/dash - url = git@github.com:magnars/dash.el.git + url = https://github.com/magnars/dash.el.git [submodule "diff-hl"] path = lib/diff-hl - url = git@github.com:dgutov/diff-hl.git + url = https://github.com/dgutov/diff-hl.git [submodule "emacsql"] path = lib/emacsql - url = git@github.com:magit/emacsql.git + url = https://github.com/magit/emacsql.git [submodule "epkg"] path = lib/epkg - url = git@github.com:emacscollective/epkg.git + url = https://github.com/emacscollective/epkg.git [submodule "git-modes"] path = lib/git-modes - url = git@github.com:magit/git-modes.git + url = https://github.com/magit/git-modes.git [submodule "llama"] path = lib/llama url = https://github.com/tarsius/llama.git [submodule "magit"] path = lib/magit - url = git@github.com:magit/magit.git + url = https://github.com/magit/magit.git [submodule "transient"] path = lib/transient - url = git@github.com:magit/transient.git + url = https://github.com/magit/transient.git [submodule "treepy"] path = lib/treepy - url = git@github.com:volrath/treepy.el.git + url = https://github.com/volrath/treepy.el.git [submodule "with-editor"] path = lib/with-editor - url = git@github.com:magit/with-editor.git + url = https://github.com/magit/with-editor.git From 92f1bf4179659b5df0fc580b6d1a58042d4b4171 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:56 +0200 Subject: [PATCH 10/14] magit: Remove obsolete entry from .borgconfig "magit-libgit.el" has been removed from Magit. --- .borgconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/.borgconfig b/.borgconfig index aca1c67..51fea40 100644 --- a/.borgconfig +++ b/.borgconfig @@ -3,5 +3,3 @@ no-makeinfo = dash-template.texi [submodule "emacsql"] no-byte-compile = emacsql-pg.el -[submodule "magit"] - no-byte-compile = lisp/magit-libgit.el From 27c30f05aff9b7c039ed71dc5da827babb918bde Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:58 +0200 Subject: [PATCH 11/14] emacsql: Compile none of the alternative back-ends --- .borgconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.borgconfig b/.borgconfig index 51fea40..c309a99 100644 --- a/.borgconfig +++ b/.borgconfig @@ -2,4 +2,8 @@ no-byte-compile = dash-functional.el no-makeinfo = dash-template.texi [submodule "emacsql"] + no-byte-compile = emacsql-mysql.el no-byte-compile = emacsql-pg.el + no-byte-compile = emacsql-psql.el + no-byte-compile = emacsql-sqlite.el + no-byte-compile = emacsql-sqlite-module.el From 152b9fbb46fcfc4b5fb20ebd483afc5670ff0ec3 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:54:59 +0200 Subject: [PATCH 12/14] emacsql: Use correct use-package keyword --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 79bd9da..8baf0f1 100644 --- a/init.el +++ b/init.el @@ -64,7 +64,7 @@ (load custom-file))) (use-package server - :commands (server-running-p) + :functions (server-running-p) :config (or (server-running-p) (server-mode))) (progn ; startup From c825d11997957033c4386bfbfc86445084f374e4 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:55:00 +0200 Subject: [PATCH 13/14] use-package: Use setopt --- init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.el b/init.el index 8baf0f1..e46a0b8 100644 --- a/init.el +++ b/init.el @@ -30,8 +30,8 @@ (borg-initialize)) (eval-and-compile ; `use-package' - (require 'use-package) - (setq use-package-verbose t)) + (setopt use-package-verbose t) + (require 'use-package)) (use-package compat) From 296bdac8e2330b4fc481d9917e7abe6e13ec90ba Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 24 Aug 2024 19:55:02 +0200 Subject: [PATCH 14/14] use-package: Enable imenu support --- init.el | 1 + 1 file changed, 1 insertion(+) diff --git a/init.el b/init.el index e46a0b8..88c19b6 100644 --- a/init.el +++ b/init.el @@ -30,6 +30,7 @@ (borg-initialize)) (eval-and-compile ; `use-package' + (setopt use-package-enable-imenu-support t) (setopt use-package-verbose t) (require 'use-package))