diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-21 02:35:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-21 02:35:15 -0500 |
| commit | bcbcf235f61bd75f965f35897784ea618fe7acb8 (patch) | |
| tree | 029b0d6453fff1e92e9cdcd866eef49595fe93f1 | |
| parent | 5bfbf968dd9460398423c8c39868c07f863cd13f (diff) | |
| parent | a118abca77a620dc848991380470576300f27680 (diff) | |
| download | rneovim-bcbcf235f61bd75f965f35897784ea618fe7acb8.tar.gz rneovim-bcbcf235f61bd75f965f35897784ea618fe7acb8.tar.bz2 rneovim-bcbcf235f61bd75f965f35897784ea618fe7acb8.zip | |
Merge pull request #4012 from jbradaric/vim-7.4.729
vim-patch:7.4.729
| -rw-r--r-- | src/nvim/screen.c | 10 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | test/functional/ui/mouse_spec.lua | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index 58a9c011b8..9a64a7c3a9 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -3489,11 +3489,11 @@ win_line ( && !(noinvcur && lnum == wp->w_cursor.lnum && (colnr_T)vcol == wp->w_virtcol))) - && lcs_eol_one >= 0) { - /* Display a '$' after the line or highlight an extra - * character if the line break is included. */ - /* For a diff line the highlighting continues after the - * "$". */ + && lcs_eol_one > 0) { + // Display a '$' after the line or highlight an extra + // character if the line break is included. + // For a diff line the highlighting continues after the + // "$". if (diff_hlf == (hlf_T)0 && line_attr == 0) { /* In virtualedit, visual selections may extend * beyond end of line. */ diff --git a/src/nvim/version.c b/src/nvim/version.c index 8f0b47e0a3..9b4c191d89 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -395,7 +395,7 @@ static int included_patches[] = { // 732, // 731 NA // 730 NA - // 729, + 729, // 728 NA // 727 NA // 726 NA diff --git a/test/functional/ui/mouse_spec.lua b/test/functional/ui/mouse_spec.lua index 30f37a7463..b3992c4a89 100644 --- a/test/functional/ui/mouse_spec.lua +++ b/test/functional/ui/mouse_spec.lua @@ -14,6 +14,7 @@ describe('Mouse input', function() before_each(function() clear() nvim('set_option', 'mouse', 'a') + nvim('set_option', 'listchars', 'eol:$') -- set mouset to very high value to ensure that even in valgrind/travis, -- nvim will still pick multiple clicks nvim('set_option', 'mouset', 5000) |