diff options
| -rw-r--r-- | doc/emacs/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/emacs/indent.texi | 3 | ||||
| -rw-r--r-- | etc/NEWS | 1 | ||||
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/electric.el | 8 |
5 files changed, 16 insertions, 4 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 02bdbe65cd5..0130d03b5ca 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2014-03-12 Glenn Morris <rgm@gnu.org> + + * indent.texi (Indent Convenience): Mention electric-indent-local-mode. + 2014-03-02 Xue Fuqiao <xfq@gnu.org> * mark.texi (Mark): diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 78e2e925e41..4b44b9289b5 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi @@ -251,4 +251,5 @@ indentation; otherwise, it inserts a tab character. Electric Indent mode is a global minor mode that automatically indents the line after every @key{RET} you type. This mode is enabled by default. To toggle this minor mode, type @kbd{M-x -electric-indent-mode}. +electric-indent-mode}. To toggle the mode in a single buffer, +use @kbd{M-x electric-indent-local-mode}. @@ -359,6 +359,7 @@ means to always load the .elc file. E.g., typing RET reindents the current line and indents the new line. `C-j' inserts a newline but does not indent. ++++ *** New buffer-local `electric-indent-local-mode'. +++ diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ed8a4b7e25..9d99bdecd38 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-03-12 Glenn Morris <rgm@gnu.org> + + * electric.el (electric-indent-mode): Doc fix. + 2014-03-12 Juanma Barranquero <lekktu@gmail.com> * vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot) diff --git a/lisp/electric.el b/lisp/electric.el index 3e19d9b23b1..7debe0b7f98 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -294,9 +294,11 @@ With a prefix argument ARG, enable Electric Indent mode if ARG is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -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'." +When enabled, this reindents whenever the hook `electric-indent-functions' +returns non-nil, or if you insert a character from `electric-indent-chars'. + +This is a global minor mode. To toggle the mode in a single buffer, +use `electric-indent-local-mode'." :global t :group 'electricity :initialize 'custom-initialize-delay :init-value t |