(makefile-font-lock-keywords): Catch variable

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

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 1912fe6..f4da8db 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -18,8 +18,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -33,6 +34,10 @@
 (buffer-disable-undo "*scratch*")
 
 (load "subr")
+
+;; We specify .el in case someone compiled version.el by mistake.
+(load "version.el")
+
 (garbage-collect)
 (load "byte-run")
 (garbage-collect)
@@ -46,21 +51,30 @@
 (garbage-collect)
 (load "files")
 (garbage-collect)
+(load "format")
+(garbage-collect)
 (load "indent")
 (garbage-collect)
-(load "window")
+(load "isearch")
 (garbage-collect)
+(load "window")
 (if (fboundp 'delete-frame)
     (progn
-      (load "frame")
-      (load "mouse")
+      (garbage-collect)
+      (load "frame")))
+(if (fboundp 'frame-face-alist)
+    (progn
       (garbage-collect)
       (load "faces")
-      (load "facemenu")
+      (load "facemenu")))
+(if (fboundp 'track-mouse)
+    (progn
+      (garbage-collect)
+      (load "mouse")
       (garbage-collect)
-      (load "menu-bar")
       (load "scroll-bar")
       (load "select")))
+(load "menu-bar")
 (garbage-collect)
 (load "paths.el")  ;Don't get confused if someone compiled paths by mistake.
 (garbage-collect)
@@ -80,10 +94,6 @@
 (garbage-collect)
 (load "fill")
 (garbage-collect)
-(load "c-mode")
-(garbage-collect)
-(load "isearch")
-(garbage-collect)
 (load "replace")
 (if (eq system-type 'vax-vms)
     (progn
@@ -101,7 +111,11 @@
     (progn
       (garbage-collect)
       (load "ls-lisp")
-      (load "winnt")))
+      (garbage-collect)
+      (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
+      (garbage-collect)
+      (load "winnt")
+      (garbage-collect)))
 (if (eq system-type 'ms-dos)
     (progn
       (load "ls-lisp")
@@ -109,13 +123,7 @@
       (load "dos-fns")
       (garbage-collect)
       (load "disp-table") ; needed to setup ibm-pc char set, see internal.el
-      (garbage-collect)
-      (if (not (fboundp 'delete-frame))
-         (progn
-           (load "mouse")
-           (garbage-collect)
-           (load "faces")
-           (garbage-collect)))))
+      (garbage-collect)))
 (if (fboundp 'atan)    ; preload some constants and 
     (progn             ; floating pt. functions if 
       (garbage-collect)        ; we have float support.
@@ -123,28 +131,32 @@
 
 (garbage-collect)
 (load "vc-hooks")
-
-;; We specify .el in case someone compiled version.el by mistake.
-(load "version.el")
+(load "ediff-hook")
 
 ;If you want additional libraries to be preloaded and their
 ;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.
-;For other systems, you must edit ../src/Makefile.in.in.
+;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")
             (equal (nth 4 command-line-args) "dump"))
         (not (eq system-type 'ms-dos)))
-    (let* ((base (concat "emacs-" emacs-version))
+    (let* ((base (concat "emacs-" emacs-version "."))
           (files (file-name-all-completions base default-directory))
           (versions (mapcar (function (lambda (name)
-                                        (string-to-int (substring name (1+ (length base))))))
+                                        (string-to-int (substring name (length base)))))
                             files)))
       (setq emacs-version (format "%s.%d"
                                  emacs-version
@@ -167,7 +179,7 @@
                           (substring name (match-end 0)))))
       (if (memq system-type '(ms-dos windows-nt))
          (setq name (expand-file-name
-                     (if (fboundp 'make-frame) "DOC-X" "DOC") "../etc"))
+                     (if (fboundp 'x-create-frame) "DOC-X" "DOC") "../etc"))
        (setq name (concat (expand-file-name "../etc/DOC-") name))
        (if (file-exists-p name)
            (delete-file name))
@@ -211,7 +223,7 @@
       (dump-emacs "emacs" "temacs")
       (message "%d pure bytes used" pure-bytes-used)
       ;; Recompute NAME now, so that it isn't set when we dump.
-      (if (not (eq system-type 'ms-dos))
+      (if (not (memq system-type '(ms-dos windows-nt)))
          (let ((name (concat "emacs-" emacs-version)))
            (while (string-match "[^-+_.a-zA-Z0-9]+" name)
              (setq name (concat (downcase (substring name 0 (match-beginning 0)))