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.

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)