diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-12-12 15:31:33 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-12-12 15:31:33 +0100 |
| commit | 0474fda62d79cb7eb250f34f19773c87f283c665 (patch) | |
| tree | df7418a6b22fbbfda725c56825ec0290f8e6be39 /src/lisp.h | |
| parent | be907b0ba82c2a65e0468d50653cae8a7cf5f16b (diff) | |
| parent | 4afef614cd6c93b4d4a57aa5bb211563649abc56 (diff) | |
| download | emacs-0474fda62d79cb7eb250f34f19773c87f283c665.tar.gz emacs-0474fda62d79cb7eb250f34f19773c87f283c665.tar.bz2 emacs-0474fda62d79cb7eb250f34f19773c87f283c665.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/lisp.h b/src/lisp.h index a5a90cce1b4..5900b8d25e4 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -1900,16 +1900,17 @@ ASCII_CHAR_P (intmax_t c) return 0 <= c && c < 0x80; } -/* A char-table is a kind of vectorlike, with contents are like a - vector but with a few other slots. For some purposes, it makes - sense to handle a char-table with type struct Lisp_Vector. An - element of a char table can be any Lisp objects, but if it is a sub - char-table, we treat it a table that contains information of a - specific range of characters. A sub char-table is like a vector but - with two integer fields between the header and Lisp data, which means +/* A char-table is a kind of vectorlike, with contents like a vector, + but with a few additional slots. For some purposes, it makes sense + to handle a char-table as type 'struct Lisp_Vector'. An element of + a char-table can be any Lisp object, but if it is a sub-char-table, + we treat it as a table that contains information of a specific + range of characters. A sub-char-table is like a vector, but with + two integer fields between the header and Lisp data, which means that it has to be marked with some precautions (see mark_char_table - in alloc.c). A sub char-table appears only in an element of a char-table, - and there's no way to access it directly from Emacs Lisp program. */ + in alloc.c). A sub-char-table appears only in an element of a + char-table, and there's no way to access it directly from a Lisp + program. */ enum CHARTAB_SIZE_BITS { @@ -1929,11 +1930,11 @@ struct Lisp_Char_Table contents, and extras slots. */ union vectorlike_header header; - /* This holds a default value, - which is used whenever the value for a specific character is nil. */ + /* This holds the default value, which is used whenever the value + for a specific character is nil. */ Lisp_Object defalt; - /* This points to another char table, which we inherit from when the + /* This points to another char table, from which we inherit when the value for a specific character is nil. The `defalt' slot takes precedence over this. */ Lisp_Object parent; @@ -1942,8 +1943,8 @@ struct Lisp_Char_Table meant for. */ Lisp_Object purpose; - /* The bottom sub char-table for characters of the range 0..127. It - is nil if none of ASCII character has a specific value. */ + /* The bottom sub char-table for characters in the range 0..127. It + is nil if no ASCII character has a specific value. */ Lisp_Object ascii; Lisp_Object contents[(1 << CHARTAB_SIZE_BITS_0)]; @@ -2018,7 +2019,7 @@ CHAR_TABLE_REF_ASCII (Lisp_Object ct, ptrdiff_t idx) } /* Almost equivalent to Faref (CT, IDX) with optimization for ASCII - characters. Do not check validity of CT. */ + characters. Does not check validity of CT. */ INLINE Lisp_Object CHAR_TABLE_REF (Lisp_Object ct, int idx) { @@ -2028,7 +2029,7 @@ CHAR_TABLE_REF (Lisp_Object ct, int idx) } /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and - 8-bit European characters. Do not check validity of CT. */ + 8-bit European characters. Does not check validity of CT. */ INLINE void CHAR_TABLE_SET (Lisp_Object ct, int idx, Lisp_Object val) { |