mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

(Vw32_system_coding_system): Remove.

Browse Source 
(w32_to_x_font, x_to_w32_font): Use Vlocale_coding_system.
This commit is contained in:
Jason Rumney 2001-11-20 22:00:54 +00:00
parent effcd99a69
commit 1fa3a2001d
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/w32fns.c
View File

@ -177,8 +177,6 @@ Lisp_Object Vx_pixel_size_width_font_regexp;
/* Alist of bdf fonts and the files that define them. */ /* Alist of bdf fonts and the files that define them. */
Lisp_Object Vw32_bdf_filename_alist; Lisp_Object Vw32_bdf_filename_alist;
Lisp_Object Vw32_system_coding_system;
/* A flag to control whether fonts are matched strictly or not. */ /* A flag to control whether fonts are matched strictly or not. */
int w32_strict_fontnames; int w32_strict_fontnames;
@ -6242,7 +6240,7 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset)
else else
fonttype = "unknown"; fonttype = "unknown";
setup_coding_system (Fcheck_coding_system (Vw32_system_coding_system), setup_coding_system (Fcheck_coding_system (Vlocale_coding_system),
&coding); &coding);
coding.src_multibyte = 0; coding.src_multibyte = 0;
coding.dst_multibyte = 1; coding.dst_multibyte = 1;
@ -6374,7 +6372,7 @@ x_to_w32_font (lpxstr, lplogfont)
unsigned char *buf; unsigned char *buf;
setup_coding_system setup_coding_system
(Fcheck_coding_system (Vw32_system_coding_system), &coding); (Fcheck_coding_system (Vlocale_coding_system), &coding);
coding.src_multibyte = 1; coding.src_multibyte = 1;
coding.dst_multibyte = 1; coding.dst_multibyte = 1;
bufsize = encoding_buffer_size (&coding, strlen (name)); bufsize = encoding_buffer_size (&coding, strlen (name));
@ -14493,11 +14491,6 @@ Set this to nil to get the old behaviour for repainting; this should
only be necessary if the default setting causes problems. */); only be necessary if the default setting causes problems. */);
w32_strict_painting = 1; w32_strict_painting = 1;
DEFVAR_LISP ("w32-system-coding-system",
&Vw32_system_coding_system,
doc: /* Coding system used by Windows system functions, such as for font names. */);
Vw32_system_coding_system = Qnil;
DEFVAR_LISP ("w32-charset-info-alist", DEFVAR_LISP ("w32-charset-info-alist",
&Vw32_charset_info_alist, &Vw32_charset_info_alist,
doc: /* Alist linking Emacs character sets to Windows fonts and codepages. doc: /* Alist linking Emacs character sets to Windows fonts and codepages.