aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Rumney2009-04-25 06:11:46 +0000
committerJason Rumney2009-04-25 06:11:46 +0000
commitb7053016e44dbeef02915ee3392079fd7846be17 (patch)
tree4e8aa0015b942aea8544dbf9617854428b9098d0
parentddc1fc75dffce210387d7c067433020035a28cb2 (diff)
downloademacs-b7053016e44dbeef02915ee3392079fd7846be17.tar.gz
emacs-b7053016e44dbeef02915ee3392079fd7846be17.zip
(clear_cached_metrics): Remove, unused since 2008-08-02.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32font.c14
2 files changed, 4 insertions, 14 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ccd678ff8bf..ae770b1953b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-04-25 Jason Rumney <jasonr@gnu.org>
2
3 * w32font.c (clear_cached_metrics): Remove, unused since 2008-08-02.
4
12009-04-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 52009-04-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2 6
3 * fringe.c (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]: 7 * fringe.c (init_fringe_bitmap) [HAVE_X_WINDOWS && WORDS_BIG_ENDIAN]:
diff --git a/src/w32font.c b/src/w32font.c
index d1ff969747b..7d9db3a6cd6 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -114,7 +114,6 @@ static Lisp_Object font_supported_scripts P_ ((FONTSIGNATURE *));
114static int w32font_full_name P_ ((LOGFONT *, Lisp_Object, int, char *, int)); 114static int w32font_full_name P_ ((LOGFONT *, Lisp_Object, int, char *, int));
115static void compute_metrics P_ ((HDC, struct w32font_info *, unsigned int, 115static void compute_metrics P_ ((HDC, struct w32font_info *, unsigned int,
116 struct w32_metric_cache *)); 116 struct w32_metric_cache *));
117static void clear_cached_metrics P_ ((struct w32font_info *));
118 117
119static Lisp_Object w32_registry P_ ((LONG, DWORD)); 118static Lisp_Object w32_registry P_ ((LONG, DWORD));
120 119
@@ -2390,19 +2389,6 @@ compute_metrics (dc, w32_font, code, metrics)
2390 metrics->status = W32METRIC_FAIL; 2389 metrics->status = W32METRIC_FAIL;
2391} 2390}
2392 2391
2393static void
2394clear_cached_metrics (w32_font)
2395 struct w32font_info *w32_font;
2396{
2397 int i;
2398 for (i = 0; i < w32_font->n_cache_blocks; i++)
2399 {
2400 if (w32_font->cached_metrics[i])
2401 bzero (w32_font->cached_metrics[i],
2402 CACHE_BLOCKSIZE * sizeof (struct font_metrics));
2403 }
2404}
2405
2406DEFUN ("x-select-font", Fx_select_font, Sx_select_font, 0, 2, 0, 2392DEFUN ("x-select-font", Fx_select_font, Sx_select_font, 0, 2, 0,
2407 doc: /* Read a font name using a W32 font selection dialog. 2393 doc: /* Read a font name using a W32 font selection dialog.
2408Return fontconfig style font string corresponding to the selection. 2394Return fontconfig style font string corresponding to the selection.