Mercurial > vim
changeset 2415:8f017e31750f vim73
Updated runtime files.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Mon, 26 Jul 2010 22:21:27 +0200 |
parents | 5bd81e397907 |
children | 1a9c16dd76d4 |
files | runtime/doc/mbyte.txt runtime/doc/message.txt runtime/doc/todo.txt runtime/filetype.vim runtime/ftplugin/sass.vim runtime/ftplugin/scss.vim runtime/indent/scss.vim runtime/makemenu.vim runtime/synmenu.vim runtime/syntax/haml.vim runtime/syntax/sass.vim runtime/syntax/scss.vim |
diffstat | 12 files changed, 124 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1,4 +1,4 @@ -*mbyte.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*mbyte.txt* For Vim version 7.3c. Last change: 2010 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar et al. @@ -928,7 +928,7 @@ 8. Input on MS-Windows *mbyte-IME* {only works Windows GUI and compiled with the |+multi_byte_ime| feature} -To input multibyte characters on Windows, you have to use Input Method Editor +To input multibyte characters on Windows, you can use an Input Method Editor (IME). In process of your editing text, you must switch status (on/off) of IME many many many times. Because IME with status on is hooking all of your key inputs, you cannot input 'j', 'k', or almost all of keys to Vim directly.
--- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.3c. Last change: 2010 Jul 20 +*message.txt* For Vim version 7.3c. Last change: 2010 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -467,7 +467,16 @@ Oh, oh. You must have been doing someth is consuming your memory. Be careful! Vim is not completely prepared for an out-of-memory situation. First make sure that any changes are saved. Then try to solve the memory shortage. To stay on the safe side, exit Vim and -start again. Also see |msdos-limitations|. +start again. + +Buffers are only partly kept in memory, thus editing a very large file is +unlikely to cause an out-of-memory situation. Undo information is completely +in memory, you can reduce that with these options: +- 'undolevels' Set to a low value, or to -1 to disable undo completely. This + helps for a change that affects all lines. +- 'undoreload' Set to zero to disable. + +Also see |msdos-limitations|. *E339* > Pattern too long
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3c. Last change: 2010 Jul 25 +*todo.txt* For Vim version 7.3c. Last change: 2010 Jul 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -31,6 +31,7 @@ be worked on, but only if you sponsor Vi -------------------- Known bugs and current work ----------------------- Access to free memory with :redir command. (Dominique Pelle, 2010 Jul 25) +Easier way to reproduce in later message. Patch for :find completion. (Nazri Ramliy) But I prefer to keep term.h and include/term.h Nazri will work on it.
--- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2010 May 14 +" Last Change: 2010 Jul 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -1633,6 +1633,9 @@ au BufNewFile,BufRead *.sa setf sather " Scilab au BufNewFile,BufRead *.sci,*.sce setf scilab +" SCSS +au BufNewFile,BufRead *.scss setf scss + " SD: Streaming Descriptors au BufNewFile,BufRead *.sd setf sd
--- a/runtime/ftplugin/sass.vim +++ b/runtime/ftplugin/sass.vim @@ -1,7 +1,7 @@ " Vim filetype plugin -" Language: Sass -" Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Last Change: 2010 May 21 +" Language: Sass +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Last Change: 2010 Jul 26 " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -9,11 +9,14 @@ if exists("b:did_ftplugin") endif let b:did_ftplugin = 1 -let b:undo_ftplugin = "setl cms< inc< ofu<" +let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<" setlocal commentstring=//\ %s +setlocal define=^\\s*\\%(@mixin\\\|=\\) +setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','') setlocal omnifunc=csscomplete#CompleteCSS +setlocal suffixesadd=.sass,.scss,.css -let &l:include = '^\s*@import\s\+\%(url(\)\=' +let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\=' " vim:set sw=2:
new file mode 100644 --- /dev/null +++ b/runtime/ftplugin/scss.vim @@ -0,0 +1,12 @@ +" Vim filetype plugin +" Language: SCSS +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Last Change: 2010 Jul 26 + +if exists("b:did_ftplugin") + finish +endif + +runtime! ftplugin/sass.vim + +" vim:set sw=2:
new file mode 100644 --- /dev/null +++ b/runtime/indent/scss.vim @@ -0,0 +1,12 @@ +" Vim indent file +" Language: SCSS +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Last Change: 2010 Jul 26 + +if exists("b:did_indent") + finish +endif + +runtime! indent/css.vim + +" vim:set sw=2:
--- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -1,6 +1,6 @@ " Script to define the syntax menu in synmenu.vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2008 Jul 13 +" Last Change: 2010 Jul 26 " This is used by "make menu" in the src directory. edit <sfile>:p:h/synmenu.vim @@ -443,6 +443,7 @@ SynMenu S-Sm.Sather:sather SynMenu S-Sm.Scheme:scheme SynMenu S-Sm.Scilab:scilab SynMenu S-Sm.Screen\ RC:screen +SynMenu S-Sm.SCSS:scss SynMenu S-Sm.SDC\ Synopsys\ Design\ Constraints:sdc SynMenu S-Sm.SDL:sdl SynMenu S-Sm.Sed:sed
--- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -2,7 +2,7 @@ " This file is normally sourced from menu.vim. " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Apr 27 +" Last Change: 2010 Jul 26 " Define the SetSyn function, used for the Syntax menu entries. " Set 'filetype' and also 'syntax' if it is manually selected.
--- a/runtime/syntax/haml.vim +++ b/runtime/syntax/haml.vim @@ -1,8 +1,8 @@ " Vim syntax file -" Language: Haml -" Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Filenames: *.haml -" Last Change: 2010 May 21 +" Language: Haml +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Filenames: *.haml +" Last Change: 2010 Jul 26 if exists("b:current_syntax") finish @@ -30,7 +30,7 @@ syn cluster hamlTop contains=ha syn match hamlBegin "^\s*\%([<>]\|&[^=~ ]\)\@!" nextgroup=hamlTag,hamlClassChar,hamlIdChar,hamlRuby,hamlPlainChar,hamlInterpolatable -syn match hamlTag "%\w\+" contained contains=htmlTagName,htmlSpecialTagName nextgroup=@hamlComponent +syn match hamlTag "%\w\+\%(:\w\+\)\=" contained contains=htmlTagName,htmlSpecialTagName nextgroup=@hamlComponent syn region hamlAttributes matchgroup=hamlAttributesDelimiter start="(" end=")" contained contains=htmlArg,hamlAttributeString,hamlAttributeVariable,htmlEvent,htmlCssDefinition nextgroup=@hamlComponent syn region hamlAttributesHash matchgroup=hamlAttributesDelimiter start="{" end="}" contained contains=@hamlRubyTop nextgroup=@hamlComponent syn region hamlObject matchgroup=hamlObjectDelimiter start="\[" end="\]" contained contains=@hamlRubyTop nextgroup=@hamlComponent
--- a/runtime/syntax/sass.vim +++ b/runtime/syntax/sass.vim @@ -1,8 +1,8 @@ " Vim syntax file -" Language: Sass -" Maintainer: Tim Pope <vimNOSPAM@tpope.org> -" Filenames: *.sass -" Last Change: 2010 May 21 +" Language: Sass +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Filenames: *.sass +" Last Change: 2010 Jul 26 if exists("b:current_syntax") finish @@ -13,16 +13,36 @@ runtime! syntax/css.vim syn case ignore syn cluster sassCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColorProp,cssTextProp,cssBoxProp,cssGeneratedContentProp,cssPagingProp,cssUIProp,cssRenderProp,cssAuralProp,cssTableProp -syn cluster sassCssAttributes contains=css.*Attr,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp +syn cluster sassCssAttributes contains=css.*Attr,scssComment,cssValue.*,cssColor,cssURL,sassDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp +syn region sassDefinition matchgroup=cssBraces start="{" end="}" contains=TOP + +syn match sassProperty "\%([{};]\s*\|^\)\@<=[[:alnum:]-]\+:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition syn match sassProperty "^\s*\zs\s\%([[:alnum:]-]\+:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute -syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassScript -syn match sassCssAttribute ".*$" contained contains=@sassCssAttributes,sassConstant -syn match sassScript ".*$" contained contains=@sassCssAttributes,sassConstant -syn match sassConstant "![[:alnum:]_-]\+" -syn match sassConstantAssignment "\%(![[:alnum:]_]\+\s*\)\@<=\%(||\)\==" nextgroup=sassScript skipwhite -syn match sassMixin "^=.*" -syn match sassMixing "^\s\+\zs+.*" +syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute +syn match sassCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|[^{};]\)*+ contained contains=@sassCssAttributes,sassVariable,sassFunction +syn match sassDefault "!default\>" contained +syn match sassVariable "!\%(important\>\|default\>\)\@![[:alnum:]_-]\+" +syn match sassVariable "$[[:alnum:]_-]\+" +syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=\%(||\)\==" nextgroup=sassCssAttribute skipwhite +syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=:" nextgroup=sassCssAttribute skipwhite + +syn match sassFunction "\<\%(rgb\|rgba\|red\|green\|blue\|mix\)\>(\@=" contained +syn match sassFunction "\<\%(hsl\|hsla\|hue\|saturation\|lightness\|adjust-hue\|lighten\|darken\|saturate\|desaturate\|grayscale\|complement\)\>(\@=" contained +syn match sassFunction "\<\%(alpha\|opacity\|rgba\|opacify\|fade-in\|transparentize\|fade-out\)\>(\@=" contained +syn match sassFunction "\<\%(unquote\|quote\)\>(\@=" contained +syn match sassFunction "\<\%(percentage\|round\|ceil\|floor\|abs\)\>(\@=" contained +syn match sassFunction "\<\%(type-of\|unit\|unitless\|comparable\)\>(\@=" contained + +syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ + +syn match sassMixinName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute +syn match sassMixin "^=" nextgroup=sassMixinName +syn match sassMixin "^\s*\zs@mixin" nextgroup=sassMixinName skipwhite +syn match sassMixing "^\s\+\zs+" nextgroup=sassMixinName +syn match sassMixing "^\s\+\zs@include" nextgroup=sassMixinName skipwhite +syn match sassMixing "\%([{};]\s*\|^\)\@<=@include" nextgroup=sassMixinName skipwhite contained containedin=sassDefinition +syn match sassExtend "^\s\+\zs@extend" syn match sassEscape "^\s*\zs\\" syn match sassIdChar "#[[:alnum:]_-]\@=" nextgroup=sassId @@ -34,28 +54,34 @@ syn match sassAmpersand "&" " TODO: Attribute namespaces " TODO: Arithmetic (including strings and concatenation) -syn region sassInclude start="@import" end=";\|$" contains=cssComment,cssURL,cssUnicodeEscape,cssMediaType -syn region sassDebugLine matchgroup=sassDebug start="@debug\>" end="$" contains=@sassCssAttributes,sassConstant -syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\)\>" end="$" contains=sassFor,@sassCssAttributes,sassConstant +syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssURL,cssUnicodeEscape,cssMediaType +syn region sassDebugLine end=";\|$" matchgroup=sassDebug start="@debug\>" contains=@sassCssAttributes,sassVariable,sassFunction +syn region sassWarnLine end=";\|$" matchgroup=sassWarn start="@warn\>" contains=@sassCssAttributes,sassVariable,sassFunction +syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\)\>" end="[{};]\@=\|$" contains=sassFor,@sassCssAttributes,sassVariable,sassFunction syn keyword sassFor from to through contained syn keyword sassTodo FIXME NOTE TODO OPTIMIZE XXX contained -syn region sassComment start="^\z(\s*\)//" end="^\%(\z1 \)\@!" contains=sassTodo -syn region sassCssComment start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=sassTodo +syn region sassComment start="^\z(\s*\)//" end="^\%(\z1 \)\@!" contains=sassTodo,@Spell +syn region sassCssComment start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=sassTodo,@Spell hi def link sassCssComment sassComment hi def link sassComment Comment -hi def link sassConstant Identifier +hi def link sassDefault cssImportant +hi def link sassVariable Identifier +hi def link sassFunction Function hi def link sassMixing PreProc hi def link sassMixin PreProc +hi def link sassExtend PreProc hi def link sassTodo Todo hi def link sassInclude Include -hi def link sassDebug Debug +hi def link sassDebug sassControl +hi def link sassWarn sassControl hi def link sassControl PreProc hi def link sassFor PreProc hi def link sassEscape Special hi def link sassIdChar Special hi def link sassClassChar Special +hi def link sassInterpolationDelimiter Delimiter hi def link sassAmpersand Character hi def link sassId Identifier hi def link sassClass Type
new file mode 100644 --- /dev/null +++ b/runtime/syntax/scss.vim @@ -0,0 +1,20 @@ +" Vim syntax file +" Language: SCSS +" Maintainer: Tim Pope <vimNOSPAM@tpope.org> +" Filenames: *.scss +" Last Change: 2010 Jul 26 + +if exists("b:current_syntax") + finish +endif + +runtime! syntax/sass.vim + +syn match scssComment "//.*" contains=sassTodo,@Spell +syn region scssComment start="/\*" end="\*/" contains=sassTodo,@Spell + +hi def link scssComment sassComment + +let b:current_syntax = "scss" + +" vim:set sw=2: