Changeset 3577

Timestamp:

12/26/07 02:52:57 (5 years ago)

Author:

kana

Message:

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

r1162@colinux: kana | 2007-12-25 06:20:22 +0900
vim/dot.vimrc:

• s:KeysToInsertOneCharacter(): Add missing 'echohl None' to restore the
  highlight for :echo.
  

r1163@colinux: kana | 2007-12-26 01:27:46 +0900
vim/dot.vim/doc/scratch.txt:

• BUGS: Improve the sentence on :edit problem.
  

r1164@colinux: kana | 2007-12-26 02:15:06 +0900
vim/dot.vim/autoload/scratch.vim:

• scratch#evaluate_linewise(), scratch#evaluate():
  New arg adjust_cursorp.
  Update all callers.
  Update documents.
  

r1165@colinux: kana | 2007-12-26 02:30:38 +0900
vim/dot.vim/plugin/scratch.vim:

• :ScratchEvaluate?: Add [!] to control cursor adjustment.
  
• <Plug>(scratch-evaluate!): New.
  
• Rename the {lhs} of all mappings.
  Update all users.
  

r1166@colinux: kana | 2007-12-26 02:40:19 +0900
vim/dot.vim/doc/scratch.txt:

• BUGS: Update some items.
  

Location:

dotfiles/vim/kana

Files:

• dot.vim/autoload/scratch.vim (modified) (3 diffs)
• dot.vim/doc/scratch.txt (modified) (4 diffs)
• dot.vim/plugin/scratch.vim (modified) (1 diff)
• dot.vimrc (modified) (3 diffs)

dotfiles/vim/kana/dot.vim/autoload/scratch.vim

@@ -85 +85 @@
 
 
-function! scratch#evaluate_linewise(line1, line2)  "{{{2
+function! scratch#evaluate_linewise(line1, line2, adjust_cursorp)  "{{{2
   let bufnr = bufnr('')
   call scratch#evaluate([bufnr, a:line1, 1, 0],
-     \                  [bufnr, a:line2, len(getline(a:line2)), 0])
+     \                  [bufnr, a:line2, len(getline(a:line2)), 0],
+     \                  a:adjust_cursorp)
 endfunction
 
@@ -94 +95 @@
 
 
-function! scratch#evaluate(range_head, range_tail)  "{{{2
+function! scratch#evaluate(range_head, range_tail, adjust_cursorp)  "{{{2
+  " Yank the script.
+  let original_pos = getpos('.')
   let original_reg_a = @a
-  let original_pos = getpos('.')
     call setpos('.', a:range_head)
     normal! v
@@ -102 +104 @@
     silent normal! "ay
     let script = @a
-  call setpos('.', original_pos)
   let @a = original_reg_a
 
+  " Evaluate it.
   execute script
+
+  if a:adjust_cursorp
+    " Move to the next line of the script (add new line if necessary).
+    call setpos('.', a:range_tail)
+    if line('.') == line('$')
+      put =''
+    else
+      normal! +
+    endif
+  else
+    call setpos('.', original_pos)
+  endif
 endfunction
 

dotfiles/vim/kana/dot.vim/doc/scratch.txt

@@ -54 +54 @@
         Close a window that shows the scratch buffer if able.
 
-:[range]ScratchEvaluate                                 *:ScratchEvaluate*
-        Evaluate/Execute the [range] as a Vim script.
+:[range]ScratchEvaluate[!]                              *:ScratchEvaluate*
+        Evaluate the [range] as a Vim script.
         The default [range] is the current line.
+        Without [!], the cursor will be moved to the next line of the script
+        after evaluating.  If there is no line to move, new blank line will be
+        appended then the cursor will be moved to the new line.
+        With [!], such adjustment will not be done.
 
 
@@ -70 +74 @@
         The return value is not defined.
 
-scratch#evaluate_linewise({line1}, {line2})       *scratch#evaluate_linewise()*
+                                                  *scratch#evaluate_linewise()*
+scratch#evaluate_linewise({line1}, {line2}, {adjust-cursorp})
         Function version of |:ScratchEvaluate|.
+        If {adjust-cursorp} is true, the cursor position will be adjusted as
+        same as |:ScratchEvaluate|.  If {adjust-cursorp} is false, such
+        adjustment will not be done.
         The return value is not defined.
 
-scratch#evaluate({pos1}, {pos2})                        *scratch#evaluate()*
+scratch#evaluate({pos1}, {pos2}, {adjust-cursorp})      *scratch#evaluate()*
         Same as |scratch#evaluate_linewise()|, but this takes the range of the
         script to be evaluated as {pos1} and {pos2}, which are same as the
@@ -86 +94 @@
 GLOBAL MAPPINGS ~
 
-<Plug>scratch-open                                      *<Plug>scratch-open*
+<Plug>(scratch-open)                                    *<Plug>(scratch-open)*
         Do |:ScratchOpen|.
 
-<Plug>scratch-close                                     *<Plug>scratch-close*
+<Plug>(scratch-close)                                   *<Plug>(scratch-close)*
         Do |:ScratchClose|.
 
-<Plug>scratch-evaluate                                *<Plug>scratch-evaluate*
-        Do |:ScratchEvaluate|.
+<Plug>(scratch-evaluate)                             *<Plug>(scratch-evaluate)*
+        Do |:ScratchEvaluate| without [!].
+
+<Plug>(scratch-evaluate!)                           *<Plug>(scratch-evaluate!)*
+        Do |:ScratchEvaluate| with [!].
 
 SCRATCH BUFFER-LOCAL MAPPINGS ~
@@ -158 +169 @@
 BUGS                                            *scratch-bugs*
 
-- When |:edit| is executed on the scratch buffer, the content of the scratch
-  buffer will be cleared.
+- Don't do |:edit|, |:bunload| or |:bdelete| on the scratch buffer.  The
+  content of the scratch buffer and/or other information (e.g., mappings) will
+  be cleared.
+  If you did it accidentally, do |:bwipeout| then |:ScratchOpen| to recreate
+  the scratch buffer.
 
 - |:ScratchOpen| - To create the scratch buffer, the current buffer will be
-  hidden temporary.
+  hidden temporary.  This behavior may cause some problems.
 
-- |:ScratchEvaluate| - Cursor adjustment is not good.
-
-- |:ScratchEvaluate| - Should this be able to evaluate any programming
-  language other than Vim script?
+- |:ScratchEvaluate| - Is it useful to evaluate any programming language other
+  than Vim script?
 
 

dotfiles/vim/kana/dot.vim/plugin/scratch.vim

@@ -20 +20 @@
 command! -bar -nargs=0 ScratchOpen  call scratch#open()
 command! -bar -nargs=0 ScratchClose  call scratch#close()
-command! -bar -nargs=0 -range ScratchEvaluate
-      \ call scratch#evaluate_linewise(<line1>, <line2>)
+command! -bang -bar -nargs=0 -range ScratchEvaluate
+      \ call scratch#evaluate_linewise(<line1>, <line2>, '<bang>' != '!')
 
 
-noremap <silent> <Plug>scratch-open  :<C-u>ScratchOpen<Return>
-noremap <silent> <Plug>scratch-close  :<C-u>ScratchClose<Return>
-noremap <silent> <Plug>scratch-evaluate  :ScratchEvaluate<Return>
+noremap <silent> <Plug>(scratch-open)  :<C-u>ScratchOpen<Return>
+noremap <silent> <Plug>(scratch-close)  :<C-u>ScratchClose<Return>
+noremap <silent> <Plug>(scratch-evaluate)  :ScratchEvaluate<Return>
+noremap <silent> <Plug>(scratch-evaluate!)  :ScratchEvaluate!<Return>
 
 

dotfiles/vim/kana/dot.vimrc

@@ -400 +400 @@
   echohl ModeMsg
   echo '-- INSERT (one char) --'
+  echohl None
   return nr2char(getchar()) . "\<Esc>"
 endfunction
@@ -1481 +1482 @@
 " scratch  "{{{2
 
-nnoremap <Leader>s  :<C-u>ScratchOpen<Return>
+nmap <Leader>s  <Plug>(scratch-open)
 
 
@@ -1487 +1488 @@
 " But I don't use it in the scratch buffer, so it should be overridden.
 autocmd MyAutoCmd User PluginScratchInitializeAfter
-      \ map <buffer> <C-m>  <Plug>scratch-evaluate
+      \ map <buffer> <C-m>  <Plug>(scratch-evaluate)