HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--rel--22
[bpt/emacs.git]
/
lisp
/
loadup.el
diff --git
a/lisp/loadup.el
b/lisp/loadup.el
index
aa019a8
..
43e7bef
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,
;;; loadup.el --- load up standardly loaded Lisp files for Emacs
;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;; 2004, 2005, 2006 Free Software Foundation, Inc.
+;; 2004, 2005, 2006
, 2007
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-10,7
+10,7
@@
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version
2
, or (at your option)
+;; the Free Software Foundation; either version
3
, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
@@
-69,11
+69,12
@@
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
(setq load-source-file-function 'load-with-code-conversion)
(load "files")
-(load "startup")
-
(load "cus-face")
(load "faces") ; after here, `defface' may be used.
(load "cus-face")
(load "faces") ; after here, `defface' may be used.
+(load "button")
+(load "startup")
+
(message "Lists of integers (garbage collection statistics) are normal output")
(message "while building Emacs; they do not indicate a problem.")
(message "%s" (garbage-collect))
(message "Lists of integers (garbage collection statistics) are normal output")
(message "while building Emacs; they do not indicate a problem.")
(message "%s" (garbage-collect))
@@
-133,7
+134,6
@@
(load "indent")
(load "window")
(load "frame")
(load "indent")
(load "window")
(load "frame")
-(load "termdev")
(load "term/tty-colors")
(load "font-core")
;; facemenu must be loaded before font-lock, because `facemenu-keymap'
(load "term/tty-colors")
(load "font-core")
;; facemenu must be loaded before font-lock, because `facemenu-keymap'
@@
-160,6
+160,7
@@
(load "textmodes/page")
(load "register")
(load "textmodes/paragraphs")
(load "textmodes/page")
(load "register")
(load "textmodes/paragraphs")
+(load "abbrev") ;lisp-mode.el uses define-abbrev-table.
(load "emacs-lisp/lisp-mode")
(load "textmodes/text-mode")
(load "textmodes/fill")
(load "emacs-lisp/lisp-mode")
(load "textmodes/text-mode")
(load "textmodes/fill")
@@
-169,7
+170,6
@@
(if (eq system-type 'vax-vms)
(progn
(load "vmsproc")))
(if (eq system-type 'vax-vms)
(progn
(load "vmsproc")))
-(load "abbrev")
(load "buff-menu")
(if (fboundp 'x-create-frame)
(load "buff-menu")
(if (fboundp 'x-create-frame)
@@
-179,9
+179,12
@@
(load "international/fontset")
(load "dnd")
(load "mwheel")
(load "international/fontset")
(load "dnd")
(load "mwheel")
- (load "tool-bar")
+ (load "tool-bar")))
+(if (featurep 'x)
+ (progn
(load "x-dnd")
(load "term/x-win")))
(load "x-dnd")
(load "term/x-win")))
+
(message "%s" (garbage-collect))
(if (eq system-type 'vax-vms)
(message "%s" (garbage-collect))
(if (eq system-type 'vax-vms)
@@
-189,10
+192,13
@@
(load "vms-patch")))
(if (eq system-type 'windows-nt)
(progn
(load "vms-patch")))
(if (eq system-type 'windows-nt)
(progn
+ (load "international/ccl")
+ (load "international/code-pages")
+ (load "w32-vars")
+ (load "term/w32-win")
(load "ls-lisp")
(load "disp-table") ; needed to setup ibm-pc char set, see internal.el
(load "dos-w32")
(load "ls-lisp")
(load "disp-table") ; needed to setup ibm-pc char set, see internal.el
(load "dos-w32")
- (load "w32-vars")
(load "w32-fns")))
(if (eq system-type 'ms-dos)
(progn
(load "w32-fns")))
(if (eq system-type 'ms-dos)
(progn
@@
-206,6
+212,9
@@
(if (eq system-type 'macos)
(progn
(load "ls-lisp")))
(if (eq system-type 'macos)
(progn
(load "ls-lisp")))
+(if (featurep 'mac-carbon)
+ (progn
+ (load "term/mac-win")))
(if (fboundp 'atan) ; preload some constants and
(progn ; floating pt. functions if we have float support.
(load "emacs-lisp/float-sup")))
(if (fboundp 'atan) ; preload some constants and
(progn ; floating pt. functions if we have float support.
(load "emacs-lisp/float-sup")))