summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-02-21 15:57:00 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-02-21 15:57:00 +0000
commit36b98f827848d2b1ece6aee7a372902e78120e98 (patch)
tree51d7af230b08c05b1733c11b89d27aadd3b8dda1 /lisp/loadup.el
parent0383bfd7963905724df93bed01ddeb3b7064222e (diff)
parent8ea094cffae04a654ddb76700fa86fa7e8d03eef (diff)
downloademacs-36b98f827848d2b1ece6aee7a372902e78120e98.tar.gz
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-105 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-106 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-107 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-108 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-109 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-110 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-37 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-516
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 44b048eee67..4cee6fd656a 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -173,6 +173,7 @@
(if (fboundp 'x-create-frame)
(progn
+ (load "fringe")
(load "image")
(load "international/fontset")
(load "dnd")