Karsten Hopp df049c
To: vim_dev@googlegroups.com
Karsten Hopp df049c
Subject: Patch 7.3.335
Karsten Hopp df049c
Fcc: outbox
Karsten Hopp df049c
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp df049c
Mime-Version: 1.0
Karsten Hopp df049c
Content-Type: text/plain; charset=UTF-8
Karsten Hopp df049c
Content-Transfer-Encoding: 8bit
Karsten Hopp df049c
------------
Karsten Hopp df049c
Karsten Hopp df049c
Patch 7.3.335
Karsten Hopp df049c
Problem:    When 'imdisable' is reset from an autocommand in Insert mode it
Karsten Hopp df049c
	    doesn't take effect.
Karsten Hopp df049c
Solution:   Call im_set_active() in Insert mode. (Taro Muraoka)
Karsten Hopp df049c
Files:	    src/option.c
Karsten Hopp df049c
Karsten Hopp df049c
Karsten Hopp df049c
*** ../vim-7.3.334/src/option.c	2011-09-21 13:40:13.000000000 +0200
Karsten Hopp df049c
--- src/option.c	2011-10-12 14:09:46.000000000 +0200
Karsten Hopp df049c
***************
Karsten Hopp df049c
*** 7806,7811 ****
Karsten Hopp df049c
--- 7806,7815 ----
Karsten Hopp df049c
  	/* Only de-activate it here, it will be enabled when changing mode. */
Karsten Hopp df049c
  	if (p_imdisable)
Karsten Hopp df049c
  	    im_set_active(FALSE);
Karsten Hopp df049c
+ 	else if (State & INSERT)
Karsten Hopp df049c
+ 	    /* When the option is set from an autocommand, it may need to take
Karsten Hopp df049c
+ 	     * effect right away. */
Karsten Hopp df049c
+ 	    im_set_active(curbuf->b_p_iminsert == B_IMODE_IM);
Karsten Hopp df049c
      }
Karsten Hopp df049c
  #endif
Karsten Hopp df049c
  
Karsten Hopp df049c
*** ../vim-7.3.334/src/version.c	2011-10-12 14:11:43.000000000 +0200
Karsten Hopp df049c
--- src/version.c	2011-10-12 16:56:30.000000000 +0200
Karsten Hopp df049c
***************
Karsten Hopp df049c
*** 711,712 ****
Karsten Hopp df049c
--- 711,714 ----
Karsten Hopp df049c
  {   /* Add new patch number below this line */
Karsten Hopp df049c
+ /**/
Karsten Hopp df049c
+     335,
Karsten Hopp df049c
  /**/
Karsten Hopp df049c
Karsten Hopp df049c
-- 
Karsten Hopp df049c
Time is money.  Especially if you make clocks.
Karsten Hopp df049c
Karsten Hopp df049c
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp df049c
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp df049c
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp df049c
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///