073263
To: vim_dev@googlegroups.com
073263
Subject: Patch 7.4.494
073263
Fcc: outbox
073263
From: Bram Moolenaar <Bram@moolenaar.net>
073263
Mime-Version: 1.0
073263
Content-Type: text/plain; charset=UTF-8
073263
Content-Transfer-Encoding: 8bit
073263
------------
073263
073263
Patch 7.4.494
073263
Problem:    Cursor shape is wrong after a CompleteDone autocommand.
073263
Solution:   Update the cursor and mouse shape after ":normal" restores the
073263
	    state. (Jacob Niehus)
073263
Files:	    src/ex_docmd.c
073263
073263
073263
*** ../vim-7.4.493/src/ex_docmd.c	2014-10-21 20:01:54.986287762 +0200
073263
--- src/ex_docmd.c	2014-11-05 09:37:05.829176795 +0100
073263
***************
073263
*** 9526,9533 ****
073263
      msg_didout |= save_msg_didout;	/* don't reset msg_didout now */
073263
  
073263
      /* Restore the state (needed when called from a function executed for
073263
!      * 'indentexpr'). */
073263
      State = save_State;
073263
  #ifdef FEAT_MBYTE
073263
      vim_free(arg);
073263
  #endif
073263
--- 9526,9540 ----
073263
      msg_didout |= save_msg_didout;	/* don't reset msg_didout now */
073263
  
073263
      /* Restore the state (needed when called from a function executed for
073263
!      * 'indentexpr'). Update the mouse and cursor, they may have changed. */
073263
      State = save_State;
073263
+ #ifdef FEAT_MOUSE
073263
+     setmouse();
073263
+ #endif
073263
+ #ifdef CURSOR_SHAPE
073263
+     ui_cursor_shape();		/* may show different cursor shape */
073263
+ #endif
073263
+ 
073263
  #ifdef FEAT_MBYTE
073263
      vim_free(arg);
073263
  #endif
073263
*** ../vim-7.4.493/src/version.c	2014-10-31 19:51:33.014698055 +0100
073263
--- src/version.c	2014-11-05 09:51:06.261156543 +0100
073263
***************
073263
*** 743,744 ****
073263
--- 743,746 ----
073263
  {   /* Add new patch number below this line */
073263
+ /**/
073263
+     494,
073263
  /**/
073263
073263
-- 
073263
Q:   How many hardware engineers does it take to change a lightbulb?
073263
A:   None.  We'll fix it in software.
073263
073263
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
073263
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
073263
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
073263
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///