diff options
| author | Eli Zaretskii | 2020-12-02 18:07:54 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2020-12-02 18:07:54 +0200 |
| commit | d86cc3ffcb348e6cf2c01182455387e39e1daaf9 (patch) | |
| tree | fbef754085355078069aead8b317b0362c20f644 /src | |
| parent | 8e7325909363affe27c36d1181b60a625ea04d23 (diff) | |
| download | emacs-d86cc3ffcb348e6cf2c01182455387e39e1daaf9.tar.gz emacs-d86cc3ffcb348e6cf2c01182455387e39e1daaf9.zip | |
; * src/chartab.c, src/lisp.h: Fix typos in comments.
Diffstat (limited to 'src')
| -rw-r--r-- | src/chartab.c | 6 | ||||
| -rw-r--r-- | src/lisp.h | 33 |
2 files changed, 20 insertions, 19 deletions
diff --git a/src/chartab.c b/src/chartab.c index 04205ac1032..a39ffa756e4 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -1000,10 +1000,10 @@ map_sub_char_table_for_charset (void (*c_function) (Lisp_Object, Lisp_Object), | |||
| 1000 | "mapping table" or a "deunifier table" of a certain charset. | 1000 | "mapping table" or a "deunifier table" of a certain charset. |
| 1001 | 1001 | ||
| 1002 | If CHARSET is not NULL (this is the case that `map-charset-chars' | 1002 | If CHARSET is not NULL (this is the case that `map-charset-chars' |
| 1003 | is called with non-nil FROM-CODE and TO-CODE), it is a charset who | 1003 | is called with non-nil FROM-CODE and TO-CODE), it is a charset that |
| 1004 | owns TABLE, and the function is called only on a character in the | 1004 | owns TABLE, and the function is called only for characters in the |
| 1005 | range FROM and TO. FROM and TO are not character codes, but code | 1005 | range FROM and TO. FROM and TO are not character codes, but code |
| 1006 | points of a character in CHARSET. | 1006 | points of characters in CHARSET (see 'decode-char'). |
| 1007 | 1007 | ||
| 1008 | This function is called in these two cases: | 1008 | This function is called in these two cases: |
| 1009 | 1009 | ||
diff --git a/src/lisp.h b/src/lisp.h index 92294ac1d33..39fbf12f95e 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -1927,16 +1927,17 @@ memclear (void *p, ptrdiff_t nbytes) | |||
| 1927 | /* True iff C is an ASCII character. */ | 1927 | /* True iff C is an ASCII character. */ |
| 1928 | #define ASCII_CHAR_P(c) UNSIGNED_CMP (c, <, 0x80) | 1928 | #define ASCII_CHAR_P(c) UNSIGNED_CMP (c, <, 0x80) |
| 1929 | 1929 | ||
| 1930 | /* A char-table is a kind of vectorlike, with contents are like a | 1930 | /* A char-table is a kind of vectorlike, with contents like a vector, |
| 1931 | vector but with a few other slots. For some purposes, it makes | 1931 | but with a few additional slots. For some purposes, it makes sense |
| 1932 | sense to handle a char-table with type struct Lisp_Vector. An | 1932 | to handle a char-table as type 'struct Lisp_Vector'. An element of |
| 1933 | element of a char table can be any Lisp objects, but if it is a sub | 1933 | a char-table can be any Lisp object, but if it is a sub-char-table, |
| 1934 | char-table, we treat it a table that contains information of a | 1934 | we treat it as a table that contains information of a specific |
| 1935 | specific range of characters. A sub char-table is like a vector but | 1935 | range of characters. A sub-char-table is like a vector, but with |
| 1936 | with two integer fields between the header and Lisp data, which means | 1936 | two integer fields between the header and Lisp data, which means |
| 1937 | that it has to be marked with some precautions (see mark_char_table | 1937 | that it has to be marked with some precautions (see mark_char_table |
| 1938 | in alloc.c). A sub char-table appears only in an element of a char-table, | 1938 | in alloc.c). A sub-char-table appears only in an element of a |
| 1939 | and there's no way to access it directly from Emacs Lisp program. */ | 1939 | char-table, and there's no way to access it directly from a Lisp |
| 1940 | program. */ | ||
| 1940 | 1941 | ||
| 1941 | enum CHARTAB_SIZE_BITS | 1942 | enum CHARTAB_SIZE_BITS |
| 1942 | { | 1943 | { |
| @@ -1956,11 +1957,11 @@ struct Lisp_Char_Table | |||
| 1956 | contents, and extras slots. */ | 1957 | contents, and extras slots. */ |
| 1957 | union vectorlike_header header; | 1958 | union vectorlike_header header; |
| 1958 | 1959 | ||
| 1959 | /* This holds a default value, | 1960 | /* This holds the default value, which is used whenever the value |
| 1960 | which is used whenever the value for a specific character is nil. */ | 1961 | for a specific character is nil. */ |
| 1961 | Lisp_Object defalt; | 1962 | Lisp_Object defalt; |
| 1962 | 1963 | ||
| 1963 | /* This points to another char table, which we inherit from when the | 1964 | /* This points to another char table, from which we inherit when the |
| 1964 | value for a specific character is nil. The `defalt' slot takes | 1965 | value for a specific character is nil. The `defalt' slot takes |
| 1965 | precedence over this. */ | 1966 | precedence over this. */ |
| 1966 | Lisp_Object parent; | 1967 | Lisp_Object parent; |
| @@ -1969,8 +1970,8 @@ struct Lisp_Char_Table | |||
| 1969 | meant for. */ | 1970 | meant for. */ |
| 1970 | Lisp_Object purpose; | 1971 | Lisp_Object purpose; |
| 1971 | 1972 | ||
| 1972 | /* The bottom sub char-table for characters of the range 0..127. It | 1973 | /* The bottom sub char-table for characters in the range 0..127. It |
| 1973 | is nil if none of ASCII character has a specific value. */ | 1974 | is nil if no ASCII character has a specific value. */ |
| 1974 | Lisp_Object ascii; | 1975 | Lisp_Object ascii; |
| 1975 | 1976 | ||
| 1976 | Lisp_Object contents[(1 << CHARTAB_SIZE_BITS_0)]; | 1977 | Lisp_Object contents[(1 << CHARTAB_SIZE_BITS_0)]; |
| @@ -2045,7 +2046,7 @@ CHAR_TABLE_REF_ASCII (Lisp_Object ct, ptrdiff_t idx) | |||
| 2045 | } | 2046 | } |
| 2046 | 2047 | ||
| 2047 | /* Almost equivalent to Faref (CT, IDX) with optimization for ASCII | 2048 | /* Almost equivalent to Faref (CT, IDX) with optimization for ASCII |
| 2048 | characters. Do not check validity of CT. */ | 2049 | characters. Does not check validity of CT. */ |
| 2049 | INLINE Lisp_Object | 2050 | INLINE Lisp_Object |
| 2050 | CHAR_TABLE_REF (Lisp_Object ct, int idx) | 2051 | CHAR_TABLE_REF (Lisp_Object ct, int idx) |
| 2051 | { | 2052 | { |
| @@ -2055,7 +2056,7 @@ CHAR_TABLE_REF (Lisp_Object ct, int idx) | |||
| 2055 | } | 2056 | } |
| 2056 | 2057 | ||
| 2057 | /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and | 2058 | /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and |
| 2058 | 8-bit European characters. Do not check validity of CT. */ | 2059 | 8-bit European characters. Does not check validity of CT. */ |
| 2059 | INLINE void | 2060 | INLINE void |
| 2060 | CHAR_TABLE_SET (Lisp_Object ct, int idx, Lisp_Object val) | 2061 | CHAR_TABLE_SET (Lisp_Object ct, int idx, Lisp_Object val) |
| 2061 | { | 2062 | { |