diff options
| author | K. Handa | 2015-09-27 17:06:12 +0900 |
|---|---|---|
| committer | K. Handa | 2015-09-27 17:06:12 +0900 |
| commit | 52beda922d2cb523a03661bf74b8678c8b45e440 (patch) | |
| tree | 04617b37298746a61d5324a5b35c9b71f439d762 /src/chartab.c | |
| parent | 94ed5167557112fb00eeca05e62589db744206de (diff) | |
| parent | 1ac5a9c20cb22efb398fa18781c6b932dd4e54df (diff) | |
| download | emacs-52beda922d2cb523a03661bf74b8678c8b45e440.tar.gz emacs-52beda922d2cb523a03661bf74b8678c8b45e440.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/chartab.c')
| -rw-r--r-- | src/chartab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/chartab.c b/src/chartab.c index bd14c4d172b..274bb60727c 100644 --- a/src/chartab.c +++ b/src/chartab.c | |||
| @@ -534,7 +534,7 @@ DEFUN ("char-table-parent", Fchar_table_parent, Schar_table_parent, | |||
| 534 | The value is either nil or another char-table. | 534 | The value is either nil or another char-table. |
| 535 | If CHAR-TABLE holds nil for a given character, | 535 | If CHAR-TABLE holds nil for a given character, |
| 536 | then the actual applicable value is inherited from the parent char-table | 536 | then the actual applicable value is inherited from the parent char-table |
| 537 | \(or from its parents, if necessary). */) | 537 | (or from its parents, if necessary). */) |
| 538 | (Lisp_Object char_table) | 538 | (Lisp_Object char_table) |
| 539 | { | 539 | { |
| 540 | CHECK_CHAR_TABLE (char_table); | 540 | CHECK_CHAR_TABLE (char_table); |