From 6c1a09ba9a801021002d75425345e51cdc498026 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Thu, 1 Aug 2013 20:09:20 +0400 Subject: [PATCH] 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 at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html. --- src/ChangeLog | 10 ++++++++++ src/w32font.h | 4 ++-- src/w32uniscribe.c | 11 +++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 95ece0f8970..abc54196eb0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ 2013-08-01 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 + at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html. + +2013-08-01 Dmitry Antipov + * frame.h (FRAME_MOUSE_UPDATE): * nsterm.m (ns_frame_up_to_date): Omit redundant check whether hlinfo->mouse_face_mouse_frame is non-NULL. diff --git a/src/w32font.h b/src/w32font.h index b4345478a22..a195749bbe8 100644 --- a/src/w32font.h +++ b/src/w32font.h @@ -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, diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index c153c8f3565..cff8885de7f 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -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. */ -- 2.11.4.GIT