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/w32fns.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/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index dac83ab6ae1..06938e3124b 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -4036,7 +4036,7 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms) | |||
| 4036 | 4036 | ||
| 4037 | for (i = 0; names[i]; i++) | 4037 | for (i = 0; names[i]; i++) |
| 4038 | { | 4038 | { |
| 4039 | font = font_open_by_name (f, names[i], strlen (names[i])); | 4039 | font = font_open_by_name (f, build_unibyte_string (names[i])); |
| 4040 | if (! NILP (font)) | 4040 | if (! NILP (font)) |
| 4041 | break; | 4041 | break; |
| 4042 | } | 4042 | } |
| @@ -6197,8 +6197,7 @@ an integer representing a ShowWindow flag: | |||
| 6197 | if (!NILP (Vlocale_coding_system)) | 6197 | if (!NILP (Vlocale_coding_system)) |
| 6198 | { | 6198 | { |
| 6199 | Lisp_Object decoded = | 6199 | Lisp_Object decoded = |
| 6200 | code_convert_string_norecord (make_unibyte_string (errstr, | 6200 | code_convert_string_norecord (build_unibyte_string (errstr), |
| 6201 | strlen (errstr)), | ||
| 6202 | Vlocale_coding_system, 0); | 6201 | Vlocale_coding_system, 0); |
| 6203 | errstr = SSDATA (decoded); | 6202 | errstr = SSDATA (decoded); |
| 6204 | } | 6203 | } |