From 7367105c2f2624770f92d505a357402da2df134c Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 5 Jun 2010 20:12:09 -0400 Subject: vim/ftplugin/sisu.vim, make less intrusive includes: * ls dir files placed in vertically split window (also dir) * rd search and replace down (in file) * rg search and replace globally (in file) * rr search and replace using ruby gsub (global search and replace) Note: rf not used, ambiguous (replace forward or replace in file?) * remove language and spelling american english, can't have a fixed default * remove G (search and replace) binding * remove F for fold file removed, use still available :F instead --- .../conf/editor-syntax-etc/vim/ftplugin/sisu.vim | 24 ++++++++-------------- .../conf/editor-syntax-etc/vim/ftplugin/sisu.vim | 24 ++++++++-------------- .../v2/conf/editor-syntax-etc/vim/syntax/sisu.vim | 2 +- 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 -" 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 dir :vs :Explore -:map nn :set nonumber paste -:map nu :set number paste -:map no :set number nopaste -"% vimdiff q exits +:map ls :vs :Explore +:map dir :vs :Explore :if &diff : cmap q qa :endif @@ -77,9 +70,9 @@ "% colorscheme slate :map :syntax on :colorscheme slate "% search and replace -:map :.,$s///c "search and replace down -:map :%s///c "search and replace whole file -:map :rubyd gsub!(//,"") +:map rd :.,$s///c "search and replace down +:map rg :%s///c "search and replace whole file +:map 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 -:map :F "consider, is a remapping :map ff :F :map fe :F zE "% foldtoggle Fold Toggle mapped to @@ -186,5 +178,5 @@ "% cursorline :highlight CursorLine guibg=black ctermbg=black :highlight CursorColumn guibg=black ctermbg=black -map cu- :set nocursorline nocursorcolumn -map cu+ :set cursorline cursorcolumn +:map cu- :set nocursorline nocursorcolumn +:map cu+ :set cursorline cursorcolumn 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 -" 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 dir :vs :Explore -:map nn :set nonumber paste -:map nu :set number paste -:map no :set number nopaste -"% vimdiff q exits +:map ls :vs :Explore +:map dir :vs :Explore :if &diff : cmap q qa :endif @@ -77,9 +70,9 @@ "% colorscheme slate :map :syntax on :colorscheme slate "% search and replace -:map :.,$s///c "search and replace down -:map :%s///c "search and replace whole file -:map :rubyd gsub!(//,"") +:map rd :.,$s///c "search and replace down +:map rg :%s///c "search and replace whole file +:map 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 -:map :F "consider, is a remapping :map ff :F :map fe :F zE "% foldtoggle Fold Toggle mapped to @@ -186,5 +178,5 @@ "% cursorline :highlight CursorLine guibg=black ctermbg=black :highlight CursorColumn guibg=black ctermbg=black -map cu- :set nocursorline nocursorcolumn -map cu+ :set cursorline cursorcolumn +:map cu- :set nocursorline nocursorcolumn +:map cu+ :set cursorline cursorcolumn 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\+[}><]" -- cgit v1.2.3