diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler/gcc.vim | 6 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/mbyte.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 1 | ||||
| -rw-r--r-- | runtime/doc/os_os2.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/print.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/tags | 1 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/undo.txt | 20 | ||||
| -rw-r--r-- | runtime/doc/workshop.txt | 10 | ||||
| -rw-r--r-- | runtime/syntax/yaml.vim | 4 |
12 files changed, 49 insertions, 22 deletions
diff --git a/runtime/compiler/gcc.vim b/runtime/compiler/gcc.vim index 75c596c7e..776bdee29 100644 --- a/runtime/compiler/gcc.vim +++ b/runtime/compiler/gcc.vim @@ -1,7 +1,7 @@ " Vim compiler file " Compiler: GNU C Compiler " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2009-05-01 +" Latest Revision: 2010-05-30 if exists("current_compiler") finish @@ -18,7 +18,11 @@ CompilerSet errorformat= \\"%f\"%*\\D%l:\ %m, \%-G%f:%l:\ %trror:\ (Each\ undeclared\ identifier\ is\ reported\ only\ once, \%-G%f:%l:\ %trror:\ for\ each\ function\ it\ appears\ in.), + \%f:%l:%c:\ %terror:\ %m, + \%f:%l:%c:\ %tarning:\ %m, \%f:%l:%c:\ %m, + \%f:%l:\ %terror:\ %m, + \%f:%l:\ %tarning:\ %m, \%f:%l:\ %m, \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m, \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f', diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 08b79bb78..4d983bfba 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1943,6 +1943,7 @@ tr( {src}, {fromstr}, {tostr}) String translate chars of {src} in {fromstr} to chars in {tostr} trunc( {expr} Float truncate Float {expr} type( {name}) Number type of variable {name} +undofile( {name}) String undo file name for {name} values( {dict}) List values in {dict} virtcol( {expr}) Number screen column of cursor or mark visualmode( [expr]) String last visual mode used @@ -5767,6 +5768,15 @@ type({expr}) The result is a Number, depending on the type of {expr}: :if type(myvar) == type({}) :if type(myvar) == type(0.0) +undofile({name}) *undofile()* + Return the name of the undo file that would be used for a file + with name {name} when writing. This uses the 'undodir' + option, finding directories that exist. It does not check if + the undo file exist. + Useful in combination with |:wundo| and |:rundo|. + When compiled without the +persistent_undo option this always + returns an empty string. + values({dict}) *values()* Return a |List| with all the values of {dict}. The |List| is in arbitrary order. diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 13dfc5973..96b5b4dd0 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -775,7 +775,7 @@ is suitable for complex input, such as CJK. For Chinese, there's a great XIM server named "xcin", you can input both Traditional and Simplified Chinese characters. And it can accept other locale if you make a correct input table. Xcin can be found at: - http://xcin.linux.org.tw/ + http://cle.linux.org.tw/xcin/ Others are scim: http://scim.freedesktop.org/ and fcitx: http://www.fcitx.org/ @@ -963,10 +963,10 @@ WHAT IS GLOBAL IME *global-ime* language version of Global IME at same place. - Global IME detailed information. - http://www.microsoft.com/windows/ie/features/ime.asp + http://search.microsoft.com/results.aspx?q=global+ime - Active Input Method Manager (Global IME) - http://msdn.microsoft.com/workshop/misc/AIMM/aimm.asp + http://msdn.microsoft.com/en-us/library/aa741221(v=VS.85).aspx Support for Global IME is an experimental feature. diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 102681540..6bf8580fe 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -585,6 +585,7 @@ when using ":w"), therefore Vim requires using a ! after the command, e.g.: Messages like this appear when starting up. This is not a Vim problem, your X11 configuration is wrong. You can find a hint on how to solve this here: http://groups.yahoo.com/group/solarisonintel/message/12179. +[this URL is no longer valid] *W10* > Warning: Changing a readonly file diff --git a/runtime/doc/os_os2.txt b/runtime/doc/os_os2.txt index b262d6d10..a6c0cf3a9 100644 --- a/runtime/doc/os_os2.txt +++ b/runtime/doc/os_os2.txt @@ -183,7 +183,8 @@ anyway you need an additional tool which gives you access to the clipboard from within a vio application. The freeware package clipbrd.zip by Stefan Gruendel can be used for this purpose. You might download the package including precompiled binaries and all sources from: - http://www.stellarcom.org/vim/index.html + http://www.os2site.com/sw/util/clipboard/index.html + http://download.uni-hd.de/ftp/pub/os2/pmtools/ Installation of this package is straight forward: just put the two executables that come with this package into a directory within your PATH for Vim should diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt index 49b7dfc02..73a3182a1 100644 --- a/runtime/doc/print.txt +++ b/runtime/doc/print.txt @@ -490,7 +490,7 @@ Traditional Chinese fonts available at: You can find descriptions of the various fonts in the read me file at - http://examples.oreilly.com/cjkvinfo/adobe/00README + http://examples.oreilly.de/english_examples/cjkvinfo/adobe/00README Please read your printer documentation on how to install new fonts. diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 229fdd602..109276f40 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -828,7 +828,8 @@ startup vimrc: > DESKTOP *desktop.vim* *ft-desktop-syntax* Primary goal of this syntax file is to highlight .desktop and .directory files -according to freedesktop.org standard: http://pdx.freedesktop.org/Standards/ +according to freedesktop.org standard: +http://standards.freedesktop.org/desktop-entry-spec/latest/ But actually almost none implements this standard fully. Thus it will highlight all Unix ini files. But you can force strict highlighting according to standard by placing this in your vimrc file: > diff --git a/runtime/doc/tags b/runtime/doc/tags index 66cc0332d..7ecb985c8 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -7867,6 +7867,7 @@ undo-tree undo.txt /*undo-tree* undo-two-ways undo.txt /*undo-two-ways* undo.txt undo.txt /*undo.txt* undo_ftplugin usr_41.txt /*undo_ftplugin* +undofile() eval.txt /*undofile()* unicode mbyte.txt /*unicode* unix os_unix.txt /*unix* unlisted-buffer windows.txt /*unlisted-buffer* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index f79148f7a..169d0fb6b 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -30,10 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Fixes for broken URLs: - Benjamin Haskell, 2010 May 25 - Christian Brabandt, 2010 May 26, two messages - Cursor positioning wrong with 0x200e character. (John Becket, 2010 May 6) E315 when trying to change a file in FileChangedRO autocommand event. @@ -1094,7 +1090,6 @@ Vim 7.3: Ron's version: http://dev.ronware.org/p/vim/finfo?name=gvim.nsi - Persistent undo bugs / fixes: - Need to check all values for evil manipulation. - - Add undofile(name): get undo file name for buffer "name". - patch for unused functions. (Dominique Pelle, 2010 May 29) - Also crypt the undo file. - Also crypt the swap file, each block separately. Change mf_write() and diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt index a7ae1736c..4dbe69394 100644 --- a/runtime/doc/undo.txt +++ b/runtime/doc/undo.txt @@ -243,12 +243,26 @@ respectively: You can use these in autocommands to explicitly specify the name of the history file. E.g.: > - au BufReadPost * rundo %:h/UNDO/%:t - au BufWritePost * wundo %:h/UNDO/%:t + au BufReadPost * call ReadUndo() + au BufWritePost * call WriteUndo() + func ReadUndo() + if filereadable(expand('%:h'). '/UNDO/' . expand('%:t')) + rundo %:h/UNDO/%:t + endif + endfunc + func WriteUndo() + let dirname = expand('%:h') . '/UNDO' + if !isdirectory(dirname) + call mkdir(dirname) + endif + wundo %:h/UNDO/%:t + endfunc You should keep 'undofile' off, otherwise you end up with two undo files for every write. -Note: I did not verify this always works! + +You can use the |undofile()| function to find out the file name that Vim would +use. Note that while reading/writing files and 'undofile' is set most errors will be silent, unless 'verbose' is set. With :wundo and :rundo you will get more diff --git a/runtime/doc/workshop.txt b/runtime/doc/workshop.txt index e4cc91a47..ae676de2b 100644 --- a/runtime/doc/workshop.txt +++ b/runtime/doc/workshop.txt @@ -89,10 +89,10 @@ Without it the toolbar and signs will be disabled. The XPM library is provide by Arnaud Le Hors of the French National Institute for Research in Computer Science and Control. It can be downloaded from -http://koala.ilog.fr/ftp/pub/xpm. The current release, as of this writing, is -xpm-3.4k-solaris.tgz, which is a gzip'ed tar file. If you create the directory -/usr/local/xpm and untar the file there you can use the uncommented lines in -the Makefile without changing them. If you use another xpm directory you will -need to change the XPM_DIR in src/Makefile. +http://cgit.freedesktop.org/xorg/lib/libXpm. The current release, as of this +writing, is xpm-3.4k-solaris.tgz, which is a gzip'ed tar file. If you create +the directory /usr/local/xpm and untar the file there you can use the +uncommented lines in the Makefile without changing them. If you use another +xpm directory you will need to change the XPM_DIR in src/Makefile. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/syntax/yaml.vim b/runtime/syntax/yaml.vim index 9ebab7068..4e93d67c7 100644 --- a/runtime/syntax/yaml.vim +++ b/runtime/syntax/yaml.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: YAML (YAML Ain't Markup Language) " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2006-04-19 +" Latest Revision: 2010-05-30 if exists("b:current_syntax") finish @@ -17,7 +17,7 @@ syn region yamlComment display oneline start='\%(^\|\s\)#' end='$' syn match yamlNodeProperty '!\%(![^\\^% ]\+\|[^!][^:/ ]*\)' -syn match yamlAnchor '&.\+' +syn match yamlAnchor '&[^ \t]\+' syn match yamlAlias '\*.\+' |