Changeset 2168

Timestamp:

11/30/07 15:01:53 (5 years ago)

Author:

kana

Message:

dotfiles/vim/kana:
* Merge the following changes from my local repository.

r1006@colinux: kana | 2007-11-28 01:04:31 +0900
vim/dot.vim/autoload/textobj/user.vim (s:rhs_escape):

• Fix the bug that '<' was escaped as '<LT<GT>'.
  
  r1008@colinux: kana | 2007-11-28 01:18:05 +0900
  vim/dot.vim/autoload/textobj/user.vim (s:rhs_escape):
  
• Fix the bug that '>' must not be escaped as '<GT>', because such notation
  doesn't exist.
  
  r1009@colinux: kana | 2007-11-28 01:21:10 +0900
  vim/dot.vim/ftplugin/issue.vim:
  
• Map <LocalLeader?>j and <LocalLeader?>k to move to issue ids.
  
• Map <Return> to s:JumpToIssue().
  
• s:JumpToIssue(): New, but not implemented yet.
  
  r1021@colinux: kana | 2007-11-30 13:05:55 +0900
  vim/dot.vimrc:
  
• (Key Mappings / Misc.): Fix the bug that visualmode() is used in map-expr
  (I expect that it will return the CURRENT Visual mode, but it will return
  the LAST Visual mode. It's returning value won't be updated in map-expr).
  
  r1023@colinux: kana | 2007-11-30 14:25:34 +0900
  vim/dot.vimrc:
  
• (Plugins / surround): Move the definition of surrounding objects into
  vim/dot.vim/plugin/surround_config.vim, to fix the problem on broken
  multibyte strings.
  
  vim/dot.vim/plugin/surround_config.vim:
  
• New, for the above change.
  
  Makefile:
  
• (GROUP_VIM_FILES): Add new file.
  
  r1024@colinux: kana | 2007-11-30 14:33:29 +0900
  vim/dot.vimrc:
  
• (modelines): Remove 'fileencoding' not to set 'modified' if the file doesn't
  contain any multibyte character.
  

Location:

dotfiles/vim/kana

Files:

• dot.vim/autoload/textobj/user.vim (modified) (1 diff)
• dot.vim/ftplugin/issue.vim (modified) (3 diffs)
• dot.vim/plugin/surround_config.vim (added)
• dot.vimrc (modified) (3 diffs)

dotfiles/vim/kana/dot.vim/autoload/textobj/user.vim

@@ -209 +209 @@
   let r = a:pattern
   let r = substitute(r, '<', '<LT>', 'g')
-  let r = substitute(r, '>', '<GT>', 'g')
   let r = substitute(r, '|', '<Bar>', 'g')
   return r

dotfiles/vim/kana/dot.vim/ftplugin/issue.vim

@@ -13 +13 @@
 
 
+let s:RE_ISSUE_ID = '#\<\d\+\>'
+
+
 
 
@@ -23 +26 @@
 nnoremap <buffer> <LocalLeader>s  :<C-u>call <SID>ShowStatus()<Return>
 
-
 nnoremap <buffer> <LocalLeader>i  :<C-u>call <SID>NewIssue()<Return>
 nnoremap <buffer> <LocalLeader>n  :<C-u>call <SID>NewNote()<Return>
 
+nnoremap <buffer> <Return>  :<C-u>call <SID>JumpToIssue()<Return>
+
+call textobj#user#define(s:RE_ISSUE_ID, '', '', {
+   \                       'move-to-next': '<LocalLeader>j',
+   \                       'move-to-prev': '<LocalLeader>k',
+   \                     })
 
 "" Moving around elements (just a memo; not implemented yet).
@@ -79 +87 @@
 
 
+function! s:JumpToIssue()
+  echo 'FIXME: Not Implemented Yet.'
+  return
+  let BAD = [0, 0]
+  let pos = [line('.'), col('.')]
+
+  let fb = textobj#user#move(s:RE_ISSUE_ID, 'n')
+  let fe = textobj#user#move(s:RE_ISSUE_ID, 'ne')
+  let fdiff = s:Distance(pos, fb, fe)
+
+  let bb = textobj#user#move(s:RE_ISSUE_ID, 'nb')
+  let be = textobj#user#move(s:RE_ISSUE_ID, 'nbe')
+  let bdiff = s:Distance(pos, bb, be)
+
+  if fdiff != BAD && bdiff != BAD
+    if s:LT(fdiff, bdiff)
+    endif
+  elseif fdiff != BAD && bdiff == BAD
+  elseif fdiff == BAD && bdiff != BAD
+  else  " if fdiff == BAD && bdiff == BAD
+    " nop
+  endif
+endfunction
+
+
+
+
 function! s:GetIDInfo()
   let pos = getpos('.')

dotfiles/vim/kana/dot.vimrc

@@ -1083 +1083 @@
 
 " Make I/A available in characterwise-visual and linewise-visual.
-vnoremap <expr> I  visualmode() == "\<C-v>" ? 'I' : "\<C-v>I"
-vnoremap <expr> A  visualmode() == "\<C-v>" ? 'A' : "\<C-v>A"
+vnoremap I  :<C-u>call <SID>ForceBlockwiseVisual('I')<Return>
+vnoremap A  :<C-u>call <SID>ForceBlockwiseVisual('A')<Return>
+
+function! s:ForceBlockwiseVisual(next_key)
+  normal! gv
+  if visualmode() != "\<C-v>"
+    execute 'normal!' "\<C-v>"
+  endif
+  call feedkeys(a:next_key, 'n')
+endfunction
 
 
@@ -1429 +1437 @@
 nmap ss  <Plug>Yssurround
 
-autocmd MyAutoCmd User DelayedSettings
-      \   if exists('g:loaded_surround') || exists('*SurroundRegister')
-      \ |   call SurroundRegister('g', 'js', "「\r」")
-      \ |   call SurroundRegister('g', 'jd', "『\r』")
-      \ | endif
+" See also ~/.vim/plugin/surround_config.vim .
 
 
@@ -1500 +1504 @@
 
 " __END__  "{{{1
-" vim: fileencoding=utf-8 bomb
+" vim: bomb
 " vim: expandtab softtabstop=2 shiftwidth=2
 " vim: foldmethod=marker