Mercurial > hg > xemacs-beta
diff lisp/faces.el @ 5619:75ad4969a16d
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 |
line wrap: on
line diff
--- a/lisp/faces.el Fri Dec 23 10:34:40 2011 +0000 +++ b/lisp/faces.el Mon Dec 26 15:04:25 2011 +0100 @@ -361,9 +361,9 @@ Only used by faces on TTY devices. For valid instantiators, see `make-face-boolean-specifier'. - flush When the end of line is reached in a flushing face, also - paint the rest of the line (up to the right border) with - that face. The effect will only be visible if the face has + shrink Shrink the face to the actual text on the line instead of + covering the whole line until the right border of the + window. The effect will only be visible if the face has a non default background. For valid instantiators, see `make-face-boolean-specifier'. @@ -903,19 +903,19 @@ (interactive (face-interactive "reverse-p" "reversed")) (set-face-property face 'reverse reverse-p locale tag-set how-to-add)) -(defun face-flush-p (face &optional domain default no-fallback) - "Return t if FACE is flushed in DOMAIN. +(defun face-shrink-p (face &optional domain default no-fallback) + "Return t if FACE is shrinked in DOMAIN. See `face-property-instance' for the semantics of the DOMAIN argument." - (face-property-instance face 'flush domain default no-fallback)) + (face-property-instance face 'shrink domain default no-fallback)) -(defun set-face-flush-p (face flush-p &optional locale tag-set how-to-add) - "Change whether FACE is flushed in LOCALE. -FLUSH-P is normally a face-boolean instantiator; see +(defun set-face-shrink-p (face shrink-p &optional locale tag-set how-to-add) + "Change whether FACE is shrinked in LOCALE. +SHRINK-P is normally a face-boolean instantiator; see `make-face-boolean-specifier'. See `set-face-property' for the semantics of the LOCALE, TAG-SET, and HOW-TO-ADD arguments." - (interactive (face-interactive "flush-p" "flushed")) - (set-face-property face 'flush flush-p locale tag-set how-to-add)) + (interactive (face-interactive "shrink-p" "shrinked")) + (set-face-property face 'shrink shrink-p locale tag-set how-to-add)) (defun face-property-equal (face1 face2 prop domain) @@ -936,7 +936,7 @@ (error "Invalid specifier domain")) (let ((device (dfw-device domain)) (common-props '(foreground background font display-table underline - dim inherit flush)) + dim inherit shrink)) (win-props '(background-pixmap background-placement strikethru)) (tty-props '(highlight blinking reverse)))