Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude: [Fix bbatsov#977] Add the which-key package
Bklyn · Apr 1, 2016 · e8dc0d3 · e8dc0d3
2 parents 174f5ad + 1f3ddb6
commit e8dc0d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
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