HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(diary-file): Doc fix.
[bpt/emacs.git]
/
lisp
/
loadup.el
diff --git
a/lisp/loadup.el
b/lisp/loadup.el
index
af1e4cc
..
b4032e4
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, 2007 Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007
, 2008
Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal
;; Maintainer: FSF
;; Keywords: internal
@@
-62,10
+62,10
@@
(load "widget")
(load "custom")
(load "emacs-lisp/map-ynp")
(load "widget")
(load "custom")
(load "emacs-lisp/map-ynp")
-(load "env")
(load "cus-start")
(load "international/mule")
(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
(load "cus-start")
(load "international/mule")
(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "env")
(load "format")
(load "bindings")
(setq load-source-file-function 'load-with-code-conversion)
(load "format")
(load "bindings")
(setq load-source-file-function 'load-with-code-conversion)
@@
-74,6
+74,9
@@
(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))
@@
-98,10
+101,7
@@
(load "language/chinese")
(load "language/cyrillic")
(load "language/indian")
(load "language/chinese")
(load "language/cyrillic")
(load "language/indian")
-(load "language/devanagari") ; This should be loaded after indian.
-(load "language/malayalam") ; This should be loaded after indian.
-(load "language/tamil") ; This should be loaded after indian.
-(load "language/kannada") ; This should be loaded after indian.
+(load "language/sinhala")
(load "language/english")
(load "language/ethiopic")
(load "language/european")
(load "language/english")
(load "language/ethiopic")
(load "language/european")
@@
-120,6
+120,9
@@
(load "language/misc-lang")
(load "language/utf-8-lang")
(load "language/georgian")
(load "language/misc-lang")
(load "language/utf-8-lang")
(load "language/georgian")
+(load "language/khmer")
+(load "language/burmese")
+(load "language/cham")
(load "indent")
(load "window")
(load "indent")
(load "window")
@@
-146,11
+149,11
@@
(message "%s" (garbage-collect))
(load "menu-bar")
(load "paths.el") ;Don't get confused if someone compiled paths by mistake.
(message "%s" (garbage-collect))
(load "menu-bar")
(load "paths.el") ;Don't get confused if someone compiled paths by mistake.
-(load "startup")
(load "emacs-lisp/lisp")
(load "textmodes/page")
(load "register")
(load "textmodes/paragraphs")
(load "emacs-lisp/lisp")
(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")
@@
-160,7
+163,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)
@@
-172,7
+174,10
@@
(load "mwheel")
(load "tool-bar")))
(if (featurep 'x)
(load "mwheel")
(load "tool-bar")))
(if (featurep 'x)
- (load "x-dnd"))
+ (progn
+ (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)
@@
-180,10
+185,11
@@
(load "vms-patch")))
(if (eq system-type 'windows-nt)
(progn
(load "vms-patch")))
(if (eq system-type 'windows-nt)
(progn
+ (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
@@
-197,6
+203,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")))