Merge from `emacs-23'.

1 files changed, 26 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 82a06956800..a2e5262c02b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2010-03-24  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
+
+        * xfns.c (Fx_create_frame): Make menuBar a RES_TYPE_BOOLEAN_NUMBER.
+
+        * dispextern.h (resource_types): RES_TYPE_BOOLEAN_NUMBER is new.
+
+2010-03-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
+        XLoadQueryFont.
+
+2010-03-24  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (decode_coding_ccl): Fix previous change for the
+        multibyte case.
+        (encode_coding_ccl): Don't setup ccl program here.  Fix for the
+        case that the output buffer is fullfilled.
+        (encode_coding): Setup ccl program here.
+
+2010-03-24  Andreas Politz  <politza@fh-trier.de>  (tiny change)
+
+        * editfns.c (Fformat): Account for string precision when computing
+        field width (Bug#5710).
+
 2010-03-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default.