diff --git a/CHANGES.md b/CHANGES.md index a413733ac9..4893aee899 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ unreleased - Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (#1795, fixes #1794) + editor modes - vim: fix python-3.12 syntax warnings in merlin.py (#1798) + - vim: Dead code / doc removal for previously deleted MerlinPhrase command (#1804) merlin 4.16 =========== diff --git a/vim/merlin/autoload/merlin.vim b/vim/merlin/autoload/merlin.vim index f78424cdd1..df33b3bdb0 100644 --- a/vim/merlin/autoload/merlin.vim +++ b/vim/merlin/autoload/merlin.vim @@ -662,20 +662,6 @@ function! merlin#setVisualSelection(a, b) call setpos("'b", markBSave) endfunction -let s:phrase_counter = 0 - -function! merlin#Phrase() - if s:phrase_counter - let s:phrase_counter = s:phrase_counter - 1 - else - let [l1, c1] = getpos("'<")[1:2] - let [l2, c2] = getpos("'>")[1:2] - let s:phrase_counter = l2 - l1 - MerlinPy merlin.vim_selectphrase("l1","c1","l2","c2") - call merlin#setVisualSelection([l1,c1],[l2,c2]) - endif -endfunction - function! merlin#Register() if @% == ":merlin-type-history:" return @@ -807,10 +793,6 @@ function! merlin#Register() command! -buffer -nargs=0 MerlinGotoDotMerlin call merlin#GotoDotMerlin() command! -buffer -nargs=0 MerlinEchoDotMerlin call merlin#EchoDotMerlin() - """ 'semantic movement' ----------------------------------------------------- - " TODO: bind (,),{,} ? - command! -buffer -nargs=0 MerlinPhrase call merlin#Phrase() - """ Polarity search command! -buffer -complete=customlist,merlin#ExpandTypePrefix -nargs=+ MerlinSearch call merlin#PolaritySearch(0,) @@ -819,10 +801,6 @@ function! merlin#Register() command! -buffer -nargs=0 MerlinDebugDisable call merlin#DebugDisable() command! -buffer -nargs=0 MerlinDebugEnable call merlin#DebugEnable() - if !exists('g:merlin_disable_default_keybindings') || !g:merlin_disable_default_keybindings - vmap :MerlinPhrase - endif - call merlin#LoadProject() endfunction diff --git a/vim/merlin/doc/merlin.txt b/vim/merlin/doc/merlin.txt index b741bc926a..b1c571d5d7 100644 --- a/vim/merlin/doc/merlin.txt +++ b/vim/merlin/doc/merlin.txt @@ -147,12 +147,6 @@ environment which name matches the user input. Hitting enter will move you to the definition of the selected element. -:MerlinPhrase *:MerlinPhrase* -Selects the current phrase. - - -Bound to by default in visual mode. - :MerlinErrorCheck *:MerlinErrorCheck* Perform a fast type check of the current file, displaying the error