Permalink
Browse files

Version 0.9.7: Fixed viminfo '" filemark issue (thanks to Petr Uzel)

  • Loading branch information...
1 parent ee340e5 commit df08cea2c388e0d1f470dae2dc5e85b04d9928b9 Florian Delizy committed with Nov 6, 2012
Showing with 31 additions and 9 deletions.
  1. +5 −0 doc/quilt.txt
  2. +26 −9 plugin/quilt.vim
View
@@ -641,6 +641,11 @@ B. Changelog *quilt-changelog*
0.9.6 [2007/09/24]
>
* Fixed files handling in patches/ directory (thanks to Jordan Crouse)
+
+<
+0.9.7 [2012/11/05]
+>
+ * Fixed viminfo '" filemark issue (thanks to Petr Uzel)
<
-------------------------------------------------------------------------------
View
@@ -1,8 +1,8 @@
"------------------------------------------------------------------------------
" This plugin enables easy integration with quilt, to push/pop/refresh patch
"
-" Author: Florian Delizy <florian.delizy@unfreeze.net>
-" Maintainer: Florian Delizy <florian.delizy@unfreeze.net>
+" Author: Florian Delizy <florian.delizy@gmail.com>
+" Maintainer: Florian Delizy <florian.delizy@gmail.com>
"
" Install:
" uncompress in your .vim/ directory, then :helptag ~/.vim/doc to get the help
@@ -20,7 +20,8 @@
"------------------------------------------------------------------------------
"
" TODO:
-"
+" ( if you see anything you'd like to be done, or need something else, mail/patch me :)
+"
" * an interface showing the current patch on the bottom
" - allow fold/unfold to see what files are included
" * auto add the currently modified file
@@ -31,6 +32,10 @@
" * quilt merge, import ... and stuffs (is somebody using it ??)
+if exists("g:skip_loading_quiltplugin") && g:skip_loading_quiltplugin
+ finish
+endif
+
"------------------------------------------------------------------------------
" Commands definition
"------------------------------------------------------------------------------
@@ -39,11 +44,13 @@ let cpocopy=&cpo | set cpo-=C
command! QuiltCheckRej call <SID>QuiltCheckRej()
command! QuiltStatus call <SID>QuiltStatus()
-autocmd! BufNewFile,BufReadPost,FileReadPost * QuiltStatus
-autocmd! BufReadPost,FileReadPost * QuiltCheckRej
+augroup QuiltPlug
+autocmd!
+
+autocmd BufNewFile,BufReadPost,FileReadPost * QuiltStatus
+autocmd BufReadPost,FileReadPost * QuiltCheckRej
-autocmd BufNewFile,BufReadPost * QuiltStatus
-autocmd BufReadPost * QuiltCheckRej
+augroup END
command! -nargs=? -complete=custom,QuiltCompleteInPatch
\ QuiltPatchEdit call <SID>QuiltPatchEdit( <f-args> )
@@ -172,15 +179,19 @@ function! <SID>QuiltAnnotate( bang, ... )
wincmd l
wincmd |
wincmd h
+ augroup QuiltPlugAnnotate
autocmd BufUnload <buffer> call <SID>QuitAnnotateJ()
+ augroup END
" Create the patch name window
new
wincmd J
wincmd k
wincmd _
wincmd j
+ augroup QuiltPlugAnnotate
autocmd BufUnload <buffer> call <SID>QuitAnnotateH()
+ augroup END
" Parse the result
@@ -237,7 +248,9 @@ function! <SID>QuiltAnnotate( bang, ... )
redraw!
if DoCursor
setlocal cursorline
+ augroup QuiltPlugAnnotate
autocmd CursorMoved <buffer> call <SID>FollowCursorLine()
+ augroup END
endif
endfunction
@@ -265,14 +278,18 @@ function! <SID>QuitAnnotateJ()
quit
wincmd k
wincmd l
- autocmd! CursorMoved <buffer>
+ augroup QuiltPlugAnnotate
+ autocmd!
+ augroup END
setlocal nocursorline
function! <SID>QuitAnnotateH()
wincmd k
quit
wincmd l
- autocmd! CursorMoved <buffer>
+ augroup QuiltPlugAnnotate
+ autocmd!
+ augroup END
setlocal nocursorline
endfunction

0 comments on commit df08cea

Please sign in to comment.