From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 31 Oct 2001 11:13:56 +0000 (+0000)
Subject: (realize_x_face): If C is not a single-byte character,
X-Git-Tag: emacs-21.2~394
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d1f602aabd4f54bc403e5a7c33c976118714354;p=emacs.git

(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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c4e664dc849..a7707dfa3dd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2001-10-31  Gerd Moellmann  <gerd@gnu.org>
 
+	* xfaces.c (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.
+
+	* dispextern.h (struct face) <colors_copied_bitwise_p>: New
+	member.
+
 	* window.c (grow_mini_window): Handle case that the root
 	window is already smaller than the nominal mininum height.
 
diff --git a/src/xfaces.c b/src/xfaces.c
index dbcc7d77224..cc1a0b25760 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1665,6 +1665,9 @@ free_face_colors (f, face)
      struct face *face;
 {
 #ifdef HAVE_X_WINDOWS
+  if (face->colors_copied_bitwise_p)
+    return;
+
   BLOCK_INPUT;
 
   if (!face->foreground_defaulted_p)
@@ -6312,12 +6315,7 @@ realize_x_face (cache, attrs, c, base_face)
       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;