To: vim-dev@vim.org Subject: Patch 5.6.037 Fcc: outbox From: Bram Moolenaar ------------ Patch 5.6.037 Problem: Multi-byte: Can't use "f" command with multi-byte character in GUI. Solution: Enable XIM in Normal mode for the GUI. (Sung-Hyun Nam) Files: src/gui_gtk_x11.c, src/multbyte.c *** ../vim-5.6.36/src/gui_gtk_x11.c Tue Mar 28 11:31:25 2000 --- src/gui_gtk_x11.c Tue Mar 28 11:34:24 2000 *************** *** 474,480 **** gtk_widget_grab_focus(gui.drawarea); #ifdef USE_XIM ! xim_set_focus(!(State & NORMAL)); #endif return TRUE; --- 474,480 ---- gtk_widget_grab_focus(gui.drawarea); #ifdef USE_XIM ! xim_set_focus(TRUE); #endif return TRUE; *** ../vim-5.6.36/src/multbyte.c Wed Dec 1 18:21:21 1999 --- src/multbyte.c Tue Mar 28 11:44:25 2000 *************** *** 206,212 **** if (focus) { ! if (!xim_has_focus) { xim_has_focus = 1; #ifdef USE_GUI_GTK --- 206,220 ---- if (focus) { ! /* In Normal mode, only connect to IM if user uses over-the-spot. */ ! if (!xim_has_focus ! && (!(State & NORMAL) ! #ifdef USE_GUI_GTK ! || (xim_input_style & GDK_IM_PREEDIT_POSITION) ! #else ! || (input_style & XIMPreeditPosition) ! #endif ! )) { xim_has_focus = 1; #ifdef USE_GUI_GTK *************** *** 236,242 **** if (!xic) return; ! xim_set_focus(!(State & NORMAL)); #ifdef USE_GUI_GTK if (gdk_im_ready()) --- 244,250 ---- if (!xic) return; ! xim_set_focus(TRUE); #ifdef USE_GUI_GTK if (gdk_im_ready()) *** ../vim-5.6.36/src/version.c Tue Mar 28 11:31:25 2000 --- src/version.c Tue Mar 28 11:41:09 2000 *************** *** 420,421 **** --- 420,423 ---- { /* Add new patch number below this line */ + /**/ + 37, /**/ -- Vim is like Emacs without all the typing. (John "Johann" Spetz) /-/-- Bram Moolenaar --- Bram@moolenaar.net --- http://www.moolenaar.net --\-\ \-\-- Vim: http://www.vim.org ---- ICCF Holland: http://www.vim.org/iccf --/-/