Make geiser actually work on windows

diff --git a/re/re-bindings.el b/re/re-bindings.el
index bf748f1fa12a3eb06acb394a418a16f6deb0e07c..c684ad2c848e512fef0eedd16b27be81115125ff 100644 (file)
--- a/re/re-bindings.el
+++ b/re/re-bindings.el
@@ -67,7 +67,7 @@
 (keymap-global-set "C-M-S-q" #'sedit-auto-prettify-sexp)
 
 (defvar *re/lisp-mode-hooks*
-  '(emacs-lisp-mode-hook lisp-mode-hook slime-mode-hook))
+  '(emacs-lisp-mode-hook lisp-mode-hook slime-mode-hook scheme-mode-hook geiser-mode-hook))
 
 (dolist (hook *re/lisp-mode-hooks*)
   (add-hook hook
@@ -82,18 +82,6 @@
                        "]"
                        (re/balance-and-eval-sexp #'eval-print-last-sexp))))
 
-;; Scheme
-(defvar *re/scheme-mode-hooks* '(scheme-mode-hook geiser-mode-hook))
-(defvar *re/scheme-mode-maps* '(scheme-mode-map geiser-mode-map))
-
-(dolist (hook *re/scheme-mode-hooks*)
-  (add-hook hook
-           (lambda ()
-             (dolist (maps *re/scheme-mode-maps*)
-               (keymap-set maps
-                           "]"
-                           (re/balance-and-eval-sexp #'sedit-auto-prettify-sexp))))))
-
 ;; IELM
 (keymap-global-set "C-c i" #'ielm)
 

diff --git a/re/re-packages.el b/re/re-packages.el
index 9169ecc5d0805ef7481d113dd67f8766aec6fe0e..1e9bd2ffd8d2ece69e177320d54652fa859b45e6 100644 (file)
--- a/re/re-packages.el
+++ b/re/re-packages.el
@@ -105,7 +105,14 @@
   :ensure
   t
   :config
-  (setq geiser-active-implementations '(chicken)))
+  (if (equal system-type 'windows-nt)
+      (setq geiser-chicken-binary '("C:/tools/chicken/bin/csi.exe" "-:c"))
+    (setq geiser-chicken-binary "csi -:c"))
+  (setq scheme-program-name geiser-chicken-binary
+       geiser-active-implementations '(chicken))
+  (add-hook 'scheme-mode-hook 'geiser-mode))
+
+(use-package geiser-chicken :ensure t :after 'geiser)
 
 (use-package csv-mode :ensure t :defer t)