(Hopefully) fix elisp/inferior-cc.el

init.el

@@ -61,7 +61,7 @@
          ((text-mode tex-mode prog-mode) . my/-enable-show-trailing-whitespace))
   :init
   (with-eval-after-load 'find-func
-    (when (file-directory-p "~/src/emacs/src/")
+    (when (and (file-directory-p "~/src/emacs/src/"))
       (setq find-function-C-source-directory "~/src/emacs/src/")))
 
   (defun my/-enable-show-trailing-whitespace ()
@@ -936,8 +936,8 @@ visual states."
         ;; read-extended-command-predicate #'command-completion-default-include-p
         read-extended-command-predicate nil
         minibuffer-prompt-properties '(read-only t ;; noindent 3
-                                       cursor-intangible t
-                                       face minibuffer-prompt))
+                                                 cursor-intangible t
+                                                 face minibuffer-prompt))
   (vertico-mode 1)
   ;; for jinx
   (require 'vertico-multiform)
@@ -1765,16 +1765,10 @@ otherwise, call `bibtex-find-text'."
 ;; My dev environment for ROS2
 (require 'arch-ros2)
 
-(require 'inferior-jshell)
 ;; java-ts-mode
 (use-package java-ts-mode
   :hook ((java-ts-mode . trusted-files-eglot-ensure-if-safe)
          (java-ts-mode . my/-setup-java-ts-mode))
-  :bind (:map java-ts-mode-map
-         ("C-x C-e" . jshell-eval-expression)
-         ("C-M-x" . jshell-eval-defun)
-         ("C-c C-r" . jshell-eval-region)
-         ("C-c C-b" . jshell-eval-buffer))
   :config
   (defun my/-setup-java-ts-mode ()
     (let ((rules (car treesit-simple-indent-rules)))
@@ -2090,6 +2084,19 @@ Note that this erases the buffer before doing anything."
               nil t))
   (add-hook 'sly-mrepl-mode-hook #'my/-sly-mrepl-enable-fontification))
 
+;; inferior cc
+(require 'inferior-cc)
+(with-eval-after-load 'c-ts-mode
+  (keymap-set c-ts-base-mode-map "C-x C-e" #'inferior-cc-eval-expression)
+  (keymap-set c-ts-base-mode-map "C-c C-r" #'inferior-cc-eval-region)
+  (keymap-set c-ts-base-mode-map "C-c C-b" #'inferior-cc-eval-buffer)
+  (keymap-set c-ts-base-mode-map "C-M-x" #'inferior-cc-eval-defun))
+(with-eval-after-load 'java-ts-mode
+  (keymap-set java-ts-mode-map "C-x C-e" #'inferior-cc-eval-expression)
+  (keymap-set java-ts-mode-map "C-c C-r" #'inferior-cc-eval-region)
+  (keymap-set java-ts-mode-map "C-c C-b" #'inferior-cc-eval-buffer)
+  (keymap-set java-ts-mode-map "C-M-x" #'inferior-cc-eval-defun))
+
 ;; jupyter
 (use-package jupyter
   :hook (jupyter-repl-mode . my/-setup-jupyter-mode)
@@ -2210,32 +2217,6 @@ current buffer is a Jupyter buffer, just use that."
                                      (point-min) (point-max)))
   (message "Evaluated buffer"))
 
-(defun my/c++-jupyter-eval-region (start end)
-  "Send the current buffer between START and END to a Jupyter repl."
-  (interactive "r")
-  (let ((code (buffer-substring-no-properties start end)))
-    (when (string-suffix-p ";" code)
-      (setq code (substring code 0 (1- (length code)))))
-    (my/jupyter-eval-in-proper-buffer code)
-    (message "Evaluated region")))
-
-(defun my/c++-ts-jupyter-eval-expression ()
-  "Eval the expression under point by sending it to a Jupyter repl."
-  (interactive nil c-ts-mode c++-ts-mode)
-  (save-excursion
-    (let ((start (point)))
-      (back-to-indentation)
-      (unless (> (point) start)
-        (goto-char start)))
-    (if-let ((thing (treesit-thing-at-point "_" 'nested))
-             (code (treesit-node-text thing)))
-        (progn
-          (when (string-suffix-p ";" code)
-            (setq code (substring code 0 (1- (length code)))))
-          (my/jupyter-eval-in-proper-buffer code)
-          (message "Evaluated: %s" code))
-      (user-error "Nothing to evaluate under point"))))
-
 (defun my/rust-jupyter-eval-region (start end)
   "Send the current buffer between START and END to a Jupyter repl."
   (interactive "r")
@@ -2258,16 +2239,6 @@ current buffer is a Jupyter buffer, just use that."
           (message "Evaluated: %s" code))
       (user-error "Nothing to evaluate under point"))))
 
-(with-eval-after-load 'c-ts-mode
-  (keymap-set c-ts-base-mode-map
-              "C-M-x" #'my/jupyter-eval-defun)
-  (keymap-set c-ts-base-mode-map
-              "C-x C-e" #'my/c++-ts-jupyter-eval-expression)
-  (keymap-set c-ts-base-mode-map
-              "C-c C-r" #'my/c++-jupyter-eval-region)
-  (keymap-set c-ts-base-mode-map
-              "C-c C-b" #'my/jupyter-eval-buffer))
-
 (with-eval-after-load 'rust-ts-mode
   (keymap-set rust-ts-mode-map
               "C-M-x" #'my/jupyter-eval-defun)
@@ -2739,6 +2710,10 @@ functions (only eshell uses it at the time of writing)."
                  "--group-directories-first" ,file))))
   (add-to-list 'dirvish-preview-dispatchers 'eza))
 
+;; trashed
+(use-package trashed
+  :bind ("C-c h" . trashed))
+
 ;; ibuffer
 (use-package ibuffer
   :bind ("C-x C-b" . ibuffer))