Minor updates.

.emacs.d/modules/term/eshell/autoload/evil.el

@@ -32,38 +32,3 @@ already there)."
   (interactive)
   (goto-char (point-max))
   (evil-append 1))
-
-;;;###autoload (autoload '+eshell/evil-change "term/eshell/autoload/evil" nil t)
-(evil-define-operator +eshell/evil-change (beg end type register yank-handler delete-func)
-  "Like `evil-change' but will not delete/copy the prompt."
-  (interactive "<R><x><y>")
-  (save-restriction
-    (narrow-to-region eshell-last-output-end (point-max))
-    (evil-change (max beg (point-min))
-                 (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max)))
-                 type register yank-handler delete-func)))
-
-;;;###autoload (autoload '+eshell/evil-change-line "term/eshell/autoload/evil" nil t)
-(evil-define-operator +eshell/evil-change-line (beg end type register yank-handler)
-  "Change to end of line."
-  :motion evil-end-of-line
-  (interactive "<R><x><y>")
-  (+eshell/evil-change beg end type register yank-handler #'evil-delete-line))
-
-;;;###autoload (autoload '+eshell/evil-delete "term/eshell/autoload/evil" nil t)
-(evil-define-operator +eshell/evil-delete (beg end type register yank-handler)
-  "Like `evil-delete' but will not delete/copy the prompt."
-  (interactive "<R><x><y>")
-  (save-restriction
-    (narrow-to-region eshell-last-output-end (point-max))
-    (evil-delete (if beg (max beg (point-min)) (point-min))
-                 (if (eq type 'line) (point-max) (min (or end (point-max)) (point-max)))
-                 type register yank-handler)))
-
-;;;###autoload (autoload '+eshell/evil-delete-line "term/eshell/autoload/evil" nil t)
-(evil-define-operator +eshell/evil-delete-line (_beg end type register yank-handler)
-  "Change to end of line."
-  :motion nil
-  :keep-visual t
-  (interactive "<R><x>")
-  (+eshell/evil-delete (point) end type register yank-handler))

.emacs.d/modules/term/eshell/config.el

@@ -126,10 +126,6 @@ You should use `set-eshell-alias!' to change this.")
       (map! :map eshell-mode-map
             :n "RET"     #'+eshell/goto-end-of-prompt
             :n [return]  #'+eshell/goto-end-of-prompt
-            :n "c"       #'+eshell/evil-change
-            :n "C"       #'+eshell/evil-change-line
-            :n "d"       #'+eshell/evil-delete
-            :n "D"       #'+eshell/evil-delete-line
             :ni "C-j"    #'eshell-next-matching-input-from-input
             :ni "C-k"    #'eshell-previous-matching-input-from-input
             :ig "C-d"    #'+eshell/quit-or-delete-char

.emacs.d/modules/term/eshell/packages.el

@@ -10,4 +10,4 @@
 (unless IS-WINDOWS
   (when (featurep! :completion company)
     (package! fish-completion :pin "10384881817b5ae38cf6197a077a663420090d2c")
-    (package! bash-completion :pin "96ce14af9674f3e605bacca87abc0c23b8f13cd5")))
+    (package! bash-completion :pin "d47edb9d4142a22746009c1f680df93a4fefd107")))

.emacs.d/modules/term/vterm/config.el

@@ -6,6 +6,18 @@
   :preface (setq vterm-install t) ; compile the package when you load vterm
   :hook (vterm-mode . doom-mark-buffer-as-real-h)
   :hook (vterm-mode . hide-mode-line-mode) ; modeline serves no purpose in vterm
+  :preface
+  (when! (fboundp 'native-compile)
+    ;; HACK Fix #3683: `vterm-module-compile' uses `locate-library' to determine
+    ;;      where vterm-module.so should be, but an eln file (for emacsGcc
+    ;;      users) reports a subdirectory that will never contain it; rendering
+    ;;      vterm unable to build itself.
+    ;; REVIEW Remove this when akermu/emacs-libvterm#363 is resolved.
+    (defadvice! +vterm--dont-resolve-to-eln-file-a (orig-fn &rest args)
+      :around #'vterm-module-compile
+      (let ((load-suffixes (remove ".eln" load-suffixes)))
+        (apply orig-fn args))))
+
   :config
   (set-popup-rule! "^vterm" :size 0.25 :vslot -4 :select t :quit nil :ttl 0)
 

.emacs.d/modules/term/vterm/doctor.el

@@ -1,8 +1,5 @@
 ;;; term/vterm/doctor.el -*- lexical-binding: t; -*-
 
-(unless (executable-find "vterm-ctrl")
-  (warn! "Couldn't find libvterm. Vterm module won't compile"))
-
 (unless (executable-find "make")
   (warn! "Couldn't find make command. Vterm module won't compile"))