diff options
| author | Tom Tromey | 2018-08-09 17:56:53 -0600 |
|---|---|---|
| committer | Tom Tromey | 2018-08-09 17:56:53 -0600 |
| commit | accb7b7ecc19f85c2750ded1046a464bc73c6a52 (patch) | |
| tree | 1aa94af022d6700a93a8ff2b73f5b210046ac010 /src/chartab.c | |
| parent | f822a2516d88eeb2118fbbc8554f155e86dfd74e (diff) | |
| parent | 53483df0de0085dbc9ef0b15a0f629ab808b0147 (diff) | |
| download | emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.tar.gz emacs-accb7b7ecc19f85c2750ded1046a464bc73c6a52.zip | |
Merge remote-tracking branch 'origin/master' into feature/bignum
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/chartab.c b/src/chartab.c index 0383a84a04d..3d38b3ce12e 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -605,7 +605,7 @@ a cons of character codes (for characters in the range), or a character code. * | |||
| 605 | Lisp_Object val; | 605 | Lisp_Object val; |
| 606 | CHECK_CHAR_TABLE (char_table); | 606 | CHECK_CHAR_TABLE (char_table); |
| 607 | 607 | ||
| 608 | if (EQ (range, Qnil)) | 608 | if (NILP (range)) |
| 609 | val = XCHAR_TABLE (char_table)->defalt; | 609 | val = XCHAR_TABLE (char_table)->defalt; |
| 610 | else if (CHARACTERP (range)) | 610 | else if (CHARACTERP (range)) |
| 611 | val = CHAR_TABLE_REF (char_table, XFIXNAT (range)); | 611 | val = CHAR_TABLE_REF (char_table, XFIXNAT (range)); |
| @@ -642,7 +642,7 @@ or a character code. Return VALUE. */) | |||
| 642 | for (i = 0; i < chartab_size[0]; i++) | 642 | for (i = 0; i < chartab_size[0]; i++) |
| 643 | set_char_table_contents (char_table, i, value); | 643 | set_char_table_contents (char_table, i, value); |
| 644 | } | 644 | } |
| 645 | else if (EQ (range, Qnil)) | 645 | else if (NILP (range)) |
| 646 | set_char_table_defalt (char_table, value); | 646 | set_char_table_defalt (char_table, value); |
| 647 | else if (CHARACTERP (range)) | 647 | else if (CHARACTERP (range)) |
| 648 | char_table_set (char_table, XFIXNUM (range), value); | 648 | char_table_set (char_table, XFIXNUM (range), value); |