diff options
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/coding.h b/src/coding.h index 57fd196af32..337ec46315e 100644 --- a/src/coding.h +++ b/src/coding.h @@ -676,21 +676,10 @@ struct coding_system #define UTF_16_LOW_SURROGATE_P(val) \ (((val) & 0xFC00) == 0xDC00) -/* Return the Unicode code point for the given UTF-16 surrogates. */ - -INLINE int -surrogates_to_codepoint (int low, int high) -{ - eassert (0 <= low && low <= 0xFFFF); - eassert (0 <= high && high <= 0xFFFF); - eassert (UTF_16_LOW_SURROGATE_P (low)); - eassert (UTF_16_HIGH_SURROGATE_P (high)); - return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400); -} - /* Extern declarations. */ extern Lisp_Object code_conversion_save (bool, bool); extern bool encode_coding_utf_8 (struct coding_system *); +extern bool utf8_string_p (Lisp_Object); extern void setup_coding_system (Lisp_Object, struct coding_system *); extern Lisp_Object coding_charset_list (struct coding_system *); extern Lisp_Object coding_system_charset_list (Lisp_Object); @@ -713,6 +702,8 @@ extern void decode_coding_object (struct coding_system *, extern void encode_coding_object (struct coding_system *, Lisp_Object, ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t, Lisp_Object); +/* Defined in this file. */ +INLINE int surrogates_to_codepoint (int, int); #if defined (WINDOWSNT) || defined (CYGWIN) @@ -757,17 +748,24 @@ extern Lisp_Object from_unicode_buffer (const wchar_t *wstr); } while (false) -extern Lisp_Object preferred_coding_system (void); +/* Return the Unicode code point for the given UTF-16 surrogates. */ +INLINE int +surrogates_to_codepoint (int low, int high) +{ + eassert (0 <= low && low <= 0xFFFF); + eassert (0 <= high && high <= 0xFFFF); + eassert (UTF_16_LOW_SURROGATE_P (low)); + eassert (UTF_16_HIGH_SURROGATE_P (high)); + return 0x10000 + (low - 0xDC00) + ((high - 0xD800) * 0x400); +} -#ifdef emacs +extern Lisp_Object preferred_coding_system (void); /* Coding system to be used to encode text for terminal display when terminal coding system is nil. */ extern struct coding_system safe_terminal_coding; -#endif - extern char emacs_mule_bytes[256]; INLINE_HEADER_END |