To: vim-dev@vim.org
Subject: Patch 6.2f.030
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.2f.030 (after 6.2f.028)
Problem:    Cursor moves up when using XIM.
Solution:   Reset im_preedit_cursor.  (Yasuhiro Matsumoto)
Files:	    src/mbyte.c


*** ../vim-6.2f.029/src/mbyte.c	Fri May 30 12:10:41 2003
--- src/mbyte.c	Fri May 30 15:35:29 2003
***************
*** 3075,3081 ****
--- 3075,3084 ----
      char_u delkey[] = {CSI, 'k', 'D'};
  
      if (State & NORMAL)
+     {
+ 	im_preedit_cursor = 0;
  	return;
+     }
      for (; im_preedit_cursor > 0; --im_preedit_cursor)
  	add_to_input_buf(bskey, (int)sizeof(bskey));
  
***************
*** 3537,3542 ****
--- 3540,3550 ----
      int
  xim_queue_key_press_event(GdkEventKey *event)
  {
+     /*
+      * When typing fFtT, XIM may be activated. Thus it must pass
+      * gtk_im_context_filter_keypress() in Normal mode.
+      * And while doing :sh too.
+      */
      if (xic != NULL && !p_imdisable
  		    && (State & (INSERT | CMDLINE | NORMAL | EXTERNCMD)) != 0)
      {
*** ../vim-6.2f.029/src/version.c	Fri May 30 12:13:02 2003
--- src/version.c	Fri May 30 21:16:31 2003
***************
*** 632,633 ****
--- 632,635 ----
  {   /* Add new patch number below this line */
+ /**/
+     30,
  /**/

-- 
The startling truth finally became apparent, and it was this: Numbers
written on restaurant checks within the confines of restaurants do not follow
the same mathematical laws as numbers written on any other pieces of paper in
any other parts of the Universe.  This single statement took the scientific
world by storm.  So many mathematical conferences got held in such good
restaurants that many of the finest minds of a generation died of obesity and
heart failure, and the science of mathematics was put back by years.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// 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        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///