aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorStefan Monnier2011-03-31 00:24:03 -0400
committerStefan Monnier2011-03-31 00:24:03 -0400
commit40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch)
treeb56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /src/font.c
parentf488fb6528738131ef41859e1f04125f2e50efce (diff)
parent44f230aa043ebb222aa0876b44d70484d5dd38db (diff)
downloademacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz
emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip
Merge from trunk
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c
index 9e8b7029c22..6b2e2f2712d 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3831,10 +3831,10 @@ be an OpenType font, and whose GPOS table of `thai' script's default
3831language system must contain `mark' feature. 3831language system must contain `mark' feature.
3832 3832
3833usage: (font-spec ARGS...) */) 3833usage: (font-spec ARGS...) */)
3834 (int nargs, Lisp_Object *args) 3834 (size_t nargs, Lisp_Object *args)
3835{ 3835{
3836 Lisp_Object spec = font_make_spec (); 3836 Lisp_Object spec = font_make_spec ();
3837 int i; 3837 size_t i;
3838 3838
3839 for (i = 0; i < nargs; i += 2) 3839 for (i = 0; i < nargs; i += 2)
3840 { 3840 {