[Emacs-diffs] trunk r113999: * syntax.c (init_syntax_once): Adjust comment and do an early

[Dmitry Antipov]

------------------------------------------------------------
revno: 113999
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-08-26 09:20:59 +0400
message:
  * syntax.c (init_syntax_once): Adjust comment and do an early
  initialization of Qchar_table_extra_slots just once...
  * casetab.c (init_casetab_once):
  * category.c (init_category_once):
  * character.c (syms_of_character):
  * coding.c (syms_of_coding):
  * xdisp.c (syms_of_xdisp): ...and omit it here.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/casetab.c                  casetab.c-20091113204419-o5vbwnq5f7feedwu-155
  src/category.c                 category.c-20091113204419-o5vbwnq5f7feedwu-1071
  src/character.c                
character.c-20091113204419-o5vbwnq5f7feedwu-8537
  src/coding.c                   coding.c-20091113204419-o5vbwnq5f7feedwu-1077
  src/syntax.c                   syntax.c-20091113204419-o5vbwnq5f7feedwu-180
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-24 12:59:13 +0000
+++ b/src/ChangeLog     2013-08-26 05:20:59 +0000
@@ -1,3 +1,13 @@
+2013-08-26  Dmitry Antipov  <address@hidden>
+
+       * syntax.c (init_syntax_once): Adjust comment and do an early
+       initialization of Qchar_table_extra_slots just once...
+       * casetab.c (init_casetab_once):
+       * category.c (init_category_once):
+       * character.c (syms_of_character):
+       * coding.c (syms_of_coding):
+       * xdisp.c (syms_of_xdisp): ...and omit it here.
+
 2013-08-24  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (get_next_display_element): Don't apply to characters

=== modified file 'src/casetab.c'
--- a/src/casetab.c     2013-05-22 21:35:00 +0000
+++ b/src/casetab.c     2013-08-26 05:20:59 +0000
@@ -247,15 +247,8 @@
 {
   register int i;
   Lisp_Object down, up, eqv;
+
   DEFSYM (Qcase_table, "case-table");
-
-  /* Intern this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
-
-  /* Now we are ready to set up this property, so we can
-     create char tables.  */
   Fput (Qcase_table, Qchar_table_extra_slots, make_number (3));
 
   down = Fmake_char_table (Qcase_table, Qnil);

=== modified file 'src/category.c'
--- a/src/category.c    2013-01-02 16:13:04 +0000
+++ b/src/category.c    2013-08-26 05:20:59 +0000
@@ -460,14 +460,6 @@
 {
   /* This has to be done here, before we call Fmake_char_table.  */
   DEFSYM (Qcategory_table, "category-table");
-
-  /* Intern this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
-
-  /* Now we are ready to set up this property, so we can
-     create category tables.  */
   Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2));
 
   Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil);

=== modified file 'src/character.c'
--- a/src/character.c   2013-08-20 14:56:03 +0000
+++ b/src/character.c   2013-08-26 05:20:59 +0000
@@ -1072,10 +1072,6 @@
               doc: /* Char table of script symbols.
 It has one extra slot whose value is a list of script symbols.  */);
 
-  /* Intern this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
   DEFSYM (Qchar_script_table, "char-script-table");
   Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1));
   Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil);

=== modified file 'src/coding.c'
--- a/src/coding.c      2013-08-03 18:16:43 +0000
+++ b/src/coding.c      2013-08-26 05:20:59 +0000
@@ -10814,11 +10814,6 @@
   Fput (Qcoding_system_error, Qerror_message,
        build_pure_c_string ("Invalid coding system"));
 
-  /* Intern this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
-
   DEFSYM (Qtranslation_table, "translation-table");
   Fput (Qtranslation_table, Qchar_table_extra_slots, make_number (2));
   DEFSYM (Qtranslation_table_id, "translation-table-id");

=== modified file 'src/syntax.c'
--- a/src/syntax.c      2013-08-13 14:26:39 +0000
+++ b/src/syntax.c      2013-08-26 05:20:59 +0000
@@ -3486,9 +3486,9 @@
   /* This has to be done here, before we call Fmake_char_table.  */
   DEFSYM (Qsyntax_table, "syntax-table");
 
-  /* Intern_C_String this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
+  /* This variable is DEFSYMed in alloc.c and not initialized yet, so
+     intern it here.  NOTE: you must guarantee that init_syntax_once
+     is called before all other users of this variable.  */
   Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
 
   /* Create objects which can be shared among syntax tables.  */

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-08-24 15:21:05 +0000
+++ b/src/xdisp.c       2013-08-26 05:20:59 +0000
@@ -29731,10 +29731,6 @@
   DEFSYM (Qzero_width, "zero-width");
 
   DEFSYM (Qglyphless_char_display, "glyphless-char-display");
-  /* Intern this now in case it isn't already done.
-     Setting this variable twice is harmless.
-     But don't staticpro it here--that is done in alloc.c.  */
-  Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
   Fput (Qglyphless_char_display, Qchar_table_extra_slots, make_number (1));
 
   DEFVAR_LISP ("glyphless-char-display", Vglyphless_char_display,