diff options
| author | Paul Eggert | 2012-08-26 01:41:36 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-08-26 01:41:36 -0700 |
| commit | d5172d4fbc2ca871d18426fb9e84ee6bb87a0e68 (patch) | |
| tree | fe1dd8c01faf007f86f46cbf4a6f441ae28b104d /src/character.h | |
| parent | 6af64513413d7194cfa2d8308db2d73f6ed64bf4 (diff) | |
| download | emacs-d5172d4fbc2ca871d18426fb9e84ee6bb87a0e68.tar.gz emacs-d5172d4fbc2ca871d18426fb9e84ee6bb87a0e68.zip | |
* character.c, charset.c, chartab.c: Use bool for booleans.
* character.c (lisp_string_width, string_count_byte8)
(string_escape_byte8):
* charset.c (charset_map_loaded, load_charset_map, read_hex):
(load_charset_map_from_file, map_charset_chars)
(Fdefine_charset_internal, define_charset_internal)
(Fdeclare_equiv_charset, find_charsets_in_text)
(Ffind_charset_region, char_charset, Fiso_charset):
* chartab.c (sub_char_table_ref, sub_char_table_ref_and_range)
(sub_char_table_set, sub_char_table_set_range)
(char_table_set_range, optimize_sub_char_table)
(map_sub_char_table):
Use bool for boolean.
* character.c (str_to_unibyte): Omit last boolean argument; it was
always 0. All callers changed.
* character.h, charset.h: Adjust to match previous changes.
* character.h (char_printable_p): Remove decl of nonexistent function.
* charset.h (struct charset): Members code_linear_p, iso_chars_96,
ascii_compatible_p, supplementary_p, compact_codes_p, unified_p
are all boolean, so make them single-bit bitfields.
Diffstat (limited to 'src/character.h')
| -rw-r--r-- | src/character.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/character.h b/src/character.h index 332dfee373a..70d4e67a978 100644 --- a/src/character.h +++ b/src/character.h | |||
| @@ -676,7 +676,6 @@ extern int string_char (const unsigned char *, | |||
| 676 | const unsigned char **, int *); | 676 | const unsigned char **, int *); |
| 677 | 677 | ||
| 678 | extern int translate_char (Lisp_Object, int c); | 678 | extern int translate_char (Lisp_Object, int c); |
| 679 | extern int char_printable_p (int c); | ||
| 680 | extern void parse_str_as_multibyte (const unsigned char *, | 679 | extern void parse_str_as_multibyte (const unsigned char *, |
| 681 | ptrdiff_t, ptrdiff_t *, ptrdiff_t *); | 680 | ptrdiff_t, ptrdiff_t *, ptrdiff_t *); |
| 682 | extern ptrdiff_t count_size_as_multibyte (const unsigned char *, ptrdiff_t); | 681 | extern ptrdiff_t count_size_as_multibyte (const unsigned char *, ptrdiff_t); |
| @@ -685,7 +684,7 @@ extern ptrdiff_t str_as_multibyte (unsigned char *, ptrdiff_t, ptrdiff_t, | |||
| 685 | extern ptrdiff_t str_to_multibyte (unsigned char *, ptrdiff_t, ptrdiff_t); | 684 | extern ptrdiff_t str_to_multibyte (unsigned char *, ptrdiff_t, ptrdiff_t); |
| 686 | extern ptrdiff_t str_as_unibyte (unsigned char *, ptrdiff_t); | 685 | extern ptrdiff_t str_as_unibyte (unsigned char *, ptrdiff_t); |
| 687 | extern ptrdiff_t str_to_unibyte (const unsigned char *, unsigned char *, | 686 | extern ptrdiff_t str_to_unibyte (const unsigned char *, unsigned char *, |
| 688 | ptrdiff_t, int); | 687 | ptrdiff_t); |
| 689 | extern ptrdiff_t strwidth (const char *, ptrdiff_t); | 688 | extern ptrdiff_t strwidth (const char *, ptrdiff_t); |
| 690 | extern ptrdiff_t c_string_width (const unsigned char *, ptrdiff_t, int, | 689 | extern ptrdiff_t c_string_width (const unsigned char *, ptrdiff_t, int, |
| 691 | ptrdiff_t *, ptrdiff_t *); | 690 | ptrdiff_t *, ptrdiff_t *); |