merge trunk

diff --cc src/ChangeLog
index fbf22c35e4c4d394df307c5495058bd70f19395d,644cbc47bfec4477783015e5562184a3931e76c0..e59a286110d5f67cf5c9c3e304f44dd960434867
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,11 -1,46 +1,54 @@@
 +2012-10-23  Kenichi Handa  <handa@gnu.org>
 +
 +      The following change is to make face-font-rescale-alist work
 +      correctly for non-ASCII fonts.
 +
 +      * font.c (font_open_entity): Don't handle Vface_font_rescale_alist.
 +      (font_open_for_lface): Handle Vface_font_rescale_alist.
 +
+ 2012-10-23  Chong Yidong  <cyd@gnu.org>
+ 
+       * xfaces.c (Vfont_list_limit): Move unused variable to faces.el.
+ 
+ 2012-10-21  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement
+       for screen font.
+       (nsfont_draw): Turn off LCD-smoothing (Bug#11484).
+ 
+       * xterm.c (x_focus_changed): Check if daemonp when sending focus in
+       event (Bug#12681).
+ 
+ 2012-10-21  Glenn Morris  <rgm@gnu.org>
+ 
+       * lisp.mk (lisp): Add cp51932.el and eucjp-ms.el.
+ 
+ 2012-10-20  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Port to OpenBSD 5.1.
+       * frame.c (Fmouse_position, Fmouse_pixel_position):
+       * xdisp.c (produce_stretch_glyph):
+       Declare local vars only when they're needed.
+       This is clearer and avoids a warning on OpenBSD about unused vars.
+       * frame.h (FRAME_WINDOW_P): Always evaluate its argument.
+       This is safer, and avoids OpenBSD warnings about unused vars.
+       * keyboard.c (record_menu_key): Remove unnecessary decl.
+       (poll_timer): Define only if POLL_FOR_INPUT is defined.
+       * unexelf.c (ELFSIZE) [!ElfW]: Do not define if already defined,
+       as our definition clashes with OpenBSD's.
+       * xfaces.c (load_face_colors, check_lface_attrs)
+       (get_lface_attributes_no_remap, get_lface_attributes)
+       (lface_fully_specified_p, x_supports_face_attributes_p)
+       (tty_supports_face_attributes_p, face_fontset, realize_face)
+       (realize_x_face, realize_tty_face):
+       Declare parameters to be Lisp_Object[LFACE_VECTOR_SIZE], not
+       merely Lisp_Object *.  This is more informative and avoids
+       a warning on OpenBSD about accessing beyond an object's size.
+ 
+ 2012-10-20  Chong Yidong  <cyd@gnu.org>
+ 
+       * lread.c (Fload): Doc fix (Bug#12592).
+ 
  2012-10-19  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
  
        * font.c (Ffont_at): Fix previous change.