mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 11:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4012 from jbradaric/vim-7.4.729

Browse Source 
vim-patch:7.4.729
This commit is contained in:
Justin M. Keyes
2016-01-21 02:35:15 -05:00
parent 5bfbf968dd a118abca77
commit bcbcf235f6
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/screen.c
View File

@@ -3489,11 +3489,11 @@ win_line (
&& !(noinvcur && !(noinvcur
&& lnum == wp->w_cursor.lnum && lnum == wp->w_cursor.lnum
&& (colnr_T)vcol == wp->w_virtcol))) && (colnr_T)vcol == wp->w_virtcol)))
&& lcs_eol_one >= 0) { && lcs_eol_one > 0) {
/* Display a '$' after the line or highlight an extra // Display a '$' after the line or highlight an extra
* character if the line break is included. */ // character if the line break is included.
/* For a diff line the highlighting continues after the // For a diff line the highlighting continues after the
* "$". */ // "$".
if (diff_hlf == (hlf_T)0 && line_attr == 0) { if (diff_hlf == (hlf_T)0 && line_attr == 0) {
/* In virtualedit, visual selections may extend /* In virtualedit, visual selections may extend
* beyond end of line. */ * beyond end of line. */

2
src/nvim/version.c
View File

@@ -395,7 +395,7 @@ static int included_patches[] = {
// 732, // 732,
// 731 NA // 731 NA
// 730 NA // 730 NA
// 729, 729,
// 728 NA // 728 NA
// 727 NA // 727 NA
// 726 NA // 726 NA

1
test/functional/ui/mouse_spec.lua
View File

@@ -14,6 +14,7 @@ describe('Mouse input', function()
before_each(function() before_each(function()
clear() clear()
nvim('set_option', 'mouse', 'a') nvim('set_option', 'mouse', 'a')
nvim('set_option', 'listchars', 'eol:$')
-- set mouset to very high value to ensure that even in valgrind/travis, -- set mouset to very high value to ensure that even in valgrind/travis,
-- nvim will still pick multiple clicks -- nvim will still pick multiple clicks
nvim('set_option', 'mouset', 5000) nvim('set_option', 'mouset', 5000)