Fix obscure porting bug with varargs functions.

[bpt/emacs.git] / src / font.c

diff --git a/src/font.c b/src/font.c
index db1d12d..124d5f9 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1,6 +1,6 @@
 /* font.c -- "Font" primitives.
 
 /* font.c -- "Font" primitives.
 

-Copyright (C) 2006-2012  Free Software Foundation, Inc.
+Copyright (C) 2006-2013 Free Software Foundation, Inc.

 Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009
 Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
   National Institute of Advanced Industrial Science and Technology (AIST)
   Registration Number H13PRO009


@@ -23,8 +23,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <float.h>
 #include <stdio.h>
 #include <config.h>
 #include <float.h>
 #include <stdio.h>

-#include <ctype.h>
-#include <setjmp.h>
+
+#include <c-ctype.h>

 
 #include "lisp.h"
 #include "character.h"
 
 #include "lisp.h"
 #include "character.h"


@@ -37,17 +37,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "fontset.h"
 #include "font.h"
 
 #include "fontset.h"
 #include "font.h"
 

-#ifdef HAVE_X_WINDOWS
-#include "xterm.h"
-#endif /* HAVE_X_WINDOWS */
-
-#ifdef HAVE_NTGUI
-#include "w32term.h"
-#endif /* HAVE_NTGUI */
-
-#ifdef HAVE_NS
-#include "nsterm.h"
-#endif /* HAVE_NS */
+#ifdef HAVE_WINDOW_SYSTEM
+#include TERM_HEADER
+#endif /* HAVE_WINDOW_SYSTEM */

 
 Lisp_Object Qopentype;
 
 
 Lisp_Object Qopentype;
 


@@ -223,13 +215,12 @@ static int num_font_drivers;
 
 
 /* Return a Lispy value of a font property value at STR and LEN bytes.
 
 
 /* Return a Lispy value of a font property value at STR and LEN bytes.

-   If STR is "*", return nil.
-   If FORCE_SYMBOL is zero and all characters in STR are digits,
-   return an integer.  Otherwise, return a symbol interned from
-   STR.  */
+   If STR is "*", return nil.  If FORCE_SYMBOL, or if STR does not
+   consist entirely of one or more digits, return a symbol interned
+   from STR.  Otherwise, return an integer.  */

 
 Lisp_Object
 
 Lisp_Object

-font_intern_prop (const char *str, ptrdiff_t len, int force_symbol)
+font_intern_prop (const char *str, ptrdiff_t len, bool force_symbol)

 {
   ptrdiff_t i;
   Lisp_Object tem;
 {
   ptrdiff_t i;
   Lisp_Object tem;


@@ -290,13 +281,13 @@ font_pixel_size (FRAME_PTR f, Lisp_Object spec)
     return XINT (size);
   if (NILP (size))
     return 0;
     return XINT (size);
   if (NILP (size))
     return 0;

-  font_assert (FLOATP (size));
+  eassert (FLOATP (size));

   point_size = XFLOAT_DATA (size);
   val = AREF (spec, FONT_DPI_INDEX);
   if (INTEGERP (val))
     dpi = XINT (val);
   else
   point_size = XFLOAT_DATA (size);
   val = AREF (spec, FONT_DPI_INDEX);
   if (INTEGERP (val))
     dpi = XINT (val);
   else

-    dpi = f->resy;
+    dpi = FRAME_RES_Y (f);

   pixel_size = POINT_TO_PIXEL (point_size, dpi);
   return pixel_size;
 #else
   pixel_size = POINT_TO_PIXEL (point_size, dpi);
   return pixel_size;
 #else


@@ -313,7 +304,8 @@ font_pixel_size (FRAME_PTR f, Lisp_Object spec)
    VAL is an integer.  */
 
 int
    VAL is an integer.  */
 
 int

-font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror)
+font_style_to_value (enum font_property_index prop, Lisp_Object val,
+                     bool noerror)

 {
   Lisp_Object table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
   int len;
 {
   Lisp_Object table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
   int len;


@@ -354,8 +346,7 @@ font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror
          }
       if (! noerror)
        return -1;
          }
       if (! noerror)
        return -1;

-      if (len == 255)
-       abort ();
+      eassert (len < 255);

       elt = Fmake_vector (make_number (2), make_number (100));
       ASET (elt, 1, val);
       args[0] = table;
       elt = Fmake_vector (make_number (2), make_number (100));
       ASET (elt, 1, val);
       args[0] = table;


@@ -393,7 +384,8 @@ font_style_to_value (enum font_property_index prop, Lisp_Object val, int noerror
 }
 
 Lisp_Object
 }
 
 Lisp_Object

-font_style_symbolic (Lisp_Object font, enum font_property_index prop, int for_face)
+font_style_symbolic (Lisp_Object font, enum font_property_index prop,
+                     bool for_face)

 {
   Lisp_Object val = AREF (font, prop);
   Lisp_Object table, elt;
 {
   Lisp_Object val = AREF (font, prop);
   Lisp_Object table, elt;


@@ -404,10 +396,10 @@ font_style_symbolic (Lisp_Object font, enum font_property_index prop, int for_fa
   table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
   CHECK_VECTOR (table);
   i = XINT (val) & 0xFF;
   table = AREF (font_style_table, prop - FONT_WEIGHT_INDEX);
   CHECK_VECTOR (table);
   i = XINT (val) & 0xFF;

-  font_assert (((i >> 4) & 0xF) < ASIZE (table));
+  eassert (((i >> 4) & 0xF) < ASIZE (table));

   elt = AREF (table, ((i >> 4) & 0xF));
   CHECK_VECTOR (elt);
   elt = AREF (table, ((i >> 4) & 0xF));
   CHECK_VECTOR (elt);

-  font_assert ((i & 0xF) + 1 < ASIZE (elt));
+  eassert ((i & 0xF) + 1 < ASIZE (elt));

   elt = (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1));
   CHECK_SYMBOL (elt);
   return elt;
   elt = (for_face ? AREF (elt, 1) : AREF (elt, (i & 0xF) + 1));
   CHECK_SYMBOL (elt);
   return elt;


@@ -480,7 +472,7 @@ font_registry_charsets (Lisp_Object registry, struct charset **encoding, struct
        goto invalid_entry;
       val = Fcons (make_number (encoding_id), make_number (repertory_id));
       font_charset_alist
        goto invalid_entry;
       val = Fcons (make_number (encoding_id), make_number (repertory_id));
       font_charset_alist

-       = nconc2 (font_charset_alist, Fcons (Fcons (registry, val), Qnil));
+       = nconc2 (font_charset_alist, list1 (Fcons (registry, val)));

     }
 
   if (encoding)
     }
 
   if (encoding)


@@ -491,7 +483,7 @@ font_registry_charsets (Lisp_Object registry, struct charset **encoding, struct
 
  invalid_entry:
   font_charset_alist
 
  invalid_entry:
   font_charset_alist

-    = nconc2 (font_charset_alist, Fcons (Fcons (registry, Qnil), Qnil));
+    = nconc2 (font_charset_alist, list1 (Fcons (registry, Qnil)));

   return -1;
 }
 
   return -1;
 }
 


@@ -725,7 +717,7 @@ font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val)
 }
 
 \f
 }
 
 \f

-/* Font name parser and unparser */
+/* Font name parser and unparser.  */

 
 static int parse_matrix (const char *);
 static int font_expand_wildcards (Lisp_Object *, int);
 
 static int parse_matrix (const char *);
 static int font_expand_wildcards (Lisp_Object *, int);


@@ -1076,11 +1068,11 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
            {
              double point_size = -1;
 
            {
              double point_size = -1;
 

-             font_assert (FONT_SPEC_P (font));
+             eassert (FONT_SPEC_P (font));

              p = f[XLFD_POINT_INDEX];
              if (*p == '[')
                point_size = parse_matrix (p);
              p = f[XLFD_POINT_INDEX];
              if (*p == '[')
                point_size = parse_matrix (p);

-             else if (isdigit (*p))
+             else if (c_isdigit (*p))

                point_size = atoi (p), point_size /= 10;
              if (point_size >= 0)
                ASET (font, FONT_SIZE_INDEX, make_float (point_size));
                point_size = atoi (p), point_size /= 10;
              if (point_size >= 0)
                ASET (font, FONT_SIZE_INDEX, make_float (point_size));


@@ -1109,7 +1101,7 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
     }
   else
     {
     }
   else
     {

-      int wild_card_found = 0;
+      bool wild_card_found = 0;

       Lisp_Object prop[XLFD_LAST_INDEX];
 
       if (FONT_ENTITY_P (font))
       Lisp_Object prop[XLFD_LAST_INDEX];
 
       if (FONT_ENTITY_P (font))


@@ -1197,7 +1189,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
   Lisp_Object val;
   int i, j, len;
 
   Lisp_Object val;
   int i, j, len;
 

-  font_assert (FONTP (font));
+  eassert (FONTP (font));

 
   for (i = FONT_FOUNDRY_INDEX, j = XLFD_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX;
        i++, j++)
 
   for (i = FONT_FOUNDRY_INDEX, j = XLFD_FOUNDRY_INDEX; i <= FONT_REGISTRY_INDEX;
        i++, j++)


@@ -1227,7 +1219,7 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
                return -1;
              f[j] = p = alloca (alloc);
              sprintf (p, "%s%s-*", SDATA (val),
                return -1;
              f[j] = p = alloca (alloc);
              sprintf (p, "%s%s-*", SDATA (val),

-                      "*" + (SDATA (val)[SBYTES (val) - 1] == '*'));
+                      &"*"[SDATA (val)[SBYTES (val) - 1] == '*']);

            }
          else
            f[j] = SSDATA (val);
            }
          else
            f[j] = SSDATA (val);


@@ -1242,13 +1234,26 @@ font_unparse_xlfd (Lisp_Object font, int pixel_size, char *name, int nbytes)
        f[j] = "*";
       else
        {
        f[j] = "*";
       else
        {

+         int c, k, l;
+         ptrdiff_t alloc;
+

          val = SYMBOL_NAME (val);
          val = SYMBOL_NAME (val);

-         f[j] = SSDATA (val);
+         alloc = SBYTES (val) + 1;
+         if (nbytes <= alloc)
+           return -1;
+         f[j] = p = alloca (alloc);
+         /* Copy the name while excluding '-', '?', ',', and '"'.  */
+         for (k = l = 0; k < alloc; k++)
+           {
+             c = SREF (val, k);
+             if (c != '-' && c != '?' && c != ',' && c != '"')
+               p[l++] = c;
+           }

        }
     }
 
   val = AREF (font, FONT_SIZE_INDEX);
        }
     }
 
   val = AREF (font, FONT_SIZE_INDEX);

-  font_assert (NUMBERP (val) || NILP (val));
+  eassert (NUMBERP (val) || NILP (val));

   if (INTEGERP (val))
     {
       EMACS_INT v = XINT (val);
   if (INTEGERP (val))
     {
       EMACS_INT v = XINT (val);


@@ -1345,9 +1350,9 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
        }
       else if (*p == '-')
        {
        }
       else if (*p == '-')
        {

-         int decimal = 0, size_found = 1;
+         bool decimal = 0, size_found = 1;

          for (q = p + 1; *q && *q != ':'; q++)
          for (q = p + 1; *q && *q != ':'; q++)

-           if (! isdigit (*q))
+           if (! c_isdigit (*q))

              {
                if (*q != '.' || decimal)
                  {
              {
                if (*q != '.' || decimal)
                  {


@@ -1448,7 +1453,7 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
                  else
                     {
                       extra_props = nconc2 (extra_props,
                  else
                     {
                       extra_props = nconc2 (extra_props,

-                                            Fcons (Fcons (key, val), Qnil));
+                                            list1 (Fcons (key, val)));

                     }
                }
              p = q;
                     }
                }
              p = q;


@@ -1475,7 +1480,7 @@ font_parse_fcname (char *name, ptrdiff_t len, Lisp_Object font)
 
       /* Scan backwards from the end, looking for a size.  */
       for (p = name + len - 1; p >= name; p--)
 
       /* Scan backwards from the end, looking for a size.  */
       for (p = name + len - 1; p >= name; p--)

-       if (!isdigit (*p))
+       if (!c_isdigit (*p))

          break;
 
       if ((p < name + len - 1) && ((p + 1 == name) || *p == ' '))
          break;
 
       if ((p < name + len - 1) && ((p + 1 == name) || *p == ' '))


@@ -1585,8 +1590,7 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
     }
   else
     {
     }
   else
     {

-      if (! FLOATP (val))
-       abort ();
+      eassert (FLOATP (val));

       pixel_size = -1;
       point_size = (int) XFLOAT_DATA (val);
     }
       pixel_size = -1;
       point_size = (int) XFLOAT_DATA (val);
     }


@@ -1614,7 +1618,7 @@ font_unparse_fcname (Lisp_Object font, int pixel_size, char *name, int nbytes)
     }
   if (point_size > 0)
     {
     }
   if (point_size > 0)
     {

-      int len = snprintf (p, lim - p, "-%d" + (p == name), point_size);
+      int len = snprintf (p, lim - p, &"-%d"[p == name], point_size);

       if (! (0 <= len && len < lim - p))
        return -1;
       p += len;
       if (! (0 <= len && len < lim - p))
        return -1;
       p += len;


@@ -1742,7 +1746,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec
 /* This part (through the next ^L) is still experimental and not
    tested much.  We may drastically change codes.  */
 
 /* This part (through the next ^L) is still experimental and not
    tested much.  We may drastically change codes.  */
 

-/* OTF handler */
+/* OTF handler.  */

 
 #if 0
 
 
 #if 0
 


@@ -1853,11 +1857,11 @@ otf_open (Lisp_Object file)
   OTF *otf;
 
   if (! NILP (val))
   OTF *otf;
 
   if (! NILP (val))

-    otf = XSAVE_VALUE (XCDR (val))->pointer;
+    otf = XSAVE_POINTER (XCDR (val), 0);

   else
     {
       otf = STRINGP (file) ? OTF_open (SSDATA (file)) : NULL;
   else
     {
       otf = STRINGP (file) ? OTF_open (SSDATA (file)) : NULL;

-      val = make_save_value (otf, 0);
+      val = make_save_ptr (otf);

       otf_list = Fcons (Fcons (file, val), otf_list);
     }
   return otf;
       otf_list = Fcons (Fcons (file, val), otf_list);
     }
   return otf;


@@ -1947,7 +1951,7 @@ generate_otf_features (Lisp_Object spec, char *features)
 {
   Lisp_Object val;
   char *p;
 {
   Lisp_Object val;
   char *p;

-  int asterisk;
+  bool asterisk;

 
   p = features;
   *p = '\0';
 
   p = features;
   *p = '\0';


@@ -2031,7 +2035,7 @@ font_otf_Anchor (OTF_Anchor *anchor)
 #endif /* 0 */
 
 \f
 #endif /* 0 */
 
 \f

-/* Font sorting */
+/* Font sorting.  */

 
 static unsigned font_score (Lisp_Object, Lisp_Object *);
 static int font_compare (const void *, const void *);
 
 static unsigned font_score (Lisp_Object, Lisp_Object *);
 static int font_compare (const void *, const void *);


@@ -2097,9 +2101,7 @@ font_score (Lisp_Object entity, Lisp_Object *spec_prop)
       {
        EMACS_INT diff = ((XINT (AREF (entity, i)) >> 8)
                          - (XINT (spec_prop[i]) >> 8));
       {
        EMACS_INT diff = ((XINT (AREF (entity, i)) >> 8)
                          - (XINT (spec_prop[i]) >> 8));

-       if (diff < 0)
-         diff = - diff;
-       score |= min (diff, 127) << sort_shift_bits[i];
+       score |= min (eabs (diff), 127) << sort_shift_bits[i];

       }
 
   /* Score the size.  Maximum difference is 127.  */
       }
 
   /* Score the size.  Maximum difference is 127.  */


@@ -2114,10 +2116,7 @@ font_score (Lisp_Object entity, Lisp_Object *spec_prop)
 
       if (CONSP (Vface_font_rescale_alist))
        pixel_size *= font_rescale_ratio (entity);
 
       if (CONSP (Vface_font_rescale_alist))
        pixel_size *= font_rescale_ratio (entity);

-      diff = pixel_size - XINT (AREF (entity, FONT_SIZE_INDEX));
-      if (diff < 0)
-       diff = - diff;
-      diff <<= 1;
+      diff = eabs (pixel_size - XINT (AREF (entity, FONT_SIZE_INDEX))) << 1;

       if (! NILP (spec_prop[FONT_DPI_INDEX])
          && ! EQ (spec_prop[FONT_DPI_INDEX], AREF (entity, FONT_DPI_INDEX)))
        diff |= 1;
       if (! NILP (spec_prop[FONT_DPI_INDEX])
          && ! EQ (spec_prop[FONT_DPI_INDEX], AREF (entity, FONT_DPI_INDEX)))
        diff |= 1;


@@ -2311,11 +2310,12 @@ font_update_sort_order (int *order)
     }
 }
 
     }
 }
 

-static int
-font_check_otf_features (Lisp_Object script, Lisp_Object langsys, Lisp_Object features, Lisp_Object table)
+static bool
+font_check_otf_features (Lisp_Object script, Lisp_Object langsys,
+                         Lisp_Object features, Lisp_Object table)

 {
   Lisp_Object val;
 {
   Lisp_Object val;

-  int negative;
+  bool negative;

 
   table = assq_no_quit (script, table);
   if (NILP (table))
 
   table = assq_no_quit (script, table);
   if (NILP (table))


@@ -2351,7 +2351,7 @@ font_check_otf_features (Lisp_Object script, Lisp_Object langsys, Lisp_Object fe
 
 /* Check if OTF_CAPABILITY satisfies SPEC (otf-spec).  */
 
 
 /* Check if OTF_CAPABILITY satisfies SPEC (otf-spec).  */
 

-static int
+static bool

 font_check_otf (Lisp_Object spec, Lisp_Object otf_capability)
 {
   Lisp_Object script, langsys = Qnil, gsub = Qnil, gpos = Qnil;
 font_check_otf (Lisp_Object spec, Lisp_Object otf_capability)
 {
   Lisp_Object script, langsys = Qnil, gsub = Qnil, gpos = Qnil;


@@ -2385,7 +2385,7 @@ font_check_otf (Lisp_Object spec, Lisp_Object otf_capability)
 /* Check if FONT (font-entity or font-object) matches with the font
    specification SPEC.  */
 
 /* Check if FONT (font-entity or font-object) matches with the font
    specification SPEC.  */
 

-int
+bool

 font_match_p (Lisp_Object spec, Lisp_Object font)
 {
   Lisp_Object prop[FONT_SPEC_MAX], *props;
 font_match_p (Lisp_Object spec, Lisp_Object font)
 {
   Lisp_Object prop[FONT_SPEC_MAX], *props;


@@ -2519,7 +2519,7 @@ font_prepare_cache (FRAME_PTR f, struct font_driver *driver)
     val = XCDR (val);
   if (NILP (val))
     {
     val = XCDR (val);
   if (NILP (val))
     {

-      val = Fcons (driver->type, Fcons (make_number (1), Qnil));
+      val = list2 (driver->type, make_number (1));

       XSETCDR (cache, Fcons (val, XCDR (cache)));
     }
   else
       XSETCDR (cache, Fcons (val, XCDR (cache)));
     }
   else


@@ -2540,7 +2540,7 @@ font_finish_cache (FRAME_PTR f, struct font_driver *driver)
   val = XCDR (cache);
   while (CONSP (val) && ! EQ (XCAR (XCAR (val)), driver->type))
     cache = val, val = XCDR (val);
   val = XCDR (cache);
   while (CONSP (val) && ! EQ (XCAR (XCAR (val)), driver->type))
     cache = val, val = XCDR (val);

-  font_assert (! NILP (val));
+  eassert (! NILP (val));

   tmp = XCDR (XCAR (val));
   XSETCAR (tmp, make_number (XINT (XCAR (tmp)) - 1));
   if (XINT (XCAR (tmp)) == 0)
   tmp = XCDR (XCAR (val));
   XSETCAR (tmp, make_number (XINT (XCAR (tmp)) - 1));
   if (XINT (XCAR (tmp)) == 0)


@@ -2557,15 +2557,14 @@ font_get_cache (FRAME_PTR f, struct font_driver *driver)
   Lisp_Object val = driver->get_cache (f);
   Lisp_Object type = driver->type;
 
   Lisp_Object val = driver->get_cache (f);
   Lisp_Object type = driver->type;
 

-  font_assert (CONSP (val));
+  eassert (CONSP (val));

   for (val = XCDR (val); ! EQ (XCAR (XCAR (val)), type); val = XCDR (val));
   for (val = XCDR (val); ! EQ (XCAR (XCAR (val)), type); val = XCDR (val));

-  font_assert (CONSP (val));
+  eassert (CONSP (val));

   /* VAL = ((DRIVER-TYPE NUM-FRAMES FONT-CACHE-DATA ...) ...) */
   val = XCDR (XCAR (val));
   return val;
 }
 
   /* VAL = ((DRIVER-TYPE NUM-FRAMES FONT-CACHE-DATA ...) ...) */
   val = XCDR (XCAR (val));
   return val;
 }
 

-static int num_fonts;

 
 static void
 font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
 
 static void
 font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)


@@ -2596,9 +2595,8 @@ font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
 
                      if (! NILP (AREF (val, FONT_TYPE_INDEX)))
                        {
 
                      if (! NILP (AREF (val, FONT_TYPE_INDEX)))
                        {

-                         font_assert (font && driver == font->driver);
+                         eassert (font && driver == font->driver);

                          driver->close (f, font);
                          driver->close (f, font);

-                         num_fonts--;

                        }
                    }
                  if (driver->free_entity)
                        }
                    }
                  if (driver->free_entity)


@@ -2666,9 +2664,7 @@ font_delete_unmatched (Lisp_Object vec, Lisp_Object spec, int size)
        {
          int diff = XINT (AREF (entity, FONT_SIZE_INDEX)) - size;
 
        {
          int diff = XINT (AREF (entity, FONT_SIZE_INDEX)) - size;
 

-         if (diff != 0
-             && (diff < 0 ? -diff > FONT_PIXEL_SIZE_QUANTUM
-                 : diff > FONT_PIXEL_SIZE_QUANTUM))
+         if (eabs (diff) > FONT_PIXEL_SIZE_QUANTUM)

            prop = FONT_SPEC_MAX;
        }
       if (prop < FONT_SPEC_MAX
            prop = FONT_SPEC_MAX;
        }
       if (prop < FONT_SPEC_MAX


@@ -2703,10 +2699,10 @@ font_list_entities (Lisp_Object frame, Lisp_Object spec)
   Lisp_Object ftype, val;
   Lisp_Object list = Qnil;
   int size;
   Lisp_Object ftype, val;
   Lisp_Object list = Qnil;
   int size;

-  int need_filtering = 0;
+  bool need_filtering = 0;

   int i;
 
   int i;
 

-  font_assert (FONT_SPEC_P (spec));
+  eassert (FONT_SPEC_P (spec));

 
   if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
     size = XINT (AREF (spec, FONT_SIZE_INDEX));
 
   if (INTEGERP (AREF (spec, FONT_SIZE_INDEX)))
     size = XINT (AREF (spec, FONT_SIZE_INDEX));


@@ -2823,15 +2819,12 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
   struct font_driver_list *driver_list;
   Lisp_Object objlist, size, val, font_object;
   struct font *font;
   struct font_driver_list *driver_list;
   Lisp_Object objlist, size, val, font_object;
   struct font *font;

-  int min_width, height;
-  int scaled_pixel_size = pixel_size;
+  int min_width, height, psize;

 
 

-  font_assert (FONT_ENTITY_P (entity));
+  eassert (FONT_ENTITY_P (entity));

   size = AREF (entity, FONT_SIZE_INDEX);
   if (XINT (size) != 0)
   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;
 
   val = AREF (entity, FONT_TYPE_INDEX);
   for (driver_list = f->font_driver_list;


@@ -2853,15 +2846,21 @@ font_open_entity (FRAME_PTR f, Lisp_Object entity, int pixel_size)
         }
     }
 
         }
     }
 

-  font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
-  if (!NILP (font_object))
-    ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
+  /* We always open a font of manageable size; i.e non-zero average
+     width and height.  */
+  for (psize = pixel_size; ; psize++)
+    {
+      font_object = driver_list->driver->open (f, entity, psize);
+      if (NILP (font_object))
+       return Qnil;
+      font = XFONT_OBJECT (font_object);
+      if (font->average_width > 0 && font->height > 0)
+       break;
+    }
+  ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));

   FONT_ADD_LOG ("open", entity, font_object);
   FONT_ADD_LOG ("open", entity, font_object);

-  if (NILP (font_object))
-    return Qnil;

   ASET (entity, FONT_OBJLIST_INDEX,
        Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
   ASET (entity, FONT_OBJLIST_INDEX,
        Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));

-  num_fonts++;

 
   font = XFONT_OBJECT (font_object);
   min_width = (font->min_width ? font->min_width
 
   font = XFONT_OBJECT (font_object);
   min_width = (font->min_width ? font->min_width


@@ -2903,10 +2902,9 @@ font_close_object (FRAME_PTR f, Lisp_Object font_object)
   FONT_ADD_LOG ("close", font_object, Qnil);
   font->driver->close (f, font);
 #ifdef HAVE_WINDOW_SYSTEM
   FONT_ADD_LOG ("close", font_object, Qnil);
   font->driver->close (f, font);
 #ifdef HAVE_WINDOW_SYSTEM

-  font_assert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
+  eassert (FRAME_X_DISPLAY_INFO (f)->n_fonts);

   FRAME_X_DISPLAY_INFO (f)->n_fonts--;
 #endif
   FRAME_X_DISPLAY_INFO (f)->n_fonts--;
 #endif

-  num_fonts--;

 }
 
 
 }
 
 


@@ -2933,7 +2931,7 @@ font_has_char (FRAME_PTR f, Lisp_Object font, int c)
       return driver_list->driver->has_char (font, c);
     }
 
       return driver_list->driver->has_char (font, c);
     }
 

-  font_assert (FONT_OBJECT_P (font));
+  eassert (FONT_OBJECT_P (font));

   fontp = XFONT_OBJECT (font);
   if (fontp->driver->has_char)
     {
   fontp = XFONT_OBJECT (font);
   if (fontp->driver->has_char)
     {


@@ -2953,7 +2951,7 @@ font_encode_char (Lisp_Object font_object, int c)
 {
   struct font *font;
 
 {
   struct font *font;
 

-  font_assert (FONT_OBJECT_P (font_object));
+  eassert (FONT_OBJECT_P (font_object));

   font = XFONT_OBJECT (font_object);
   return font->driver->encode_char (font, c);
 }
   font = XFONT_OBJECT (font_object);
   return font->driver->encode_char (font, c);
 }


@@ -2964,7 +2962,7 @@ font_encode_char (Lisp_Object font_object, int c)
 Lisp_Object
 font_get_name (Lisp_Object font_object)
 {
 Lisp_Object
 font_get_name (Lisp_Object font_object)
 {

-  font_assert (FONT_OBJECT_P (font_object));
+  eassert (FONT_OBJECT_P (font_object));

   return AREF (font_object, FONT_NAME_INDEX);
 }
 
   return AREF (font_object, FONT_NAME_INDEX);
 }
 


@@ -3045,15 +3043,14 @@ font_select_entity (Lisp_Object frame, Lisp_Object entities, Lisp_Object *attrs,
 {
   Lisp_Object font_entity;
   Lisp_Object prefer;
 {
   Lisp_Object font_entity;
   Lisp_Object prefer;

-  int result, i;
+  int i;

   FRAME_PTR f = XFRAME (frame);
 
   if (NILP (XCDR (entities))
       && ASIZE (XCAR (entities)) == 1)
     {
       font_entity = AREF (XCAR (entities), 0);
   FRAME_PTR f = XFRAME (frame);
 
   if (NILP (XCDR (entities))
       && ASIZE (XCAR (entities)) == 1)
     {
       font_entity = AREF (XCAR (entities), 0);

-      if (c < 0
-         || (result = font_has_char (f, font_entity, c)) > 0)
+      if (c < 0 || font_has_char (f, font_entity, c) > 0)

        return font_entity;
       return Qnil;
     }
        return font_entity;
       return Qnil;
     }


@@ -3127,7 +3124,9 @@ font_find_for_lface (FRAME_PTR f, Lisp_Object *attrs, Lisp_Object spec, int c)
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
 
     {
       double pt = XINT (attrs[LFACE_HEIGHT_INDEX]);
 

-      pixel_size = POINT_TO_PIXEL (pt / 10, f->resy);
+      pixel_size = POINT_TO_PIXEL (pt / 10, FRAME_RES_Y (f));
+      if (pixel_size < 1)
+       pixel_size = 1;

     }
   ASET (work, FONT_SIZE_INDEX, Qnil);
   foundry[0] = AREF (work, FONT_FOUNDRY_INDEX);
     }
   ASET (work, FONT_SIZE_INDEX, Qnil);
   foundry[0] = AREF (work, FONT_FOUNDRY_INDEX);


@@ -3239,33 +3238,37 @@ 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));
   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
     {
   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
        {
       else
        {

-         struct face *def = FACE_FROM_ID (f, DEFAULT_FACE_ID);
-         Lisp_Object height = def->lface[LFACE_HEIGHT_INDEX];
-         if (INTEGERP (height))
-           pt = XINT (height);
+         double pt;
+         if (INTEGERP (attrs[LFACE_HEIGHT_INDEX]))
+           pt = XINT (attrs[LFACE_HEIGHT_INDEX]);

          else
          else

-           abort (); /* We should never end up here.  */
-       }
+           {
+             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, FRAME_RES_Y (f));

 #ifdef HAVE_NS
 #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), FRAME_RES_Y (f)) : 0);
+           }

 #endif
 #endif

+       }
+      size *= font_rescale_ratio (entity);

     }
     }

+

   return font_open_entity (f, entity, size);
 }
 
   return font_open_entity (f, entity, size);
 }
 


@@ -3514,8 +3517,7 @@ font_update_drivers (FRAME_PTR f, Lisp_Object new_drivers)
 
   for (list = f->font_driver_list; list; list = list->next)
     if (list->on)
 
   for (list = f->font_driver_list; list; list = list->next)
     if (list->on)

-      active_drivers = nconc2 (active_drivers,
-                              Fcons (list->driver->type, Qnil));
+      active_drivers = nconc2 (active_drivers, list1 (list->driver->type));

   return active_drivers;
 }
 
   return active_drivers;
 }
 


@@ -3581,7 +3583,7 @@ font_filter_properties (Lisp_Object font,
   Lisp_Object it;
   int i;
 
   Lisp_Object it;
   int i;
 

-  /* Set boolean values to Qt or Qnil */
+  /* Set boolean values to Qt or Qnil.  */

   for (i = 0; boolean_properties[i] != NULL; ++i)
     for (it = alist; ! NILP (it); it = XCDR (it))
       {
   for (i = 0; boolean_properties[i] != NULL; ++i)
     for (it = alist; ! NILP (it); it = XCDR (it))
       {


@@ -3629,7 +3631,7 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
         Lisp_Object string)
 {
   FRAME_PTR f;
         Lisp_Object string)
 {
   FRAME_PTR f;

-  int multibyte;
+  bool multibyte;

   Lisp_Object font_object;
 
   multibyte = (NILP (string)
   Lisp_Object font_object;
 
   multibyte = (NILP (string)


@@ -3665,7 +3667,7 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
        }
     }
 
        }
     }
 

-  f = XFRAME (WGET (w, frame));
+  f = XFRAME (w->frame);

   if (! FRAME_WINDOW_P (f))
     return Qnil;
   if (! face)
   if (! FRAME_WINDOW_P (f))
     return Qnil;
   if (! face)


@@ -3696,11 +3698,11 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
 
 #ifdef HAVE_WINDOW_SYSTEM
 
 
 #ifdef HAVE_WINDOW_SYSTEM
 

-/* Check how many characters after POS (at most to *LIMIT) can be
-   displayed by the same font in the window W.  FACE, if non-NULL, is
-   the face selected for the character at POS.  If STRING is not nil,
-   it is the string to check instead of the current buffer.  In that
-   case, FACE must be not NULL.
+/* Check how many characters after character/byte position POS/POS_BYTE
+   (at most to *LIMIT) can be displayed by the same font in the window W.
+   FACE, if non-NULL, is the face selected for the character at POS.
+   If STRING is not nil, it is the string to check instead of the current
+   buffer.  In that case, FACE must be not NULL.

 
    The return value is the font-object for the character at POS.
    *LIMIT is set to the position where that font can't be used.
 
    The return value is the font-object for the character at POS.
    *LIMIT is set to the position where that font can't be used.


@@ -3708,29 +3710,26 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
    It is assured that the current buffer (or STRING) is multibyte.  */
 
 Lisp_Object
    It is assured that the current buffer (or STRING) is multibyte.  */
 
 Lisp_Object

-font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face, Lisp_Object string)
+font_range (ptrdiff_t pos, ptrdiff_t pos_byte, ptrdiff_t *limit,
+           struct window *w, struct face *face, Lisp_Object string)

 {
 {

-  ptrdiff_t pos_byte, ignore;
+  ptrdiff_t ignore;

   int c;
   Lisp_Object font_object = Qnil;
 
   if (NILP (string))
     {
   int c;
   Lisp_Object font_object = Qnil;
 
   if (NILP (string))
     {

-      pos_byte = CHAR_TO_BYTE (pos);

       if (! face)
        {
          int face_id;
 
          face_id = face_at_buffer_position (w, pos, 0, 0, &ignore,
                                             *limit, 0, -1);
       if (! face)
        {
          int face_id;
 
          face_id = face_at_buffer_position (w, pos, 0, 0, &ignore,
                                             *limit, 0, -1);

-         face = FACE_FROM_ID (XFRAME (WGET (w, frame)), face_id);
+         face = FACE_FROM_ID (XFRAME (w->frame), face_id);

        }
     }
   else
        }
     }
   else

-    {
-      font_assert (face);
-      pos_byte = string_char_to_byte (string, pos);
-    }
+    eassert (face);

 
   while (pos < *limit)
     {
 
   while (pos < *limit)
     {


@@ -3760,7 +3759,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face
 #endif
 
 \f
 #endif
 
 \f

-/* Lisp API */
+/* Lisp API.  */

 
 DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
        doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.
 
 DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
        doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.


@@ -3863,7 +3862,8 @@ usage: (font-spec ARGS...)  */)
       if (EQ (key, QCname))
        {
          CHECK_STRING (val);
       if (EQ (key, QCname))
        {
          CHECK_STRING (val);

-         font_parse_name (SSDATA (val), SBYTES (val), spec);
+         if (font_parse_name (SSDATA (val), SBYTES (val), spec) < 0)
+           error ("Invalid font name: %s", SSDATA (val));

          font_put_extra (spec, key, val);
        }
       else
          font_put_extra (spec, key, val);
        }
       else


@@ -4002,16 +4002,11 @@ The optional argument FRAME specifies the frame that the face attributes
 are to be displayed on.  If omitted, the selected frame is used.  */)
   (Lisp_Object font, Lisp_Object frame)
 {
 are to be displayed on.  If omitted, the selected frame is used.  */)
   (Lisp_Object font, Lisp_Object frame)
 {

-  struct frame *f;
+  struct frame *f = decode_live_frame (frame);

   Lisp_Object plist[10];
   Lisp_Object val;
   int n = 0;
 
   Lisp_Object plist[10];
   Lisp_Object val;
   int n = 0;
 

-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);
-  f = XFRAME (frame);
-

   if (STRINGP (font))
     {
       int fontset = fs_query_fontset (font, 0);
   if (STRINGP (font))
     {
       int fontset = fs_query_fontset (font, 0);


@@ -4036,7 +4031,7 @@ are to be displayed on.  If omitted, the selected frame is used.  */)
   if (INTEGERP (val))
     {
       Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);
   if (INTEGERP (val))
     {
       Lisp_Object font_dpi = AREF (font, FONT_DPI_INDEX);

-      int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : f->resy;
+      int dpi = INTEGERP (font_dpi) ? XINT (font_dpi) : FRAME_RES_Y (f);

       plist[n++] = QCheight;
       plist[n++] = make_number (PIXEL_TO_POINT (XINT (val) * 10, dpi));
     }
       plist[n++] = QCheight;
       plist[n++] = make_number (PIXEL_TO_POINT (XINT (val) * 10, dpi));
     }


@@ -4137,7 +4132,7 @@ how close they are to PREFER.  */)
     return Qnil;
   if (NILP (XCDR (list))
       && ASIZE (XCAR (list)) == 1)
     return Qnil;
   if (NILP (XCDR (list))
       && ASIZE (XCAR (list)) == 1)

-    return Fcons (AREF (XCAR (list), 0), Qnil);
+    return list1 (AREF (XCAR (list), 0));

 
   if (! NILP (prefer))
     vec = font_sort_entities (list, prefer, frame, 0);
 
   if (! NILP (prefer))
     vec = font_sort_entities (list, prefer, frame, 0);


@@ -4161,18 +4156,15 @@ how close they are to PREFER.  */)
 
 DEFUN ("font-family-list", Ffont_family_list, Sfont_family_list, 0, 1, 0,
        doc: /* List available font families on the current frame.
 
 DEFUN ("font-family-list", Ffont_family_list, Sfont_family_list, 0, 1, 0,
        doc: /* List available font families on the current frame.

-Optional argument FRAME, if non-nil, specifies the target frame.  */)
+If FRAME is omitted or nil, the selected frame is used.  */)

   (Lisp_Object frame)
 {
   (Lisp_Object frame)
 {

-  FRAME_PTR f;
+  struct frame *f = decode_live_frame (frame);

   struct font_driver_list *driver_list;
   struct font_driver_list *driver_list;

-  Lisp_Object list;
+  Lisp_Object list = Qnil;
+
+  XSETFRAME (frame, f);

 
 

-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);
-  f = XFRAME (frame);
-  list = Qnil;

   for (driver_list = f->font_driver_list; driver_list;
        driver_list = driver_list->next)
     if (driver_list->driver->list_family)
   for (driver_list = f->font_driver_list; driver_list;
        driver_list = driver_list->next)
     if (driver_list->driver->list_family)


@@ -4268,7 +4260,7 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0,
            while (! NILP (val)
                   && ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
              val = XCDR (val);
            while (! NILP (val)
                   && ! EQ (XCAR (XCAR (val)), driver_list->driver->type))
              val = XCDR (val);

-           font_assert (! NILP (val));
+           eassert (! NILP (val));

            tmp = XCDR (XCAR (val));
            if (XINT (XCAR (tmp)) == 0)
              {
            tmp = XCDR (XCAR (val));
            if (XINT (XCAR (tmp)) == 0)
              {


@@ -4306,12 +4298,15 @@ to get the correct visual image of character sequences set in the
 header of the glyph-string.
 
 If the shaping was successful, the value is GSTRING itself or a newly
 header of the glyph-string.
 
 If the shaping was successful, the value is GSTRING itself or a newly

-created glyph-string.  Otherwise, the value is nil.  */)
+created glyph-string.  Otherwise, the value is nil.
+
+See the documentation of `composition-get-gstring' for the format of
+GSTRING.  */)

   (Lisp_Object gstring)
 {
   struct font *font;
   Lisp_Object font_object, n, glyph;
   (Lisp_Object gstring)
 {
   struct font *font;
   Lisp_Object font_object, n, glyph;

-  ptrdiff_t i, j, from, to;
+  ptrdiff_t i, from, to;

 
   if (! composition_gstring_p (gstring))
     signal_error ("Invalid glyph-string: ", gstring);
 
   if (! composition_gstring_p (gstring))
     signal_error ("Invalid glyph-string: ", gstring);


@@ -4337,44 +4332,42 @@ created glyph-string.  Otherwise, the value is nil.  */)
   if (XINT (n) < LGSTRING_GLYPH_LEN (gstring))
     LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil);
 
   if (XINT (n) < LGSTRING_GLYPH_LEN (gstring))
     LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil);
 

+  /* Check FROM_IDX and TO_IDX of each GLYPH in GSTRING to assure that
+     GLYPHS covers all characters (except for the last few ones) in
+     GSTRING.  More formally, provided that NCHARS is the number of
+     characters in GSTRING and GLYPHS[i] is the ith glyph, FROM_IDX
+     and TO_IDX of each glyph must satisfy these conditions:
+
+       GLYPHS[0].FROM_IDX == 0
+       GLYPHS[i].FROM_IDX <= GLYPHS[i].TO_IDX
+       if (GLYPHS[i].FROM_IDX == GLYPHS[i-1].FROM_IDX)
+         ;; GLYPHS[i] and GLYPHS[i-1] belongs to the same grapheme cluster
+         GLYPHS[i].TO_IDX == GLYPHS[i-1].TO_IDX
+       else
+         ;; Be sure to cover all characters.
+         GLYPHS[i].FROM_IDX == GLYPHS[i-1].TO_IDX + 1 */

   glyph = LGSTRING_GLYPH (gstring, 0);
   from = LGLYPH_FROM (glyph);
   to = LGLYPH_TO (glyph);
   glyph = LGSTRING_GLYPH (gstring, 0);
   from = LGLYPH_FROM (glyph);
   to = LGLYPH_TO (glyph);

-  for (i = 1, j = 0; i < LGSTRING_GLYPH_LEN (gstring); i++)
+  if (from != 0 || to < from)
+    goto shaper_error;
+  for (i = 1; i < LGSTRING_GLYPH_LEN (gstring); i++)

     {
     {

-      Lisp_Object this = LGSTRING_GLYPH (gstring, i);
-
-      if (NILP (this))
+      glyph = LGSTRING_GLYPH (gstring, i);
+      if (NILP (glyph))

        break;
        break;

-      if (NILP (LGLYPH_ADJUSTMENT (this)))
-       {
-         if (j < i - 1)
-           for (; j < i; j++)
-             {
-               glyph = LGSTRING_GLYPH (gstring, j);
-               LGLYPH_SET_FROM (glyph, from);
-               LGLYPH_SET_TO (glyph, to);
-             }
-         from = LGLYPH_FROM (this);
-         to = LGLYPH_TO (this);
-         j = i;
-       }
-      else
-       {
-         if (from > LGLYPH_FROM (this))
-           from = LGLYPH_FROM (this);
-         if (to < LGLYPH_TO (this))
-           to = LGLYPH_TO (this);
-       }
+      if (! (LGLYPH_FROM (glyph) <= LGLYPH_TO (glyph)
+            && (LGLYPH_FROM (glyph) == from
+                ? LGLYPH_TO (glyph) == to
+                : LGLYPH_FROM (glyph) == to + 1)))
+       goto shaper_error;
+      from = LGLYPH_FROM (glyph);
+      to = LGLYPH_TO (glyph);

     }
     }

-  if (j < i - 1)
-    for (; j < i; j++)
-      {
-       glyph = LGSTRING_GLYPH (gstring, j);
-       LGLYPH_SET_FROM (glyph, from);
-       LGLYPH_SET_TO (glyph, to);
-      }

   return composition_gstring_put_cache (gstring, XINT (n));
   return composition_gstring_put_cache (gstring, XINT (n));

+
+ shaper_error:
+  return Qnil;

 }
 
 DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs,
 }
 
 DEFUN ("font-variation-glyphs", Ffont_variation_glyphs, Sfont_variation_glyphs,


@@ -4539,11 +4532,9 @@ DEFUN ("open-font", Fopen_font, Sopen_font, 1, 3, 0,
   (Lisp_Object font_entity, Lisp_Object size, Lisp_Object frame)
 {
   EMACS_INT isize;
   (Lisp_Object font_entity, Lisp_Object size, Lisp_Object frame)
 {
   EMACS_INT isize;

+  struct frame *f = decode_live_frame (frame);

 
   CHECK_FONT_ENTITY (font_entity);
 
   CHECK_FONT_ENTITY (font_entity);

-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);

 
   if (NILP (size))
     isize = XINT (AREF (font_entity, FONT_SIZE_INDEX));
 
   if (NILP (size))
     isize = XINT (AREF (font_entity, FONT_SIZE_INDEX));


@@ -4551,7 +4542,7 @@ DEFUN ("open-font", Fopen_font, Sopen_font, 1, 3, 0,
     {
       CHECK_NUMBER_OR_FLOAT (size);
       if (FLOATP (size))
     {
       CHECK_NUMBER_OR_FLOAT (size);
       if (FLOATP (size))

-       isize = POINT_TO_PIXEL (XFLOAT_DATA (size), XFRAME (frame)->resy);
+       isize = POINT_TO_PIXEL (XFLOAT_DATA (size), FRAME_RES_Y (f));

       else
        isize = XINT (size);
       if (! (INT_MIN <= isize && isize <= INT_MAX))
       else
        isize = XINT (size);
       if (! (INT_MIN <= isize && isize <= INT_MAX))


@@ -4559,7 +4550,7 @@ DEFUN ("open-font", Fopen_font, Sopen_font, 1, 3, 0,
       if (isize == 0)
        isize = 120;
     }
       if (isize == 0)
        isize = 120;
     }

-  return font_open_entity (XFRAME (frame), font_entity, isize);
+  return font_open_entity (f, font_entity, isize);

 }
 
 DEFUN ("close-font", Fclose_font, Sclose_font, 1, 2, 0,
 }
 
 DEFUN ("close-font", Fclose_font, Sclose_font, 1, 2, 0,


@@ -4567,10 +4558,7 @@ DEFUN ("close-font", Fclose_font, Sclose_font, 1, 2, 0,
   (Lisp_Object font_object, Lisp_Object frame)
 {
   CHECK_FONT_OBJECT (font_object);
   (Lisp_Object font_object, Lisp_Object frame)
 {
   CHECK_FONT_OBJECT (font_object);

-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);
-  font_close_object (XFRAME (frame), font_object);
+  font_close_object (decode_live_frame (frame), font_object);

   return Qnil;
 }
 
   return Qnil;
 }
 


@@ -4622,7 +4610,7 @@ If the font is not OpenType font, CAPABILITY is nil.  */)
 
   CHECK_FONT_GET_OBJECT (font_object, font);
 
 
   CHECK_FONT_GET_OBJECT (font_object, font);
 

-  val = Fmake_vector (make_number (9), Qnil);
+  val = make_uninit_vector (9);

   ASET (val, 0, AREF (font_object, FONT_NAME_INDEX));
   ASET (val, 1, AREF (font_object, FONT_FILE_INDEX));
   ASET (val, 2, make_number (font->pixel_size));
   ASET (val, 0, AREF (font_object, FONT_NAME_INDEX));
   ASET (val, 1, AREF (font_object, FONT_FILE_INDEX));
   ASET (val, 2, make_number (font->pixel_size));


@@ -4633,6 +4621,8 @@ If the font is not OpenType font, CAPABILITY is nil.  */)
   ASET (val, 7, make_number (font->average_width));
   if (font->driver->otf_capability)
     ASET (val, 8, Fcons (Qopentype, font->driver->otf_capability (font)));
   ASET (val, 7, make_number (font->average_width));
   if (font->driver->otf_capability)
     ASET (val, 8, Fcons (Qopentype, font->driver->otf_capability (font)));

+  else
+    ASET (val, 8, Qnil);

   return val;
 }
 
   return val;
 }
 


@@ -4725,7 +4715,7 @@ the corresponding element is nil.  */)
       chars = aref_addr (object, XFASTINT (from));
     }
 
       chars = aref_addr (object, XFASTINT (from));
     }
 

-  vec = Fmake_vector (make_number (len), Qnil);
+  vec = make_uninit_vector (len);

   for (i = 0; i < len; i++)
     {
       Lisp_Object g;
   for (i = 0; i < len; i++)
     {
       Lisp_Object g;


@@ -4735,8 +4725,11 @@ the corresponding element is nil.  */)
 
       code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)
 
       code = font->driver->encode_char (font, c);
       if (code == FONT_INVALID_CODE)

-       continue;
-      g = Fmake_vector (make_number (LGLYPH_SIZE), Qnil);
+       {
+         ASET (vec, i, Qnil);
+         continue;
+       }
+      g = LGLYPH_NEW ();

       LGLYPH_SET_FROM (g, i);
       LGLYPH_SET_TO (g, i);
       LGLYPH_SET_CHAR (g, c);
       LGLYPH_SET_FROM (g, i);
       LGLYPH_SET_TO (g, i);
       LGLYPH_SET_CHAR (g, c);


@@ -4768,33 +4761,30 @@ FONT is a font-spec, font-entity, or font-object. */)
 DEFUN ("font-at", Ffont_at, Sfont_at, 1, 3, 0,
        doc: /* Return a font-object for displaying a character at POSITION.
 Optional second arg WINDOW, if non-nil, is a window displaying
 DEFUN ("font-at", Ffont_at, Sfont_at, 1, 3, 0,
        doc: /* Return a font-object for displaying a character at POSITION.
 Optional second arg WINDOW, if non-nil, is a window displaying

-the current buffer.  It defaults to the currently selected window.  */)
+the current buffer.  It defaults to the currently selected window.
+Optional third arg STRING, if non-nil, is a string containing the target
+character at index specified by POSITION.  */)

   (Lisp_Object position, Lisp_Object window, Lisp_Object string)
 {
   (Lisp_Object position, Lisp_Object window, Lisp_Object string)
 {

-  struct window *w;
-  ptrdiff_t pos;
+  struct window *w = decode_live_window (window);

 
   if (NILP (string))
     {
 
   if (NILP (string))
     {

+      if (XBUFFER (w->contents) != current_buffer)
+       error ("Specified window is not displaying the current buffer.");

       CHECK_NUMBER_COERCE_MARKER (position);
       if (! (BEGV <= XINT (position) && XINT (position) < ZV))
        args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
       CHECK_NUMBER_COERCE_MARKER (position);
       if (! (BEGV <= XINT (position) && XINT (position) < ZV))
        args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));

-      pos = XINT (position);

     }
   else
     {
       CHECK_NUMBER (position);
       CHECK_STRING (string);
     }
   else
     {
       CHECK_NUMBER (position);
       CHECK_STRING (string);

-      if (! (0 < XINT (position) && XINT (position) < SCHARS (string)))
+      if (! (0 <= XINT (position) && XINT (position) < SCHARS (string)))

        args_out_of_range (string, position);
        args_out_of_range (string, position);

-      pos = XINT (position);

     }
     }

-  if (NILP (window))
-    window = selected_window;
-  CHECK_LIVE_WINDOW (window);
-  w = XWINDOW (window);

 
 

-  return font_at (-1, pos, NULL, w, string);
+  return font_at (-1, XINT (position), NULL, w, string);

 }
 
 #if 0
 }
 
 #if 0


@@ -4851,26 +4841,21 @@ where
   OPENED-NAME is the name used for opening the font,
   FULL-NAME is the full name of the font,
   SIZE is the pixelsize of the font,
   OPENED-NAME is the name used for opening the font,
   FULL-NAME is the full name of the font,
   SIZE is the pixelsize of the font,

-  HEIGHT is the pixel-height of the font (i.e ascent + descent),
+  HEIGHT is the pixel-height of the font (i.e., ascent + descent),

   BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
   RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
     how to compose characters.
 If the named font is not yet loaded, return nil.  */)
   (Lisp_Object name, Lisp_Object frame)
 {
   BASELINE-OFFSET is the upward offset pixels from ASCII baseline,
   RELATIVE-COMPOSE and DEFAULT-ASCENT are the numbers controlling
     how to compose characters.
 If the named font is not yet loaded, return nil.  */)
   (Lisp_Object name, Lisp_Object frame)
 {

-  FRAME_PTR f;
+  struct frame *f;

   struct font *font;
   Lisp_Object info;
   Lisp_Object font_object;
 
   struct font *font;
   Lisp_Object info;
   Lisp_Object font_object;
 

-  (*check_window_system_func) ();
-

   if (! FONTP (name))
     CHECK_STRING (name);
   if (! FONTP (name))
     CHECK_STRING (name);

-  if (NILP (frame))
-    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame);
-  f = XFRAME (frame);
+  f = decode_window_system_frame (frame);

 
   if (STRINGP (name))
     {
 
   if (STRINGP (name))
     {


@@ -4895,7 +4880,7 @@ If the named font is not yet loaded, return nil.  */)
     return Qnil;
   font = XFONT_OBJECT (font_object);
 
     return Qnil;
   font = XFONT_OBJECT (font_object);
 

-  info = Fmake_vector (make_number (7), Qnil);
+  info = make_uninit_vector (7);

   ASET (info, 0, AREF (font_object, FONT_NAME_INDEX));
   ASET (info, 1, AREF (font_object, FONT_FULLNAME_INDEX));
   ASET (info, 2, make_number (font->pixel_size));
   ASET (info, 0, AREF (font_object, FONT_NAME_INDEX));
   ASET (info, 1, AREF (font_object, FONT_FULLNAME_INDEX));
   ASET (info, 2, make_number (font->pixel_size));


@@ -4924,7 +4909,7 @@ build_style_table (const struct table_entry *entry, int nelement)
   int i, j;
   Lisp_Object table, elt;
 
   int i, j;
   Lisp_Object table, elt;
 

-  table = Fmake_vector (make_number (nelement), Qnil);
+  table = make_uninit_vector (nelement);

   for (i = 0; i < nelement; i++)
     {
       for (j = 0; entry[i].names[j]; j++);
   for (i = 0; i < nelement; i++)
     {
       for (j = 0; entry[i].names[j]; j++);


@@ -5188,7 +5173,7 @@ See `font-weight-table' for the format of the vector. */);
   XSYMBOL (intern_c_string ("font-width-table"))->constant = 1;
 
   staticpro (&font_style_table);
   XSYMBOL (intern_c_string ("font-width-table"))->constant = 1;
 
   staticpro (&font_style_table);

-  font_style_table = Fmake_vector (make_number (3), Qnil);
+  font_style_table = make_uninit_vector (3);

   ASET (font_style_table, 0, Vfont_weight_table);
   ASET (font_style_table, 1, Vfont_slant_table);
   ASET (font_style_table, 2, Vfont_width_table);
   ASET (font_style_table, 0, Vfont_weight_table);
   ASET (font_style_table, 1, Vfont_slant_table);
   ASET (font_style_table, 2, Vfont_width_table);


@@ -5218,9 +5203,9 @@ EMACS_FONT_LOG is set.  Otherwise, it is set to t.  */);
 #ifdef HAVE_BDFFONT
   syms_of_bdffont ();
 #endif /* HAVE_BDFFONT */
 #ifdef HAVE_BDFFONT
   syms_of_bdffont ();
 #endif /* HAVE_BDFFONT */

-#ifdef WINDOWSNT
+#ifdef HAVE_NTGUI

   syms_of_w32font ();
   syms_of_w32font ();

-#endif /* WINDOWSNT */
+#endif /* HAVE_NTGUI */

 #ifdef HAVE_NS
   syms_of_nsfont ();
 #endif /* HAVE_NS */
 #ifdef HAVE_NS
   syms_of_nsfont ();
 #endif /* HAVE_NS */