Merge branch 'no-cursor-move-during-indentexpr'

guns · guns · commit 84d5e0c9f156 · 2014-05-08T01:20:01.000-05:00
While an indentexpr is allowed to move the cursor while calculating a
line's indent, doing so makes GetClojureIndent() unusable as a library
function. Paredit.vim, for instance, makes use of this function.

Closes #49

* no-cursor-move-during-indentexpr:
  Eliminate cursor side-effect in GetClojureIndent().
  Fix GetClojureIndent() undesireable cursor move.
diff --git a/indent/clojure.vim b/indent/clojure.vim
@@ -306,6 +306,7 @@ if exists("*searchpairpos")
 
 	function! GetClojureIndent()
 		let lnum = line('.')
+		let cnum = col('.')
 		let [opening_lnum, indent] = s:clojure_indent_pos()
 
 		" Account for multibyte characters
@@ -315,6 +316,7 @@ if exists("*searchpairpos")
 
 		" Return if there are no previous lines to inherit from
 		if opening_lnum < 1 || opening_lnum >= lnum - 1
+			call cursor(lnum, cnum)
 			return indent
 		endif
 
@@ -349,11 +351,13 @@ if exists("*searchpairpos")
 				" Check if this is part of a multiline string
 				call cursor(lnum, 1)
 				if s:syn_id_name() !~? '\vstring|regex'
+					call cursor(lnum, cnum)
 					return indent(lnum)
 				endif
 			endif
 		endwhile
 
+		call cursor(lnum, cnum)
 		return indent
 	endfunction
 
