/* Font backend for the Microsoft W32 API.
- Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <math.h>
#include <ctype.h>
#include <commdlg.h>
+#include <setjmp.h>
#include "lisp.h"
#include "w32term.h"
Lisp_Object frame, font_spec;
{
Lisp_Object fonts = w32font_list_internal (frame, font_spec, 0);
- font_add_log ("w32font-list", font_spec, fonts);
+ FONT_ADD_LOG ("w32font-list", font_spec, fonts);
return fonts;
}
Lisp_Object frame, font_spec;
{
Lisp_Object entity = w32font_match_internal (frame, font_spec, 0);
- font_add_log ("w32font-match", font_spec, entity);
+ FONT_ADD_LOG ("w32font-match", font_spec, entity);
return entity;
}
{
for (i = 0; i < w32_font->n_cache_blocks; i++)
{
- if (w32_font->cached_metrics[i])
- xfree (w32_font->cached_metrics[i]);
+ xfree (w32_font->cached_metrics[i]);
}
xfree (w32_font->cached_metrics);
w32_font->cached_metrics = NULL;
NULL, /* otf_drive */
NULL, /* start_for_frame */
NULL, /* end_for_frame */
- NULL /* shape */
+ NULL, /* shape */
+ NULL, /* check */
+ NULL, /* get_variation_glyphs */
+ NULL, /* filter_properties */
};