updated for version 7.0230
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 9ebce3c..a0ea100 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -161,7 +161,6 @@
gui_x11.html \
hangulin.html \
hebrew.html \
- help.html \
howto.html \
if_cscop.html \
if_mzsch.html \
@@ -173,6 +172,7 @@
if_tcl.html \
indent.html \
index.html \
+ vimindex.html \
insert.html \
intro.html \
map.html \
@@ -327,6 +327,14 @@
.txt.html:
$(AWK) -f makehtml.awk $< >$@
+# index.html is the starting point for HTML, but for the help files it is
+# help.txt. Therefore use vimindex.html for index.txt.
+index.html: help.txt
+ $(AWK) -f makehtml.awk help.txt >index.html
+
+vimindex.html: index.txt
+ $(AWK) -f makehtml.awk index.txt >vimindex.html
+
tags.ref tags.html: tags
$(AWK) -f maketags.awk tags >tags.html
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index b3b0dd9..f79f84e 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt* For Vim version 7.0aa. Last change: 2006 Feb 27
+*gui.txt* For Vim version 7.0aa. Last change: 2006 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -499,6 +499,8 @@
*:nme* *:nmenu* *:nnoreme* *:nnoremenu*
*:ome* *:omenu* *:onoreme* *:onoremenu*
*:vme* *:vmenu* *:vnoreme* *:vnoremenu*
+ *:xme* *:xmenu* *:xnoreme* *:xnoremenu*
+ *:sme* *:smenu* *:snoreme* *:snoremenu*
*:ime* *:imenu* *:inoreme* *:inoremenu*
*:cme* *:cmenu* *:cnoreme* *:cnoremenu*
*E330* *E327* *E331* *E336* *E333*
@@ -787,6 +789,8 @@
*:nunme* *:nunmenu*
*:ounme* *:ounmenu*
*:vunme* *:vunmenu*
+ *:xunme* *:xunmenu*
+ *:sunme* *:sunmenu*
*:iunme* *:iunmenu*
*:cunme* *:cunmenu*
To delete a menu item or a whole submenu, use the unmenu commands, which are
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 5a2bdb8..9ffde22 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1,4 +1,4 @@
-*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 16
+*index.txt* For Vim version 7.0aa. Last change: 2006 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1413,10 +1413,15 @@
|:slast| :sla[st] split window and go to last file in the
argument list
|:smagic| :sm[agic] :substitute with 'magic'
+|:smap| :sma[p] like ":map" but for Select mode
+|:smapclear| :smapc[lear] remove all mappings for Select mode
+|:smenu| :sme[nu] add menu for Select mode
|:snext| :sn[ext] split window and go to next file in the
argument list
|:sniff| :sni[ff] send request to sniff
|:snomagic| :sno[magic] :substitute with 'nomagic'
+|:snoremap| :snor[emap] like ":noremap" but for Select mode
+|:snoremenu| :snoreme[nu] like ":noremenu" but for Select mode
|:sort| :sor[t] sort lines
|:source| :so[urce] read Vim or Ex commands from a file
|:spelldump| :spelld[ump] split window and fill with all correct words
@@ -1439,6 +1444,8 @@
|:stjump| :stj[ump] do ":tjump" and split window
|:stselect| :sts[elect] do ":tselect" and split window
|:sunhide| :sun[hide] same as ":unhide"
+|:sunmap| :sunm[ap] like ":unmap" but for Select mode
+|:sunmenu| :sunme[nu] remove menu for Select mode
|:suspend| :sus[pend] same as ":stop"
|:sview| :sv[iew] split window and edit file read-only
|:swapname| :sw[apname] show the name of the current swap file
@@ -1500,15 +1507,15 @@
|:visual| :vi[sual] same as ":edit", but turns off "Ex" mode
|:viusage| :viu[sage] overview of Normal mode commands
|:view| :vie[w] edit a file read-only
-|:vmap| :vm[ap] like ":map" but for Visual mode
-|:vmapclear| :vmapc[lear] remove all mappings for Visual mode
-|:vmenu| :vme[nu] add menu for Visual mode
-|:vnoremap| :vn[oremap] like ":noremap" but for Visual mode
+|:vmap| :vm[ap] like ":map" but for Visual+Select mode
+|:vmapclear| :vmapc[lear] remove all mappings for Visual+Select mode
+|:vmenu| :vme[nu] add menu for Visual+Select mode
|:vnew| :vne[w] create a new empty window, vertically split
-|:vnoremenu| :vnoreme[nu] like ":noremenu" but for Visual mode
+|:vnoremap| :vn[oremap] like ":noremap" but for Visual+Select mode
+|:vnoremenu| :vnoreme[nu] like ":noremenu" but for Visual+Select mode
|:vsplit| :vs[plit] split current window vertically
-|:vunmap| :vu[nmap] like ":unmap" but for Visual mode
-|:vunmenu| :vunme[nu] remove menu for Visual mode
+|:vunmap| :vu[nmap] like ":unmap" but for Visual+Select mode
+|:vunmenu| :vunme[nu] remove menu for Visual+Select mode
|:windo| :windo execute command in each window
|:write| :w[rite] write to a file
|:wNext| :wN[ext] write to a file and go to previous file in
@@ -1528,8 +1535,16 @@
|:wviminfo| :wv[iminfo] write to viminfo file
|:xit| :x[it] write if buffer changed and quit window or Vim
|:xall| :xa[ll] same as ":wqall"
+|:xmapclear| :xmapc[lear] remove all mappings for Visual mode
+|:xmap| :xm[ap] like ":map" but for Visual mode
+|:xmenu| :xme[nu] add menu for Visual mode
+|:xnoremap| :xn[oremap] like ":noremap" but for Visual mode
+|:xnoremenu| :xnoreme[nu] like ":noremenu" but for Visual mode
+|:xunmap| :xu[nmap] like ":unmap" but for Visual mode
+|:xunmenu| :xunme[nu] remove menu for Visual mode
|:yank| :y[ank] yank lines into a register
|:z| :z print some lines
|:~| :~ repeat last ":substitute"
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index f1e0868..defc308 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.0aa. Last change: 2006 Mar 11
+*map.txt* For Vim version 7.0aa. Last change: 2006 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -48,6 +48,8 @@
:map {lhs} {rhs} |mapmode-nvo| *:map*
:nm[ap] {lhs} {rhs} |mapmode-n| *:nm* *:nmap*
:vm[ap] {lhs} {rhs} |mapmode-v| *:vm* *:vmap*
+:xm[ap] {lhs} {rhs} |mapmode-x| *:xm* *:xmap*
+:smap {lhs} {rhs} |mapmode-s| *:smap*
:om[ap] {lhs} {rhs} |mapmode-o| *:om* *:omap*
:map! {lhs} {rhs} |mapmode-ic| *:map!*
:im[ap] {lhs} {rhs} |mapmode-i| *:im* *:imap*
@@ -62,6 +64,8 @@
:no[remap] {lhs} {rhs} |mapmode-nvo| *:no* *:noremap*
:nn[oremap] {lhs} {rhs} |mapmode-n| *:nn* *:nnoremap*
:vn[oremap] {lhs} {rhs} |mapmode-v| *:vn* *:vnoremap*
+:xn[oremap] {lhs} {rhs} |mapmode-x| *:xn* *:xnoremap*
+:snor[emap] {lhs} {rhs} |mapmode-s| *:snor* *:snoremap*
:ono[remap] {lhs} {rhs} |mapmode-o| *:ono* *:onoremap*
:no[remap]! {lhs} {rhs} |mapmode-ic| *:no!* *:noremap!*
:ino[remap] {lhs} {rhs} |mapmode-i| *:ino* *:inoremap*
@@ -76,6 +80,8 @@
:unm[ap] {lhs} |mapmode-nvo| *:unm* *:unmap*
:nun[map] {lhs} |mapmode-n| *:nun* *:nunmap*
:vu[nmap] {lhs} |mapmode-v| *:vu* *:vunmap*
+:xu[nmap] {lhs} |mapmode-x| *:xu* *:xunmap*
+:sunm[ap] {lhs} |mapmode-s| *:sunm* *:sunmap*
:ou[nmap] {lhs} |mapmode-o| *:ou* *:ounmap*
:unm[ap]! {lhs} |mapmode-ic| *:unm!* *:unmap!*
:iu[nmap] {lhs} |mapmode-i| *:iu* *:iunmap*
@@ -92,6 +98,8 @@
:mapc[lear] |mapmode-nvo| *:mapc* *:mapclear*
:nmapc[lear] |mapmode-n| *:nmapc* *:nmapclear*
:vmapc[lear] |mapmode-v| *:vmapc* *:vmapclear*
+:xmapc[lear] |mapmode-x| *:xmapc* *:xmapclear*
+:smapc[lear] |mapmode-s| *:smapc* *:smapclear*
:omapc[lear] |mapmode-o| *:omapc* *:omapclear*
:mapc[lear]! |mapmode-ic| *:mapc!* *:mapclear!*
:imapc[lear] |mapmode-i| *:imapc* *:imapclear*
@@ -104,6 +112,8 @@
:map |mapmode-nvo|
:nm[ap] |mapmode-n|
:vm[ap] |mapmode-v|
+:xm[ap] |mapmode-x|
+:sm[ap] |mapmode-s|
:om[ap] |mapmode-o|
:map! |mapmode-ic|
:im[ap] |mapmode-i|
@@ -116,6 +126,8 @@
:map {lhs} |mapmode-nvo| *:map_l*
:nm[ap] {lhs} |mapmode-n| *:nmap_l*
:vm[ap] {lhs} |mapmode-v| *:vmap_l*
+:xm[ap] {lhs} |mapmode-x| *:xmap_l*
+:sm[ap] {lhs} |mapmode-s| *:smap_l*
:om[ap] {lhs} |mapmode-o| *:omap_l*
:map! {lhs} |mapmode-ic| *:map_l!*
:im[ap] {lhs} |mapmode-i| *:imap_l*
@@ -238,9 +250,6 @@
- For Insert mode. These are also used in Replace mode.
- For Command-line mode: When entering a ":" or "/" command.
-There are no separate mappings for Select mode. The same as for Visual mode
-are used |Select-mode-mapping|.
-
Special case: While typing a count for a command in Normal mode, mapping zero
is disabled. This makes it possible to map zero without making it impossible
to type a count with a zero.
@@ -250,13 +259,27 @@
*mapmode-nvo* *mapmode-n* *mapmode-v* *mapmode-o*
commands: modes: ~
- Normal Visual Operator-pending ~
-:map :noremap :unmap :mapclear yes yes yes
-:nmap :nnoremap :nunmap :nmapclear yes - -
-:vmap :vnoremap :vunmap :vmapclear - yes -
-:omap :onoremap :ounmap :omapclear - - yes
+ Normal Visual+Select Operator-pending ~
+:map :noremap :unmap :mapclear yes yes yes
+:nmap :nnoremap :nunmap :nmapclear yes - -
+:vmap :vnoremap :vunmap :vmapclear - yes -
+:omap :onoremap :ounmap :omapclear - - yes
+
+ *mapmode-x* *mapmode-s*
+Some commands work both in Visual and Select mode, some in only one. Note
+that quite often "Visual" is mentioned where both Visual and Select mode
+apply. |Select-mode-mapping|
+
+ commands: modes: ~
+ Visual Select ~
+:vmap :vnoremap :vunmap :vmapclear yes yes
+:xmap :xnoremap :xunmap :xmapclear yes -
+:smap :snoremap :sunmap :smapclear - yes
*mapmode-ic* *mapmode-i* *mapmode-c* *mapmode-l*
+Some commands work both in Insert mode and Command-line mode, some not:
+
+ commands: modes: ~
Insert Command-line Lang-Arg ~
:map! :noremap! :unmap! :mapclear! yes yes -
:imap :inoremap :iunmap :imapclear yes - -
@@ -1218,8 +1241,9 @@
The replacement text for a user defined command is scanned for special escape
sequences, using <...> notation. Escape sequences are replaced with values
from the entered command line, and all other text is copied unchanged. The
-resulting string is executed as an Ex command. If the initial < of an escape
-sequence is preceded by a backslash, the sequence is copied unchanged.
+resulting string is executed as an Ex command. To avoid the replacement use
+<lt> in plade of the initial <. Thus to include "<bang>" literally use
+"<lt>bang>".
The valid escape sequences are
diff --git a/runtime/doc/netbeans.txt b/runtime/doc/netbeans.txt
index 9d851cc..789fbbc 100644
--- a/runtime/doc/netbeans.txt
+++ b/runtime/doc/netbeans.txt
@@ -194,7 +194,7 @@
*E658*
NetBeans connection lost for this buffer
NetBeans has become confused about the state of this file.
- Rather than risc data corruption, NetBeans has severed the
+ Rather than risk data corruption, NetBeans has severed the
connection for this file. Vim will take over responsibility
for saving changes to this file and NetBeans will no longer
know of these changes.
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 1ff70ac..f9688ab 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -1,4 +1,4 @@
-*visual.txt* For Vim version 7.0aa. Last change: 2006 Jan 22
+*visual.txt* For Vim version 7.0aa. Last change: 2006 Mar 20
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -460,9 +460,10 @@
Mappings and menus in Select mode. *Select-mode-mapping*
-In Select mode the mappings and menus of Visual mode are used. Before it is
-executed, Vim automatically switches to Visual mode, so that the same
-behavior as in Visual mode is effective.
+When mappings and menus are defined with the |:vmap| or |:vmenu| command they
+work both in Visual mode and in Select mode. When these are used in Select
+mode Vim automatically switches to Visual mode, so that the same behavior as
+in Visual mode is effective. If you don't want this use |:xmap| or |:smap|.
After the mapping or menu finishes, the selection is enabled again and Select
mode entered, unless the selected area was deleted, another buffer became