diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-03-18 17:14:36 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-03-18 17:14:36 -0400 |
| commit | 5fb6db0d69041c043055021ecdb84c803ac9e053 (patch) | |
| tree | 1cb65dab31c962a1a4219e5e29c8a53dbab78cf4 /doc/misc/vip.texi | |
| parent | f6985e81564c91e84a998858f9446139e64405cf (diff) | |
| download | emacs-5fb6db0d69041c043055021ecdb84c803ac9e053.tar.gz | |
* doc/lispref/modes.texi (Auto-Indentation): Mention electric-indent variables.
* doc/misc/cc-mode.texi (Indentation Commands): Remove C-j, since it's not
defined by CC-mode but globally.
(FAQ): Tweak text about RET and auto-indentation.
* doc/misc/vip.texi (Other Vi Commands): Adjust doc of C-j.
Diffstat (limited to 'doc/misc/vip.texi')
| -rw-r--r-- | doc/misc/vip.texi | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 95f829d14ed..2c888fd1432 100644 --- 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. |