diff options
| author | Jason Rumney | 2007-12-06 15:17:39 +0000 |
|---|---|---|
| committer | Jason Rumney | 2007-12-06 15:17:39 +0000 |
| commit | fb220ed56a90caccafcf5c61faf51d033aca3e3f (patch) | |
| tree | 37b4c7f5bd1c5fe2b38aca27c4b217ee0f2a75eb /src | |
| parent | 0bd508417142ff377f34aec8dcec9438d9175c2c (diff) | |
| download | emacs-fb220ed56a90caccafcf5c61faf51d033aca3e3f.tar.gz emacs-fb220ed56a90caccafcf5c61faf51d033aca3e3f.zip | |
(w32_to_x_font): Fix bad merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 3e4413a0bee..441ad0f60dc 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -5535,9 +5535,6 @@ w32_to_x_font (lplogfont, lpxstr, len, specific_charset) | |||
| 5535 | strlen(lplogfont->lfFaceName), Qnil); | 5535 | strlen(lplogfont->lfFaceName), Qnil); |
| 5536 | fontname = coding.destination; | 5536 | fontname = coding.destination; |
| 5537 | 5537 | ||
| 5538 | fontname = alloca (sizeof (*fontname) * bufsz); | ||
| 5539 | decode_coding (&coding, lplogfont->lfFaceName, fontname, | ||
| 5540 | strlen (lplogfont->lfFaceName), bufsz - 1); | ||
| 5541 | *(fontname + coding.produced) = '\0'; | 5538 | *(fontname + coding.produced) = '\0'; |
| 5542 | 5539 | ||
| 5543 | /* Replace dashes with underscores so the dashes are not | 5540 | /* Replace dashes with underscores so the dashes are not |