Commit 6c1a09ba authored by Dmitry Antipov's avatar Dmitry Antipov

Fix last font-related change.

* w32font.h (w32font_list_internal, w32font_match_internal):
Fix prototype.
* w32uniscribe.c (uniscribe_list, uniscribe_match):
(uniscribe_list_family): Adjust to match font API change.
MS-Windows breakage reported by Juanma Barranquero <lekktu@gmail.com>
at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html.
parent f8c20208
2013-08-01 Dmitry Antipov <dmantipov@yandex.ru>
Fix last font-related change.
* w32font.h (w32font_list_internal, w32font_match_internal):
Fix prototype.
* w32uniscribe.c (uniscribe_list, uniscribe_match):
(uniscribe_list_family): Adjust to match font API change.
MS-Windows breakage reported by Juanma Barranquero <lekktu@gmail.com>
at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html.
2013-08-01 Dmitry Antipov <dmantipov@yandex.ru>
* frame.h (FRAME_MOUSE_UPDATE):
......
......@@ -64,10 +64,10 @@ struct w32font_info
#define CACHE_BLOCKSIZE 128
Lisp_Object w32font_get_cache (FRAME_PTR fe);
Lisp_Object w32font_list_internal (Lisp_Object frame,
Lisp_Object w32font_list_internal (struct frame *f,
Lisp_Object font_spec,
int opentype_only);
Lisp_Object w32font_match_internal (Lisp_Object frame,
Lisp_Object w32font_match_internal (struct frame *f,
Lisp_Object font_spec,
int opentype_only);
int w32font_open_internal (FRAME_PTR f, Lisp_Object font_entity,
......
......@@ -69,28 +69,27 @@ memq_no_quit (Lisp_Object elt, Lisp_Object list)
/* Font backend interface implementation. */
static Lisp_Object
uniscribe_list (Lisp_Object frame, Lisp_Object font_spec)
uniscribe_list (struct frame *f, Lisp_Object font_spec)
{
Lisp_Object fonts = w32font_list_internal (frame, font_spec, 1);
Lisp_Object fonts = w32font_list_internal (f, font_spec, 1);
FONT_ADD_LOG ("uniscribe-list", font_spec, fonts);
return fonts;
}
static Lisp_Object
uniscribe_match (Lisp_Object frame, Lisp_Object font_spec)
uniscribe_match (struct frame *f, Lisp_Object font_spec)
{
Lisp_Object entity = w32font_match_internal (frame, font_spec, 1);
Lisp_Object entity = w32font_match_internal (f, font_spec, 1);
FONT_ADD_LOG ("uniscribe-match", font_spec, entity);
return entity;
}
static Lisp_Object
uniscribe_list_family (Lisp_Object frame)
uniscribe_list_family (struct frame *f)
{
Lisp_Object list = Qnil;
LOGFONT font_match_pattern;
HDC dc;
FRAME_PTR f = XFRAME (frame);
memset (&font_match_pattern, 0, sizeof (font_match_pattern));
/* Limit enumerated fonts to outline fonts to save time. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment