Changeset 1732

Timestamp:

11/18/07 00:50:39 (6 years ago)

Author:

kana

Message:

dotfiles/vim/kana:
* Sync with my local repository (2007-10-18/2007-11-18).

Location:

dotfiles/vim/kana

Files:

• dot.vim/autoload/textobj (added)
• dot.vim/autoload/textobj/datetime.vim (added)
• dot.vim/autoload/textobj/user.vim (added)
• dot.vim/doc/textobj-datetime.txt (added)
• dot.vim/doc/textobj-user.txt (added)
• dot.vim/doc/todatetime.txt (deleted)
• dot.vim/doc/touser.txt (deleted)
• dot.vim/plugin/todatetime.vim (deleted)
• dot.vim/plugin/touser.vim (deleted)
• dot.vimrc (modified) (15 diffs)

dotfiles/vim/kana/dot.vimrc

@@ -119 +119 @@
 elseif $ENV_ACCESS ==# 'linux'
   set termencoding=euc-jp
-else  " 'colinux'
+elseif $ENV_ACCESS ==# 'colinux'
   set termencoding=utf-8
+else  " fallback
+  set termencoding=  " same as 'encoding'
 endif
 
@@ -156 +158 @@
 set grepprg=internal
 set incsearch
+set laststatus=2  " always show status lines.
 set mouse=
 set ruler
@@ -165 +168 @@
 set titlestring=Vim:\ %f\ %h%r%m
 set wildmenu
-
 set viminfo=<50,'10,h,r/a,n~/.viminfo
+
+" default 'statusline' with 'fileencoding'.
+let &statusline = ''
+let &statusline .= '%<%f %h%m%r'
+let &statusline .= '%='
+let &statusline .= '[%{&fileencoding == "" ? &encoding : &fileencoding}]'
+let &statusline .= '  %-14.(%l,%c%V%) %P'
 
 " To automatically detect the width and the height of the terminal,
@@ -582 +591 @@
 
 
+function! s:MoveWindowIntoNewTabPage()
+  let original_tabnr = tabpagenr()
+  let target_bufnr = bufnr('')
+
+  tabnew
+  let new_tabnr = tabpagenr()
+  execute target_bufnr 'buffer'
+
+  execute original_tabnr 'tabnext'
+  if 1 < winnr('$')
+    close
+  else
+    enew
+  endif
+
+  execute new_tabnr 'tabnext'
+endfunction
+
+
 
 
@@ -862 +890 @@
 nnoremap [Space]J  :<C-u>call <SID>JoinHere(1)<Return>
 nnoremap [Space]gJ  :<C-u>call <SID>JoinHere(0)<Return>
-  " unjoin
+  " unjoin  " BUGS: side effect - destroy the last inserted text (".).
 nnoremap [Space]j  i<Return><Esc>
 
@@ -885 +913 @@
 
 " Windows  "{{{2
-"
+
 " Synonyms for the default mappings, with single key strokes.
 
-nnoremap <Esc>h  <C-w>h
-nnoremap <Esc>j  <C-w>j
-nnoremap <Esc>k  <C-w>k
-nnoremap <Esc>l  <C-w>l
+nnoremap <C-i>  <C-w>w
+" <Tab> = <C-i>
+nnoremap <Esc>i  <C-w>W
+nmap <S-Tab>  <Esc>i
+
+  " For other mappings (<Esc>{x} to <C-w>{x}).
+nmap <Esc> <C-w>
+
+
+" Others.
 
 nnoremap <Esc>H  :<C-u>call <SID>MoveWindowThenEqualizeIfNecessary('H')<Return>
@@ -898 +932 @@
 nnoremap <Esc>L  :<C-u>call <SID>MoveWindowThenEqualizeIfNecessary('L')<Return>
 
-nnoremap <C-i>  <C-w>w
-" <Tab> = <C-i>
-nnoremap <Esc>i  <C-w>W
-nmap <S-Tab>  <Esc>i
+  " This {lhs} overrides the default action (Move cursor to top-left window).
+  " But I rarely use its {lhs}s, so this mapping is not problematic.
+nnoremap <C-w><C-t>  :<C-u>call <SID>MoveWindowIntoNewTabPage()<Return>
 
 
@@ -951 +984 @@
 
 " Swap ` and ' -- I prefer ` to ' and ` is not easy to type.
-noremap ' `
-noremap ` '
+" <SID>jump-default and <SID>jump-another are the name for these actions
+" to use other places in this file.
+map '  <SID>jump-default
+map `  <SID>jump-another
+noremap <SID>jump-default  `
+noremap <SID>jump-another  '
 
 
@@ -966 +1003 @@
 
 " Synonyms for <> and [], same as plugin surround.
+onoremap aa  a>
+onoremap ia  i>
 vnoremap aa  a>
 vnoremap ia  i>
 
+onoremap ar  a]
+onoremap ir  i]
 vnoremap ar  a]
 vnoremap ir  i]
 
 
+" Delete the content of the current line (not the line itself).
+" BUGS: not repeatable.
+" BUGS: the default behavior is overridden, but it's still available via "x".
+nnoremap dl  0d$
+
+
+" Like gv, but select the last changed text.
+nnoremap gc  `[v`]
+
+
+" Make I/A available in characterwise-visual and linewise-visual.
+vnoremap I  <C-v>I
+vnoremap A  <C-v>A
+
+
+" Start Insert mode with [count] blank lines.
+" (I prefer this behavior to the default behavior of [count]o/O
+"  -- repeat the next insertion [count] times.)
+nnoremap o  :<C-u>call <SID>StartInsertModeWithBlankLines('o')<Return>
+nnoremap O  :<C-u>call <SID>StartInsertModeWithBlankLines('O')<Return>
+
+function! s:StartInsertModeWithBlankLines(command)
+  " Do "[count]o<Esc>o" and so forth.
+  " BUGS: In map-<expr>, v:count and v:count1 don't hold correct values.
+  " FIXME: proper indenting in comments.
+  " FIXME: not repeatable perfectly (repeat insertion without blank lines).
+  let script = ''
+  if v:count == v:count1  " is [count] specified?
+    let script .= v:count . a:command . "\<Esc>"
+    if a:command ==# 'O'
+      " Adjust the cursor position.
+      let script .= "\<Down>" . v:count . "\<Up>"
+    endif
+  endif
+  let script .= a:command
+  call feedkeys(script, 'n')
+endfunction
+
+
+" Search for the selected text.
+vnoremap *  :<C-u>call <SID>SearchForTheSelectedText()<Return>
+
+  " FIXME: escape to search the selected text literaly.
+function! s:SearchForTheSelectedText()
+  let reg_u = @"
+  let reg_0 = @0
+
+  normal! gvy
+  let @/ = @0
+  call histadd('/', @0)
+  normal! n
+
+  let @0 = reg_0
+  let @" = reg_u
+endfunction
+
+
 
 
@@ -980 +1078 @@
 
 " Filetypes  "{{{1
-" All  "{{{2
+" Any filetype   "{{{2
 
 autocmd MyAutoCmd FileType *
   \ call <SID>FileType_any()
-
 function! s:FileType_any()
   " To use my global mappings for section jumping,
@@ -999 +1096 @@
 
 
+" Fix 'fileencoding' to use 'encoding'
+" if the buffer only contains 7-bit characters.
+" Note that if the buffer is not 'modifiable',
+" its 'fileencoding' cannot be changed, so that such buffers are skipped.
+autocmd MyAutoCmd BufReadPost *
+  \   if &modifiable && !search('[^\x00-\x7F]', 'cnw')
+  \ |   setlocal fileencoding=
+  \ | endif
+
+
 " although this is not a filetype settings.
 autocmd MyAutoCmd ColorScheme *
@@ -1010 +1117 @@
 
 
+" css  "{{{2
+
+autocmd MyAutoCmd FileType css
+  \ call <SID>SetShortIndent()
+
+
+
+
 " dosini (.ini)  "{{{2
 
@@ -1025 +1140 @@
 
 
+" help  "{{{2
+
+autocmd MyAutoCmd FileType help
+  \ call textobj#user#define('|[^|]*|', '', '', {
+  \                            'move-to-next': '<buffer> gj',
+  \                            'move-to-prev': '<buffer> gk',
+  \                          })
+
+
+
+
 " lua  "{{{2
 
@@ -1081 +1207 @@
   call <SID>SetShortIndent()
   let vim_indent_cont = &shiftwidth
+
+  iabbr <buffer> jf  function!()<Return>
+                    \endfunction<Return>
+                    \<Up><Up><End><Left><Left>
+  iabbr <buffer> ji  if<Return>
+                    \endif<Return>
+                    \<Up><Up><End>
+  iabbr <buffer> je  if<Return>
+                    \else<Return>
+                    \endif<Return>
+                    \<Up><Up><Up><End>
+  iabbr <buffer> jw  while<Return>
+                    \endwhile<Return>
+                    \<Up><Up><End>
+
+  " Fix the default syntax to properly highlight
+  " autoload#function() and dictionary.function().
+  syntax clear vimFunc
+  syntax match vimFunc
+    \ "\%([sS]:\|<[sS][iI][dD]>\|\<\%(\I\i*[#.]\)\+\)\=\I\i*\ze\s*("
+    \ contains=vimFuncName,vimUserFunc,vimCommand,vimNotFunc,vimExecute
+  syntax clear vimUserFunc
+  syntax match vimUserFunc contained
+    \ "\%([sS]:\|<[sS][iI][dD]>\|\<\%(\I\i*[#.]\)\+\)\i\+\|\<\u\i*\>\|\<if\>"
+    \ contains=vimNotation,vimCommand
 endfunction
 
@@ -1221 +1372 @@
 
 
-" todatetime  "{{{2
-
-autocmd MyAutoCmd User DelayedSettings
-      \   if exists('g:loaded_todatetime')
-      \ |   call TODateTime_DefaultKeymappings(1)
-      \ | endif
+" textobj-datetime  "{{{2
+
+silent! call textobj#datetime#default_mappings(1)