diff options
| author | Paul Eggert | 2011-06-12 22:24:58 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-12 22:24:58 -0700 |
| commit | 193e32d9a86691236b65238556b2d7a11bfc66d8 (patch) | |
| tree | 70a2909dcee6e716f40d2b69eaf98516f87f3efe /src | |
| parent | e5533da60e29f1cbbd7f909023f2c256bd76464c (diff) | |
| download | emacs-193e32d9a86691236b65238556b2d7a11bfc66d8.tar.gz emacs-193e32d9a86691236b65238556b2d7a11bfc66d8.zip | |
* lisp.h (CHAR_TABLE_SET): Omit now-redundant test.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lisp.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a9d47ebca16..ab821226fa4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-06-13 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lisp.h (CHAR_TABLE_SET): Omit now-redundant test. | ||
| 4 | |||
| 3 | * lread.c (Fload): Don't compare a possibly-garbage time_t value. | 5 | * lread.c (Fload): Don't compare a possibly-garbage time_t value. |
| 4 | 6 | ||
| 5 | GLYPH_CODE_FACE returns EMACS_INT, not int. | 7 | GLYPH_CODE_FACE returns EMACS_INT, not int. |
diff --git a/src/lisp.h b/src/lisp.h index 1324440c700..389762a07e5 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -941,8 +941,7 @@ struct Lisp_Vector | |||
| 941 | /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and | 941 | /* Equivalent to Faset (CT, IDX, VAL) with optimization for ASCII and |
| 942 | 8-bit European characters. Do not check validity of CT. */ | 942 | 8-bit European characters. Do not check validity of CT. */ |
| 943 | #define CHAR_TABLE_SET(CT, IDX, VAL) \ | 943 | #define CHAR_TABLE_SET(CT, IDX, VAL) \ |
| 944 | (((IDX) >= 0 && ASCII_CHAR_P (IDX) \ | 944 | (ASCII_CHAR_P (IDX) && SUB_CHAR_TABLE_P (XCHAR_TABLE (CT)->ascii) \ |
| 945 | && SUB_CHAR_TABLE_P (XCHAR_TABLE (CT)->ascii)) \ | ||
| 946 | ? XSUB_CHAR_TABLE (XCHAR_TABLE (CT)->ascii)->contents[IDX] = VAL \ | 945 | ? XSUB_CHAR_TABLE (XCHAR_TABLE (CT)->ascii)->contents[IDX] = VAL \ |
| 947 | : char_table_set (CT, IDX, VAL)) | 946 | : char_table_set (CT, IDX, VAL)) |
| 948 | 947 | ||