# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 790458382 0
# Node ID bc83756f19ade5a36793cf2c545055e025c80b82
# Parent  830e201e9603ae08b73b8553b02260e9d171b343
(ange-ftp-gateway-program, ange-ftp-shell-command): Use new global
remote-shell-program.

diff -r 830e201e9603 -r bc83756f19ad lisp/ange-ftp.el
--- a/lisp/ange-ftp.el	Wed Jan 18 19:46:00 1995 +0000
+++ b/lisp/ange-ftp.el	Wed Jan 18 19:46:22 1995 +0000
@@ -724,9 +724,9 @@
   "*If non-nil then the gateway program should  give a shell prompt.
 Both telnet and rlogin do something like this.")
 
-(defvar ange-ftp-gateway-program (if (eq system-type 'hpux) "remsh" "rsh")
+(defvar ange-ftp-gateway-program remote-shell-program
   "*Name of program to spawn a shell on the gateway machine.
-Valid candidates are rsh (remsh on hp-ux), telnet and rlogin.  See
+Valid candidates are rsh (remsh on some systems), telnet and rlogin.  See
 also the gateway variable above.")
 
 (defvar ange-ftp-gateway-prompt-pattern "^[^#$%>;\n]*[#$%>;] *"
@@ -3999,12 +3999,6 @@
     (if func (funcall func file keep-backup-version)
       (ange-ftp-real-file-name-sans-versions file keep-backup-version))))
 
-(defvar ange-ftp-remote-shell-file-name
-  (if (memq system-type '(hpux usg-unix-v)) ; hope that's right
-      "remsh"
-    "rsh")
-  "Name of command to run a remote shell, for ange-ftp.")
-
 ;;; This doesn't work yet; a new hook needs to be created.
 ;;; Maybe the new hook should be in call-process.
 (defun ange-ftp-shell-command (command)
@@ -4019,7 +4013,7 @@
       (setq command
 	    (format  "%s %s \"%s\""	; remsh -l USER does not work well
 					; on a hp-ux machine I tried
-		     ange-ftp-remote-shell-file-name host command))
+		     remote-shell-program host command))
       (ange-ftp-message "Remote command '%s' ..." command)
       ;; Cannot call ange-ftp-real-dired-run-shell-command here as it
       ;; would prepend "cd default-directory" --- which bombs because