summaryrefslogtreecommitdiff
path: root/src/charset.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/charset.h')
-rw-r--r--src/charset.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/charset.h b/src/charset.h
index d5c41ec6f49..7453192bb9c 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -171,23 +171,23 @@ struct charset
unsigned char *code_space_mask;
/* True if there's no gap in code-points. */
- unsigned code_linear_p : 1;
+ bool_bf code_linear_p : 1;
/* True if the charset is treated as 96 chars in ISO-2022
as opposed to 94 chars. */
- unsigned iso_chars_96 : 1;
+ bool_bf iso_chars_96 : 1;
/* True if the charset is compatible with ASCII. */
- unsigned ascii_compatible_p : 1;
+ bool_bf ascii_compatible_p : 1;
/* True if the charset is supplementary. */
- unsigned supplementary_p : 1;
+ bool_bf supplementary_p : 1;
/* True if all the code points are representable by Lisp_Int. */
- unsigned compact_codes_p : 1;
+ bool_bf compact_codes_p : 1;
/* True if the charset is unified with Unicode. */
- unsigned unified_p : 1;
+ bool_bf unified_p : 1;
/* ISO final byte of the charset: 48..127. It may be -1 if the
charset doesn't conform to ISO-2022. */
@@ -344,7 +344,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
do { \
if (! SYMBOLP (x) || CHARSET_SYMBOL_HASH_INDEX (x) < 0) \
wrong_type_argument (Qcharsetp, (x)); \
- } while (0)
+ } while (false)
/* Check if X is a valid charset symbol. If valid, set ID to the id
@@ -357,7 +357,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
wrong_type_argument (Qcharsetp, (x)); \
id = XINT (AREF (HASH_VALUE (XHASH_TABLE (Vcharset_hash_table), idx), \
charset_id)); \
- } while (0)
+ } while (false)
/* Check if X is a valid charset symbol. If valid, set ATTR to the
@@ -366,7 +366,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
do { \
if (!SYMBOLP (x) || NILP (attr = CHARSET_SYMBOL_ATTRIBUTES (x))) \
wrong_type_argument (Qcharsetp, (x)); \
- } while (0)
+ } while (false)
#define CHECK_CHARSET_GET_CHARSET(x, charset) \
@@ -374,7 +374,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
int csid; \
CHECK_CHARSET_GET_ID (x, csid); \
charset = CHARSET_FROM_ID (csid); \
- } while (0)
+ } while (false)
/* Lookup Vcharset_ordered_list and return the first charset that
@@ -383,7 +383,7 @@ set_charset_attr (struct charset *charset, enum charset_attr_index idx,
((c) < 0x80 ? CHARSET_FROM_ID (charset_ascii) \
: char_charset ((c), Qnil, NULL))
-#if 0
+#if false
/* Char-table of charset-sets. Each element is a bool vector indexed
by a charset ID. */
extern Lisp_Object Vchar_charset_set;
@@ -452,7 +452,7 @@ extern Lisp_Object charset_work;
: encode_char (charset, c))))
-/* Set to 1 when a charset map is loaded to warn that a buffer text
+/* Set to true when a charset map is loaded to warn that a buffer text
and a string data may be relocated. */
extern bool charset_map_loaded;
@@ -489,7 +489,7 @@ extern int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL];
(fast_map)[(c) >> 10] |= 1 << (((c) >> 7) & 7); \
else \
(fast_map)[((c) >> 15) + 62] |= 1 << (((c) >> 12) & 7); \
- } while (0)
+ } while (false)