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

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

etc/NEWS

@@ -203,6 +203,8 @@ Czech typography rules.  To globally enable this feature, evaluate:
 
 * Editing Changes in Emacs 24.4
 
+** `electric-indent-mode' is enabled by default.
+
 ** Command `rectangle-mark-mode' bound to C-x SPC makes a rectangular region.
 Most commands are still unaware of it, but kill/yank do work on the rectangle.
 

lisp/ChangeLog

+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.

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])

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

src/ChangeLog

+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)

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