To: vim_dev@googlegroups.com Subject: Patch 7.4.2318 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2318 Problem: When 'incsearch' is not set CTRL-T and CTRL-G are not inserted as before. Solution: Move #ifdef and don't use goto. Files: src/ex_getln.c *** ../vim-7.4.2317/src/ex_getln.c 2016-09-03 16:29:01.446841174 +0200 --- src/ex_getln.c 2016-09-03 19:39:42.246989233 +0200 *************** *** 1657,1665 **** #endif goto cmdline_not_changed; case Ctrl_G: /* next match */ case Ctrl_T: /* previous match */ - #ifdef FEAT_SEARCH_EXTRA if (p_is && !cmd_silent && (firstc == '/' || firstc == '?')) { pos_T t; --- 1657,1665 ---- #endif goto cmdline_not_changed; + #ifdef FEAT_SEARCH_EXTRA case Ctrl_G: /* next match */ case Ctrl_T: /* previous match */ if (p_is && !cmd_silent && (firstc == '/' || firstc == '?')) { pos_T t; *************** *** 1724,1731 **** } else vim_beep(BO_ERROR); } ! goto cmdline_not_changed; #endif case Ctrl_V: --- 1724,1732 ---- } else vim_beep(BO_ERROR); + goto cmdline_not_changed; } ! break; #endif case Ctrl_V: *** ../vim-7.4.2317/src/version.c 2016-09-03 19:11:55.125044114 +0200 --- src/version.c 2016-09-03 19:34:04.133826699 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2318, /**/ -- hundred-and-one symptoms of being an internet addict: 156. You forget your friend's name but not her e-mail address. /// 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 ///