Merge branch 'master' into layer/magit-directors-cut

This commit is contained in:
Jonas Bernoulli
2018-12-27 12:54:21 +01:00
9 changed files with 14 additions and 8 deletions

6
.gitmodules vendored
View File

@@ -36,6 +36,9 @@
[submodule "git-modes"] [submodule "git-modes"]
path = lib/git-modes path = lib/git-modes
url = git@github.com:magit/git-modes.git url = git@github.com:magit/git-modes.git
[submodule "graphql"]
path = lib/graphql
url = git@github.com:vermiculus/graphql.el.git
[submodule "magit"] [submodule "magit"]
path = lib/magit path = lib/magit
url = git@github.com:magit/magit.git url = git@github.com:magit/magit.git
@@ -65,6 +68,9 @@
[submodule "s"] [submodule "s"]
path = lib/s path = lib/s
url = git@github.com:magnars/s.el.git url = git@github.com:magnars/s.el.git
[submodule "treepy"]
path = lib/treepy
url = git@github.com:volrath/treepy.el.git
[submodule "use-package"] [submodule "use-package"]
path = lib/use-package path = lib/use-package
url = git@github.com:jwiegley/use-package.git url = git@github.com:jwiegley/use-package.git

View File

@@ -39,9 +39,7 @@
(setq auto-compile-mode-line-counter t) (setq auto-compile-mode-line-counter t)
(setq auto-compile-source-recreate-deletes-dest t) (setq auto-compile-source-recreate-deletes-dest t)
(setq auto-compile-toggle-deletes-nonlib-dest t) (setq auto-compile-toggle-deletes-nonlib-dest t)
(setq auto-compile-update-autoloads t) (setq auto-compile-update-autoloads t))
(add-hook 'auto-compile-inhibit-compile-hook
'auto-compile-inhibit-compile-detached-git-head))
(use-package epkg (use-package epkg
:defer t :defer t

1
lib/graphql Submodule

Submodule lib/graphql added at e2b309689f

1
lib/treepy Submodule

Submodule lib/treepy added at b40e6b09eb