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.

--- a/lisp/x-faces.el	Fri Dec 23 10:34:40 2011 +0000
+++ b/lisp/x-faces.el	Mon Dec 26 15:04:25 2011 +0100
@@ -715,8 +715,8 @@
 	       "Face.AttributeStrikethru"
 	       'boolean locale))
 	 (fp (x-get-resource-and-maybe-bogosity-check
-	      (concat name ".attributeFlush")
-	      "Face.AttributeFlush"
+	      (concat name ".attributeShrink")
+	      "Face.AttributeShrink"
 	      'boolean locale))
 	 ;; we still resource for these TTY-only resources so that you can
 	 ;; specify resources for TTY frames/devices. This is useful when you
@@ -886,19 +886,19 @@
     (when fp
       (cond (device-class
 	     (remove-specifier-specs-matching-tag-set-cdrs (face-property
-							    face 'flush)
+							    face 'shrink)
 							   locale
 							   tty-tag-set)
 	     (remove-specifier-specs-matching-tag-set-cdrs (face-property
-							    face 'flush)
+							    face 'shrink)
 							   locale
 							   x-tag-set))
 	    (t
-	     (remove-specifier (face-property face 'flush) locale
+	     (remove-specifier (face-property face 'shrink) locale
 			       tty-tag-set nil)
-	     (remove-specifier (face-property face 'flush) locale
+	     (remove-specifier (face-property face 'shrink) locale
 			       x-tag-set nil)))
-      (set-face-flush-p face fp locale our-tag-set append))
+      (set-face-shrink-p face fp locale our-tag-set append))
     ))
 
 ;; GNU Emacs compatibility. (move to obsolete.el?)