readd geiser-guile loads, whitespace fixes, paredit in ielm + eshell

1 files changed, 30 insertions, 20 deletions

diff --git a/.config/emacs/modules/bd--devel.el b/.config/emacs/modules/bd--devel.el
index fda79a9..96f5bb1 100644
--- a/.config/emacs/modules/bd--devel.el
+++ b/.config/emacs/modules/bd--devel.el
@@ -18,7 +18,7 @@
 (use-package prog-mode
   :hook
   ((js-mode . (lambda ()
-		(add-to-list 'prettify-symbols-alist '("function" . ?ƒ))))
+                (add-to-list 'prettify-symbols-alist '("function" . ?ƒ))))
    (prog-mode . (lambda ()
                   (font-lock-add-keywords
                    nil '(("\\<\\(FIX\\(ME\\)?\\|TODO\\)"
@@ -50,8 +50,8 @@
   :hook ((compilation-filter . ansi-color-compilation-filter))
   :config
   (setopt compilation-always-kill t
-	  compilation-scroll-output 'first-error
-	  compilation-ask-about-save nil)
+          compilation-scroll-output 'first-error
+          compilation-ask-about-save nil)
   (defun bd/compile-dwim (f)
     (let ((default-directory (bd/get-directory-dwim)))
       (call-interactively f)))
@@ -75,21 +75,23 @@
 
 (use-package flymake
   :bind (("C-c f f" . #'flymake-mode)
-	 :map	flymake-mode-map
-	 ("C-c f s" . #'flymake-start)
-	 ("C-c f n" . #'flymake-goto-next-error)
-	 ("C-c f p" . #'flymake-goto-prev-error)
-	 ("C-c f b" . #'flymake-show-buffer-diagnostics)
-	 ("C-c f p" . #'flymake-show-project-diagnostics))
+         :map   flymake-mode-map
+         ("C-c f s" . #'flymake-start)
+         ("C-c f n" . #'flymake-goto-next-error)
+         ("C-c f p" . #'flymake-goto-prev-error)
+         ("C-c f b" . #'flymake-show-buffer-diagnostics)
+         ("C-c f p" . #'flymake-show-project-diagnostics))
   :config
   (setopt flymake-no-changes-timeout nil
-	  flymake-start-on-flymake-mode t
-	  flymake-start-on-save-buffer t
-	  flymake-proc-compilation-prevents-syntax-check t
-	  flymake-wrap-around nil
-	  flymake-show-diagnostics-at-end-of-line nil))
+          flymake-start-on-flymake-mode t
+          flymake-start-on-save-buffer t
+          flymake-proc-compilation-prevents-syntax-check t
+          flymake-wrap-around nil
+          flymake-show-diagnostics-at-end-of-line nil))
 
-(use-package geiser-guile)
+(require 'geiser)
+(require 'geiser-mode)
+(require 'geiser-guile)
 
 (use-package yasnippet
   :hook ((text-mode
@@ -102,21 +104,29 @@
 (use-package paren
   :config
   (setopt show-paren-delay 0
-	  show-paren-highlight-openparen t
-	  show-paren-context-when-offscreen t
-	  show-paren-when-point-in-periphery t
-	  show-paren-when-point-inside-paren t))
+          show-paren-highlight-openparen t
+          show-paren-context-when-offscreen t
+          show-paren-when-point-in-periphery t
+          show-paren-when-point-inside-paren t))
 
 (use-package rainbow-delimiters
   :hook prog-mode)
 
 (use-package paredit
   :hook (ielm-mode
-	 emacs-lisp-mode
+         emacs-lisp-mode
+         eshell-mode
          lisp-mode
          scheme-mode
          lisp-interaction-mode)
   :config
+  (defun bd/paredit-preserve-repl (f &rest args)
+    "Wrapper around F (paredit-RET, discarding ARGS."
+    (pcase (cons major-mode (eolp))
+      ('(inferior-emacs-lisp-mode . t) (ielm-return))
+      ('(eshell-mode . t) (eshell-send-input))
+      (_ (funcall f))))
+  (advice-add #'paredit-RET :around #'bd/paredit-preserve-repl)
   (eldoc-add-command
    'paredit-backward-delete
    'paredit-close-round))