Mercurial > vim

comparison src/normal.c @ 18203:e0ec4cd7a865 v8.1.2096

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2096: too many #ifdefs Commit: https://github.com/vim/vim/commit/8c96af9c05bfcac2d5ae081e098d4863db561511 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 28 19:05:57 2019 +0200 patch 8.1.2096: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_COMMENTS.
author Bram Moolenaar <Bram@vim.org>
date Sat, 28 Sep 2019 19:15:03 +0200
parents 5e10ee16f4b4
children 5d67f207f7c3
comparison
equal deleted inserted replaced
18202:13049de86673 18203:e0ec4cd7a865
3279 curwin->w_cursor = found_pos; 3279 curwin->w_cursor = found_pos;
3280 t = OK; 3280 t = OK;
3281 } 3281 }
3282 break; 3282 break;
3283 } 3283 }
3284 #ifdef FEAT_COMMENTS
3285 if (get_leader_len(ml_get_curline(), NULL, FALSE, TRUE) > 0) 3284 if (get_leader_len(ml_get_curline(), NULL, FALSE, TRUE) > 0)
3286 { 3285 {
3287 /* Ignore this line, continue at start of next line. */ 3286 /* Ignore this line, continue at start of next line. */
3288 ++curwin->w_cursor.lnum; 3287 ++curwin->w_cursor.lnum;
3289 curwin->w_cursor.col = 0; 3288 curwin->w_cursor.col = 0;
3290 continue; 3289 continue;
3291 } 3290 }
3292 #endif
3293 valid = is_ident(ml_get_curline(), curwin->w_cursor.col); 3291 valid = is_ident(ml_get_curline(), curwin->w_cursor.col);
3294 3292
3295 /* If the current position is not a valid identifier and a previous 3293 /* If the current position is not a valid identifier and a previous
3296 * match is present, favor that one instead. */ 3294 * match is present, favor that one instead. */
3297 if (!valid && found_pos.lnum != 0) 3295 if (!valid && found_pos.lnum != 0)
7226 (cap->cmdchar == 'O' ? 1 : 0)), 7224 (cap->cmdchar == 'O' ? 1 : 0)),
7227 (linenr_T)(curwin->w_cursor.lnum + 7225 (linenr_T)(curwin->w_cursor.lnum +
7228 (cap->cmdchar == 'o' ? 1 : 0)) 7226 (cap->cmdchar == 'o' ? 1 : 0))
7229 ) == OK 7227 ) == OK
7230 && open_line(cap->cmdchar == 'O' ? BACKWARD : FORWARD, 7228 && open_line(cap->cmdchar == 'O' ? BACKWARD : FORWARD,
7231 #ifdef FEAT_COMMENTS 7229 has_format_option(FO_OPEN_COMS) ? OPENLINE_DO_COM : 0,
7232 has_format_option(FO_OPEN_COMS) ? OPENLINE_DO_COM : 7230 0) == OK)
7233 #endif
7234 0, 0) == OK)
7235 { 7231 {
7236 #ifdef FEAT_CONCEAL 7232 #ifdef FEAT_CONCEAL
7237 if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum) 7233 if (curwin->w_p_cole > 0 && oldline != curwin->w_cursor.lnum)
7238 redrawWinline(curwin, oldline); 7234 redrawWinline(curwin, oldline);
7239 #endif 7235 #endif