[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113636: Fix last font-related change.
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r113636: Fix last font-related change. |
Date: |
Thu, 01 Aug 2013 16:09:50 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113636
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-08-01 20:09:20 +0400
message:
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 <address@hidden>
at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/w32font.h w32font.h-20091113204419-o5vbwnq5f7feedwu-8546
src/w32uniscribe.c
w32uniscribe.c-20091113204419-o5vbwnq5f7feedwu-8619
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-08-01 14:54:29 +0000
+++ b/src/ChangeLog 2013-08-01 16:09:20 +0000
@@ -1,5 +1,15 @@
2013-08-01 Dmitry Antipov <address@hidden>
+ 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 <address@hidden>
+ at http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00006.html.
+
+2013-08-01 Dmitry Antipov <address@hidden>
+
* frame.h (FRAME_MOUSE_UPDATE):
* nsterm.m (ns_frame_up_to_date): Omit redundant check
whether hlinfo->mouse_face_mouse_frame is non-NULL.
=== modified file 'src/w32font.h'
--- a/src/w32font.h 2013-01-01 09:11:05 +0000
+++ b/src/w32font.h 2013-08-01 16:09:20 +0000
@@ -64,10 +64,10 @@
#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,
=== modified file 'src/w32uniscribe.c'
--- a/src/w32uniscribe.c 2013-03-04 07:41:01 +0000
+++ b/src/w32uniscribe.c 2013-08-01 16:09:20 +0000
@@ -69,28 +69,27 @@
/* 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. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113636: Fix last font-related change.,
Dmitry Antipov <=