* mwheel.el (mwheel-installed-bindings): New var.

[bpt/emacs.git] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 74ecf28..da7613b 100644 (file)
--- 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.
+;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003, 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)
@@ -174,7 +180,6 @@
       (load "image")
       (load "international/fontset")
       (load "dnd")
-      (load "mwheel")
       (load "tool-bar")))
 (if (featurep 'x)
     (progn
@@ -202,16 +207,15 @@
       ;; ``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
-      (load "ls-lisp")))
 (if (featurep 'ns)
     (progn
       (load "emacs-lisp/easymenu")  ;; for platform-related menu adjustments
       (load "term/ns-win")))
+(if (fboundp 'x-create-frame)
+    ;; Do it after loading term/foo-win.el since the value of the
+    ;; mouse-wheel-*-event vars depends on those files being loaded or not.
+    (load "mwheel"))
 (if (fboundp 'atan)    ; preload some constants and
     (progn             ; floating pt. functions if we have float support.
       (load "emacs-lisp/float-sup")))
@@ -232,12 +236,6 @@
 (if (load "site-load" t)
     (garbage-collect))
 
-(if (fboundp 'x-popup-menu)
-    (precompute-menubar-bindings))
-;; Turn on recording of which commands get rebound,
-;; for the sake of the next call to precompute-menubar-bindings.
-(setq define-key-rebound-commands nil)
-
 ;; Determine which last version number to use
 ;; based on the executables that now exist.
 (if (and (or (equal (nth 3 command-line-args) "dump")
@@ -257,6 +255,8 @@
 ;; must be among the ones parsed by make-docfile
 ;; to construct DOC.  Any that are not processed
 ;; for DOC will not have doc strings in the dumped Emacs.
+;; Note also that any uncompiled files that are loaded should
+;; have doc-strings that conform to the make-docfile convention.
 
 (message "Finding pointers to doc strings...")
 (if (or (equal (nth 3 command-line-args) "dump")
@@ -327,6 +327,7 @@
        (equal (nth 4 command-line-args) "bootstrap"))
     (setcdr load-path nil))
 
+(setq inhibit-load-charset-map nil)
 (clear-charset-maps)
 (garbage-collect)