diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-03-20 13:14:45 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-03-20 13:14:45 -0400 |
| commit | 494ec1e71d7f725534be9a5518f0a2bdfe35d2c3 (patch) | |
| tree | 119fdfb556c38c5b260d9e8046bc1a0510196ddf /doc/misc/vip.texi | |
| parent | 049fac7c941e4b7afad0471c209dc15193460282 (diff) | |
| download | emacs-494ec1e71d7f725534be9a5518f0a2bdfe35d2c3.tar.gz emacs-494ec1e71d7f725534be9a5518f0a2bdfe35d2c3.tar.bz2 emacs-494ec1e71d7f725534be9a5518f0a2bdfe35d2c3.zip | |
* lisp/electric.el (electric-newline-and-maybe-indent): New command.
Bind it globally to C-j.
(electric-indent-mode): Don't mess with the global map any more.
Don't drop the post-self-insert-hook is some buffer is still using it.
* lisp/bindings.el (global-map): Remove C-j binding.
Fixes: debbugs:16770
Diffstat (limited to 'doc/misc/vip.texi')
| -rw-r--r-- | doc/misc/vip.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 2c888fd1432..07f12fdf882 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi @@ -1568,7 +1568,7 @@ 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 -@kindex 012 @kbd{C-j} (@code{electric-indent-just-newline'} or @code{newline-and-indent}) +@kindex 012 @kbd{C-j} (@code{electric-newline-and-maybe-indent}) Insert a newline, and maybe indent according to mode. @item C-k @kindex 013 @kbd{C-k} (@code{kill-line}) |