y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version 0.2.2

Browse Source 
Added keybindings to split/vertsplit when following WikiWords.
<S-CR> - split WikiWord
<C-CR> - vertical split WikiWord
This commit is contained in:
Maxim Kim 2008-05-07 00:00:00 +00:00 committed by Able Scraper
parent 4e4fb8a1b4
commit c0b56d572b
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ftplugin/vimwiki.vim
View File

@ -4,8 +4,8 @@
" Home: http://code.google.com/p/vimwiki/ " Home: http://code.google.com/p/vimwiki/
" Author: Maxim Kim " Author: Maxim Kim
" Filenames: *.wiki " Filenames: *.wiki
" Last Change: (05.05.2008 19:30) " Last Change: (07.05.2008 19:25)
" Version: 0.2 " Version: 0.2.2
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@ -132,7 +132,14 @@ function! s:WikiLinkToNonWikiFile(word)
endfunction endfunction
if !exists('*s:WikiFollowWord') if !exists('*s:WikiFollowWord')
function! s:WikiFollowWord() function! s:WikiFollowWord(split)
if a:split == "split"
let cmd = ":split "
elseif a:split == "vsplit"
let cmd = ":vsplit "
else
let cmd = ":e "
endif
let word = s:WikiStripWord(s:WikiGetWordAtCursor(s:wiki_word), g:vimwiki_stripsym) let word = s:WikiStripWord(s:WikiGetWordAtCursor(s:wiki_word), g:vimwiki_stripsym)
" insert doesn't work properly inside :if. Check :help :if. " insert doesn't work properly inside :if. Check :help :if.
if word == "" if word == ""
@ -140,12 +147,12 @@ if !exists('*s:WikiFollowWord')
return return
endif endif
if s:WikiLinkToNonWikiFile(word) if s:WikiLinkToNonWikiFile(word)
execute ":e ".word execute cmd.word
else else
" history is [['WikiWord.wiki', 11], ['AnotherWikiWord', 3] ... etc] " history is [['WikiWord.wiki', 11], ['AnotherWikiWord', 3] ... etc]
" where numbers are column positions we should return when coming back. " where numbers are column positions we should return when coming back.
call insert(g:vimwiki_history, [expand('%:p'), col('.')]) call insert(g:vimwiki_history, [expand('%:p'), col('.')])
execute ":e ".g:vimwiki_home.word.g:vimwiki_ext execute cmd.g:vimwiki_home.word.g:vimwiki_ext
endif endif
endfunction endfunction
@ -208,7 +215,9 @@ vmap <buffer> j gj
imap <buffer> <Down> <C-o>gj imap <buffer> <Down> <C-o>gj
imap <buffer> <Up> <C-o>gk imap <buffer> <Up> <C-o>gk
nmap <buffer> <CR> :call <SID>WikiFollowWord()<CR> nmap <buffer> <CR> :call <SID>WikiFollowWord('nosplit')<CR>
nmap <buffer> <S-CR> :call <SID>WikiFollowWord('split')<CR>
nmap <buffer> <C-CR> :call <SID>WikiFollowWord('vsplit')<CR>
nmap <buffer> <BS> :call <SID>WikiGoBackWord()<CR> nmap <buffer> <BS> :call <SID>WikiGoBackWord()<CR>
nmap <buffer> <TAB> :call <SID>WikiNextWord()<CR> nmap <buffer> <TAB> :call <SID>WikiNextWord()<CR>

10
syntax/vimwiki.vim
View File

@ -4,8 +4,8 @@
" Home: http://code.google.com/p/vimwiki/ " Home: http://code.google.com/p/vimwiki/
" Author: Maxim Kim " Author: Maxim Kim
" Filenames: *.wiki " Filenames: *.wiki
" Last Change: (05.05.2008 19:30) " Last Change: (07.05.2008 19:25)
" Version: 0.2 " Version: 0.2.2
" Based on FlexWiki " Based on FlexWiki
" Quit if syntax file is already loaded " Quit if syntax file is already loaded
@ -50,9 +50,6 @@ syntax match wikiEmoticons /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\)/
" Aggregate all the regular text highlighting into wikiText " Aggregate all the regular text highlighting into wikiText
syntax cluster wikiText contains=wikiItalic,wikiBold,wikiCode,wikiDelText,wikiSuperScript,wikiSubScript,wikiLink,wikiWord,wikiEmoticons syntax cluster wikiText contains=wikiItalic,wikiBold,wikiCode,wikiDelText,wikiSuperScript,wikiSubScript,wikiLink,wikiWord,wikiEmoticons
" Treat all other lines that start with spaces as PRE-formatted text.
syntax match wikiPre /^[ \t]\+.*$/ contains=@wikiText
" Header levels, 1-6 " Header levels, 1-6
syntax match wikiH1 /\(^!\{1}.*$\|^\s*=\{1}.*=\{1}\s*$\)/ syntax match wikiH1 /\(^!\{1}.*$\|^\s*=\{1}.*=\{1}\s*$\)/
syntax match wikiH2 /\(^!\{2}.*$\|^\s*=\{2}.*=\{2}\s*$\)/ syntax match wikiH2 /\(^!\{2}.*$\|^\s*=\{2}.*=\{2}\s*$\)/
@ -72,7 +69,8 @@ syntax match wikiTable /||/
" highlight only bullets and digits. " highlight only bullets and digits.
syntax match wikiList /^\s\+\(\*\|[1-9]\+0*\.\|#\)/ syntax match wikiList /^\s\+\(\*\|[1-9]\+0*\.\|#\)/
" Treat all other lines that start with spaces as PRE-formatted text.
syntax match wikiPre /^\s\+[^[:blank:]*#].*$/
" Link FlexWiki syntax items to colors " Link FlexWiki syntax items to colors