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

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39a428a5a28094f61b1fbab7595bea7c9632a27e..2a8188f8f5eb943e5c36e8ad069a1fe64eedd31d 100644 (file)
--- 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'.