fix shell handling and C-t rebind

1 files changed, 17 insertions, 16 deletions

diff --git a/emacs/.config/emacs-kj/init.el b/emacs/.config/emacs-kj/init.el
index c26b876..fc47bc5 100644
--- a/emacs/.config/emacs-kj/init.el
+++ b/emacs/.config/emacs-kj/init.el
@@ -115,21 +115,20 @@
 
 (defun kj/shell-here ()
   (interactive)
-  (shell (kj/shell-buffer-name)))
-
-(add-hook 'shell-mode-hook
-          (defun kj/kill-shell-buffer-on-exit ()
-            (let* ((proc (get-buffer-process (current-buffer)))
-                   (sentinel (process-sentinel proc)))
-              (set-process-sentinel
-               proc
-               `(lambda (proc signal)
-                  (funcall ',sentinel proc signal)
-                  (and (memq (process-status proc) '(exit signal))
-                       (buffer-live-p (process-buffer proc))
-                       (message "Shell died, killing buffer %s"
-                                (process-buffer proc))
-                       (kill-buffer (process-buffer proc))))))))
+  (let ((buffer
+         (shell (kj/shell-buffer-name))))
+    (with-current-buffer buffer
+      (let* ((proc (get-buffer-process (current-buffer)))
+             (sentinel (process-sentinel proc)))
+        (set-process-sentinel
+         proc
+         `(lambda (proc signal)
+            (funcall ',sentinel proc signal)
+            (and (memq (process-status proc) '(exit signal))
+                 (buffer-live-p (process-buffer proc))
+                 (message "Shell died, killing buffer %s"
+                          (process-buffer proc))
+                 (kill-buffer (process-buffer proc)))))))))
 
 (add-hook 'comint-output-filter-functions #'comint-osc-process-output)
 
@@ -212,7 +211,9 @@
   (savehist-mode))
 
 ;; Rebind C-x?
-(define-key key-translation-map "\C-t" "\C-x")
+(global-set-key (kbd "C-t") 'ctrl-x-map)
+(define-key global-map (kbd "C-t") ctl-x-map)
+;; (define-key key-translation-map "\C-t" "\C-t")
 ;; (define-key key-translation-map "\C-x" "\C-t")
 
 (use-package marginalia