From: Eli Zaretskii Date: Thu, 9 Jun 2011 09:40:51 +0000 (+0300) Subject: Fix bug #8780 with decoding files after using ange-ftp. X-Git-Tag: emacs-pretest-24.0.90~104^3~30 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=638e9005f1a275c6f8f3298ae7aaca4dba3abb25;p=emacs.git 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 c403c8045d2..47da6d77c90 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2011-06-09 Eli Zaretskii + + * 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 * 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)