[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100596: Fix bug #8780 with decoding files after using ange-ftp.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100596
fixes bug(s): http://debbugs.gnu.org/8780
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Thu 2011-06-09 12:40:51 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/net/ange-ftp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-06-05 00:32:23 +0000
+++ b/lisp/ChangeLog    2011-06-09 09:40:51 +0000
@@ -1,3 +1,10 @@
+2011-06-09  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/python.el (python-after-info-look): Add autoload cookie.

=== modified file 'lisp/net/ange-ftp.el'
--- a/lisp/net/ange-ftp.el      2011-01-02 23:50:46 +0000
+++ b/lisp/net/ange-ftp.el      2011-06-09 09:40:51 +0000
@@ -3290,6 +3290,7 @@
                     (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)