X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/87e7795ecea5c89342917bb3de23995a49742195..c0466914ba3ad88c402b0301646b4b5db8aeb913:/lisp/loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 9767c33d61..affaf03b92 100644
--- 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 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -83,12 +83,13 @@
 
 (load "help")
 
+(load "jka-cmpr-hook")
 ;; Any Emacs Lisp source file (*.el) loaded here after can contain
 ;; multilingual text.
 (load "international/mule-cmds")
 (load "case-table")
-(load "composite")
 (load "international/characters")
+(load "composite")
 ;; This file doesn't exist when building Emacs from CVS.  It is
 ;; generated just after temacs is build.
 (load "international/charprop.el" t)
@@ -163,6 +164,7 @@
 
 (if (fboundp 'x-create-frame)
     (progn
+      (load "fringe")
       (load "image")
       (load "international/fontset")
       (load "dnd")
@@ -200,7 +202,6 @@
 (message "%s" (garbage-collect))
 
 (load "vc-hooks")
-(load "jka-cmpr-hook")
 (load "ediff-hook")
 (if (fboundp 'x-show-tip) (load "tooltip"))