Mercurial > vim

comparison src/fileio.c @ 11158:501f46f7644c v8.0.0466

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e08ead1d269f
comparison
equal deleted inserted replaced
11157:35a1705f4d02 11158:501f46f7644c
5042 5042
5043 if (errmsg != NULL) 5043 if (errmsg != NULL)
5044 { 5044 {
5045 int numlen = errnum != NULL ? (int)STRLEN(errnum) : 0; 5045 int numlen = errnum != NULL ? (int)STRLEN(errnum) : 0;
5046 5046
5047 attr = hl_attr(HLF_E); /* set highlight for error messages */ 5047 attr = HL_ATTR(HLF_E); /* set highlight for error messages */
5048 msg_add_fname(buf, 5048 msg_add_fname(buf,
5049 #ifndef UNIX 5049 #ifndef UNIX
5050 sfname 5050 sfname
5051 #else 5051 #else
5052 fname 5052 fname
5298 { 5298 {
5299 msg_scroll = TRUE; /* don't overwrite messages here */ 5299 msg_scroll = TRUE; /* don't overwrite messages here */
5300 msg_silent = 0; /* must give this prompt */ 5300 msg_silent = 0; /* must give this prompt */
5301 /* don't use emsg() here, don't want to flush the buffers */ 5301 /* don't use emsg() here, don't want to flush the buffers */
5302 MSG_ATTR(_("WARNING: The file has been changed since reading it!!!"), 5302 MSG_ATTR(_("WARNING: The file has been changed since reading it!!!"),
5303 hl_attr(HLF_E)); 5303 HL_ATTR(HLF_E));
5304 if (ask_yesno((char_u *)_("Do you really want to write to it"), 5304 if (ask_yesno((char_u *)_("Do you really want to write to it"),
5305 TRUE) == 'n') 5305 TRUE) == 'n')
5306 return FAIL; 5306 return FAIL;
5307 msg_scroll = FALSE; /* always overwrite the file message now */ 5307 msg_scroll = FALSE; /* always overwrite the file message now */
5308 } 5308 }
7009 # ifdef FEAT_AUTOCMD 7009 # ifdef FEAT_AUTOCMD
7010 if (!autocmd_busy) 7010 if (!autocmd_busy)
7011 # endif 7011 # endif
7012 { 7012 {
7013 msg_start(); 7013 msg_start();
7014 msg_puts_attr(tbuf, hl_attr(HLF_E) + MSG_HIST); 7014 msg_puts_attr(tbuf, HL_ATTR(HLF_E) + MSG_HIST);
7015 if (*mesg2 != NUL) 7015 if (*mesg2 != NUL)
7016 msg_puts_attr((char_u *)mesg2, 7016 msg_puts_attr((char_u *)mesg2,
7017 hl_attr(HLF_W) + MSG_HIST); 7017 HL_ATTR(HLF_W) + MSG_HIST);
7018 msg_clr_eos(); 7018 msg_clr_eos();
7019 (void)msg_end(); 7019 (void)msg_end();
7020 if (emsg_silent == 0) 7020 if (emsg_silent == 0)
7021 { 7021 {
7022 out_flush(); 7022 out_flush();
7838 if (event != last_event || ap->group != last_group) 7838 if (event != last_event || ap->group != last_group)
7839 { 7839 {
7840 if (ap->group != AUGROUP_DEFAULT) 7840 if (ap->group != AUGROUP_DEFAULT)
7841 { 7841 {
7842 if (AUGROUP_NAME(ap->group) == NULL) 7842 if (AUGROUP_NAME(ap->group) == NULL)
7843 msg_puts_attr(get_deleted_augroup(), hl_attr(HLF_E)); 7843 msg_puts_attr(get_deleted_augroup(), HL_ATTR(HLF_E));
7844 else 7844 else
7845 msg_puts_attr(AUGROUP_NAME(ap->group), hl_attr(HLF_T)); 7845 msg_puts_attr(AUGROUP_NAME(ap->group), HL_ATTR(HLF_T));
7846 msg_puts((char_u *)" "); 7846 msg_puts((char_u *)" ");
7847 } 7847 }
7848 msg_puts_attr(event_nr2name(event), hl_attr(HLF_T)); 7848 msg_puts_attr(event_nr2name(event), HL_ATTR(HLF_T));
7849 last_event = event; 7849 last_event = event;
7850 last_group = ap->group; 7850 last_group = ap->group;
7851 msg_putchar('\n'); 7851 msg_putchar('\n');
7852 if (got_int) 7852 if (got_int)
7853 return; 7853 return;