diff options
author | Bram Moolenaar <Bram@vim.org> | 2005-12-06 19:59:18 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2005-12-06 19:59:18 +0000 |
commit | 9372a11ca67d6bdec9c16407a941cb8094eec3b6 (patch) | |
tree | 9633dee37b98fab6fe12d78ee30bc761f2f21a73 /runtime | |
parent | cef9dcc37ef6dce3d98cf1550c3731fff9d451b5 (diff) | |
download | vim-git-9372a11ca67d6bdec9c16407a941cb8094eec3b6.tar.gz |
updated for version 7.0163
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/autoload/xmlcomplete.vim | 2 | ||||
-rw-r--r-- | runtime/doc/autocmd.txt | 3 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
-rw-r--r-- | runtime/doc/gui_x11.txt | 58 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 9 | ||||
-rw-r--r-- | runtime/doc/tags | 18 | ||||
-rw-r--r-- | runtime/syntax/slice.vim | 6 |
7 files changed, 41 insertions, 61 deletions
diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim index 3cd4c7164..2d09eff09 100644 --- a/runtime/autoload/xmlcomplete.vim +++ b/runtime/autoload/xmlcomplete.vim @@ -310,7 +310,7 @@ function! xmlcomplete#GetLastOpenTag(unaryTagsStack) let tagpat='</\='.b:xml_namespace.':\(\k\|[.-]\)\+\|/>' endif else - let tagpat='</\=\(\k\|[.-:]\)\+\|/>' + let tagpat='</\=\(\k\|[.-]\)\+\|/>' endif while (linenum>0) let line=getline(linenum) diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 390afadd4..37a51ad99 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -555,6 +555,9 @@ QuickFixCmdPre *QuickFixCmdPre* QuickFixCmdPost *QuickFixCmdPost* like QuickFixCmdPre, but after a quickfix command is run. + *SessionLoadPost* +SessionLoadPost After loading the session file created using + the |:mksession| command. *MenuPopup* MenuPopup Just before showing the popup menu (under the right mouse button). Useful for adjusting the diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index adcf45187..eeb07a259 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.0aa. Last change: 2005 Nov 20 +*eval.txt* For Vim version 7.0aa. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -3624,6 +3624,8 @@ remote_foreground({server}) *remote_foreground()* < Except that on Win32 systems the client does the work, to work around the problem that the OS doesn't always allow the server to bring itself to the foreground. + Note: This does not restore the window if it was minimized, + like foreground() does. This function is not available in the |sandbox|. {only in the Win32, Athena, Motif and GTK GUI versions and the Win32 console version} @@ -4194,7 +4196,7 @@ strlen({expr}) The result is a Number, which is the length of the String strpart({src}, {start}[, {len}]) *strpart()* The result is a String, which is part of {src}, starting from - byte {start}, with the length {len}. + byte {start}, with the byte length {len}. When non-existing bytes are included, this doesn't result in an error, the bytes are simply omitted. If {len} is missing, the copy continues from {start} till the diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index d717bfe44..825ff3c6a 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*gui_x11.txt* For Vim version 7.0aa. Last change: 2005 Dec 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -437,59 +437,9 @@ command line argument). ============================================================================== 7. KDE version *gui-kde* *kde* *KDE* *KVim* -NOTE: The KDE version is still under development. It is not recommended for -daily work. - -The KDE version of Vim works with KDE 2.x and KDE 3.x. -KVim (name code for gui-kde) does not use traditional X settings for its -configuration. -Most important difference is the font handling, KVim uses QFont to display the -text. To set your font use the following syntax : -> - :set guifont=Fixed\ [Misc]/10/-1/5/50/0/0/0/1/0 -< -the '10' value is the font size, other settings concerns more specific Qt -options which you should not need to care with. -The suggested way to choose your font is through the font selection dialog -available with the command : - :set guifont=* - -Note: X Font names are not supported any more, so if you use GVim too, you'll -have to set something like this in your ~/.gvimrc : > - - if has("gui_kde") - :set guifont=Fixed\ [Misc]/10/-1/5/50/0/0/0/1/0 - else if has("gui_gtk") - :set guifont=-misc-fixed-medium-r-normal-*-*-100-*-*-c-*-iso10646-1 - endif -< - *antialias* -KVim uses antialias for its font, so that the text looks better, to disable -this you have to refer to Qt's documentation (export QT_XFT=0 for QT 2.x). - -KDE provides some other features, like being able to move the menubar and the -toolbar wherever you want around the text area. - - *kde-toolbar* -KVim can be used with a KDE-look toolbar instead of Vim's default toolbar. To -enable this feature you have to run the configure script with the ---enable-kde-toolbar switch. It may be moved to a runtime option in the -future. - - *DCOP* -Since Vim 6.0, the new ClientServer feature has been added, it works fine in -KVim too. KVim also provides its own communication scheme based on DCOP. This -is mainly used by the |vimpart| but can freely be used by other applications -or manually through KDE's DCOP tools. The DCOP servername is synchronized with -the X11 servername so that it's easier to identify the same KVim through the -two communication systems. - - *vimpart* *vim-kpart* -KVim developers are also working on a component to allow embedding of Vim into -KDE's applications. As of this writing, the component is working and can be -used in different KDE applications. New KDE applications should support it -soon. To get more information about this component, refer to -http://freehackers.org/kvim or to the KDE project. +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. ============================================================================== 8. Compiling *gui-x11-compiling* diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index dcd83b787..55ca07351 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.0aa. Last change: 2005 Oct 02 +*starting.txt* For Vim version 7.0aa. Last change: 2005 Dec 04 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1201,6 +1201,13 @@ An example mapping: > :nmap <F2> :wa<Bar>exe "mksession! " . v:this_session<CR>:so ~/sessions/ This saves the current Session, and starts off the command to load another. +The |SessionLoadPost| autocmd event is triggered after a session file is +loaded/sourced. + *SessionLoad-variable* +While the session file is loading the SessionLoad global variable is set to 1. +Plugins can use this to postpone some work until the SessionLoadPost event is +triggered. + *:mkvie* *:mkview* :mkvie[w][!] [file] Write a Vim script that restores the contents of the current window. diff --git a/runtime/doc/tags b/runtime/doc/tags index 2fb97ba14..965719d27 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1655,6 +1655,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :@ repeat.txt /*:@* :@: repeat.txt /*:@:* :@@ repeat.txt /*:@@* +:CompilerSet usr_41.txt /*:CompilerSet* :Explore pi_netrw.txt /*:Explore* :Hexplore pi_netrw.txt /*:Hexplore* :Man filetype.txt /*:Man* @@ -3974,6 +3975,8 @@ Select visual.txt /*Select* Select-mode visual.txt /*Select-mode* Select-mode-mapping visual.txt /*Select-mode-mapping* Session starting.txt /*Session* +SessionLoad-variable starting.txt /*SessionLoad-variable* +SessionLoadPost autocmd.txt /*SessionLoadPost* StdinReadPost autocmd.txt /*StdinReadPost* StdinReadPre autocmd.txt /*StdinReadPre* Syntax autocmd.txt /*Syntax* @@ -5132,6 +5135,7 @@ g:netrw_sort_by pi_netrw.txt /*g:netrw_sort_by* g:netrw_sort_direction pi_netrw.txt /*g:netrw_sort_direction* g:netrw_sort_sequence pi_netrw.txt /*g:netrw_sort_sequence* g:netrw_ssh_browse_reject pi_netrw.txt /*g:netrw_ssh_browse_reject* +g:netrw_ssh_cmd pi_netrw.txt /*g:netrw_ssh_cmd* g:netrw_timefmt pi_netrw.txt /*g:netrw_timefmt* g:netrw_uid pi_netrw.txt /*g:netrw_uid* g:netrw_use_nt_rcp pi_netrw.txt /*g:netrw_use_nt_rcp* @@ -6771,6 +6775,13 @@ tags-file-format tagsrch.txt /*tags-file-format* tags-option tagsrch.txt /*tags-option* tagsrch.txt tagsrch.txt /*tagsrch.txt* tagstack tagsrch.txt /*tagstack* +tar pi_tar.txt /*tar* +tar-contents pi_tar.txt /*tar-contents* +tar-copyright pi_tar.txt /*tar-copyright* +tar-history pi_tar.txt /*tar-history* +tar-manual pi_tar.txt /*tar-manual* +tar-usage pi_tar.txt /*tar-usage* +tar.txt pi_tar.txt /*tar.txt* tcl if_tcl.txt /*tcl* tcl-beep if_tcl.txt /*tcl-beep* tcl-buffer if_tcl.txt /*tcl-buffer* @@ -7356,6 +7367,13 @@ zf fold.txt /*zf* zg spell.txt /*zg* zh scroll.txt /*zh* zi fold.txt /*zi* +zip pi_zip.txt /*zip* +zip-contents pi_zip.txt /*zip-contents* +zip-copyright pi_zip.txt /*zip-copyright* +zip-history pi_zip.txt /*zip-history* +zip-manual pi_zip.txt /*zip-manual* +zip-usage pi_zip.txt /*zip-usage* +zip.txt pi_zip.txt /*zip.txt* zj fold.txt /*zj* zk fold.txt /*zk* zl scroll.txt /*zl* diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim index e8f876c8b..8a4d6751a 100644 --- a/runtime/syntax/slice.vim +++ b/runtime/syntax/slice.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Slice (ZeroC's Specification Language for Ice) -" Maintainer: Morel Bodin <bodin@tuxfamily.net> -" Last Change: 2003 Sep 24 +" Maintainer: Morel Bodin <slice06@nym.hush.com> +" Last Change: 2005 Dec 03 " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -15,7 +15,7 @@ endif syn keyword sliceType bool byte double float int long short string void syn keyword sliceQualifier const extends idempotent implements local nonmutating out throws -syn keyword sliceConstruct class enum exception dictionnary interface module LocalObject Object sequence struct +syn keyword sliceConstruct class enum exception dictionary interface module LocalObject Object sequence struct syn keyword sliceQualifier const extends idempotent implements local nonmutating out throws syn keyword sliceBoolean false true |