diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 202cebcfb8a..ad19fff32d4 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -177,8 +177,6 @@ Lisp_Object Vx_pixel_size_width_font_regexp; | |||
| 177 | /* Alist of bdf fonts and the files that define them. */ | 177 | /* Alist of bdf fonts and the files that define them. */ |
| 178 | Lisp_Object Vw32_bdf_filename_alist; | 178 | Lisp_Object Vw32_bdf_filename_alist; |
| 179 | 179 | ||
| 180 | Lisp_Object Vw32_system_coding_system; | ||
| 181 | |||
| 182 | /* A flag to control whether fonts are matched strictly or not. */ | 180 | /* A flag to control whether fonts are matched strictly or not. */ |
| 183 | int w32_strict_fontnames; | 181 | int w32_strict_fontnames; |
| 184 | 182 | ||
| @@ -6242,7 +6240,7 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset) | |||
| 6242 | else | 6240 | else |
| 6243 | fonttype = "unknown"; | 6241 | fonttype = "unknown"; |
| 6244 | 6242 | ||
| 6245 | setup_coding_system (Fcheck_coding_system (Vw32_system_coding_system), | 6243 | setup_coding_system (Fcheck_coding_system (Vlocale_coding_system), |
| 6246 | &coding); | 6244 | &coding); |
| 6247 | coding.src_multibyte = 0; | 6245 | coding.src_multibyte = 0; |
| 6248 | coding.dst_multibyte = 1; | 6246 | coding.dst_multibyte = 1; |
| @@ -6374,7 +6372,7 @@ x_to_w32_font (lpxstr, lplogfont) | |||
| 6374 | unsigned char *buf; | 6372 | unsigned char *buf; |
| 6375 | 6373 | ||
| 6376 | setup_coding_system | 6374 | setup_coding_system |
| 6377 | (Fcheck_coding_system (Vw32_system_coding_system), &coding); | 6375 | (Fcheck_coding_system (Vlocale_coding_system), &coding); |
| 6378 | coding.src_multibyte = 1; | 6376 | coding.src_multibyte = 1; |
| 6379 | coding.dst_multibyte = 1; | 6377 | coding.dst_multibyte = 1; |
| 6380 | bufsize = encoding_buffer_size (&coding, strlen (name)); | 6378 | bufsize = encoding_buffer_size (&coding, strlen (name)); |
| @@ -14493,11 +14491,6 @@ Set this to nil to get the old behaviour for repainting; this should | |||
| 14493 | only be necessary if the default setting causes problems. */); | 14491 | only be necessary if the default setting causes problems. */); |
| 14494 | w32_strict_painting = 1; | 14492 | w32_strict_painting = 1; |
| 14495 | 14493 | ||
| 14496 | DEFVAR_LISP ("w32-system-coding-system", | ||
| 14497 | &Vw32_system_coding_system, | ||
| 14498 | doc: /* Coding system used by Windows system functions, such as for font names. */); | ||
| 14499 | Vw32_system_coding_system = Qnil; | ||
| 14500 | |||
| 14501 | DEFVAR_LISP ("w32-charset-info-alist", | 14494 | DEFVAR_LISP ("w32-charset-info-alist", |
| 14502 | &Vw32_charset_info_alist, | 14495 | &Vw32_charset_info_alist, |
| 14503 | doc: /* Alist linking Emacs character sets to Windows fonts and codepages. | 14496 | doc: /* Alist linking Emacs character sets to Windows fonts and codepages. |