Avoid the use of :normal in the indentexpr

guns · guns · commit 62fa6df15f6c · 2013-02-08T21:28:07.000-06:00
Docs state that the indentexpr must not contain side effects, but that
moving the cursor is okay because it will be reset. However, a closer
look reveals that :normal commands for moving the cursor have side
effects beyond just moving the cursor and thus do not behave properly.

The Vim documentation should be changed to make this more clear, but we
can do our part now.
diff --git a/indent/clojure.vim b/indent/clojure.vim
@@ -256,9 +256,9 @@ if exists("*searchpairpos")
         endif
 
         " In case after the paren is a whitespace, we search for the next word.
-        normal! l
+        call cursor(0, col('.') + 1)
         if s:CurrentChar() == ' '
-            normal! w
+            call search('\v\S', 'W')
         endif
 
         " If we moved to another line, there is no word after the (. We
@@ -290,12 +290,13 @@ if exists("*searchpairpos")
             return paren[1] + &shiftwidth - 1
         endif
 
-        normal! W
+        call search('\v\s|\n', 'cW')
+        call search('\v\S', 'W')
         if paren[0] < line(".")
             return paren[1] + &shiftwidth - 1
         endif
 
-        normal! ge
+        call search('\v\S', 'bW')
         return virtcol(".") + 1
     endfunction
 
