aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorXue Fuqiao2013-09-04 08:39:34 +0800
committerXue Fuqiao2013-09-04 08:39:34 +0800
commitadf2fc4a01efe77d73cd52bc9173914ed56ff531 (patch)
treea5a280a5554a7bffeaf94fccae29fa3ac1a5d066 /src/coding.c
parent63191d9f2043d2e67657e85a7b3842805dd1dad6 (diff)
parent38726039b77db432989fed106c88e9f1aa463281 (diff)
downloademacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.tar.gz
emacs-adf2fc4a01efe77d73cd52bc9173914ed56ff531.zip
Merge from mainline.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/coding.c b/src/coding.c
index 5b637627763..c10fb375672 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -10814,11 +10814,6 @@ syms_of_coding (void)
10814 Fput (Qcoding_system_error, Qerror_message, 10814 Fput (Qcoding_system_error, Qerror_message,
10815 build_pure_c_string ("Invalid coding system")); 10815 build_pure_c_string ("Invalid coding system"));
10816 10816
10817 /* Intern this now in case it isn't already done.
10818 Setting this variable twice is harmless.
10819 But don't staticpro it here--that is done in alloc.c. */
10820 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
10821
10822 DEFSYM (Qtranslation_table, "translation-table"); 10817 DEFSYM (Qtranslation_table, "translation-table");
10823 Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2)); 10818 Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2));
10824 DEFSYM (Qtranslation_table_id, "translation-table-id"); 10819 DEFSYM (Qtranslation_table_id, "translation-table-id");