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

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 30a26e9..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)
@@ -166,9 +172,6 @@
 (message "%s" (garbage-collect))
 
 (load "replace")
-(if (eq system-type 'vax-vms)
-    (progn
-      (load "vmsproc")))
 (load "buff-menu")
 
 (if (fboundp 'x-create-frame)
@@ -177,45 +180,42 @@
       (load "image")
       (load "international/fontset")
       (load "dnd")
-      (load "mwheel")
       (load "tool-bar")))
 (if (featurep 'x)
     (progn
       (load "x-dnd")
+      (load "term/common-win")
       (load "term/x-win")))
-      
+
 (message "%s" (garbage-collect))
 
-(if (eq system-type 'vax-vms)
-    (progn
-      (load "vms-patch")))
 (if (eq system-type 'windows-nt)
     (progn
       (load "w32-vars")
+      (load "term/common-win")
       (load "term/w32-win")
       (load "ls-lisp")
-      (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
+      (load "disp-table")
       (load "dos-w32")
       (load "w32-fns")))
 (if (eq system-type 'ms-dos)
     (progn
-      (load "ls-lisp")
       (load "dos-w32")
       (load "dos-fns")
       (load "dos-vars")
-      (load "international/ccl")       ; codepage.el uses CCL en/decoder
-      (load "international/codepage")  ; internal.el uses cpNNN coding systems
+      ;; Don't load term/common-win: it isn't appropriate for the `pc'
+      ;; ``window system'', which generally behaves like a terminal.
+      (load "term/pc-win")
+      (load "ls-lisp")
       (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
-(if (eq system-type 'macos)
-    (progn
-      (load "ls-lisp")))
-(if (featurep 'mac-carbon)
-    (progn
-      (load "term/mac-win")))
-(if (featurep 'ns-windowing)
+(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")))
@@ -231,17 +231,11 @@
 ;doc strings kept in the DOC file rather than in core,
 ;you may load them with a "site-load.el" file.
 ;But you must also cause them to be scanned when the DOC file
-;is generated.  For VMS, you must edit ../vms/makedoc.com.
+;is generated.
 ;For other systems, you must edit ../src/Makefile.in.
 (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")
@@ -261,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")
@@ -331,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)
 
@@ -342,11 +339,7 @@
 
 (if (or (member (nth 3 command-line-args) '("dump" "bootstrap"))
        (member (nth 4 command-line-args) '("dump" "bootstrap")))
-    (if (eq system-type 'vax-vms)
-       (progn
-         (message "Dumping data as file temacs.dump")
-         (dump-emacs "temacs.dump" "temacs")
-         (kill-emacs))
+    (progn
       (if (memq system-type '(ms-dos windows-nt cygwin))
           (message "Dumping under the name emacs")
         (message "Dumping under the name emacs"))