aboutsummaryrefslogtreecommitdiffstats
path: root/src/fontset.c
diff options
context:
space:
mode:
authorMiles Bader2007-07-15 02:05:20 +0000
committerMiles Bader2007-07-15 02:05:20 +0000
commit7eb1e4534e88a32fe5e549e630fdabf3e062be2b (patch)
tree34fc72789f1cfbfeb067cf507f8871c322df300a /src/fontset.c
parent76d11d2cf9623e9f4c38e8239c4444ffc1fae485 (diff)
parent6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff)
downloademacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.tar.gz
emacs-7eb1e4534e88a32fe5e549e630fdabf3e062be2b.zip
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
Diffstat (limited to 'src/fontset.c')
-rw-r--r--src/fontset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 7d227d8f43f..855d2322412 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1438,7 +1438,7 @@ If FRAME is omitted, it defaults to the currently selected 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;