Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1166

diff --cc src/ChangeLog
index 089afb97ecc6a1db211b418eabaf0c8c8078afda,d7826d013aa0ec86681f2c7222258fd20405f582..9c5c073fc79c3455ddea5ca230eab2c7288a9311
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,42 -1,15 +1,46 @@@
 -      [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event):
 -      Fix last change.
+ 2008-05-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+ 
+       * macterm.c (x_draw_relief_rect): Remove unused variable `dpy'.
 -2008-05-13  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+ 
 +2008-05-15  Kenichi Handa  <handa@m17n.org>
  
 -      * xterm.c (handle_one_xevent): Don't pass buttons higher than 3
 -      to Gtk+ menus.
 +      * font.c (font_find_for_lface): Reflect LFACE_FONT in the font
 +      preference.
 +
 +2008-05-15  Glenn Morris  <rgm@gnu.org>
 +
 +      * emacs.c (USAGE1, standard_args): Remove -disable-font-backend.
 +
 +2008-05-15  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * fns.c (init_fns): Don't initialize weak_hash_tables here.
 +      (init_weak_hash_tables): New fun.  Initialize weak_hash_tables.
 +
 +      * alloc.c (init_alloc_once): Call init_weak_hash_tables.
 +
 +2008-05-15  Kenichi Handa  <handa@m17n.org>
  
 -2008-05-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 +      * ftfont.c (ftfont_list): Downcase family name to check generic
 +      families.
 +
 +      * xfaces.c (Finternal_set_lisp_face_attribute): Be sure to make a
 +      font-spec for QCfont value.
 +
 +      * fontset.c (Fnew_fontset): Call font_unparse_xlfd with 256-byte
 +      buffer.  Check the return value of it.
 +
 +2008-05-14  Jason Rumney  <jasonr@gnu.org>
 +
 +      * w32term.c (w32_get_glyph_overhangs): Remove.
 +      (w32_redisplay_interface): Use x_get_glyph_overhangs instead.
 +
 +2008-05-14  Kenichi Handa  <handa@m17n.org>
 +
 +      * font.c (font_prop_validate): Make nil a valid value.
 +      (font_clear_cache): Check if the cached vector of entities is nil
 +      or not.
 +
 +2008-05-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
  
        * emacs.c (main_thread): Conditionalize on
        FORWARD_SIGNAL_TO_MAIN_THREAD instead of HAVE_GTK_AND_PTHREAD.

diff --cc src/macterm.c
Simple merge