aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-03-08 22:23:48 -0800
committerPaul Eggert2011-03-08 22:23:48 -0800
commit5967d05138d7405e4b60153f98c8beaf40c7d6da (patch)
tree258f784d3718cbbdfd768297fe0d3ed5eaf6ded1 /src
parent6b463e581fc2f176fd2ab5b06cff963e94218163 (diff)
downloademacs-5967d05138d7405e4b60153f98c8beaf40c7d6da.tar.gz
emacs-5967d05138d7405e4b60153f98c8beaf40c7d6da.zip
* xfaces.c (free_realized_faces_for_fontset): Remove; not used.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xfaces.c39
2 files changed, 1 insertions, 39 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1f8e0f6b8e3..fb266a71a0f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,7 @@
3 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename 3 * xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
4 or move locals to avoid shadowing. 4 or move locals to avoid shadowing.
5 (tty_defined_color, merge_face_heights): Now static. 5 (tty_defined_color, merge_face_heights): Now static.
6 (free_realized_faces_for_fontset): Remove; not used.
6 7
7 * terminal.c (store_terminal_param): Now static. 8 * terminal.c (store_terminal_param): Now static.
8 9
diff --git a/src/xfaces.c b/src/xfaces.c
index d463175ed2c..b49675a7d8e 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4312,45 +4312,6 @@ free_realized_faces (struct face_cache *c)
4312} 4312}
4313 4313
4314 4314
4315/* Free all realized faces that are using FONTSET on frame F. */
4316
4317void
4318free_realized_faces_for_fontset (struct frame *f, int fontset)
4319{
4320 struct face_cache *cache = FRAME_FACE_CACHE (f);
4321 struct face *face;
4322 int i;
4323
4324 /* We must block input here because we can't process X events safely
4325 while only some faces are freed, or when the frame's current
4326 matrix still references freed faces. */
4327 BLOCK_INPUT;
4328
4329 for (i = 0; i < cache->used; i++)
4330 {
4331 face = cache->faces_by_id[i];
4332 if (face
4333 && face->fontset == fontset)
4334 {
4335 uncache_face (cache, face);
4336 free_realized_face (f, face);
4337 }
4338 }
4339
4340 /* Must do a thorough redisplay the next time. Mark current
4341 matrices as invalid because they will reference faces freed
4342 above. This function is also called when a frame is destroyed.
4343 In this case, the root window of F is nil. */
4344 if (WINDOWP (f->root_window))
4345 {
4346 clear_current_matrices (f);
4347 ++windows_or_buffers_changed;
4348 }
4349
4350 UNBLOCK_INPUT;
4351}
4352
4353
4354/* Free all realized faces on FRAME or on all frames if FRAME is nil. 4315/* Free all realized faces on FRAME or on all frames if FRAME is nil.
4355 This is done after attributes of a named face have been changed, 4316 This is done after attributes of a named face have been changed,
4356 because we can't tell which realized faces depend on that face. */ 4317 because we can't tell which realized faces depend on that face. */