from trunk

diff --cc src/ChangeLog
index a614d670fbad63333ea1f86b52c97d191842ddfb,941c394f107143a390b868b14ede5c525d160b6e..34a7282d8145e20b948048357eab218b148df11b
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2010-01-31  Kenichi Handa  <handa@m17n.org>
 +
 +      * font.c (font_parse_xlfd): If FONT is a font-entity and pixel
 +      size in NAME is invalid, return -1.
 +
+ 2010-01-31  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * nsterm.m (ns_defined_color): Block input.  Suggested by Mike
+       <deactivated@gmail.com> (Bug#3605).
+ 
  2010-01-31  David De La Harpe Golden  <david@harpegolden.net>
  
        * fileio.c (Frename_file): Correctly rename symlinks to