13 files changed, 142 insertions, 75 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1a309066703..e59a286110d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,50 @@
+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).
diff --git a/src/font.c b/src/font.c
index 7cb4149ac4e..bff2356d6ca 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2816,14 +2816,11 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   int min_width, height;
-  int scaled_pixel_size = pixel_size;
 
   eassert (FONT_ENTITY_P (entity));
   size = AREF (entity, FONT_SIZE_INDEX);
   if (XINT (size) != 0)
-    scaled_pixel_size = pixel_size = XINT (size);
-  else if (CONSP (Vface_font_rescale_alist))
-    scaled_pixel_size = pixel_size * font_rescale_ratio (entity);
+    pixel_size = XINT (size);
 
   val = AREF (entity, FONT_TYPE_INDEX);
   for (driver_list = f->font_driver_list;
@@ -2845,7 +2842,7 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
         }
     }
 
-  font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
+  font_object = driver_list->driver->open (f, entity, pixel_size);
   if (!NILP (font_object))
     ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
   FONT_ADD_LOG ("open", entity, font_object);
@@ -3230,31 +3227,36 @@ font_open_for_lface (FRAME_PTR f, Lisp_Object entity, Lisp_Object *attrs, Lisp_O
   if (INTEGERP (AREF (entity, FONT_SIZE_INDEX))
       && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0)
     size = XINT (AREF (entity, FONT_SIZE_INDEX));
-  else if (FONT_SPEC_P (spec) && ! NILP (AREF (spec, FONT_SIZE_INDEX)))
-    size = font_pixel_size (f, spec);
   else
     {
-      double pt;
-      if (INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
-        pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
+      if (FONT_SPEC_P (spec) && ! NILP (AREF (spec, FONT_SIZE_INDEX)))
+        size = font_pixel_size (f, spec);
       else
         {
-          struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
-          Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
-          eassert (INTEGERP (height));
-          pt = XINT (height);
-        }
+          double pt;
+          if (INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
+            pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
+          else
+            {
+              struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
+              Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
+              eassert (INTEGERP (height));
+              pt = XINT (height);
+            }
 
-      pt /= 10;
-      size = POINT_TO_PIXEL (pt, f->resy);
+          pt /= 10;
+          size = POINT_TO_PIXEL (pt, f->resy);
 #ifdef HAVE_NS
-      if (size == 0)
-        {
-          Lisp_Object ffsize = get_frame_param (f, Qfontsize);
-          size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0;
-        }
+          if (size == 0)
+            {
+              Lisp_Object ffsize = get_frame_param (f, Qfontsize);
+              size = NUMBERP (ffsize) ? POINT_TO_PIXEL (XINT (ffsize), f->resy) : 0;
+            }
 #endif
+        }
+      size *= font_rescale_ratio (entity);
     }
+
   return font_open_entity (f, entity, size);
 }
 
diff --git a/src/frame.c b/src/frame.c
index 017d051fc1d..6478ad1e06f 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1501,10 +1501,7 @@ and returns whatever that function returns.  */)
 {
   FRAME_PTR f;
   Lisp_Object lispy_dummy;
-  enum scroll_bar_part party_dummy;
   Lisp_Object x, y, retval;
-  int col, row;
-  Time long_dummy;
   struct gcpro gcpro1;
 
   f = SELECTED_FRAME ();
@@ -1513,14 +1510,19 @@ and returns whatever that function returns.  */)
 #if defined (HAVE_MOUSE) || defined (HAVE_GPM)
   /* It's okay for the hook to refrain from storing anything.  */
   if (FRAME_TERMINAL (f)->mouse_position_hook)
-    (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1,
-                                                &lispy_dummy, &party_dummy,
-                                                &x, &y,
-                                                &long_dummy);
+    {
+      enum scroll_bar_part party_dummy;
+      Time time_dummy;
+      (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1,
+                                                  &lispy_dummy, &party_dummy,
+                                                  &x, &y,
+                                                  &time_dummy);
+    }
+
   if (! NILP (x))
     {
-      col = XINT (x);
-      row = XINT (y);
+      int col = XINT (x);
+      int row = XINT (y);
       pixel_to_glyph_coords (f, col, row, &col, &row, NULL, 1);
       XSETINT (x, col);
       XSETINT (y, row);
@@ -1547,9 +1549,7 @@ and nil for X and Y.  */)
 {
   FRAME_PTR f;
   Lisp_Object lispy_dummy;
-  enum scroll_bar_part party_dummy;
   Lisp_Object x, y;
-  Time long_dummy;
 
   f = SELECTED_FRAME ();
   x = y = Qnil;
@@ -1557,10 +1557,15 @@ and nil for X and Y.  */)
 #if defined (HAVE_MOUSE) || defined (HAVE_GPM)
   /* It's okay for the hook to refrain from storing anything.  */
   if (FRAME_TERMINAL (f)->mouse_position_hook)
-    (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1,
-                                                &lispy_dummy, &party_dummy,
-                                                &x, &y,
-                                                &long_dummy);
+    {
+      enum scroll_bar_part party_dummy;
+      Time time_dummy;
+      (*FRAME_TERMINAL (f)->mouse_position_hook) (&f, -1,
+                                                  &lispy_dummy, &party_dummy,
+                                                  &x, &y,
+                                                  &time_dummy);
+    }
+
 #endif
   XSETFRAME (lispy_dummy, f);
   return Fcons (lispy_dummy, Fcons (x, y));
diff --git a/src/frame.h b/src/frame.h
index 7bf76c21c56..f8c3d99fedd 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -646,7 +646,7 @@ typedef struct frame *FRAME_PTR;
 #define FRAME_WINDOW_P(f) FRAME_NS_P(f)
 #endif
 #ifndef FRAME_WINDOW_P
-#define FRAME_WINDOW_P(f) (0)
+#define FRAME_WINDOW_P(f) ((void) (f), 0)
 #endif
 
 /* Return a pointer to the structure holding information about the
diff --git a/src/keyboard.c b/src/keyboard.c
index 010bd6c72ef..2f751d0ec72 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -368,7 +368,6 @@ static Lisp_Object command_loop (void);
 static Lisp_Object Qextended_command_history;
 EMACS_TIME timer_check (void);
 
-static void record_menu_key (Lisp_Object c);
 static void echo_now (void);
 static ptrdiff_t echo_length (void);
 
@@ -1966,12 +1965,12 @@ safe_run_hooks (Lisp_Object hook)
 
 int poll_suppress_count;
 
-/* Asynchronous timer for polling.  */
 
-static struct atimer *poll_timer;
+#ifdef POLL_FOR_INPUT
 
+/* Asynchronous timer for polling.  */
 
-#ifdef POLL_FOR_INPUT
+static struct atimer *poll_timer;
 
 /* Poll for input, so that we catch a C-g if it comes in.  This
    function is called from x_make_frame_visible, see comment
diff --git a/src/lisp.h b/src/lisp.h
index e0611e19ff1..17a9e5c1f6a 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -308,7 +308,7 @@ enum Lisp_Fwd_Type
    First, there are already a couple of Lisp types that can be used if
    your new type does not need to be exposed to Lisp programs nor
    displayed to users.  These are Lisp_Save_Value, a Lisp_Misc
-   subtype, and PVEC_OTHER, a kind of vectorlike object.  The former
+   subtype; and PVEC_OTHER, a kind of vectorlike object.  The former
    is suitable for temporarily stashing away pointers and integers in
    a Lisp object (see the existing uses of make_save_value and
    XSAVE_VALUE).  The latter is useful for vector-like Lisp objects
@@ -322,7 +322,7 @@ enum Lisp_Fwd_Type
    To define a new data type, add one more Lisp_Misc subtype or one
    more pseudovector subtype.  Pseudovectors are more suitable for
    objects with several slots that need to support fast random access,
-   whil Lisp_Misc types are foreverything else.  A pseudovector object
+   while Lisp_Misc types are for everything else.  A pseudovector object
    provides one or more slots for Lisp objects, followed by struct
    members that are accessible only from C.  A Lisp_Misc object is a
    wrapper for a C struct that can contain anything you like.
diff --git a/src/lisp.mk b/src/lisp.mk
index 3d60e07dea3..1f459d4d5f1 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -35,7 +35,8 @@
 ## no-byte-compile ones.
 
 ## Confusingly, term/internal is not in loadup, but is unconditionally
-## loaded by pc-win, which is.
+## loaded by pc-win, which is.  Ditto for international/cp51932 and
+## international/eucjp-ms, loaded from language/japanese.
 
 ## Note that this list should not include lisp files which might not
 ## be present, like site-load.el and site-init.el; this makefile
@@ -94,6 +95,8 @@ lisp = \
         $(lispsource)/language/greek.elc \
         $(lispsource)/language/hebrew.elc \
         $(lispsource)/language/japanese.elc \
+        $(lispsource)/international/cp51932.el \
+        $(lispsource)/international/eucjp-ms.el \
         $(lispsource)/language/korean.elc \
         $(lispsource)/language/lao.elc \
         $(lispsource)/language/tai-viet.elc \
diff --git a/src/nsfont.m b/src/nsfont.m
index 7c9f05aa0bb..4f29d1d54a9 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -797,7 +797,13 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
   block_input ();
 
   /* for metrics */
+#ifdef NS_IMPL_COCOA
+  sfont = [nsfont screenFontWithRenderingMode:
+                    NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
   sfont = [nsfont screenFont];
+#endif
+
   if (sfont == nil)
     sfont = nsfont;
 
@@ -1229,6 +1235,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y,
     else
       CGContextSetShouldAntialias (gcontext, 1);
 
+    CGContextSetShouldSmoothFonts (gcontext, NO);
     CGContextSetTextMatrix (gcontext, fliptf);
 
     if (bgCol != nil)
@@ -1372,7 +1379,12 @@ ns_glyph_metrics (struct nsfont_info *font_info, unsigned char block)
 #endif
 
   block_input ();
- sfont = [font_info->nsfont screenFont];
+#ifdef NS_IMPL_COCOA
+  sfont = [font_info->nsfont screenFontWithRenderingMode:
+                      NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
+  sfont = [font_info->nsfont screenFont];
+#endif
 
   font_info->metrics[block] = xzalloc (0x100 * sizeof (struct font_metrics));
   if (!(font_info->metrics[block]))
diff --git a/src/unexelf.c b/src/unexelf.c
index f35b53aeab3..121e6042fc9 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -507,10 +507,12 @@ typedef struct {
 
 #ifndef ElfW
 # define ElfBitsW(bits, type) Elf##bits##_##type
-# ifdef _LP64
-#  define ELFSIZE 64
-# else
-#  define ELFSIZE 32
+# ifndef ELFSIZE
+#  ifdef _LP64
+#   define ELFSIZE 64
+#  else
+#   define ELFSIZE 32
+#  endif
 # endif
   /* This macro expands `bits' before invoking ElfBitsW.  */
 # define ElfExpandBitsW(bits, type) ElfBitsW (bits, type)
diff --git a/src/w32fns.c b/src/w32fns.c
index 8dd3eb83c60..28e8ea02e05 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -211,7 +211,7 @@ static void w32_show_hourglass (struct frame *);
 static void w32_hide_hourglass (void);
 
 #ifdef WINDOWSNT
-/* From w32inevet.c */
+/* From w32inevt.c */
 extern int faked_key;
 #endif /* WINDOWSNT */
 
@@ -7711,4 +7711,3 @@ emacs_abort (void)
       break;
     }
 }
-
diff --git a/src/xdisp.c b/src/xdisp.c
index f597e40bbd5..109aca9051c 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24318,17 +24318,16 @@ produce_stretch_glyph (struct it *it)
   Lisp_Object prop, plist;
   int width = 0, height = 0, align_to = -1;
   int zero_width_ok_p = 0;
-  int ascent = 0;
   double tem;
-  struct face *face = NULL;
   struct font *font = NULL;
 
 #ifdef HAVE_WINDOW_SYSTEM
+  int ascent = 0;
   int zero_height_ok_p = 0;
 
   if (FRAME_WINDOW_P (it->f))
     {
-      face = FACE_FROM_ID (it->f, it->face_id);
+      struct face *face = FACE_FROM_ID (it->f, it->face_id);
       font = face->font ? face->font : FRAME_FONT (it->f);
       PREPARE_FACE_FOR_DISPLAY (it->f, face);
     }
diff --git a/src/xfaces.c b/src/xfaces.c
index 3e6e9dc8ec0..221387c4b6d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -371,8 +371,6 @@ Lisp_Object Vface_alternative_font_registry_alist;
 
 static Lisp_Object Qscalable_fonts_allowed;
 
-#define DEFAULT_FONT_LIST_LIMIT 100
-
 /* The symbols `foreground-color' and `background-color' which can be
    used as part of a `face' property.  This is for compatibility with
    Emacs 20.2.  */
@@ -1323,7 +1321,8 @@ load_color (struct frame *f, struct face *face, Lisp_Object name,
    try to emulate gray colors with a stipple from Vface_default_stipple.  */
 
 static void
-load_face_colors (struct frame *f, struct face *face, Lisp_Object *attrs)
+load_face_colors (struct frame *f, struct face *face,
+                  Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   Lisp_Object fg, bg;
 
@@ -1802,7 +1801,7 @@ the WIDTH times as wide as FACE on FRAME.  */)
 /* Check consistency of Lisp face attribute vector ATTRS.  */
 
 static void
-check_lface_attrs (Lisp_Object *attrs)
+check_lface_attrs (Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   eassert (UNSPECIFIEDP (attrs[LFACE_FAMILY_INDEX])
            || IGNORE_DEFFACE_P (attrs[LFACE_FAMILY_INDEX])
@@ -2049,7 +2048,8 @@ lface_from_face_name (struct frame *f, Lisp_Object face_name, int signal_p)
 
 static int
 get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name,
-                               Lisp_Object *attrs, int signal_p)
+                               Lisp_Object attrs[LFACE_VECTOR_SIZE],
+                               int signal_p)
 {
   Lisp_Object lface;
 
@@ -2071,7 +2071,7 @@ get_lface_attributes_no_remap (struct frame *f, Lisp_Object face_name,
 
 static int
 get_lface_attributes (struct frame *f, Lisp_Object face_name,
-                      Lisp_Object *attrs, int signal_p,
+                      Lisp_Object attrs[LFACE_VECTOR_SIZE], int signal_p,
                       struct named_merge_point *named_merge_points)
 {
   Lisp_Object face_remapping;
@@ -2108,7 +2108,7 @@ get_lface_attributes (struct frame *f, Lisp_Object face_name,
    specified, i.e. are non-nil.  */
 
 static int
-lface_fully_specified_p (Lisp_Object *attrs)
+lface_fully_specified_p (Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   int i;
 
@@ -4760,7 +4760,8 @@ DEFUN ("face-attributes-as-vector", Fface_attributes_as_vector,
     \(2) `close in spirit' to what the attributes specify, if not exact.  */
 
 static int
-x_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs,
+x_supports_face_attributes_p (struct frame *f,
+                              Lisp_Object attrs[LFACE_VECTOR_SIZE],
                               struct face *def_face)
 {
   Lisp_Object *def_attrs = def_face->lface;
@@ -4862,7 +4863,8 @@ x_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs,
    substitution of a `dim' face for italic.  */
 
 static int
-tty_supports_face_attributes_p (struct frame *f, Lisp_Object *attrs,
+tty_supports_face_attributes_p (struct frame *f,
+                                Lisp_Object attrs[LFACE_VECTOR_SIZE],
                                 struct face *def_face)
 {
   int weight, slant;
@@ -5245,7 +5247,7 @@ be found.  Value is ALIST.  */)
    attribute of ATTRS doesn't name a fontset.  */
 
 static int
-face_fontset (Lisp_Object *attrs)
+face_fontset (Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   Lisp_Object name;
 
@@ -5474,7 +5476,8 @@ realize_named_face (struct frame *f, Lisp_Object symbol, int id)
    face.  Value is a pointer to the newly created realized face.  */
 
 static struct face *
-realize_face (struct face_cache *cache, Lisp_Object *attrs, int former_face_id)
+realize_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE],
+              int former_face_id)
 {
   struct face *face;
 
@@ -5551,7 +5554,7 @@ realize_non_ascii_face (struct frame *f, Lisp_Object font_object,
    created realized face.  */
 
 static struct face *
-realize_x_face (struct face_cache *cache, Lisp_Object *attrs)
+realize_x_face (struct face_cache *cache, Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   struct face *face = NULL;
 #ifdef HAVE_WINDOW_SYSTEM
@@ -5878,7 +5881,8 @@ map_tty_color (struct frame *f, struct face *face,
    Value is a pointer to the newly created realized face.  */
 
 static struct face *
-realize_tty_face (struct face_cache *cache, Lisp_Object *attrs)
+realize_tty_face (struct face_cache *cache,
+                  Lisp_Object attrs[LFACE_VECTOR_SIZE])
 {
   struct face *face;
   int weight, slant;
@@ -6594,12 +6598,6 @@ syms_of_xfaces (void)
   defsubr (&Sdump_colors);
 #endif
 
-  DEFVAR_LISP ("font-list-limit", Vfont_list_limit,
-               doc: /* Limit for font matching.
-If an integer > 0, font matching functions won't load more than
-that number of fonts when searching for a matching font.  */);
-  Vfont_list_limit = make_number (DEFAULT_FONT_LIST_LIMIT);
-
   DEFVAR_LISP ("face-new-frame-defaults", Vface_new_frame_defaults,
     doc: /* List of global face definitions (for internal use only.)  */);
   Vface_new_frame_defaults = Qnil;
diff --git a/src/xterm.c b/src/xterm.c
index 23685ee8ae6..a52a113ccda 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3457,7 +3457,8 @@ x_focus_changed (int type, int state, struct x_display_info *dpyinfo, struct fra
 
           /* Don't stop displaying the initial startup message
              for a switch-frame event we don't need.  */
-          if (NILP (Vterminal_frame)
+          /* When run as a deamon, Vterminal_frame is always NIL.  */
+          if ((NILP (Vterminal_frame) || EQ (Fdaemonp(), Qt))
               && CONSP (Vframe_list)
               && !NILP (XCDR (Vframe_list)))
             {