rpms/vim-vimoutliner/F-12 vim-vimoutliner.spec, 1.5, 1.6 vimoutliner-mc-build.patch, 1.1, 1.2

Wed Jan 6 06:12:25 UTC 2010

Author: mcepl

Update of /cvs/pkgs/rpms/vim-vimoutliner/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17814

Modified Files:
	vim-vimoutliner.spec vimoutliner-mc-build.patch 
Log Message:
Fix vimoutliner-mc-build.patch not to set maplocalleader


Index: vim-vimoutliner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vim-vimoutliner/F-12/vim-vimoutliner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6

--- vim-vimoutliner.spec	27 Jul 2009 06:53:46 -0000	1.5
+++ vim-vimoutliner.spec	6 Jan 2010 06:12:25 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           vim-vimoutliner
 Version:        0.3.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Script for building an outline editor on top of Vim
 Group:          Applications/Editors
 # LICENSE says v2, but the code all says v2+
@@ -92,6 +92,9 @@ fi
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Wed Jan 06 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.4-13
+- Fix vimoutliner-mc-build.patch not to set maplocalleader
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

vimoutliner-mc-build.patch:
 ftdetect/vo_base.vim |    3 ---
 ftplugin/vo_base.vim |    8 ++++----
 syntax/vo_base.vim   |   14 +++++++-------
 vo_readme.txt        |   10 +++++-----
 4 files changed, 16 insertions(+), 19 deletions(-)

Index: vimoutliner-mc-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/vim-vimoutliner/F-12/vimoutliner-mc-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vimoutliner-mc-build.patch	9 Jan 2007 09:04:37 -0000	1.1
+++ vimoutliner-mc-build.patch	6 Jan 2010 06:12:25 -0000	1.2
@@ -1,6 +1,52 @@
+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	2006-12-04 13:27:20.000000000 +0100
-@@ -219,7 +219,7 @@
++++ 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
@@ -9,7 +55,7 @@
  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 @@
+@@ -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
@@ -18,7 +64,7 @@
  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 @@
+@@ -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
@@ -27,7 +73,7 @@
  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 @@
+@@ -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
@@ -36,7 +82,7 @@
  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 @@
+@@ -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
@@ -45,7 +91,7 @@
  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 @@
+@@ -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
@@ -54,7 +100,7 @@
  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 @@
+@@ -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
@@ -63,31 +109,10 @@
  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
---- 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	2006-12-04 11:06:07.000000000 +0100
-@@ -656,7 +656,8 @@
- 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 @@
-     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
---- vimoutliner-0.3.4/vo_readme.txt.MC-build	2006-12-04 11:06:51.000000000 +0100
-+++ vimoutliner-0.3.4/vo_readme.txt	2006-12-04 11:26:33.000000000 +0100
-@@ -246,12 +246,12 @@
+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
  
@@ -105,15 +130,3 @@
  
  -------------------------------------------------------------------------
  USING VIMOUTLINER ON OTHER FILE TYPES                    *vo-other-files*
---- 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	2006-12-04 11:06:07.000000000 +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


