3 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e838dd4181..8e4bd8f37e0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * electric.el (electric-indent-mode): Enable by default.
+        * loadup.el: Preload "electric".
+
 2013-11-29  Bozhidar Batsov  <bozhidar@batsov.com>
 
         * emacs-lisp/helpers.el (string-empty-p): New function.
diff --git a/lisp/electric.el b/lisp/electric.el
index 04d0bd3e935..91b99b4bfe7 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -284,6 +284,8 @@ This is a global minor mode.  When enabled, it reindents whenever
 the hook `electric-indent-functions' returns non-nil, or you
 insert a character from `electric-indent-chars'."
   :global t :group 'electricity
+  :initialize 'custom-initialize-delay
+  :init-value t
   (if (not electric-indent-mode)
       (progn
         (when (eq (lookup-key global-map [?\C-j])
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