To: vim-dev@vim.org
Subject: Patch 6.1.235
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.235 (depends on 6.1.223)
Problem:    'iminsert' is changed from 1 to 2 when leaving Insert mode. (Peter
	    Valach)
Solution:   Check "State" before resetting it to NORMAL.
Files:	    src/edit.c


*** ../vim61.234/src/edit.c	Mon Oct 14 20:18:19 2002
--- src/edit.c	Mon Oct 21 20:33:38 2002
***************
*** 5868,5873 ****
--- 5868,5882 ----
  	    --curwin->w_cursor.col;
      }
  
+ #ifdef USE_IM_CONTROL
+     /* Disable IM to allow typing English directly for Normal mode commands.
+      * When ":lmap" is enabled don't change 'iminsert' (IM can be enabled as
+      * well). */
+     if (!(State & LANGMAP))
+ 	im_save_status(&curbuf->b_p_iminsert);
+     im_set_active(FALSE);
+ #endif
+ 
      State = NORMAL;
      /* need to position cursor again (e.g. when on a TAB ) */
      changed_cline_bef_curs();
***************
*** 5877,5891 ****
  #endif
  #ifdef CURSOR_SHAPE
      ui_cursor_shape();		/* may show different cursor shape */
- #endif
- 
- #ifdef USE_IM_CONTROL
-     /* Disable IM to allow typing English directly for Normal mode commands.
-      * When ":lmap" is enabled don't change 'iminsert' (IM can be enabled as
-      * well). */
-     if (!(State & LANGMAP))
- 	im_save_status(&curbuf->b_p_iminsert);
-     im_set_active(FALSE);
  #endif
  
      /*
--- 5886,5891 ----
*** ../vim61.234/src/version.c	Sun Oct 27 14:38:00 2002
--- src/version.c	Sun Oct 27 14:40:03 2002
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     235,
  /**/

-- 
CUSTOMER:     Well, can you hang around a couple of minutes?  He won't be
              long.
MORTICIAN:    Naaah, I got to go on to Robinson's -- they've lost nine today.
CUSTOMER:     Well, when is your next round?
MORTICIAN:    Thursday.
DEAD PERSON:  I think I'll go for a walk.
                                  The Quest for the Holy Grail (Monty Python)

 ///  Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net  \\\
///          Creator of Vim - Vi IMproved -- http://www.vim.org          \\\
\\\           Project leader for A-A-P -- http://www.a-a-p.org           ///
 \\\ Lord Of The Rings helps Uganda - http://iccf-holland.org/lotr.html ///