[Emacs-diffs] scratch/raeburn-startup 3cbcdc1 2/5: Build category table at startup rather than saving it.

[Ken Raeburn]

branch: scratch/raeburn-startup
commit 3cbcdc1db1171af8c0553a7ecc3604f581fa6671
Author: Ken Raeburn <address@hidden>
Commit: Ken Raeburn <address@hidden>

    Build category table at startup rather than saving it.
    
    * lisp/loadup.el: Instead of writing to dumped.elc a call to
    internal--set-category-table and the full category table, write out
    instructions to load international/characters at startup.
    * src/category.c (Finternal_set_standard_category_table): Deleted.
    (syms_of_category): Don't make it known.
---
 lisp/loadup.el |    5 ++---
 src/category.c |   12 ------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lisp/loadup.el b/lisp/loadup.el
index aa22b3a..a8601b4 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -490,9 +490,6 @@ lost after dumping")))
         (push `(internal--set-standard-syntax-table
                 ,(standard-syntax-table))
               cmds)
-        (push `(internal--set-standard-category-table
-                ,(standard-category-table))
-              cmds)
         (mapatoms
          (lambda (s)
            (when (fboundp s)
@@ -630,6 +627,8 @@ lost after dumping")))
                       (face-spec-set f (get f 'face-defface-spec)
                                      'face-defface-spec)))
             (terpri)
+            (print '(load "international/characters" nil t))
+            (terpri)
             (print `(dolist (cs ',coding-system-aliases)
                       (define-coding-system-alias (car cs) (cdr cs))))
             (terpri)
diff --git a/src/category.c b/src/category.c
index a8c60bd..8315797 100644
--- a/src/category.c
+++ b/src/category.c
@@ -291,17 +291,6 @@ Return TABLE.  */)
   return table;
 }
 
-DEFUN ("internal--set-standard-category-table",
-       Finternal_set_standard_category_table,
-       Sinternal_set_standard_category_table, 1, 1, 0,
-       doc: /* Replace the standard category table used for new buffers.  */)
-  (Lisp_Object table)
-{
-  table = check_category_table (table);
-  Vstandard_category_table = table;
-  return table;
-}
-
 
 Lisp_Object
 char_category_set (int c)
@@ -525,7 +514,6 @@ See the documentation of the variable 
`word-combining-categories'.  */);
   defsubr (&Schar_category_set);
   defsubr (&Scategory_set_mnemonics);
   defsubr (&Smodify_category_entry);
-  defsubr (&Sinternal_set_standard_category_table);
 
   category_table_version = 0;
 }