* doc/emacs/programs.texi (Misc for Programs): Mention electric-layout-mode.

2 files changed, 12 insertions, 2 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ebed400fd6c..3c4ee4181e4 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,7 +1,11 @@
+2012-02-10  Glenn Morris  <rgm@gnu.org>
+
+        * programs.texi (Misc for Programs): Mention electric-layout-mode.
+
 2012-02-09  Glenn Morris  <rgm@gnu.org>
 
-        * buffers.texi (Misc Buffer): M-x info does not seem to require a buffer
-        switch after M-x rename-uniquely.
+        * buffers.texi (Misc Buffer): M-x info does not seem to require a
+        buffer switch after M-x rename-uniquely.
 
         * trouble.texi (Checklist): Mention C-c m in report-emacs-bug.
 
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 8ba9b78603a..346e2fff5ff 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1415,6 +1415,12 @@ paragraph commands to work on.  Auto Fill mode, if enabled in a
 programming language major mode, indents the new lines which it
 creates.
 
+@findex electric-layout-mode
+  Electric Layout mode (@kbd{M-x electric-layout-mode}) is a global
+minor mode that automatically inserts newlines when you type certain
+characters; for example, @samp{@{}, @samp{@}} and @samp{;} in Javascript
+mode.
+
   Apart from Hideshow mode (@pxref{Hideshow}), another way to
 selectively display parts of a program is to use the selective display
 feature (@pxref{Selective Display}).  Programming modes often also