From 7fb4e6af7da69682cede6f6a3232f43a5a8fabe6 Mon Sep 17 00:00:00 2001
From: Benjamin Andresen <bandresen@gmail.com>
Date: Sat, 15 Jul 2017 17:57:44 +0200
Subject: [PATCH] Add: lang/emacs-lisp: macrostep

---
 modules/lang/emacs-lisp/config.el   | 23 +++++++++++++++++++++++
 modules/lang/emacs-lisp/packages.el |  1 +
 2 files changed, 24 insertions(+)

diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index 0277cf552..6b688e12e 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -74,6 +74,29 @@
   (setq inferior-lisp-program "clisp")
   (require 'slime-fuzzy))
 
+(def-package! macrostep
+  :commands macrostep-expand
+  :config
+  (map! :map macrostep-keymap
+        :n "RET"    #'macrostep-expand
+        :n "e"      #'macrostep-expand
+        :n "u"      #'macrostep-collapse
+        :n "c"      #'macrostep-collapse
+
+        :n "TAB"    #'macrostep-next-macro
+        :n "n"      #'macrostep-next-macro
+        :n "J"      #'macrostep-next-macro
+
+        :n "S-TAB"  #'macrostep-prev-macro
+        :n "K"      #'macrostep-prev-macro
+        :n "p"      #'macrostep-prev-macro
+
+        :n "q"      #'macrostep-collapse-all
+        :n "C"      #'macrostep-collapse-all)
+  ;; `evil-normalize-keymaps' seems to be required for macrostep or it won't
+  ;; apply for the very first invocation
+  (add-hook 'macrostep-mode-hook #'evil-normalize-keymaps))
+
 
 ;;
 ;;
diff --git a/modules/lang/emacs-lisp/packages.el b/modules/lang/emacs-lisp/packages.el
index 5432cd499..6b568ffc7 100644
--- a/modules/lang/emacs-lisp/packages.el
+++ b/modules/lang/emacs-lisp/packages.el
@@ -4,3 +4,4 @@
 (package! auto-compile)
 (package! highlight-quoted)
 (package! slime)
+(package! macrostep)