Mercurial > hg > xemacs-beta

diff src/faces.h @ 5619:75ad4969a16d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace the 'flush face property with the opposite 'shrink one. lisp/ChangeLog addition: 2011-12-26 Didier Verna <didier@xemacs.org> * cl-macs.el (face-flush-p): Removed. * cl-macs.el (face-shrink-p): New. * faces.el (face-flush-p): Removed. * faces.el (face-shrink-p): New. * faces.el (set-face-flush-p): Removed. * faces.el (set-face-shrink-p): New. * cus-face.el (custom-face-attributes): * faces.el (set-face-property): * faces.el (face-equal): * x-faces.el (x-init-face-from-resources): * x-faces.el (make-face-x-resource-internal): Replace the 'flush property with the opposite 'shrink one. src/ChangeLog addition: 2011-12-26 Didier Verna <didier@xemacs.org> * lisp.h: * faces.c (mark_face): * faces.c (face_equal): * faces.c (face_getprop): * faces.c (face_putprop): * faces.c (face_remprop): * faces.c (face_plist): * faces.c (reset_face): * faces.c (update_face_inheritance_mapper): * faces.c (Fmake_face): * faces.c (update_face_cachel_data): * faces.c (merge_face_cachel_data): * faces.c (Fcopy_face): * faces.c (syms_of_faces): * faces.c (vars_of_faces): * faces.c (complex_vars_of_faces): * faces.h (struct Lisp_Face): * faces.h (struct face_cachel): * faces.h (WINDOW_FACE_CACHEL_SHRINK_P): * faces.h (FACE_SHRINK_P): * fontcolor.c (face_boolean_validate): Replace the 'flush property with the opposite 'shrink one. * redisplay.c (create_text_block): * redisplay.c (create_string_text_block): Ditto. Invert the logic for storing a new clear_findex in the display lines.
author Didier Verna <didier@xemacs.org>
date Mon, 26 Dec 2011 15:04:25 +0100
parents b0d712bbc2a6
children c39052c921b5
line wrap: on
line diff
--- a/src/faces.h	Fri Dec 23 10:34:40 2011 +0000
+++ b/src/faces.h	Mon Dec 26 15:04:25 2011 +0100
@@ -54,7 +54,7 @@
   Lisp_Object dim;
   Lisp_Object blinking;
   Lisp_Object reverse;
-  Lisp_Object flush;
+  Lisp_Object shrink;
 
   Lisp_Object plist;
 
@@ -181,7 +181,7 @@
   unsigned int dim :1;
   unsigned int blinking :1;
   unsigned int reverse :1;
-  unsigned int flush :1;
+  unsigned int shrink :1;
 
   /* Used when merging to tell if the above field represents an actual
      value of this face or a fallback value. */
@@ -199,7 +199,7 @@
   unsigned int dim_specified :1;
   unsigned int blinking_specified :1;
   unsigned int reverse_specified :1;
-  unsigned int flush_specified :1;
+  unsigned int shrink_specified :1;
 
   /* The updated flag is set after we calculate the values for the
      face cachel and cleared whenever a face changes, to indicate
@@ -359,8 +359,8 @@
   (WINDOW_FACE_CACHEL (window, index)->blinking)
 #define WINDOW_FACE_CACHEL_REVERSE_P(window, index)			\
   (WINDOW_FACE_CACHEL (window, index)->reverse)
-#define WINDOW_FACE_CACHEL_FLUSH_P(window, index)			\
-  (WINDOW_FACE_CACHEL (window, index)->flush)
+#define WINDOW_FACE_CACHEL_SHRINK_P(window, index)			\
+  (WINDOW_FACE_CACHEL (window, index)->shrink)
 
 #define FACE_PROPERTY_SPECIFIER(face, property) Fget (face, property, Qnil)
 
@@ -422,7 +422,7 @@
   (!NILP (FACE_PROPERTY_INSTANCE (face, Qblinking, domain, 0, Qzero)))
 #define FACE_REVERSE_P(face, domain)					\
   (!NILP (FACE_PROPERTY_INSTANCE (face, Qreverse, domain, 0, Qzero)))
-#define FACE_FLUSH_P(face, domain)					\
-  (!NILP (FACE_PROPERTY_INSTANCE (face, Qflush, domain, 0, Qzero)))
+#define FACE_SHRINK_P(face, domain)					\
+  (!NILP (FACE_PROPERTY_INSTANCE (face, Qshrink, domain, 0, Qzero)))
 
 #endif /* INCLUDED_faces_h_ */