Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39a428a5a28..2a8188f8f5e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-25  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-25  Juanma Barranquero  <lekktu@gmail.com>
 
         * allout.el (allout-unload-function): Pass -1 to `allout-mode'.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 0493ead7bbf..1282f86d503 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3278,6 +3278,7 @@ system TYPE.")
                      (name (ange-ftp-quote-string (nth 2 parsed)))
                      (temp (ange-ftp-make-tmp-name host))
                      (binary (ange-ftp-binary-file filename))
+                     (buffer-file-type buffer-file-type)
                      (abbr (ange-ftp-abbreviate-filename filename))
                      (coding-system-used last-coding-system-used)
                      size)