From: Kenichi Handa <handa@gnu.org>
Date: Sat, 27 Apr 2013 13:34:02 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~359
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13d0e56fa3f73d3583b39409d98aefc30ea52daa;p=emacs.git

merge trunk
---

13d0e56fa3f73d3583b39409d98aefc30ea52daa
diff --cc src/ChangeLog
index 5dd113775d9,9ae5c29ab72..d649c1bcdbc
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,13 @@@
 -2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 +2013-04-27  Kenichi Handa  <handa@gnu.org>
 +
 +	* font.c (font_open_entity): Always open a font of manageable
 +	size.
  
++2013-04-26  Paul Eggert  <eggert@cs.ucla.edu>
+ 	Port better to AIX (Bug#14258).
+ 	* lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too,
+ 	to pacify AIX xlc.
+ 
  2013-04-24  Kenichi Handa  <handa@gnu.org>
  
  	* coding.c (decode_coding_iso_2022): When an invalid escape