Merge branch 'develop' into eshell-improvements

modules/term/eshell/autoload/evil.el

@@ -6,7 +6,7 @@
   "TODO"
   (interactive "<fsh><!>")
   (let ((buffer (+eshell-last-buffer))
-        (command (+evil-resolve-vim-path-a command)))
+        (command (+evil-replace-filename-modifiers-a command)))
     (cond (buffer
            (select-window (get-buffer-window buffer))
            (+eshell-run-command command buffer))

modules/term/eshell/config.el

@@ -48,7 +48,7 @@ You should use `set-eshell-alias!' to change this.")
 
 
 ;;
-;; Packages
+;;; Packages
 
 (after! eshell ; built-in
   (setq eshell-banner-message

modules/term/vterm/README.org

@@ -88,6 +88,13 @@ There are several ways to manually install the module:
 1. You can use =M-x vterm-module-compile= to let emacs automatically compile and
    install the module.
 
+   Modify ~vterm-module-cmake-args~ to pass arguments to the cmake build script.
+   e.g. To use a local build of libvterm instead of the included one.
+
+   #+BEGIN_SRC elisp
+   (setq vterm-module-cmake-args "-DUSE_SYSTEM_LIBVTERM=yes")
+   #+END_SRC
+
    *WARNING*: Emacs will hang during the compilation. It may take a while.
 
 2. You can compile and install the module yourself. Go to the vterm installation

modules/term/vterm/config.el

@@ -2,25 +2,26 @@
 
 (use-package! vterm
   :when (bound-and-true-p module-file-suffix)
-  :commands (vterm vterm-mode)
-  :preface (setq vterm-install t)
+  :commands vterm vterm-mode
+  :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
   :config
   (set-popup-rule! "^vterm" :size 0.25 :vslot -4 :select t :quit nil :ttl 0)
 
+  ;; Once vterm is dead, the vterm buffer is useless. Why keep it around? We can
+  ;; spawn another if want one.
+  (setq vterm-kill-buffer-on-exit t)
+
   (setq-hook! 'vterm-mode-hook
-    ;; Don't prompt about processes when killing vterm
+    ;; Don't prompt about dying processes when killing vterm
     confirm-kill-processes nil
     ;; Prevent premature horizontal scrolling
     hscroll-margin 0)
 
-  (setq vterm-kill-buffer-on-exit t)
-
+  ;; Restore the point's location when leaving and re-entering insert mode.
   (when (featurep! :editor evil)
     (add-hook! 'vterm-mode-hook
       (defun +vterm-init-remember-point-h ()
         (add-hook 'evil-insert-state-exit-hook #'+vterm-remember-insert-point-h nil t)
-        (add-hook 'evil-insert-state-entry-hook #'+vterm-goto-insert-point-h nil t))))
-
-  (add-hook 'vterm-mode-hook #'doom-mark-buffer-as-real-h)
-  ;; Modeline serves no purpose in vterm
-  (add-hook 'vterm-mode-hook #'hide-mode-line-mode))
+        (add-hook 'evil-insert-state-entry-hook #'+vterm-goto-insert-point-h nil t)))))

modules/term/vterm/packages.el

@@ -3,4 +3,4 @@
 
 (package! vterm
   :built-in 'prefer
-  :pin "996c535b9c")
+  :pin "aa512b8351")