mirror of
https://github.com/emacscollective/emacs.g.git
synced 2025-06-07 08:14:16 -04:00
Merge branch 'master' into layer/essentials
This commit is contained in:
commit
75ba6b42ce
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,5 +1,6 @@
|
|||||||
/.cask
|
/.cask
|
||||||
/.hive-maint
|
/.hive-maint
|
||||||
/custom.el
|
/custom.el
|
||||||
|
/eln-cache
|
||||||
/elpa
|
/elpa
|
||||||
/var
|
/var
|
||||||
|
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -13,6 +13,7 @@
|
|||||||
[submodule "dash"]
|
[submodule "dash"]
|
||||||
path = lib/dash
|
path = lib/dash
|
||||||
url = git@github.com:magnars/dash.el.git
|
url = git@github.com:magnars/dash.el.git
|
||||||
|
no-byte-compile = dash-functional.el
|
||||||
no-makeinfo = dash-template.texi
|
no-makeinfo = dash-template.texi
|
||||||
[submodule "diff-hl"]
|
[submodule "diff-hl"]
|
||||||
path = lib/diff-hl
|
path = lib/diff-hl
|
||||||
@ -30,6 +31,7 @@
|
|||||||
[submodule "magit"]
|
[submodule "magit"]
|
||||||
path = lib/magit
|
path = lib/magit
|
||||||
url = git@github.com:magit/magit.git
|
url = git@github.com:magit/magit.git
|
||||||
|
no-byte-compile = lisp/magit-libgit.el
|
||||||
recursive-byte-compile = true
|
recursive-byte-compile = true
|
||||||
info-path = Documentation
|
info-path = Documentation
|
||||||
[submodule "markdown-mode"]
|
[submodule "markdown-mode"]
|
||||||
|
2
init.el
2
init.el
@ -174,6 +174,8 @@
|
|||||||
(global-undo-tree-mode)
|
(global-undo-tree-mode)
|
||||||
(setq undo-tree-mode-lighter ""))
|
(setq undo-tree-mode-lighter ""))
|
||||||
|
|
||||||
|
;;; Tequila worms
|
||||||
|
|
||||||
(progn ; startup
|
(progn ; startup
|
||||||
(message "Loading %s...done (%.3fs)" user-init-file
|
(message "Loading %s...done (%.3fs)" user-init-file
|
||||||
(float-time (time-subtract (current-time)
|
(float-time (time-subtract (current-time)
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f8619d1616b523918323914ec77bfbee2c559781
|
Subproject commit ff21de70f3523afa2976d1e787e2febefeba2653
|
2
lib/borg
2
lib/borg
@ -1 +1 @@
|
|||||||
Subproject commit 5de2a7aa0c126f5b18506e187bca66079e68f51d
|
Subproject commit 0ff7d7e469d75c26caed8d50ca80299cc4a77b88
|
@ -1 +1 @@
|
|||||||
Subproject commit c864c1fadfea4a05fff29cb60891b7a32ac88c78
|
Subproject commit e2687e7ff958a19e6e5d6552c4e0b7b33c424bab
|
2
lib/dash
2
lib/dash
@ -1 +1 @@
|
|||||||
Subproject commit e0254c56e78b82f670e2d92ad7077c6cc96db1cf
|
Subproject commit 39d067b9fbb2db65fc7a6938bfb21489ad990cb4
|
@ -1 +1 @@
|
|||||||
Subproject commit 3394d8536c315e9bf553d0ee0bdd5afa6c4aa6ff
|
Subproject commit a682de60187763128d2d0a85f1d168d89877691f
|
@ -1 +1 @@
|
|||||||
Subproject commit 6d8cd9366284b5a27268ff4b783e2c34573d5b60
|
Subproject commit 9dca5996168c4963eb67e61c7f17fdcb8228e314
|
2
lib/epkg
2
lib/epkg
@ -1 +1 @@
|
|||||||
Subproject commit 94c8389a8b660a68ae7e5458583b06b30ba0edb9
|
Subproject commit cb12a3fed77d574e5c30eafd4f950dae02022b67
|
@ -1 +1 @@
|
|||||||
Subproject commit 55468314a5f6b77d2c96be62c7005ac94545e217
|
Subproject commit 433e1c57a63c88855fc41a942e29d7bc8c9c16c7
|
@ -1 +1 @@
|
|||||||
Subproject commit 8e23c49b5a739284ffa87c489759ff7787c36ae0
|
Subproject commit 2fe42f63d558e488ad71d050e8ca5e8565c845ae
|
@ -1 +1 @@
|
|||||||
Subproject commit 3b96dedb404f614479c1b321fac3e4bf11ba0782
|
Subproject commit ed63b4803899c3719aeeba461e249c473e5b26f0
|
@ -1 +1 @@
|
|||||||
Subproject commit 8ad5fb83c458801816fc2f888c43f6baf74b5803
|
Subproject commit 65f4eac82c564204d20df0a606dc2fcaa72cc41e
|
@ -1 +1 @@
|
|||||||
Subproject commit 365c73d2618dd0040a32c2601c5456ab5495b812
|
Subproject commit a7422fb8ab1baee19adb2717b5b47b9c3812a84c
|
@ -1 +1 @@
|
|||||||
Subproject commit b439749da110af83aea40e79dd2a8c57427bc28a
|
Subproject commit eabf9c9bd2477e98251b84ed22c6b4d8d43603e6
|
Loading…
x
Reference in New Issue
Block a user