Merge from emacs-24; up to 2012-04-20T05:47:55Z!eliz@gnu.org

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcefb16..76d3e24 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-04  Chong Yidong  <cyd@gnu.org>
+
+       * select.el (xselect--encode-string): Always use utf-8 for TEXT on
+       Nextstep.
+
 2012-05-05  Ransom Williams  <auvergnerw@gmail.com>  (tiny change)
 
        * files.el (file-auto-mode-skip): New var.