summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-11-29 12:59:38 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2013-11-29 12:59:38 -0500
commitda048127635e94607932eee634b0fc8803c3ebfc (patch)
treeee6f4542a8a973017858179f62830ee57ca2d990 /lisp/loadup.el
parent015b3b3e8ec1330a0bbe3981e7070df8e17c9399 (diff)
downloademacs-da048127635e94607932eee634b0fc8803c3ebfc.tar.gz
* lisp/electric.el (electric-indent-mode): Enable by default.
* lisp/loadup.el: Preload "electric". * src/lisp.mk (lisp): Add electric.elc.
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 d31f02a39ad..aececad804f 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -280,6 +280,7 @@
(load "vc/vc-hooks")
(load "vc/ediff-hook")
+(load "electric")
(if (not (eq system-type 'ms-dos)) (load "tooltip"))
;; This file doesn't exist when building a development version of Emacs