mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-06-07 08:14:16 -04:00
Merge branch 'master' into drone/bash-completion
This commit is contained in:
Jonas Bernoulli
commit
058112c7ff
9
.gitmodules
vendored
9
.gitmodules
vendored
@ -14,6 +14,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
|
||||
@ -26,6 +29,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
|
||||
@ -39,6 +45,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
|
||||
|
||||
11
Makefile
11
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 \
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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)
|
||||
@ -14,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:
|
||||
|
||||
1
etc/borg/config.mk
Normal file
1
etc/borg/config.mk
Normal file
@ -0,0 +1 @@
|
||||
EMACS_EXTRA = --eval "(setq load-prefer-newer t)"
|
||||
2
init.el
2
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))
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit ff21de70f3523afa2976d1e787e2febefeba2653
|
||||
Subproject commit b204e2f85aaa4d41af4eb1819633c9613f5172bf
|
||||
2
lib/borg
2
lib/borg
@ -1 +1 @@
|
||||
Subproject commit c563966e969b19b10f08046f5c132eefa5534da4
|
||||
Subproject commit 3cea55cd44fe3b92034afa02315c4c37a42fbb2f
|
||||
@ -1 +1 @@
|
||||
Subproject commit 15f906c393db1a0fb6577afc3cf59466531eafef
|
||||
Subproject commit 87d2edae8bc3d390bcfc5e909e9c13ff9fce994a
|
||||
1
lib/compat
Submodule
1
lib/compat
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 8c514176612add24d1d5d8554510547ccc841a25
|
||||
2
lib/dash
2
lib/dash
@ -1 +1 @@
|
||||
Subproject commit da167c51e9fd167a48d06c7c0ee8e3ac7abd9718
|
||||
Subproject commit 0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6fa3af0843093f44e028584a93eef091ec7e79d2
|
||||
Subproject commit e84209e959a17c7b96148e099e391daa29a4835e
|
||||
@ -1 +1 @@
|
||||
Subproject commit c82a0e6b4d256a3743b718cfb640fa9efc045f6e
|
||||
Subproject commit 373975cbccf7776af771e23f86043b236a330702
|
||||
1
lib/emacsql-sqlite-builtin
Submodule
1
lib/emacsql-sqlite-builtin
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 3e820c66fdaa9937f9e612900954dcd6c7d01943
|
||||
2
lib/epkg
2
lib/epkg
@ -1 +1 @@
|
||||
Subproject commit 44bcdb03bb11891f5966b39be942d76a4a57f5cf
|
||||
Subproject commit 4524f9a8f19717c4afb84a184db7841b4ffcbf56
|
||||
@ -1 +1 @@
|
||||
Subproject commit 62fbf2e5b84ca789e7bc2f87939386023b5ba3df
|
||||
Subproject commit eca3bb42ea8abed9ef8549b2ac91bbea445c5bb5
|
||||
@ -1 +1 @@
|
||||
Subproject commit 2e73b66c2980abb9211d9881a8710c8ac5a33184
|
||||
Subproject commit dbb2e9c8de8806c3160e896e346d681168c5a64e
|
||||
@ -1 +1 @@
|
||||
Subproject commit 51f22a68e23b87626d162c58a0afbc21ad22f210
|
||||
Subproject commit 6a427d9da742d78a8f6bd6ed9e31fbf241b2ea82
|
||||
1
lib/sqlite3
Submodule
1
lib/sqlite3
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 2f6095201b1d943d92cc017e100eec571a8d2aab
|
||||
@ -1 +1 @@
|
||||
Subproject commit ecb815bcae22b99971d59c8f6cdd7a3b17637498
|
||||
Subproject commit a583d2b2f5f8963f08cb5a15a4d4dd55faa13585
|
||||
@ -1 +1 @@
|
||||
Subproject commit 36d36957628621e8340f755b22082e1f4ed8e2d7
|
||||
Subproject commit cfcbc2731e402b9169c0dc03e89b5b57aa988502
|
||||
Loading…
x
Reference in New Issue
Block a user