diff options
| author | Kenichi Handa | 1999-10-27 04:59:52 +0000 |
|---|---|---|
| committer | Kenichi Handa | 1999-10-27 04:59:52 +0000 |
| commit | a21da928c0a018d7d7330e77f0feba2b6a82aaf3 (patch) | |
| tree | f7ced6d35116f932cb1d61d27ef2a2a465fa241f | |
| parent | 17dbfaad0e4aa86cc4e7bf9783e52b9177856fec (diff) | |
| download | emacs-a21da928c0a018d7d7330e77f0feba2b6a82aaf3.tar.gz emacs-a21da928c0a018d7d7330e77f0feba2b6a82aaf3.zip | |
(ange-ftp-insert-file-contents): Don't change
last-coding-system-used by the call of ange-ftp-set-ascii-mode.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/ange-ftp.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2e8065ccbeb..edfa5da9b9e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 1999-10-27 Kenichi Handa <handa@etl.go.jp> | ||
| 2 | |||
| 3 | * ange-ftp.el (ange-ftp-insert-file-contents): Don't change | ||
| 4 | last-coding-system-used by the call of ange-ftp-set-ascii-mode. | ||
| 5 | |||
| 1 | 1999-10-27 Richard M. Stallman <rms@caffeine.ai.mit.edu> | 6 | 1999-10-27 Richard M. Stallman <rms@caffeine.ai.mit.edu> |
| 2 | 7 | ||
| 3 | * emacs-lisp/advice.el (ad-activate-internal): Renamed from | 8 | * emacs-lisp/advice.el (ad-activate-internal): Renamed from |
diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el index d9cfc0e246d..68f8f954253 100644 --- a/lisp/ange-ftp.el +++ b/lisp/ange-ftp.el | |||
| @@ -3217,7 +3217,10 @@ system TYPE.") | |||
| 3217 | "FTP Error: %s not arrived or readable" | 3217 | "FTP Error: %s not arrived or readable" |
| 3218 | filename))))) | 3218 | filename))))) |
| 3219 | (if binary | 3219 | (if binary |
| 3220 | (ange-ftp-set-ascii-mode host user)) | 3220 | ;; We must keep `last-coding-system-used' |
| 3221 | ;; unchanged. | ||
| 3222 | (let (last-coding-system-used) | ||
| 3223 | (ange-ftp-set-ascii-mode host user))) | ||
| 3221 | (ange-ftp-del-tmp-name temp)) | 3224 | (ange-ftp-del-tmp-name temp)) |
| 3222 | (if visit | 3225 | (if visit |
| 3223 | (progn | 3226 | (progn |