diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-06-09 12:40:51 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-06-09 12:40:51 +0300 |
| commit | 638e9005f1a275c6f8f3298ae7aaca4dba3abb25 (patch) | |
| tree | 23daaad5b163011c0b24cf89f63d3164e5b87d2a /lisp | |
| parent | 499719b7762b7dea99f0306b9d907ba50432215e (diff) | |
| download | emacs-638e9005f1a275c6f8f3298ae7aaca4dba3abb25.tar.gz | |
Fix bug #8780 with decoding files after using ange-ftp.
lisp/net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind
buffer-file-type before setting its value, to avoid disastrous
global effects on decoding files for DOS/Windows systems.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/net/ange-ftp.el | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c403c8045d2..47da6d77c90 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-06-09 Eli Zaretskii <eliz@gnu.org> + + * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind + buffer-file-type before setting its value, to avoid disastrous + global effects on decoding files for DOS/Windows systems. + (Bug#8780) + 2011-06-05 Juanma Barranquero <lekktu@gmail.com> * progmodes/python.el (python-after-info-look): Add autoload cookie. diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c009671ce7c..a3a11756253 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3290,6 +3290,7 @@ system TYPE.") (binary (or (ange-ftp-binary-file filename) (memq (ange-ftp-host-type host user) '(unix dumb-unix)))) + (buffer-file-type buffer-file-type) (abbr (ange-ftp-abbreviate-filename filename)) (coding-system-used last-coding-system-used) size) |