Mercurial > hg > xemacs-beta

comparison lisp/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 8265913e617b
comparison
equal deleted inserted replaced
5618:cc1ec4c93a67 5619:75ad4969a16d
359 359
360 reverse Reverse the foreground and background colors. 360 reverse Reverse the foreground and background colors.
361 Only used by faces on TTY devices. 361 Only used by faces on TTY devices.
362 For valid instantiators, see `make-face-boolean-specifier'. 362 For valid instantiators, see `make-face-boolean-specifier'.
363 363
364 flush When the end of line is reached in a flushing face, also 364 shrink Shrink the face to the actual text on the line instead of
365 paint the rest of the line (up to the right border) with 365 covering the whole line until the right border of the
366 that face. The effect will only be visible if the face has 366 window. The effect will only be visible if the face has
367 a non default background. 367 a non default background.
368 For valid instantiators, see `make-face-boolean-specifier'. 368 For valid instantiators, see `make-face-boolean-specifier'.
369 369
370 inherit Face name or face object from which to inherit attributes, 370 inherit Face name or face object from which to inherit attributes,
371 or a list of such elements. Attributes from inherited 371 or a list of such elements. Attributes from inherited
901 See `set-face-property' for the semantics of the LOCALE, TAG-SET, and 901 See `set-face-property' for the semantics of the LOCALE, TAG-SET, and
902 HOW-TO-ADD arguments." 902 HOW-TO-ADD arguments."
903 (interactive (face-interactive "reverse-p" "reversed")) 903 (interactive (face-interactive "reverse-p" "reversed"))
904 (set-face-property face 'reverse reverse-p locale tag-set how-to-add)) 904 (set-face-property face 'reverse reverse-p locale tag-set how-to-add))
905 905
906 (defun face-flush-p (face &optional domain default no-fallback) 906 (defun face-shrink-p (face &optional domain default no-fallback)
907 "Return t if FACE is flushed in DOMAIN. 907 "Return t if FACE is shrinked in DOMAIN.
908 See `face-property-instance' for the semantics of the DOMAIN argument." 908 See `face-property-instance' for the semantics of the DOMAIN argument."
909 (face-property-instance face 'flush domain default no-fallback)) 909 (face-property-instance face 'shrink domain default no-fallback))
910 910
911 (defun set-face-flush-p (face flush-p &optional locale tag-set how-to-add) 911 (defun set-face-shrink-p (face shrink-p &optional locale tag-set how-to-add)
912 "Change whether FACE is flushed in LOCALE. 912 "Change whether FACE is shrinked in LOCALE.
913 FLUSH-P is normally a face-boolean instantiator; see 913 SHRINK-P is normally a face-boolean instantiator; see
914 `make-face-boolean-specifier'. 914 `make-face-boolean-specifier'.
915 See `set-face-property' for the semantics of the LOCALE, TAG-SET, and 915 See `set-face-property' for the semantics of the LOCALE, TAG-SET, and
916 HOW-TO-ADD arguments." 916 HOW-TO-ADD arguments."
917 (interactive (face-interactive "flush-p" "flushed")) 917 (interactive (face-interactive "shrink-p" "shrinked"))
918 (set-face-property face 'flush flush-p locale tag-set how-to-add)) 918 (set-face-property face 'shrink shrink-p locale tag-set how-to-add))
919 919
920 920
921 (defun face-property-equal (face1 face2 prop domain) 921 (defun face-property-equal (face1 face2 prop domain)
922 (equal (face-property-instance face1 prop domain) 922 (equal (face-property-instance face1 prop domain)
923 (face-property-instance face2 prop domain))) 923 (face-property-instance face2 prop domain)))
934 (if (null domain) (setq domain (selected-window))) 934 (if (null domain) (setq domain (selected-window)))
935 (if (not (valid-specifier-domain-p domain)) 935 (if (not (valid-specifier-domain-p domain))
936 (error "Invalid specifier domain")) 936 (error "Invalid specifier domain"))
937 (let ((device (dfw-device domain)) 937 (let ((device (dfw-device domain))
938 (common-props '(foreground background font display-table underline 938 (common-props '(foreground background font display-table underline
939 dim inherit flush)) 939 dim inherit shrink))
940 (win-props '(background-pixmap background-placement strikethru)) 940 (win-props '(background-pixmap background-placement strikethru))
941 (tty-props '(highlight blinking reverse))) 941 (tty-props '(highlight blinking reverse)))
942 942
943 ;; First check the properties which are used in common between the 943 ;; First check the properties which are used in common between the
944 ;; x and tty devices. Then, check those properties specific to 944 ;; x and tty devices. Then, check those properties specific to