Changeset 338 for lang/vim/surround/trunk

Timestamp:

10/02/07 16:12:51 (16 months ago)

Author:

kana

Message:

lang/vim/surround:
* Revise the code layout.
* Add new header with modification notes.
* Set g:loaded_surround at the last for some error cases.

Files:

• lang/vim/surround/trunk/plugin/surround.vim (modified) (16 diffs)

lang/vim/surround/trunk/plugin/surround.vim

@@ +1 @@
+" surround.vim - Surrounding text objects
+" Author: Tim Pope <vimNOSPAM@tpope.info>
+" ModifiedBy: kana <http://nicht.s8.xrea.com>
+" BasedOn: Id: surround.vim,v 1.26 2007-07-31 14:20:47 tpope Exp
+" License: same as the original one, i.e., same as Vim itself.
+" $Id$  "{{{1
+" Original Header  "{{{2
+" >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 " surround.vim - Surroundings
 " Author:       Tim Pope <vimNOSPAM@tpope.info>
@@ -10 +18 @@
 "
 " Licensed under the same terms as Vim itself.
-
-" ============================================================================
+" <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+" "}}}2
 
 " Exit quickly when:
@@ -19 +27 @@
     finish
 endif
-let g:loaded_surround = 1
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-" Input functions {{{1
+
+
+
+" Implementation  "{{{1
+" Input functions  "{{{2
 
 function! s:getchar()
@@ -72 +83 @@
 endfunction
 
-" }}}1
-
-" Wrapping functions {{{1
+
+" Wrapping functions  "{{{2
 
 function! s:extractbefore(str)
@@ -330 +340 @@
     call setreg(a:reg,new,type)
 endfunction
-" }}}1
-
-function! s:insert(...) " {{{1
+
+
+function! s:insert(...)  "{{{2
     " Optional argument causes the result to appear on 3 lines, not 1
     "call inputsave()
@@ -378 +388 @@
     let &clipboard = cb_save
     return "\<Del>"
-endfunction " }}}1
-
-function! s:reindent() " {{{1
+endfunction
+
+
+function! s:reindent()  "{{{2
     if exists("b:surround_indent") ? b:surround_indent : (exists("g:surround_indent") && g:surround_indent)
         silent norm! '[=']
     endif
-endfunction " }}}1
-
-function! s:dosurround(...) "{{{1
+endfunction
+
+
+function! s:dosurround(...)  "{{{2
     " ([target-surrounding-object-char, [new-surrounding-object-char]])
-    " adjust arguments  "{{{2
+    " adjust arguments  "{{{3
     let scount = v:count1
     let char = (a:0 ? a:1 : s:inputtarget())
@@ -414 +426 @@
     endif
 
-    " save and initialize some values  "{{{2
+    " save and initialize some values  "{{{3
     let cb_save = &clipboard
     set clipboard-=unnamed
@@ -422 +434 @@
     call setreg('"',"")
 
-    " move the target text range into @@, then delete surroudings  "{{{2
+    " move the target text range into @@, then delete surroudings  "{{{3
     let strcount = (scount == 1 ? "" : scount)
     let user_defined_object = s:get_user_defined_object(char)
@@ -499 +511 @@
     endif
 
-    " surround @@ new objects  "{{{2
+    " surround @@ new objects  "{{{3
     call setreg('"',keeper,regtype)
     if newchar != ""
@@ -505 +517 @@
     endif
 
-    " put the result into the original position, then reindent  "{{{2
+    " put the result into the original position, then reindent  "{{{3
     silent exe 'norm! ""'.pcmd.'`['
     if removed =~ '\n' || okeeper =~ '\n' || getreg('"') =~ '\n'
@@ -515 +527 @@
     endif
 
-    " restore the original value, set some values for later use  "{{{2
+    " restore the original value, set some values for later use  "{{{3
     call setreg('"',removed,regtype)
     let s:lastdel = removed
     let &clipboard = cb_save
-endfunction " }}}1
-
-function! s:changesurround() " {{{1
+endfunction
+
+
+function! s:changesurround()  "{{{2
     let a = s:inputtarget()
     if a == ""
@@ -531 +544 @@
     endif
     call s:dosurround(a,b)
-endfunction " }}}1
-
-function! s:opfunc(type,...) " {{{1
+endfunction
+
+
+function! s:opfunc(type,...)  "{{{2
     let char = s:inputreplacement()
     if char == ""
@@ -588 +602 @@
 function! s:opfunc2(arg)
     call s:opfunc(a:arg,1)
-endfunction " }}}1
-
-function! s:closematch(str) " {{{1
+endfunction
+
+
+function! s:closematch(str)  "{{{2
     " Close an open (, {, [, or < on the command line.
     let tail = matchstr(a:str,'.[^\[\](){}<>]*$')
@@ -604 +619 @@
         return ""
     endif
-endfunction " }}}1
+endfunction
  
-" Misc. functions  "{{{1
+
+" Misc. functions  "{{{2
+
 function! s:search_literally(pattern, flags)
     return search(s:literalize_pattern(a:pattern), a:flags)
@@ -634 +651 @@
     endif
 endfunction
-"}}}1
+
+
+
+
+" Key Mappings  "{{{1
 
 nnoremap <silent> <Plug>Dsurround  :<C-U>call <SID>dosurround(<SID>inputtarget())<CR>
@@ -679 +700 @@
 endif
 
+
+
+
+" Misc.  "{{{1
+
 let &cpo = s:cpo_save
 
+let g:loaded_surround = 1
+
+
+
+
+" __END__  "{{{1
 " vim:set ft=vim sw=4 sts=4 et: