Merge pull request #2493 from Pyrohh/cleanup-patches-misc

[RFC] vim-patch: 7.4.{389, 659} + small cleanup

6 files changed, 31 insertions, 29 deletions

diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 7d1666f866..b9a1916ef2 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -1048,14 +1048,6 @@ EXTERN int typebuf_was_filled INIT(= FALSE);      /* received text from client
                                                      or from feedkeys() */
 
 
-#if defined(UNIX)
-EXTERN int term_is_xterm INIT(= FALSE);         /* xterm-like 'term' */
-#endif
-
-#if defined(UNIX)
-EXTERN int xterm_conflict_mouse INIT(= FALSE);
-#endif
-
 #ifdef BACKSLASH_IN_FILENAME
 EXTERN char psepc INIT(= '\\');         /* normal path separator character */
 EXTERN char psepcN INIT(= '/');         /* abnormal path separator character */
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 455615d318..8def1bb2ad 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -291,8 +291,6 @@ static struct key_name_entry {
   {0,                 NULL}
 };
 
-#define KEY_NAMES_TABLE_LEN ARRAY_SIZE(key_names_table)
-
 static struct mousetable {
   int pseudo_code;              /* Code for pseudo mouse event */
   int button;                   /* Which mouse button is it? */
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 1a7d161c62..33e3f5b459 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4347,7 +4347,7 @@ did_set_string_option (
   }
 
   if (curwin->w_curswant != MAXCOL
-      && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+      && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
     curwin->w_set_curswant = TRUE;
 
   check_redraw(options[opt_idx].flags);
@@ -4988,7 +4988,7 @@ set_bool_option (
 
   comp_col();                       /* in case 'ruler' or 'showcmd' changed */
   if (curwin->w_curswant != MAXCOL
-      && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+      && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
     curwin->w_set_curswant = TRUE;
   check_redraw(options[opt_idx].flags);
 
@@ -5360,7 +5360,7 @@ set_num_option (
 
   comp_col();                       /* in case 'columns' or 'ls' changed */
   if (curwin->w_curswant != MAXCOL
-      && (options[opt_idx].flags & (P_CURSWANT | P_RCLR)) != 0)
+      && (options[opt_idx].flags & (P_CURSWANT | P_RALL)) != 0)
     curwin->w_set_curswant = TRUE;
   check_redraw(options[opt_idx].flags);
 
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index dc94f331fd..8761e44196 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -6415,18 +6415,6 @@ static void win_rest_invalid(win_T *wp)
  * screen changes, and in the meantime, everything still works.
  */
 
-/*
- * types for inserting or deleting lines
- */
-#define USE_T_CAL   1
-#define USE_T_CDL   2
-#define USE_T_AL    3
-#define USE_T_CE    4
-#define USE_T_DL    5
-#define USE_T_SR    6
-#define USE_NL      7
-#define USE_T_CD    8
-#define USE_REDRAW  9
 
 // insert lines on the screen and update ScreenLines[]
 // 'end' is the line after the scrolled part. Normally it is Rows.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4bdd22e819..76460959ed 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -124,7 +124,7 @@ static int included_patches[] = {
   //662,
   //661,
   660,
-  //659,
+  659,
   //658,
   //657,
   //656,
@@ -394,7 +394,7 @@ static int included_patches[] = {
   392,
   391,
   390,
-  //389,
+  389,
   388,
   387,
   386,
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 7710918b94..d57c1773b1 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -159,8 +159,6 @@ describe('Screen', function()
                                                                |
         ]])
       end)
-
-      
     end)
   end)
 
@@ -245,6 +243,32 @@ describe('Screen', function()
     end)
   end)
 
+  describe('normal mode', function()
+    -- https://code.google.com/p/vim/issues/detail?id=339
+    it("setting 'ruler' doesn't reset the preferred column", function()
+      execute('set virtualedit=')
+      feed('i0123456<cr>789<esc>kllj')
+      execute('set ruler')
+      feed('k')
+      screen:expect([[
+        0123^456                                              |
+        789                                                  |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        ~                                                    |
+        :set ruler                         1,5           All |
+      ]])
+    end)
+  end)
+
   describe('command mode', function()
     it('typing commands', function()
       feed(':ls')