(ange-ftp-remote-shell): Remove variable.

(ange-ftp-call-chmod): Reference remote-shell-program instead of
ange-ftp-remote-shell.

2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ccc2a8b63d3..267307ed395 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-10  Kai Grossjohann  <kai.grossjohann@gmx.net>
+
+        * net/ange-ftp.el (ange-ftp-remote-shell): Remove variable.
+        (ange-ftp-call-chmod): Reference remote-shell-program instead of
+        ange-ftp-remote-shell.
+
 2004-10-10  Andreas Schwab  <schwab@suse.de>
 
         * emacs-lisp/byte-opt.el (byte-optimize-backward-word): Optimize
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index c1f3c0a8d52..16a4826b8ae 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4514,9 +4514,6 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
                1))
     (apply 'call-process program nil (not discard) nil arguments)))
 
-(defvar ange-ftp-remote-shell "rsh"
-  "Remote shell to use for chmod, if FTP server rejects the `chmod' command.")
-
 ;; Handle an attempt to run chmod on a remote file
 ;; by using the ftp chmod command.
 (defun ange-ftp-call-chmod (args)
@@ -4541,7 +4538,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.")
                                                        abbr))))
                (or (car result)
                    (call-process
-                    ange-ftp-remote-shell
+                    remote-shell-program
                     nil t nil host dired-chmod-program mode name))))))
      rest))
   (setq ange-ftp-ls-cache-file nil)     ;Stop confusing Dired.