aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2006-06-16 13:22:32 +0000
committerJan Djärv2006-06-16 13:22:32 +0000
commit2090e2a3897bd0e36fd0e8ba13d861668a0a887f (patch)
tree77ac5c1e9b5fba165b7f80ae416909a5f5d551c9 /src
parent743fa7170bfa2d10cd142b8b37194ba8115cd31e (diff)
downloademacs-2090e2a3897bd0e36fd0e8ba13d861668a0a887f.tar.gz
emacs-2090e2a3897bd0e36fd0e8ba13d861668a0a887f.zip
* frame.h (x_new_fontset2): Fix prototype.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.unicode4
-rw-r--r--src/frame.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index ed2661ac062..d25e5be3f12 100644
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,7 @@
12006-06-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * frame.h (x_new_fontset2): Fix prototype.
4
12006-06-16 Kenichi Handa <handa@m17n.org> 52006-06-16 Kenichi Handa <handa@m17n.org>
2 6
3 * font.h (struct font_driver): Member parse_name deleted. 7 * font.h (struct font_driver): Member parse_name deleted.
diff --git a/src/frame.h b/src/frame.h
index ce6ceebf02a..06976875759 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1064,7 +1064,7 @@ extern void x_wm_set_icon_position P_ ((struct frame *, int, int));
1064extern Lisp_Object x_new_font P_ ((struct frame *, char *)); 1064extern Lisp_Object x_new_font P_ ((struct frame *, char *));
1065extern Lisp_Object x_new_fontset P_ ((struct frame *, Lisp_Object)); 1065extern Lisp_Object x_new_fontset P_ ((struct frame *, Lisp_Object));
1066#ifdef USE_FONT_BACKEND 1066#ifdef USE_FONT_BACKEND
1067extern Lisp_Object x_new_fontset2 P_ ((struct frame *, Lisp_Object)); 1067extern Lisp_Object x_new_fontset2 P_ ((struct frame *, int, Lisp_Object));
1068#endif /* USE_FONT_BACKEND */ 1068#endif /* USE_FONT_BACKEND */
1069 1069
1070/* These are in frame.c */ 1070/* These are in frame.c */