Merge branch 'master' into layer/essentials

This commit is contained in:
Jonas Bernoulli
2021-09-08 17:51:10 +02:00
16 changed files with 18 additions and 13 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
/.cask /.cask
/.hive-maint /.hive-maint
/custom.el /custom.el
/eln-cache
/elpa /elpa
/var /var

2
.gitmodules vendored
View File

@@ -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"]

View File

@@ -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)