To: vim-dev@vim.org Subject: Patch 6.0.125 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.125 (extra) Problem: Win32: When using the multi_byte_ime feature pressing the shift key would be handled as if a character was entered, thus mappings with a shifted key didn't work. (Charles Campbell) Solution: Ignore pressing the shift, control and alt keys. Files: src/os_win32.c *** ../vim60.124/src/os_win32.c Wed Jan 9 16:08:19 2002 --- src/os_win32.c Thu Jan 10 21:12:05 2002 *************** *** 1157,1180 **** if (cRecords > 0) { - #ifdef FEAT_MBYTE_IME - /* Windows IME sends two '\n's with only one 'ENTER'. - first, wVirtualKeyCode == 13. second, wVirtualKeyCode == 0 */ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { if (ir.Event.KeyEvent.uChar.UnicodeChar == 0 && ir.Event.KeyEvent.wVirtualKeyCode == 13) { ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); continue; } - return decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE); - } - #else - if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown - && decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE)) - return TRUE; #endif ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); --- 1157,1177 ---- if (cRecords > 0) { if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) { + #ifdef FEAT_MBYTE_IME + /* Windows IME sends two '\n's with only one 'ENTER'. First: + * wVirtualKeyCode == 13. second: wVirtualKeyCode == 0 */ if (ir.Event.KeyEvent.uChar.UnicodeChar == 0 && ir.Event.KeyEvent.wVirtualKeyCode == 13) { ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); continue; } #endif + if (decode_key_event(&ir.Event.KeyEvent, &ch, &ch2, FALSE)) + return TRUE; + } ReadConsoleInput(g_hConIn, &ir, 1, &cRecords); *** ../vim60.124/src/version.c Thu Jan 10 20:17:24 2002 --- src/version.c Thu Jan 10 21:14:22 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 125, /**/ -- Mynd you, m00se bites Kan be pretty nasti ... "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ ((( Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim ))) \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///