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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c403c8045d2b8ddcb86378abf0d8b3b46a5d9a4c..47da6d77c9003fcc737479233f70c473a84d5b47 100644 (file)
--- 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 c009671ce7c0e0a5c1fff13f52922ae4a77e9cd8..a3a11756253a2a24fe17938fa3c10eed93a52db3 100644 (file)
--- 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)