diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/ftfont.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index b0d10791379..d9ae9be0905 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -2598,7 +2598,7 @@ ftfont_font_format (FcPattern *pattern, Lisp_Object filename) | |||
| 2598 | return intern ("unknown"); | 2598 | return intern ("unknown"); |
| 2599 | } | 2599 | } |
| 2600 | 2600 | ||
| 2601 | static const char *ftfont_booleans [] = { | 2601 | static const char *const ftfont_booleans [] = { |
| 2602 | ":antialias", | 2602 | ":antialias", |
| 2603 | ":hinting", | 2603 | ":hinting", |
| 2604 | ":verticallayout", | 2604 | ":verticallayout", |
| @@ -2611,7 +2611,7 @@ static const char *ftfont_booleans [] = { | |||
| 2611 | NULL, | 2611 | NULL, |
| 2612 | }; | 2612 | }; |
| 2613 | 2613 | ||
| 2614 | static const char *ftfont_non_booleans [] = { | 2614 | static const char *const ftfont_non_booleans [] = { |
| 2615 | ":family", | 2615 | ":family", |
| 2616 | ":familylang", | 2616 | ":familylang", |
| 2617 | ":style", | 2617 | ":style", |