X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/2846c6e3607995ce250435e5998ea6a08f60dd89..97e92ffbd42de8321677900fbc7dc44b51a4290e:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 74ecf2867a..284c7e3a11 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,7 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -46,6 +46,12 @@
 
 (message "Using load-path %s" load-path)
 
+(if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
+	(member (nth 4 command-line-args) '("dump" "bootstrap")))
+    ;; To reduce the size of dumped Emacs, we avoid making huge
+    ;; char-tables.
+    (setq inhibit-load-charset-map t))
+
 ;; We don't want to have any undo records in the dumped Emacs.
 (set-buffer "*scratch*")
 (setq buffer-undo-list t)
@@ -202,8 +208,6 @@
       ;; ``window system'', which generally behaves like a terminal.
       (load "term/pc-win")
       (load "ls-lisp")
-      (load "international/ccl")	; codepage.el uses CCL en/decoder
-      (load "international/codepage")	; internal.el uses cpNNN coding systems
       (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
 (if (eq system-type 'macos)
     (progn
@@ -327,6 +331,7 @@
 	(equal (nth 4 command-line-args) "bootstrap"))
     (setcdr load-path nil))
 
+(setq inhibit-load-charset-map nil)
 (clear-charset-maps)
 (garbage-collect)