[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a9d6ba4: Rename font_driver member close -> close_f
From: |
Mattias Engdegård |
Subject: |
[Emacs-diffs] master a9d6ba4: Rename font_driver member close -> close_font |
Date: |
Tue, 9 Jul 2019 12:41:15 -0400 (EDT) |
branch: master
commit a9d6ba49d5cc11fd921c796d2e4ad2d47121d34f
Author: Mattias Engdegård <address@hidden>
Commit: Mattias Engdegård <address@hidden>
Rename font_driver member close -> close_font
* src/alloc.c (cleanup_vector):
* src/xftfont.c (xftfont_driver):
* src/xfont.c (xfont_driver):
* src/nsfont.m (nsfont_driver):
* src/macfont.m (macfont_driver):
* src/ftxfont.c (ftxfont_driver):
* src/ftfont.c (ftfont_driver):
* src/ftcrfont.c (ftcrfont_driver):
* src/font.h (struct font_driver):
* src/font.c (font_clear_cache, font_close_object):
Rename `close' member to `close_font', to avoid clash with preprocessor
define of `close' in nt/inc/ms-w32.h and for consistency with `open_font'.
---
src/alloc.c | 2 +-
src/font.c | 4 ++--
src/font.h | 2 +-
src/ftcrfont.c | 2 +-
src/ftfont.c | 2 +-
src/ftxfont.c | 2 +-
src/macfont.m | 2 +-
src/nsfont.m | 2 +-
src/xfont.c | 2 +-
src/xftfont.c | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/alloc.c b/src/alloc.c
index 90817da..833176d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3019,7 +3019,7 @@ cleanup_vector (struct Lisp_Vector *vector)
{
/* Attempt to catch subtle bugs like Bug#16140. */
eassert (valid_font_driver (drv));
- drv->close (font);
+ drv->close_font (font);
}
}
}
diff --git a/src/font.c b/src/font.c
index 5b10fb2..ce85e0b 100644
--- a/src/font.c
+++ b/src/font.c
@@ -2642,7 +2642,7 @@ font_clear_cache (struct frame *f, Lisp_Object cache,
if (! NILP (AREF (val, FONT_TYPE_INDEX)))
{
eassert (font && driver == font->driver);
- driver->close (font);
+ driver->close_font (font);
}
}
if (driver->free_entity)
@@ -2962,7 +2962,7 @@ font_close_object (struct frame *f, Lisp_Object
font_object)
/* Already closed. */
return;
FONT_ADD_LOG ("close", font_object, Qnil);
- font->driver->close (font);
+ font->driver->close_font (font);
#ifdef HAVE_WINDOW_SYSTEM
eassert (FRAME_DISPLAY_INFO (f)->n_fonts);
FRAME_DISPLAY_INFO (f)->n_fonts--;
diff --git a/src/font.h b/src/font.h
index e59fc1d..9d4b2d8 100644
--- a/src/font.h
+++ b/src/font.h
@@ -627,7 +627,7 @@ struct font_driver
int pixel_size);
/* Close FONT. NOTE: this can be called by GC. */
- void (*close) (struct font *font);
+ void (*close_font) (struct font *font);
/* Prepare FACE for displaying characters by FONT on frame F by
storing some data in FACE->extra. */
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index 24a4242..f0c7cbb 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -577,7 +577,7 @@ struct font_driver const ftcrfont_driver =
.match = ftcrfont_match,
.list_family = ftfont_list_family,
.open_font = ftcrfont_open,
- .close = ftcrfont_close,
+ .close_font = ftcrfont_close,
.has_char = ftcrfont_has_char,
.encode_char = ftcrfont_encode_char,
.text_extents = ftcrfont_text_extents,
diff --git a/src/ftfont.c b/src/ftfont.c
index 52a3b38..16b18de 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -3040,7 +3040,7 @@ static struct font_driver const ftfont_driver =
.match = ftfont_match,
.list_family = ftfont_list_family,
.open_font = ftfont_open,
- .close = ftfont_close,
+ .close_font = ftfont_close,
.has_char = ftfont_has_char,
.encode_char = ftfont_encode_char,
.text_extents = ftfont_text_extents,
diff --git a/src/ftxfont.c b/src/ftxfont.c
index 81b7255..1d1bd2c 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -336,7 +336,7 @@ struct font_driver const ftxfont_driver =
.match = ftxfont_match,
.list_family = ftfont_list_family,
.open_font = ftxfont_open,
- .close = ftxfont_close,
+ .close_font = ftxfont_close,
.has_char = ftfont_has_char,
.encode_char = ftfont_encode_char,
.text_extents = ftfont_text_extents,
diff --git a/src/macfont.m b/src/macfont.m
index 26a4a55..301951f 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -1664,7 +1664,7 @@ static struct font_driver macfont_driver =
.list_family = macfont_list_family,
.free_entity = macfont_free_entity,
.open_font = macfont_open,
- .close = macfont_close,
+ .close_font = macfont_close,
.has_char = macfont_has_char,
.encode_char = macfont_encode_char,
.text_extents = macfont_text_extents,
diff --git a/src/nsfont.m b/src/nsfont.m
index df58202..7a40d67 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -1492,7 +1492,7 @@ struct font_driver const nsfont_driver =
.match = nsfont_match,
.list_family = nsfont_list_family,
.open_font = nsfont_open,
- .close = nsfont_close,
+ .close_font = nsfont_close,
.has_char = nsfont_has_char,
.encode_char = nsfont_encode_char,
.text_extents = nsfont_text_extents,
diff --git a/src/xfont.c b/src/xfont.c
index f6cd2ed..e7a0cb2 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1107,7 +1107,7 @@ struct font_driver const xfont_driver =
.match = xfont_match,
.list_family = xfont_list_family,
.open_font = xfont_open,
- .close = xfont_close,
+ .close_font = xfont_close,
.prepare_face = xfont_prepare_face,
.has_char = xfont_has_char,
.encode_char = xfont_encode_char,
diff --git a/src/xftfont.c b/src/xftfont.c
index 3ce4b15..e003580 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -644,7 +644,7 @@ struct font_driver const xftfont_driver =
.match = xftfont_match,
.list_family = ftfont_list_family,
.open_font = xftfont_open,
- .close = xftfont_close,
+ .close_font = xftfont_close,
.prepare_face = xftfont_prepare_face,
.done_face = xftfont_done_face,
.has_char = xftfont_has_char,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a9d6ba4: Rename font_driver member close -> close_font,
Mattias Engdegård <=