diff options
| author | Glenn Morris | 2011-06-25 11:21:00 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-06-25 11:21:00 -0700 |
| commit | 11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20 (patch) | |
| tree | 4359edf5c3e99c0abcf9eff028a7a2609f483745 /lisp/ChangeLog | |
| parent | 3794a2d3a43433c27f65c902bfdc21479d7d309f (diff) | |
| parent | c9e799dbb100c5161f7a485452d29f554d95e6c7 (diff) | |
| download | emacs-11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20.tar.gz emacs-11fdef7d0cf3ef1ce30d1cd09ca9ca9a2b099d20.zip | |
Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 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 @@ | |||
| 1 | 2011-06-25 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * net/ange-ftp.el (ange-ftp-insert-file-contents): Let-bind | ||
| 4 | buffer-file-type before setting its value, to avoid disastrous | ||
| 5 | global effects on decoding files for DOS/Windows systems. | ||
| 6 | (Bug#8780) | ||
| 7 | |||
| 1 | 2011-06-25 Juanma Barranquero <lekktu@gmail.com> | 8 | 2011-06-25 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 9 | ||
| 3 | * allout.el (allout-unload-function): Pass -1 to `allout-mode'. | 10 | * allout.el (allout-unload-function): Pass -1 to `allout-mode'. |