From 1fe8c5cf56a90025c891476a1d602e0c91847311 Mon Sep 17 00:00:00 2001
From: Ravi R Kiran <aine.marina@gmail.com>
Date: Mon, 19 Apr 2021 08:54:20 -0500
Subject: Another attempt at getting repl-toggle hooks right


diff --git a/lisp/ravi-init-repl.el b/lisp/ravi-init-repl.el
index cd8ba0b..33d1cc8 100644
--- a/lisp/ravi-init-repl.el
+++ b/lisp/ravi-init-repl.el
@@ -45,26 +45,27 @@
   :ensure nil)
 
 (use-package repl-toggle
+  :commands (rtog/activate ravi/repl-toggle-or-compile-dwim)
+  :bind (:map repl-toggle-mode-map
+              ("<f5>" . ravi/repl-toggle-or-compile-dwim))
   :config
-  (progn
-    (setq rtog/mode-repl-alist '((python-mode . python-shell-switch-to-shell)
-                                 (octave-mode . ravi/octave-shell-switch-to-shell)
-                                 (emacs-lisp-mode . ielm)))
-    (setq rtog/goto-buffer-fun 'pop-to-buffer)
-    (add-hook 'python-mode-hook 'rtog/activate)
-    (add-hook 'octave-mode-hook 'rtog/activate)
-    (add-hook 'emacs-lisp-mode-hook 'rtog/activate)
+  (setq rtog/mode-repl-alist '((python-mode . python-shell-switch-to-shell)
+                               (octave-mode . ravi/octave-shell-switch-to-shell)
+                               (emacs-lisp-mode . ielm)))
+  (setq rtog/goto-buffer-fun 'pop-to-buffer)
+  (add-hook 'python-mode-hook #'rtog/activate)
+  (add-hook 'octave-mode-hook #'rtog/activate)
+  (add-hook 'emacs-lisp-mode-hook #'rtog/activate)
+  (add-hook 'c-mode-common-hook #'rtog/activate)
 
-    (defun ravi/repl-toggle-or-compile-dwim ()
-      (interactive)
-      (if (or rtog/--last-buffer (assoc major-mode rtog/mode-repl-alist))
-          (call-interactively 'rtog/toggle-repl)
-        (call-interactively 'compile-dwim)))
+  (defun ravi/repl-toggle-or-compile-dwim ()
+    (interactive)
+    (if (or rtog/--last-buffer (assoc major-mode rtog/mode-repl-alist))
+        (call-interactively 'rtog/toggle-repl)
+      (call-interactively 'compile-dwim)))
 
-    ; The default keybinding is not great
-    (unbind-key "C-c C-z" repl-toggle-mode-map)
-    (bind-key "<f5>" 'ravi/repl-toggle-or-compile-dwim repl-toggle-mode-map)
-    )
+  ;; The default keybinding is not great
+  (unbind-key "C-c C-z" repl-toggle-mode-map)
   :diminish repl-toggle-mode)
 
 ;; Calc and friends
-- 
cgit v0.10.1