[Emacs-diffs] trunk r116736: * emacs/indent.texi (Indent Convenience): Mention electric-indent-local-mode.

[Glenn Morris]

------------------------------------------------------------
revno: 116736
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2014-03-11 23:48:20 -0700
message:
  * emacs/indent.texi (Indent Convenience): Mention electric-indent-local-mode.
  
  * lisp/electric.el (electric-indent-mode): Doc fix.
  
  * etc/NEWS: Related markup.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/indent.texi          
indent.texi-20091113204419-o5vbwnq5f7feedwu-6257
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/electric.el               electric.el-20091113204419-o5vbwnq5f7feedwu-47

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2014-03-09 23:55:11 +0000
+++ b/doc/emacs/ChangeLog       2014-03-12 06:48:20 +0000
@@ -1,3 +1,7 @@
+2014-03-12  Glenn Morris  <address@hidden>
+
+       * indent.texi (Indent Convenience): Mention electric-indent-local-mode.
+
 2014-03-02  Xue Fuqiao  <address@hidden>
 
        * mark.texi (Mark):

=== modified file 'doc/emacs/indent.texi'
--- a/doc/emacs/indent.texi     2014-02-27 11:59:35 +0000
+++ b/doc/emacs/indent.texi     2014-03-12 06:48:20 +0000
@@ -251,4 +251,5 @@
   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}.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-03-10 15:49:01 +0000
+++ b/etc/NEWS  2014-03-12 06:48:20 +0000
@@ -359,6 +359,7 @@
 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'.
 
 +++

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-12 04:00:03 +0000
+++ b/lisp/ChangeLog    2014-03-12 06:48:20 +0000
@@ -1,3 +1,7 @@
+2014-03-12  Glenn Morris  <address@hidden>
+
+       * electric.el (electric-indent-mode): Doc fix.
+
 2014-03-12  Juanma Barranquero  <address@hidden>
 
        * vc/pcvs.el (cvs-temp-buffer, defun-cvs-mode, cvs-get-cvsroot)

=== modified file 'lisp/electric.el'
--- a/lisp/electric.el  2014-03-04 04:03:34 +0000
+++ b/lisp/electric.el  2014-03-12 06:48:20 +0000
@@ -294,9 +294,11 @@
 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