To: vim_dev@googlegroups.com Subject: Patch 8.0.0628 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.0628 (after 8.0.0626 Problem: Cursor disappears after silent mapping. (Ramel Eshed) Solution: Do restore the cursor when it was changed, but don't change it in the first place for a silent mapping. Files: src/getchar.c *** ../vim-8.0.0627/src/getchar.c 2017-06-05 19:32:28.702723156 +0200 --- src/getchar.c 2017-06-07 20:38:30.133907045 +0200 *************** *** 2583,2589 **** * get a character: 3. from the user - handle in Insert mode */ /* ! * special case: if we get an in insert mode and there * are no more characters at once, we pretend to go out of * insert mode. This prevents the one second delay after * typing an . If we get something after all, we may --- 2583,2589 ---- * get a character: 3. from the user - handle in Insert mode */ /* ! * Special case: if we get an in insert mode and there * are no more characters at once, we pretend to go out of * insert mode. This prevents the one second delay after * typing an . If we get something after all, we may *************** *** 2617,2624 **** mode_deleted = TRUE; } #ifdef FEAT_GUI ! /* may show different cursor shape */ ! if (gui.in_use) { int save_State; --- 2617,2624 ---- mode_deleted = TRUE; } #ifdef FEAT_GUI ! /* may show a different cursor shape */ ! if (gui.in_use && State != NORMAL && !cmd_silent) { int save_State; *************** *** 2913,2928 **** } #ifdef FEAT_GUI /* may unshow different cursor shape */ ! if (gui.in_use) ! { ! if (cmd_silent) ! gui_dont_update_cursor(TRUE); ! else ! gui_can_update_cursor(); ! ! if (shape_changed) ! gui_update_cursor(TRUE, FALSE); ! } #endif --vgetc_busy; --- 2913,2920 ---- } #ifdef FEAT_GUI /* may unshow different cursor shape */ ! if (gui.in_use && shape_changed) ! gui_update_cursor(TRUE, FALSE); #endif --vgetc_busy; *** ../vim-8.0.0627/src/version.c 2017-06-05 19:56:01.124964522 +0200 --- src/version.c 2017-06-07 20:39:19.821545423 +0200 *************** *** 766,767 **** --- 766,769 ---- { /* Add new patch number below this line */ + /**/ + 628, /**/ -- Shift happens. -- Doppler /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///