aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-02-02 15:11:39 +0000
committerGerd Moellmann2000-02-02 15:11:39 +0000
commit65d68537afbe22f080645f12bfa5e07a916b97a4 (patch)
treeda3f89ade47f0914aa23a5b90b1d04b28dce4792
parent3433c43f88f851b40540dac5655122b92f55d2ef (diff)
downloademacs-65d68537afbe22f080645f12bfa5e07a916b97a4.tar.gz
emacs-65d68537afbe22f080645f12bfa5e07a916b97a4.zip
(ange-ftp-write-region): Handle case that
succeeding process operation sets a different coding system.
-rw-r--r--lisp/ange-ftp.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 6c822d4604a..fb0b03b52e0 100644
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -3185,6 +3185,7 @@ system TYPE.")
3185 (memq (ange-ftp-host-type host user) 3185 (memq (ange-ftp-host-type host user)
3186 '(unix dumb-unix)))) 3186 '(unix dumb-unix))))
3187 (abbr (ange-ftp-abbreviate-filename filename)) 3187 (abbr (ange-ftp-abbreviate-filename filename))
3188 (coding-system-used last-coding-system-used)
3188 size) 3189 size)
3189 (unwind-protect 3190 (unwind-protect
3190 (progn 3191 (progn
@@ -3207,6 +3208,7 @@ system TYPE.")
3207 size 3208 size
3208 (nth 1 (ange-ftp-real-insert-file-contents 3209 (nth 1 (ange-ftp-real-insert-file-contents
3209 temp visit beg end replace)) 3210 temp visit beg end replace))
3211 coding-system-used last-coding-system-used
3210 ;; override autodetection of buffer file type 3212 ;; override autodetection of buffer file type
3211 ;; to ensure buffer is saved in DOS format 3213 ;; to ensure buffer is saved in DOS format
3212 buffer-file-type binary) 3214 buffer-file-type binary)
@@ -3226,6 +3228,7 @@ system TYPE.")
3226 (progn 3228 (progn
3227 (set-visited-file-modtime '(0 0)) 3229 (set-visited-file-modtime '(0 0))
3228 (setq buffer-file-name filename))) 3230 (setq buffer-file-name filename)))
3231 (setq last-coding-system-used coding-system-used)
3229 (list filename size)) 3232 (list filename size))
3230 (signal 'file-error 3233 (signal 'file-error
3231 (list 3234 (list