merge trunk

diff --cc lisp/ChangeLog
index 5dd5270974640c046f66089ce5a74061b723d439,8cdb2cdba429f1bfb1a7decd1114338917df7766..42c1686e9d55173a0f120ec94da18398909bb1b3
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,39 -1,10 +1,46 @@@
- 2011-07-06  Kenichi Handa  <handa@m17n.org>
++2011-07-07  Kenichi Handa  <handa@m17n.org>
 +
 +      * international/characters.el (build-unicode-category-table):
 +      Delete it.
 +      (unicode-category-table): Set it by
 +      unicode-prroperty-table-internal.
 +
 +      * international/mule-cmds.el (char-code-property-alist): Moved to
 +      to src/chartab.c.
 +      (get-char-code-property): Call unicode-property-table-internal to
 +      load a file.  Call get-unicode-property-internal where necessary.
 +      (put-char-code-property): Call unicode-property-table-internal to
 +      load a file.  Call put-unicode-property-internal where necessary.
 +      put-unicode-property-internal where necessary.
 +      (char-code-property-description): Call
 +      unicode-property-table-internal to load a file.
 +
 +      * international/charprop.el:
 +      * international/uni-bidi.el:
 +      * international/uni-category.el:
 +      * international/uni-combining.el:
 +      * international/uni-comment.el:
 +      * international/uni-decimal.el:
 +      * international/uni-decomposition.el:
 +      * international/uni-digit.el:
 +      * international/uni-lowercase.el:
 +      * international/uni-mirrored.el:
 +      * international/uni-name.el:
 +      * international/uni-numeric.el:
 +      * international/uni-old-name.el:
 +      * international/uni-titlecase.el:
 +      * international/uni-uppercase.el: Regenerate.
 +
 +      * loadup.el: Load international/charprop.el before
 +      international/characters.
 +
+ 2011-07-07  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * window.el (next-buffer, previous-buffer): Signal an error if
+       called from a minibuffer window.
+ 
+       * bindings.el: Revert 2011-07-04 change.
+ 
  2011-07-06  Richard Stallman  <rms@gnu.org>
  
        * mail/rmailmm.el (rmail-mime-process): Use markers for buf positions.

diff --cc src/ChangeLog
index a3536cda7a4fea1e64bb1626a397a344ea05ee29,36f34fc9f6b1b338f545b32f78b4c68ee884552e..642445b23286f64f2ed3b580c8aaf7f4ec44e0ad
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,45 -1,8 +1,50 @@@
- 2011-07-06  Kenichi Handa  <handa@m17n.org>
++2011-07-07  Kenichi Handa  <handa@m17n.org>
 +
 +      * character.h (unicode_category_t): New enum type.
 +
 +      * chartab.c (uniprop_decoder_t, uniprop_encoder_t): New types.
 +      (Qchar_code_property_table): New variable.
 +      (UNIPROP_TABLE_P, UNIPROP_GET_DECODER)
 +      (UNIPROP_COMPRESSED_FORM_P): New macros.
 +      (char_table_ascii): Uncompress the compressed values.
 +      (sub_char_table_ref): New arg is_uniprop.  Callers changed.
 +      Uncompress the compressed values.
 +      (sub_char_table_ref_and_range):  Likewise.
 +      (char_table_ref_and_range): Uncompress the compressed values.
 +      (sub_char_table_set): New arg is_uniprop.  Callers changed.
 +      Uncompress the compressed values.
 +      (sub_char_table_set_range): Args changed.  Callers changed.
 +      (char_table_set_range): Adjuted for the above change.
 +      (map_sub_char_table): Delete args default_val and parent.  Add arg
 +      top.  Give decoded values to a Lisp function.
 +      (map_char_table): Adjusted for the above change.  Give decoded
 +      values to a Lisp function.  Gcpro more variables.
 +      (uniprop_table_uncompress)
 +      (uniprop_decode_value_run_length): New functions.
 +      (uniprop_decoder, uniprop_decoder_count): New variables.
 +      (uniprop_get_decoder, uniprop_encode_value_character)
 +      (uniprop_encode_value_run_length, uniprop_encode_value_numeric):
 +      New functions.
 +      (uniprop_encoder, uniprop_encoder_count): New variables.
 +      (uniprop_get_encoder, uniprop_table)
 +      (Funicode_property_table_internal, Fget_unicode_property_internal)
 +      (Fput_unicode_property_internal): New functions.
 +      (syms_of_chartab): DEFSYM Qchar_code_property_table, defsubr
 +      Sunicode_property_table_internal, Sget_unicode_property_internal,
 +      and Sput_unicode_property_internal. Defvar_lisp
 +      char-code-property-alist.
 +
 +      * composite.c (CHAR_COMPOSABLE_P): Adjusted for the change of
 +      Vunicode_category_table.
 +
 +      * font.c (font_range): Adjusted for the change of
 +      Vunicode_category_table.
 +
+ 2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       * m/iris4d.h: Remove file, move contents ...
+       * s/irix6-5.h: ... here.
+ 
  2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
  
        Remove unportable assumption about struct layout (Bug#8884).