diff options
| author | Alan Pearce | 2016-01-14 19:29:25 +0100 |
|---|---|---|
| committer | Alan Pearce | 2016-01-14 19:29:25 +0100 |
| commit | f9009077e3781b77c9caaf2ddea066119a742910 (patch) | |
| tree | 766c7073132ec59601ad8f45657ba313056a064b /tag-emacs/emacs.d | |
| parent | 142e29561966e9a991145947b52a763f9906658c (diff) | |
| parent | 9c688f368aa5bcb92e1532c6e96b50a8adac7a55 (diff) | |
| download | dotfiles-f9009077e3781b77c9caaf2ddea066119a742910.tar.lz dotfiles-f9009077e3781b77c9caaf2ddea066119a742910.tar.zst dotfiles-f9009077e3781b77c9caaf2ddea066119a742910.zip | |
Merge branch 'master' of home:projects/dotfiles
Diffstat (limited to 'tag-emacs/emacs.d')
| -rw-r--r-- | tag-emacs/emacs.d/init.org | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org index 7eff008..01cae19 100644 --- a/tag-emacs/emacs.d/init.org +++ b/tag-emacs/emacs.d/init.org @@ -41,7 +41,10 @@ the buffer to be empty. ("marmalade" . "http://marmalade-repo.org/packages/") ("melpa-stable" . "http://stable.melpa.org/packages/") ("melpa" . "http://melpa.org/packages/")) - package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa")) + package-user-dir (concat "~/.emacs.d/packages/" emacs-version "/elpa") + package-pinned-packages '(("use-package" . melpa-stable) + ("diminish" . melpa-stable) + ("bind-key" . melpa-stable))) (package-initialize) (unless (package-installed-p 'use-package) (package-refresh-contents) @@ -51,7 +54,8 @@ the buffer to be empty. (require 'diminish) (require 'bind-key)) (setq use-package-verbose t - use-package-always-ensure t) + use-package-always-ensure t + package-enable-at-startup nil) #+END_SRC * Customize @@ -748,8 +752,6 @@ whitespace-sensitive language, of course. (auto-indent-global-mode))) #+END_SRC -*** TODO Check for auto-indentation of whitespace-sensitive languages. - ** smart-tabs-mode Not related to [[smart-tab][=smart-tab=]], this mode indents with tabs and aligns |