aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1993-05-24 00:03:08 +0000
committerRichard M. Stallman1993-05-24 00:03:08 +0000
commitebc64af3a0d7e4b0f05aa8a2f56d652495bed5aa (patch)
treeb56650ccd878e095e6a7b273ff26b8e0074500e2 /src
parent6515fde49106ef70318510313981662522313f31 (diff)
downloademacs-ebc64af3a0d7e4b0f05aa8a2f56d652495bed5aa.tar.gz
emacs-ebc64af3a0d7e4b0f05aa8a2f56d652495bed5aa.zip
(Fset_face_attribute_internal): Don't call unload_font
for the frame's own font.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 4c053f663fa..5aec6907c0c 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -863,7 +863,8 @@ DEFUN ("set-face-attribute-internal", Fset_face_attribute_internal,
863 if (EQ (attr_name, intern ("font"))) 863 if (EQ (attr_name, intern ("font")))
864 { 864 {
865 XFontStruct *font = load_font (f, attr_value); 865 XFontStruct *font = load_font (f, attr_value);
866 unload_font (f, face->font); 866 if (face->font != f->display.x->font)
867 unload_font (f, face->font);
867 face->font = font; 868 face->font = font;
868 } 869 }
869 else if (EQ (attr_name, intern ("foreground"))) 870 else if (EQ (attr_name, intern ("foreground")))