Skip to content

Commit 6b6b58c

Browse files
committed
Port to Neovim: Initialize script-local click variables to prevent E121 errors if Release event triggers before Mouse event.
1 parent 5d5dc4c commit 6b6b58c

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

plugin/acme.vim

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
let s:click = {'winid': 0}
2+
let s:clicksel = 0
3+
let s:clickwin = 0
4+
let s:visual = [[0,0,0,0], [0,0,0,0], '']
5+
let s:clickstatus = 0
6+
17
function s:Bound(min, n, max)
28
return max([a:min, min([a:n, a:max])])
39
endfunc
@@ -13,8 +19,8 @@ function s:FileWin(name)
1319
endfunc
1420

1521
function s:Sel()
16-
let text = getreg('"')
17-
let type = getregtype('"')
22+
let text = getreg("'")
23+
let type = getregtype("'")
1824
let view = winsaveview()
1925
silent normal! gv""y
2026
let sel = [getreg('"'), getregtype('"')]
@@ -196,12 +202,7 @@ function s:JobKill(job, sig)
196202
if has('nvim')
197203
let sig = a:sig
198204
if type(sig) == type("")
199-
let map = {
200-
\ 'int': 2,
201-
\ 'hup': 1,
202-
\ 'term': 15,
203-
\ 'kill': 9
204-
\ }
205+
let map = {'int': 2, 'hup': 1, 'term': 15, 'kill': 9}
205206
let sig = get(map, sig, 15)
206207
endif
207208
silent! call luaeval("vim.loop.kill(vim.fn.jobpid(_A), _B)", [a:job, sig])
@@ -923,8 +924,8 @@ function s:Layout(col)
923924
let s = float2nr(h / (n * (n > s:tops ? 1.75 : 1)))
924925
endif
925926
call win_move_statusline(win_id2win(w) - 1, winheight(w) - s)
926-
let h -= s
927-
let n -= 1
927+
h -= s
928+
n -= 1
928929
endfor
929930
call timer_start(0, {_ -> s:Fit(a:col)})
930931
endfunc
@@ -961,7 +962,7 @@ function s:RestVisual(vis)
961962
call setpos("'>", a:vis[1])
962963
if a:vis[0][1] != 0
963964
let v = winsaveview()
964-
silent! exe "normal! `<".a:vis[2]." \<Esc>"
965+
silent! exe "normal! `<".a:vis[2]."`>\<Esc>"
965966
call winrestview(v)
966967
endif
967968
endfunc
@@ -1188,7 +1189,7 @@ endfunc
11881189
function s:CtrlRecv(ch, data)
11891190
let len = strridx(a:data, "\x1e")
11901191
let len += len == -1 ? 0 : len(s:ctrlrx)
1191-
let s:ctrlrx .= a:data
1192+
s:ctrlrx .= a:data
11921193
if len == -1
11931194
return
11941195
endif
@@ -1356,4 +1357,4 @@ if s:ctrlexe != ''
13561357
\ })
13571358
endif
13581359
let $EDITOR = s:ctrlexe
1359-
endif
1360+
endif

0 commit comments

Comments
 (0)