head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.106 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.104 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.102 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.100 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.98 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.96 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.94 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.92 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.90 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.88 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.86 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.84 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.82 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.80 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.78 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.76 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.74 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.72 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.70 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.68 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.66 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.64 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.62 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.58 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.38 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.60 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.56 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.54 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.52 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.50 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.48 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.46 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.44 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.42 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.40 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.36 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.34 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.32 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.30 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.28 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.26 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.24 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.22 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.20 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.18 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.16 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.14 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.12 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.10 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.8 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.6 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.4 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.2 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.1.0.28 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.26 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.24 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.22 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.20 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.18 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.16 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.14 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.12 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.10 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.8 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.6 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.4 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.2 pkgsrc-2009Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2013.01.23.17.26.07; author wiz; state Exp; branches; next 1.1; 1.1 date 2009.08.07.16.39.21; author lukem; state Exp; branches; next ; desc @@ 1.2 log @Fix build with automake-1.13. While here, use a better WRKSRC and rebase patches. @ text @$NetBSD: patch-ap,v 1.1 2009/08/07 16:39:21 lukem Exp $ --- vi/v_match.c.orig 2007-11-19 03:41:42.000000000 +1100 +++ vi/v_match.c @@@@ -39,6 +39,19 @@@@ v_match(SCR *sp, VICMD *vp) size_t cno, len, off; int cnt, isempty, matchc, startc, (*gc)__P((SCR *, VCS *)); CHAR_T *p; + char *cp; + char *match_chars; + + static int match_lno, match_col, match_dir; + + /* + * Historically vi would match (), {} and [] however + * an update included <>. This is ok for editing HTML + * but a pain in the butt for C source. + * Making it an option lets the user decide what is 'right'. + * Also fixed to do something sensible with "". + */ + match_chars = O_STR(sp, O_MATCHCHARS); /* * !!! @@@@ -58,44 +71,27 @@@@ v_match(SCR *sp, VICMD *vp) nomatch: msgq(sp, M_BERR, "184|No match character on this line"); return (1); } - switch (startc = p[off]) { - case '(': - matchc = ')'; - gc = cs_next; - break; - case ')': - matchc = '('; - gc = cs_prev; - break; - case '[': - matchc = ']'; - gc = cs_next; - break; - case ']': - matchc = '['; - gc = cs_prev; - break; - case '{': - matchc = '}'; - gc = cs_next; - break; - case '}': - matchc = '{'; - gc = cs_prev; + startc = p[off]; + cp = strchr(match_chars, startc); + if (cp != NULL) break; - case '<': - matchc = '>'; - gc = cs_next; - break; - case '>': - matchc = '<'; - gc = cs_prev; - break; - default: - continue; - } - break; } + cnt = cp - match_chars; + matchc = match_chars[cnt ^ 1]; + + /* Alternate back-forward search if startc and matchc the same */ + if (startc == matchc) { + /* are we continuing from where last match finished? */ + if (match_lno == vp->m_start.lno && match_col ==vp->m_start.cno) + /* yes - continue in sequence */ + match_dir++; + else + /* no - go forward, back, back, forward */ + match_dir = 1; + if (match_dir & 2) + cnt++; + } + gc = cnt & 1 ? cs_prev : cs_next; cs.cs_lno = vp->m_start.lno; cs.cs_cno = off; @@@@ -109,10 +105,10 @@@@ nomatch: msgq(sp, M_BERR, "184|No match break; continue; } + if (cs.cs_ch == matchc && --cnt == 0) + break; if (cs.cs_ch == startc) ++cnt; - else if (cs.cs_ch == matchc && --cnt == 0) - break; } if (cnt) { msgq(sp, M_BERR, "185|Matching character not found"); @@@@ -139,6 +135,9 @@@@ nomatch: msgq(sp, M_BERR, "184|No match else vp->m_final = vp->m_stop; + match_lno = vp->m_final.lno; + match_col = vp->m_final.cno; + /* * !!! * If the motion is across lines, and the earliest cursor position @ 1.1 log @Apply various features and fixes from NetBSD basesrc: * Implement options: expandtab gtagsmode matchchars * Fix tty garbling when quitting from recovery mode. * Don't coredump during autoindent edge case. * Set internal version to "nvi-1.81.6nb4 (2009-08-07)" * Crank pkgrevision to nb4. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- ../vi/v_match.c.orig 2007-11-19 03:41:42.000000000 +1100 +++ ../vi/v_match.c @