Fix indentation with multibyte characters

Instead of sometimes using virtcol() to get the screen position,
work with the file as single-byte characters, then adjust the final
indentation by the difference of col and virtcol.

There may be some outstanding edge cases.

Author: guns

clj/dev-resources/test-multibyte-indent.in

@@ -0,0 +1,5 @@
+(let [Δt (if foo
+          bar
+          baz)])
+
+;; vim:ft=clojure:

clj/dev-resources/test-multibyte-indent.out

@@ -0,0 +1,5 @@
+(let [Δt (if foo
+           bar
+           baz)])
+
+;; vim:ft=clojure:

clj/test/vim_clojure_static/indent_test.clj

@@ -6,4 +6,7 @@
   (test-indent "is inherited from previous element"
                :in "test-inherit-indent.in"
                :out "test-inherit-indent.out"
-               :keys "/α\\<CR>s\\<C-O>Oa\\<Esc>/β\\<CR>s\\<CR>\\<CR>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>b\\<CR>c\\<CR>\\<CR>d\\<Esc>"))
+               :keys "/α\\<CR>s\\<C-O>Oa\\<Esc>/β\\<CR>s\\<CR>\\<CR>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>\\<C-H>b\\<CR>c\\<CR>\\<CR>d\\<Esc>")
+  (test-indent "with multibyte characters"
+               :in "test-multibyte-indent.in"
+               :out "test-multibyte-indent.out"))

indent/clojure.vim

@@ -8,11 +8,6 @@
 " License:	Same as Vim
 " Last Change:	%%RELEASE_DATE%%
 
-" TODO: Indenting after multibyte characters is broken:
-"       (let [Δ (if foo
-"                bar    ; Indent error
-"                baz)])
-
 if exists("b:did_indent")
 	finish
 endif
@@ -99,7 +94,7 @@ if exists("*searchpairpos")
 		endif
 
 		let pos = searchpairpos(a:open, '', a:close, 'bWn', "!s:is_paren()", stopat)
-		return [pos[0], virtcol(pos)]
+		return [pos[0], col(pos)]
 	endfunction
 
 	function! s:clojure_check_for_string_worker()
@@ -306,12 +301,13 @@ if exists("*searchpairpos")
 		endif
 
 		call search('\v\S', 'bW')
-		return [line('.'), virtcol('.') + 1]
+		return [line('.'), col('.') + 1]
 	endfunction
 
 	function! GetClojureIndent()
 		let lnum = line('.')
 		let [opening_lnum, indent] = s:clojure_indent_pos()
+		let indent -= indent - virtcol([opening_lnum, indent])
 
 		" Return if there are no previous lines to inherit from
 		if opening_lnum < 1 || opening_lnum >= lnum - 1