aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-06-02 19:03:58 +0000
committerGerd Moellmann2000-06-02 19:03:58 +0000
commite911049b46512f90759afafb22d9c215835476ce (patch)
tree2791e8e4dc439b561259431062b3bd405104a234 /src
parent033e3e18df29b7e9cf98f4ae66125b06774b0af1 (diff)
downloademacs-e911049b46512f90759afafb22d9c215835476ce.tar.gz
emacs-e911049b46512f90759afafb22d9c215835476ce.zip
(realize_x_face): When copying BASE_FACE bitwise to the
result face, set flags in the face indicating that colors may not be freed.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index f39a2936b6e..7dd4e5ba7e1 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5859,7 +5859,17 @@ realize_x_face (cache, attrs, c, base_face)
5859 { 5859 {
5860 bcopy (base_face, face, sizeof *face); 5860 bcopy (base_face, face, sizeof *face);
5861 face->gc = 0; 5861 face->gc = 0;
5862 face->font = NULL; /* to force realize_face to load font */ 5862
5863 /* Don't try to free the colors copied bitwise from BASE_FACE. */
5864 face->foreground_defaulted_p = 1;
5865 face->background_defaulted_p = 1;
5866 face->underline_defaulted_p = 1;
5867 face->overline_color_defaulted_p = 1;
5868 face->strike_through_color_defaulted_p = 1;
5869 face->box_color_defaulted_p = 1;
5870
5871 /* to force realize_face to load font */
5872 face->font = NULL;
5863 return face; 5873 return face;
5864 } 5874 }
5865 5875