vim-vimoutliner/vimoutliner-mc-build.patch

132 lines
9.4 KiB
Diff

diff -up vimoutliner-0.3.4/ftdetect/vo_base.vim.MC-build vimoutliner-0.3.4/ftdetect/vo_base.vim
--- vimoutliner-0.3.4/ftdetect/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/ftdetect/vo_base.vim 2010-01-06 06:58:49.092484180 +0100
@@ -74,9 +74,6 @@
"Revision 1.1 2003/02/08 21:11:26 noel
"Initial revision
"
-if exists("did_load_filetypes")
- finish
-endif
augroup filetypedetect
au! BufRead,BufNewFile *.otl setfiletype vo_base
au! BufRead,BufNewFile *.oln setfiletype xoutliner
diff -up vimoutliner-0.3.4/ftplugin/vo_base.vim.MC-build vimoutliner-0.3.4/ftplugin/vo_base.vim
--- vimoutliner-0.3.4/ftplugin/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/ftplugin/vo_base.vim 2010-01-06 06:59:20.907497474 +0100
@@ -65,7 +65,7 @@ let b:current_syntax = "outliner"
" User Preferences {{{1
-let maplocalleader = ",," " this is prepended to VO key mappings
+"let maplocalleader = ",," " this is prepended to VO key mappings
setlocal ignorecase " searches ignore case
setlocal smartcase " searches use smart case
@@ -656,7 +656,8 @@ setlocal tags^=$HOME/.vimoutliner/vo_tag
let b:current_syntax = "outliner"
" Personal configuration options files as per Matej Cepl
-setlocal runtimepath+=$HOME/.vimoutliner,$HOME
+"orig setlocal runtimepath+=$HOME/.vimoutliner,$HOME,/etc
+setlocal runtimepath+=/etc,$HOME/.vimoutliner,$HOME
ru! .vimoutlinerrc vimoutlinerrc
" More sophisticated version of the modules loading; thanks to Preben 'Peppe'
" Guldberg for telling me how to split string and make semi-lists with vim.
@@ -668,8 +669,7 @@ while (s:idx != -1)
let s:part = strpart(s:tmp, 0, s:idx)
let s:tmp = strpart(s:tmp, s:idx + 1)
let s:idx = stridx(s:tmp, ':')
- "exec 'ru! ftplugin/vo_' . part . '.vim'
- exec "runtime! plugins/vo_" . s:part . ".vim"
+ exec 'runtime! ftplugin/vo_' . s:part . '.vim'
endwhile
" The End
diff -up vimoutliner-0.3.4/syntax/vo_base.vim.MC-build vimoutliner-0.3.4/syntax/vo_base.vim
--- vimoutliner-0.3.4/syntax/vo_base.vim.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/syntax/vo_base.vim 2010-01-06 06:58:49.091483356 +0100
@@ -219,7 +219,7 @@ syn sync fromstart
syn match outlTags '_tag_\w*' contained
" Noel's style of body text {{{2
-syntax region BT1 start=+^ \S+ skip=+^ \S+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region BT1 start=+^ \S+ skip=+^ \S+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT2 start=+^\(\t\)\{1} \S+ skip=+^\(\t\)\{1} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT3 start=+^\(\t\)\{2} \S+ skip=+^\(\t\)\{2} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT4 start=+^\(\t\)\{3} \S+ skip=+^\(\t\)\{3} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -230,7 +230,7 @@ syntax region BT8 start=+^\(\t\)\{7} \S+
syntax region BT9 start=+^\(\t\)\{8} \S+ skip=+^\(\t\)\{8} \S+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"comment-style bodytext as per Steve Litt {{{2
-syntax region BT1 start=+^:+ skip=+^:+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region BT1 start=+^:+ skip=+^:+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT2 start=+^\(\t\)\{1}:+ skip=+^\(\t\)\{1}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT3 start=+^\(\t\)\{2}:+ skip=+^\(\t\)\{2}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region BT4 start=+^\(\t\)\{3}:+ skip=+^\(\t\)\{3}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -241,7 +241,7 @@ syntax region BT8 start=+^\(\t\)\{7}:+ s
syntax region BT9 start=+^\(\t\)\{8}:+ skip=+^\(\t\)\{8}:+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"Preformatted body text {{{2
-syntax region PT1 start=+^;+ skip=+^;+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region PT1 start=+^;+ skip=+^;+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT2 start=+^\(\t\)\{1};+ skip=+^\(\t\)\{1};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT3 start=+^\(\t\)\{2};+ skip=+^\(\t\)\{2};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region PT4 start=+^\(\t\)\{3};+ skip=+^\(\t\)\{3};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -252,7 +252,7 @@ syntax region PT8 start=+^\(\t\)\{7};+ s
syntax region PT9 start=+^\(\t\)\{8};+ skip=+^\(\t\)\{8};+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"Preformatted tables {{{2
-syntax region TA1 start=+^|+ skip=+^|+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region TA1 start=+^|+ skip=+^|+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA2 start=+^\(\t\)\{1}|+ skip=+^\(\t\)\{1}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA3 start=+^\(\t\)\{2}|+ skip=+^\(\t\)\{2}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region TA4 start=+^\(\t\)\{3}|+ skip=+^\(\t\)\{3}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -263,7 +263,7 @@ syntax region TA8 start=+^\(\t\)\{7}|+ s
syntax region TA9 start=+^\(\t\)\{8}|+ skip=+^\(\t\)\{8}|+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"wrapping user text {{{2
-syntax region UT1 start=+^>+ skip=+^>+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region UT1 start=+^>+ skip=+^>+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT2 start=+^\(\t\)\{1}>+ skip=+^\(\t\)\{1}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT3 start=+^\(\t\)\{2}>+ skip=+^\(\t\)\{2}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UT4 start=+^\(\t\)\{3}>+ skip=+^\(\t\)\{3}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -274,7 +274,7 @@ syntax region UT8 start=+^\(\t\)\{7}>+ s
syntax region UT9 start=+^\(\t\)\{8}>+ skip=+^\(\t\)\{8}>+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
"non-wrapping user text {{{2
-syntax region UB1 start=+^<+ skip=+^<+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=e-2 contains=spellErr,SpellErrors,BadWord contained
+syntax region UB1 start=+^<+ skip=+^<+ end=+^\S+me=e-1 end=+^\(\t\)\{1}\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB2 start=+^\(\t\)\{1}<+ skip=+^\(\t\)\{1}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB3 start=+^\(\t\)\{2}<+ skip=+^\(\t\)\{2}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
syntax region UB4 start=+^\(\t\)\{3}<+ skip=+^\(\t\)\{3}<+ end=+^\(\t\)*\S+me=s-1 contains=spellErr,SpellErrors,BadWord contained
@@ -291,7 +291,7 @@ setlocal com=sO:\:\ -,mO:\:\ \ ,eO:\:\:,
" Headings {{{2
syntax region OL1 start=+^[^:\t]+ end=+^[^:\t]+me=e-1 contains=outlTags,BT1,BT2,PT1,PT2,TA1,TA2,UT1,UT2,UB1,UB2,spellErr,SpellErrors,BadWord,OL2 keepend
-syntax region OL2 start=+^\t[^:\t]+ end=+^\t[^:\t]+me=e-2 contains=outlTags,BT2,BT3,PT2,PT3,TA2,TA3,UT2,UT3,UB2,UB3,spellErr,SpellErrors,BadWord,OL3 keepend
+syntax region OL2 start=+^\t[^:\t]+ end=+^\t[^:\t]+me=s-1 contains=outlTags,BT2,BT3,PT2,PT3,TA2,TA3,UT2,UT3,UB2,UB3,spellErr,SpellErrors,BadWord,OL3 keepend
syntax region OL3 start=+^\(\t\)\{2}[^:\t]+ end=+^\(\t\)\{2}[^:\t]+me=e-3 contains=outlTags,BT3,BT4,PT3,PT4,TA3,TA4,UT3,UT4,UB3,UB4,spellErr,SpellErrors,BadWord,OL4 keepend
syntax region OL4 start=+^\(\t\)\{3}[^:\t]+ end=+^\(\t\)\{3}[^:\t]+me=e-4 contains=outlTags,BT4,BT5,PT4,PT5,TA4,TA5,UT4,UT5,UB4,UB5,spellErr,SpellErrors,BadWord,OL5 keepend
syntax region OL5 start=+^\(\t\)\{4}[^:\t]+ end=+^\(\t\)\{4}[^:\t]+me=e-5 contains=outlTags,BT5,BT6,PT5,PT6,TA5,TA6,UT5,UT6,UB5,UB6,spellErr,SpellErrors,BadWord,OL6 keepend
diff -up vimoutliner-0.3.4/vo_readme.txt.MC-build vimoutliner-0.3.4/vo_readme.txt
--- vimoutliner-0.3.4/vo_readme.txt.MC-build 2005-06-20 15:34:21.000000000 +0200
+++ vimoutliner-0.3.4/vo_readme.txt 2010-01-06 06:58:49.092484180 +0100
@@ -246,12 +246,12 @@ INSTALLING AND TESTING VIMOUTLINER
Ctrl+K is a VimOutliner synonym for Ctrl+]
Ctrl+N is a VimOutliner synonym for Ctrl+T
- Debian Installation *vo-debian*
+ Installation from distribution packages
+ *vo-packages* *vo-debian*
- Debian does include Vim Outliner as a package. However some
- Debian version require this line to be added to your .vimrc file:
-
- syntax on
+ Debian and Fedora/Extras include Vim Outliner as a package. It is
+ usually preferable to use official package custom-tailored for your
+ distribution than to install VimOutliner from generic tarball.
-------------------------------------------------------------------------
USING VIMOUTLINER ON OTHER FILE TYPES *vo-other-files*