refactor: split eshell-vterm-config into eshell-config and vterm-config

The combined module had grown to 573 lines covering two unrelated subsystems with no shared state — the eshell shell-mode commands and the vterm/F12 toggle. The header even rendered this with two `;; ----` dividers. Split into two focused modules. eshell-config.el keeps the eshell user commands and package wiring (~170 lines). vterm-config.el keeps the vterm package, the tmux history capture command, the F12 toggle, and the C-; V keymap (~400 lines). Update init.el to require both, point the four vterm test files at vterm-config, and refresh the cross-module commentary in cj-window-geometry.el and cj-window-toggle.el.

No behavior change. Full test suite green; validate-modules clean.

1 files changed, 0 insertions, 573 deletions

diff --git a/modules/eshell-vterm-config.el b/modules/eshell-vterm-config.el
deleted file mode 100644
index 165e0437..00000000
--- a/modules/eshell-vterm-config.el
+++ /dev/null
@@ -1,573 +0,0 @@
-;;; eshell-vterm-config --- Settings for the Emacs Shell -*- lexical-binding: t; coding: utf-8; -*-
-;; author Craig Jennings <c@cjennings.net>
-
-;;; Commentary:
-
-;; ESHELL
-;; - Eshell is useful as a REPL
-;; - Redirect to the kill ring : ls > /dev/kill
-;; - Redirect to the clioboard : ls > /dev/clip
-;; - Redirect to a buffer      : ls > #<ls-output>
-;; - Use elisp functions       : write your own "detox" command in elisp
-;;                             : then use it in eshell
-;; - cd to remote directories  : cd /sshx:c@cjennings.net:/home/cjennings
-;;                             : and take all the elisp functionality remotely
-;;                             : including Dired or Magit on a remote server
-
-;; VTERM
-;; At the moment, vterm behaves like a real terminal. For most keys, vterm will
-;; just send them to the process that is currently running. So, C-a may be
-;; beginning-of-the-line in a shell, or the prefix key in a screen session.
-
-;; If you enter vterm-copy-mode with C-; V c or <pause>, the buffer will become
-;; a normal Emacs buffer. You can then use your navigation keys, select
-;; rectangles, etc.  When you press RET or M-w, the region will be copied and
-;; you'll be back in a working terminal session.  C-; V C captures the current
-;; tmux pane history into a temporary Emacs buffer where M-w copies the selected
-;; region and returns to the vterm.
-
-;; ANSI-TERM & TERM
-;; I haven't yet found a need for term or ansi-term in my workflows, so I leave
-;; them with their default configurations.
-
-;;; Code:
-
-(require 'system-utils)
-(require 'keybindings)
-(require 'seq)
-(require 'subr-x)
-
-;; ------------------------------ Eshell -----------------------------
-;; the Emacs shell.
-
-(use-package eshell
-  :ensure nil ;; built-in
-  :commands (eshell)
-  :config
-  (setq eshell-banner-message "")
-  (setq eshell-scroll-to-bottom-on-input 'all)
-  (setq eshell-error-if-no-glob t)
-  (setq eshell-hist-ignoredups t)
-  (setq eshell-save-history-on-exit t)
-  (setq eshell-prefer-lisp-functions nil)
-  (setq eshell-destroy-buffer-when-process-dies t)
-
-  ;; no pagers required
-  (setenv "PAGER" "cat")
-
-  (setq eshell-prompt-function
-		(lambda ()
-		  (concat
-		   (propertize (format-time-string "[%d-%m-%y %T]") 'face '(:foreground "gray"))
-		   " "
-		   (propertize (user-login-name) 'face '(:foreground "gray"))
-		   " "
-           (propertize (system-name) 'face '(:foreground "gray"))
-		   ":"
-		   (propertize (abbreviate-file-name (eshell/pwd)) 'face '(:foreground "gray"))
-		   "\n"
-		   (propertize "%"  'face '(:foreground "white"))
-		   " ")))
-
-  (add-hook
-   'eshell-mode-hook
-   (lambda ()
-     (setq pcomplete-cycle-completions nil)))
-  (setq eshell-cmpl-cycle-completions nil)
-
-  (add-to-list 'eshell-modules-list 'eshell-tramp)
-
-  (add-hook 'eshell-hist-mode-hook
-            (lambda ()
-              (keymap-set eshell-hist-mode-map "<up>" #'previous-line)
-              (keymap-set eshell-hist-mode-map "<down>" #'next-line)))
-
-  (add-hook 'eshell-mode-hook
-            (lambda ()
-              (add-to-list 'eshell-visual-commands '("lf" "ranger" "tail" "htop" "gotop" "mc" "ncdu" "top"))
-              (add-to-list 'eshell-visual-subcommands '("git" "log" "diff" "show"))
-              (add-to-list 'eshell-visual-options '("git" "--help" "--paginate"))
-
-              ;; aliases
-              (eshell/alias "e"      "find-file $1")
-			  (eshell/alias "em"     "find-file $1")
-			  (eshell/alias "emacs"  "find-file $1")
-			  (eshell/alias "open"   "cj/xdg-open $1")
-			  (eshell/alias "gocj"   "cd /sshx:cjennings@cjennings.net:/var/cjennings/")
-			  (eshell/alias "gosb"   "cd /sshx:cjennings@wolf.usbx.me:/home/cjennings/")
-			  (eshell/alias "gowolf" "cd /sshx:cjennings@wolf.usbx.me:/home/cjennings/")
-			  (eshell/alias "v"      "eshell-exec-visual $*")
-			  (eshell/alias "ff"     "find-file-other-window $1")
-			  (eshell/alias "f"      "find-using-dired $1")
-			  (eshell/alias "r"      "ranger")
-			  (eshell/alias "ll"     "ls -laF"))))
-
-(defun eshell/find-file-other-window (&rest files)
-  "Open FILE(s) in other window from eshell."
-  (if (= 1 (length files))
-	  ;; Single file - just use it directly
-	  (find-file-other-window (car files))
-	;; Multiple files - open each in other window
-	(dolist (file files)
-	  (find-file-other-window file))))
-
-(defun eshell/find-file (&rest files)
-  "Open FILE(s) from eshell."
-  (if (= 1 (length files))
-	  ;; Single file
-	  (find-file (car files))
-	;; Multiple files
-	(dolist (file files)
-      (find-file file))))
-
-(defun eshell/clear ()
-  "Clear the eshell buffer."
-  (let ((inhibit-read-only t))
-    (erase-buffer)
-    (eshell-send-input)))
-
-(defun eshell/find-using-dired (file-pattern)
-  "Find a file matching FILE-PATTERN using `find-name-dired'."
-  (let ((escaped-pattern (regexp-quote file-pattern)))
-    (find-name-dired default-directory escaped-pattern)))
-
-(defun cj/eshell-delete-window-on-exit ()
-  "Close the eshell window when exiting."
-  (when (not (one-window-p))
-    (delete-window)))
-(advice-add 'eshell-life-is-too-much :after 'cj/eshell-delete-window-on-exit)
-
-(use-package eshell-toggle
-  :custom
-  (eshell-toggle-size-fraction 2)
-  (eshell-toggle-run-command nil)
-  (eshell-toggle-init-function #'eshell-toggle-init-eshell)
-  :bind
-  ("C-<f12>" . eshell-toggle))
-
-(use-package xterm-color
-  :after eshell
-  :hook
-  (eshell-before-prompt-hook . (lambda ()
-                                 (setq xterm-color-preserve-properties t)))
-  :config
-  (setenv "TERM" "xterm-256color"))
-
-(use-package eshell-syntax-highlighting
-  :after esh-mode
-  :config
-  (eshell-syntax-highlighting-global-mode +1))
-
-(use-package eshell-up
-  :after eshell
-  :config
-  (defalias 'eshell/up 'eshell-up)
-  (defalias 'eshell/up-peek 'eshell-up-peek))
-
-;; Enhance history searching
-(defun cj/eshell-history-search ()
-  "Search eshell history with completion."
-  (interactive)
-  (insert
-   (completing-read "Eshell history: "
-					(delete-dups
-					 (ring-elements eshell-history-ring)))))
-
-(add-hook 'eshell-mode-hook
-		  (lambda ()
-			(keymap-set eshell-mode-map "C-r" #'cj/eshell-history-search)))
-
-;; Better completion for eshell
-(use-package pcmpl-args
-  :after eshell)
-
-;; Company mode integration for eshell
-(use-package company-shell
-  :after (eshell company)
-  :config
-  (add-to-list 'company-backends 'company-shell)
-  (add-hook 'eshell-mode-hook
-			(lambda ()
-			  (setq-local company-minimum-prefix-length 2)
-			  (setq-local company-idle-delay 2)
-			  (company-mode 1))))
-
-
-;; ------------------------------ Vterm ------------------------------
-;; faster and highly dependable, but not extensible
-
-(defvar-keymap cj/vterm-map
-  :doc "Personal vterm command map.")
-;; Uppercase V is intentional: lowercase C-; v is the version-control menu.
-(keymap-set cj/custom-keymap "V" cj/vterm-map)
-
-(defvar-local cj/vterm-tmux-history--origin-buffer nil
-  "Buffer active before opening the tmux history buffer.")
-
-(defvar-local cj/vterm-tmux-history--origin-window nil
-  "Window active before opening the tmux history buffer.")
-
-(defvar-local cj/vterm-tmux-history--origin-point nil
-  "Point in the origin buffer before opening the tmux history buffer.")
-
-(defun cj/vterm--tmux-output (&rest args)
-  "Run tmux with ARGS and return its stdout.
-Signal `user-error' when tmux exits with a non-zero status."
-  (with-temp-buffer
-    (let ((exit-code (apply #'process-file "tmux" nil t nil args)))
-      (unless (zerop exit-code)
-        (user-error "tmux failed: %s" (string-trim (buffer-string))))
-      (buffer-string))))
-
-(defun cj/vterm--tmux-pane-id-for-tty (tty)
-  "Return the tmux pane id for client TTY."
-  (let* ((output (cj/vterm--tmux-output
-                  "list-clients" "-F" "#{client_tty}\t#{pane_id}"))
-         (lines (split-string output "\n" t))
-         (match (seq-find
-                 (lambda (line)
-                   (let ((fields (split-string line "\t")))
-                     (equal (car fields) tty)))
-                 lines)))
-    (unless match
-      (user-error "No tmux client found for vterm tty %s" tty))
-    (cadr (split-string match "\t"))))
-
-(defun cj/vterm--tmux-capture-pane (pane-id)
-  "Return full joined tmux history for PANE-ID."
-  (cj/vterm--tmux-output
-   "capture-pane" "-p" "-J" "-S" "-" "-E" "-" "-t" pane-id))
-
-(defun cj/vterm--current-tmux-pane-id ()
-  "Return the tmux pane id for the current vterm buffer."
-  (unless (eq major-mode 'vterm-mode)
-    (user-error "Current buffer is not a vterm buffer"))
-  (let* ((proc (get-buffer-process (current-buffer)))
-         (tty (and proc (process-tty-name proc))))
-    (unless (and tty (not (string-empty-p tty)))
-      (user-error "Could not determine vterm tty"))
-    (cj/vterm--tmux-pane-id-for-tty tty)))
-
-(defvar-keymap cj/vterm-tmux-history-mode-map
-  :doc "Keymap for `cj/vterm-tmux-history-mode'."
-  "M-w" #'cj/vterm-tmux-history-copy-and-quit
-  "q" #'cj/vterm-tmux-history-quit)
-
-(define-derived-mode cj/vterm-tmux-history-mode special-mode "Tmux History"
-  "Mode for copying captured tmux pane history with normal Emacs keys."
-  (setq-local truncate-lines t)
-  (goto-address-mode 1))
-
-(defun cj/vterm-tmux-history-quit ()
-  "Quit tmux history and return to its origin buffer."
-  (interactive)
-  (let ((history-buffer (current-buffer))
-        (origin-buffer cj/vterm-tmux-history--origin-buffer)
-        (origin-window cj/vterm-tmux-history--origin-window)
-        (origin-point cj/vterm-tmux-history--origin-point))
-    (when (buffer-live-p origin-buffer)
-      (if (window-live-p origin-window)
-          (progn
-            (set-window-buffer origin-window origin-buffer)
-            (select-window origin-window))
-        (pop-to-buffer origin-buffer))
-      (with-current-buffer origin-buffer
-        (when (integer-or-marker-p origin-point)
-          (goto-char origin-point))))
-    (when (buffer-live-p history-buffer)
-      (kill-buffer history-buffer))))
-
-(defun cj/vterm-tmux-history-copy-and-quit ()
-  "Copy active region from tmux history, then quit back to the origin."
-  (interactive)
-  (unless (use-region-p)
-    (user-error "No active region"))
-  (let ((text (buffer-substring-no-properties
-               (region-beginning)
-               (region-end))))
-    (kill-new text)
-    (deactivate-mark)
-    (cj/vterm-tmux-history-quit)))
-
-(defun cj/vterm-tmux-history ()
-  "Open full tmux pane history in a temporary Emacs buffer.
-
-The history buffer uses normal Emacs navigation and selection.  `M-w'
-copies the active region, closes the history buffer, and returns point
-to the vterm buffer that launched it."
-  (interactive)
-  (let* ((origin-buffer (current-buffer))
-         (origin-window (selected-window))
-         (origin-point (point))
-         (pane-id (cj/vterm--current-tmux-pane-id))
-         (history (cj/vterm--tmux-capture-pane pane-id))
-         (buffer (get-buffer-create
-                  (format "*vterm tmux history: %s*" (buffer-name origin-buffer)))))
-    (with-current-buffer buffer
-      (let ((inhibit-read-only t))
-        (erase-buffer)
-        (insert history))
-      (cj/vterm-tmux-history-mode)
-      (setq-local cj/vterm-tmux-history--origin-buffer origin-buffer)
-      (setq-local cj/vterm-tmux-history--origin-window origin-window)
-      (setq-local cj/vterm-tmux-history--origin-point origin-point)
-      (goto-char (point-max)))
-    (pop-to-buffer buffer)))
-
-(defun cj/vterm-copy-mode-cancel ()
-  "Exit `vterm-copy-mode' without copying."
-  (interactive)
-  (unless (bound-and-true-p vterm-copy-mode)
-    (user-error "This command is effective only in vterm-copy-mode"))
-  (vterm-copy-mode -1))
-
-(use-package vterm
-  :defer .5
-  :commands (vterm vterm-other-window)
-  :init
-  (defvar vterm-keymap-exceptions
-    '("C-c" "C-x" "C-u" "C-g" "C-h" "C-l" "M-x" "M-o" "C-y" "M-y")
-    "Exceptions for `vterm-keymap'.")
-  (add-to-list 'vterm-keymap-exceptions "C-;")
-  (setq vterm-always-compile-module t)
-
-  (defun cj/turn-off-chrome-for-vterm ()
-	(hl-line-mode -1)
-	(display-line-numbers-mode -1))
-
-  (defun cj/vterm-launch-tmux ()
-	"Automatically launch tmux in vterm if not already in a tmux session.
-
-Skipped when `cj/--ai-vterm-suppress-tmux' is non-nil so the AI-vterm
-flow can run its own project-named tmux session instead of a bare,
-auto-named one.  `bound-and-true-p' keeps this safe whether or not
-ai-vterm.el is loaded."
-	(let ((proc (get-buffer-process (current-buffer))))
-	  (when (and proc
-				 (not (getenv "TMUX")) ; Check if not already in tmux
-				 (not (bound-and-true-p cj/--ai-vterm-suppress-tmux)))
-		(vterm-send-string "tmux\n"))))
-  :hook
-  ((vterm-mode . cj/turn-off-chrome-for-vterm)
-   (vterm-mode . cj/vterm-launch-tmux))
-  :bind
-  (:map vterm-mode-map
-		("<f8>"    . nil)
-		("<f9>"    . nil)
-		("<f10>"   . nil)
-		("<f12>"   . nil)
-		("C-c C-t" . nil)
-		("C-y"     . vterm-yank)
-		("<pause>" . vterm-copy-mode))
-  :custom
-  (vterm-kill-buffer-on-exit t)
-  (vterm-max-scrollback 100000)
-  :config
-  (setq vterm-timer-delay nil))
-
-;; vterm-toggle is kept installed so `M-x vterm-toggle' still works,
-;; but F12 below is bound to a custom toggle (`cj/vterm-toggle') that
-;; excludes claude-prefixed buffers from its candidate set.
-(use-package vterm-toggle
-  :defer .5
-  :config
-  (setq vterm-toggle-fullscreen-p nil))
-
-;; ----------------------- F12 toggle (custom) -----------------------
-;;
-;; Replacement for `vterm-toggle' on F12.  Two reasons to roll our own:
-;;
-;; 1. claude exclusion.  vterm-toggle picks the most-recently-selected
-;;    vterm buffer as the toggle target.  When the user just used F9
-;;    on a claude vterm, the most-recent vterm IS claude, so F12 ends
-;;    up toggling claude -- which has its own F9 / C-F9 / M-F9 surface
-;;    in `ai-vterm.el' and shouldn't be affected by F12.  The claude
-;;    exclusion lives in the candidate filter (`cj/--vterm-toggle-buffer-p').
-;;
-;; 2. user-modified geometry.  vterm-toggle's display rule had a
-;;    hard-coded `(window-height . 0.7)' that overrode any mouse-resize
-;;    or M-S-t orientation flip on the next toggle.  This module mirrors
-;;    the geometry-preservation pattern shipped in ai-vterm.el: capture
-;;    direction + body size at toggle-off, replay them via a custom
-;;    display action (`cj/--vterm-toggle-display-saved') that uses
-;;    frame-edge directions and `(body-columns . N)' / `(body-lines . N)'
-;;    so the result is divider-independent and layout-stable.
-
-(require 'cl-lib)
-(require 'seq)
-(require 'cj-window-geometry)
-(require 'cj-window-toggle)
-
-(defcustom cj/vterm-toggle-window-height 0.7
-  "Default fraction of frame height for the F12 vterm window.
-Used as the size fallback when `cj/--vterm-toggle-last-size' is nil
-(i.e. the user hasn't toggled off a vterm yet this session)."
-  :type 'number
-  :group 'vterm)
-
-(defvar cj/--vterm-toggle-last-direction nil
-  "Last user-chosen direction for the F12 vterm display.
-Symbol: right, left, below, above.  nil means use the default
-`below' for F12's traditional bottom split.")
-
-(defvar cj/--vterm-toggle-last-size nil
-  "Last user-chosen body size for the F12 vterm display.
-Positive integer: body-cols (right/left) or body-lines (below/above).
-nil means fall back to `cj/vterm-toggle-window-height' as a fraction.")
-
-(defun cj/--vterm-toggle-buffer-p (buffer)
-  "Return non-nil when BUFFER is a vterm buffer F12 should manage.
-
-Qualifies when BUFFER is alive, has `vterm-mode' (or its name starts
-with the vterm-toggle prefix), AND its name does NOT start with the
-claude prefix used by ai-vterm.el.  The claude exclusion keeps F12
-from grabbing buffers that ai-vterm.el's F9 dispatch owns."
-  (and (bufferp buffer)
-       (buffer-live-p buffer)
-       (with-current-buffer buffer
-         (and (or (eq major-mode 'vterm-mode)
-                  (string-prefix-p (or (bound-and-true-p vterm-buffer-name)
-                                       "*vterm*")
-                                   (buffer-name buffer)))
-              (not (string-prefix-p "claude [" (buffer-name buffer)))))))
-
-(defun cj/--vterm-toggle-buffers ()
-  "Return live F12-managed vterm buffers in `buffer-list' (MRU) order."
-  (seq-filter #'cj/--vterm-toggle-buffer-p (buffer-list)))
-
-(defun cj/--vterm-toggle-displayed-window (&optional frame)
-  "Return a window in FRAME currently displaying an F12 vterm buffer, or nil.
-FRAME defaults to the selected frame.  Minibuffer is excluded."
-  (seq-find (lambda (w)
-              (cj/--vterm-toggle-buffer-p (window-buffer w)))
-            (window-list (or frame (selected-frame)) 'never)))
-
-(defun cj/--vterm-toggle-capture-state (window)
-  "Capture WINDOW's direction + body size into module-level state.
-
-Default direction is `below' to match F12's traditional bottom
-split when WINDOW fills the frame's root area."
-  (cj/window-toggle-capture-state
-   window 'below
-   'cj/--vterm-toggle-last-direction
-   'cj/--vterm-toggle-last-size))
-
-(defun cj/--vterm-toggle-display-saved (buffer alist)
-  "Display-buffer action: split per saved direction and body size.
-
-Delegates to `cj/window-toggle-display-saved' against the F12 state
-vars, falling back to `below' and `cj/vterm-toggle-window-height'."
-  (cj/window-toggle-display-saved
-   buffer alist
-   'cj/--vterm-toggle-last-direction 'below
-   'cj/--vterm-toggle-last-size cj/vterm-toggle-window-height))
-
-(defun cj/--vterm-toggle-display-rule-list ()
-  "Return the `display-buffer-alist' entry list installed by F12.
-
-Routes any vterm buffer that satisfies `cj/--vterm-toggle-buffer-p'
-through two actions: reuse-window (for visible vterm windows) then
-the saved-geometry display action.  Excludes claude buffers via the
-predicate -- those are handled by ai-vterm.el's display rule."
-  '(((lambda (buffer-or-name _)
-       (cj/--vterm-toggle-buffer-p (get-buffer buffer-or-name)))
-     (display-buffer-reuse-window
-      cj/--vterm-toggle-display-saved)
-     (inhibit-same-window . t))))
-
-(dolist (entry (cj/--vterm-toggle-display-rule-list))
-  (add-to-list 'display-buffer-alist entry))
-
-(defun cj/--vterm-toggle-dispatch ()
-  "Compute the F12 (`cj/vterm-toggle') action without performing it.
-
-Returns one of:
-- (toggle-off . WINDOW)        -- vterm displayed in WINDOW; hide it.
-- (show-recent . BUFFER)       -- vterm alive but not shown; redisplay.
-- (create-new)                 -- no vterm buffer alive; create one."
-  (let ((win (cj/--vterm-toggle-displayed-window)))
-    (cond
-     (win (cons 'toggle-off win))
-     (t
-      (let ((buffers (cj/--vterm-toggle-buffers)))
-        (cond
-         (buffers (cons 'show-recent (car buffers)))
-         (t '(create-new))))))))
-
-(declare-function vterm "vterm" (&optional buffer-name))
-
-(defun cj/vterm-toggle ()
-  "Toggle a normal (non-claude) vterm buffer.
-
-- If an F12-managed vterm is currently displayed in this frame,
-  capture its geometry and delete its window (toggle off).  Falls
-  back to burying the buffer when the vterm is the only window in
-  the frame.
-- Otherwise, if any F12-managed vterm buffer is alive, display the
-  most-recent one via the saved-geometry action.
-- Otherwise, create a new vterm via `(vterm)' which routes through
-  the same display action.
-
-Excludes claude-prefixed vterm buffers; those have their own F9 /
-C-F9 / M-F9 dispatch via `cj/ai-vterm'."
-  (interactive)
-  (pcase (cj/--vterm-toggle-dispatch)
-    (`(toggle-off . ,win)
-     (cj/--vterm-toggle-capture-state win)
-     (if (one-window-p)
-         (bury-buffer (window-buffer win))
-       (delete-window win))
-     nil)
-    (`(show-recent . ,buf)
-     (display-buffer buf)
-     (let ((w (get-buffer-window buf)))
-       (when w (select-window w)))
-     buf)
-    (`(create-new)
-     (vterm))))
-
-(keymap-global-set "<f12>" #'cj/vterm-toggle)
-
-(keymap-set cj/vterm-map "C" #'cj/vterm-tmux-history)
-(keymap-set cj/vterm-map "c" #'vterm-copy-mode)
-(keymap-set cj/vterm-map "l" #'vterm-clear-scrollback)
-(keymap-set cj/vterm-map "n" #'vterm)
-(keymap-set cj/vterm-map "o" #'vterm-other-window)
-(keymap-set cj/vterm-map "q" #'vterm-send-next-key)
-(keymap-set cj/vterm-map "r" #'vterm-reset-cursor-point)
-(keymap-set cj/vterm-map "t" #'cj/vterm-toggle)
-
-(defun cj/vterm-install-prefix-key ()
-  "Make `C-;' resolve as the personal keymap inside vterm buffers."
-  (when (boundp 'vterm-mode-map)
-    (keymap-set vterm-mode-map "C-;" cj/custom-keymap)))
-
-(defun cj/vterm-install-copy-mode-cancel-keys ()
-  "Install copy and cancel keys in `vterm-copy-mode-map'."
-  (when (boundp 'vterm-copy-mode-map)
-    (keymap-set vterm-copy-mode-map "C-g" #'cj/vterm-copy-mode-cancel)
-    (keymap-set vterm-copy-mode-map "<escape>" #'cj/vterm-copy-mode-cancel)
-    (keymap-set vterm-copy-mode-map "M-w" #'vterm-copy-mode-done)))
-
-(cj/vterm-install-prefix-key)
-(cj/vterm-install-copy-mode-cancel-keys)
-(with-eval-after-load 'vterm
-  (cj/vterm-install-prefix-key)
-  (cj/vterm-install-copy-mode-cancel-keys))
-
-(add-hook 'vterm-mode-hook #'goto-address-mode)
-
-(with-eval-after-load 'which-key
-  (which-key-add-key-based-replacements
-    "C-; V" "vterm menu"
-    "C-; V C" "tmux scrollback copy"
-    "C-; V c" "vterm copy mode"
-    "C-; V l" "clear vterm scrollback"
-    "C-; V n" "new vterm"
-    "C-; V o" "vterm other window"
-    "C-; V q" "send next key to vterm"
-    "C-; V r" "reset vterm cursor point"
-    "C-; V t" "toggle vterm"))
-
-(provide 'eshell-vterm-config)
-;;; eshell-vterm-config.el ends here.