Commit: 17ea707f3bd57c677a3c7a566296a2a831c4061e - vim (git)

Commit MetaInfo

• Révision: 17ea707f3bd57c677a3c7a566296a2a831c4061e (tree)
• l'heure: 2018-02-24 08:03:56
• Auteur: Markus Prepens <markus.prepens@gmai...>
• Commiter: Markus Prepens

Message de Log

Merge branch 'master' of https://github.com/analogbit/nvim

Change Summary

• modified: autoload/shellcommand.vim
• modified: autoload/whitespace.vim
• modified: init.vim

Modification

--- a/autoload/shellcommand.vim
+++ b/autoload/shellcommand.vim
@@ -9,7 +9,7 @@
 function! shellcommand#Run(cmdLine)
 
   if !exists("s:outputBuffer")
-    let s:outputBuffer = tempname()
+    let s:outputBuffer = "[SCRun]"
   endif
 
   let winnr = bufwinnr(s:outputBuffer)
@@ -27,7 +27,7 @@ function! shellcommand#Run(cmdLine)
   else
     " No ShellCommand buffer
     execute "edit " . s:outputBuffer
-    setlocal noswapfile nowrap
+    setlocal noswapfile nowrap buftype=nofile
   endif
 
   let cmdRun = ""

--- a/autoload/whitespace.vim
+++ b/autoload/whitespace.vim
@@ -23,15 +23,15 @@ endfunction
 " Description: Delete empty lines around cursor.
 function! s:OneBlankLine()
   while line('.') > 1 && empty(getline(line('.') - 1))
-    normal kdd
+    normal k"_dd
   endwhile
   while line('.') < line('$') && empty(getline(line('.'))) && empty(getline(line('.') + 1))
-    normal dd
+    normal "_dd
   endwhile
   " Top and last lines needs special treatment.
   if line('.') == 1 || line('.') == line('$')
     if empty(getline('.'))
-      normal dd
+      normal "_dd
     endif
   endif
 endfunction
@@ -40,10 +40,10 @@ endfunction
 function! s:OneSpace()
   if s:CharUnderCursor("curr") == " "
     while s:CharUnderCursor("prev") == " " && getcurpos()[2] > 1
-      normal hx
+      normal h"_x
     endwhile
     while s:CharUnderCursor("next") == " "
-      normal x
+      normal "_x
     endwhile
   endif
 endfunction

--- a/init.vim
+++ b/init.vim
@@ -98,7 +98,7 @@ set completeopt=menu
 set pumheight=10
 
 " Command line completion
-set nowildmenu wildmode=list:full
+set nowildmenu wildmode=list:longest
 set wildignorecase
 set wildignore=*.*~
 
@@ -125,19 +125,15 @@ set diffopt=context:3,vertical,iwhite,filler
 " Note: 'cursorline' may delay cursor movement in buffer with filetype 'c'.
 " This behavior may be caused by Doxygen syntax highlighting.
 function! s:TurnCursorLineOn()
-
   if g:use_sticky_cursorline !=0 && &diff == 0 && &buftype == ""
     set cursorline
   endif
-
 endfunction
 
 function! ToggleStickyCursorLine()
-
   if !exists("g:use_sticky_cursorline")
     let g:use_sticky_cursorline = 0
   endif
-
   if g:use_sticky_cursorline == 0
     let g:use_sticky_cursorline = 1
     set cursorline
@@ -153,25 +149,20 @@ function! ToggleStickyCursorLine()
       au!
     augroup END
   endif
-
 endfunction
 
 " Description: Jump to last location. Check out :help line(). Function checks
 " if the '" marker is valid. Jump to the mark, but don't change the jumplist
 " when jumping within the current buffer (:help g').
 function! RestoreCursor ()
-
   if line("'\"") > 1 && line("'\"") <= line("$")
     exe "normal! g'\""
   endif
-
 endfunction
 
 " Description: A context sensitve file movement function.
 function! FastForwardAndRewind(direction)
-
   if a:direction == "fastforward"
-
     if &diff
       normal ]czz
     elseif &filetype == "diff"
@@ -183,9 +174,7 @@ function! FastForwardAndRewind(direction)
     else
       normal ]]
     endif
-
   elseif a:direction == "rewind"
-
     if &diff
       normal [czz
     elseif &filetype == "diff"
@@ -197,32 +186,38 @@ function! FastForwardAndRewind(direction)
     else
       normal [[
     endif
-
   endif
-
 endfunction
 
 function! HiName()
-
   let synid = synID(line("."), col("."), 0)
   let synidtrans = synIDtrans(synid)
   echo synIDattr(synidtrans, "name")
-
 endfunction
 
+" Description: My splash screen (with one-liner Vim script in it)
 function! Welcome()
-
   let l:welcome_text_file = '~/Documents/welcome.txt'
-
   if filereadable(expand(l:welcome_text_file))
     execute 'edit ' . l:welcome_text_file
     nmap <buffer> <CR> 0y$:<C-r>"<CR>
   endif
+endfunction
 
+" Description: Create or move to buffer ClipboardTxt, start to write text,
+" switch to another application and copy the clipboard, filled with
+" ClipboardTxt.
+function! ClipboardBuffer()
+  if bufexists("ClipboardTxt")
+    buffer ClipboardTxt
+  else
+    edit ClipboardTxt
+    setlocal buftype=nofile
+    autocmd FocusLost clipboard.txt  normal gg"*yG
+  endif
 endfunction
 
 function! HighlightWord(word)
-
   if !exists("s:thisHighlightWord")
     let s:thisHighlightWord = ""
   endif
@@ -234,7 +229,6 @@ function! HighlightWord(word)
     let s:thisHighlightWord = ""
     match none
   endif
-
 endfunction
 
 " }}}
@@ -254,7 +248,6 @@ command! -nargs=0 SwitchWorkspace        call workspace#Switch()
 command! -nargs=0 ShowHiName             call HiName()
 command! -nargs=0 ToggleStickyCursorline call ToggleStickyCursorLine()
 
-
 command! -nargs=0 WhitespaceCleanup   call whitespace#Cleanup()
 command! -nargs=0 WhitespaceMelt      call whitespace#Melt()
 
@@ -327,6 +320,7 @@ nnoremap <Leader>h :call HighlightWord("<C-r><C-w>")<CR>
 nnoremap <Leader>tn :$tabnew<CR>
 nnoremap <Leader>tc :tabclose<CR>
 
+nnoremap <Leader>c  :call ClipboardBuffer()<CR>
 nnoremap <Leader>dt :ToggleVimdiff<CR>
 nnoremap <Leader>du :wa <BAR> diffupdate<CR>
 nnoremap <Leader>do :VimdiffFileContext<CR>
@@ -398,8 +392,7 @@ cnoremap <A-.> <C-r>=expand("%:p:h")<CR>
 
 " }}}
 
-
-" Save when losing focus
+" Save when Neovim's losing or gaining focus
 augroup ginit
   " clear group in case file sourced several times
   autocmd!