Mercurial > emacs
changeset 60657:aa6d20307ac6
(ENCODE_SYSTEM, DECODE_SYSTEM) [!WINDOWSNT]: Use the
locale-coding-system, as was already done for WINDOWSNT.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 17 Mar 2005 00:37:35 +0000 |
| parents | f49f92a8d1b1 |
| children | 2b7e54e81973 |
| files | src/coding.h |
| diffstat | 1 files changed, 3 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/coding.h Wed Mar 16 22:55:07 2005 +0000 +++ b/src/coding.h Thu Mar 17 00:37:35 2005 +0000 @@ -1,5 +1,5 @@ /* Header for coding system handler. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. Copyright (C) 1995, 1997 Electrotechnical Laboratory, JAPAN. Licensed to the Free Software Foundation. @@ -591,9 +591,8 @@ ? code_convert_string_norecord (name, Vdefault_file_name_coding_system, 0) \ : name)) -#ifdef WINDOWSNT /* Encode the string STR using the specified coding system - for w32 system functions, if any. */ + for system functions, if any. */ #define ENCODE_SYSTEM(str) \ (! NILP (Vlocale_coding_system) \ && !EQ (Vlocale_coding_system, make_number (0)) \ @@ -601,20 +600,13 @@ : str) /* Decode the string STR using the specified coding system - for w32 system functions, if any. */ + for system functions, if any. */ #define DECODE_SYSTEM(name) \ (! NILP (Vlocale_coding_system) \ && !EQ (Vlocale_coding_system, make_number (0)) \ ? code_convert_string_norecord (str, Vlocale_coding_system, 0) \ : str) -#else /* WINDOWSNT */ - -#define ENCODE_SYSTEM(str) string_make_unibyte(str) -#define DECODE_SYSTEM(name) name - -#endif /* !WINDOWSNT */ - #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 1) /* Extern declarations. */