Tiny doc/misc edits

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

diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 28e78f5..25605aa 100644 (file)
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -2,8 +2,10 @@
 @setfilename ../../info/vip
 @settitle VIP
 
+@documentencoding UTF-8
+
 @copying
-Copyright @copyright{} 1987, 2001--2013 Free Software Foundation, Inc.
+Copyright @copyright{} 1987, 2001--2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -163,7 +165,7 @@ directory and it will be executed every time you invoke Emacs.  If you wish
 to be in vi mode whenever Emacs starts up, you can include the following
 line in your @file{.emacs} file instead of the above line:
 @example
-(setq term-setup-hook 'vip-mode)
+(add-hook 'emacs-startup-hook 'vip-mode)
 @end example
 @noindent
 (@xref{Vi Mode}, for the explanation of vi mode.)
@@ -567,7 +569,7 @@ in the current window, while @kbd{S} selects buffer in another window.
 @kindex 1300 @kbd{X} (@code{vip-ctl-x-equivalent})
 These keys will exit from vi mode and return to emacs mode temporarily.
 If you type @kbd{C} (@kbd{X}), Emacs will be in emacs mode and will believe
-that you have typed @kbd{C-c} (@kbd{C-x}, resp.) in emacs mode. Moreover,
+that you have typed @kbd{C-c} (@kbd{C-x}) in emacs mode. Moreover,
 if the following character you type is an upper-case letter, then Emacs
 will believe that you have typed the corresponding control character.
 You will be in vi mode again after the command is executed.  For example,
@@ -1566,8 +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
-@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-newline-and-maybe-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.
@@ -1861,7 +1863,7 @@ The following Ex commands are available in Vi, but not implemented in VIP.
 @node Customization
 @chapter Customization
 
-If you have a file called @file{.vip} in your home directory, then it
+If you have a file called @file{~/.emacs.d/vip} (or @file{~/.vip}), then it
 will also be loaded when VIP is loaded.  This file is thus useful for
 customizing VIP.
 
@@ -1901,7 +1903,7 @@ if @code{nil} then it sis bound to @code{delete-backward-char}.
 @end table
 @noindent
 You can reset these constants in VIP by the Ex command @kbd{set}.  Or you
-can include a line like this in your @file{.vip} file:
+can include a line like this in your @file{~/.emacs.d/vip} file:
 @example
 (setq vip-case-fold-search t)
 @end example
@@ -1914,8 +1916,8 @@ can include a line like this in your @file{.vip} file:
 VIP uses @code{vip-command-mode-map} as the @dfn{local keymap} for vi mode.
 For example, in vi mode, @key{SPC} is bound to the function
 @code{vip-scroll}.  But, if you wish to make @key{SPC} and some other keys
- behave like Vi, you can include the following lines in your @file{.vip}
-file.
+ behave like Vi, you can include the following lines in your
+@file{~/.emacs.d/vip} file.
 
 @example
 (define-key vip-command-mode-map "\C-g" 'vip-info-on-file)