Commits

Meikel Brandmeyer committed 81c18a5

Unfix Yank (reported by O. Kvist)

Unfix Yank, but fix erroneuous invocations.

  • Participants
  • Parent commits 586b8f9

Comments (0)

Files changed (2)

File vim/autoload/vimclojure/util.vim

 	let closure = {'reg': a:r, 'yank': a:how}
 
 	function closure.f() dict
-		silent execute "normal!" self.yank
+		silent execute self.yank
 		return getreg(self.reg)
 	endfunction
 

File vim/indent/clojure.vim

 		call vimclojure#util#MoveBackward()
 
 		" Special case: we are at a '(('.
-		if vimclojure#util#Yank('l', '"lyl') == '('
+		if vimclojure#util#Yank('l', 'normal! "lyl') == '('
 			return 0
 		endif
 		call cursor(self.pos)
 		call cursor(nextParen)
 
 		call vimclojure#util#MoveForward()
-		let keyword = vimclojure#util#Yank('l', '"lye')
+		let keyword = vimclojure#util#Yank('l', 'normal! "lye')
 		for kw in [ 'deftype', 'defrecord', 'reify', 'proxy', 'letfn' ]
 			if kw == keyword
 				return 1
 
 	" In case after the paren is a whitespace, we search for the next word.
 	normal! l
-	if vimclojure#util#Yank('l', '"lyl') == ' '
+	if vimclojure#util#Yank('l', 'normal! "lyl') == ' '
 		normal! w
 	endif
 
 
 	" We still have to check, whether the keyword starts with a (, [ or {.
 	" In that case we use the ( position for indent.
-	let w = vimclojure#util#Yank('l', '"lye')
+	let w = vimclojure#util#Yank('l', 'normal! "lye')
 	if stridx('([{', w[0]) > 0
 		return paren[1]
 	endif