diff options
| author | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-09-04 08:39:34 +0800 |
| commit | adf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch) | |
| tree | a5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/category.c | |
| parent | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff) | |
| parent | 38726039b77db432989fed106c88e9f1aa463281 (diff) | |
| download | emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip | |
Merge from mainline.
Diffstat (limited to 'src/category.c')
| -rw-r--r-- | src/category.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/category.c b/src/category.c index 30ffbd0890f..b28978fb721 100644 --- a/src/category.c +++ b/src/category.c | |||
| @@ -460,14 +460,6 @@ init_category_once (void) | |||
| 460 | { | 460 | { |
| 461 | /* This has to be done here, before we call Fmake_char_table. */ | 461 | /* This has to be done here, before we call Fmake_char_table. */ |
| 462 | DEFSYM (Qcategory_table, "category-table"); | 462 | DEFSYM (Qcategory_table, "category-table"); |
| 463 | |||
| 464 | /* Intern this now in case it isn't already done. | ||
| 465 | Setting this variable twice is harmless. | ||
| 466 | But don't staticpro it here--that is done in alloc.c. */ | ||
| 467 | Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots"); | ||
| 468 | |||
| 469 | /* Now we are ready to set up this property, so we can | ||
| 470 | create category tables. */ | ||
| 471 | Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); | 463 | Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); |
| 472 | 464 | ||
| 473 | Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); | 465 | Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); |