diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 141d565203f..f892d6bc58a 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -2469,11 +2469,6 @@ merge_face_vectors (f, from, to, named_merge_points) | |||
| 2469 | } | 2469 | } |
| 2470 | } | 2470 | } |
| 2471 | 2471 | ||
| 2472 | /* If `font' attribute is specified, reflect the font properties in | ||
| 2473 | it to the other attributes. */ | ||
| 2474 | if (0 && !UNSPECIFIEDP (to[LFACE_FONT_INDEX])) | ||
| 2475 | font_update_lface (f, to); | ||
| 2476 | |||
| 2477 | /* TO is always an absolute face, which should inherit from nothing. | 2472 | /* TO is always an absolute face, which should inherit from nothing. |
| 2478 | We blindly copy the :inherit attribute above and fix it up here. */ | 2473 | We blindly copy the :inherit attribute above and fix it up here. */ |
| 2479 | to[LFACE_INHERIT_INDEX] = Qnil; | 2474 | to[LFACE_INHERIT_INDEX] = Qnil; |
| @@ -3341,12 +3336,6 @@ FRAME 0 means change the face on all frames, and change the default | |||
| 3341 | the attribute is mandatory. Also, clear the average | 3336 | the attribute is mandatory. Also, clear the average |
| 3342 | width. */ | 3337 | width. */ |
| 3343 | font_clear_prop (XVECTOR (lface)->contents, prop_index); | 3338 | font_clear_prop (XVECTOR (lface)->contents, prop_index); |
| 3344 | |||
| 3345 | /* If we are setting QCfamily, clear out FONT_WIDTH_INDEX as | ||
| 3346 | well. This avoids rejecting valid families that lack support | ||
| 3347 | for a particular width. */ | ||
| 3348 | if (prop_index == FONT_FAMILY_INDEX) | ||
| 3349 | font_clear_prop (XVECTOR (lface)->contents, FONT_WIDTH_INDEX); | ||
| 3350 | } | 3339 | } |
| 3351 | 3340 | ||
| 3352 | /* Changing a named face means that all realized faces depending on | 3341 | /* Changing a named face means that all realized faces depending on |