Changeset 4728 for lang/vim/textobj-user/trunk

Timestamp:

01/17/08 01:24:31 (10 months ago)

Author:

kana

Message:

lang/vim/textobj-user:
* Update the copyright notice.
* vim/dot.vim/autoload/textobj/user.vim:

• textobj#user#move(): Modify to be able to use in Visual and
  Operator-pending mode.
  
• textobj#user#select(): Fix the wrong selecting in Operator-pending mode.
  

* vim/dot.vim/doc/textobj-user.txt:

• Update for the above changes.
  

* Mark as version 0.2.

Location:

lang/vim/textobj-user/trunk

Files:

• autoload/textobj/user.vim (modified) (4 diffs)
• doc/textobj-user.txt (modified) (6 diffs)

lang/vim/textobj-user/trunk/autoload/textobj/user.vim

@@ -1 +1 @@
 " textobj-user - Support for user-defined text objects
-" Version: 0.1
-" Copyright (C) 2007 kana <http://nicht.s8.xrea.com/>
+" Version: 0.2
+" Copyright (C) 2007-2008 kana <http://nicht.s8.xrea.com/>
 " License: MIT license (see <http://www.opensource.org/licenses/mit-license>)
 " $Id$  "{{{1
 " Interfaces  "{{{1
 
-function! textobj#user#move(pattern, flags)
+function! textobj#user#move(pattern, flags, previous_mode)
+  if a:previous_mode ==# 'v'
+    normal! gv
+  endif
   let i = v:count1
   while 0 < i
@@ -20 +23 @@
 " FIXME: In a case of a:pattern matches with one character.
 function! textobj#user#select(pattern, flags, previous_mode)
-  execute 'normal!' "gv\<Esc>"
+  if a:previous_mode ==# 'v'
+    execute 'normal!' "gv\<Esc>"
+  endif
   let ORIG_POS = s:gpos_to_spos(getpos('.'))
 
@@ -114 +119 @@
     for lhs in lhss
       if function_name == 'move-to-next'
-        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, '')
+        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, '', 'n')
+        execute 'vnoremap' s:mapargs_single_move(lhs, pat0, '', 'v')
+        execute 'onoremap' s:mapargs_single_move(lhs, pat0, '', 'o')
       elseif function_name == 'move-to-next-end'
-        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'e')
+        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'e', 'n')
+        execute 'vnoremap' s:mapargs_single_move(lhs, pat0, 'e', 'v')
+        execute 'onoremap' s:mapargs_single_move(lhs, pat0, 'e', 'o')
       elseif function_name == 'move-to-prev'
-        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'b')
+        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'b', 'n')
+        execute 'vnoremap' s:mapargs_single_move(lhs, pat0, 'b', 'v')
+        execute 'onoremap' s:mapargs_single_move(lhs, pat0, 'b', 'o')
       elseif function_name == 'move-to-prev-end'
-        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'be')
+        execute 'nnoremap' s:mapargs_single_move(lhs, pat0, 'be', 'n')
+        execute 'vnoremap' s:mapargs_single_move(lhs, pat0, 'be', 'v')
+        execute 'onoremap' s:mapargs_single_move(lhs, pat0, 'be', 'o')
       elseif function_name == 'select-next' || function_name == 'select'
         execute 'vnoremap' s:mapargs_single_select(lhs, pat0, '', 'v')
@@ -214 +227 @@
 
 
-function! s:mapargs_single_move(lhs, pattern, flags)
-  return printf('<silent> %s  :<C-u>call textobj#user#move(%s, %s)<CR>',
-              \ a:lhs, string(a:pattern), string(a:flags))
+function! s:mapargs_single_move(lhs, pattern, flags, previous_mode)
+  return printf('<silent> %s  :<C-u>call textobj#user#move(%s, %s, %s)<CR>',
+              \ a:lhs,
+              \ string(a:pattern), string(a:flags), string(a:previous_mode))
 endfunction
 

lang/vim/textobj-user/trunk/doc/textobj-user.txt

@@ -1 +1 @@
 *textobj-user.txt*      Support for user-defined text objects
 
-Version 0.1
-Copyright (C) 2007 kana <http://nicht.s8.xrea.com/>
+Version 0.2
+Copyright (C) 2007-2008 kana <http://nicht.s8.xrea.com/>
 License: MIT license (see <http://www.opensource.org/licenses/mit-license>)
 $Id$
@@ -25 +25 @@
 
                                                 *textobj#user#move()*
-textobj#user#move({pattern}, {flags})
+textobj#user#move({pattern}, {flags}, {previous-mode})
         Move the cursor to the appropriate object defined by {pattern}.
 
@@ -33 +33 @@
                 'b'     search backward instead of forward.
                 'e'     move to the end of the match.
+
+        {previous-mode} is a string representing the "previous" mode,
+        that is, which mode of mapping causes the calling of this function.
+        For example, if this function is called via a mapping for
+        Operator-pending mode, {previous-mode} must be 'o'.
+                char    meaning ~
+                ----    ------- ~
+                'n'     Normal mode
+                'o'     Operator-pending mode
+                'v'     Visual mode
 
         Return value is same as |searchpos()|.
@@ -49 +59 @@
                         cursor is not in the range of an object.
 
-        {previous-mode} is a string that represents the "previous" mode.
-        For example, if this function is called via a mapping for
-        Operator-pending mode, {previous-mode} must be 'o'.
-                char    meaning ~
-                ----    ------- ~
-                'o'     Operator-pending mode
-                'v'     Visual mode
+        For the detail of {previous-mode}, see |textobj#user#move()|.
 
         Return value is not defined.
@@ -74 +78 @@
                         {pattern1} and {pattern2}, this function does nothing.
 
-        For the detail of {previous-mode}, see |textobj#user#select()|.
+        For the detail of {previous-mode}, see |textobj#user#move()|.
 
         Return value is not defined.
@@ -128 +132 @@
 CHANGELOG                                       *textobj-user-changelog*
 
+0.2     2008-01-07T08:44:14+09:00
+        - textobj#user#select(): Fix the wrong selecting in Operator-pending
+          mode.
+        - textobj#user#move(): Modify to be able to use in Visual and
+          Operator-pending mode.
+
 0.1     2007-11-16T01:17:45+09:00
         - Modify to be autoloaded.