Fix ChangeLog typo.

[gnu-emacs] / lisp / loadup.el

diff --git a/lisp/loadup.el b/lisp/loadup.el
index b531fd02b43f9ea58c2d16dd83d411c9f5993631..85222ce7d9e98daedbda7b79dd3f87029fd2bf92 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, 2004, 2005,
-;;   2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -92,7 +92,7 @@
 (load "emacs-lisp/map-ynp")
 (load "cus-start")
 (load "international/mule")
-(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "international/mule-conf")
 (load "env")
 (load "format")
 (load "bindings")
@@ -125,8 +125,8 @@
 (load "case-table")
 (load "international/characters")
 (load "composite")
-;; This file doesn't exist when building Emacs from CVS.  It is
-;; generated just after temacs is build.
+;; This file doesn't exist when building a development version of Emacs
+;; from the repository.  It is generated just after temacs is built.
 (load "international/charprop.el" t)
 
 ;; Load language-specific files.
@@ -198,6 +198,10 @@
       (load "international/fontset")
       (load "dnd")
       (load "tool-bar")))
+
+(if (or (featurep 'system-font-setting) (featurep 'font-render-setting))
+    (load "font-setting"))
+
 (if (featurep 'x)
     (progn
       (load "x-dnd")