jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone
3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.418
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.418
3ef2ca
Problem:    When leaving ":append" the cursor shape is like in Insert mode.
3ef2ca
	    (Jacob Niehus)
3ef2ca
Solution:   Do not have State set to INSERT when calling getline().
3ef2ca
Files:	    src/ex_cmds.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.417/src/ex_cmds.c	2014-08-06 18:17:03.471147780 +0200
3ef2ca
--- src/ex_cmds.c	2014-08-29 08:54:26.666398204 +0200
3ef2ca
***************
3ef2ca
*** 4011,4021 ****
3ef2ca
--- 4011,4029 ----
3ef2ca
  	    eap->nextcmd = p;
3ef2ca
  	}
3ef2ca
  	else
3ef2ca
+ 	{
3ef2ca
+ 	    int save_State = State;
3ef2ca
+ 
3ef2ca
+ 	    /* Set State to avoid the cursor shape to be set to INSERT mode
3ef2ca
+ 	     * when getline() returns. */
3ef2ca
+ 	    State = CMDLINE;
3ef2ca
  	    theline = eap->getline(
3ef2ca
  #ifdef FEAT_EVAL
3ef2ca
  		    eap->cstack->cs_looplevel > 0 ? -1 :
3ef2ca
  #endif
3ef2ca
  		    NUL, eap->cookie, indent);
3ef2ca
+ 	    State = save_State;
3ef2ca
+ 	}
3ef2ca
  	lines_left = Rows - 1;
3ef2ca
  	if (theline == NULL)
3ef2ca
  	    break;
3ef2ca
*** ../vim-7.4.417/src/version.c	2014-08-24 21:39:45.488526954 +0200
3ef2ca
--- src/version.c	2014-08-29 08:58:31.086398738 +0200
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     418,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
hundred-and-one symptoms of being an internet addict:
3ef2ca
88. Every single time you press the 'Get mail' button...it does get new mail.
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///