To: vim-dev@vim.org Subject: Patch 6.0.231 Fcc: outbox From: Bram Moolenaar MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.0.231 Problem: "gd" and "gD" don't work when the variable matches in a comment just above the match to be found. (Servatius Brandt) Solution: Continue searching in the first column below the comment. Files: src/normal.c *** ../vim60.230/src/normal.c Mon Feb 18 10:46:53 2002 --- src/normal.c Mon Feb 18 11:21:59 2002 *************** *** 3662,3671 **** while ((t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD, pat, 1L, 0, RE_LAST)) != FAIL #ifdef FEAT_COMMENTS ! && get_leader_len(ml_get_curline(), NULL, FALSE) #endif && old_pos.lnum > curwin->w_cursor.lnum) ++curwin->w_cursor.lnum; if (t == FAIL || old_pos.lnum <= curwin->w_cursor.lnum) { clearopbeep(oap); --- 3662,3675 ---- while ((t = searchit(curwin, curbuf, &curwin->w_cursor, FORWARD, pat, 1L, 0, RE_LAST)) != FAIL #ifdef FEAT_COMMENTS ! && get_leader_len(ml_get_curline(), NULL, FALSE) > 0 #endif && old_pos.lnum > curwin->w_cursor.lnum) + { + /* Ignore this line, continue at start of next line. */ ++curwin->w_cursor.lnum; + curwin->w_cursor.col = 0; + } if (t == FAIL || old_pos.lnum <= curwin->w_cursor.lnum) { clearopbeep(oap); *** ../vim60.230/src/version.c Mon Feb 18 10:46:53 2002 --- src/version.c Mon Feb 18 11:24:55 2002 *************** *** 608,609 **** --- 608,611 ---- { /* Add new patch number below this line */ + /**/ + 231, /**/ -- Mushrooms always grow in damp places and so they look like umbrellas. /// Bram Moolenaar -- Bram@moolenaar.net -- http://www.moolenaar.net \\\ /// Creator of Vim -- http://vim.sf.net -- ftp://ftp.vim.org/pub/vim \\\ \\\ Project leader for A-A-P -- http://www.a-a-p.org /// \\\ Help me helping AIDS orphans in Uganda - http://iccf-holland.org ///