Mercurial > emacs
comparison src/fontset.c @ 83644:0ece58f6e0aa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-813)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-25
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 15 Jul 2007 02:05:20 +0000 |
parents | b8d9a391daf3 c1184a3d99c9 |
children | 65663fcd2caa |
comparison
equal
deleted
inserted
replaced
83643:70b38dec13a1 | 83644:0ece58f6e0aa |
---|---|
1436 (name, frame) | 1436 (name, frame) |
1437 Lisp_Object name, frame; | 1437 Lisp_Object name, frame; |
1438 { | 1438 { |
1439 Lisp_Object fontset; | 1439 Lisp_Object fontset; |
1440 FRAME_PTR f; | 1440 FRAME_PTR f; |
1441 Lisp_Object indices[3]; | 1441 int indices[3]; |
1442 Lisp_Object val, tail, elt; | 1442 Lisp_Object val, tail, elt; |
1443 Lisp_Object *realized; | 1443 Lisp_Object *realized; |
1444 struct font_info *fontp = NULL; | 1444 struct font_info *fontp = NULL; |
1445 int n_realized = 0; | 1445 int n_realized = 0; |
1446 int i; | 1446 int i; |