summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-03-11 23:48:20 -0700
committerGlenn Morris <rgm@gnu.org>2014-03-11 23:48:20 -0700
commit8a51e8e417ea4bb54bca9fa1ad49f3806f642180 (patch)
tree78fed86d314c3eca9f6f76660d422e1881b58273 /doc
parent5983b317f4cd4853dd22fc97dd91a1999fc20aba (diff)
downloademacs-8a51e8e417ea4bb54bca9fa1ad49f3806f642180.tar.gz
* emacs/indent.texi (Indent Convenience): Mention electric-indent-local-mode.
* lisp/electric.el (electric-indent-mode): Doc fix. * etc/NEWS: Related markup.
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/indent.texi3
2 files changed, 6 insertions, 1 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}.