From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 31 Oct 2001 11:12:09 +0000 (+0000)
Subject: (struct face) <colors_copied_bitwise_p>: New
X-Git-Tag: ttn-vms-21-2-B4~18959
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd387b25cddcdc7437a7abe5fbf3637a92e8d54b;p=emacs.git

(struct face) <colors_copied_bitwise_p>: New
member.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 689de4ccd30..ba97028618a 100644
--- 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,Bm(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 820f986179d..892025e41e7 100644
--- 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;