updated for version 7.0c10
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 6932e81..317518d 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.0c. Last change: 2006 Mar 15
+*autocmd.txt* For Vim version 7.0c. Last change: 2006 Apr 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -510,6 +510,10 @@
just before the change is applied to the text.
WARNING: If the autocommand moves the cursor
the effect of the change is undefined.
+ *E788*
+ It is not allowed to change to another buffer
+ here. You can reload the buffer but not edit
+ another one.
*FileChangedShell*
FileChangedShell When Vim notices that the modification time of
a file has changed since editing started.
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 3df513e..21b2f3a 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -1,4 +1,4 @@
-*diff.txt* For Vim version 7.0c. Last change: 2006 Mar 15
+*diff.txt* For Vim version 7.0c. Last change: 2006 Apr 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -272,6 +272,10 @@
Note that deleted lines are displayed, but not counted as text lines. You
can't move the cursor into them. To fill the deleted lines with the lines
from another buffer use ":diffget" on the line below them.
+ *E787*
+When the buffer that is about to be modified is read-only and the autocommand
+that is triggered by |FileChangedRO| changes buffers the command will fail.
+The autocommand must not change buffers.
The [bufspec] argument above can be a buffer number, a pattern for a buffer
name or a part of a buffer name. Examples:
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 7a67a69..eecdd86 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -1,4 +1,4 @@
-*editing.txt* For Vim version 7.0c. Last change: 2006 Mar 06
+*editing.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -422,14 +422,18 @@
The [++opt] argument can be used to force the value of 'fileformat',
'fileencoding' or 'binary' to a value for one command, and to specify the
behavior for bad characters. The form is: >
+ ++{optname}
+Or: >
++{optname}={value}
-Where {optname} is one of: *++ff* *++enc* *++bin* *++nobin*
+Where {optname} is one of: *++ff* *++enc* *++bin* *++nobin* *++edit*
ff or fileformat overrides 'fileformat'
enc or encoding overrides 'fileencoding'
bin or binary sets 'binary'
nobin or nobinary resets 'binary'
bad specifies behavior for bad characters
+ edit for |:read| only: keep option values as if editing
+ a file
{value} cannot contain white space. It can be any valid value for these
options. Examples: >
@@ -897,6 +901,7 @@
The [!] is needed to overwrite an existing file.
When 'filetype' is empty filetype detection is done
with the new name, before the file is written.
+ When the write was successful 'readonly' is reset.
{not in Vi}
*:up* *:update*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 81463b4..b830ca0 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*eval.txt* For Vim version 7.0c. Last change: 2006 Apr 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -110,8 +110,8 @@
:let Fn = function("MyFunc")
:echo Fn()
< *E704* *E705* *E707*
-A Funcref variable must start with a capital, "s:", "w:" or "b:". You cannot
-have both a Funcref variable and a function with the same name.
+A Funcref variable must start with a capital, "s:", "w:", "t:" or "b:". You
+cannot have both a Funcref variable and a function with the same name.
A special case is defining a function and directly assigning its Funcref to a
Dictionary entry. Example: >
@@ -504,7 +504,7 @@
It is also possible to add a function without the "dict" attribute as a
Funcref to a Dictionary, but the "self" variable is not available then.
- *numbered-function*
+ *numbered-function* *anonymous-function*
To avoid the extra name for the function it can be defined and directly
assigned to a Dictionary in this way: >
:let mydict = {'data': [0, 1, 2, 3]}
@@ -1030,6 +1030,7 @@
(nothing) In a function: local to a function; otherwise: global
|buffer-variable| b: Local to the current buffer.
|window-variable| w: Local to the current window.
+|tabpage-variable| t: Local to the current tab page.
|global-variable| g: Global.
|local-variable| l: Local to a function.
|script-variable| s: Local to a |:source|'ed Vim script.
@@ -1063,6 +1064,11 @@
A variable name that is preceded with "w:" is local to the current window. It
is deleted when the window is closed.
+ *tabpage-variable* *t:var*
+A variable name that is preceded with "t:" is local to the current tab page,
+It is deleted when the tab page is closed. {not available when compiled
+without the +windows feature}
+
*global-variable* *g:var*
Inside functions global variables are accessed with "g:". Omitting this will
access a variable local to a function. But "g:" can also be used in any other
@@ -1628,6 +1634,7 @@
String check for mappings matching {name}
match( {expr}, {pat}[, {start}[, {count}]])
Number position where {pat} matches in {expr}
+matcharg( {nr}) List arguments of |:match|
matchend( {expr}, {pat}[, {start}[, {count}]])
Number position where {pat} ends in {expr}
matchlist( {expr}, {pat}[, {start}[, {count}]])
@@ -1641,6 +1648,7 @@
mode() String current editing mode
nextnonblank( {lnum}) Number line nr of non-blank line >= {lnum}
nr2char( {expr}) String single char with ASCII value {expr}
+pathshorten( {expr}) String shorten directory names in a path
prevnonblank( {lnum}) Number line nr of non-blank line <= {lnum}
printf( {fmt}, {expr1}...) String format text
pumvisible() Number whether popup menu is visible
@@ -2252,6 +2260,9 @@
extension.
On MS-DOS and MS-Windows it only checks if the file exists and
is not a directory, not if it's really executable.
+ On MS-Windows an executable in the same directory as Vim is
+ always found. Since this directory is added to $PATH it
+ should also work to execute it |win32-PATH|.
The result is a Number:
1 exists
0 does not exist
@@ -2720,10 +2731,10 @@
Otherwise the actual font name is returned, or {name} if the
GUI does not support obtaining the real name.
Only works when the GUI is running, thus not you your vimrc or
- Note that the GTK 2 GUI accepts any font name, thus checking
- for a valid name does not work.
gvimrc file. Use the |GUIEnter| autocommand to use this
function just after the GUI has started.
+ Note that the GTK 2 GUI accepts any font name, thus checking
+ for a valid name does not work.
getfperm({fname}) *getfperm()*
The result is a String, which is the read, write, and execute
@@ -3137,9 +3148,9 @@
NOTE: Command-line completion is not supported.
inputlist({textlist}) *inputlist()*
- {textlist} must be a list of strings. This list is displayed,
- one string per line. The user will be prompted to enter a
- number, which is returned.
+ {textlist} must be a |List| of strings. This |List| is
+ displayed, one string per line. The user will be prompted to
+ enter a number, which is returned.
The user can also select an item by clicking on it with the
mouse. For the first string 0 is returned. When clicking
above the first item a negative number is returned. When
@@ -3196,7 +3207,7 @@
exist, or isn't a directory, the result is FALSE. {directory}
is any expression, which is used as a String.
-islocked({expr}) *islocked()*
+islocked({expr}) *islocked()* *E786*
The result is a Number, which is non-zero when {expr} is the
name of a locked variable.
{expr} must be the name of a variable, |List| item or
@@ -3479,6 +3490,18 @@
the pattern. 'smartcase' is NOT used. The matching is always
done like 'magic' is set and 'cpoptions' is empty.
+
+matcharg({nr}) *matcharg()*
+ Selects the {nr} match item, as set with a |:match|,
+ |:2match| or |:3match| command.
+ Return a |List| with two elements:
+ The name of the highlight group used
+ The pattern used.
+ When {nr} is not 1, 2 or 3 returns an empty |List|.
+ When there is no match item set returns ['', ''].
+ This is usef to save and restore a |:match|.
+
+
matchend({expr}, {pat}[, {start}[, {count}]]) *matchend()*
Same as match(), but return the index of first character after
the match. Example: >
@@ -3598,6 +3621,15 @@
call setpos('.', save_cursor)
< Also see |setpos()|.
+pathshorten({expr}) *pathshorten()*
+ Shorten directory names in the path {expr} and return the
+ result. The tail, the file name, is kept as-is. The other
+ components in the path are reduced to single letters. Leading
+ '~' and '.' characters are kept. Example: >
+ :echo pathshorten('~/.vim/autoload/myfile.vim')
+< ~/.v/a/myfile.vim ~
+ It doesn't matter if the path exists or not.
+
prevnonblank({lnum}) *prevnonblank()*
Return the line number of the first line at or above {lnum}
that is not blank. Example: >
@@ -5036,7 +5068,6 @@
gui_athena Compiled with Athena GUI.
gui_gtk Compiled with GTK+ GUI (any version).
gui_gtk2 Compiled with GTK+ 2 GUI (gui_gtk is also defined).
-gui_kde Compiled with KDE GUI |KVim|
gui_mac Compiled with Macintosh GUI.
gui_motif Compiled with Motif GUI.
gui_photon Compiled with Photon GUI.
@@ -5654,6 +5685,7 @@
g: global variables
b: local buffer variables
w: local window variables
+ t: local tab page variables
s: script-local variables
l: local function variables
v: Vim variables.
@@ -5711,8 +5743,8 @@
Note that when two variables refer to the same |List|
and you lock one of them, the |List| will also be
- locked when used through the other variable. Example:
- >
+ locked when used through the other variable.
+ Example: >
:let l = [0, 1, 2, 3]
:let cl = l
:lockvar l
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index d838680..cd25c19 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -1,4 +1,4 @@
-*gui.txt* For Vim version 7.0c. Last change: 2006 Mar 20
+*gui.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -36,6 +36,10 @@
|gui-x11-start|.
*gui-init* *gvimrc* *.gvimrc* *_gvimrc*
+The gvimrc file is where GUI-specific startup commands should be placed. It
+is always sourced after the |vimrc| file. If you have one then the $MYGVIMRC
+environment variable has its name.
+
When the GUI starts up initializations are carried out, in this order:
- The 'term' option is set to "builgin_gui" and terminal options are reset to
their default value for the GUI |terminal-options|.
@@ -66,6 +70,8 @@
- For Win32, when $HOME is not set, "$VIM\_gvimrc" is used.
- When a "_gvimrc" file is not found, ".gvimrc" is tried too. And vice
versa.
+ The name of the first file found is stored in $MYGVIMRC, unless it was
+ already set.
- If the 'exrc' option is set (which is NOT the default) the file ./.gvimrc
is sourced, if it exists and isn't the same file as the system or user
gvimrc file. If this file is not owned by you, some security restrictions
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
index 7e0ec1e..18fdf60 100644
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -1,4 +1,4 @@
-*hangulin.txt* For Vim version 7.0c. Last change: 2005 Mar 29
+*hangulin.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam
@@ -48,7 +48,7 @@
Hangul Fonts
------------
-You can set text font using $HOME/.Xdefaults or $HOME/.gvimrc.
+You can set text font using $HOME/.Xdefaults or in your gvimrc file.
But to use Hangul, you should set 'guifontset' in your vimrc.
$HOME/.Xdefaults: >
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index d99f21f..229220f 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*help.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM - main help file
k
@@ -85,7 +85,7 @@
|usr_90.txt| Installing Vim
-REFERENCE MANUAL: These files explain every detail of Vim. *ref-toc*
+REFERENCE MANUAL: These files explain every detail of Vim. *reference_toc*
General subjects ~
|intro.txt| general introduction to Vim; notation used in help files
@@ -195,6 +195,12 @@
|pi_zip.txt| Zip archive explorer
LOCAL ADDITIONS: *local-additions*
+|cecutil.txt| DrChip's Utilities Jun 11, 2004
+|example.txt| Example for a locally added help file
+|matchit.txt| Extended "%" matching
+|test.txt| Testing the hélp cömmånd nôw
+|typecorr.txt| Plugin for correcting typing mistakes
+|helpp.txt| Dummy line to avoid an error message
------------------------------------------------------------------------------
*bars* Bars example
diff --git a/runtime/doc/howto.txt b/runtime/doc/howto.txt
index f8f7543..f6b81a8 100644
--- a/runtime/doc/howto.txt
+++ b/runtime/doc/howto.txt
@@ -1,4 +1,4 @@
-*howto.txt* For Vim version 7.0c. Last change: 2001 Sep 03
+*howto.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -75,7 +75,7 @@
|auto-setting| set options automatically
|term-dependent-settings| set options depending on terminal name
|save-settings| save settings
-|:quote| comment my exrc/vimrc/gvimrc files
+|:quote| comment my .vim files
|'helpheight'| change the default help height
|'highlight'| set various highlighting modes
|'title'| set the window title
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 4eb4bcf..417a4b3 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*insert.txt* For Vim version 7.0c. Last change: 2006 Apr 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1004,10 +1004,12 @@
Each list item can either be a string or a Dictionary. When it is a string it
is used as the completion. When it is a Dictionary it can contain these
items:
- word the completion, mandatory
- abbr abbreviation of "word", to be used in the menu
- menu extra text for the popup menu
- info more information about the item
+ word the text that will be inserted, mandatory
+ abbr abbreviation of "word"; when not empty it is used in
+ the menu instead of "word"
+ menu extra text for the popup menu, after "word" or "abbr"
+ info more information about the item, can be displayed in a
+ preview window
kind single letter indicating the type of completion
icase when non-zero case is to be ignored; when omitted
the 'ignorecase' option is used
@@ -1291,6 +1293,14 @@
- after $ variables name
- if variable was declared as object add "->", if tags file is available show
name of class
+ - after "->" complete only function and variable names specific for given
+ class. To find class location and contents tags file is required. Because
+ PHP isn't strongly typed language user can use @var tag to declare class: >
+
+ /* @var $myVar myClass */
+ $myVar->
+<
+ Still, to find myClass contents tags file is required.
- function names with additonal info:
- in case of built-in functions list of possible arguments and after | type
@@ -1375,6 +1385,12 @@
with data pulled directly from within a database. For detailed instructions
and a tutorial see |omni-sql-completion|.
+The SQL completion plugin can be used in conjunction with other completion
+plugins. For example, the PHP filetype has it's own completion plugin.
+Since PHP is often used to generate dynamic website by accessing a database,
+the SQL completion plugin can also be enabled. This allows you to complete
+PHP code and SQL code at the same time.
+
XML *ft-xml-omni*
@@ -1634,11 +1650,15 @@
10. Inserting a file *inserting-file*
*:r* *:re* *:read*
-:r[ead] [name] Insert the file [name] (default: current file) below
+:r[ead] [++opt] [name]
+ Insert the file [name] (default: current file) below
the cursor.
+ See |++opt| for the possible values of [++opt].
-:{range}r[ead] [name] Insert the file [name] (default: current file) below
+:{range}r[ead] [++opt] [name]
+ Insert the file [name] (default: current file) below
the specified line.
+ See |++opt| for the possible values of [++opt].
*:r!* *:read!*
:r[ead] !{cmd} Execute {cmd} and insert its standard output below
@@ -1663,6 +1683,14 @@
used, for example, when you want to edit that file instead: ":e! #". This can
be switched off by removing the 'a' flag from the 'cpoptions' option.
+Of the [++opt] arguments one is specifically for ":read", the ++edit argument.
+This is useful when the ":read" command is actually used to read a file into
+the buffer as if editing that file. Use this command in an empty buffer: >
+ :read ++edit filename
+The effect is that the 'fileformat', 'fileencoding', 'bomb', etc. options are
+set to what has been detected for "filename". Note that a single empty line
+remains, you may want to delete it.
+
*file-read*
The 'fileformat' option sets the <EOL> style for a file:
'fileformat' characters name ~
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 74b2f8e..3b6934b 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -1,4 +1,4 @@
-*mbyte.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*mbyte.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar et al.
@@ -985,7 +985,7 @@
This works in the same way when using XIM.
You can select cursor color when status is on by using highlight group
- CursorIM. For example, add these lines to your _gvimrc: >
+ CursorIM. For example, add these lines to your |gvimrc|: >
if has('multi_byte_ime')
highlight Cursor guifg=NONE guibg=Green
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index f176566..b04bb55 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*options.txt* For Vim version 7.0c. Last change: 2006 Apr 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -684,8 +684,7 @@
or selected.
This option is provided for backward compatibility with the Vim
released with Sun ONE Studio 4 Enterprise Edition.
- Note: When this option is on some plugins may not work. The directory
- browser sets if off.
+ Note: When this option is on some plugins may not work.
*'arabic'* *'arab'* *'noarabic'* *'noarab'*
'arabic' 'arab' boolean (default off)
@@ -1488,8 +1487,8 @@
|fold-marker|.
*'compatible'* *'cp'* *'nocompatible'* *'nocp'*
-'compatible' 'cp' boolean (default on, off when a .vimrc or .gvimrc file
- is found)
+'compatible' 'cp' boolean (default on, off when a |vimrc| or |gvimrc|
+ file is found)
global
{not in Vi}
This option has the effect of making Vim either more Vi-compatible, or
@@ -1504,10 +1503,10 @@
options. This default was chosen for those people who want to use Vim
just like Vi, and don't even (want to) know about the 'compatible'
option.
- When a ".vimrc" or ".gvimrc" file is found while Vim is starting up,
+ When a |vimrc| or |gvimrc| file is found while Vim is starting up,
this option is switched off, and all options that have not been
modified will be set to the Vim defaults. Effectively, this means
- that when a ".vimrc" or ".gvimrc" file exists, Vim will use the Vim
+ that when a |vimrc| or |gvimrc| file exists, Vim will use the Vim
defaults, otherwise it will use the Vi defaults. (Note: This doesn't
happen for the system-wide vimrc or gvimrc file). Also see
|compatible-default| and |posix-compliance|.
@@ -2719,6 +2718,8 @@
< This is similar to the default, except that these characters will also
be used when there is highlighting.
+ for "stl" and "stlnc" only single-byte values are supported.
+
The highlighting used for these items:
item highlight group ~
stl:c StatusLine |hl-StatusLine|
@@ -2894,6 +2895,7 @@
quickfix ":cn", ":crew", ":make", etc.
search search for a pattern: "/", "n", "*", "gd", etc.
(not for a search pattern in a ":" command)
+ Also for |[s| and |]s|.
tag jumping to a tag: ":ta", CTRL-T, etc.
undo undo or redo: "u" and CTRL-R
When the command is part of a mapping this option is not used. Add
@@ -3332,7 +3334,7 @@
can use "gvim -f" or ":gui -f" to start the GUI in the
foreground. |gui-fork|
Note: Set this option in the vimrc file. The forking may have
- happened already when the gvimrc file is read.
+ happened already when the |gvimrc| file is read.
'i' Use a Vim icon. For GTK with KDE it is used in the left-upper
corner of the window. It's black&white on non-GTK, because of
@@ -3341,7 +3343,7 @@
'm' Menu bar is present.
'M' The system menu "$VIMRUNTIME/menu.vim" is not sourced. Note
that this flag must be added in the .vimrc file, before
- switching on syntax or filetype recognition (when the .gvimrc
+ switching on syntax or filetype recognition (when the |gvimrc|
file is sourced the system menu has already been loaded; the
":syntax on" and ":filetype on" commands load the menu too).
'g' Grey menu items: Make menu items that are not active grey. If
@@ -3374,7 +3376,7 @@
'p' Use Pointer callbacks for X11 GUI. This is required for some
window managers. If the cursor is not blinking or hollow at
the right moment, try adding this flag. This must be done
- before starting the GUI. Set it in your gvimrc. Adding or
+ before starting the GUI. Set it in your |gvimrc|. Adding or
removing it after the GUI has started has no effect.
'F' Add a footer. Only for Motif. See |gui-footer|.
@@ -3469,7 +3471,7 @@
"8:SpecialKey,@:NonText,d:Directory,
e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,
M:ModeMsg,n:LineNr,r:Question,
- s:StatusLine,S:StatusLineNC,c:VertSplit
+ s:StatusLine,S:StatusLineNC,c:VertSplit,
t:Title,v:Visual,w:WarningMsg,W:WildMenu,
f:Folded,F:FoldColumn,A:DiffAdd,
C:DiffChange,D:DiffDelete,T:DiffText,
@@ -3560,7 +3562,7 @@
highlight all of the matched text. However, this depends on where the
search starts. This will be the first line in the window or the first
line below a closed fold. A match in a previous line which is not
- drawn may not continue in an newly drawn line.
+ drawn may not continue in a newly drawn line.
NOTE: This option is reset when 'compatible' is set.
*'history'* *'hi'*
@@ -4265,7 +4267,7 @@
The characters ':' and ',' should not be used. UTF-8 characters can
be used when 'encoding' is "utf-8", otherwise only printable
- characters are allowed.
+ characters are allowed. All characters must be single width.
Examples: >
:set lcs=tab:>-,trail:-
@@ -5369,6 +5371,8 @@
going back to the other window, it still uses the
same relative offset.
Also see |scroll-binding|.
+ When 'diff' mode is active there always is vertical scroll binding,
+ even when "ver" isn't there.
*'sections'* *'sect'*
'sections' 'sect' string (default "SHNHH HUnhsh")
@@ -5969,8 +5973,9 @@
|zg| and |zw| commands can be used to access each. This allows using
a personal word list file and a project word list file.
When a word is added while this option is empty Vim will set it for
- you: Using the first "spell" directory in 'runtimepath' that is
- writable and the first language name that appears in 'spelllang',
+ you: Using the first directory in 'runtimepath' that is writable. If
+ there is no "spell" directory yet it will be created. For the file
+ name the first language name that appears in 'spelllang' is used,
ignoring the region.
The resulting ".spl" file will be used for spell checking, it does not
have to appear in 'spelllang'.
diff --git a/runtime/doc/os_dos.txt b/runtime/doc/os_dos.txt
index 02cb032..7e7711c 100644
--- a/runtime/doc/os_dos.txt
+++ b/runtime/doc/os_dos.txt
@@ -1,4 +1,4 @@
-*os_dos.txt* For Vim version 7.0c. Last change: 2006 Feb 14
+*os_dos.txt* For Vim version 7.0c. Last change: 2006 Mar 30
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -77,10 +77,11 @@
==============================================================================
3. Standard mappings *dos-standard-mappings*
-CTRL-PageUp cursor to first screen line *<C-PageUp>*
-CTRL-PageDown cursor to last screen line, last character *<C-PageDown>*
+The mappings for CTRL-PageUp and CTRL-PageDown have been removed, they now
+jump to the next or previous tab page |<C-PageUp>| |<C-PageDown>|
-These mappings accomplish this:
+If you want them to move to the first and last screen line you can use these
+mappings:
key key code Normal/Visual mode Insert mode ~
CTRL-PageUp <M-N><M-C-D> H <C-O>H
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index c894f0a..0861127 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,4 +1,4 @@
-*os_win32.txt* For Vim version 7.0c. Last change: 2005 Mar 29
+*os_win32.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by George Reilly
@@ -87,6 +87,12 @@
probably get very strange behavior from Vim. Therefore Vim does not obtain
the default value of 'term' from the environment variable "TERM".
+$PATH *win32-PATH*
+
+The directory of the Vim executable is appended to $PATH. This is mostly to
+make "!xxd' work, as it is in the Tools menu. And it also means that when
+executable() returns 1 the executable can actually be executed.
+
==============================================================================
3. Restore screen contents *win32-restore*
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index f415574..3bd8c40 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt* For Vim version 7.0c. Last change: 2006 Mar 25
+*pattern.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1220,6 +1220,9 @@
'ignorecase' does not apply, use |/\c| in the pattern to
ignore case. Otherwise case is not ignored.
+ Also see |matcharg()|, it returns the highlight group and
+ pattern of a previous :match command.
+
Another example, which highlights all characters in virtual
column 72 and more: >
:highlight rightMargin term=bold ctermfg=blue guifg=blue
@@ -1235,10 +1238,10 @@
Clear a previously defined match pattern.
-:2mat[ch] {group} /{pattern}/
+:2mat[ch] {group} /{pattern}/ *:2match*
:2mat[ch]
:2mat[ch] none
-:3mat[ch] {group} /{pattern}/
+:3mat[ch] {group} /{pattern}/ *:3match*
:3mat[ch]
:3mat[ch] none
Just like |:match| above, but set a separate match. Thus
diff --git a/runtime/doc/pi_paren.txt b/runtime/doc/pi_paren.txt
index b3fcb7d..a34f354 100644
--- a/runtime/doc/pi_paren.txt
+++ b/runtime/doc/pi_paren.txt
@@ -1,4 +1,4 @@
-*pi_paren.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*pi_paren.txt* For Vim version 7.0c. Last change: 2006 Apr 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,9 +38,13 @@
syntax items are ignored. Any syntax items with "string" or "comment"
somewhere in their name are considered string or comment items.
-The search is limited to what is visible in the window. The plugin doesn't
-search further than 100 lines to avoid a long delay when there are closed
-folds.
+The search is limited to avoid a delay when moving the cursor. The limits
+are:
+- What is visible in the window.
+- 100 lines above or below the cursor to avoid a long delay when there are
+ closed folds.
+- 'synmaxcolumn' times 2 bytes before or after the cursor to avoid a delay
+ in a long line with syntax highlighting.
==============================================================================
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt
index a986ee9..77eb19e 100644
--- a/runtime/doc/pi_tar.txt
+++ b/runtime/doc/pi_tar.txt
@@ -1,6 +1,8 @@
*tar.txt* For Vim version 7.0c. Last change: 2006 Mar 24
- Tar File Interface
+ +====================+
+ | Tar File Interface |
+ +====================+
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
@@ -12,7 +14,8 @@
1. Contents *tar* *tar-contents*
1. Contents..................................................|tar-contents|
2. Usage.....................................................|tar-usage|
- 3. History...................................................|tar-history|
+ 3. Options...................................................|tar-options|
+ 4. History...................................................|tar-history|
==============================================================================
2. Usage *tar-usage* *tar-manual*
@@ -24,7 +27,25 @@
tar archives via the plugin.
==============================================================================
-3. History *tar-history*
+3. Options *tar-options*
+
+ These options are variables that one may change, typically in one's
+ <.vimrc> file.
+ Default
+ Variable Value Explanation
+ *g:tar_browseoptions* "Ptf" used to get a list of contents
+ *g:tar_readoptions* "OPxf" used to extract a file from a tarball
+ *g:tar_cmd* "tar" the name of the tar program
+ *g:tar_writeoptions* "uf" used to update/replace a file
+
+
+==============================================================================
+4. History *tar-history*
+
+ v7 Mar 22, 2006 * work on making tar plugin work across network
+ Mar 27, 2006 * g:tar_cmd now available for users to change the name
+ of the tar program to be used. By default, of course,
+ its "tar".
v6 Dec 21, 2005 * writing to files not in directories caused problems -
fixed (pointed out by Christian Robinson)
v5 Nov 22, 2005 * report option workaround installed
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 8e70bbf..eeb5d76 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -1,18 +1,20 @@
-*zip.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*zip.txt* For Vim version 7.0c. Last change: 2006 Apr 03
- Zip File Interface
+ +====================+
+ | Zip File Interface |
+ +====================+
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
-Copyright: Copyright (C) 2005 Charles E. Campbell, Jr. {{{1 *zip-copyright*
- Permission is hereby granted to use and distribute this code,
- with or without modifications, provided that this copyright
- notice is copied with it. Like anything else that's free,
- zip.vim, zipPlugin.vim, and pi_zip.txt are provided *as is*
- and it comes with no warranty of any kind, either expressed or
- implied. By using this plugin, you agree that in no event will
- the copyright holder be liable for any damages resulting from
- the use of this software.
+Copyright: Copyright (C) 2005,2006 Charles E Campbell, Jr {{{1 *zip-copyright*
+ Permission is hereby granted to use and distribute this code,
+ with or without modifications, provided that this copyright
+ notice is copied with it. Like anything else that's free,
+ zip.vim, zipPlugin.vim, and pi_zip.txt are provided *as is*
+ and it comes with no warranty of any kind, either expressed or
+ implied. By using this plugin, you agree that in no event will
+ the copyright holder be liable for any damages resulting from
+ the use of this software.
==============================================================================
1. Contents *zip* *zip-contents*
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index db0210f..f76ab51 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -1,4 +1,4 @@
-*spell.txt* For Vim version 7.0c. Last change: 2006 Mar 27
+*spell.txt* For Vim version 7.0c. Last change: 2006 Apr 03
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -500,7 +500,7 @@
:mkspell ~/.vim/spell/en /tmp/en_US /tmp/en_CA /tmp/en_AU
< This combines the English word lists for US, CA and AU
into one en.spl file.
- Up to eight regions can be combined. *E754* *755*
+ Up to eight regions can be combined. *E754* *E755*
The REP and SAL items of the first .aff file where
they appear are used. |spell-REP| |spell-SAL|
@@ -1058,36 +1058,8 @@
- Making the word with the affix rare, by using the |spell-RARE| flag.
- Exclude the word with the affix from compounding, by using the
|spell-COMPOUNDFORBIDFLAG| flag.
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-OLD STUFF: This needs to be rewritten to use affix flags.
- *spell-affix-rare*
-An extra item for Vim is the "rare" flag. It must come after the other
-fields, before a comment. When used then all words that use the affix will be
-marked as rare words. Examples:
-
- PFX F 0 nene . rare ~
- SFX F 0 oin n rare # hardly ever used ~
-
-However, if the word also appears as a good word in another way (e.g., in
-another region) it won't be marked as rare.
-
- *spell-affix-nocomp*
-Another extra item for Vim is the "nocomp" flag. It must come after the other
-fields, before a comment. It can be either before or after "rare". When
-present then all words that use the affix will not be part of a compound word.
-Example:
- affix file:
- COMPOUNDFLAG c ~
- SFX a Y 2 ~
- SFX a 0 s . ~
- SFX a 0 ize . nocomp ~
- dictionary:
- word/c ~
- util/ac ~
-
-This allows for "wordutil" and "wordutils" but not "wordutilize".
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+- Allow the word with the affix to be part of a compound word on the side of
+ the affix with the |spell-COMPOUNDPERMITFLAG|.
*spell-PFXPOSTPONE*
When an affix file has very many prefixes that apply to many words it's not
@@ -1146,6 +1118,11 @@
a typing mistake anyway. When the same word is found as good it won't be
highlighted as rare.
+This flag can also be used on an affix, so that a basic word is not rare but
+the basic word plus affix is rare |spell-affix-flags|. However, if the word
+also appears as a good word in another way (e.g., in another region) it won't
+be marked as rare.
+
BAD WORDS *spell-BAD*
@@ -1243,6 +1220,12 @@
This allows for the word "start-end", but not "startend".
+An additional implied rule is that, without further flags, a word with a
+prefix cannot be compounded after another word, and a word with a suffix
+cannot be compounded with a following word. Thus the affix cannot appear
+on the inside of a compound word. This can be changed with the
+|spell-COMPOUNDPERMITFLAG|.
+
*spell-NEEDCOMPOUND*
The NEEDCOMPOUND flag is used to require that a word is used as part of a
compound word. The word itself is not a good word. Example:
@@ -1282,13 +1265,24 @@
*spell-COMPOUNDFORBIDFLAG*
The COMPOUNDFORBIDFLAG specifies a flag that can be used on an affix. It
-means that the word plus affix cannot be used in a compound word.
+means that the word plus affix cannot be used in a compound word. Example:
+ affix file:
+ COMPOUNDFLAG c ~
+ COMPOUNDFORBIDFLAG x ~
+ SFX a Y 2 ~
+ SFX a 0 s . ~
+ SFX a 0 ize/x . ~
+ dictionary:
+ word/c ~
+ util/ac ~
+
+This allows for "wordutil" and "wordutils" but not "wordutilize".
*spell-COMPOUNDPERMITFLAG*
The COMPOUNDPERMITFLAG specifies a flag that can be used on an affix. It
means that the word plus affix can also be used in a compound word in a way
-where the affix ends up halfway the word.
-NOT IMPLEMENTED YET.
+where the affix ends up halfway the word. Without this flag that is not
+allowed.
*spell-COMPOUNDROOT*
The COMPOUNDROOT flag is used for words in the dictionary that are already a
@@ -1309,9 +1303,9 @@
Only case-folded letters need to be included.
-Above another way to restrict compounding was mentioned above: adding "nocomp"
-after an affix causes all words that are made with that affix not be be used
-for compounding. |spell-affix-nocomp|
+Above another way to restrict compounding was mentioned above: Adding the
+|spell-COMPOUNDFORBIDFLAG| flag to an affix causes all words that are made
+with that affix not be be used for compounding.
UNLIMITED COMPOUNDING *spell-NOBREAK*
diff --git a/runtime/doc/sql.txt b/runtime/doc/sql.txt
index 5d07a5c..29a0bce 100644
--- a/runtime/doc/sql.txt
+++ b/runtime/doc/sql.txt
@@ -1,4 +1,4 @@
-*sql.txt* For Vim version 7.0c. Last change: Tue Mar 28 2006 9:33:14 PM
+*sql.txt* For Vim version 7.0c. Last change: Mon Apr 03 2006 10:34:00 PM
by David Fishburn
@@ -26,7 +26,8 @@
4.3.3 Complete Procedures |sql-completion-procedures|
4.3.4 Complete Views |sql-completion-views|
4.4 Completion Customization |sql-completion-customization|
- 4.5 Customizing Maps |sql-completion-maps|
+ 4.5 SQL Maps |sql-completion-maps|
+ 4.6 Using with other filetypes |sql-completion-filetypes|
==============================================================================
1. Navigation *sql-navigation*
@@ -321,41 +322,48 @@
---------------
The static popups created contain items defined by the active syntax rules
while editing a file with a filetype of SQL. The plugin defines (by default)
-various maps to help the user refine which list of items they wish displayed.
+various maps to help the user refine the list of items to be displayed.
The defaults static maps are: >
- imap <buffer> <C-C>a <C-\><C-O>:let b:sql_compl_type='syntax'<CR><C-X><C-O>
- imap <buffer> <C-C>s <C-\><C-O>:let b:sql_compl_type='sqlStatement'<CR><C-X><C-O>
- imap <buffer> <C-C>f <C-\><C-O>:let b:sql_compl_type='sqlFunction'<CR><C-X><C-O>
- imap <buffer> <C-C>k <C-\><C-O>:let b:sql_compl_type='sqlKeyword'<CR><C-X><C-O>
- imap <buffer> <C-C>o <C-\><C-O>:let b:sql_compl_type='sqlOption'<CR><C-X><C-O>
- imap <buffer> <C-C>T <C-\><C-O>:let b:sql_compl_type='sqlType'<CR><C-X><C-O>
+ imap <buffer> <C-C>a <C-\><C-O>:call sqlcomplete#Map('syntax')<CR><C-X><C-O>
+ imap <buffer> <C-C>k <C-\><C-O>:call sqlcomplete#Map('sqlKeyword')<CR><C-X><C-O>
+ imap <buffer> <C-C>f <C-\><C-O>:call sqlcomplete#Map('sqlFunction')<CR><C-X><C-O>
+ imap <buffer> <C-C>o <C-\><C-O>:call sqlcomplete#Map('sqlOption')<CR><C-X><C-O>
+ imap <buffer> <C-C>T <C-\><C-O>:call sqlcomplete#Map('sqlType')<CR><C-X><C-O>
+ imap <buffer> <C-C>s <C-\><C-O>:call sqlcomplete#Map('sqlStatement')<CR><C-X><C-O>
<
The static maps (which are based on the syntax highlight groups) follow this
format: >
- imap <buffer> <C-C>k <C-\><C-O>:let b:sql_compl_type='sqlKeyword'<CR><C-X><C-O>
+ imap <buffer> <C-C>k <C-\><C-O>:call sqlcomplete#Map('sqlKeyword')<CR><C-X><C-O>
<
This command breaks down as: >
imap - Create an insert map
<buffer> - Only for this buffer
- <C-C>k - Your choice of key map
+ <C-C>k - Your choice of key map
<C-\><C-O> - Execute one command, return to Insert mode
- :let b:sql_compl_type= - Choose the highlight group's entries to display.
+ :call sqlcomplete#Map( - Allows the SQL completion plugin to perform some
+ housekeeping functions to allow it to be used in
+ conjunction with other completion plugins.
+ Indicate which item you want the SQL completion
+ plugin to complete.
+ In this case we are asking the plugin to display
+ items from the syntax highlight group
+ 'sqlKeyword'.
You can view a list of highlight group names to
choose from by executing the
:syntax list
command while editing a SQL file.
'sqlKeyword' - Display the items for the sqlKeyword highlight
group
- <CR> - Execute the :let command
+ )<CR> - Execute the :let command
<C-X><C-O> - Trigger the standard omni completion key stroke.
- By setting the b:sql_compl_type variable, this
- instructs the SQL completion plugin to populate
- the popup with items from the sqlKeyword highlight
- group. The plugin will also cache this result
- until Vim is restarted. The syntax list is
- retrieved using the syntaxcomplete plugin.
+ Passing in 'sqlKeyword' instructs the SQL
+ completion plugin to populate the popup with
+ items from the sqlKeyword highlight group. The
+ plugin will also cache this result until Vim is
+ restarted. The syntax list is retrieved using
+ the syntaxcomplete plugin.
<
-Setting b:sql_compl_type = 'syntax' is a special case. This instructs the
+Using the 'syntax' keyword is a special case. This instructs the
syntaxcomplete plugin to retrieve all syntax items. So this will effectively
work for any of Vim's SQL syntax files. At the time of writing this includes
10 different syntax files for the different dialects of SQL (see section 3
@@ -383,7 +391,7 @@
plugin installed, (http://vim.sourceforge.net/script.php?script_id=356).
Dynamic mode is used by several features of the SQL completion plugin.
-After installing the dbext plugin see the |dbext-tutorial| for additional
+After installing the dbext plugin see the dbext-tutorial for additional
configuration and usage. The dbext plugin allows the SQL completion plugin
to display a list of tables, procedures, views and columns. >
Table List
@@ -403,9 +411,7 @@
Stored Procedure List - <C-C>p
View List - <C-C>v
Column List - <C-C>c
- - .<C-X><C-O>
- - If <C-X><C-O> is pressed following a period
- it is assumed you are asking for a column list.
+ - Windows platform only
- When viewing a popup window displaying the list
of tables, you can press <C-Right>, this will
replace the table currently highlighted with
@@ -418,7 +424,7 @@
the popup window. This makes the re-displaying of these lists very
fast. If new tables or columns are added to the database it may become
necessary to clear the plugins cache. The default map for this is: >
- imap <buffer> <C-C>R <C-O>:let b:sql_compl_type='ResetCache'<CR><C-X><C-O>
+ imap <buffer> <C-C>R <C-\><C-O>:call sqlcomplete#Map('ResetCache')<CR><C-X><C-O>
<
4.3 SQL Tutorial *sql-completion-tutorial*
@@ -472,7 +478,7 @@
dbext.vim is working as expected. If not, please consult the dbext.txt
documentation.
-Assuming you have followed the |dbext-tutorial| you can press <C-C>t to
+Assuming you have followed the dbext-tutorial you can press <C-C>t to
display a list of tables. There is a delay while dbext is creating the table
list. After the list is displayed press <C-W>. This will remove both the
popup window and the table name already chosen when the list became active. >
@@ -496,7 +502,7 @@
together. If you wish to enable this functionality on a *nix platform choose
a key and create this mapping (see |sql-completion-maps| for further
details on where to create this imap): >
- imap <buffer> <your_keystroke> <CR><C-\><C-O>:let b:sql_compl_type='column'<CR><C-X><C-O>
+ imap <buffer> <your_keystroke> <CR><C-\><C-O>:call sqlcomplete#Map('column')<CR><C-X><C-O>
<
Example of using column completion:
- Press <C-C>t again to display the list of tables.
@@ -611,9 +617,65 @@
MYTABLENAME --> M
<
-4.5 Customizing Maps *sql-completion-maps*
---------------------
+4.5 SQL Maps *sql-completion-maps*
+------------
+The default SQL maps have been described in other sections of this document in
+greater detail. Here is a list of the maps with a brief description of each.
+
+Static Maps
+-----------
+These are maps which use populate the completion list using Vim's syntax
+highlighting rules. >
+ <C-C>a
+< - Displays all SQL syntax items. >
+ <C-C>k
+< - Displays all SQL syntax items defined as 'sqlKeyword'. >
+ <C-C>f
+< - Displays all SQL syntax items defined as 'sqlFunction. >
+ <C-C>o
+< - Displays all SQL syntax items defined as 'sqlOption'. >
+ <C-C>T
+< - Displays all SQL syntax items defined as 'sqlType'. >
+ <C-C>s
+< - Displays all SQL syntax items defined as 'sqlStatement'. >
+
+Dynamic Maps
+------------
+These are maps which use populate the completion list using the dbext.vim plugin. >
+ <C-C>t
+< - Displays a list of tables. >
+ <C-C>p
+< - Displays a list of procedures. >
+ <C-C>v
+< - Displays a list of views. >
+ <C-C>c
+< - Displays a list of columns for a specific table. >
+ <C-C>l
+< - Displays a comma separated list of columns for a specific table. >
+ <C-C>L
+< - Displays a comma separated list of columns for a specific table.
+ This should only be used when the completion window is active. >
+ <C-Right>
+< - Displays a list of columns for the table currently highlighted in
+ the completion window. <C-Right> is not recognized on most Unix
+ systems, so this maps is only created on the Windows platform.
+ If you would like the same feature on Unix, choose a different key
+ and make the same map in your vimrc.
+ This should only be used when the completion window is active. >
+ <C-Left>
+< - Displays the list of tables.
+ <C-Left> is not recognized on most Unix systems, so this maps is
+ only created on the Windows platform. If you would like the same
+ feature on Unix, choose a different key and make the same map in
+ your vimrc.
+ This should only be used when the completion window is active. >
+ <C-C>R
+< - This maps removes all cached items and forces the SQL completion
+ to regenerate the list of items.
+
+Customizing Maps
+----------------
You can create as many additional key maps as you like. Generally, the maps
will be specifying different syntax highlight groups.
@@ -624,7 +686,7 @@
<
Do no edit ftplugin/sql.vim directly! If you change this file your changes
will be over written on future updates. Vim has a special directory structure
-that allows you to make customizations without changing the files that are
+which allows you to make customizations without changing the files that are
included with the Vim distribution. If you wish to customize the maps
create an after/ftplugin/sql.vim (see |after-directory|) and place the same
maps from the ftplugin/sql.vim in it using your own key strokes. <C-C> was
@@ -632,4 +694,44 @@
platform you can also use <C-Space> or ALT keys.
+4.6 Using with other filetypes *sql-completion-filetypes*
+------------------------------
+
+Many times SQL can be used with different filetypes. For example Perl, Java,
+PHP, Javascript can all interact with a database. Often you need both the SQL
+completion as well as the completion capabilities for the current language you
+are editing.
+
+This can be enabled easily with the following steps (assuming a Perl file): >
+ 1. :e test.pl
+ 2. :set filetype=sql
+ 3. :set ft=perl
+
+Step 1
+------
+Begins by editing a Perl file. Vim automatically sets the filetype to
+"perl". By default, Vim runs the appropriate filetype file
+ftplugin/perl.vim. If you are using the syntax completion plugin by following
+the directions at |ft-syntax-omni| then the |'omnifunc'| option has been set to
+"syntax#Complete". Pressing <C-X><C-O> will display the omni popup containing
+the syntax items for Perl.
+
+Step 2
+------
+Manually setting the filetype to 'sql' will also fire the appropriate filetype
+files ftplugin/sql.vim. This file will define a number of buffer specific
+maps for SQL completion, see |sql-completion-maps|. Now these maps have
+been created and the SQL completion plugin has been initialized. All SQL
+syntax items have been cached in preparation. The SQL filetype script detects
+we are attempting to use two different completion plugins. Since the SQL maps
+begin with <C-C>, the maps will toggle the |'omnifunc'| when in use. So you
+can use <C-X><C-O> to continue using the completion for Perl (using the syntax
+completion plugin) and <C-C> to use the SQL completion features.
+
+Step 3
+------
+Setting the filetype back to Perl sets all the usual "perl" related items back
+as they were.
+
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index c0f2a03..4ca2139 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0c. Last change: 2006 Mar 26
+*starting.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -413,7 +413,7 @@
process and exits the current one. "-f" should be used when
gvim is started by a program that will wait for the edit
session to finish (e.g., mail or readnews). If you want gvim
- never to fork, include 'f' in 'guioptions' in your .gvimrc.
+ never to fork, include 'f' in 'guioptions' in your |gvimrc|.
Careful: You can use "-gf" to start the GUI in the foreground,
but "-fg" is used to specify the foreground color. |gui-fork|
{not in Vi}
@@ -430,7 +430,7 @@
< Also consider using autocommands; see |autocommand|.
When {vimrc} is equal to "NONE" (all uppercase), all
initializations from files and environment variables are
- skipped, including reading the .gvimrc file when the GUI
+ skipped, including reading the |gvimrc| file when the GUI
starts. Loading plugins is also skipped.
When {vimrc} is equal to "NORC" (all uppercase), this has the
same effect as "NONE", but loading plugins is not skipped.
@@ -440,7 +440,7 @@
{not in Vi}
*-U* *E230*
--U {gvimrc} The file "gvimrc" is read for initializations when the GUI
+-U {gvimrc} The file {gvimrc} is read for initializations when the GUI
starts. Other GUI initializations are skipped. When {gvimrc}
is equal to "NONE", no file is read for GUI initializations at
all. |gui-init|
@@ -761,7 +761,8 @@
*VIMINIT* *.vimrc* *_vimrc* *EXINIT* *.exrc* *_exrc*
c. Four places are searched for initializations. The first that exists
- is used, the others are ignored.
+ is used, the others are ignored. The $MYVIMRC environment variable is
+ set to the file that was first found, unless $MYVIMRC was already set.
- The environment variable VIMINIT (see also |compatible-default|) (*)
The value of $VIMINIT is used as an Ex command line.
- The user vimrc file(s):
@@ -905,7 +906,8 @@
not been set or reset will be changed. This has the same effect like the
value of 'compatible' had this value when starting Vim. Note that this
doesn't happen for the system-wide vimrc file. It does also happen for gvimrc
-files.
+files. The $MYVIMRC or $MYGVIMRC file will be set to the first found vimrc
+and/or gvimrc file.
But there is a side effect of setting or resetting 'compatible' at the moment
a .vimrc file is found: Mappings are interpreted the moment they are
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 0d037d6..a0a5b8d 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.0c. Last change: 2006 Mar 28
+*syntax.txt* For Vim version 7.0c. Last change: 2006 Apr 04
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -81,14 +81,14 @@
NOTE: When using reverse video ("gvim -fg white -bg black"), the default value
of 'background' will not be set until the GUI window is opened, which is after
-reading the .gvimrc. This will cause the wrong default highlighting to be
+reading the |gvimrc|. This will cause the wrong default highlighting to be
used. To set the default value of 'background' before switching on
-highlighting, include the ":gui" command in the .gvimrc: >
+highlighting, include the ":gui" command in the |gvimrc|: >
:gui " open window and set default for 'background'
:syntax on " start highlighting, use 'background' to set colors
-NOTE: Using ":gui" in the .gvimrc means that "gvim -f" won't start in the
+NOTE: Using ":gui" in the |gvimrc| means that "gvim -f" won't start in the
foreground! Use ":gui -f" then.
@@ -1013,10 +1013,10 @@
fixed source form if the fortran_fixed_source variable has been set. If
neither of these variables have been set, the syntax script attempts to
determine which source form has been used by examining the first five columns
-of the first 25 lines of your file. If no signs of free source form are
+of the first 250 lines of your file. If no signs of free source form are
detected, then the file is assumed to be in fixed source form. The algorithm
should work in the vast majority of cases. In some cases, such as a file that
-begins with 25 or more full-line comments, the script may incorrectly decide
+begins with 250 or more full-line comments, the script may incorrectly decide
that the fortran code is in fixed form. If that happens, just add a
non-comment statement beginning anywhere in the first five columns of the
first twenty five lines, save (:w) and then reload (:e!) the file.
@@ -2304,7 +2304,7 @@
SH *sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax*
-This covers the "normal" Unix (Bourne) sh, bash and the Korn shell.
+This covers the "normal" Unix (Borne) sh, bash and the Korn shell.
Vim attempts to determine which shell type is in use by specifying that
various filenames are of specific types: >
@@ -2328,6 +2328,11 @@
< sh: >
let is_sh = 1
+If there's no "#! ..." line, and the user hasn't availed himself/herself of a
+default sh.vim syntax setting as just shown, then syntax/sh.vim will assume
+the Borne shell syntax. No need to quote RFCs or market penetration
+statistics in error reports, please.
+
If, in your <.vimrc>, you set >
let g:sh_fold_enabled= 1
>
@@ -3760,7 +3765,7 @@
have the same effect.
"undercurl" is a curly underline. When "undercurl" is not possible
then "underline" is used. In general "undercurl" is only available in
- the GUI.
+ the GUI. The color is set with |highlight-guisp|.
start={term-list} *highlight-start* *E422*
stop={term-list} *term-list* *highlight-stop*
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 87b42c0..db51d84 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -1,4 +1,4 @@
-*tabpage.txt* For Vim version 7.0c. Last change: 2006 Mar 03
+*tabpage.txt* For Vim version 7.0c. Last change: 2006 Mar 31
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -119,12 +119,14 @@
label to switch to that tab page. Click where there is no label to go to the
next tab page. |'tabline'|
-:tabn[ext] *:tabn* *:tabnext* *gt*
-gt Go to the next tab page. Wraps around from the last to the
+:tabn[ext] *:tabn* *:tabnext* *gt*
+gt *CTRL-<PageDown>* *<C-PageDown>*
+<C-PageDown> Go to the next tab page. Wraps around from the last to the
first one.
:tabn[ext] {count}
-{count}gt Go to tab page {count}. The first tab page has number one.
+{count}gt *CTRL-<PageUp>* *<C-PageUp>*
+<C-PageUp> Go to tab page {count}. The first tab page has number one.
:tabp[revious] *:tabp* *:tabprevious* *gT*
@@ -198,6 +200,8 @@
within one tab page. Other tab pages can show differences between other
files.
+Variables local to a tab page start with "t:". |tabpage-variable|
+
The TabLeave and TabEnter autocommand events can be used to do something when
switching from one tab page to another. The exact order depends on what you
are doing. When creating a new tab page this works as if you create a new
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 32e2f0b..3e2de48 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -1042,6 +1042,7 @@
++bad editing.txt /*++bad*
++bin editing.txt /*++bin*
++builtin_terms various.txt /*++builtin_terms*
+++edit editing.txt /*++edit*
++enc editing.txt /*++enc*
++ff editing.txt /*++ff*
++nobin editing.txt /*++nobin*
@@ -1655,7 +1656,6 @@
45.3 usr_45.txt /*45.3*
45.4 usr_45.txt /*45.4*
45.5 usr_45.txt /*45.5*
-755 spell.txt /*755*
8g8 various.txt /*8g8*
90.1 usr_90.txt /*90.1*
90.2 usr_90.txt /*90.2*
@@ -1676,6 +1676,8 @@
:. cmdline.txt /*:.*
:/ cmdline.txt /*:\/*
:0file editing.txt /*:0file*
+:2match pattern.txt /*:2match*
+:3match pattern.txt /*:3match*
::. cmdline.txt /*::.*
::8 cmdline.txt /*::8*
::e cmdline.txt /*::e*
@@ -2909,8 +2911,8 @@
<C-LeftMouse> tagsrch.txt /*<C-LeftMouse>*
<C-MouseDown> scroll.txt /*<C-MouseDown>*
<C-MouseUp> scroll.txt /*<C-MouseUp>*
-<C-PageDown> os_dos.txt /*<C-PageDown>*
-<C-PageUp> os_dos.txt /*<C-PageUp>*
+<C-PageDown> tabpage.txt /*<C-PageDown>*
+<C-PageUp> tabpage.txt /*<C-PageUp>*
<C-Right> motion.txt /*<C-Right>*
<C-RightMouse> tagsrch.txt /*<C-RightMouse>*
<CR> motion.txt /*<CR>*
@@ -3118,6 +3120,8 @@
COMSPEC starting.txt /*COMSPEC*
CR-used-for-NL pattern.txt /*CR-used-for-NL*
CTRL-6 editing.txt /*CTRL-6*
+CTRL-<PageDown> tabpage.txt /*CTRL-<PageDown>*
+CTRL-<PageUp> tabpage.txt /*CTRL-<PageUp>*
CTRL-A change.txt /*CTRL-A*
CTRL-B scroll.txt /*CTRL-B*
CTRL-C pattern.txt /*CTRL-C*
@@ -3961,6 +3965,7 @@
E752 spell.txt /*E752*
E753 spell.txt /*E753*
E754 spell.txt /*E754*
+E755 spell.txt /*E755*
E756 spell.txt /*E756*
E757 options.txt /*E757*
E758 spell.txt /*E758*
@@ -3994,6 +3999,9 @@
E783 spell.txt /*E783*
E784 tabpage.txt /*E784*
E785 eval.txt /*E785*
+E786 eval.txt /*E786*
+E787 diff.txt /*E787*
+E788 autocmd.txt /*E788*
E79 message.txt /*E79*
E80 message.txt /*E80*
E800 arabic.txt /*E800*
@@ -4428,6 +4436,7 @@
alt-input debugger.txt /*alt-input*
alternate-file editing.txt /*alternate-file*
amiga-window starting.txt /*amiga-window*
+anonymous-function eval.txt /*anonymous-function*
ant.vim syntax.txt /*ant.vim*
ap motion.txt /*ap*
apache.vim syntax.txt /*apache.vim*
@@ -5398,6 +5407,10 @@
g:netrw_use_nt_rcp pi_netrw.txt /*g:netrw_use_nt_rcp*
g:netrw_win95ftp pi_netrw.txt /*g:netrw_win95ftp*
g:netrw_winsize pi_netrw.txt /*g:netrw_winsize*
+g:tar_browseoptions pi_tar.txt /*g:tar_browseoptions*
+g:tar_cmd pi_tar.txt /*g:tar_cmd*
+g:tar_readoptions pi_tar.txt /*g:tar_readoptions*
+g:tar_writeoptions pi_tar.txt /*g:tar_writeoptions*
g:var eval.txt /*g:var*
g; motion.txt /*g;*
g< message.txt /*g<*
@@ -6052,6 +6065,7 @@
match() eval.txt /*match()*
match-highlight pattern.txt /*match-highlight*
match-parens tips.txt /*match-parens*
+matcharg() eval.txt /*matcharg()*
matchend() eval.txt /*matchend()*
matchit-install usr_05.txt /*matchit-install*
matchlist() eval.txt /*matchlist()*
@@ -6426,6 +6440,7 @@
papp.vim syntax.txt /*papp.vim*
paragraph motion.txt /*paragraph*
pascal.vim syntax.txt /*pascal.vim*
+pathshorten() eval.txt /*pathshorten()*
pattern pattern.txt /*pattern*
pattern-atoms pattern.txt /*pattern-atoms*
pattern-multi-byte pattern.txt /*pattern-multi-byte*
@@ -6607,8 +6622,8 @@
redo undo.txt /*redo*
redo-register undo.txt /*redo-register*
ref intro.txt /*ref*
-ref-toc help.txt /*ref-toc*
reference intro.txt /*reference*
+reference_toc help.txt /*reference_toc*
regexp pattern.txt /*regexp*
regexp-changes-5.4 version5.txt /*regexp-changes-5.4*
register sponsor.txt /*register*
@@ -6876,9 +6891,7 @@
spell-affix-comment spell.txt /*spell-affix-comment*
spell-affix-flags spell.txt /*spell-affix-flags*
spell-affix-mbyte spell.txt /*spell-affix-mbyte*
-spell-affix-nocomp spell.txt /*spell-affix-nocomp*
spell-affix-not-supported spell.txt /*spell-affix-not-supported*
-spell-affix-rare spell.txt /*spell-affix-rare*
spell-affix-vim spell.txt /*spell-affix-vim*
spell-compound spell.txt /*spell-compound*
spell-dic-format spell.txt /*spell-dic-format*
@@ -6913,6 +6926,7 @@
sql-completion-columns sql.txt /*sql-completion-columns*
sql-completion-customization sql.txt /*sql-completion-customization*
sql-completion-dynamic sql.txt /*sql-completion-dynamic*
+sql-completion-filetypes sql.txt /*sql-completion-filetypes*
sql-completion-maps sql.txt /*sql-completion-maps*
sql-completion-procedures sql.txt /*sql-completion-procedures*
sql-completion-static sql.txt /*sql-completion-static*
@@ -7015,6 +7029,7 @@
system-vimrc starting.txt /*system-vimrc*
s~ change.txt /*s~*
t motion.txt /*t*
+t:var eval.txt /*t:var*
t_#2 term.txt /*t_#2*
t_#4 term.txt /*t_#4*
t_%1 term.txt /*t_%1*
@@ -7174,6 +7189,7 @@
tab-page-other tabpage.txt /*tab-page-other*
tabline-menu tabpage.txt /*tabline-menu*
tabpage tabpage.txt /*tabpage*
+tabpage-variable eval.txt /*tabpage-variable*
tabpage.txt tabpage.txt /*tabpage.txt*
tabpagebuflist() eval.txt /*tabpagebuflist()*
tabpagenr() eval.txt /*tabpagenr()*
@@ -7210,6 +7226,7 @@
tar-copyright pi_tar.txt /*tar-copyright*
tar-history pi_tar.txt /*tar-history*
tar-manual pi_tar.txt /*tar-manual*
+tar-options pi_tar.txt /*tar-options*
tar-usage pi_tar.txt /*tar-usage*
tar.txt pi_tar.txt /*tar.txt*
tcl if_tcl.txt /*tcl*
@@ -7663,6 +7680,7 @@
win16-various gui_w16.txt /*win16-various*
win32 os_win32.txt /*win32*
win32-!start gui_w32.txt /*win32-!start*
+win32-PATH os_win32.txt /*win32-PATH*
win32-colors gui_w32.txt /*win32-colors*
win32-compiling os_win32.txt /*win32-compiling*
win32-curdir os_win32.txt /*win32-curdir*
@@ -7682,6 +7700,7 @@
win32s os_win32.txt /*win32s*
winbufnr() eval.txt /*winbufnr()*
wincol() eval.txt /*wincol()*
+window windows.txt /*window*
window-contents intro.txt /*window-contents*
window-exit editing.txt /*window-exit*
window-move-cursor windows.txt /*window-move-cursor*
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt
index e5e934b..75c0522 100644
--- a/runtime/doc/todo.txt
+++ b/runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*todo.txt* For Vim version 7.0c. Last change: 2006 Apr 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,22 +30,22 @@
*known-bugs*
-------------------- Known bugs and current work -----------------------
-When "search" is in 'foldopen' have [s and ]s open folds.
-
New Hungarian dictionary. (Laci Nemeth)
- test COMPOUNDFORBIDFLAG
- implement use of COMPOUNDPERMITFLAG
- implement use of CHECKCOMPOUND* flags, <compoptions>
- implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[].
- explain the use of affix flags, replace |spell-affix-rare|
+- Support flags on a suffix used for second level affixes.
+ The flags may also be used for compounding. Default is an OR
+ mechanism with the flags of the word.
+ Adding "compset" flag on the affixes means the compound flags of the word
+ are not used?
-- Set user variables to the names of the actually used user vimrc file,
- the first directory looked for user plugins/syntax files.
- $MYVIMRC for .vimrc, $MYGVIMRC for .gvimrc, $MYRUNTIME/plugin for
- runtime files?
- Also: when the environment variable exists, use it. If it doesn't
- exist, set it. Requires good names: $VIM_USER_VIMRC $VIM_USER_DIR
- Add a menu item "Preferences" that does "sp $MYVIMRC".
+- implement use of CHECKCOMPOUND* flags, <compoptions> in .spl file
+
+- Add CHECKCOMPOUNDCASE: when compounding make leading capital lower case.
+ How is it supposed to work?
+
+- implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[].
+
+Obey 'switchbuf' "useopen" value for windows in other tabs, e.g. for :sbuffer.
+Or use another value, e.g., "usetab"?
Add more tests for all new functionality in Vim 7. Especially new functions.
@@ -641,7 +641,7 @@
UnxUtils.zip archive.
Alternate one: http://www.pramodx.20m.com/tee_for_win32.htm, but Walter
Briscoe says it's not as good.
-8 'fillchars' doesn't work for multi-byte characters.
+8 "stl" and "stlnc" in 'fillchars' don't work for multi-byte characters.
8 Command line completion: buffers "foo.txt" and "../b/foo.txt", completing
":buf foo<Tab>" doesn't find the second one. (George V. Reilly)
7 Output for ":scriptnames" and ":breaklist" should shorten the file names:
@@ -1090,7 +1090,6 @@
Tab pages:
-9 Win32 GUI: menu for tab pages line.
9 GUI implementation for the tab pages line for other systems.
8 Make GUI menu in tab pages line configurable. Like the popup menu.
8 tab pages in the session file, if "tabpages" in 'sessionoptions'
@@ -1106,28 +1105,14 @@
Spell checking:
-- Implement COMPOUNDFORBIDFLAG .
- Check out Hunspell 1.1.4.
The manpage doesn't match the source code...
Try to make the newly added features compatible.
what does MAXNGRAMSUGS do?
is COMPLEXPREFIXES necessary when we have flags for affixes?
-- Look into Hungarian dictionary: hu_HU-1.0.tar.gz
- This one doesn't match with Hunspell 1.1.4.
-- Add CHECKCOMPOUNDCASE: when compounding make leading capital lower case.
- How is it supposed to work?
-- When compounding Hunspell doesn't allow affixes inside the compound word,
- only before and after it. COMPOUNDPERMITFLAG can be used to allow it.
- Check Myspell and Aspell if they also work this way.
- Thus a word + suffix needs a flag that it can't be used with a following
- compound, and word + prefix can't be after another word in a compound.
+- Add a command the repeats ]s and z=, showing the misspelled word in its
+ context. Thus to spell-check a whole file.
- suggestion for "KG" to "kg" when it's keepcase.
-- Support flags on a suffix. Used for second level affixes, rare and
- nocomp. The flags may also be used for compounding. Default is an OR
- mechanism with the flags of the word. Adding "compset" on the affixes
- means the compound flags of the word are not used.
- Instead of "SFX a 0 add/FLAGS ." we could use "SFX a 0 add . /FLAGS" (or
- support both).
- Support breakpoint character ? 0xb7 and ignore it? Makes it possible to
use same wordlist for hyphenation.
- Compound word is accepted if nr of words is <= COMPOUNDWORDMAX OR nr of
@@ -1335,6 +1320,8 @@
cluster can be added to existing syntax items.
8 C syntax: Don't highlight {} as errors inside () when used like this:
"({ something })", often used in GCC code.
+7 Add a "startgroup" to a region. Used like "nextgroup" inside the region,
+ preferred item at the start of the region. (Charles Campbell)
8 When editing a new file without a name and giving it a name (by writing
it) and 'filetype' is not set, detect the filetype. Avoid doing it for
":wq file".
@@ -2245,6 +2232,12 @@
'cindent', 'smartindent':
+8 Aligning with "e" of "error" because of the ':' doesn't make sense:
+ cout << ( a ? f() : "error")
+8 Wrong indent with default settings when (dl) appears in this line:
+ (dl)->barbar(
+ dk);
+ When "(dl)" is changed to "dl" it uses 'sw' * 2 as expected.
8 Wrong indent below ? : with ():
if ((a ? (b) : c) != 0)
aligns with ":".
diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt
index e2c6207..0906dc7 100644
--- a/runtime/doc/usr_05.txt
+++ b/runtime/doc/usr_05.txt
@@ -1,4 +1,4 @@
-*usr_05.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*usr_05.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
@@ -25,27 +25,27 @@
*05.1* The vimrc file *vimrc-intro*
You probably got tired of typing commands that you use very often. To start
-with all your favorite option settings and mappings, you write them in what is
-called the vimrc file. Vim reads this file when it starts up.
+Vim with all your favorite option settings and mappings, you write them in
+what is called the vimrc file. Vim executes the commands in this file when it
+starts up.
-If you have trouble finding your vimrc file, use this command: >
+If you already have a vimrc file (e.g., when your sysadmin has one setup for
+you), you can edit it this way: >
- :scriptnames
+ :edit $MYVIMRC
-One of the first files in the list should be called ".vimrc" or "_vimrc" and
-is located in your home directory.
- If you don't have a vimrc file yet, see |vimrc| to find out where you can
+If you don't have a vimrc file yet, see |vimrc| to find out where you can
create a vimrc file. Also, the ":version" command mentions the name of the
"user vimrc file" Vim looks for.
-For Unix this file is always used: >
+For Unix and Macintosh this file is always used and is recommended:
- ~/.vimrc
+ ~/.vimrc ~
-For MS-DOS and MS-Windows it is mostly one of these: >
+For MS-DOS and MS-Windows you can use one of these:
- $HOME/_vimrc
- $VIM/_vimrc
+ $HOME/_vimrc ~
+ $VIM/_vimrc ~
The vimrc file can contain all the commands that you type after a colon. The
most simple ones are for setting options. For example, if you want Vim to
diff --git a/runtime/doc/usr_24.txt b/runtime/doc/usr_24.txt
index 385bc7e..8521d59 100644
--- a/runtime/doc/usr_24.txt
+++ b/runtime/doc/usr_24.txt
@@ -1,4 +1,4 @@
-*usr_24.txt* For Vim version 7.0c. Last change: 2005 Apr 01
+*usr_24.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
@@ -232,6 +232,32 @@
The results depend on what is found in your file system, of course. The
matches are sorted alphabetically.
+
+COMPLETING IN SOURCE CODE
+
+Source code files are well structured. That makes it possible to do
+completion in an intelligent way. In Vim this is called Omni completion. In
+some other editors it's called intellisense, but that is a trademark.
+
+The key to Omni completion is CTRL-X CTRL-O. Obviously the O stands for Omni
+here, so that you can remember it easier. Let's use an example for editing C
+source:
+
+ { ~
+ struct foo *p; ~
+ p-> ~
+
+The cursor is after "p->". Now type CTRL-X CTRL-O. Vim will offer you a list
+of alternatives, which are the items that "struct foo" contains. That is
+quite different from using CTRL-P, which would complete any word, while only
+members of "struct foo" are valid here.
+
+For Omni completion to work you may need to do some setup. For C code you
+need to create a tags file and set the 'tags' option. That is explained
+|ft-c-omni|. For other filetypes you may need to do something similar, look
+below |compl-omni-filetypes|. It only works for specific filetypes. Check
+the value of the 'omnifunc' option to find out if it would work.
+
==============================================================================
*24.4* Repeating an insert
diff --git a/runtime/doc/usr_31.txt b/runtime/doc/usr_31.txt
index a5fc02e..86de40d 100644
--- a/runtime/doc/usr_31.txt
+++ b/runtime/doc/usr_31.txt
@@ -1,4 +1,4 @@
-*usr_31.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*usr_31.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
@@ -249,6 +249,11 @@
an xterm that supports resizing).
The gvimrc file is searched for in the same locations as the vimrc file.
Normally it's name is "~/.gvimrc" for Unix and "$VIM/_gvimrc" for MS-Windows.
+The $MYGVIMRC environment variable is set to it, thus you can use this command
+to edit the file, if you have one: >
+
+ :edit $MYGVIMRC
+<
If for some reason you don't want to use the normal gvimrc file, you can
specify another one with the "-U" argument: >
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index b21b7c3..1ce27b2 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -1,4 +1,4 @@
-*usr_toc.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*usr_toc.txt* For Vim version 7.0c. Last change: 2006 Apr 02
VIM USER MANUAL - by Bram Moolenaar
@@ -49,7 +49,7 @@
Reference manual
-|ref-toc| More detailed information for all commands
+|reference_toc| More detailed information for all commands
The user manual is available as a single, ready to print HTML and PDF file
here:
diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt
index 46356b0..8e55aac 100644
--- a/runtime/doc/version7.txt
+++ b/runtime/doc/version7.txt
@@ -1,4 +1,4 @@
-*version7.txt* For Vim version 7.0c. Last change: 2006 Mar 29
+*version7.txt* For Vim version 7.0c. Last change: 2006 Apr 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -86,6 +86,12 @@
For filetype detection: For many types, instead of ~/.dir/filename use
*/.dir/filename, so that it also works for other user's files.
+For quite a few filetypes the indent settings have been moved from the
+filetype plugin to the indent plugin. If you used: >
+ :filetype plugin on
+Then some indent settings may be missing. You need to use: >
+ :filetype plugin indent on
+
":0verbose" now sets 'verbose' to zero instead of one.
Removed the old and incomplete "VimBuddy" code.
@@ -151,6 +157,10 @@
abbreviated. This caused unexpected behavior, such as <li> being recognized
as <line1>. The items can no longer be abbreviated.
+When executing a FileChangedRO autocommand it is no longer allowed to switch
+to another buffer or edit another file. This is to prevent crashes (the event
+is triggered deep down in the code where changing buffers is not anticipated).
+
==============================================================================
NEW FEATURES *new-7*
@@ -170,7 +180,7 @@
can be used to turn the string back into the variable value.
The |:let| command can now use "+=". ":let var += expr" works like
-":let var = var + expr". "-=" and ".=" works in a similar way.
+":let var = var + expr". "-=" and ".=" work in a similar way.
With the |:profile| command you can find out where your function or script
wastes its time.
@@ -277,6 +287,8 @@
The |--remote-tab| argument can be used to edit a file in a new tab page in an
already running Vim server.
+Variables starting with "t:" are local to a tab page.
+
More info here: |tabpage|
The Win32 GUI tabs were implemented by Yegappan Lakshmanan.
@@ -747,6 +759,7 @@
|maparg()| extra argument: use abbreviation
|mapcheck()| extra argument: use abbreviation
|match()| extra argument: count
+|matcharg()| return arguments of |:match| command
|matchend()| extra argument: count
|matchlist()| list with match and submatches of a pattern in a string
|matchstr()| extra argument: count
@@ -981,6 +994,11 @@
Others: ~
+The |:read| command has the |++edit| argument. This means it will use the
+detected 'fileformat', 'fileencoding' and other options for the buffer. This
+also fixes the problem that editing a compressed file didn't set these
+options.
+
The Netbeans interface was updated for Sun Studio 10. The protocol number
goes from 2.2 to 2.3. (Gordon Prieur)
@@ -1056,6 +1074,9 @@
Ruby interface: add line number methods. (Ryan Paul)
+The $MYVIMRC environment variable is set to the first found vimrc file.
+The $MYGVIMRC environment variable is set to the first found gvimrc file.
+
==============================================================================
IMPROVEMENTS *improvements-7*
@@ -2183,7 +2204,7 @@
Ruby interface: when inserting/deleting lines display wasn't updated. (Ryan
Paul)
---- fixes since Vim 6.0b ---
+--- fixes since Vim 7.0b ---
Getting the GCC version in configure didn't work with Solaris sed. First
strip any "darwin." and then get the version number.
@@ -2217,7 +2238,7 @@
Typing BS at the "z=" prompt removed the prompt.
---- fixes since Vim 6.0c ---
+--- fixes since Vim 7.0c ---
When jumping to another tab page the Vim window size was always set, even when
nothing in the layout changed.
@@ -2255,4 +2276,113 @@
Win32: Set the default for 'isprint' back to the wrong default "@,~-255",
because many people use Windows-1252 while 'encoding' is "latin1".
+GTK: Added a workaround for gvim crashing when used over an untrusted ssh
+link, caused by GTK doing something nasty. (Ed Catmur)
+
+Win32: The font used for the tab page labels is too big. Use the system menu
+font. (George Reilly)
+
+Win32: Adjusting the window position and size to keep it on the screen didn't
+work properly when the taskbar is on the left or top of the screen.
+
+The installman.sh and installml.sh scripts use ${10}, that didn't work with
+old shells. And use "test -f" instead of "test -e".
+
+Win32: When 'encoding' was set in the vimrc then a directory argument for diff
+mode didn't work.
+
+GUI: at the inputlist() prompt the cursorshape was adjusted as if the windows
+were still at their old position.
+
+The parenmatch plugin didn't remember the highlighting per window.
+
+Using ":bd" for a buffer that's the current window in another tab page caused
+a crash.
+
+For a new tab page the 'scroll' option wasn't set to a good default.
+
+Using an end offset for a search "/pat/e" didn't work properly for multi-byte
+text. (Yukihiro Nakadaira)
+
+":s/\n/,/" doubled the text when used on the last line.
+
+When "search" is in 'foldopen' "[s" and "]s" now open folds.
+
+When using a numbered function "dict" can be omitted, but "self" didn't work
+then. Always add FC_DICT to the function flags when it's part of a
+dictionary.
+
+When "--remote-tab" executes locally it left an empty tab page.
+
+"gvim -u NONE", ":set cursorcolumn", "C" in the second line didn't update
+text. Do update further lines even though the "$" is displayed.
+
+VMS: Support GTK better, also enable +clientserver. (Zoltan Arpadffy)
+
+When highlighting of statusline or tabline is changed there was no redraw to
+show the effect.
+
+Mac: Added "CFBundleIdentifier" to infplist.xml.
+
+Added tabpage-local variables t:var.
+
+Win32: Added double-click in tab pages line creates new tab. (Yegappan
+Lakshmanan)
+
+Motif: Added GUI tab pages line. (Yegappan Lakshmanan)
+
+Fixed crash when 'lines' was set to 1000 in a modeline.
+
+When init_spellfile() finds a writable directory in 'runtimepath' but it
+doesn't contain a "spell" directory, create one.
+
+Win32: executable() also finds "xxd" in the directory where Vim was started,
+but "!xxd" doesn't work. Append the Vim starting directory to $PATH.
+
+The tab page labels are shortened, directory names are reduced to a single
+letter by default. Added the pathshorten() function to allow a user to do the
+same.
+
+":saveas" now resets 'readonly' if the file was successfully written.
+
+Set $MYVIMRC file to the first found .vimrc file.
+Set $MYGVIMRC file to the first found .gvimrc file.
+Added menu item "Startup Settings" that edits the $MYVIMRC file
+
+Added matcharg().
+
+Error message E745 appeared twice. Renamed one to E786.
+
+Fixed crash when using "au BufRead * Sexplore" and doing ":help". Was wiping
+out a buffer that's still in a window.
+
+":hardcopy" resulted in an error message when 'encoding' is "utf-8" and
+'printencoding' is empty. Now it assumes latin1. (Mike Williams)
+
+The check for the toolbar feature for Motif, depending on certain included
+files, wasn't detailed enough, causing building to fail in gui_xmebw.c.
+
+Using CTRL-E in Insert mode completion after CTRL-P inserted the first match
+instead of the original text.
+
+When displaying a UTF-8 character with a zero lower byte Vim might think the
+previous character is double-wide.
+
+The "nbsp" item of 'listchars' didn't work when 'encoding' was utf-8.
+
+Motif: when Xm/xpm.h is missing gui_xmebw.c would not compile.
+HAVE_XM_UNHIGHLIGHTT_H was missing a T.
+
+Mac: Moved the .icns files into src/os_mac_rsrc, so that they can all be
+copied at once. Adjusted the Info.plist file for three icons.
+
+When Visual mode is active while switching to another tabpage could get ml_get
+errors.
+
+When 'list' is set, 'nowrap' the $ in the first column caused 'cursorcolumn'
+to move to the right.
+
+When a line wraps, 'cursorcolumn' was never displayed past the end of the
+line.
+
vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/vimball.txt b/runtime/doc/vimball.txt
index 305af96..1fc1e36 100644
--- a/runtime/doc/vimball.txt
+++ b/runtime/doc/vimball.txt
@@ -1,4 +1,4 @@
-*vimball.txt* For Vim version 7.0c. Last change: 2006 Mar 24
+*vimball.txt* For Vim version 7.0c. Last change: 2006 Apr 01
Vimball Archiver
@@ -56,6 +56,9 @@
==============================================================================
3. Vimball History *vimball-history*
+ 4 : Mar 31, 2006 * BufReadPost seems to fire twice; BufReadEnter
+ only fires once, so the "Source this file..."
+ message is now issued only once.
3 : Mar 20, 2006 * removed query, now requires sourcing to be
extracted (:so %). Message to that effect
included.
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 954373e..b6db540 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt* For Vim version 7.0c. Last change: 2006 Mar 11
+*windows.txt* For Vim version 7.0c. Last change: 2006 Apr 01
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -33,7 +33,7 @@
disabled at compile time}
==============================================================================
-1. Introduction *windows-intro*
+1. Introduction *windows-intro* *window*
A window is a viewport onto a buffer. You can use multiple windows on one
buffer, or several windows on different buffers.
@@ -618,13 +618,15 @@
The |argument-list| is set, like with the |:next| command.
The purpose of this command is that it can be used from a
program that wants Vim to edit another file, e.g., a debugger.
+ When using the |:tab| modifier each argument is opened in a
+ tab page. The last window is used if it's empty.
{only available when compiled with the +gui feature}
==============================================================================
8. Do a command in all buffers or windows *list-repeat*
*:windo*
-:windo[!] {cmd} Execute {cmd} in each window.
+:windo {cmd} Execute {cmd} in each window.
It works like doing this: >
CTRL-W t
:{cmd}