* doc/lispref/modes.texi (Auto-Indentation): Mention electric-indent variables.

[bpt/emacs.git] / doc / misc / vip.texi

diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 95f829d..2c888fd 100644 (file)
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1568,9 +1568,8 @@ Set mark and push previous mark on mark ring (@code{set-mark-command}).
 @kindex 011 TAB (@code{indent-for-tab-command})
 Indent line for current major mode (@code{indent-for-tab-command}).
 @item C-j
-@c FIXME: This should be `electric-indent-just-newline' since GNU Emacs 24.4.
-@kindex 012 @kbd{C-j} (@code{newline-and-indent})
-Insert a newline, then indent according to mode (@code{newline-and-indent}).
+@kindex 012 @kbd{C-j} (@code{electric-indent-just-newline'} or @code{newline-and-indent})
+Insert a newline, and maybe indent according to mode.
 @item C-k
 @kindex 013 @kbd{C-k} (@code{kill-line})
 Kill the rest of the current line; before a newline, kill the newline.