Merge from mainline.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 63f7972b700ac8f211f46a01b3e5962ace35585f..85222ce7d9e98daedbda7b79dd3f87029fd2bf92 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, 2009  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -25,15 +25,35 @@
 
 ;; This is loaded into a bare Emacs to make a dumpable one.
 
+;; If you add/remove Lisp files to be loaded here, consider the
+;; following issues:
+
+;; i) Any file loaded on all platforms should appear in $lisp
+;; and $shortlisp in src/Makefile.in.  Use the .el or .elc version as
+;; appropriate.
+
+;; ii) Any file that is only loaded on some platforms should appear
+;; in the version of $lisp in the generated Makefile on that platform.
+;; At the present time, this is achieved by use of #ifdefs.
+;; It should also appear in $SOME_MACHINE_LISP on all platforms.
+
+;; The above steps ensure both that the Lisp files are compiled (if
+;; necessary) before the emacs executable is dumped, and that they are
+;; passed to make-docfile.  (Any that are not processed for DOC will
+;; not have doc strings in the dumped Emacs.)  Because of this:
+
+;; iii) If the file is loaded uncompiled, it should (where possible)
+;; obey the doc-string conventions expected by make-docfile.
+
 ;;; Code:
 
-;; add subdirectories to the load-path for files that might
-;; get autoloaded when bootstrapping
+;; Add subdirectories to the load-path for files that might get
+;; autoloaded when bootstrapping.
 (if (or (equal (nth 3 command-line-args) "bootstrap")
        (equal (nth 4 command-line-args) "bootstrap")
        (equal (nth 3 command-line-args) "unidata-gen.el")
        (equal (nth 4 command-line-args) "unidata-gen-files")
-       ;; in case CANNOT_DUMP
+       ;; In case CANNOT_DUMP.
        (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
     (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
@@ -72,7 +92,7 @@
 (load "emacs-lisp/map-ynp")
 (load "cus-start")
 (load "international/mule")
-(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "international/mule-conf")
 (load "env")
 (load "format")
 (load "bindings")
@@ -105,8 +125,8 @@
 (load "case-table")
 (load "international/characters")
 (load "composite")
-;; This file doesn't exist when building Emacs from CVS.  It is
-;; generated just after temacs is build.
+;; This file doesn't exist when building a development version of Emacs
+;; from the repository.  It is generated just after temacs is built.
 (load "international/charprop.el" t)
 
 ;; Load language-specific files.
@@ -178,6 +198,10 @@
       (load "international/fontset")
       (load "dnd")
       (load "tool-bar")))
+
+(if (or (featurep 'system-font-setting) (featurep 'font-render-setting))
+    (load "font-setting"))
+
 (if (featurep 'x)
     (progn
       (load "x-dnd")
@@ -242,12 +266,6 @@
        (format "%s.%d"
                emacs-version (if versions (1+ (apply 'max versions)) 1)))))
 
-;; Note: all compiled Lisp files loaded above this point
-;; 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")