Mercurial > vim
changeset 5697:c2098c3095e7
Updated runtime files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sat, 08 Mar 2014 18:38:28 +0100 |
| parents | 1ddbc811c259 |
| children | 767103b5bcb0 |
| files | runtime/doc/gui.txt runtime/doc/gui_x11.txt runtime/doc/syntax.txt runtime/doc/tags runtime/doc/todo.txt runtime/filetype.vim runtime/ftplugin/spec.vim runtime/syntax/apache.vim runtime/syntax/euphoria3.vim runtime/syntax/euphoria4.vim runtime/syntax/spec.vim runtime/tutor/tutor.pt runtime/tutor/tutor.pt.utf-8 |
| diffstat | 13 files changed, 132 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.4. Last change: 2013 Jun 12 +*gui.txt* For Vim version 7.4. Last change: 2014 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -133,6 +133,7 @@ task bar with the 'guiheadroom' option. :winp[os] Display current position of the top left corner of the GUI vim window in pixels. Does not work in all versions. + Also see |getwinposx()| and |getwinposy()|. :winp[os] {X} {Y} *E466* Put the GUI vim window at the given {X} and {Y} coordinates. @@ -151,8 +152,11 @@ task bar with the 'guiheadroom' option. option. If you are running the X Window System, you can get information about the -window Vim is running in with this command: > +window Vim is running in with these commands: > :!xwininfo -id $WINDOWID + :!xprop -id $WINDOWID + :execute '!xwininfo -id ' . v:windowid + :execute '!xprop -id ' . v:windowid < *gui-IME* *iBus* Input methods for international characters in X that rely on the XIM
--- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.4. Last change: 2011 Sep 14 +*gui_x11.txt* For Vim version 7.4. Last change: 2014 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -442,7 +442,7 @@ 7. KDE version *gui-kde* *kde* *KDE* *gui-x11-kde* There is no KDE version of Vim. There has been some work on a port using the Qt toolkit, but it never worked properly and it has been abandoned. Work -continues on Yzis: www.yzis.org. +continues on Yzis: https://github.com/chrizel/Yzis. ============================================================================== 8. Compiling *gui-x11-compiling*
--- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.4. Last change: 2013 Aug 22 +*syntax.txt* For Vim version 7.4. Last change: 2014 Feb 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1281,6 +1281,32 @@ Finally, some vendors support hexadecima to your startup file. +EUPHORIA *euphoria3.vim* *euphoria4.vim* *ft-euphoria-syntax* + +Two syntax highlighting files exists for Euphoria. One for Euphoria +version 3.1.1, which is the default syntax highlighting file, and one for +Euphoria version 4.0.5 or later. + +Euphoria version 3.1.1 (http://www.rapideuphoria.com/) is still necessary +for developing applications for the DOS platform, which Euphoria version 4 +(http://www.openeuphoria.org/) does not support. + +The following file extensions are auto-detected as Euphoria file type: + + *.e, *.eu, *.ew, *.ex, *.exu, *.exw + *.E, *.EU, *.EW, *.EX, *.EXU, *.EXW + +To select syntax highlighting file for Euphoria, as well as for +auto-detecting the *.e and *.E file extensions as Euphoria file type, +add the following line to your startup file: > + + :let filetype_euphoria="euphoria3" + + or + + :let filetype_euphoria="euphoria4" + + ERLANG *erlang.vim* *ft-erlang-syntax* Erlang is a functional programming language developed by Ericsson. Files with
--- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -5472,6 +5472,8 @@ errors message.txt /*errors* escape intro.txt /*escape* escape() eval.txt /*escape()* escape-bar version4.txt /*escape-bar* +euphoria3.vim syntax.txt /*euphoria3.vim* +euphoria4.vim syntax.txt /*euphoria4.vim* eval eval.txt /*eval* eval() eval.txt /*eval()* eval-examples eval.txt /*eval-examples* @@ -5738,6 +5740,7 @@ ft-dosbatch-syntax syntax.txt /*ft-dosba ft-dtd-syntax syntax.txt /*ft-dtd-syntax* ft-eiffel-syntax syntax.txt /*ft-eiffel-syntax* ft-erlang-syntax syntax.txt /*ft-erlang-syntax* +ft-euphoria-syntax syntax.txt /*ft-euphoria-syntax* ft-flexwiki-syntax syntax.txt /*ft-flexwiki-syntax* ft-form-syntax syntax.txt /*ft-form-syntax* ft-fortran-indent indent.txt /*ft-fortran-indent*
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2014 Feb 23 +*todo.txt* For Vim version 7.4. Last change: 2014 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -54,14 +54,24 @@ Regexp problems: Problem that a previous silent ":throw" causes a following try/catch not to work. (ZyX, 2013 Sep 28) +Patch for VMS. (Zoltan Arpadffy, 2014 Mar 6) + +Euphoria syntax, Shian Lee, Feb 27 + ":cd C:\Windows\System32\drivers\etc*" does not work, even though the directory exists. (Sergio Gallelli, 2013 Dec 29) Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) +Can't build Vim with Perl when -Dusethreads is not specified for building +perl, and building with --enable-perlinterp=dynamic. +Patch by Yasuhiro Matsumoto, 2014 Feb 24. + Update for Clojure ftplugin. (Sung Pae). Await discussion about formatting in ftplugins. +Update for phpcomplete.vim. (Complex, 2014 Mar 1) + Python: ":py raw_input('prompt')" doesn't work. (Manu Hack) Using autoconf 2.69 gives a lot of warnings. @@ -88,12 +98,23 @@ Problem with 'errorformat'. Patch by Lc Patch for the problem that a mapping where the second byte is 0x80 isn't handled correcly. (Nobuhiro Takasaki, 2014 Feb 11) +Update 2014 Mar 8. Patch for mksession. (Nobuhiro Takasaki, 2014 Jan 31) Also fixes another problem (following email) +Patch to use rubyarchhdrdir for Ruby 2.x. (James McCoy, 2014 Feb 24) + +Dynamic Ruby linking issues. Patch by Danek Duvall (2014 Feb 26) +and by Yukihiro Nakadaira (2014 Feb 27) + +Patch: Detect grep options for Solaris. (Danek Duvall, 2014 Feb 26) + Adding "~" to 'cdpath' doesn't work for completion? (Davido, 2013 Aug 19) +Syntax file for gnuplot. Existing one is very old. (Andrew Rasmussen, 2014 +Feb 24) + Crash with ":%s/\n//g" on long file. (Aidan Marlin, 2014 Jan 15) Christian Brabandt: patch to run this into a join. (2014 Jan 18) Suggestion to not save replaced line for undo: Yukihiro Nakadaira, 2014 Jan @@ -101,6 +122,10 @@ 25. Add digraph for Rouble: =P. What's the Unicode? +Bug: "!ls %" expands parenthesis in %, but not spaces. So this doesn't work +either: ':!ls "%"'. +Patch by Gary Johnson, 2014 Mar 6. + Issue 174: Detect Mason files. Phpcomplete.vim update. (Complex, 2014 Jan 15) @@ -129,6 +154,8 @@ instead. (Samuel Ferencik, 2013 Sep 28) Series of patches for NL vs NUL handling. (ZyX, 2013 Nov 3, Nov 9) +Patch for XDG base directory support. (Jean François Bignolles, 2014 Mar 4) + Patch to add flag to shortmess to avoid giving completion messages. (Shougo Matsu, 2014 Jan 6, update Jan 11) @@ -162,8 +189,8 @@ Patch to handle integer overflow. (Aaron With "$" in 'cpoptions' the popup menu isn't fully drawn. (Matti Niemenmaa, 2013 Sep 5) -Patch to add item in 'listchars' to repeat first character. (Nathaniel Braun, -pragm, 2013 Oct 13) +Patch to add "ntab" item in 'listchars' to repeat first character. (Nathaniel +Braun, pragm, 2013 Oct 13) Again 2014 Mar 5. Undo message is not always properly displayed. Patch by Ken Takata, 2013 oct 3. Doesn't work properly according to Yukihiro Nakadaira.
--- 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: 2014 Feb 23 +" Last Change: 2014 Feb 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -673,22 +673,26 @@ au BufNewFile,BufRead *.ed\(f\|if\|n\|o\ " Embedix Component Description au BufNewFile,BufRead *.ecd setf ecd -" Eiffel or Specman +" Eiffel or Specman or Euphoria au BufNewFile,BufRead *.e,*.E call s:FTe() " Elinks configuration au BufNewFile,BufRead */etc/elinks.conf,*/.elinks/elinks.conf setf elinks func! s:FTe() - let n = 1 - while n < 100 && n < line("$") - if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$" - setf specman - return - endif - let n = n + 1 - endwhile - setf eiffel + if exists('g:filetype_euphoria') + exe 'setf ' . g:filetype_euphoria + else + let n = 1 + while n < 100 && n < line("$") + if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$" + setf specman + return + endif + let n = n + 1 + endwhile + setf eiffel + endif endfunc " ERicsson LANGuage; Yaws is erlang too @@ -1034,7 +1038,7 @@ au BufNewFile,BufRead *.ldif setf ldif au BufNewFile,BufRead *.ld setf ld " Lex -au BufNewFile,BufRead *.lex,*.l setf lex +au BufNewFile,BufRead *.lex,*.l,*.lxx,*.l++ setf lex " Libao au BufNewFile,BufRead */etc/libao.conf,*/.libao setf libao @@ -2432,7 +2436,7 @@ au BufNewFile,BufRead *.xsd setf xsd au BufNewFile,BufRead *.xsl,*.xslt setf xslt " Yacc -au BufNewFile,BufRead *.yy setf yacc +au BufNewFile,BufRead *.yy,*.yxx,*.y++ setf yacc " Yacc or racc au BufNewFile,BufRead *.y call s:FTy()
--- a/runtime/ftplugin/spec.vim +++ b/runtime/ftplugin/spec.vim @@ -1,7 +1,8 @@ " Plugin to update the %changelog section of RPM spec files " Filename: spec.vim -" Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> -" Last Change: 2012 Mar 07 +" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com +" Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014) +" Last Change: Sun Mar 2 11:24 MSK 2014 Igor Gnatenko if exists("b:did_ftplugin") finish @@ -150,6 +151,10 @@ if !exists("*s:ParseRpmVars") execute a:strline let definestr = "^[ \t]*%define[ \t]\\+" . varname . "[ \t]\\+\\(.*\\)$" let linenum = search(definestr, "bW") + if (linenum == 0) + let definestr = substitute(definestr, "%define", "%global", "") + let linenum = search(definestr, "bW") + endif if (linenum != -1) let ret = ret . substitute(getline(linenum), definestr, "\\1", "") else
--- a/runtime/syntax/apache.vim +++ b/runtime/syntax/apache.vim @@ -3,7 +3,7 @@ " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz> " License: This file can be redistribued and/or modified under the same terms " as Vim itself. -" Last Change: 2013-09-16 +" Last Change: 2014-03-04 " Notes: Last synced with apache-2.2.3, version 1.x is no longer supported " TODO: see particular FIXME's scattered through the file " make it really linewise? @@ -157,7 +157,7 @@ syn keyword apacheDeclaration PerlRestar syn keyword apacheDeclaration PerlFreshRestart PerlSendHeader syn keyword apacheDeclaration php_value php_flag php_admin_value php_admin_flag syn match apacheSection "<\/\=\(Proxy\|ProxyMatch\)[^>]*>" contains=apacheAnything -syn keyword apacheDeclaration AllowCONNECT NoProxy ProxyBadHeader ProxyBlock ProxyDomain ProxyErrorOverride ProxyIOBufferSize ProxyMaxForwards ProxyPass ProxyPassReverse ProxyPassReverseCookieDomain ProxyPassReverseCookiePath ProxyPreserveHost ProxyReceiveBufferSize ProxyRemote ProxyRemoteMatch ProxyRequests ProxyTimeout ProxyVia +syn keyword apacheDeclaration AllowCONNECT NoProxy ProxyBadHeader ProxyBlock ProxyDomain ProxyErrorOverride ProxyIOBufferSize ProxyMaxForwards ProxyPass ProxyPassMatch ProxyPassReverse ProxyPassReverseCookieDomain ProxyPassReverseCookiePath ProxyPreserveHost ProxyReceiveBufferSize ProxyRemote ProxyRemoteMatch ProxyRequests ProxyTimeout ProxyVia syn keyword apacheDeclaration RewriteBase RewriteCond RewriteEngine RewriteLock RewriteLog RewriteLogLevel RewriteMap RewriteOptions RewriteRule syn keyword apacheOption inherit syn keyword apacheDeclaration BrowserMatch BrowserMatchNoCase SetEnvIf SetEnvIfNoCase
--- a/runtime/syntax/euphoria3.vim +++ b/runtime/syntax/euphoria3.vim @@ -1,11 +1,9 @@ " Vim syntax file -" Language: Euphoria 3.1.1 - supports DOS - (http://www.RapidEuphoria.com) +" Language: Euphoria 3.1.1 - supports DOS - (http://www.rapideuphoria.com/) " Maintainer: Shian Lee -" Last Change: 2014 Feb 23 (for Vim 7.4) -" Remark: Using 'euphoria3.vim' if "$EUDIR\BIN\EX.EXE" or "$EUDIR/bin/exu" -" file exist; else, using 'euphoria4.vim' for Euphoria 4.x.x. -" Filetype: *.e, *.eu, *.ew, *.ex, *.exu, *.exw (also in UPPER case). -" note: *.e|*.E are used by Eiffel; for solution see :help filetype. +" Last Change: 2014 Feb 24 (for Vim 7.4) +" Remark: Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; +" For details see :help ft-euphoria-syntax " Quit if a (custom) syntax file was already loaded (compatible with Vim 5.8): if version < 600 @@ -14,6 +12,10 @@ elseif exists("b:current_syntax") finish endif +" Reset compatible-options to Vim default value, just in case: +let s:save_cpo = &cpo +set cpo&vim + " Should suffice for very long expressions: syn sync lines=40 @@ -127,3 +129,7 @@ hi def link euphoria3Delimit Delimiter let b:current_syntax = "euphoria3" +" Restore current compatible-options: +let &cpo = s:save_cpo +unlet s:save_cpo +
--- a/runtime/syntax/euphoria4.vim +++ b/runtime/syntax/euphoria4.vim @@ -1,11 +1,9 @@ " Vim syntax file -" Language: Euphoria 4.0.5 (http://www.RapidEuphoria.com) +" Language: Euphoria 4.0.5 (http://www.openeuphoria.org/) " Maintainer: Shian Lee -" Last Change: 2014 Feb 23 (for Vim 7.4) -" Remark: Using 'euphoria3.vim' if "$EUDIR\BIN\EX.EXE" or "$EUDIR/bin/exu" -" file exist; else, using 'euphoria4.vim' for Euphoria 4.x.x. -" Filetype: *.e, *.eu, *.ew, *.ex, *.exu, *.exw (also in UPPER case). -" note: *.e|*.E are used by Eiffel; for solution see :help filetype. +" Last Change: 2014 Feb 24 (for Vim 7.4) +" Remark: Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; +" For details see :help ft-euphoria-syntax " Quit if a (custom) syntax file was already loaded (compatible with Vim 5.8): if version < 600 @@ -14,6 +12,10 @@ elseif exists("b:current_syntax") finish endif +" Reset compatible-options to Vim default value, just in case: +let s:save_cpo = &cpo +set cpo&vim + " Should suffice for very long strings and expressions: syn sync lines=40 @@ -238,3 +240,7 @@ hi def link euphoria4PreProc PreProc let b:current_syntax = "euphoria4" +" Restore current compatible-options: +let &cpo = s:save_cpo +unlet s:save_cpo +
--- a/runtime/syntax/spec.vim +++ b/runtime/syntax/spec.vim @@ -1,8 +1,9 @@ " Filename: spec.vim " Purpose: Vim syntax file " Language: SPEC: Build/install scripts for Linux RPM packages -" Maintainer: Donovan Rebbechi elflord@panix.com -" Last Change: Fri Dec 3 11:54 EST 2004 Marcin Dalecki +" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com +" Former Maintainer: Donovan Rebbechi elflord@panix.com (until March 2014) +" Last Change: Sun Mar 2 10:33 MSK 2014 Igor Gnatenko " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -82,8 +83,8 @@ syn keyword specMacroNameLocal contained "One line macros - valid in all ScriptAreas "tip: remember do include new items on specScriptArea's skip section -syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier -syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|makeinstall\)}' end='$' contains=specCommandOpts,specMacroIdentifier +syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier +syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier "%% Files Section %% "TODO %config valid parameters: missingok\|noreplace @@ -113,7 +114,7 @@ syn region specDescriptionArea matchgrou syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment "%% Scripts Section %% -syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 +syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2 "%% Changelog Section %% syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
--- a/runtime/tutor/tutor.pt +++ b/runtime/tutor/tutor.pt @@ -58,11 +58,11 @@ NOTA: As teclas de cursor devem funcionar também. Mas usando hjkl, tão logo Isso sai do editor SEM salvar qualquer mudança que tenha sido feita. Se quiser salvar as alterações e sair, digite :wq <ENTER> - 3. Quando vir o prompt do shell digite o comando que lhe trouxe a este - tutorial, na maioria dos casos: vimtutor <ENTER>. + 3. Repita o procedimento que lhe trouxe a este tutorial. O procedimento pode + ter sido a digitação de: vimtutor <ENTER>. 4. Se você memorizou estes passos e está confiante, execute os passos de - 1 a 3 para sair e re-entrar no editor. + 1 a 3 para sair e reentrar no editor. NOTA: :q! <ENTER> descarta qualquer mudança. Em uma próxima lição será ensinado como salvar as mudanças feitas em um arquivo. @@ -560,7 +560,7 @@ Nota: Isso é muito útil para corrigir um programa com parênteses não-casados! 1. Mova o cursor para a linha abaixo marcada com --->. - 2. Digite :/s/aa/a <ENTER> . Note que este comando somente muda a + 2. Digite :s/aa/a <ENTER> . Note que este comando somente muda a primeira ocorrência na linha. 3. Agora digite :s/aa/a/g significando substituir globalmente na linha.
--- a/runtime/tutor/tutor.pt.utf-8 +++ b/runtime/tutor/tutor.pt.utf-8 @@ -58,11 +58,11 @@ NOTA: As teclas de cursor devem funcionar também. Mas usando hjkl, tão logo Isso sai do editor SEM salvar qualquer mudança que tenha sido feita. Se quiser salvar as alterações e sair, digite :wq <ENTER> - 3. Quando vir o prompt do shell digite o comando que lhe trouxe a este - tutorial, na maioria dos casos: vimtutor <ENTER>. + 3. Repita o procedimento que lhe trouxe a este tutorial. O procedimento pode + ter sido a digitação de: vimtutor <ENTER>. 4. Se você memorizou estes passos e está confiante, execute os passos de - 1 a 3 para sair e re-entrar no editor. + 1 a 3 para sair e reentrar no editor. NOTA: :q! <ENTER> descarta qualquer mudança. Em uma próxima lição será ensinado como salvar as mudanças feitas em um arquivo. @@ -560,7 +560,7 @@ Nota: Isso é muito útil para corrigir um programa com parênteses não-casados! 1. Mova o cursor para a linha abaixo marcada com --->. - 2. Digite :/s/aa/a <ENTER> . Note que este comando somente muda a + 2. Digite :s/aa/a <ENTER> . Note que este comando somente muda a primeira ocorrência na linha. 3. Agora digite :s/aa/a/g significando substituir globalmente na linha.