Changeset 321 for lang/vim/surround/trunk

Timestamp:

10/01/07 04:56:56 (16 months ago)

Author:

kana

Message:

lang/vim/surround:
* Support dynamic template for user-defined objects.

Location:

lang/vim/surround/trunk

Files:

• doc/surround.txt (modified) (1 diff)
• plugin/surround.vim (modified) (1 diff)

lang/vim/surround/trunk/doc/surround.txt

@@ -230 +230 @@
 CHANGELOG                                       *surround-changelog*
 
+2007-10-01T03:43:51+09:00       kana    <http://nicht.s8.xrea.com/>
+
+        - Support dynamic template for |surround-customizing|.
+          Now templates of user-defined surrounding objects may be functions
+          or funcrefs which must return a template.
+
+          For example, the following setting provides two-stroke keys "xb" and
+          "xB" for some templates.
+>
+          function g:surround_{char2nr('x')}()
+            let c = nr2char(getchar())
+            if c ==# 'b'
+              return "(((\r)))"
+            elseif c ==# 'B'
+              return "{{{\r}}}"
+            else
+              return ''
+            endif
+          endfunction
+<
 2007-10-01T00:25:20+09:00       kana    <http://nicht.s8.xrea.com/>
 

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

@@ -617 +617 @@
 function! s:get_user_defined_object(char)
     if exists("b:surround_".char2nr(a:char))
-        return b:surround_{char2nr(a:char)}
+        let Value = b:surround_{char2nr(a:char)}
+    elseif exists("*b:surround_".char2nr(a:char))
+        let Value = function('b:surround_'.char2nr(a:char))
     elseif exists("g:surround_".char2nr(a:char))
-        return g:surround_{char2nr(a:char)}
-    else
-        return ''
+        let Value = g:surround_{char2nr(a:char)}
+    elseif exists("*g:surround_".char2nr(a:char))
+        let Value = function('g:surround_'.char2nr(a:char))
+    else
+        let Value = ''
+    endif
+
+    if type(Value) == type('string')
+        return Value
+    else  " function?
+        return Value()
     endif
 endfunction