mirror/emacs.g
1
0
Fork 0
mirror of https://github.com/emacscollective/emacs.g.git synced 2025-06-07 08:14:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into layer/all

Browse Source
This commit is contained in:
Jonas Bernoulli 2022-11-07 00:54:41 +01:00
commit 50bbc44b0a
No known key found for this signature in database
GPG Key ID: 230C2EFBB326D927
19 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

@ -9,7 +9,7 @@
url = git@github.com:emacscollective/borg.git url = git@github.com:emacscollective/borg.git
[submodule "closql"] [submodule "closql"]
path = lib/closql path = lib/closql
url = git@github.com:emacscollective/closql.git url = git@github.com:magit/closql.git
[submodule "compat"] [submodule "compat"]
path = lib/compat path = lib/compat
url = https://git.sr.ht/~pkal/compat url = https://git.sr.ht/~pkal/compat
@ -33,10 +33,7 @@
[submodule "emacsql"] [submodule "emacsql"]
no-byte-compile = emacsql-pg.el no-byte-compile = emacsql-pg.el
path = lib/emacsql path = lib/emacsql
url = git@github.com:skeeto/emacsql.git url = git@github.com:magit/emacsql.git
[submodule "emacsql-sqlite-builtin"]
path = lib/emacsql-sqlite-builtin
url = git@github.com:emacscollective/emacsql-sqlite-builtin.git
[submodule "epkg"] [submodule "epkg"]
path = lib/epkg path = lib/epkg
url = git@github.com:emacscollective/epkg.git url = git@github.com:emacscollective/epkg.git

15
Makefile
View File

@ -1,17 +1,28 @@
-include lib/borg/borg.mk -include lib/borg/borg.mk
ifndef BORG_DIR
help helpall::
$(info )
$(info Bootstrapping)
$(info -------------)
$(info make bootstrap-borg = make borg and make targets available)
@printf "\n"
bootstrap-borg: bootstrap-borg:
@git submodule--helper clone --name borg --path lib/borg \ @git submodule--helper clone --name borg --path lib/borg \
--url git@github.com:emacscollective/borg.git --url git@github.com:emacscollective/borg.git
@cd lib/borg; git symbolic-ref HEAD refs/heads/master @cd lib/borg; git symbolic-ref HEAD refs/heads/master
@cd lib/borg; git reset --hard HEAD @cd lib/borg; git reset --hard HEAD
else
helpall:: helpall::
$(info Test and fix targets) $(info Test and fix targets)
$(info --------------------) $(info --------------------)
$(info make codespell-dry = run codespell, dry run) $(info make codespell-dry = run codespell, dry run)
$(info make codespell-fix = run codespell, write fixes) $(info make codespell-fix = run codespell, write fixes)
$(info ) @printf "\n"
codespell-dry: codespell-dry:
@cd lib; codespell \ @cd lib; codespell \
@ -26,3 +37,5 @@ codespell-fix:
--exclude-file ~/.emacs.d/etc/codespell/ignore-lines \ --exclude-file ~/.emacs.d/etc/codespell/ignore-lines \
--skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \ --skip $(shell sed '/^\s*$$/d;/^\s*#.*$$/d;s/#.*//;s/\s//g' \
~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",") ~/.emacs.d/etc/codespell/ignore-files | tr "\\n" ",")
endif

4
init.el
View File

@ -82,7 +82,7 @@
(add-hook 'before-save-hook 'copyright-update)) (add-hook 'before-save-hook 'copyright-update))
(use-package dash (use-package dash
:config (global-dash-fontify-mode 1)) :config (global-dash-fontify-mode))
(use-package diff-hl (use-package diff-hl
:config :config
@ -247,7 +247,7 @@
(use-package recentf (use-package recentf
:demand t :demand t
:config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?:")) :config (add-to-list 'recentf-exclude "^/\\(?:ssh\\|su\\|sudo\\)?x?:"))
(use-package savehist (use-package savehist
:config (savehist-mode)) :config (savehist-mode))

2
lib/auto-compile

@ -1 +1 @@
Subproject commit b204e2f85aaa4d41af4eb1819633c9613f5172bf Subproject commit 9caa1aeaa9c37faae87fc2e6b86e6be0dc1ab084

2
lib/borg

@ -1 +1 @@
Subproject commit 3cea55cd44fe3b92034afa02315c4c37a42fbb2f Subproject commit 032ddf33799dd0a2c89d1a3e9e04dc3cdc13320c

2
lib/closql

@ -1 +1 @@
Subproject commit 87d2edae8bc3d390bcfc5e909e9c13ff9fce994a Subproject commit 820e95170acb79de0fb554577a0dc9b707e23aea

2
lib/compat

@ -1 +1 @@
Subproject commit 8c514176612add24d1d5d8554510547ccc841a25 Subproject commit e827a9f3e2ba585de8b07cd246534a15ec414a8b

2
lib/dash

@ -1 +1 @@
Subproject commit 0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341 Subproject commit 3df46d7d9fe74f52a661565888e4d31fd760f0df

2
lib/diff-hl

@ -1 +1 @@
Subproject commit e84209e959a17c7b96148e099e391daa29a4835e Subproject commit 68fb280b300c5d8460cc7b9183e29fb3ec604136

2
lib/emacsql

@ -1 +1 @@
Subproject commit 373975cbccf7776af771e23f86043b236a330702 Subproject commit e318a6c8f65371e2ab667d811205a0d9a98dacbb

1
lib/emacsql-sqlite-builtin

@ -1 +0,0 @@
Subproject commit 3e820c66fdaa9937f9e612900954dcd6c7d01943

2
lib/epkg

@ -1 +1 @@
Subproject commit 4524f9a8f19717c4afb84a184db7841b4ffcbf56 Subproject commit dbb2d6556b8d100633b8a8b71914df476279dc13

2
lib/git-modes

@ -1 +1 @@
Subproject commit eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5 Subproject commit 4f9ad30f01cfb3f8460b786153f8569578c0f8dc

2
lib/magit

@ -1 +1 @@
Subproject commit dbb2e9c8de8806c3160e896e346d681168c5a64e Subproject commit 2a5815fee1ed091751b8bbfa242f7a78d7e5e039

2
lib/packed

@ -1 +1 @@
Subproject commit 6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82 Subproject commit c079fc64f46e514ab685c01fef22f13a33f90d0f

2
lib/transient

@ -1 +1 @@
Subproject commit a583d2b2f5f8963f08cb5a15a4d4dd55faa13585 Subproject commit ad953cc3c5b8a066d3da11a8527c035744f1385f

2
lib/treepy

@ -1 +1 @@
Subproject commit 3ac940e97f3d03e48ca9d7fcd74916a9b01c72f3 Subproject commit de1a2ddc3fd7152d0bfbd9e14312ff8a4864ab2b

2
lib/use-package

@ -1 +1 @@
Subproject commit a7422fb8ab1baee19adb2717b5b47b9c3812a84c Subproject commit 0be480ea77655304a4e6aa9d38d9d9a251b2bd32

2
lib/with-editor

@ -1 +1 @@
Subproject commit cfcbc2731e402b9169c0dc03e89b5b57aa988502 Subproject commit 4ca225bf1c54d6dab2ba7e734f594419c7769e36