summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2005-10-03 21:52:09 +0000
committerBram Moolenaar <Bram@vim.org>2005-10-03 21:52:09 +0000
commitbb15b658647d8eca01e67df871f7cb5ed95e2534 (patch)
tree6214d5476e5b780728462e5832306a9050bef26b /runtime
parent69e0ff94dce3a017feafbd0bb60e5720cda0441b (diff)
updated for version 7.0153
Diffstat (limited to 'runtime')
-rw-r--r--runtime/autoload/csscomplete.vim6
-rw-r--r--runtime/doc/message.txt5
-rw-r--r--runtime/optwin.vim6
-rw-r--r--runtime/spell/fr/main.aap2
4 files changed, 12 insertions, 7 deletions
diff --git a/runtime/autoload/csscomplete.vim b/runtime/autoload/csscomplete.vim
index f67445439e..ea52786e71 100644
--- a/runtime/autoload/csscomplete.vim
+++ b/runtime/autoload/csscomplete.vim
@@ -1,7 +1,7 @@
" Vim completion script
" Language: CSS 2.1
" Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change: 2005 Sep 27
+" Last Change: 2005 Oct 02
function! csscomplete#CompleteCSS(findstart, base)
if a:findstart
@@ -179,7 +179,7 @@ else
elseif prop == 'font-family'
let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy"]
elseif prop == 'font-size'
- return []
+ let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
elseif prop == 'font-style'
let values = ["normal", "italic", "oblique"]
elseif prop == 'font-variant'
@@ -187,7 +187,7 @@ else
elseif prop == 'font-weight'
let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
elseif prop == 'font'
- let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
+ let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
elseif prop =~ '^\(height\|width\)$'
let values = ["auto"]
elseif prop =~ '^\(left\|rigth\)$'
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 87429e0302..14797dee3c 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -1,4 +1,4 @@
-*message.txt* For Vim version 7.0aa. Last change: 2005 Sep 25
+*message.txt* For Vim version 7.0aa. Last change: 2005 Oct 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -768,6 +768,9 @@ To reduce the number of hit-enter prompts:
- Add flags to 'shortmess'.
- Reset 'showcmd' and/or 'ruler'.
+If your script causes the hit-enter prompt and you don't know why, you may
+find the |v:scrollstart| variable useful.
+
Also see 'mouse'. The hit-enter message is highlighted with the |hl-Question|
group.
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 06d2976272..5c53b05608 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
" These commands create the option window.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2005 Sep 13
+" Last Change: 2005 Oct 02
" If there already is an option window, jump to that one.
if bufwinnr("option-window") > 0
@@ -698,9 +698,11 @@ call append("$", "formatlistpat\tpattern to recognize a numbered list")
call append("$", "\t(local to buffer)")
call <SID>OptionL("flp")
if has("insert_expand")
- call append("$", "complete\tspecifies how Insert mode completion works")
+ call append("$", "complete\tspecifies how Insert mode completion works for CTRL-N and CTRL-P")
call append("$", "\t(local to buffer)")
call <SID>OptionL("cpt")
+ call append("$", "completeopt\twhether to use a popup menu for Insert mode completion")
+ call <SID>OptionG("cot", &cot)
call append("$", "completefunc\tuser defined function for Insert mode completion")
call append("$", "\t(local to buffer)")
call <SID>OptionL("cfu")
diff --git a/runtime/spell/fr/main.aap b/runtime/spell/fr/main.aap
index 1b70b83d78..faf3e01e70 100644
--- a/runtime/spell/fr/main.aap
+++ b/runtime/spell/fr/main.aap
@@ -19,7 +19,7 @@ $SPELLDIR/fr.utf-8.spl : $FILES
:sys env LANG=fr_FR.UTF-8
$VIM -u NONE -e -c "mkspell! $SPELLDIR/fr fr_FR" -c q
-../README_fr.txt : README_fr_FR.txt lisez-moi.txt
+../README_fr.txt : README_fr_FR.txt
:cat $source >!$target
#