summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/files.el17
1 files changed, 3 insertions, 14 deletions
diff --git a/lisp/files.el b/lisp/files.el
index b99ccf66d8a..bdceaefb0ff 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1274,20 +1274,9 @@ Tip: You can use this expansion of remote identifier components
;; It's not clear what the best file for this to be in is, but given
;; it uses custom-initialize-delay, it is easier if it is preloaded
;; rather than autoloaded.
-(defcustom remote-shell-program
- ;; This used to try various hard-coded places for remsh, rsh, and
- ;; rcmd, trying to guess based on location whether "rsh" was
- ;; "restricted shell" or "remote shell", but I don't see the point
- ;; in this day and age. Almost everyone will use ssh, and have
- ;; whatever command they want to use in PATH.
- (purecopy
- (let ((list '("ssh" "remsh" "rcmd" "rsh")))
- (while (and list
- (not (executable-find (car list)))
- (setq list (cdr list))))
- (or (car list) "ssh")))
- "Program to use to execute commands on a remote host (e.g. ssh or rsh)."
- :version "24.3" ; ssh rather than rsh, etc
+(defcustom remote-shell-program (or (executable-find "ssh") "ssh")
+ "Program to use to execute commands on a remote host (i.e. ssh)."
+ :version "29.1"
:initialize 'custom-initialize-delay
:group 'environment
:type 'file)