jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.494

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.494
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.494
3ef2ca
Problem:    Cursor shape is wrong after a CompleteDone autocommand.
3ef2ca
Solution:   Update the cursor and mouse shape after ":normal" restores the
3ef2ca
	    state. (Jacob Niehus)
3ef2ca
Files:	    src/ex_docmd.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.493/src/ex_docmd.c	2014-10-21 20:01:54.986287762 +0200
3ef2ca
--- src/ex_docmd.c	2014-11-05 09:37:05.829176795 +0100
3ef2ca
***************
3ef2ca
*** 9526,9533 ****
3ef2ca
      msg_didout |= save_msg_didout;	/* don't reset msg_didout now */
3ef2ca
  
3ef2ca
      /* Restore the state (needed when called from a function executed for
3ef2ca
!      * 'indentexpr'). */
3ef2ca
      State = save_State;
3ef2ca
  #ifdef FEAT_MBYTE
3ef2ca
      vim_free(arg);
3ef2ca
  #endif
3ef2ca
--- 9526,9540 ----
3ef2ca
      msg_didout |= save_msg_didout;	/* don't reset msg_didout now */
3ef2ca
  
3ef2ca
      /* Restore the state (needed when called from a function executed for
3ef2ca
!      * 'indentexpr'). Update the mouse and cursor, they may have changed. */
3ef2ca
      State = save_State;
3ef2ca
+ #ifdef FEAT_MOUSE
3ef2ca
+     setmouse();
3ef2ca
+ #endif
3ef2ca
+ #ifdef CURSOR_SHAPE
3ef2ca
+     ui_cursor_shape();		/* may show different cursor shape */
3ef2ca
+ #endif
3ef2ca
+ 
3ef2ca
  #ifdef FEAT_MBYTE
3ef2ca
      vim_free(arg);
3ef2ca
  #endif
3ef2ca
*** ../vim-7.4.493/src/version.c	2014-10-31 19:51:33.014698055 +0100
3ef2ca
--- src/version.c	2014-11-05 09:51:06.261156543 +0100
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     494,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
Q:   How many hardware engineers does it take to change a lightbulb?
3ef2ca
A:   None.  We'll fix it in software.
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    ///