1 files changed, 12 insertions, 17 deletions

diff --git a/modules/tramp-config.el b/modules/tramp-config.el
index f2bc8457..1c8a8ab9 100644
--- a/modules/tramp-config.el
+++ b/modules/tramp-config.el
@@ -26,6 +26,7 @@
 ;; Silence byte-compiler "assignment to free variable" warnings for vars
 ;; defined by lazily-loaded packages (tramp, dirtrack, magit). These are
 ;; only set inside the use-package :config block, after the package loads.
+(defvar ange-ftp-try-passive-mode)
 (defvar tramp-copy-size-limit)
 (defvar tramp-use-ssh-controlmaster-options)
 (defvar tramp-cleanup-idle-time)
@@ -76,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)
@@ -119,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")
 
@@ -147,5 +136,11 @@
   ;; Cleanup TRAMP buffers when idle (every 15 min)
   (setq tramp-cleanup-idle-time 900))
 
+;; FTP (ange-ftp) settings — TRAMP's /ftp: method delegates to ange-ftp.
+;; Passive mode is required for servers that can't open a data connection
+;; back to this machine (NAT, phone FTP servers); active mode hangs on LIST.
+(with-eval-after-load 'ange-ftp
+  (setq ange-ftp-try-passive-mode t))
+
 (provide 'tramp-config)
 ;;; tramp-config.el ends here