diff options
| author | Dmitry Antipov | 2012-07-20 11:29:04 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-07-20 11:29:04 +0400 |
| commit | d7ea76b4f34c4e2c43bf0b1deeedde354ca540f7 (patch) | |
| tree | ac3cb2ab6d00e89542afc9a5290191e549ce1d81 /src/ftfont.c | |
| parent | 765e61e391ee0937ff6b30510b6c4651064fe38e (diff) | |
| download | emacs-d7ea76b4f34c4e2c43bf0b1deeedde354ca540f7.tar.gz emacs-d7ea76b4f34c4e2c43bf0b1deeedde354ca540f7.zip | |
Simple wrapper for make_unibyte_string, adjust font_open_by_name.
* src/lisp.h (build_unibyte_string): New function.
* src/dosfns.c, src/fileio.c, src/fns.c, src/ftfont.c, src/process.c:
* src/sysdep.c, src/w32fns.c, src/xfns.c: Use it.
* src/font.c (font_open_by_name): Change 2nd and 3rd args to the only arg
of type Lisp_Object to avoid redundant calls to make_unibyte_string.
Adjust users accordingly.
* src/font.h (font_open_by_name): Adjust prototype.
* admin/coccinelle/unibyte_string.cocci: Semantic patch to convert from
make_unibyte_string to build_unibyte_string where appropriate.
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 131a27f76e0..e16f967f596 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -211,7 +211,7 @@ ftfont_pattern_entity (FcPattern *p, Lisp_Object extra) | |||
| 211 | return Qnil; | 211 | return Qnil; |
| 212 | 212 | ||
| 213 | file = (char *) str; | 213 | file = (char *) str; |
| 214 | key = Fcons (make_unibyte_string (file, strlen (file)), make_number (idx)); | 214 | key = Fcons (build_unibyte_string (file), make_number (idx)); |
| 215 | cache = ftfont_lookup_cache (key, FTFONT_CACHE_FOR_ENTITY); | 215 | cache = ftfont_lookup_cache (key, FTFONT_CACHE_FOR_ENTITY); |
| 216 | entity = XCAR (cache); | 216 | entity = XCAR (cache); |
| 217 | if (! NILP (entity)) | 217 | if (! NILP (entity)) |