aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
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 @@
12014-03-12 Glenn Morris <rgm@gnu.org>
2
3 * indent.texi (Indent Convenience): Mention electric-indent-local-mode.
4
12014-03-02 Xue Fuqiao <xfq@gnu.org> 52014-03-02 Xue Fuqiao <xfq@gnu.org>
2 6
3 * mark.texi (Mark): 7 * 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.
251 Electric Indent mode is a global minor mode that automatically 251 Electric Indent mode is a global minor mode that automatically
252indents the line after every @key{RET} you type. This mode is enabled 252indents the line after every @key{RET} you type. This mode is enabled
253by default. To toggle this minor mode, type @kbd{M-x 253by default. To toggle this minor mode, type @kbd{M-x
254electric-indent-mode}. 254electric-indent-mode}. To toggle the mode in a single buffer,
255use @kbd{M-x electric-indent-local-mode}.