mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-31 01:20:37 -08:00
Code Issues Projects Releases Wiki Activity

(set_lface_from_font_name): Fix incomplete merge.

Browse source
This commit is contained in:
Gerd Moellmann 1999-12-06 21:23:20 +00:00
parent 3d973f7115
commit 397e4fae84
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
1999-12-06 Gerd Moellmann <gerd@gnu.org>
* xfaces.c (set_lface_from_font_name): Fix incomplete merge.
1999-12-04 Hrvoje Niksic <hniksic@iskon.hr>
* lread.c (Fintern_soft): Accept a symbol argument.

3
src/xfaces.c
View file

@ -2769,7 +2769,7 @@ lface_fully_specified_p (attrs)
for split_font_name, see the comment there. */
static int
set_lface_from_font_name (f, lface, font_name, force_p)
set_lface_from_font_name (f, lface, font_name, force_p, may_fail_p)
struct frame *f;
Lisp_Object lface;
char *font_name;
@ -2809,6 +2809,7 @@ set_lface_from_font_name (f, lface, font_name, force_p)
}
UNBLOCK_INPUT;
}
}
/* If FONT_NAME is completely bogus try to use something reasonable
if this function must succeed. Otherwise, give up. */