Mercurial > vim
comparison src/edit.c @ 11158:501f46f7644c v8.0.0466
patch 8.0.0466: still macros that should be all-caps
commit https://github.com/vim/vim/commit/8820b48654b62472821d9b155fe03ab7ac13a05c
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Mar 16 17:23:31 2017 +0100
patch 8.0.0466: still macros that should be all-caps
Problem: There are still a few macros that should be all-caps.
Solution: Make a few more macros all-caps.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 16 Mar 2017 17:30:06 +0100 |
| parents | f4ea50924c6d |
| children | e0309111d976 |
comparison
equal
deleted
inserted
replaced
| 11157:35a1705f4d02 | 11158:501f46f7644c |
|---|---|
| 1769 if (ScreenLines != NULL) | 1769 if (ScreenLines != NULL) |
| 1770 { | 1770 { |
| 1771 update_topline(); /* just in case w_topline isn't valid */ | 1771 update_topline(); /* just in case w_topline isn't valid */ |
| 1772 validate_cursor(); | 1772 validate_cursor(); |
| 1773 if (highlight) | 1773 if (highlight) |
| 1774 attr = hl_attr(HLF_8); | 1774 attr = HL_ATTR(HLF_8); |
| 1775 else | 1775 else |
| 1776 attr = 0; | 1776 attr = 0; |
| 1777 pc_row = W_WINROW(curwin) + curwin->w_wrow; | 1777 pc_row = W_WINROW(curwin) + curwin->w_wrow; |
| 1778 pc_col = W_WINCOL(curwin); | 1778 pc_col = W_WINCOL(curwin); |
| 1779 #if defined(FEAT_RIGHTLEFT) || defined(FEAT_MBYTE) | 1779 #if defined(FEAT_RIGHTLEFT) || defined(FEAT_MBYTE) |
| 2254 { | 2254 { |
| 2255 ctrl_x_mode = 0; | 2255 ctrl_x_mode = 0; |
| 2256 edit_submode = NULL; | 2256 edit_submode = NULL; |
| 2257 msg_attr(dict_opt ? (char_u *)_("'dictionary' option is empty") | 2257 msg_attr(dict_opt ? (char_u *)_("'dictionary' option is empty") |
| 2258 : (char_u *)_("'thesaurus' option is empty"), | 2258 : (char_u *)_("'thesaurus' option is empty"), |
| 2259 hl_attr(HLF_E)); | 2259 HL_ATTR(HLF_E)); |
| 2260 if (emsg_silent == 0) | 2260 if (emsg_silent == 0) |
| 2261 { | 2261 { |
| 2262 vim_beep(BO_COMPL); | 2262 vim_beep(BO_COMPL); |
| 2263 setcursor(); | 2263 setcursor(); |
| 2264 out_flush(); | 2264 out_flush(); |
| 3250 fp = mch_fopen((char *)files[i], "r"); /* open dictionary file */ | 3250 fp = mch_fopen((char *)files[i], "r"); /* open dictionary file */ |
| 3251 if (flags != DICT_EXACT) | 3251 if (flags != DICT_EXACT) |
| 3252 { | 3252 { |
| 3253 vim_snprintf((char *)IObuff, IOSIZE, | 3253 vim_snprintf((char *)IObuff, IOSIZE, |
| 3254 _("Scanning dictionary: %s"), (char *)files[i]); | 3254 _("Scanning dictionary: %s"), (char *)files[i]); |
| 3255 (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); | 3255 (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); |
| 3256 } | 3256 } |
| 3257 | 3257 |
| 3258 if (fp != NULL) | 3258 if (fp != NULL) |
| 3259 { | 3259 { |
| 3260 /* | 3260 /* |
| 4342 ins_buf->b_fname == NULL | 4342 ins_buf->b_fname == NULL |
| 4343 ? buf_spname(ins_buf) | 4343 ? buf_spname(ins_buf) |
| 4344 : ins_buf->b_sfname == NULL | 4344 : ins_buf->b_sfname == NULL |
| 4345 ? ins_buf->b_fname | 4345 ? ins_buf->b_fname |
| 4346 : ins_buf->b_sfname); | 4346 : ins_buf->b_sfname); |
| 4347 (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); | 4347 (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); |
| 4348 } | 4348 } |
| 4349 else if (*e_cpt == NUL) | 4349 else if (*e_cpt == NUL) |
| 4350 break; | 4350 break; |
| 4351 else | 4351 else |
| 4352 { | 4352 { |
| 4372 #endif | 4372 #endif |
| 4373 else if (*e_cpt == ']' || *e_cpt == 't') | 4373 else if (*e_cpt == ']' || *e_cpt == 't') |
| 4374 { | 4374 { |
| 4375 type = CTRL_X_TAGS; | 4375 type = CTRL_X_TAGS; |
| 4376 vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); | 4376 vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); |
| 4377 (void)msg_trunc_attr(IObuff, TRUE, hl_attr(HLF_R)); | 4377 (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); |
| 4378 } | 4378 } |
| 4379 else | 4379 else |
| 4380 type = -1; | 4380 type = -1; |
| 4381 | 4381 |
| 4382 /* in any case e_cpt is advanced to the next entry */ | 4382 /* in any case e_cpt is advanced to the next entry */ |
| 5691 if (edit_submode_extra != NULL) | 5691 if (edit_submode_extra != NULL) |
| 5692 { | 5692 { |
| 5693 if (!p_smd) | 5693 if (!p_smd) |
| 5694 msg_attr(edit_submode_extra, | 5694 msg_attr(edit_submode_extra, |
| 5695 edit_submode_highl < HLF_COUNT | 5695 edit_submode_highl < HLF_COUNT |
| 5696 ? hl_attr(edit_submode_highl) : 0); | 5696 ? HL_ATTR(edit_submode_highl) : 0); |
| 5697 } | 5697 } |
| 5698 else | 5698 else |
| 5699 msg_clr_cmdline(); /* necessary for "noshowmode" */ | 5699 msg_clr_cmdline(); /* necessary for "noshowmode" */ |
| 5700 } | 5700 } |
| 5701 | 5701 |