Permalink
Browse files

Version 3.8

- FIX: viki#MarkInexistentInElement() for pre 7.0.009 vim (thanks to M Brandmeyer)
- FIX: Make sure tlib is loaded even if it is installed in a different rtp-directory (thanks to M Brandmeyer)
- Added dia to g:vikiSpecialFiles
- FIX: Scrambled window when opening an url from vim (thanks A Moell)
  • Loading branch information...
1 parent 3499fe0 commit b0608f2c827a25956808d1de012cfae33c0a51bb @tomtom tomtom committed with Jun 21, 2008
Showing with 50 additions and 28 deletions.
  1. +10 −3 autoload/viki.vim
  2. +3 −2 ftplugin/viki.vim
  3. +20 −8 plugin/viki.vim
  4. +14 −13 syntax/texmath.vim
  5. +3 −2 syntax/viki.vim
View
@@ -3,8 +3,8 @@
" @Website: http://www.vim.org/account/profile.php?user_id=4037
" @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
" @Created: 2007-03-25.
-" @Last Change: 2008-01-10.
-" @Revision: 0.457
+" @Last Change: 2008-06-22.
+" @Revision: 0.460
if &cp || exists("loaded_viki_auto") "{{{2
finish
@@ -415,7 +415,7 @@ if v:version == 700 && !has('patch8')
let lr = &lazyredraw
set lazyredraw
call viki#SaveCursorPosition()
- let kpk = s:SID() . "VikiMarkInexistentIn" . a:elt
+ let kpk = s:SID() . "MarkInexistentIn" . a:elt
call {kpk}()
call viki#RestoreCursorPosition()
call s:ResetSavedCursorPosition()
@@ -2104,6 +2104,13 @@ fun! viki#GetIndent()
endtry
endf
+function! viki#ExecExternal(cmd) "{{{3
+ exec a:cmd
+ if !has("gui_running")
+ " Scrambled window with vim
+ redraw!
+ endif
+endf
""" #Files related stuff {{{1
View
@@ -2,8 +2,8 @@
" @Author: Thomas Link (micathom AT gmail com?subject=vim)
" @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
" @Created: 12-Jän-2004.
-" @Last Change: 2008-01-14.
-" @Revision: 403
+" @Last Change: 2008-02-14.
+" @Revision: 404
" if !g:vikiEnabled
" finish
@@ -34,6 +34,7 @@ setlocal foldtext=VikiFoldText()
setlocal expandtab
" setlocal iskeyword+=#,{
setlocal iskeyword+={
+setlocal iskeyword-=_
let &include='\(^\s*#INC.\{-}\(\sfile=\|:\)\)'
" let &include='\(^\s*#INC.\{-}\(\sfile=\|:\)\|\[\[\)'
View
@@ -2,8 +2,8 @@
" @Author: Thomas Link (micathom AT gmail com?subject=vim)
" @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
" @Created: 08-Dec-2003.
-" @Last Change: 2008-01-15.
-" @Revision: 3.7.2548
+" @Last Change: 2008-06-22.
+" @Revision: 3.7.2563
"
" GetLatestVimScripts: 861 1 viki.vim
"
@@ -34,11 +34,14 @@
if &cp || exists("loaded_viki") "{{{2
finish
endif
-if !exists('loaded_tlib') || loaded_tlib < 15
- echoerr 'tlib >= 0.15 is required'
- finish
+if !exists('g:loaded_tlib') || g:loaded_tlib < 15
+ runtime plugin/02tlib.vim
+ if !exists('g:loaded_tlib') || g:loaded_tlib < 15
+ echoerr 'tlib >= 0.15 is required'
+ finish
+ endif
endif
-let loaded_viki = 307
+let loaded_viki = 308
" This is what we consider nil, in the absence of nil in vimscript
let g:vikiDefNil = ''
@@ -107,6 +110,7 @@ if !exists("g:vikiSpecialFiles") "{{{2
\ 'au',
\ 'avi',
\ 'bmp',
+ \ 'dia',
\ 'doc',
\ 'dvi',
\ 'eps',
@@ -369,7 +373,7 @@ if !exists('*VikiOpenSpecialFile') "{{{2
if prot != ''
let openFile = viki#SubstituteArgs(prot, 'FILE', a:file)
" TLogVAR openFile
- exec openFile
+ call viki#ExecExternal(openFile)
else
throw 'Viki: Please define g:vikiOpenFileWith_'. proto .' or g:vikiOpenFileWith_ANY!'
endif
@@ -445,7 +449,7 @@ if !exists("*VikiOpenSpecialProtocol") "{{{2
exec 'let openURL = '. prot
let openURL = viki#SubstituteArgs(openURL, 'URL', a:url)
" TLogVAR openURL
- exec openURL
+ call viki#ExecExternal(openURL)
else
throw 'Viki: Please define g:vikiOpenUrlWith_'. proto .' or g:vikiOpenUrlWith_ANY!'
endif
@@ -987,5 +991,13 @@ it can be included from other syntax files.
default value if g:vikiFoldMethodVersion == 4.
- FIX: "=" in if expressions in certain versions of VikiFoldLevel()
+3.8
+- FIX: viki#MarkInexistentInElement() for pre 7.0.009 vim (thanks to M
+Brandmeyer)
+- FIX: Make sure tlib is loaded even if it is installed in a different
+rtp-directory (thanks to M Brandmeyer)
+- Added dia to g:vikiSpecialFiles
+- FIX: Scrambled window when opening an url from vim (thanks A Moell)
+"
" vim: ff=unix
View
@@ -3,8 +3,8 @@
" @Website: http://www.vim.org/account/profile.php?user_id=4037
" @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
" @Created: 2007-11-15.
-" @Last Change: 2007-11-18.
-" @Revision: 0.0.12
+" @Last Change: 2008-01-23.
+" @Revision: 0.0.15
" Use only as embedded syntax to be included from other syntax files.
@@ -26,21 +26,22 @@ endif
" syn match texmathArgDelimiters /[{}\[\]]/ contained containedin=texmathMath
-syn match texmathCommand /\\[[:alnum:]]\+/ contained
-syn match texmathMathFont /\\\(math[[:alnum:]]\+\|Bbb\|frak\)/ contained
-syn match texmathMathWord /[[:alnum:].]\+/ contained
-syn match texmathUnword /\(\\\\\|[^[:alnum:]${}()[\]^_\\]\+\)/ contained
-syn match texmathPairs /\([<>()[\]]\|\\[{}]\|\\[lr]\(brace\|vert\|Vert\|angle\|ceil\|floor\|group\|moustache\)\)/ contained
-syn match texmathSub /_/ contained
-syn match texmathSup /\^/ contained
+syn match texmathCommand /\\[[:alnum:]]\+/ contained containedin=texmath
+syn match texmathMathFont /\\\(math[[:alnum:]]\+\|Bbb\|frak\)/ contained containedin=texmath
+syn match texmathMathWord /[[:alnum:].]\+/ contained containedin=texmathMath
+syn match texmathUnword /\(\\\\\|[^[:alnum:]${}()[\]^_\\]\+\)/ contained containedin=texmath
+syn match texmathPairs /\([<>()[\]]\|\\[{}]\|\\[lr]\(brace\|vert\|Vert\|angle\|ceil\|floor\|group\|moustache\)\)/
+ \ contained containedin=texmath
+syn match texmathSub /_/ contained containedin=texmathMath
+syn match texmathSup /\^/ contained containedin=texmathMath
syn region texmathText matchgroup=Statement
\ start=/\\text{/ end=/}/ skip=/\\[{}]/
- \ contained
-syn cluster texmath contains=texmathArgDelimiters,texmathCommand,texmathMathFont,texmathPairs,texmathUnword,texmathText
-syn cluster texmathMath contains=@texmath,texmathMathWord,texmathSup,texmathSub
+ \ contained containedin=texmath
syn region texmathArgDelimiters matchgroup=Delimiter
\ start=/\\\@<!{/ end=/\\\@<!}/ skip=/\\[{}]/
- \ contained contains=@texmathMath
+ \ contained contains=@texmathMath containedin=texmath
+syn cluster texmath contains=texmathArgDelimiters,texmathCommand,texmathMathFont,texmathPairs,texmathUnword,texmathText
+syn cluster texmathMath contains=@texmath,texmathMathWord,texmathSup,texmathSub
" Statement PreProc
HiLink texmathSup Type
View
@@ -2,8 +2,8 @@
" @Author: Thomas Link (micathom AT gmail com?subject=vim)
" @License: GPL (see http://www.gnu.org/licenses/gpl.txt)
" @Created: 30-Dez-2003.
-" @Last Change: 2007-11-28.
-" @Revision: 0.855
+" @Last Change: 2008-04-17.
+" @Revision: 0.858
if !g:vikiEnabled
finish
@@ -166,6 +166,7 @@ if g:vikiHighlightMath == 'latex'
syn region vikiTexFormula matchgroup=Comment
\ start=/\$/ end=/\$/
\ contains=@texmathMath
+ syn sync match vikiTexFormula grouphere NONE /^\s*$/
endif
syn region vikiTexRegion matchgroup=vikiMacroDelim

0 comments on commit b0608f2

Please sign in to comment.