Updating Doom Emacs.

.emacs.d/modules/editor/lispy/README.org

@@ -1,5 +1,15 @@
-#+TITLE: :editor lispy
+#+TITLE:   editor/lispy
+#+DATE:    October 27, 2018
+#+SINCE:   v2.0
+#+STARTUP: inlineimages
 
+* Table of Contents :TOC_3:noexport:
+- [[#description][Description]]
+- [[#prerequisites][Prerequisites]]
+- [[#troubleshooting][Troubleshooting]]
+  - [[#mouse-wheel-and-wrapadditional-wrap-key-themes-in-tty-emacs-2573][Mouse wheel and =wrap=/=additional-wrap= key themes in TTY Emacs (#2573)]]
+
+* Description
 This module adds [[https://github.com/noctuid/lispyville][lispy]] key functionality in Lisp languages.
 
 This includes:
@@ -18,19 +28,25 @@ lispy is active
 The default key themes that are set are as follows:
 
 #+BEGIN_SRC emacs-lisp
-(lispyville-set-key-theme
- '((operators normal)
-    c-w
-    (prettify insert)
-    (atom-movement normal visual)
-    slurp/barf-lispy
-    (wrap normal insert)
-    additional
-    additional-insert
-    (additional-wrap normal insert)
-    (escape insert)))
+'((operators normal)
+  c-w
+  (prettify insert)
+  (atom-movement normal visual)
+  slurp/barf-lispy
+  additional
+  additional-insert)
 #+END_SRC
 
-See noctuid's [[https://github.com/noctuid/lispyville/blob/master/README.org][README]] for more info on specific keybindings (starting [[https://github.com/noctuid/lispyville#operators-key-theme][here]]) of
-each key theme. Think of ~lispyville-set-key-theme~ as adding
-~parinfer-extensions~ via ~(setq parinfer-extensions '(blah blah blah))~.
+To change the key themes set ~lispyville-key-theme~. Think of
+~lispyville-key-theme~ as the equivalent of ~parinfer-extensions~. See
+lispyville's [[https://github.com/noctuid/lispyville/blob/master/README.org][README]] for more info on the specific keybindings of each key theme
+(starting [[https://github.com/noctuid/lispyville#operators-key-theme][here]]).
+
+* Prerequisites
+This module has no prerequisites.
+
+* Troubleshooting
+** Mouse wheel and =wrap=/=additional-wrap= key themes in TTY Emacs ([[https://github.com/hlissner/doom-emacs/issues/2573][#2573]])
+lispyville binds =M-[= to ~lispyville-wrap-brackets~ when the =wrap= or
+=additional-wrap= key theme are enabled. In terminal Emacs, this is the key
+Emacs receives when you scroll with your mouse wheel.

.emacs.d/modules/editor/lispy/config.el

@@ -1,29 +1,30 @@
 ;;; editor/lispy/config.el -*- lexical-binding: t; -*-
 
 (use-package! lispy
-  :hook ((common-lisp-mode . lispy-mode)
+  :hook ((lisp-mode . lispy-mode)
          (emacs-lisp-mode . lispy-mode)
          (scheme-mode . lispy-mode)
          (racket-mode . lispy-mode)
          (hy-mode . lispy-mode)
          (lfe-mode . lispy-mode)
+         (dune-mode . lispy-mode)
          (clojure-mode . lispy-mode))
   :config
   (setq lispy-close-quotes-at-end-p t)
   (add-hook 'lispy-mode-hook #'turn-off-smartparens-mode))
 
+
 (use-package! lispyville
   :when (featurep! :editor evil)
   :hook (lispy-mode . lispyville-mode)
+  :init
+  (setq lispyville-key-theme
+        '((operators normal)
+          c-w
+          (prettify insert)
+          (atom-movement normal visual)
+          slurp/barf-lispy
+          additional
+          additional-insert))
   :config
-  (lispyville-set-key-theme
-   '((operators normal)
-     c-w
-     (prettify insert)
-     (atom-movement normal visual)
-     slurp/barf-lispy
-     (wrap normal insert)
-     additional
-     additional-insert
-     (additional-wrap normal insert)
-     (escape insert))))
+  (lispyville-set-key-theme))

.emacs.d/modules/editor/lispy/packages.el

@@ -1,7 +1,6 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; editor/lispyville/packages.el
 
-(package! lispy)
-
+(package! lispy :pin "cdaa9c70ca39a880163cbbce924bb46cc56b9fa4")
 (when (featurep! :editor evil)
-  (package! lispyville))
+  (package! lispyville :pin "25a70126ea807653e0a8c512d4128c90ed673d7a"))