Mercurial > hg > xemacs-beta
comparison src/redisplay.c @ 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 | 81fee4aee9b6 |
comparison
equal
deleted
inserted
replaced
| 5618:cc1ec4c93a67 | 5619:75ad4969a16d |
|---|---|
| 2498 | 2498 |
| 2499 /* Check if we have hit a newline character. If so, add a marker | 2499 /* Check if we have hit a newline character. If so, add a marker |
| 2500 to the line and end this loop. */ | 2500 to the line and end this loop. */ |
| 2501 else if (data.ch == '\n') | 2501 else if (data.ch == '\n') |
| 2502 { | 2502 { |
| 2503 /* Update the clearing face index when the flush property is | 2503 /* Update the clearing face index unless the shrink property is |
| 2504 set. -- dvl */ | 2504 set. -- dvl */ |
| 2505 if ((data.findex > DEFAULT_INDEX) | 2505 if ((data.findex > DEFAULT_INDEX) |
| 2506 && WINDOW_FACE_CACHEL_FLUSH_P (w, data.findex)) | 2506 && ! WINDOW_FACE_CACHEL_SHRINK_P (w, data.findex)) |
| 2507 dl->clear_findex = data.findex; | 2507 dl->clear_findex = data.findex; |
| 2508 | 2508 |
| 2509 /* We aren't going to be adding an end glyph so give its | 2509 /* We aren't going to be adding an end glyph so give its |
| 2510 space back in order to make sure that the cursor can | 2510 space back in order to make sure that the cursor can |
| 2511 fit. */ | 2511 fit. */ |
| 4936 | 4936 |
| 4937 /* Check if we have hit a newline character. If so, add a marker | 4937 /* Check if we have hit a newline character. If so, add a marker |
| 4938 to the line and end this loop. */ | 4938 to the line and end this loop. */ |
| 4939 else if (data.ch == '\n') | 4939 else if (data.ch == '\n') |
| 4940 { | 4940 { |
| 4941 /* Update the clearing face index when the flush property is | 4941 /* Update the clearing face index unless the shrink property is |
| 4942 set. -- dvl */ | 4942 set. -- dvl */ |
| 4943 if ((data.findex > DEFAULT_INDEX) | 4943 if ((data.findex > DEFAULT_INDEX) |
| 4944 && WINDOW_FACE_CACHEL_FLUSH_P (w, data.findex)) | 4944 && ! WINDOW_FACE_CACHEL_SHRINK_P (w, data.findex)) |
| 4945 dl->clear_findex = data.findex; | 4945 dl->clear_findex = data.findex; |
| 4946 | 4946 |
| 4947 /* We aren't going to be adding an end glyph so give its | 4947 /* We aren't going to be adding an end glyph so give its |
| 4948 space back in order to make sure that the cursor can | 4948 space back in order to make sure that the cursor can |
| 4949 fit. */ | 4949 fit. */ |