(struct face) <colors_copied_bitwise_p>: New

member.

diff --git a/src/ChangeLog b/src/ChangeLog
index 689de4ccd3001661f6475c712550499e64d4e486..ba97028618a6664124d421a9c7491b2eb59e236e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +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.
+
 2001-10-31  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
        * marker.c: Change doc-string comments to `new style' [w/`doc:'

diff --git a/src/dispextern.h b/src/dispextern.h
index 820f986179d9f7ce06fd386ac9bdfc52d9bc27b3..892025e41e774a088a9b0b98ac7aba953ad91e8e 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1313,6 +1313,11 @@ struct face
   unsigned tty_reverse_p : 1;
   unsigned tty_blinking_p : 1;
 
+  /* 1 means that colors of this face may not be freed because they
+     have been copied bitwise from a base face (see
+     realize_x_face).  */
+  unsigned colors_copied_bitwise_p : 1;
+
   /* Next and previous face in hash collision list of face cache.  */
   struct face *next, *prev;