Merge branch 'master' into layer/all

This commit is contained in:
Jonas Bernoulli
2018-01-17 17:39:32 +01:00

View File

@@ -99,6 +99,7 @@
:config (setq ediff-window-setup-function 'ediff-setup-windows-plain)) :config (setq ediff-window-setup-function 'ediff-setup-windows-plain))
(use-package eldoc (use-package eldoc
:when (version< "25" emacs-version)
:config (global-eldoc-mode)) :config (global-eldoc-mode))
(use-package fill-column-indicator (use-package fill-column-indicator
@@ -257,6 +258,7 @@
:config (savehist-mode)) :config (savehist-mode))
(use-package saveplace (use-package saveplace
:when (version< "25" emacs-version)
:config (save-place-mode)) :config (save-place-mode))
(use-package shell (use-package shell