Merge pull request #4012 from jbradaric/vim-7.4.729

vim-patch:7.4.729

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. */

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

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)