Update autogroup

klen · klen · commit 902cb3d457f5 · 2013-12-02T00:12:45.000+07:00
diff --git a/AUTHORS b/AUTHORS
@@ -11,6 +11,7 @@ Contributors:
 * Ashley Hewson (ashleyh);
 * Benjamin Ruston (bruston);
 * Boris Filippov (frenzykryger);
+* Daniel Hahler (blueyed)
 * David Vogt (winged);
 * Denis Kasak (dkasak);
 * Dirk Wallenstein (dirkwallenstein);
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -9,11 +9,15 @@ if !pymode#default('g:pymode_init', 1)
     call pymode#breakpoint#init()
 endif
 
+augroup pymode
+
+    au!
+
 command! -buffer -nargs=1 PymodeVirtualenv call pymode#virtualenv#activate(<args>)
 
 " Setup events for pymode
-au pymode BufWritePre <buffer> call pymode#buffer_pre_write()
-au pymode BufWritePost <buffer> call pymode#buffer_post_write()
+au BufWritePre <buffer> call pymode#buffer_pre_write()
+au BufWritePost <buffer> call pymode#buffer_post_write()
 
 " Run python code
 if g:pymode_run
@@ -43,7 +47,7 @@ endif
 
 " Remove unused whitespaces
 if g:pymode_trim_whitespaces
-    au pymode BufWritePre <buffer> call pymode#trim_whitespaces()
+    au BufWritePre <buffer> call pymode#trim_whitespaces()
 endif
 
 " Custom options
@@ -70,19 +74,19 @@ if g:pymode_lint
     let b:pymode_signs = []
 
     if g:pymode_lint_on_fly
-        au pymode InsertLeave <buffer> PymodeLint
+        au! InsertLeave <buffer> PymodeLint
     endif
 
     if g:pymode_lint_message
-        au! pymode CursorMoved <buffer>
-        au! pymode CursorMoved <buffer> call pymode#lint#show_errormessage()
+        au! CursorMoved <buffer>
+        au! CursorMoved <buffer> call pymode#lint#show_errormessage()
     endif
 
     " Disabled for current release
     if g:pymode_lint_async
         " let &l:updatetime = g:pymode_lint_async_updatetime
-        " au! pymode BufEnter <buffer> call pymode#lint#start()
-        " au! pymode BufLeave <buffer> call pymode#lint#stop()
+        " au! BufEnter <buffer> call pymode#lint#start()
+        " au! BufLeave <buffer> call pymode#lint#stop()
     end
 
 endif
@@ -183,3 +187,5 @@ if g:pymode_rope
     end
 
 end
+
+augroup END
