Skip to content

[RDY] vim-patch:8.1.{459,463,466} #9098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Oct 9, 2018
Merged

[RDY] vim-patch:8.1.{459,463,466} #9098

merged 3 commits into from
Oct 9, 2018

Conversation

janlazo
Copy link
Contributor

@janlazo janlazo commented Oct 8, 2018 •
edited
Loading

vim-patch:8.1.0459: Test_executable fails when there is a dog in the system

Problem: Test_executable fails when there is a dog in the system.
Solution: Rename the dog. (Hirohito Higashi)
vim/vim@a05a0d3

vim-patch:8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt

Problem: "simalt ~x" in .vimrc blocks swap file prompt.
Solution: Flush buffers before prompting. (Yasuhiro Matsumoto,
closes vim/vim#3518, closes vim/vim#2192)
vim/vim@798184c

vim-patch:8.1.0466: autocmd test fails

Problem: Autocmd test fails.
Solution: Do call inchar() when flushing typeahead.
vim/vim@6a2633b

janlazo added 2 commits October 8, 2018 16:35
@janlazo
vim-patch:8.1.0459: Test_executable fails when there is a dog in the …
c64d670 
…system

Problem:    Test_executable fails when there is a dog in the system.
Solution:   Rename the dog. (Hirohito Higashi)
vim/vim@a05a0d3
@janlazo
vim-patch:8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
573567a 
Problem:    "simalt ~x" in .vimrc blocks swap file prompt.
Solution:   Flush buffers before prompting. (Yasuhiro Matsumoto,
            closes vim/vim#3518, closes vim/vim#2192)
vim/vim@798184c
@marvim marvim added WIP vim-patch See https://neovim.io/doc/user/dev_vimpatch.html and removed WIP labels Oct 8, 2018
janlazo
janlazo commented Oct 9, 2018
View reviewed changes
src/nvim/testdir/test_functions.vim
@@ -873,7 +873,7 @@ func Test_Executable()
call assert_equal(1, executable('win.ini'))
elseif has('unix')
call assert_equal(1, executable('cat'))
call assert_equal(0, executable('dog'))
call assert_equal(0, executable('nodogshere'))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When is there a dog???

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When there's food

@janlazo
Copy link
Contributor Author

janlazo commented Oct 9, 2018 

[  ERROR   ] 2 errors, listed below:
[  ERROR   ] ...neovim/neovim/test/functional/ui/inccommand_spec.lua @ 2475: :substitute with inccommand during :terminal activity
test/functional/helpers.lua:313: 
retry() attempts: 1
test/functional/ui/screen.lua:431: Row 9 did not match.
Expected:
  |bar baz fox                   |
  |bar foo ba^z                   |
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{11:[No Name] [+]                 }|
  |xxx                           |
  |*xxx                           |
  |xxx                           |
  |xxx                           |
  |xxx                           |
  |xxx                           |
  |{10:term                          }|
  |                              |
Actual:
  |bar baz fox                   |
  |bar foo ba^z                   |
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{11:[No Name] [+]                 }|
  |xxx                           |
  |*{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{15:~                             }|
  |{10:term                          }|
  |                              |

@janlazo
vim-patch:8.1.0466: autocmd test fails
f181efd 
Problem:    Autocmd test fails.
Solution:   Do call inchar() when flushing typeahead.
vim/vim@6a2633b
@janlazo janlazo changed the title [WIP] vim-patch:8.1.{459,463} [RDY] vim-patch:8.1.{459,463,466} Oct 9, 2018
@marvim marvim added RDY and removed WIP labels Oct 9, 2018
@justinmk
Copy link
Member

justinmk commented Oct 9, 2018

That inccommand test is a known issue ><

@justinmk justinmk merged commit 85e8fd9 into neovim:master Oct 9, 2018
@justinmk justinmk removed the RDY label Oct 9, 2018
@janlazo janlazo deleted the vim-8.1.0459 branch October 10, 2018 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@justinmk justinmk justinmk left review comments

Assignees
No one assigned
Labels
vim-patch See https://neovim.io/doc/user/dev_vimpatch.html
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

gvim (windows) freezes when opening a file already openend in another Vim (with "simalt ~x" in GUIEnter)
3 participants
@janlazo @justinmk @marvim