Mercurial > hg > xemacs-beta

comparison lisp/x-faces.el @ 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
comparison
equal deleted inserted replaced
5618:cc1ec4c93a67 5619:75ad4969a16d
713 (stp (x-get-resource-and-maybe-bogosity-check 713 (stp (x-get-resource-and-maybe-bogosity-check
714 (concat name ".attributeStrikethru") 714 (concat name ".attributeStrikethru")
715 "Face.AttributeStrikethru" 715 "Face.AttributeStrikethru"
716 'boolean locale)) 716 'boolean locale))
717 (fp (x-get-resource-and-maybe-bogosity-check 717 (fp (x-get-resource-and-maybe-bogosity-check
718 (concat name ".attributeFlush") 718 (concat name ".attributeShrink")
719 "Face.AttributeFlush" 719 "Face.AttributeShrink"
720 'boolean locale)) 720 'boolean locale))
721 ;; we still resource for these TTY-only resources so that you can 721 ;; we still resource for these TTY-only resources so that you can
722 ;; specify resources for TTY frames/devices. This is useful when you 722 ;; specify resources for TTY frames/devices. This is useful when you
723 ;; start up your XEmacs on an X display and later open some TTY 723 ;; start up your XEmacs on an X display and later open some TTY
724 ;; frames. 724 ;; frames.
884 tty-tag-set nil)) 884 tty-tag-set nil))
885 (set-face-reverse-p face rp locale our-tag-set append)) 885 (set-face-reverse-p face rp locale our-tag-set append))
886 (when fp 886 (when fp
887 (cond (device-class 887 (cond (device-class
888 (remove-specifier-specs-matching-tag-set-cdrs (face-property 888 (remove-specifier-specs-matching-tag-set-cdrs (face-property
889 face 'flush) 889 face 'shrink)
890 locale 890 locale
891 tty-tag-set) 891 tty-tag-set)
892 (remove-specifier-specs-matching-tag-set-cdrs (face-property 892 (remove-specifier-specs-matching-tag-set-cdrs (face-property
893 face 'flush) 893 face 'shrink)
894 locale 894 locale
895 x-tag-set)) 895 x-tag-set))
896 (t 896 (t
897 (remove-specifier (face-property face 'flush) locale 897 (remove-specifier (face-property face 'shrink) locale
898 tty-tag-set nil) 898 tty-tag-set nil)
899 (remove-specifier (face-property face 'flush) locale 899 (remove-specifier (face-property face 'shrink) locale
900 x-tag-set nil))) 900 x-tag-set nil)))
901 (set-face-flush-p face fp locale our-tag-set append)) 901 (set-face-shrink-p face fp locale our-tag-set append))
902 )) 902 ))
903 903
904 ;; GNU Emacs compatibility. (move to obsolete.el?) 904 ;; GNU Emacs compatibility. (move to obsolete.el?)
905 (defalias 'make-face-x-resource-internal 'x-init-face-from-resources) 905 (defalias 'make-face-x-resource-internal 'x-init-face-from-resources)
906 906