To: vim_dev@googlegroups.com Subject: Patch 7.4.1935 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1935 Problem: When using the GUI search/replace a second match right after the replacement is skipped. Solution: Add the SEARCH_START flag. (Mleddy) Files: src/gui.c *** ../vim-7.4.1934/src/gui.c 2016-04-20 20:18:16.957270339 +0200 --- src/gui.c 2016-06-14 20:36:56.218241847 +0200 *************** *** 5348,5357 **** } else { ! /* Search for the next match. */ i = msg_scroll; (void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, ! SEARCH_MSG + SEARCH_MARK, NULL); msg_scroll = i; /* don't let an error message set msg_scroll */ } --- 5348,5362 ---- } else { ! int searchflags = SEARCH_MSG + SEARCH_MARK; ! ! /* Search for the next match. ! * Don't skip text under cursor for single replace. */ ! if (type == FRD_REPLACE) ! searchflags += SEARCH_START; i = msg_scroll; (void)do_search(NULL, down ? '/' : '?', ga.ga_data, 1L, ! searchflags, NULL); msg_scroll = i; /* don't let an error message set msg_scroll */ } *** ../vim-7.4.1934/src/version.c 2016-06-13 22:58:35.052724825 +0200 --- src/version.c 2016-06-14 20:37:51.773648524 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1935, /**/ -- I AM THANKFUL... ...for the clothes that fit a little too snug because it means I have more than enough to eat. /// 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 ///