vim/ftplugin/sisu.vim, make less intrusive

includes:
* <leader>ls  dir files placed in vertically split window (also <leader>dir)
* <leader>rd  search and replace down (in file)
* <leader>rg  search and replace globally (in file)
* <leader>rr  search and replace using ruby gsub (global search and replace)
Note: <leader>rf not used, ambiguous (replace forward or replace in file?)
* remove language and spelling american english, can't have a fixed default
* remove <CTRL>G (search and replace) binding
* remove <CTRL>F for fold file removed, use still available :F instead

3 files changed, 17 insertions, 33 deletions

diff --git a/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 314dd7d2..74296412 100644
--- a/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v1/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -1,14 +1,10 @@
 "%% SiSU Vim ftplugin
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-0.38)
+" SiSU Markup:     SiSU (sisu-1.0) 2010-06-05
 " an ftplugin setting defaults for editing sisu markup files
 :syntax on
 :filetype on
 :filetype indent on
-":let dialect='UK'
-:if version >= 700
-:  setlocal spell spelllang=en_us
-:endif
 :autocmd FileType sisu :set nonumber
 :set encoding=utf-8 fileencodings=
 :set ff=unix
@@ -55,11 +51,8 @@
 :  cmap q qa
 :endif
 "% directory files, placed in vertical split window
-:map <leader>dir :vs<cr><C-W><C-R> :Explore<cr>
-:map <leader>nn :set nonumber paste<cr>
-:map <leader>nu :set number paste<cr>
-:map <leader>no :set number nopaste<cr>
-"% vimdiff q exits
+:map <leader>ls :vs<cr> :Explore<cr>
+:map <leader>dir :vs<cr> :Explore<cr>
 :if &diff
 :  cmap q qa
 :endif
@@ -77,9 +70,9 @@
 "% colorscheme slate
 :map <C-C> :syntax on <cr> :colorscheme slate<cr>
 "% search and replace
-:map <C-@> :.,$s///c "search and replace down
-:map <c-G> :%s///c "search and replace whole file
-:map <c-X> :rubyd gsub!(//,"")
+:map <leader>rd :.,$s///c "search and replace down
+:map <leader>rg :%s///c "search and replace whole file
+:map <leader>rr :rubyd gsub!(//,"")
 "% pwd t64 working directory set to that of the file you're editing
 "changes pwd to directory of file in current buffer
 :function! CHANGE_CURR_DIR()
@@ -108,7 +101,6 @@
 "%% SiSU vim folds
 "% foldsearchx FoldSearch (opens result of search all else closed) t77
 :map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
-:map <C-F> :F<cr>  "consider, is a remapping
 :map <leader>ff :F<cr>
 :map <leader>fe :F<cr> zE
 "% foldtoggle Fold Toggle mapped to <space>
@@ -186,5 +178,5 @@
 "% cursorline
 :highlight CursorLine guibg=black ctermbg=black
 :highlight CursorColumn guibg=black ctermbg=black
-map <leader>cu- :set nocursorline nocursorcolumn<cr>
-map <leader>cu+ :set cursorline cursorcolumn<cr>
+:map <leader>cu- :set nocursorline nocursorcolumn<cr>
+:map <leader>cu+ :set cursorline cursorcolumn<cr>
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 314dd7d2..160444fd 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -1,14 +1,10 @@
 "%% SiSU Vim ftplugin
 " SiSU Maintainer: Ralph Amissah <ralph@amissah.com>
-" SiSU Markup:     SiSU (sisu-0.38)
+" SiSU Markup:     SiSU (sisu-2.0) 2010-06-05
 " an ftplugin setting defaults for editing sisu markup files
 :syntax on
 :filetype on
 :filetype indent on
-":let dialect='UK'
-:if version >= 700
-:  setlocal spell spelllang=en_us
-:endif
 :autocmd FileType sisu :set nonumber
 :set encoding=utf-8 fileencodings=
 :set ff=unix
@@ -55,11 +51,8 @@
 :  cmap q qa
 :endif
 "% directory files, placed in vertical split window
-:map <leader>dir :vs<cr><C-W><C-R> :Explore<cr>
-:map <leader>nn :set nonumber paste<cr>
-:map <leader>nu :set number paste<cr>
-:map <leader>no :set number nopaste<cr>
-"% vimdiff q exits
+:map <leader>ls :vs<cr> :Explore<cr>
+:map <leader>dir :vs<cr> :Explore<cr>
 :if &diff
 :  cmap q qa
 :endif
@@ -77,9 +70,9 @@
 "% colorscheme slate
 :map <C-C> :syntax on <cr> :colorscheme slate<cr>
 "% search and replace
-:map <C-@> :.,$s///c "search and replace down
-:map <c-G> :%s///c "search and replace whole file
-:map <c-X> :rubyd gsub!(//,"")
+:map <leader>rd :.,$s///c "search and replace down
+:map <leader>rg :%s///c "search and replace whole file
+:map <leader>rr :rubyd gsub!(//,"")
 "% pwd t64 working directory set to that of the file you're editing
 "changes pwd to directory of file in current buffer
 :function! CHANGE_CURR_DIR()
@@ -108,7 +101,6 @@
 "%% SiSU vim folds
 "% foldsearchx FoldSearch (opens result of search all else closed) t77
 :map fs :set foldmethod=expr foldcolumn=2 foldlevel=0 <cr>
-:map <C-F> :F<cr>  "consider, is a remapping
 :map <leader>ff :F<cr>
 :map <leader>fe :F<cr> zE
 "% foldtoggle Fold Toggle mapped to <space>
@@ -186,5 +178,5 @@
 "% cursorline
 :highlight CursorLine guibg=black ctermbg=black
 :highlight CursorColumn guibg=black ctermbg=black
-map <leader>cu- :set nocursorline nocursorcolumn<cr>
-map <leader>cu+ :set cursorline cursorcolumn<cr>
+:map <leader>cu- :set nocursorline nocursorcolumn<cr>
+:map <leader>cu+ :set cursorline cursorcolumn<cr>
diff --git a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
index 40c050ee..c0d30b89 100644
--- a/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
+++ b/data/sisu/v2/conf/editor-syntax-etc/vim/syntax/sisu.vim
@@ -119,7 +119,7 @@ syn region  sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin"
 "Errors:
 syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]"
 syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
-syn match sisu_error_wspace contains=sisu_error_wspace " \s*$"
+syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$"
 syn match sisu_error contains=sisu_error_wspace "\t\+"
 syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
 syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"