Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
vim_dev
Home
+ new post
About this group
Join this group
Patch 7.3.513
Options
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
   1 message - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Bram Moolenaar  
View profile  
 More options Apr 30 2012, 12:18 pm
From: Bram Moolenaar <B...@Moolenaar.net>
Date: Mon, 30 Apr 2012 18:18:59 +0200
Local: Mon, Apr 30 2012 12:18 pm
Subject: Patch 7.3.513
Print | Individual message | Show original | Report this message | Find messages by this author

Patch 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)
Files:      src/edit.c, src/normal.c, src/proto/edit.pro

*** ../vim-7.3.512/src/edit.c   2012-04-05 16:07:01.000000000 +0200
--- src/edit.c  2012-04-30 17:53:47.000000000 +0200
***************
*** 253,259 ****
  #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));
--- 253,258 ----
***************
*** 9899,9905 ****
   * 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
  ins_copychar(lnum)
      linenr_T  lnum;
  {
--- 9898,9904 ----
   * 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.
   */
!     int
  ins_copychar(lnum)
      linenr_T  lnum;
  {
*** ../vim-7.3.512/src/normal.c 2012-03-28 12:59:53.000000000 +0200
--- src/normal.c        2012-04-30 18:06:13.000000000 +0200
***************
*** 7070,7076 ****
            for (n = cap->count1; n > 0; --n)
            {
                State = REPLACE;
!               ins_char(cap->nchar);
                State = old_State;
                if (cap->ncharC1 != 0)
                    ins_char(cap->ncharC1);
--- 7070,7087 ----
            for (n = cap->count1; n > 0; --n)
            {
                State = REPLACE;
!               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,7098 ****
                 * line will be changed.
                 */
                ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
!               ptr[curwin->w_cursor.col] = cap->nchar;
                if (p_sm && msg_silent == 0)
                    showmatch(cap->nchar);
                ++curwin->w_cursor.col;
--- 7103,7117 ----
                 * line will be changed.
                 */
                ptr = ml_get_buf(curbuf, curwin->w_cursor.lnum, TRUE);
!               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;
*** ../vim-7.3.512/src/proto/edit.pro   2010-08-15 21:57:28.000000000 +0200
--- src/proto/edit.pro  2012-04-30 17:54:41.000000000 +0200
***************
*** 39,42 ****
--- 39,43 ----
  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 : */
*** ../vim-7.3.512/src/version.c        2012-04-30 17:35:44.000000000 +0200
--- src/version.c       2012-04-30 18:17:52.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     513,
  /**/

--
It is illegal for anyone to try and stop a child from playfully jumping over
puddles of water.
                [real standing law in California, United States of America]

 /// Bram Moolenaar -- B...@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »

Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
©2013 Google