aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorMiles Bader2007-11-11 00:56:44 +0000
committerMiles Bader2007-11-11 00:56:44 +0000
commitf23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch)
treeded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/loadup.el
parente2d092da5980a7d05a5428074f8eb4925fa801e8 (diff)
parenta457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff)
downloademacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz
emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.zip
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36bedfc67ec..12aaae60aab 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -153,6 +153,7 @@
153(load "textmodes/page") 153(load "textmodes/page")
154(load "register") 154(load "register")
155(load "textmodes/paragraphs") 155(load "textmodes/paragraphs")
156(load "abbrev") ;lisp-mode.el uses define-abbrev-table.
156(load "emacs-lisp/lisp-mode") 157(load "emacs-lisp/lisp-mode")
157(load "textmodes/text-mode") 158(load "textmodes/text-mode")
158(load "textmodes/fill") 159(load "textmodes/fill")
@@ -162,7 +163,6 @@
162(if (eq system-type 'vax-vms) 163(if (eq system-type 'vax-vms)
163 (progn 164 (progn
164 (load "vmsproc"))) 165 (load "vmsproc")))
165(load "abbrev")
166(load "buff-menu") 166(load "buff-menu")
167 167
168(if (fboundp 'x-create-frame) 168(if (fboundp 'x-create-frame)