diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-06-01 14:50:56 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-06-01 14:50:56 +0200 |
commit | 543b7ef7000d08d77409478315d68b607bb8bad8 (patch) | |
tree | 387cd45294ce55a130556d4e22a0b7706156b1fd /runtime | |
parent | 3737fc1c30a559c82c57b5ce6aedae76cbeabaef (diff) |
Updated runtime files and translations.
Diffstat (limited to 'runtime')
62 files changed, 5034 insertions, 837 deletions
diff --git a/runtime/autoload/tohtml.vim b/runtime/autoload/tohtml.vim index 2e9021a48e..9be2d29340 100644 --- a/runtime/autoload/tohtml.vim +++ b/runtime/autoload/tohtml.vim @@ -1,6 +1,6 @@ " Vim autoload file for the tohtml plugin. " Maintainer: Ben Fritz <fritzophrenic@gmail.com> -" Last Change: 2012 Jun 30 +" Last Change: 2013 May 31 " " Additional contributors: " @@ -401,13 +401,13 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{ call add(html, '</head>') let body_line_num = len(html) if !empty(s:settings.prevent_copy) - call add(html, "<body onload='FixCharWidth();'>") + call add(html, "<body onload='FixCharWidth(); JumpToLine();'>") call add(html, "<!-- hidden divs used by javascript to get the width of a char -->") call add(html, "<div id='oneCharWidth'>0</div>") call add(html, "<div id='oneInputWidth'><input size='1' value='0'".tag_close."</div>") call add(html, "<div id='oneEmWidth' style='width: 1em;'></div>") else - call add(html, '<body>') + call add(html, '<body onload="JumpToLine();">') endif call add(html, "<table border='1' width='100%' id='vimCodeElement'>") @@ -503,6 +503,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{ call add(html, s:body_end_line) call add(html, '</html>') + " The generated HTML is admittedly ugly and takes a LONG time to fold. + " Make sure the user doesn't do syntax folding when loading a generated file, + " using a modeline. + call add(html, '<!-- vim: set foldmethod=manual : -->') + let i = 1 let name = "Diff" . (s:settings.use_xhtml ? ".xhtml" : ".html") " Find an unused file name if current file name is already in use @@ -539,14 +544,12 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{ " add required javascript in reverse order so we can just call append again " and again without adjusting {{{ - " insert script closing tag if any javascript is needed - if s:settings.dynamic_folds || !empty(s:settings.prevent_copy) - call append(style_start, [ - \ '', - \ s:settings.use_xhtml ? '//]]>' : '-->', - \ "</script>" - \ ]) - endif + " insert script closing tag + call append(style_start, [ + \ '', + \ s:settings.use_xhtml ? '//]]>' : '-->', + \ "</script>" + \ ]) " insert script which corrects the size of small input elements in " prevent_copy mode. See 2html.vim for details on why this is needed and how @@ -572,6 +575,55 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{ \ '}' \ ]) endif + " + " insert javascript to get IDs from line numbers, and to open a fold before + " jumping to any lines contained therein + call append(style_start, [ + \ " /* Always jump to new location even if the line was hidden inside a fold, or", + \ " * we corrected the raw number to a line ID.", + \ " */", + \ " if (lineElem) {", + \ " lineElem.scrollIntoView(true);", + \ " }", + \ " return true;", + \ "}", + \ "if ('onhashchange' in window) {", + \ " window.onhashchange = JumpToLine;", + \ "}" + \ ]) + if s:settings.dynamic_folds + call append(style_start, [ + \ "", + \ " /* navigate upwards in the DOM tree to open all folds containing the line */", + \ " var node = lineElem;", + \ " while (node && node.id != 'vimCodeElement')", + \ " {", + \ " if (node.className == 'closed-fold')", + \ " {", + \ " /* toggle open the fold ID (remove window ID) */", + \ " toggleFold(node.id.substr(4));", + \ " }", + \ " node = node.parentNode;", + \ " }", + \ ]) + endif + call append(style_start, [ + \ "", + \ "/* function to open any folds containing a jumped-to line before jumping to it */", + \ "function JumpToLine()", + \ "{", + \ " var lineNum;", + \ " lineNum = window.location.hash;", + \ " lineNum = lineNum.substr(1); /* strip off '#' */", + \ "", + \ " if (lineNum.indexOf('L') == -1) {", + \ " lineNum = 'L'+lineNum;", + \ " }", + \ " if (lineNum.indexOf('W') == -1) {", + \ " lineNum = 'W1'+lineNum;", + \ " }", + \ " lineElem = document.getElementById(lineNum);" + \ ]) " Insert javascript to toggle matching folds open and closed in all windows, " if dynamic folding is active. @@ -596,12 +648,11 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{ \ ]) endif - " insert script tag if any javascript is needed - if s:settings.dynamic_folds || s:settings.prevent_copy != "" - call append(style_start, [ - \ "<script type='text/javascript'>", - \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"]) - endif "}}} + " insert script tag; javascript is always needed for the line number + " normalization for URL hashes + call append(style_start, [ + \ "<script type='text/javascript'>", + \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"]) " Insert styles from all the generated html documents and additional styles " for the table-based layout of the side-by-side diff. The diff should take diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim index 6aaa2441e4..a36f9f6972 100644 --- a/runtime/colors/koehler.vim +++ b/runtime/colors/koehler.vim @@ -2,7 +2,7 @@ " vim: tw=0 ts=4 sw=4 " Vim color file " Maintainer: Ron Aaron <ron@ronware.org> -" Last Change: 2006 Dec 10 +" Last Change: 2013 May 23 hi clear set background=dark @@ -43,6 +43,8 @@ hi MatchParen term=reverse ctermfg=blue guibg=Blue hi TabLine term=bold,reverse cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white hi TabLineFill term=bold,reverse cterm=bold ctermfg=lightblue ctermbg=white gui=bold guifg=blue guibg=white hi TabLineSel term=reverse ctermfg=white ctermbg=lightblue guifg=white guibg=blue +hi Underlined term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline +hi Ignore ctermfg=black ctermbg=black guifg=black guibg=black hi link IncSearch Visual hi link String Constant hi link Character Constant diff --git a/runtime/colors/ron.vim b/runtime/colors/ron.vim index 45d64455ad..1e9caa3150 100644 --- a/runtime/colors/ron.vim +++ b/runtime/colors/ron.vim @@ -2,7 +2,7 @@ " vim: tw=0 ts=4 sw=4 " Vim color file " Maintainer: Ron Aaron <ron@ronware.org> -" Last Change: 2003 May 02 +" Last Change: 2013 May 24 set background=dark hi clear @@ -11,7 +11,7 @@ if exists("syntax_on") endif let g:colors_name = "ron" hi Normal guifg=cyan guibg=black -hi NonText guifg=brown +hi NonText guifg=yellow guibg=#303030 hi comment guifg=green hi constant guifg=cyan gui=bold hi identifier guifg=cyan gui=NONE @@ -24,10 +24,11 @@ hi WarningMsg guifg=Black guibg=Green hi Error guibg=Red hi Todo guifg=Black guibg=orange hi Cursor guibg=#60a060 guifg=#00ff00 -hi Search guibg=lightslateblue +hi Search guibg=darkgray guifg=black gui=bold hi IncSearch gui=NONE guibg=steelblue hi LineNr guifg=darkgrey hi title guifg=darkgrey +hi ShowMarksHL ctermfg=cyan ctermbg=lightblue cterm=bold guifg=yellow guibg=black gui=bold hi StatusLineNC gui=NONE guifg=lightblue guibg=darkblue hi StatusLine gui=bold guifg=cyan guibg=blue hi label guifg=gold2 @@ -41,3 +42,4 @@ hi DiffDelete guibg=coral hi Folded guibg=gray30 hi FoldColumn guibg=gray30 guifg=white hi cIf0 guifg=gray +hi diffOnly guifg=red gui=bold diff --git a/runtime/compiler/haml.vim b/runtime/compiler/haml.vim new file mode 100644 index 0000000000..faa1fd9780 --- /dev/null +++ b/runtime/compiler/haml.vim @@ -0,0 +1,23 @@ +if exists("current_compiler") + finish +endif +let current_compiler = "haml" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo-=C + +CompilerSet makeprg=haml\ -c + +CompilerSet errorformat= + \Haml\ %trror\ on\ line\ %l:\ %m, + \Syntax\ %trror\ on\ line\ %l:\ %m, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim:set sw=2 sts=2: diff --git a/runtime/compiler/sass.vim b/runtime/compiler/sass.vim new file mode 100644 index 0000000000..8340b9c7de --- /dev/null +++ b/runtime/compiler/sass.vim @@ -0,0 +1,25 @@ +if exists("current_compiler") + finish +endif +let current_compiler = "sass" + +if exists(":CompilerSet") != 2 " older Vim always used :setlocal + command -nargs=* CompilerSet setlocal <args> +endif + +let s:cpo_save = &cpo +set cpo-=C + +CompilerSet makeprg=sass\ -c + +CompilerSet errorformat= + \%f:%l:%m\ (Sass::Syntax%trror), + \%ESyntax\ %trror:%m, + \%C%\\s%\\+on\ line\ %l\ of\ %f, + \%Z%.%#, + \%-G%.%# + +let &cpo = s:cpo_save +unlet s:cpo_save + +" vim:set sw=2 sts=2: diff --git a/runtime/doc/evim-fr.1 b/runtime/doc/evim-fr.1 index ab19a90945..898ed70c2a 100644 --- a/runtime/doc/evim-fr.1 +++ b/runtime/doc/evim-fr.1 @@ -1,4 +1,4 @@ -.TH EVIM 1 "16 février 2002 February 16" +.TH EVIM 1 "16 février 2002" .SH NAME evim \- « Easy Vim », édite un fichier avec Vim sans utiliser les modes .SH SYNOPSIS @@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans .SH TRADUCTION Cette page de manuel a été traduite David Blanchet. <david.blanchet@free.fr> 2005-03-26. -Mise à jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com> +Mise à jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com> diff --git a/runtime/doc/evim-fr.UTF-8.1 b/runtime/doc/evim-fr.UTF-8.1 index 267366ff57..2b38e66cb5 100644 --- a/runtime/doc/evim-fr.UTF-8.1 +++ b/runtime/doc/evim-fr.UTF-8.1 @@ -1,4 +1,4 @@ -.TH EVIM 1 "16 février 2002 February 16" +.TH EVIM 1 "16 février 2002" .SH NAME evim \- « Easy Vim », édite un fichier avec Vim sans utiliser les modes .SH SYNOPSIS @@ -54,4 +54,4 @@ Voir le menu Aide/Remerciements ou ":help credits" dans .SH TRADUCTION Cette page de manuel a été traduite David Blanchet. <david.blanchet@free.fr> 2005-03-26. -Mise à jour 2012-05-06, Dominique Pellé <dominique.pelle@gmail.com> +Mise à jour 2013-05-10, Dominique Pellé <dominique.pelle@gmail.com> diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt index 67a5c147fb..6367df6a4e 100644 --- a/runtime/doc/filetype.txt +++ b/runtime/doc/filetype.txt @@ -1,4 +1,4 @@ -*filetype.txt* For Vim version 7.3. Last change: 2011 Jun 19 +*filetype.txt* For Vim version 7.3. Last change: 2013 May 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -603,7 +603,7 @@ Since the text for this plugin is rather long it has been put in a separate file: |ft_sql.txt|. -TEX *ft-tex-plugin* +TEX *ft-tex-plugin* *g:tex_flavor* If the first line of a *.tex file has the form > %&<format> diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index 4f23d079d8..fffc4c7898 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -1,4 +1,4 @@ -*if_pyth.txt* For Vim version 7.3. Last change: 2013 May 21 +*if_pyth.txt* For Vim version 7.3. Last change: 2013 May 25 VIM REFERENCE MANUAL by Paul Moore diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 98f22ddb8a..6b01d7c179 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2013 May 17 +*options.txt* For Vim version 7.3. Last change: 2013 May 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -5516,7 +5516,7 @@ A jump table for the options with a short description can be found at |Q_op|. matches will be highlighted. This is used to avoid that Vim hangs when using a very complicated pattern. - *'regexpengine''* *'re'* + *'regexpengine'* *'re'* 'regexpengine' 're' number (default 0) global {not in Vi} @@ -7521,7 +7521,7 @@ A jump table for the options with a short description can be found at |Q_op|. given, no further entry is used. See |undo-persistence|. - *'undofile'* *'udf'* + *'undofile'* *'noundofile'* *'udf'* *'noudf'* 'undofile' 'udf' boolean (default off) local to buffer {not in Vi} diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt index 5f47889fd1..e90e388391 100644 --- a/runtime/doc/pattern.txt +++ b/runtime/doc/pattern.txt @@ -1,4 +1,4 @@ -*pattern.txt* For Vim version 7.3. Last change: 2013 May 17 +*pattern.txt* For Vim version 7.3. Last change: 2013 May 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -698,6 +698,7 @@ overview. For speed it's often much better to avoid this multi. Try using "\zs" instead |/\zs|. To match the same as the above example: an\_s\+\zsfile + At least set a limit for the look-behind, see below. "\@<=" and "\@<!" check for matches just before what follows. Theoretically these matches could start anywhere before this position. @@ -710,6 +711,18 @@ overview. Example matches ~ \1\@<=,\([a-z]\+\) ",abc" in "abc,abc" +\@123<= + Like "\@<=" but only look back 123 bytes. This avoids trying lots + of matches that are known to fail and make executing the pattern very + slow. Example, check if there is a "<" just before "span": + /<\@1<=span + This will try matching "<" only one byte before "span", which is the + only place that works anyway. + After crossing a line boundary, the limit is relative to the end of + the line. Thus the characters at the start of the line with the match + are not counted (this is just to keep it simple). + The number zero is the same as no limit. + */\@<!* \@<! Matches with zero width if the preceding atom does NOT match just before what follows. Thus this matches if there is no position in the @@ -719,11 +732,16 @@ overview. The match with the preceding atom is made to end just before the match with what follows, thus an atom that ends in ".*" will work. Warning: This can be slow (because many positions need to be checked - for a match). + for a match). Use a limit if you can, see below. Example matches ~ \(foo\)\@<!bar any "bar" that's not in "foobar" \(\/\/.*\)\@<!in "in" which is not after "//" +\@123<! + Like "\@<!" but only look back 123 bytes. This avoids trying lots of + matches that are known to fail and make executing the pattern very + slow. + */\@>* \@> Matches the preceding atom like matching a whole pattern. {not in Vi} Like "(?>pattern)" in Perl. @@ -1193,6 +1211,8 @@ When "\Z" appears anywhere in the pattern, composing characters are ignored. Thus only the base characters need to match, the composing characters may be different and the number of composing characters may differ. Only relevant when 'encoding' is "utf-8". +Exception: If the pattern starts with one or more composing characters, these +must match. When a composing character appears at the start of the pattern of after an item that doesn't include the composing character, a match is found at any @@ -1202,8 +1222,20 @@ When using a dot and a composing character, this works the same as the composing character by itself, except that it doesn't matter what comes before this. -The order of composing characters matters, even though changing the order -doesn't change what a character looks like. This may change in the future. +The order of composing characters does not matter. Also, the text may have +more composing characters than the pattern, it still matches. But all +composing characters in the pattern must be found in the text. + +Suppose B is a base character and x and y are composing characters: + pattern text match ~ + Bxy Bxy yes (perfect match) + Bxy Byx yes (order ignored) + Bxy By no (x missing) + Bxy Bx no (y missing) + Bx Bx yes (perfect mach) + Bx By no (x missing) + Bx Bxy yes (extra y ignored) + Bx Byx yes (extra y ignored) ============================================================================== 9. Compare with Perl patterns *perl-patterns* diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index 86fb491e41..41f6d8c95f 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.3. Last change: 2013 May 20 +*starting.txt* For Vim version 7.3. Last change: 2013 May 29 VIM REFERENCE MANUAL by Bram Moolenaar @@ -439,7 +439,9 @@ a slash. Thus "-R" means recovery and "-/R" readonly. will wait for the edit session to finish (e.g., mail or readnews). See |amiga-window|. - MS-Windows: This option is not always supported. + MS-Windows: This option is not supported. However, when + running Vim with an installed vim.bat or gvim.bat file it + works. {not in Vi} diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 39c7839f42..d0f271b085 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3. Last change: 2013 Apr 05 +*syntax.txt* For Vim version 7.3. Last change: 2013 May 31 VIM REFERENCE MANUAL by Bram Moolenaar @@ -381,7 +381,11 @@ This is not a syntax file itself, but a script that converts the current window into HTML. Vim opens a new window in which it builds the HTML file. After you save the resulting file, you can view it with any browser. The -colors should be exactly the same as you see them in Vim. +colors should be exactly the same as you see them in Vim. You can jump to +specific lines by adding (for example) #L123 or #123 to the end of the URL in +your browser's address bar (#123 only with javascript support). And with +|g:html_dynamic_folds| enabled, you can show or hide the text that is folded +in Vim. You are not supposed to set the 'filetype' or 'syntax' option to "2html"! Source the script to convert the current file: > @@ -424,7 +428,11 @@ and last line to be converted. Example, using the last set Visual area: > |g:html_diff_one_file| is set, :TOhtml will convert all windows which are part of the diff in the current tab and place them side-by-side in a <table> element - in the generated HTML. + in the generated HTML. When this happens you can jump + to lines in specific windows with (for example) #W1L42 + for line 42 in the first diffed window, or #W3L87 for + line 87 in the third. Omitting the window ID will + default to the first window if javascript is enabled. Examples: > @@ -1240,7 +1248,7 @@ to your startup file. ERLANG *erlang.vim* *ft-erlang-syntax* Erlang is a functional programming language developed by Ericsson. Files with -the following extentions are recognized as Erlang files: erl, hrl, yaws. +the following extensions are recognized as Erlang files: erl, hrl, yaws. The BIFs (built-in functions) are highlighted by default. To disable this, put the following line in your vimrc: > @@ -2286,7 +2294,7 @@ For highlighting parent error ] or ): > let php_parent_error_close = 1 -For skipping an php end tag, if there exists an open ( or [ without a closing +For skipping a php end tag, if there exists an open ( or [ without a closing one: > let php_parent_error_open = 1 diff --git a/runtime/doc/tags b/runtime/doc/tags index df53a50bb7..f02c4c2967 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -657,6 +657,8 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'nottybuiltin' options.txt /*'nottybuiltin'* 'nottyfast' options.txt /*'nottyfast'* 'notx' options.txt /*'notx'* +'noudf' options.txt /*'noudf'* +'noundofile' options.txt /*'noundofile'* 'novb' options.txt /*'novb'* 'novice' vi_diff.txt /*'novice'* 'novisualbell' options.txt /*'novisualbell'* @@ -740,7 +742,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'readonly' options.txt /*'readonly'* 'redraw' vi_diff.txt /*'redraw'* 'redrawtime' options.txt /*'redra |