mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-06-07 00:04:33 -04:00
Merge branch 'master' into layer/essentials
This commit is contained in:
Jonas Bernoulli
commit
4a499dcf56
@ -2,8 +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
|
||||
[submodule "magit"]
|
||||
no-byte-compile = lisp/magit-libgit.el
|
||||
[submodule "sqlite3"]
|
||||
build-step = make
|
||||
no-byte-compile = emacsql-psql.el
|
||||
no-byte-compile = emacsql-sqlite.el
|
||||
no-byte-compile = emacsql-sqlite-module.el
|
||||
|
||||
34
.gitmodules
vendored
34
.gitmodules
vendored
@ -3,37 +3,37 @@
|
||||
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 = https://git.sr.ht/~pkal/compat
|
||||
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://git.sr.ht/~tarsius/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 "markdown-mode"]
|
||||
path = lib/markdown-mode
|
||||
url = git@github.com:jrblevin/markdown-mode.git
|
||||
@ -43,25 +43,19 @@
|
||||
[submodule "queue"]
|
||||
path = lib/queue
|
||||
url = git@github.com:emacsmirror/queue.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
|
||||
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 "undo-tree"]
|
||||
remote = silent http://www.dr-qubit.org/git/undo-tree.git
|
||||
path = lib/undo-tree
|
||||
url = git@github.com:tarsiiformes/undo-tree.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
|
||||
url = https://github.com/magit/with-editor.git
|
||||
[submodule "yaml-mode"]
|
||||
path = lib/yaml-mode
|
||||
url = git@github.com:yoshiki/yaml-mode.git
|
||||
|
||||
@ -7,10 +7,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)
|
||||
|
||||
9
init.el
9
init.el
@ -30,8 +30,11 @@
|
||||
(borg-initialize))
|
||||
|
||||
(eval-and-compile ; `use-package'
|
||||
(require 'use-package)
|
||||
(setq use-package-verbose t))
|
||||
(setopt use-package-enable-imenu-support t)
|
||||
(setopt use-package-verbose t)
|
||||
(require 'use-package))
|
||||
|
||||
(use-package compat)
|
||||
|
||||
(use-package dash
|
||||
:config (global-dash-fontify-mode))
|
||||
@ -64,7 +67,7 @@
|
||||
(load custom-file)))
|
||||
|
||||
(use-package server
|
||||
:commands (server-running-p)
|
||||
:functions (server-running-p)
|
||||
:config (or (server-running-p) (server-mode)))
|
||||
|
||||
(progn ; startup
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 36646df118dbea91e3d00d06ed712c5d05399404
|
||||
Subproject commit 5cc4e97443727554357f6c57614f12ca87419627
|
||||
2
lib/borg
2
lib/borg
@ -1 +1 @@
|
||||
Subproject commit f9b34133df7ccb650f7e34f43a996c2467def8a3
|
||||
Subproject commit 7b88080eea47f6991e74df6e573d3fc88920ac59
|
||||
@ -1 +1 @@
|
||||
Subproject commit 85ac7b8a894a4e259439d79eb6bd6f5129770905
|
||||
Subproject commit c1a346d56ecee16d1f0d7707f0d62c72604a8802
|
||||
@ -1 +1 @@
|
||||
Subproject commit e3b9f66b6d60d5f1da91218fa95cc3a4dca30cfb
|
||||
Subproject commit e9203e164903a6bb7de3e58aa0d653bbcff9d3d1
|
||||
2
lib/dash
2
lib/dash
@ -1 +1 @@
|
||||
Subproject commit 96eaba028ac069ea0e5cc70de15b0229126a054a
|
||||
Subproject commit 1de9dcb83eacfb162b6d9a118a4770b1281bcd84
|
||||
@ -1 +1 @@
|
||||
Subproject commit ac746a6e27e04a077c68a2ebe4f8750399286107
|
||||
Subproject commit b80ff9b4a772f7ea000e86fbf88175104ddf9557
|
||||
@ -1 +1 @@
|
||||
Subproject commit 64012261f65fcdd7ea137d1973ef051af1dced42
|
||||
Subproject commit e5f0928a047dba8e3a00b6333400422b301bac35
|
||||
2
lib/epkg
2
lib/epkg
@ -1 +1 @@
|
||||
Subproject commit a72903cf2e7234a745b5ec4aac12a1e3dd85ea09
|
||||
Subproject commit 8f51609006a563222e64c3f61363061a8c2d7748
|
||||
@ -1 +1 @@
|
||||
Subproject commit 44d536ba637235c9dd203410281397417a3e60b6
|
||||
Subproject commit f99010bbeb8b6d8a0819fac0195a2ef0159d08f0
|
||||
@ -1 +1 @@
|
||||
Subproject commit f4a59f215438243fbbdc103a6db11fb2e99cff99
|
||||
Subproject commit 732389e3886b510c2661d7d4fd65e01837211e8a
|
||||
@ -1 +1 @@
|
||||
Subproject commit 5389cbcfff7a2a3fe6007bc0681ff97e18cd7350
|
||||
Subproject commit 461d5ba249b8178ae83f80596da4312e65010720
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit ad6dc366b7cc7587965a7eeb7c1fb8b83679f81e
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6efa9fadf8ba670c3919fdecbc10a20577893fba
|
||||
Subproject commit 3ec0692c3122ab78e1967bbbfa377711a123abe6
|
||||
@ -1 +1 @@
|
||||
Subproject commit 7c4a0d21322506a4d4b2301b4274ec955b429b47
|
||||
Subproject commit 75fe3ec37e6f9b2bdfd6d0584efd984d0c00a43e
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit a6e856418d2ebd053b34e0ab2fda328abeba731c
|
||||
@ -1 +1 @@
|
||||
Subproject commit bce8d1bf3faf5237332aada3bb0920bbbc037fe7
|
||||
Subproject commit 63e60d5877c97b5c4205816ddd2ba53dde109317
|
||||
Loading…
x
Reference in New Issue
Block a user