diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ldefs-boot-auto.el | 8 | ||||
| -rw-r--r-- | lisp/ldefs-boot-manual.el | 6 | ||||
| -rw-r--r-- | lisp/loadup.el | 122 |
3 files changed, 58 insertions, 78 deletions
diff --git a/lisp/ldefs-boot-auto.el b/lisp/ldefs-boot-auto.el index 66147173d50..020c6707a00 100644 --- a/lisp/ldefs-boot-auto.el +++ b/lisp/ldefs-boot-auto.el @@ -87,14 +87,7 @@ (autoload 'help-xref-button "help-mode" nil nil nil) (autoload 'hi-lock-face-buffer "hi-lock" nil nil nil) (autoload 'html-mode "sgml-mode" nil nil nil) -(autoload 'image-type "image" nil nil nil) -(autoload 'image-type-auto-detected-p "image" nil nil nil) (autoload 'image-type-available-p "image" nil nil nil) -(autoload 'image-type-from-buffer "image" nil nil nil) -(autoload 'image-type-from-data "image" nil nil nil) -(autoload 'image-type-from-file-header "image" nil nil nil) -(autoload 'image-type-from-file-name "image" nil nil nil) -(autoload 'imagemagick-register-types "image" nil nil nil) (autoload 'info "info" nil nil nil) (autoload 'info-complete-symbol "info-look" nil nil nil) (autoload 'info-emacs-manual "info" nil nil nil) @@ -139,7 +132,6 @@ (autoload 'time-to-days "time-date" nil nil nil) (autoload 'timezone-make-date-arpa-standard "timezone" nil nil nil) (autoload 'tmm-menubar "tmm" nil nil nil) -(autoload 'tool-bar-add-item-from-menu "tool-bar" nil nil nil) (autoload 'truncate-string-to-width "mule-util" nil nil nil) (autoload 'ucs-normalize-HFS-NFC-region "ucs-normalize" nil nil nil) (autoload 'ucs-normalize-HFS-NFD-region "ucs-normalize" nil nil nil) diff --git a/lisp/ldefs-boot-manual.el b/lisp/ldefs-boot-manual.el index 2f6e3fd2094..183703d25e8 100644 --- a/lisp/ldefs-boot-manual.el +++ b/lisp/ldefs-boot-manual.el @@ -10,12 +10,6 @@ ;; during the byte-compile phase (defvar electric-pair-text-pairs '((34 . 34))) -;; These two autoloads are needed for files.el. They are only used on -;; their respective platforms so do not get added to -;; ldefs-boot-auto.el when it is generated on a different platform. -(autoload 'dos-convert-standard-filename "dos-fns.el" nil nil nil) -(autoload 'w32-convert-standard-filename "w32-fns.el" nil nil nil) - (load "ldefs-boot-auto.el") diff --git a/lisp/loadup.el b/lisp/loadup.el index 8780ea6edb5..5b19b05a82e 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -230,11 +230,8 @@ (load "jit-lock") (load "mouse") - -(unless (equal (member "bootstrap" command-line-args) '("bootstrap")) - (if (boundp 'x-toolkit-scroll-bars) - (load "scroll-bar"))) - +(if (boundp 'x-toolkit-scroll-bars) + (load "scroll-bar")) (load "select") (load "emacs-lisp/timer") (load "isearch") @@ -256,62 +253,61 @@ (load "emacs-lisp/tabulated-list") (load "buff-menu") -(unless (equal (member "bootstrap" command-line-args) '("bootstrap")) - (if (fboundp 'x-create-frame) - (progn - (load "fringe") - ;; Needed by `imagemagick-register-types' - (load "emacs-lisp/regexp-opt") - (load "image") - (load "international/fontset") - (load "dnd") - (load "tool-bar"))) - - (if (featurep 'dynamic-setting) - (load "dynamic-setting")) - - (if (featurep 'x) - (progn - (load "x-dnd") - (load "term/common-win") - (load "term/x-win"))) - - (if (or (eq system-type 'windows-nt) - (featurep 'w32)) - (progn - (load "term/common-win") - (load "w32-vars") - (load "term/w32-win") - (load "disp-table") - (when (eq system-type 'windows-nt) - (load "w32-fns") - (load "ls-lisp") - (load "dos-w32")))) - (if (eq system-type 'ms-dos) - (progn - (load "dos-w32") - (load "dos-fns") - (load "dos-vars") - ;; Don't load term/common-win: it isn't appropriate for the `pc' - ;; ``window system'', which generally behaves like a terminal. - (load "term/internal") - (load "term/pc-win") +(if (fboundp 'x-create-frame) + (progn + (load "fringe") + ;; Needed by `imagemagick-register-types' + (load "emacs-lisp/regexp-opt") + (load "image") + (load "international/fontset") + (load "dnd") + (load "tool-bar"))) + +(if (featurep 'dynamic-setting) + (load "dynamic-setting")) + +(if (featurep 'x) + (progn + (load "x-dnd") + (load "term/common-win") + (load "term/x-win"))) + +(if (or (eq system-type 'windows-nt) + (featurep 'w32)) + (progn + (load "term/common-win") + (load "w32-vars") + (load "term/w32-win") + (load "disp-table") + (when (eq system-type 'windows-nt) + (load "w32-fns") (load "ls-lisp") - (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el - (if (featurep 'ns) - (progn - (load "term/common-win") - ;; Don't load ucs-normalize.el unless uni-*.el files were - ;; already produced, because it needs uni-*.el files that might - ;; not be built early enough during bootstrap. - (when (load-history-filename-element "charprop\\.el") - (load "international/mule-util") - (load "international/ucs-normalize") - (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"))) + (load "dos-w32")))) +(if (eq system-type 'ms-dos) + (progn + (load "dos-w32") + (load "dos-fns") + (load "dos-vars") + ;; Don't load term/common-win: it isn't appropriate for the `pc' + ;; ``window system'', which generally behaves like a terminal. + (load "term/internal") + (load "term/pc-win") + (load "ls-lisp") + (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el +(if (featurep 'ns) + (progn + (load "term/common-win") + ;; Don't load ucs-normalize.el unless uni-*.el files were + ;; already produced, because it needs uni-*.el files that might + ;; not be built early enough during bootstrap. + (when (load-history-filename-element "charprop\\.el") + (load "international/mule-util") + (load "international/ucs-normalize") + (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")) ;; Preload some constants and floating point functions. (load "emacs-lisp/float-sup") @@ -321,10 +317,8 @@ (load "electric") (load "emacs-lisp/eldoc") (load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway) - -(unless (equal (member "bootstrap" command-line-args) '("bootstrap")) - (if (not (eq system-type 'ms-dos)) - (load "tooltip"))) +(if (not (eq system-type 'ms-dos)) + (load "tooltip")) ;; This file doesn't exist when building a development version of Emacs ;; from the repository. It is generated just after temacs is built. |