* emacs/indent.texi (Indent Convenience): Mention electric-indent-local-mode.

* lisp/electric.el (electric-indent-mode): Doc fix.

* etc/NEWS: Related markup.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 02bdbe65cd591cbd48aea34920e6ade98e63142d..0130d03b5caa31cf2922923ead187bbfcab17189 100644 (file)
--- 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 78e2e925e410b94e312f11d56f91d5ee2bcaf49c..4b44b9289b5093cba42027bbd74e4c015100c267 100644 (file)
--- 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}.

diff --git a/etc/NEWS b/etc/NEWS
index 2127fc4d97e9b997b4ca9bcbcaad17fb4e9d8410..910c838570605ca48bc8b0a3c0923c4899bb07fd 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -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 6ed8a4b7e252d78d4b8e880790610a59ae043095..9d99bdecd38b5ea125cc4eef7d324a0e10864aa5 100644 (file)
--- 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 3e19d9b23b1ce4b7a559176b0bca296843821d9d..7debe0b7f98faed676a4bffefaa2295c071e4c84 100644 (file)
--- 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