Mercurial > emacs

changeset 40555:dfc4450c2329

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(realize_x_face): If C is not a single-byte character, set the face's colors_copied_bitwise_p instead of the defaulted_p members which have a different meaning. (free_face_colors): Do nothing for a face whose colors have been copied bitwise.
author Gerd Moellmann <gerd@gnu.org>
date Wed, 31 Oct 2001 11:10:25 +0000
parents 766b5428db52
children 69558454a8f9
files src/xfaces.c
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Wed Oct 31 11:06:47 2001 +0000
+++ b/src/xfaces.c	Wed Oct 31 11:10:25 2001 +0000
@@ -1664,6 +1664,9 @@
      struct face *face;
 {
 #ifdef HAVE_X_WINDOWS
+  if (face->colors_copied_bitwise_p)
+    return;
+
   BLOCK_INPUT;
 
   if (!face->foreground_defaulted_p)
@@ -6350,12 +6353,7 @@
       face->gc = 0;
 
       /* Don't try to free the colors copied bitwise from BASE_FACE.  */
-      face->foreground_defaulted_p = 1;
-      face->background_defaulted_p = 1;
-      face->underline_defaulted_p = 1;
-      face->overline_color_defaulted_p = 1;
-      face->strike_through_color_defaulted_p = 1;
-      face->box_color_defaulted_p = 1;
+      face->colors_copied_bitwise_p = 1;
 
       /* to force realize_face to load font */
       face->font = NULL;