Merge branch 'master' of github.com:suutari-ai/prelude

* 'master' of github.com:suutari-ai/prelude: personal/custom: Rewrap personal/custom: Set elpy-test-runner to pytest prelude-modules: Re-enable prelude-company personal/custom: Add to custom-safe-themes Add a hook to magit that notifies diff-hl [Fix bbatsov#977] Add the which-key package personal/custom: Set org-todo-keyword-faces personal/custom: Set whitespace max column to 120
suutari · Apr 17, 2016 · 66e3b35 · 66e3b35
2 parents 2f7c872 + 0f659d2
commit 66e3b35
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/core/prelude-editor.el b/core/prelude-editor.el
@@ -392,6 +392,7 @@ indent yanked text (with prefix arg don't indent)."
 ;; diff-hl
 (global-diff-hl-mode +1)
 (add-hook 'dired-mode-hook 'diff-hl-dired-mode)
+(add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
 
 ;; easy-kill
 (global-set-key [remap kill-ring-save] 'easy-kill)

diff --git a/core/prelude-packages.el b/core/prelude-packages.el
@@ -73,6 +73,7 @@
     smartrep
     undo-tree
     volatile-highlights
+    which-key
     zenburn-theme
     zop-to-char)
   "A list of packages to ensure are installed at launch.")

diff --git a/core/prelude-ui.el b/core/prelude-ui.el
@@ -84,5 +84,9 @@
 (require 'beacon)
 (beacon-mode +1)
 
+;; show available keybindings after you start typing
+(require 'which-key)
+(which-key-mode +1)
+
 (provide 'prelude-ui)
 ;;; prelude-ui.el ends here
diff --git a/personal/custom.el b/personal/custom.el
@@ -11,16 +11,19 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(adaptive-fill-regexp "[ 	]*\\([-–!|#%;:>*·•‣⁃◦]+[ 	]*\\)*")
- '(custom-safe-themes (quote ("c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "c5a044ba03d43a725bd79700087dea813abcb6beb6be08c7eb3303ed90782482" "f0a99f53cbf7b004ba0c1760aa14fd70f2eabafe4e62a2b3cf5cabae8203113b" "9dae95cdbed1505d45322ef8b5aa90ccb6cb59e0ff26fef0b8f411dfc416c552" "756597b162f1be60a12dbd52bab71d40d6a2845a3e3c2584c6573ee9c332a66e" "3a727bdc09a7a141e58925258b6e873c65ccf393b2240c51553098ca93957723" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" default)))
+ '(custom-safe-themes
+   (quote
+    ("71ecffba18621354a1be303687f33b84788e13f40141580fa81e7840752d31bf" "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "c5a044ba03d43a725bd79700087dea813abcb6beb6be08c7eb3303ed90782482" "f0a99f53cbf7b004ba0c1760aa14fd70f2eabafe4e62a2b3cf5cabae8203113b" "9dae95cdbed1505d45322ef8b5aa90ccb6cb59e0ff26fef0b8f411dfc416c552" "756597b162f1be60a12dbd52bab71d40d6a2845a3e3c2584c6573ee9c332a66e" "3a727bdc09a7a141e58925258b6e873c65ccf393b2240c51553098ca93957723" "6a37be365d1d95fad2f4d185e51928c789ef7a4ccf17e7ca13ad63a8bf5b922f" default)))
  '(dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.$\\|^\\.git$")
  '(elpy-rpc-backend "jedi")
  '(elpy-rpc-timeout 5)
+ '(elpy-test-runner (quote elpy-test-pytest-runner))
  '(fill-column 72)
  '(helm-M-x-fuzzy-match t)
  '(org-agenda-files (quote ("~/Documents/org")))
  '(org-default-notes-file "notes.org")
  '(org-directory "~/Documents/org")
- '(org-todo-keyword-faces (quote (("TODO" . org-warning) ("STARTED" . "yellow"))))
+ '(org-todo-keyword-faces (quote (("TODO" . "#f44") ("STARTED" . "#ee8"))))
  '(org-todo-keywords (quote ((sequence "TODO" "STARTED" "DONE"))))
  '(prelude-clean-whitespace-on-save nil)
  '(projectile-mode-line-lighter "Pt")
@@ -32,14 +35,16 @@
  '(python-check-command "flake8")
  '(python-fill-docstring-style (quote django))
  '(server-mode t)
- '(server-temp-file-regexp "^/tmp/Re\\|/draft$\\|/COMMIT_EDITMSG$\\|/MERGE_MSG$\\|/git-rebase-todo$")
+ '(server-temp-file-regexp
+   "^/tmp/Re\\|/draft$\\|/COMMIT_EDITMSG$\\|/MERGE_MSG$\\|/git-rebase-todo$")
  '(sml/theme (quote respectful))
  '(sp-autodelete-closing-pair nil)
  '(sp-autodelete-opening-pair nil)
  '(sp-autodelete-pair nil)
  '(sp-autoescape-string-quote nil)
  '(sp-autoinsert-pair nil)
  '(wg-session-file "~/.emacs.d/savefile/workgroups")
+ '(whitespace-line-column 120)
  '(winner-mode t nil (winner)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

diff --git a/prelude-modules.el b/prelude-modules.el
@@ -1,8 +1,8 @@
 (require 'prelude-ido) ;; Super charges Emacs completion for C-x C-f and more
 (require 'prelude-helm) ;; Interface for narrowing and search
 ; (require 'prelude-helm-everywhere) ;; Enable Helm everywhere
-;; Note: Company mode does not play nicely with Elpy
-;; (require 'prelude-company)
+
+(require 'prelude-company)
 
 (require 'prelude-c)
 ;; (require 'prelude-clojure)