Revert "fix ocaml#553"

This reverts commit 7efcb22.

The problem reported in ocaml#553 is not reproducible when this commit is reverted,
so it's likely that the underlying Neovim bug that caused it has been resolved.
The fix introduces a problem where the window is scrolled (ocaml#1221), so this
commit reverts it.

Author: voodoos

CHANGES.md

@@ -10,6 +10,9 @@ git version
     - handle `=` syntax in compiler flags (#1409)
   + editor modes
     - update quick setup instructions for emacs (#1380, @ScriptDevil)
+    - fix an issue in Neovim where the current line jumps to the top of the
+      window on repeated calls to `MerlinTypeOf` (#1433 by @ddickstein, fixes
+      #1221)
   + test suite
     - make `merlin-wrapper` create a default `.merlin` file  only when there is
       no `dune-project` to let tests use `dune ocaml-merlin` reader. (#1425)

vim/merlin/autoload/merlin.vim

@@ -237,7 +237,7 @@ function! s:ShowTypeEnclosing(type)
 
   let g:merlin_latest_type = a:type['type']
 
-  if g:merlin_type_history_height <= 0 || (!has("nvim") && (v:version <= 703 || !has("patch-7.4.424")))
+  if g:merlin_type_history_height <= 0 || v:version <= 703 || !has("patch-7.4.424")
     echo a:type['type'] . a:type['tail_info']
     return
   endif

vim/merlin/autoload/merlin_type.vim

@@ -64,15 +64,6 @@ function! s:RecordType(type)
 
   " vimscript can't append to a buffer without a refresh (?!)
   MerlinPy << EOF
-
-# Vim cursor is a global state that will leak.
-# Nvim will complain the cursor is outside of buffer (using cursor from
-# current buffer in the type buffer).
-# So put it to origin and restore it later.
-cw = vim.current.window
-cursor = cw.cursor
-cw.cursor = (1,0)
-
 idx = int(vim.eval("g:merlin_type_history"))
 typ = vim.eval("a:type")
 buf = None
@@ -95,7 +86,7 @@ else:
 
 # Note that this leaves a blank line at the beginning of the buffer, but
 # it is apparently the desired behavior.
-cw.cursor = cursor
+
 EOF
 
   call winrestview(l:view)