aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ange-ftp.el9
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index f359cbe8d7c..78f83c3e2c0 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.26 $") 859(defconst ange-ftp-version "$Revision: 1.27 $")
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.")
@@ -2900,7 +2900,7 @@ system TYPE.")
2900 (ange-ftp-add-file-entry filename)) 2900 (ange-ftp-add-file-entry filename))
2901 (ange-ftp-real-write-region start end filename append visit)))) 2901 (ange-ftp-real-write-region start end filename append visit))))
2902 2902
2903(defun ange-ftp-insert-file-contents (filename &optional visit) 2903(defun ange-ftp-insert-file-contents (filename &optional visit beg end)
2904 (barf-if-buffer-read-only) 2904 (barf-if-buffer-read-only)
2905 (setq filename (expand-file-name filename)) 2905 (setq filename (expand-file-name filename))
2906 (let ((parsed (ange-ftp-ftp-name filename))) 2906 (let ((parsed (ange-ftp-ftp-name filename)))
@@ -2941,7 +2941,8 @@ system TYPE.")
2941 (setq 2941 (setq
2942 size 2942 size
2943 (nth 1 (ange-ftp-real-insert-file-contents temp 2943 (nth 1 (ange-ftp-real-insert-file-contents temp
2944 visit))) 2944 visit
2945 beg end)))
2945 (signal 'ftp-error 2946 (signal 'ftp-error
2946 (list 2947 (list
2947 "Opening input file:" 2948 "Opening input file:"
@@ -2958,7 +2959,7 @@ system TYPE.")
2958 (list 2959 (list
2959 "Opening input file" 2960 "Opening input file"
2960 filename)))) 2961 filename))))
2961 (ange-ftp-real-insert-file-contents filename visit)))) 2962 (ange-ftp-real-insert-file-contents filename visit beg end))))
2962 2963
2963(defun ange-ftp-expand-symlink (file dir) 2964(defun ange-ftp-expand-symlink (file dir)
2964 (if (file-name-absolute-p file) 2965 (if (file-name-absolute-p file)