updated for version 7.3.513

Problem:    Cannot use CTRL-E and CTRL-Y with "r".
Solution:   Make CTRL-E and CTRL-Y work like in Insert mode. (Christian
            Brabandt)

diff --git a/src/edit.c b/src/edit.c
index c8320a6e23b5ca3c7824578b8b503fe22ed2cf13..17bbc6f2eec9316697e006d3b2ff0a4ebc31854d 100644 (file)
--- a/src/edit.c
+++ b/src/edit.c
@@ -253,7 +253,6 @@ static int  ins_eol __ARGS((int c));
 #ifdef FEAT_DIGRAPHS
 static int  ins_digraph __ARGS((void));
 #endif
-static int  ins_copychar __ARGS((linenr_T lnum));
 static int  ins_ctrl_ey __ARGS((int tc));
 #ifdef FEAT_SMARTINDENT
 static void ins_try_si __ARGS((int c));
@@ -9899,7 +9898,7 @@ ins_digraph()
  * Handle CTRL-E and CTRL-Y in Insert mode: copy char from other line.
  * Returns the char to be inserted, or NUL if none found.
  */
-    static int
+    int
 ins_copychar(lnum)
     linenr_T   lnum;
 {

diff --git a/src/normal.c b/src/normal.c
index a7301162bd2accf6b88c3b0c0f21bcf3c1430005..98f4a0a9f0772f6f3a6367c7d1d3571125433cf1 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -7070,7 +7070,18 @@ nv_replace(cap)
            for (n = cap->count1; n > 0; --n)
            {
                State = REPLACE;
-               ins_char(cap->nchar);
+               if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
+               {
+                   int c = ins_copychar(curwin->w_cursor.lnum
+                                          + (cap->nchar == Ctrl_Y ? -1 : 1));
+                   if (c != NUL)
+                       ins_char(c);
+                   else
+                       /* will be decremented further down */
+                       ++curwin->w_cursor.col;
+               }
+               else
+                   ins_char(cap->nchar);
                State = old_State;
                if (cap->ncharC1 != 0)
                    ins_char(cap->ncharC1);
@@ -7092,7 +7103,15 @@ nv_replace(cap)
                 * line will be changed.
                 */
                ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
-               ptr[curwin->w_cursor.col] = cap->nchar;
+               if (cap->nchar == Ctrl_E || cap->nchar == Ctrl_Y)
+               {
+                 int c = ins_copychar(curwin->w_cursor.lnum
+                                          + (cap->nchar == Ctrl_Y ? -1 : 1));
+                 if (c != NUL)
+                   ptr[curwin->w_cursor.col] = c;
+               }
+               else
+                   ptr[curwin->w_cursor.col] = cap->nchar;
                if (p_sm && msg_silent == 0)
                    showmatch(cap->nchar);
                ++curwin->w_cursor.col;

diff --git a/src/proto/edit.pro b/src/proto/edit.pro
index e2398c452b0fd262532f983f4b645fc3a209fecd..1eed378706a804735029cd8fabab32745e1241a7 100644 (file)
--- a/src/proto/edit.pro
+++ b/src/proto/edit.pro
@@ -39,4 +39,5 @@ int in_cinkeys __ARGS((int keytyped, int when, int line_is_empty));
 int hkmap __ARGS((int c));
 void ins_scroll __ARGS((void));
 void ins_horscroll __ARGS((void));
+int ins_copychar __ARGS((linenr_T lnum));
 /* vim: set ft=c : */

diff --git a/src/version.c b/src/version.c
index ce22d9f99cef87950b6ab447c15e36b40c5bf0e4..de24ff4bd67b7bbb4e6277aa221b1af9e25ccc0f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    513,
 /**/
     512,
 /**/