diff options
| author | Miles Bader <[email protected]> | 2005-03-19 02:42:17 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2005-03-19 02:42:17 +0000 |
| commit | 1bac4db5629da854a984a0e84a9469f14b6b9e76 (patch) | |
| tree | 068627144f173fed8c3331d541debae6c36f8988 /src/coding.h | |
| parent | f603a66a19f5bfbba314daaa21e77665b3e03dd5 (diff) | |
| parent | 951f97e67d904729032b476caf5f7c2e7e303d73 (diff) | |
Revision: [email protected]/emacs--unicode--0--patch-28
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 180-191)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 39-44)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/coding.h b/src/coding.h index 2a44da5692..c537ef8376 100644 --- a/src/coding.h +++ b/src/coding.h @@ -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. Copyright (C) 2003 @@ -600,9 +600,8 @@ struct coding_system : 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)) \ @@ -610,20 +609,13 @@ struct coding_system : 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 */ - /* Used by the gtk menu code. Note that this encodes utf-8, not utf-8-emacs, so it's not a no-op. */ #define ENCODE_UTF_8(str) code_convert_string_norecord (str, Qutf_8, 1) |