diff options
| author | Kenichi Handa | 2006-06-09 06:28:33 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2006-06-09 06:28:33 +0000 |
| commit | e96b5f132a7a7762dc27f9a1fd6aadc459798f17 (patch) | |
| tree | 42498d68772ffc5e009c89d4699ff98f3c2f230a /src | |
| parent | e50e56890f9fd53cd82f00559d3a0edfa20a947b (diff) | |
| download | emacs-e96b5f132a7a7762dc27f9a1fd6aadc459798f17.tar.gz emacs-e96b5f132a7a7762dc27f9a1fd6aadc459798f17.zip | |
(font_find_for_lface): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/font.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/font.c b/src/font.c index 9c8f37c01f9..6f6e7f5d096 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1728,7 +1728,7 @@ font_find_for_lface (f, lface, spec) | |||
| 1728 | for (i = FONT_FOUNDRY_INDEX; i <= FONT_SIZE_INDEX; i++) | 1728 | for (i = FONT_FOUNDRY_INDEX; i <= FONT_SIZE_INDEX; i++) |
| 1729 | try_unspecified[i] = NILP (AREF (scratch_font_spec, i)); | 1729 | try_unspecified[i] = NILP (AREF (scratch_font_spec, i)); |
| 1730 | 1730 | ||
| 1731 | if (STRINGP (attrs[LFACE_FONT_INDEX])) | 1731 | if (NILP (spec) && STRINGP (attrs[LFACE_FONT_INDEX])) |
| 1732 | font_merge_old_spec (attrs[LFACE_FONT_INDEX], Qnil, Qnil, | 1732 | font_merge_old_spec (attrs[LFACE_FONT_INDEX], Qnil, Qnil, |
| 1733 | scratch_font_spec); | 1733 | scratch_font_spec); |
| 1734 | if (NILP (AREF (scratch_font_spec, FONT_FAMILY_INDEX)) | 1734 | if (NILP (AREF (scratch_font_spec, FONT_FAMILY_INDEX)) |