* lisp/electric.el (electric-indent-mode): Enable by default.

* lisp/loadup.el: Preload "electric".
* src/lisp.mk (lisp): Add electric.elc.

2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 668bba1e4ed..1fa027b1f5a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * lisp.mk (lisp): Add electric.elc.
+
 2013-11-29  Tom Seddon  <emacs@tomseddon.plus.com>  (tiny change)
 
         * w32font.c (g_b_init_get_char_width_32_w): New static var.
@@ -9,6 +13,8 @@
         punishing raster (a.k.a. "bitmap") fonts by slowing down
         redisplay.  (Bug#6364).
 
+2013-11-29  Eli Zaretskii  <eliz@gnu.org>
+
         * xdisp.c (clear_mouse_face): Don't invalidate the entire
         mouse-highlight info, just signal frame_up_to_date_hook that mouse
         highlight needs to be redisplayed.  (Bug#15913)
diff --git a/src/lisp.mk b/src/lisp.mk
index c12deebd893..72ada45c5e4 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -164,6 +164,7 @@ lisp = \
         $(lispsource)/emacs-lisp/float-sup.elc \
         $(lispsource)/vc/vc-hooks.elc \
         $(lispsource)/vc/ediff-hook.elc \
+        $(lispsource)/electric.elc \
         $(lispsource)/tooltip.elc