updated for version 7.0153
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fa51c2a..a06b6f6 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0aa. Last change: 2005 Sep 29
+*eval.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1372,6 +1372,14 @@
v:register The name of the register supplied to the last normal mode
command. Empty if none were supplied. |getreg()| |setreg()|
+ *v:scrollstart* *scrollstart-variable*
+v:scrollstart String describing the script or function that caused the
+ screen to scroll up. It's only set when it is empty, thus the
+ first reason is remembered. It is set to "Unknown" for a
+ typed command.
+ This can be used to find out why your script causes the
+ hit-enter prompt.
+
*v:servername* *servername-variable*
v:servername The resulting registered |x11-clientserver| name if any.
Read-only.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index f668c00..4b6d0eb 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.0aa. Last change: 2005 Sep 23
+*insert.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -952,6 +952,27 @@
other contexts unless a double CTRL-X is used.
+INSERT COMPLETION POPUP MENU *ins-completion-menu*
+
+Vim can display the matches in a simplistic popup menu.
+
+The menu is used when:
+- The 'completeopt' option contains "menu".
+- The terminal supports at least 8 colors.
+- There are at least two matches.
+
+While the menu is displayed these keys have a special meaning:
+<CR> and <Enter>: Accept the currently selected match
+<Up>: Select the previous match, as if CTRL-P was used
+<Down>: Select the next match, as if CTRL-N was used
+
+The colors of the menu can be changed with these highlight groups:
+Pmenu normal item |hl-Pmenu|
+PmenuSel selected item |hl-PmenuSel|
+PmenuSbar scrollbar |hl-PmenuSbar|
+PmenuThumb thumb of the scrollbar |hl-PmenuThumb|
+
+
Filetype-specific remarks for omni completion *compl-omni-filetypes*
C *ft-c-omni*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 3400094..50bae20 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.0aa. Last change: 2005 Sep 28
+*options.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1683,6 +1683,18 @@
set completefunc=CompleteMonths
<
+ *'completeopt'* *'cot'*
+'completeopt' 'cot' string (default: "menu")
+ global
+ {not in Vi}
+ Options for Insert mode completion |ins-completion|.
+ Currently the only supported value is:
+
+ menu Use a popup menu to show the possible completions. The
+ menu is only shown when there is more than one match and
+ sufficient colors are available. |ins-completion-menu|
+
+
*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
'confirm' 'cf' boolean (default off)
global
@@ -3382,7 +3394,9 @@
f:Folded,F:FoldColumn,A:DiffAdd,
C:DiffChange,D:DiffDelete,T:DiffText,
>:SignColumn,B:SpellBad,P:SpellCap,
- R:SpellRare,L:SpellLocal")
+ R:SpellRare,L:SpellLocal,
+ +:Pmenu,=:PmenuSel,
+ x:PmenuSbar,X:PmenuThumb")
global
{not in Vi}
This option can be used to set highlighting mode for various
@@ -3423,6 +3437,10 @@
|hl-SpellCap| P word that should start with capital|spell|
|hl-SpellRare| R rare word |spell|
|hl-SpellLocal| L word from other region |spell|
+ |hl-Pmenu| + popup menu normal line
+ |hl-PmenuSel| = popup menu normal line
+ |hl-PmenuSbar| x popup menu scrollbar
+ |hl-PmenuThumb| X popup menu scrollbar thumb
The display modes are:
r reverse (termcap entry "mr" and "me")
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 7335d30..dcd83b7 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0aa. Last change: 2005 Jun 30
+*starting.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -789,10 +789,11 @@
4. Load the plugin scripts. *load-plugins*
This does the same as the command: >
- :runtime! plugin/*.vim
+ :runtime! plugin/**/*.vim
< The result is that all directories in the 'runtimepath' option will be
searched for the "plugin" sub-directory and all files ending in ".vim"
- will be sourced (in alphabetical order per directory).
+ will be sourced (in alphabetical order per directory), also in
+ subdirectories.
Loading plugins won't be done when:
- The 'loadplugins' option was reset in a vimrc file.
- The |--noplugin| command line argument is used.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 021a158..17bc635 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.0aa. Last change: 2005 Sep 27
+*syntax.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3926,6 +3926,14 @@
doesn't fit at the end of the line).
*hl-Normal*
Normal normal text
+ *hl-Pmenu*
+Pmenu Popup menu: normal item.
+ *hl-PmenuSel*
+PmenuSel Popup menu: selected item.
+ *hl-PmenuSbar*
+PmenuSbar Popup menu: scrollbar.
+ *hl-PmenuThumb*
+PmenuThumb Popup menu: Thumb of the scrollbar.
*hl-Question*
Question |hit-enter| prompt and yes/no questions
*hl-Search*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 44e189a..31c5f16 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -120,10 +120,12 @@
'compatible' options.txt /*'compatible'*
'complete' options.txt /*'complete'*
'completefunc' options.txt /*'completefunc'*
+'completeopt' options.txt /*'completeopt'*
'confirm' options.txt /*'confirm'*
'consk' options.txt /*'consk'*
'conskey' options.txt /*'conskey'*
'copyindent' options.txt /*'copyindent'*
+'cot' options.txt /*'cot'*
'cp' options.txt /*'cp'*
'cpo' options.txt /*'cpo'*
'cpoptions' options.txt /*'cpoptions'*
@@ -5353,6 +5355,10 @@
hl-MoreMsg syntax.txt /*hl-MoreMsg*
hl-NonText syntax.txt /*hl-NonText*
hl-Normal syntax.txt /*hl-Normal*
+hl-Pmenu syntax.txt /*hl-Pmenu*
+hl-PmenuSbar syntax.txt /*hl-PmenuSbar*
+hl-PmenuSel syntax.txt /*hl-PmenuSel*
+hl-PmenuThumb syntax.txt /*hl-PmenuThumb*
hl-Question syntax.txt /*hl-Question*
hl-Scrollbar syntax.txt /*hl-Scrollbar*
hl-Search syntax.txt /*hl-Search*
@@ -5546,6 +5552,7 @@
inputsave() eval.txt /*inputsave()*
inputsecret() eval.txt /*inputsecret()*
ins-completion insert.txt /*ins-completion*
+ins-completion-menu insert.txt /*ins-completion-menu*
ins-expandtab insert.txt /*ins-expandtab*
ins-reverse rileft.txt /*ins-reverse*
ins-smarttab insert.txt /*ins-smarttab*
@@ -6363,6 +6370,7 @@
scrollbind-quickadj scroll.txt /*scrollbind-quickadj*
scrollbind-relative scroll.txt /*scrollbind-relative*
scrolling scroll.txt /*scrolling*
+scrollstart-variable eval.txt /*scrollstart-variable*
sdl.vim syntax.txt /*sdl.vim*
search() eval.txt /*search()*
search-commands pattern.txt /*search-commands*
@@ -6948,6 +6956,7 @@
v:profiling eval.txt /*v:profiling*
v:progname eval.txt /*v:progname*
v:register eval.txt /*v:register*
+v:scrollstart eval.txt /*v:scrollstart*
v:servername eval.txt /*v:servername*
v:shell_error eval.txt /*v:shell_error*
v:statusmsg eval.txt /*v:statusmsg*
@@ -7324,6 +7333,13 @@
zg spell.txt /*zg*
zh scroll.txt /*zh*
zi fold.txt /*zi*
+zip zip.txt /*zip*
+zip-contents zip.txt /*zip-contents*
+zip-copyright zip.txt /*zip-copyright*
+zip-history zip.txt /*zip-history*
+zip-manual zip.txt /*zip-manual*
+zip-usage zip.txt /*zip-usage*
+zip.txt zip.txt /*zip.txt*
zj fold.txt /*zj*
zk fold.txt /*zk*
zl scroll.txt /*zl*
diff --git a/runtime/menu.vim b/runtime/menu.vim
index f4ed1b5..1a221bf 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Aug 16
+" Last Change: 2005 Oct 01
" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
@@ -902,7 +902,7 @@
endif
let curcol = col('.')
- let w = spellbadword()
+ let [w, a] = spellbadword()
if col('.') > curcol " don't use word after the cursor
let w = ''
call cursor(0, curcol) " put the cursor back where it was