refactor(message): propagate highlight id instead of attrs

Problem:  Highlight group id is not propagated to the end of the message call
          stack, where ext_messages are emitted.
Solution: Refactor message functions to pass along highlight group id
          instead of attr id.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 635d26f123..0944a3041e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1903,8 +1903,8 @@ static const char *did_set_arabic(optset_T *args)
     if (strcmp(p_enc, "utf-8") != 0) {
       static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'");
 
-      msg_source(HL_ATTR(HLF_W));
-      msg(_(w_arabic), HL_ATTR(HLF_W));
+      msg_source(HLF_W + 1);
+      msg(_(w_arabic), HLF_W + 1);
       set_vim_var_string(VV_WARNINGMSG, _(w_arabic), -1);
     }
 
@@ -4187,7 +4187,7 @@ static void showoneopt(vimoption_T *opt, int opt_flags)
     msg_putchar('=');
     // put value string in NameBuff
     option_value2string(opt, opt_flags);
-    msg_outtrans(NameBuff, 0);
+    msg_outtrans(NameBuff, 0, false);
   }
 
   silent_mode = save_silent;