comparison src/search.c @ 20573:00fff78a929a v8.2.0840

patch 8.2.0840: search match count wrong when only match is in fold Commit: https://github.com/vim/vim/commit/6cb0726215519fe94103803e4aa77a355384bcf2 Author: Bram Moolenaar <Bram@vim.org> Date: Fri May 29 22:49:43 2020 +0200 patch 8.2.0840: search match count wrong when only match is in fold Problem: Search match count wrong when only match is in fold. Solution: Update search stats when in a closed fold. (Christian Brabandt, closes #6160, closes #6152)
author Bram Moolenaar <Bram@vim.org>
date Fri, 29 May 2020 23:00:04 +0200
parents 6ca6a372fef6
children 8a2b86a39ef4
comparison
equal deleted inserted replaced
20572:8dd549c6de33 20573:00fff78a929a
1590 && !msg_silent 1590 && !msg_silent
1591 && c != FAIL 1591 && c != FAIL
1592 && !shortmess(SHM_SEARCHCOUNT) 1592 && !shortmess(SHM_SEARCHCOUNT)
1593 && msgbuf != NULL) 1593 && msgbuf != NULL)
1594 search_stat(dirc, &pos, show_top_bot_msg, msgbuf, 1594 search_stat(dirc, &pos, show_top_bot_msg, msgbuf,
1595 (count != 1 || has_offset)); 1595 (count != 1 || has_offset
1596 #ifdef FEAT_FOLDING
1597 || (!(fdo_flags & FDO_SEARCH) &&
1598 hasFolding(curwin->w_cursor.lnum, NULL, NULL))
1599 #endif
1600 ));
1596 1601
1597 /* 1602 /*
1598 * The search command can be followed by a ';' to do another search. 1603 * The search command can be followed by a ';' to do another search.
1599 * For example: "/pat/;/foo/+3;?bar" 1604 * For example: "/pat/;/foo/+3;?bar"
1600 * This is like doing another search command, except: 1605 * This is like doing another search command, except: