From da048127635e94607932eee634b0fc8803c3ebfc Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 29 Nov 2013 12:59:38 -0500 Subject: [PATCH] * lisp/electric.el (electric-indent-mode): Enable by default. * lisp/loadup.el: Preload "electric". * src/lisp.mk (lisp): Add electric.elc. --- etc/NEWS | 2 ++ lisp/ChangeLog | 5 +++++ lisp/electric.el | 2 ++ lisp/loadup.el | 1 + src/ChangeLog | 6 ++++++ src/lisp.mk | 1 + 6 files changed, 17 insertions(+) diff --git a/etc/NEWS b/etc/NEWS index 2f9f84d811..febc367c6d 100644 --- a/etc/NEWS +++ b/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. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4e838dd418..8e4bd8f37e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-11-29 Stefan Monnier + + * electric.el (electric-indent-mode): Enable by default. + * loadup.el: Preload "electric". + 2013-11-29 Bozhidar Batsov * emacs-lisp/helpers.el (string-empty-p): New function. diff --git a/lisp/electric.el b/lisp/electric.el index 04d0bd3e93..91b99b4bfe 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 d31f02a39a..aececad804 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 diff --git a/src/ChangeLog b/src/ChangeLog index 668bba1e4e..1fa027b1f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-11-29 Stefan Monnier + + * lisp.mk (lisp): Add electric.elc. + 2013-11-29 Tom Seddon (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 + * 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 c12deebd89..72ada45c5e 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 -- 2.20.1