From: Kenichi Handa <handa@m17n.org>
Date: Sun, 31 Jan 2010 06:50:30 +0000 (+0900)
Subject: from trunk
X-Git-Tag: emacs-pretest-23.1.93~132
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a1c65d578c777948efa42aa2132c6c96cf4026ab;p=emacs.git

from trunk
---

a1c65d578c777948efa42aa2132c6c96cf4026ab
diff --cc src/ChangeLog
index a614d670fba,941c394f107..34a7282d814
--- a/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