aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-11-04 12:02:01 +0000
committerRichard M. Stallman1993-11-04 12:02:01 +0000
commit1bb361e4c22d8a46628a23520fb3fc97a7718a99 (patch)
treebb7f6e9d5e48f04512120ac7890ec10b2b075a66
parent2b88f7a0b4d2d6d16e5e375334dfb94420226b5e (diff)
downloademacs-1bb361e4c22d8a46628a23520fb3fc97a7718a99.tar.gz
emacs-1bb361e4c22d8a46628a23520fb3fc97a7718a99.zip
(ange-ftp-load): Handle extra args after the file name.
-rw-r--r--lisp/ange-ftp.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 312f3ee6d35..9e51f6f33da 100644
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -856,7 +856,7 @@ SIZE, if supplied, should be a prime number."
856;;;; Internal variables. 856;;;; Internal variables.
857;;;; ------------------------------------------------------------ 857;;;; ------------------------------------------------------------
858 858
859(defconst ange-ftp-version "$Revision: 1.33 $") 859(defconst ange-ftp-version "$Revision: 1.34 $")
860 860
861(defvar ange-ftp-data-buffer-name " *ftp data*" 861(defvar ange-ftp-data-buffer-name " *ftp data*"
862 "Buffer name to hold directory listing data received from ftp process.") 862 "Buffer name to hold directory listing data received from ftp process.")
@@ -3634,13 +3634,13 @@ system TYPE.")
3634 (format "Getting %s" fn1)) 3634 (format "Getting %s" fn1))
3635 tmp1)))) 3635 tmp1))))
3636 3636
3637(defun ange-ftp-load (file) 3637(defun ange-ftp-load (file &rest args)
3638 (if (ange-ftp-ftp-name file) 3638 (if (ange-ftp-ftp-name file)
3639 (let ((copy (ange-ftp-file-local-copy file))) 3639 (let ((copy (ange-ftp-file-local-copy file)))
3640 (unwind-protect 3640 (unwind-protect
3641 (load copy) 3641 (apply 'load copy args)
3642 (delete-file copy))) 3642 (delete-file copy)))
3643 (ange-ftp-real-load file))) 3643 (apply 'ange-ftp-real-load file args)))
3644 3644
3645;; Calculate default-unhandled-directory for a given ange-ftp buffer. 3645;; Calculate default-unhandled-directory for a given ange-ftp buffer.
3646(defun ange-ftp-unhandled-file-name-directory (filename) 3646(defun ange-ftp-unhandled-file-name-directory (filename)