Mercurial > vim

comparison src/normal.c @ 11129:f4ea50924c6d v8.0.0452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.0452: some macros are in lower case commit https://github.com/vim/vim/commit/1c46544412382db8b3203d6c78e550df885540bd Author: Bram Moolenaar <Bram@vim.org> Date: Sun Mar 12 20:10:05 2017 +0100 patch 8.0.0452: some macros are in lower case Problem: Some macros are in lower case. Solution: Make a few more macros upper case.
author Christian Brabandt <cb@256bit.org>
date Sun, 12 Mar 2017 20:15:06 +0100
parents 778c10516955
children 501f46f7644c
comparison
equal deleted inserted replaced
11128:23154628ab7f 11129:f4ea50924c6d
3088 { 3088 {
3089 /* If the character under the cursor (skipping white space) is 3089 /* If the character under the cursor (skipping white space) is
3090 * not a word character, try finding a match and select a (), 3090 * not a word character, try finding a match and select a (),
3091 * {}, [], #if/#endif, etc. block. */ 3091 * {}, [], #if/#endif, etc. block. */
3092 end_visual = curwin->w_cursor; 3092 end_visual = curwin->w_cursor;
3093 while (gc = gchar_pos(&end_visual), vim_iswhite(gc)) 3093 while (gc = gchar_pos(&end_visual), VIM_ISWHITE(gc))
3094 inc(&end_visual); 3094 inc(&end_visual);
3095 if (oap != NULL) 3095 if (oap != NULL)
3096 oap->motion_type = MCHAR; 3096 oap->motion_type = MCHAR;
3097 if (oap != NULL 3097 if (oap != NULL
3098 && VIsual_mode == 'v' 3098 && VIsual_mode == 'v'
3465 } 3465 }
3466 } 3466 }
3467 else 3467 else
3468 #endif 3468 #endif
3469 while (ptr[col] != NUL 3469 while (ptr[col] != NUL
3470 && (i == 0 ? !vim_iswordc(ptr[col]) : vim_iswhite(ptr[col])) 3470 && (i == 0 ? !vim_iswordc(ptr[col]) : VIM_ISWHITE(ptr[col]))
3471 # if defined(FEAT_BEVAL) 3471 # if defined(FEAT_BEVAL)
3472 && (!(find_type & FIND_EVAL) || ptr[col] != ']') 3472 && (!(find_type & FIND_EVAL) || ptr[col] != ']')
3473 # endif 3473 # endif
3474 ) 3474 )
3475 ++col; 3475 ++col;
3522 #endif 3522 #endif
3523 { 3523 {
3524 while (col > 0 3524 while (col > 0
3525 && ((i == 0 3525 && ((i == 0
3526 ? vim_iswordc(ptr[col - 1]) 3526 ? vim_iswordc(ptr[col - 1])
3527 : (!vim_iswhite(ptr[col - 1]) 3527 : (!VIM_ISWHITE(ptr[col - 1])
3528 && (!(find_type & FIND_IDENT) 3528 && (!(find_type & FIND_IDENT)
3529 || !vim_iswordc(ptr[col - 1])))) 3529 || !vim_iswordc(ptr[col - 1]))))
3530 #if defined(FEAT_BEVAL) 3530 #if defined(FEAT_BEVAL)
3531 || ((find_type & FIND_EVAL) 3531 || ((find_type & FIND_EVAL)
3532 && col > 1 3532 && col > 1
3586 col += (*mb_ptr2len)(ptr + col); 3586 col += (*mb_ptr2len)(ptr + col);
3587 } 3587 }
3588 else 3588 else
3589 #endif 3589 #endif
3590 while ((i == 0 ? vim_iswordc(ptr[col]) 3590 while ((i == 0 ? vim_iswordc(ptr[col])
3591 : (ptr[col] != NUL && !vim_iswhite(ptr[col]))) 3591 : (ptr[col] != NUL && !VIM_ISWHITE(ptr[col])))
3592 # if defined(FEAT_BEVAL) 3592 # if defined(FEAT_BEVAL)
3593 || ((find_type & FIND_EVAL) 3593 || ((find_type & FIND_EVAL)
3594 && col <= (int)startcol 3594 && col <= (int)startcol
3595 && find_is_eval_item(ptr + col, &col, &bn, FORWARD)) 3595 && find_is_eval_item(ptr + col, &col, &bn, FORWARD))
3596 # endif 3596 # endif
8107 coladvance((colnr_T)i); 8107 coladvance((colnr_T)i);
8108 if (flag) 8108 if (flag)
8109 { 8109 {
8110 do 8110 do
8111 i = gchar_cursor(); 8111 i = gchar_cursor();
8112 while (vim_iswhite(i) && oneright() == OK); 8112 while (VIM_ISWHITE(i) && oneright() == OK);
8113 } 8113 }
8114 curwin->w_set_curswant = TRUE; 8114 curwin->w_set_curswant = TRUE;
8115 break; 8115 break;
8116 8116
8117 case '_': 8117 case '_':
8131 if (curwin->w_cursor.col > 0 && ptr[curwin->w_cursor.col] == NUL) 8131 if (curwin->w_cursor.col > 0 && ptr[curwin->w_cursor.col] == NUL)
8132 --curwin->w_cursor.col; 8132 --curwin->w_cursor.col;
8133 8133
8134 /* Decrease the cursor column until it's on a non-blank. */ 8134 /* Decrease the cursor column until it's on a non-blank. */
8135 while (curwin->w_cursor.col > 0 8135 while (curwin->w_cursor.col > 0
8136 && vim_iswhite(ptr[curwin->w_cursor.col])) 8136 && VIM_ISWHITE(ptr[curwin->w_cursor.col]))
8137 --curwin->w_cursor.col; 8137 --curwin->w_cursor.col;
8138 curwin->w_set_curswant = TRUE; 8138 curwin->w_set_curswant = TRUE;
8139 adjust_for_sel(cap); 8139 adjust_for_sel(cap);
8140 } 8140 }
8141 break; 8141 break;
8714 if (!word_end && cap->oap->op_type == OP_CHANGE) 8714 if (!word_end && cap->oap->op_type == OP_CHANGE)
8715 { 8715 {
8716 n = gchar_cursor(); 8716 n = gchar_cursor();
8717 if (n != NUL) /* not an empty line */ 8717 if (n != NUL) /* not an empty line */
8718 { 8718 {
8719 if (vim_iswhite(n)) 8719 if (VIM_ISWHITE(n))
8720 { 8720 {
8721 /* 8721 /*
8722 * Reproduce a funny Vi behaviour: "cw" on a blank only 8722 * Reproduce a funny Vi behaviour: "cw" on a blank only
8723 * changes one character, not all blanks until the start of 8723 * changes one character, not all blanks until the start of
8724 * the next word. Only do this when the 'w' flag is included 8724 * the next word. Only do this when the 'w' flag is included