From 11eb84175a30b96e3fa179723bc486a88d102d05 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 18 Jul 2026 18:24:01 -0500
Subject: fix(shell): require external-open, scope tramp revert, drop dead
 config

- dirvish-config, dwim-shell-config: both call cj/xdg-open (external-open) but relied on init.el requiring it before them, and dirvish's require comment misattributed it to system-utils. Added the require to both and corrected the comment and both Runtime-requires headers.
- tramp-config: revert-without-query was set to '(".*") inside the TRAMP module, so every file in Emacs reverted without confirmation. Scoped it to the TRAMP path regexp, so local files keep their revert prompt and remote files skip the round-trip.
- tramp-config: removed the sshfast method (referenced nowhere, scp and sshx handle everything) and a duplicate tramp-own-remote-path add-to-list.

Tests: new runtime-requires assertions for both modules, red first under make test-file. The tramp :config edits are verified in the daemon. Suite green.
---
 modules/dirvish-config.el    |  7 ++++---
 modules/dwim-shell-config.el |  3 ++-
 modules/tramp-config.el      | 22 +++++-----------------
 3 files changed, 11 insertions(+), 21 deletions(-)

(limited to 'modules')

diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index ef41ab33..edbb0b35 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -8,8 +8,8 @@
 ;; Load shape: eager.
 ;; Eager reason: none; file manager, a command/hook-loaded deferral candidate.
 ;; Top-level side effects: three add-hook, package configuration via use-package.
-;; Runtime requires: user-constants, system-utils, host-environment, system-lib,
-;;   external-open-lib.
+;; Runtime requires: user-constants, system-utils, external-open,
+;;   host-environment, system-lib, external-open-lib.
 ;; Direct test load: yes.
 ;;
 ;; Enhanced file management via Dirvish (modern dired replacement) with icons,
@@ -34,7 +34,8 @@
 ;;; Code:
 
 (require 'user-constants)   ;; code-dir, music-dir, pix-dir et al. used at load time
-(require 'system-utils)     ;; cj/xdg-open, cj/open-file-with-command bound to keys
+(require 'system-utils)     ;; cj/open-file-with-command bound to keys
+(require 'external-open)    ;; cj/xdg-open bound to keys ("o" and OS-handler fallback)
 (require 'host-environment)
 (require 'system-lib)
 (require 'external-open-lib)
diff --git a/modules/dwim-shell-config.el b/modules/dwim-shell-config.el
index e8790a48..a334fc4e 100644
--- a/modules/dwim-shell-config.el
+++ b/modules/dwim-shell-config.el
@@ -7,7 +7,7 @@
 ;; Load shape: eager.
 ;; Eager reason: none; Dired/Dirvish shell commands can load by command.
 ;; Top-level side effects: package configuration via use-package.
-;; Runtime requires: cl-lib, system-lib.
+;; Runtime requires: cl-lib, system-lib, external-open.
 ;; Direct test load: yes.
 ;;
 ;; Configures dwim-shell-command actions for marked Dired/Dirvish files:
@@ -23,6 +23,7 @@
 
 (require 'cl-lib)
 (require 'system-lib)  ;; cj/confirm-strong (permanent file destruction confirm)
+(require 'external-open)  ;; cj/xdg-open, called to open conversion output files
 
 ;; Function declarations (lazily-loaded packages and sibling modules).
 (declare-function dwim-shell-command-on-marked-files "dwim-shell-command")
diff --git a/modules/tramp-config.el b/modules/tramp-config.el
index 95fa83db..1c8a8ab9 100644
--- a/modules/tramp-config.el
+++ b/modules/tramp-config.el
@@ -77,9 +77,10 @@
   ;; Cache remote file attributes for better performance
   (setq remote-file-name-inhibit-cache nil)
 
-  ;; Don't check for modified buffers before revert
-  ;; to avoid unnecessary remote operations
-  (setq revert-without-query '(".*"))
+  ;; Skip the revert confirmation for remote files only, to avoid
+  ;; unnecessary remote round-trips.  Scoped to the TRAMP path regexp so
+  ;; local files keep their normal revert prompt.
+  (setq revert-without-query (list tramp-file-name-regexp))
 
   ;; Refresh buffers when needed rather than automatically
   (setq auto-revert-remote-files nil)
@@ -120,21 +121,8 @@
   ;; Default transfer method (use scp for most efficient transfer)
   (setq tramp-default-method "scp")
 
-  ;; Use different methods based on host/domain patterns
-  (add-to-list 'tramp-methods
-			   '("sshfast"
-				 (tramp-login-program "ssh")
-				 (tramp-login-args (("-l" "%u") ("-p" "%p") ("%c")
-									("-e" "none") ("-t" "-t") ("%h")))
-				 (tramp-async-args (("-q")))
-				 (tramp-remote-shell "/bin/sh")
-				 (tramp-remote-shell-login ("-l"))
-				 (tramp-remote-shell-args ("-c"))
-				 (tramp-connection-timeout 10)))
-
   ;; Remote shell and project settings
-  ;; Support for Docker containers
-  (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+  ;; Extend the remote PATH (tramp-own-remote-path already added above)
   (add-to-list 'tramp-remote-path "/usr/local/bin")
   (add-to-list 'tramp-remote-path "/usr/local/sbin")
 
-- 
cgit v1.2.3