diff options
| author | Jason Rumney | 2001-11-20 22:01:56 +0000 |
|---|---|---|
| committer | Jason Rumney | 2001-11-20 22:01:56 +0000 |
| commit | 9b58c683a3b0979fe72106a8fa7a6c989f609665 (patch) | |
| tree | c5b519039b9655f7a422678a39b799bfbb41c84a /src/coding.h | |
| parent | 1fa3a2001dcc51605ca0080a5dd49640e78c4f44 (diff) | |
| download | emacs-9b58c683a3b0979fe72106a8fa7a6c989f609665.tar.gz emacs-9b58c683a3b0979fe72106a8fa7a6c989f609665.zip | |
(Vw32_system_coding_system) [WINDOWSNT]: Remove.
(ENCODE_SYSTEM, DECODE_SYSTEM) [WINDOWSNT]: Use Vlocale_coding_system.
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/coding.h b/src/coding.h index e3cab288062..69b5c69afbb 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -590,17 +590,17 @@ struct coding_system | |||
| 590 | /* Encode the string STR using the specified coding system | 590 | /* Encode the string STR using the specified coding system |
| 591 | for w32 system functions, if any. */ | 591 | for w32 system functions, if any. */ |
| 592 | #define ENCODE_SYSTEM(str) \ | 592 | #define ENCODE_SYSTEM(str) \ |
| 593 | (! NILP (Vw32_system_coding_system) \ | 593 | (! NILP (Vlocale_coding_system) \ |
| 594 | && XFASTINT (Vw32_system_coding_system) != 0 \ | 594 | && XFASTINT (Vlocale_coding_system) != 0 \ |
| 595 | ? code_convert_string_norecord (str, Vw32_system_coding_system, 1) \ | 595 | ? code_convert_string_norecord (str, Vlocale_coding_system, 1) \ |
| 596 | : str) | 596 | : str) |
| 597 | 597 | ||
| 598 | /* Decode the string STR using the specified coding system | 598 | /* Decode the string STR using the specified coding system |
| 599 | for w32 system functions, if any. */ | 599 | for w32 system functions, if any. */ |
| 600 | #define DECODE_SYSTEM(name) \ | 600 | #define DECODE_SYSTEM(name) \ |
| 601 | (! NILP (Vw32_system_coding_system) \ | 601 | (! NILP (Vlocale_coding_system) \ |
| 602 | && XFASTINT (Vw32_system_coding_system) != 0 \ | 602 | && XFASTINT (Vlocale_coding_system) != 0 \ |
| 603 | ? code_convert_string_norecord (str, Vw32_system_coding_system, 0) \ | 603 | ? code_convert_string_norecord (str, Vlocale_coding_system, 0) \ |
| 604 | : str) | 604 | : str) |
| 605 | 605 | ||
| 606 | #else /* WINDOWSNT */ | 606 | #else /* WINDOWSNT */ |
| @@ -707,10 +707,6 @@ extern Lisp_Object Vfile_name_coding_system; | |||
| 707 | Vfile_name_coding_system is nil. */ | 707 | Vfile_name_coding_system is nil. */ |
| 708 | extern Lisp_Object Vdefault_file_name_coding_system; | 708 | extern Lisp_Object Vdefault_file_name_coding_system; |
| 709 | 709 | ||
| 710 | #ifdef WINDOWSNT | ||
| 711 | /* Coding system for w32 system strings, or nil if none. */ | ||
| 712 | extern Lisp_Object Vw32_system_coding_system; | ||
| 713 | #endif | ||
| 714 | #endif | 710 | #endif |
| 715 | 711 | ||
| 716 | /* Error signaled when there's a problem with detecting coding system */ | 712 | /* Error signaled when there's a problem with detecting coding system */ |