vim: src/message.c comparison

comparison src/message.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	f4d1fad4ac00

comparison

equal deleted inserted replaced

-:35a1705f4d02
+:501f46f7644c
 	vim_free(p);
 }
 p = get_emsg_lnum();
 if (p != NULL)
 {
-	msg_attr(p, hl_attr(HLF_N));
+	msg_attr(p, HL_ATTR(HLF_N));
 	vim_free(p);
 	last_sourcing_lnum = sourcing_lnum;  /* only once for each line */
 }
 /* remember the last sourcing name printed, also when it's empty */
 	did_emsg = TRUE;		/* flag for DoOneCmd() */
 }
 emsg_on_display = TRUE;	/* remember there is an error message */
 ++msg_scroll;		/* don't overwrite a previous message */
-attr = hl_attr(HLF_E);	/* set highlight mode for error messages */
+attr = HL_ATTR(HLF_E);	/* set highlight mode for error messages */
 if (msg_scrolled != 0)
 	need_wait_return = TRUE;    /* needed in case emsg() is called after
 				     * wait_return has reset need_wait_return
 				     * and a redraw is expected because
 				     * msg_scrolled is non-zero */
 {
 	s = mch_getenv((char_u *)"LANG");
 	if (s != NULL && *s != NUL)
 	    msg_attr((char_u *)
 		    _("Messages maintainer: Bram Moolenaar <Bram@vim.org>"),
-		    hl_attr(HLF_T));
+		    HL_ATTR(HLF_T));
 }
 /* Display what was not skipped. */
 for (; p != NULL && !got_int; p = p->next)
 	if (p->msg != NULL)
 if (msg_didout)	/* start on a new line */
 	msg_putchar('\n');
 if (got_int)
 	MSG_PUTS(_("Interrupt: "));
-MSG_PUTS_ATTR(_("Press ENTER or type command to continue"), hl_attr(HLF_R));
+MSG_PUTS_ATTR(_("Press ENTER or type command to continue"), HL_ATTR(HLF_R));
 if (!msg_use_printf())
 	msg_clr_eos();
 p_more = save_p_more;
 }
 #if defined(FEAT_FIND_ID) || defined(PROTO)
 void
 msg_home_replace_hl(char_u *fname)
 {
-msg_home_replace_attr(fname, hl_attr(HLF_D));
+msg_home_replace_attr(fname, HL_ATTR(HLF_D));
 }
 #endif
 static void
 msg_home_replace_attr(char_u *fname, int attr)
 		 * far and the translation of the unprintable char. */
 		if (str > plain_start)
 		    msg_puts_attr_len(plain_start, (int)(str - plain_start),
 									attr);
 		plain_start = str + mb_l;
-		msg_puts_attr(transchar(c), attr == 0 ? hl_attr(HLF_8) : attr);
+		msg_puts_attr(transchar(c), attr == 0 ? HL_ATTR(HLF_8) : attr);
 		retval += char2cells(c);
 	    }
 	    len -= mb_l - 1;
 	    str += mb_l;
 	}
 		 * translation of the unprintable char. */
 		if (str > plain_start)
 		    msg_puts_attr_len(plain_start, (int)(str - plain_start),
 									attr);
 		plain_start = str + 1;
-		msg_puts_attr(s, attr == 0 ? hl_attr(HLF_8) : attr);
+		msg_puts_attr(s, attr == 0 ? HL_ATTR(HLF_8) : attr);
 		retval += (int)STRLEN(s);
 	    }
 	    else
 		++retval;
 	    ++str;
 int		retval = 0;
 char_u	*string;
 int		attr;
 int		len;
-attr = hl_attr(HLF_8);
+attr = HL_ATTR(HLF_8);
 while (*str != NUL)
 {
 	/* Leading and trailing spaces need to be displayed in <> form. */
 	if ((str == strstart || str[1] == NUL) && *str == ' ')
 	{
 		}
 		else
 		{
 		    c = lcs_tab1;
 		    c_extra = lcs_tab2;
-		    attr = hl_attr(HLF_8);
+		    attr = HL_ATTR(HLF_8);
 		}
 	    }
 	    else if (c == 160 && list && lcs_nbsp != NUL)
 	    {
 		c = lcs_nbsp;
-		attr = hl_attr(HLF_8);
+		attr = HL_ATTR(HLF_8);
 	    }
 	    else if (c == NUL && list && lcs_eol != NUL)
 	    {
 		p_extra = (char_u *)"";
 		c_extra = NUL;
 		n_extra = 1;
 		c = lcs_eol;
-		attr = hl_attr(HLF_AT);
+		attr = HL_ATTR(HLF_AT);
 		--s;
 	    }
 	    else if (c != NUL && (n = byte2cells(c)) > 1)
 	    {
 		n_extra = n - 1;
 		p_extra = transchar_byte(c);
 		c_extra = NUL;
 		c = *p_extra++;
 		/* Use special coloring to be able to distinguish <hex> from
 		 * the same in plain text. */
-		attr = hl_attr(HLF_8);
+		attr = HL_ATTR(HLF_8);
 	    }
 	    else if (c == ' ' && trail != NULL && s > trail)
 	    {
 		c = lcs_trail;
-		attr = hl_attr(HLF_8);
+		attr = HL_ATTR(HLF_8);
 	    }
 	    else if (c == ' ' && list && lcs_space != NUL)
 	    {
 		c = lcs_space;
-		attr = hl_attr(HLF_8);
+		attr = HL_ATTR(HLF_8);
 	    }
 	}
 	if (c == NUL)
 	    break;
 		cmdmsg_rl ? msg_col <= 1 :
 #endif
 		msg_col == Columns - 1))
 {
 	/* Doesn't fit, print a highlighted '>' to fill it up. */
-	msg_screen_putchar('>', hl_attr(HLF_AT));
+	msg_screen_putchar('>', HL_ATTR(HLF_AT));
 	return s;
 }
 screen_puts_len(s, l, msg_row, msg_col, attr);
 #ifdef FEAT_RIGHTLEFT
 void
 msg_puts_title(
 char_u	*s)
 {
-msg_puts_attr(s, hl_attr(HLF_T));
+msg_puts_attr(s, HL_ATTR(HLF_T));
 }
 /*
 * Show a message in such a way that it always fits in the line.  Cut out a
 * part in the middle and replace it with "..." when necessary.
 room = Columns - msg_col;
 if (len > room && room >= 20)
 {
 	slen = (room - 3) / 2;
 	msg_outtrans_len_attr(longstr, slen, attr);
-	msg_puts_attr((char_u *)"...", hl_attr(HLF_8));
+	msg_puts_attr((char_u *)"...", HL_ATTR(HLF_8));
 }
 msg_outtrans_len_attr(longstr + len - slen, slen, attr);
 }
 /*
 msg_moremsg(int full)
 {
 int		attr;
 char_u	*s = (char_u *)_("-- More --");
-attr = hl_attr(HLF_M);
+attr = HL_ATTR(HLF_M);
 screen_puts(s, (int)Rows - 1, 0, attr);
 if (full)
 	screen_puts((char_u *)
 		_(" SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "),
 		(int)Rows - 1, vim_strsize(s), attr);
 set_vim_var_string(VV_WARNINGMSG, message, -1);
 #endif
 vim_free(keep_msg);
 keep_msg = NULL;
 if (hl)
-	keep_msg_attr = hl_attr(HLF_W);
+	keep_msg_attr = HL_ATTR(HLF_W);
 else
 	keep_msg_attr = 0;
 if (msg_attr(message, keep_msg_attr) && msg_scrolled == 0)
 	set_keep_msg(message, keep_msg_attr);
 msg_didout = FALSE;	    /* overwrite this message */
 display_confirm_msg(void)
 {
 /* avoid that 'q' at the more prompt truncates the message here */
 ++confirm_msg_used;
 if (confirm_msg != NULL)
-	msg_puts_attr(confirm_msg, hl_attr(HLF_M));
+	msg_puts_attr(confirm_msg, HL_ATTR(HLF_M));
 --confirm_msg_used;
 }
 #endif /* FEAT_CON_DIALOG */

Mercurial > vim

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