Fix some gq bugs when tw was set

JelteF · JelteF · commit 0077e5782dff · 2014-07-16T19:22:34.000+02:00
diff --git a/indent/javascript.vim b/indent/javascript.vim
@@ -442,6 +442,10 @@ unlet s:cpo_save
 function! Fixedgq(lnum, count)
     let l:count = a:count
 
+    if mode() == 'i' " gq was not pressed, but tw was set
+        return 1
+    endif
+
     if len(getline(a:lnum)) < 80 && l:count == 1 " No need for gq
         return 1
     endif
@@ -468,7 +472,7 @@ function! Fixedgq(lnum, count)
     endif
 
     " Try breaking after string
-    if breakpoint[1] == indent(a:lnum)
+    if breakpoint[1] <= indent(a:lnum)
         call cursor(a:lnum, 81)
         let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
     endif
