Mercurial > vim
comparison src/ex_getln.c @ 11121:778c10516955 v8.0.0448
patch 8.0.0448: some macros are in lower case
commit https://github.com/vim/vim/commit/b5aedf3e228d35821591da9ae8501b61cf2e264c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 12 18:23:53 2017 +0100
patch 8.0.0448: some macros are in lower case
Problem: Some macros are in lower case, which can be confusing.
Solution: Make a few lower case macros upper case.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 12 Mar 2017 18:30:06 +0100 |
parents | ab9f7bbe4439 |
children | 506f5d8b7d8b |
comparison
equal
deleted
inserted
replaced
11120:29ee7ffe8df7 | 11121:778c10516955 |
---|---|
232 cmd_hkmap = 0; | 232 cmd_hkmap = 0; |
233 #endif | 233 #endif |
234 | 234 |
235 ccline.overstrike = FALSE; /* always start in insert mode */ | 235 ccline.overstrike = FALSE; /* always start in insert mode */ |
236 #ifdef FEAT_SEARCH_EXTRA | 236 #ifdef FEAT_SEARCH_EXTRA |
237 clearpos(&match_end); | 237 CLEAR_POS(&match_end); |
238 save_cursor = curwin->w_cursor; /* may be restored later */ | 238 save_cursor = curwin->w_cursor; /* may be restored later */ |
239 search_start = curwin->w_cursor; | 239 search_start = curwin->w_cursor; |
240 old_curswant = curwin->w_curswant; | 240 old_curswant = curwin->w_curswant; |
241 old_leftcol = curwin->w_leftcol; | 241 old_leftcol = curwin->w_leftcol; |
242 old_topline = curwin->w_topline; | 242 old_topline = curwin->w_topline; |
1477 { | 1477 { |
1478 /* Add a character from under the cursor for 'incsearch' */ | 1478 /* Add a character from under the cursor for 'incsearch' */ |
1479 if (did_incsearch) | 1479 if (did_incsearch) |
1480 { | 1480 { |
1481 curwin->w_cursor = match_end; | 1481 curwin->w_cursor = match_end; |
1482 if (!equalpos(curwin->w_cursor, search_start)) | 1482 if (!EQUAL_POS(curwin->w_cursor, search_start)) |
1483 { | 1483 { |
1484 c = gchar_cursor(); | 1484 c = gchar_cursor(); |
1485 /* If 'ignorecase' and 'smartcase' are set and the | 1485 /* If 'ignorecase' and 'smartcase' are set and the |
1486 * command line has no uppercase characters, convert | 1486 * command line has no uppercase characters, convert |
1487 * the character to lowercase */ | 1487 * the character to lowercase */ |
1705 * when nv_search finishes the cursor will be | 1705 * when nv_search finishes the cursor will be |
1706 * put back on the match */ | 1706 * put back on the match */ |
1707 search_start = t; | 1707 search_start = t; |
1708 (void)decl(&search_start); | 1708 (void)decl(&search_start); |
1709 } | 1709 } |
1710 if (lt(t, search_start) && c == Ctrl_G) | 1710 if (LT_POS(t, search_start) && c == Ctrl_G) |
1711 { | 1711 { |
1712 /* wrap around */ | 1712 /* wrap around */ |
1713 search_start = t; | 1713 search_start = t; |
1714 if (firstc == '?') | 1714 if (firstc == '?') |
1715 (void)incl(&search_start); | 1715 (void)incl(&search_start); |
2005 { | 2005 { |
2006 if (gotesc) | 2006 if (gotesc) |
2007 curwin->w_cursor = save_cursor; | 2007 curwin->w_cursor = save_cursor; |
2008 else | 2008 else |
2009 { | 2009 { |
2010 if (!equalpos(save_cursor, search_start)) | 2010 if (!EQUAL_POS(save_cursor, search_start)) |
2011 { | 2011 { |
2012 /* put the '" mark at the original position */ | 2012 /* put the '" mark at the original position */ |
2013 curwin->w_cursor = save_cursor; | 2013 curwin->w_cursor = save_cursor; |
2014 setpcmark(); | 2014 setpcmark(); |
2015 } | 2015 } |