Fix bug when using gq on multiple lines and fix vimlint errors

Author: JelteF

indent/python.vim

@@ -15,7 +15,7 @@ setlocal expandtab
 setlocal nolisp
 setlocal autoindent
 setlocal indentexpr=GetPythonPEPIndent(v:lnum)
-setlocal formatexpr=Fixedgq(v:lnum,v:count,v:char)
+setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
 setlocal tabstop=4
 setlocal softtabstop=4
@@ -257,11 +257,20 @@ function! GetPythonPEPIndent(lnum)
 endfunction
 
 
-function! Fixedgq(lnum, count, char)
-    let count = a:count
-    if len(getline(a:lnum)) < 80 " No need for gq
+function! Fixedgq(lnum, count)
+    let l:count = a:count
+    if len(getline(a:lnum)) < 80 && l:count == 1 " No need for gq
         return 1
     endif
+
+    " Put all the lines on one line and do normal spliting after that
+    if l:count > 1
+        while l:count > 1
+            let l:count -= 1
+            normal J
+        endwhile
+    endif
+
     let l:winview = winsaveview()
 
     " Check if the line is part of a docstring
@@ -303,17 +312,12 @@ function! Fixedgq(lnum, count, char)
     if breakpoint[1] != 0
         call feedkeys("r\<CR>")
     else
-        let count = count - 1
-        normal j
+        let l:count = l:count - 1
     endif
 
     " run gq on new lines
-    if count > 1
-        call feedkeys("gq".a:count."j")
-    elseif count == 1
+    if l:count == 1
         call feedkeys("gqq")
-    else
-        normal k
     endif
 
     return 0