Mercurial > emacs
comparison src/xdisp.c @ 36673:e3523940caad
(handle_face_prop, face_before_or_after_it_pos)
(display_string): Call face_at_string_position with new
parameter.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 08 Mar 2001 20:55:53 +0000 |
| parents | de61c584d4a2 |
| children | d6cac298735a |
comparison
equal
deleted
inserted
replaced
| 36672:acf152adbf82 | 36673:e3523940caad |
|---|---|
| 2214 IT_STRING_CHARPOS (*it), | 2214 IT_STRING_CHARPOS (*it), |
| 2215 bufpos, | 2215 bufpos, |
| 2216 it->region_beg_charpos, | 2216 it->region_beg_charpos, |
| 2217 it->region_end_charpos, | 2217 it->region_end_charpos, |
| 2218 &next_stop, | 2218 &next_stop, |
| 2219 base_face_id); | 2219 base_face_id, 0); |
| 2220 | 2220 |
| 2221 #if 0 /* This shouldn't be neccessary. Let's check it. */ | 2221 #if 0 /* This shouldn't be neccessary. Let's check it. */ |
| 2222 /* If IT is used to display a mode line we would really like to | 2222 /* If IT is used to display a mode line we would really like to |
| 2223 use the mode line face instead of the frame's default face. */ | 2223 use the mode line face instead of the frame's default face. */ |
| 2224 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) | 2224 if (it->glyph_row == MATRIX_MODE_LINE_ROW (it->w->desired_matrix) |
| 2322 CHARPOS (pos), | 2322 CHARPOS (pos), |
| 2323 bufpos, | 2323 bufpos, |
| 2324 it->region_beg_charpos, | 2324 it->region_beg_charpos, |
| 2325 it->region_end_charpos, | 2325 it->region_end_charpos, |
| 2326 &next_check_charpos, | 2326 &next_check_charpos, |
| 2327 base_face_id); | 2327 base_face_id, 0); |
| 2328 | 2328 |
| 2329 /* Correct the face for charsets different from ASCII. Do it | 2329 /* Correct the face for charsets different from ASCII. Do it |
| 2330 for the multibyte case only. The face returned above is | 2330 for the multibyte case only. The face returned above is |
| 2331 suitable for unibyte text if IT->string is unibyte. */ | 2331 suitable for unibyte text if IT->string is unibyte. */ |
| 2332 if (STRING_MULTIBYTE (it->string)) | 2332 if (STRING_MULTIBYTE (it->string)) |
| 13789 | 13789 |
| 13790 it->face_id | 13790 it->face_id |
| 13791 = face_at_string_position (it->w, face_string, face_string_pos, | 13791 = face_at_string_position (it->w, face_string, face_string_pos, |
| 13792 0, it->region_beg_charpos, | 13792 0, it->region_beg_charpos, |
| 13793 it->region_end_charpos, | 13793 it->region_end_charpos, |
| 13794 &endptr, it->base_face_id); | 13794 &endptr, it->base_face_id, 0); |
| 13795 face = FACE_FROM_ID (it->f, it->face_id); | 13795 face = FACE_FROM_ID (it->f, it->face_id); |
| 13796 it->face_box_p = face->box != FACE_NO_BOX; | 13796 it->face_box_p = face->box != FACE_NO_BOX; |
| 13797 } | 13797 } |
| 13798 | 13798 |
| 13799 /* Set max_x to the maximum allowed X position. Don't let it go | 13799 /* Set max_x to the maximum allowed X position. Don't let it go |