From 098e91400eb06d29c31264ba973ea8a563703059 Mon Sep 17 00:00:00 2001
From: Matthew Malcomson <hardenedapple@gmail.com>
Date: Sat, 25 Mar 2017 14:43:19 +0000
Subject: refactor: Remove allow_keys global (#6346)

* The allow_keys global is unused in nvim, remove it

* clint
---
 src/nvim/message.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 4cd0db21e8..cc9ef15f13 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -847,23 +847,22 @@ void wait_return(int redraw)
        * CTRL-C, but we need to loop then. */
       had_got_int = got_int;
 
-      /* Don't do mappings here, we put the character back in the
-       * typeahead buffer. */
-      ++no_mapping;
-      ++allow_keys;
-
-      /* Temporarily disable Recording. If Recording is active, the
-       * character will be recorded later, since it will be added to the
-       * typebuf after the loop */
+      // Don't do mappings here, we put the character back in the
+      // typeahead buffer.
+      no_mapping++;
+
+      // Temporarily disable Recording. If Recording is active, the
+      // character will be recorded later, since it will be added to the
+      // typebuf after the loop
       save_Recording = Recording;
       save_scriptout = scriptout;
       Recording = FALSE;
       scriptout = NULL;
       c = safe_vgetc();
-      if (had_got_int && !global_busy)
-        got_int = FALSE;
-      --no_mapping;
-      --allow_keys;
+      if (had_got_int && !global_busy) {
+        got_int = false;
+      }
+      no_mapping--;
       Recording = save_Recording;
       scriptout = save_scriptout;
 
-- 
cgit 


From f9a31e98505c0f5e83dd3ba957fbd0f4b150d30c Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Mon, 27 Mar 2017 01:04:57 +0800
Subject: vim-patch:7.4.2349 (#6368)

Problem:    Valgrind reports using uninitialzed memory. (Dominique Pelle)
Solution:   Check the length before checking for a NUL.

https://github.com/vim/vim/commit/2321ca2a78286bc026fa7f407281ddbeb04114bb
---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index cc9ef15f13..bf54284881 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1986,7 +1986,7 @@ static void msg_puts_printf(const char *str, const ptrdiff_t maxlen)
   char buf[4];
   char *p;
 
-  while (*s != NUL && (maxlen < 0 || s - str < maxlen)) {
+  while ((maxlen < 0 || s - str < maxlen) && *s != NUL) {
     if (!(silent_mode && p_verbose == 0)) {
       // NL --> CR NL translation (for Unix, not for "--version")
       p = &buf[0];
-- 
cgit 


From 28dafe3ff0b0dc082fb62b2251fd64a167ce7188 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 21 Aug 2016 08:16:47 +0300
Subject: eval,*: Move get_tv_string to typval.c

Function was renamed and changed to return `const char *`.
---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index bf54284881..423f5a27e7 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -718,7 +718,7 @@ int delete_first_msg(void)
 void ex_messages(void *const eap_p)
   FUNC_ATTR_NONNULL_ALL
 {
-  exarg_T *eap = (exarg_T *)eap_p;
+  const exarg_T *const eap = (const exarg_T *)eap_p;
   struct msg_hist *p;
   int c = 0;
 
-- 
cgit 


From 40feac6efcc75395bb20da2b028b67a2b6e95bd9 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 10 Sep 2016 22:32:14 +0300
Subject: message: Revise maxlen argument in msg_puts_attr_len

`attr` argument is enough to forbid putting message in history. Also forbid
strings with NUL before `len` just in case (it appears that this does not ever
happen).
---
 src/nvim/message.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 423f5a27e7..1eab9a403b 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1562,13 +1562,17 @@ void msg_puts_attr(const char *const s, const int attr)
   msg_puts_attr_len(s, -1, attr);
 }
 
-/// Like msg_puts_attr(), but with a maximum length "maxlen" (in bytes).
-/// When "maxlen" is -1 there is no maximum length.
-/// When "maxlen" is >= 0 the message is not put in the history.
-void msg_puts_attr_len(const char *str, const ptrdiff_t maxlen, int attr)
+/// Write a message with highlight attributes
+///
+/// @param[in]  str  NUL-terminated message string.
+/// @param[in]  len  Length of the string or -1.
+/// @param[in]  attr  Highlight attribute.
+void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr)
+  FUNC_ATTR_NONNULL_ALL
 {
+  assert(len < 0 || memchr(str, 0, len) == NULL);
   // If redirection is on, also write to the redirection file.
-  redir_write(str, maxlen);
+  redir_write(str, len);
 
   // Don't print anything when using ":silent cmd".
   if (msg_silent != 0) {
@@ -1576,8 +1580,9 @@ void msg_puts_attr_len(const char *str, const ptrdiff_t maxlen, int attr)
   }
 
   // if MSG_HIST flag set, add message to history
-  if ((attr & MSG_HIST) && maxlen < 0) {
-    add_msg_hist(str, -1, attr);
+  if (attr & MSG_HIST) {
+    assert(len < 0);
+    add_msg_hist(str, (int)len, attr);
     attr &= ~MSG_HIST;
   }
 
@@ -1596,9 +1601,9 @@ void msg_puts_attr_len(const char *str, const ptrdiff_t maxlen, int attr)
   // different, e.g. for Win32 console) or we just don't know where the
   // cursor is.
   if (msg_use_printf()) {
-    msg_puts_printf(str, maxlen);
+    msg_puts_printf(str, len);
   } else {
-    msg_puts_display((const char_u *)str, maxlen, attr, false);
+    msg_puts_display((const char_u *)str, len, attr, false);
   }
 }
 
-- 
cgit 


From 8b0fa64ed3dbd4376cbfa195526ec97d8c944a97 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 10 Sep 2016 22:35:47 +0300
Subject: message: Remove incorrect assertion

It was there only to prove that *now* `len` argument is not used to forbid
putting message into history (i.e. that Neovim behaviour did not change). After
this commit it should be possible to use msg_puts_attr_len with len>=0 to put
message into history should new code need this.
---
 src/nvim/message.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 1eab9a403b..83f2735b50 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1581,7 +1581,6 @@ void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr)
 
   // if MSG_HIST flag set, add message to history
   if (attr & MSG_HIST) {
-    assert(len < 0);
     add_msg_hist(str, (int)len, attr);
     attr &= ~MSG_HIST;
   }
-- 
cgit 


From 8dd9c6edd87403fb583b1e8b5567987e159fd7e2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 3 Apr 2017 00:40:48 +0300
Subject: message: Do not use IObuff in emsgf

---
 src/nvim/message.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 83f2735b50..4423b430a5 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -573,16 +573,17 @@ void emsg_invreg(int name)
 /// Print an error message with unknown number of arguments
 bool emsgf(const char *const fmt, ...)
 {
+  static char errbuf[IOSIZE];
   if (emsg_not_now()) {
     return true;
   }
 
   va_list ap;
   va_start(ap, fmt);
-  vim_vsnprintf((char *) IObuff, IOSIZE, fmt, ap, NULL);
+  vim_vsnprintf(errbuf, sizeof(errbuf), fmt, ap, NULL);
   va_end(ap);
 
-  return emsg(IObuff);
+  return emsg(errbuf);
 }
 
 static void msg_emsgf_event(void **argv)
-- 
cgit 


From 8eb598c08ea51731536184a4b3e98000ce073877 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 3 Apr 2017 00:44:49 +0300
Subject: fixup!

---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 4423b430a5..1d3609291a 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -583,7 +583,7 @@ bool emsgf(const char *const fmt, ...)
   vim_vsnprintf(errbuf, sizeof(errbuf), fmt, ap, NULL);
   va_end(ap);
 
-  return emsg(errbuf);
+  return emsg((const char_u *)errbuf);
 }
 
 static void msg_emsgf_event(void **argv)
-- 
cgit 


From db9ef6263ec5b7885782ccf0a93e06b0c71f6944 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sat, 8 Apr 2017 16:45:38 +0200
Subject: mbyte: replace vim_tolower with mb_tolower handling locale correctly

---
 src/nvim/message.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 1d3609291a..2cc426cf42 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2731,7 +2731,7 @@ do_dialog (
       }
 
       /* Make the character lowercase, as chars in "hotkeys" are. */
-      c = vim_tolower(c);
+      c = mb_tolower(c);
       retval = 1;
       for (i = 0; hotkeys[i]; ++i) {
         if (has_mbyte) {
@@ -2777,7 +2777,7 @@ copy_char (
 
   if (has_mbyte) {
     if (lowercase) {
-      c = vim_tolower((*mb_ptr2char)(from));
+      c = mb_tolower((*mb_ptr2char)(from));
       return (*mb_char2bytes)(c, to);
     } else {
       len = (*mb_ptr2len)(from);
-- 
cgit 


From c1cf03398143f4dc0ac9155988edad349d24deca Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sun, 9 Apr 2017 10:08:26 +0200
Subject: lint: fix clint errors around mb_tolower calls

---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 2cc426cf42..3e4a1e10b6 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2730,7 +2730,7 @@ do_dialog (
         break;
       }
 
-      /* Make the character lowercase, as chars in "hotkeys" are. */
+      // Make the character lowercase, as chars in "hotkeys" are.
       c = mb_tolower(c);
       retval = 1;
       for (i = 0; hotkeys[i]; ++i) {
-- 
cgit 


From 083792e1374100f1b0c48c72987935f56ebbd8ad Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:56:30 +0300
Subject: message: Remove some enc_utf8/… checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/message.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 3e4a1e10b6..91dfc79e38 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1165,15 +1165,9 @@ int msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
    * Normal characters are printed several at a time.
    */
   while (--len >= 0) {
-    if (enc_utf8) {
-      // Don't include composing chars after the end.
-      mb_l = utfc_ptr2len_len((char_u *)str, len + 1);
-    } else if (has_mbyte) {
-      mb_l = (*mb_ptr2len)((char_u *)str);
-    } else {
-      mb_l = 1;
-    }
-    if (has_mbyte && mb_l > 1) {
+    // Don't include composing chars after the end.
+    mb_l = utfc_ptr2len_len((char_u *)str, len + 1);
+    if (mb_l > 1) {
       c = (*mb_ptr2char)((char_u *)str);
       if (vim_isprintc(c)) {
         // Printable multi-byte char: count the cells.
-- 
cgit 


From 0718d0e6d44536547dac2248c65b15547e56fc10 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:58:19 +0300
Subject: message: Some more has_mbyte/enc_utf8 removal

---
 src/nvim/message.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 91dfc79e38..42e1fd1cf9 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1657,16 +1657,13 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
 
       // Display char in last column before showing more-prompt.
       if (*s >= ' ' && !cmdmsg_rl) {
-        if (has_mbyte) {
-          if (enc_utf8 && maxlen >= 0)
-            /* avoid including composing chars after the end */
-            l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
-          else
-            l = (*mb_ptr2len)(s);
-          s = screen_puts_mbyte((char_u *)s, l, attr);
+        if (maxlen >= 0) {
+          // Avoid including composing chars after the end.
+          l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
         } else {
-          msg_screen_putchar(*s++, attr);
+          l = utfc_ptr2len(s);
         }
+        s = screen_puts_mbyte((char_u *)s, l, attr);
         did_last_char = true;
       } else {
         did_last_char = false;
-- 
cgit 


From c2f3e361c52ec4e7149ea1d8c6a1202e0873da8e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:11:50 +0300
Subject: *: Add comment to all C files

---
 src/nvim/message.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 42e1fd1cf9..146937c25a 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * message.c: functions for displaying messages on the command line
  */
-- 
cgit 


From 8f59d1483934f91011b755406251136c406e77f6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 27 Apr 2017 14:38:41 +0200
Subject: event: Remove "priority" concept.

It was replaced by the "child queue" concept (MultiQueue).
---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 146937c25a..696855e3aa 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -604,7 +604,7 @@ void msg_schedule_emsgf(const char *const fmt, ...)
   va_end(ap);
 
   char *s = xstrdup((char *)IObuff);
-  loop_schedule(&main_loop, event_create(1, msg_emsgf_event, 1, s));
+  loop_schedule(&main_loop, event_create(msg_emsgf_event, 1, s));
 }
 
 /*
-- 
cgit 


From 7bd97127b4e45dcef1159603834b04ef0dcadfd7 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 07:58:49 -0400
Subject: vim-patch:7.4.2244

Problem:    Adding pattern to ":oldfiles" is not a generic solution.
Solution:   Add the ":filter /pat/ cmd" command modifier.  Only works for some
            commands right now.

https://github.com/vim/vim/commit/7b668e83d0635d082b7ec90d7d2aa30a9d7d8928
---
 src/nvim/message.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 696855e3aa..c83dfcd63f 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -31,6 +31,7 @@
 #include "nvim/ops.h"
 #include "nvim/option.h"
 #include "nvim/normal.h"
+#include "nvim/regexp.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
@@ -148,6 +149,12 @@ msg_attr_keep (
   int retval;
   char_u *buf = NULL;
 
+  // Skip messages not match ":filter pattern".
+  // Don't filter when there is an error.
+  if (!emsg_on_display && message_filtered(s)) {
+    return true;
+  }
+
   if (attr == 0) {
     set_vim_var_string(VV_STATUSMSG, (char *) s, -1);
   }
@@ -1783,6 +1790,14 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
   msg_check();
 }
 
+/// Return true when ":filter pattern" was used and "msg" does not match
+/// "pattern".
+bool message_filtered(char_u *msg)
+{
+  return cmdmod.filter_regmatch.regprog != NULL
+    && !vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+}
+
 /*
  * Scroll the screen up one line for displaying the next message line.
  */
-- 
cgit 


From f219657453271f19519148d76536879bec044534 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:29:44 -0400
Subject: vim-patch:7.4.2263

Problem:    :filter does not work for many commands.  Can only get matching
            messages.
Solution:   Make :filter work for :command, :map, :list, :number and :print.
            Make ":filter!" show non-matching lines.

https://github.com/vim/vim/commit/d29459baa61819e59961804ed258efac5733ec70
---
 src/nvim/message.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index c83dfcd63f..057ce75f79 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1794,8 +1794,12 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
 /// "pattern".
 bool message_filtered(char_u *msg)
 {
-  return cmdmod.filter_regmatch.regprog != NULL
-    && !vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+  if (cmdmod.filter_regmatch.regprog == NULL) {
+    return false;
+  }
+
+  bool match = vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+  return cmdmod.filter_force ? match : !match;
 }
 
 /*
-- 
cgit 


From 3da49cd68e7d5c968cc99a926819038ff57f488f Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 28 Jun 2017 22:09:10 +0300
Subject: ex_getln: Fix “echoerr msg not shown” problem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also attempted to fix problem with cancelling input() on error by avoiding
standard error printing facilities (assumed thrown error message is the
problem), but with no luck so far.
---
 src/nvim/message.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 057ce75f79..ab918712e5 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1611,6 +1611,27 @@ void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr)
   }
 }
 
+/// Print a formatted message
+///
+/// Message printed is limited by #IOSIZE. Must not be used from inside
+/// msg_puts_attr().
+///
+/// @param[in]  attr  Highlight attributes.
+/// @param[in]  fmt  Format string.
+void msg_printf_attr(const int attr, const char *const fmt, ...)
+  FUNC_ATTR_NONNULL_ALL
+{
+  static char msgbuf[IOSIZE];
+
+  va_list ap;
+  va_start(ap, fmt);
+  const size_t len = vim_vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap, NULL);
+  va_end(ap);
+
+  msg_scroll = true;
+  msg_puts_attr_len(msgbuf, (ptrdiff_t)len, attr);
+}
+
 /*
  * The display part of msg_puts_attr_len().
  * May be called recursively to display scroll-back text.
-- 
cgit 


From e9e1668ca6520936eaa0958823325c11a72fa923 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 2 Jul 2017 18:12:46 +0300
Subject: message: Refactor str2special_save and str2special

Does not alter their usages as well.
---
 src/nvim/message.c | 120 +++++++++++++++++++++++++++--------------------------
 1 file changed, 62 insertions(+), 58 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 057ce75f79..2263f9c00d 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1281,90 +1281,94 @@ msg_outtrans_special (
   return retval;
 }
 
-/*
- * Return the lhs or rhs of a mapping, with the key codes turned into printable
- * strings, in an allocated string.
- */
-char_u *
-str2special_save (
-    char_u *str,
-    int is_lhs          /* TRUE for lhs, FALSE for rhs */
-)
+/// Convert string, replacing key codes with printables
+///
+/// Used for lhs or rhs of mappings.
+///
+/// @param[in]  str  String to convert.
+/// @param[in]  replace_spaces  Convert spaces into <Space>, normally used for
+///                             lhs, but not rhs.
+///
+/// @return [allocated] Converted string.
+char *str2special_save(const char *const str, const bool replace_spaces)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_MALLOC
+  FUNC_ATTR_NONNULL_RET
 {
   garray_T ga;
-  char_u      *p = str;
-
   ga_init(&ga, 1, 40);
-  while (*p != NUL)
-    ga_concat(&ga, str2special(&p, is_lhs));
+
+  const char *p = str;
+  while (*p != NUL) {
+    ga_concat(&ga, (const char_u *)str2special(&p, replace_spaces));
+  }
   ga_append(&ga, NUL);
-  return (char_u *)ga.ga_data;
+  return (char *)ga.ga_data;
 }
 
-/*
- * Return the printable string for the key codes at "*sp".
- * Used for translating the lhs or rhs of a mapping to printable chars.
- * Advances "sp" to the next code.
- */
-char_u *
-str2special (
-    char_u **sp,
-    int from               /* TRUE for lhs of mapping */
-)
+/// Convert character, replacing key one key code with printable representation
+///
+/// @param[in,out]  sp  String to convert. Is advanced to the next key code.
+/// @param[in]  replace_spaces  Convert spaces into <Space>, normally used for
+///                             lhs, but not rhs.
+///
+/// @return Converted key code, in a static buffer. Buffer is always one and the
+///         same, so save converted string somewhere before running str2special
+///         for the second time.
+const char *str2special(const char **const sp, const bool replace_spaces)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET
 {
-  int c;
-  static char_u buf[7];
-  char_u              *str = *sp;
-  int modifiers = 0;
-  int special = FALSE;
+  static char buf[7];
 
-  if (has_mbyte) {
-    char_u  *p;
-
-    /* Try to un-escape a multi-byte character.  Return the un-escaped
-     * string if it is a multi-byte character. */
-    p = mb_unescape(sp);
-    if (p != NULL)
-      return p;
+  // Try to un-escape a multi-byte character.  Return the un-escaped
+  // string if it is a multi-byte character.
+  const char *const p = mb_unescape(sp);
+  if (p != NULL) {
+    return p;
   }
 
-  c = *str;
+  const char *str = *sp;
+  int c = (uint8_t)(*str);
+  int modifiers = 0;
+  bool special = false;
   if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) {
-    if (str[1] == KS_MODIFIER) {
-      modifiers = str[2];
+    if ((uint8_t)str[1] == KS_MODIFIER) {
+      modifiers = (uint8_t)str[2];
       str += 3;
-      c = *str;
+      c = (uint8_t)(*str);
     }
     if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) {
-      c = TO_SPECIAL(str[1], str[2]);
+      c = TO_SPECIAL((uint8_t)str[1], (uint8_t)str[2]);
       str += 2;
-      if (c == KS_ZERO)         /* display <Nul> as ^@ or <Nul> */
+      if (c == KS_ZERO) {  // display <Nul> as ^@ or <Nul>
         c = NUL;
+      }
+    }
+    if (IS_SPECIAL(c) || modifiers) {  // Special key.
+      special = true;
     }
-    if (IS_SPECIAL(c) || modifiers)     /* special key */
-      special = TRUE;
   }
 
-  if (has_mbyte && !IS_SPECIAL(c)) {
-    int len = (*mb_ptr2len)(str);
+  if (!IS_SPECIAL(c)) {
+    const int len = utf_ptr2len((const char_u *)str);
 
-    /* For multi-byte characters check for an illegal byte. */
-    if (has_mbyte && MB_BYTE2LEN(*str) > len) {
-      transchar_nonprint(buf, c);
+    // Check for an illegal byte.
+    if (MB_BYTE2LEN((uint8_t)(*str)) > len) {
+      transchar_nonprint((char_u *)buf, c);
       *sp = str + 1;
       return buf;
     }
-    /* Since 'special' is TRUE the multi-byte character 'c' will be
-     * processed by get_special_key_name() */
-    c = (*mb_ptr2char)(str);
+    // Since 'special' is TRUE the multi-byte character 'c' will be
+    // processed by get_special_key_name().
+    c = utf_ptr2char((const char_u *)str);
     *sp = str + len;
-  } else
+  } else {
     *sp = str + 1;
+  }
 
-  /* Make unprintable characters in <> form, also <M-Space> and <Tab>.
-   * Use <Space> only for lhs of a mapping. */
-  if (special || char2cells(c) > 1 || (from && c == ' '))
-    return get_special_key_name(c, modifiers);
+  // Make unprintable characters in <> form, also <M-Space> and <Tab>.
+  if (special || char2cells(c) > 1 || (replace_spaces && c == ' ')) {
+    return (const char *)get_special_key_name(c, modifiers);
+  }
   buf[0] = c;
   buf[1] = NUL;
   return buf;
-- 
cgit 


From 832c158a663c7acb03a47fbd1e380ab7f835a9cd Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 2 Jul 2017 18:24:16 +0300
Subject: message: Refactor str2specialbuf

Does not alter its usages.
---
 src/nvim/message.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 2263f9c00d..656f1adaf8 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1374,19 +1374,25 @@ const char *str2special(const char **const sp, const bool replace_spaces)
   return buf;
 }
 
-/*
- * Translate a key sequence into special key names.
- */
-void str2specialbuf(char_u *sp, char_u *buf, int len)
+/// Convert string, replacing key codes with printables
+///
+/// @param[in]  str  String to convert.
+/// @param[out]  buf  Buffer to save results to.
+/// @param[in]  len  Buffer length.
+void str2specialbuf(const char *sp, char *buf, size_t len)
+  FUNC_ATTR_NONNULL_ALL
 {
-  char_u      *s;
-
-  *buf = NUL;
   while (*sp) {
-    s = str2special(&sp, FALSE);
-    if ((int)(STRLEN(s) + STRLEN(buf)) < len)
-      STRCAT(buf, s);
+    const char *s = str2special(&sp, false);
+    const size_t s_len = strlen(s);
+    if (s_len <= len) {
+      break;
+    }
+    memcpy(buf, s, s_len);
+    buf += s_len;
+    len -= s_len;
   }
+  *buf = NUL;
 }
 
 /*
-- 
cgit 


From 6140396d97d700ab6390b4ecfc4fd7da0ebdfd9f Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 2 Jul 2017 18:29:42 +0300
Subject: *: Adjust usages of modified functions

---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 656f1adaf8..feb2fb214e 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1269,7 +1269,7 @@ msg_outtrans_special (
       string = "<Space>";
       str++;
     } else {
-      string = (const char *)str2special((char_u **)&str, from);
+      string = str2special((const char **)&str, from);
     }
     const int len = vim_strsize((char_u *)string);
     // Highlight special keys
-- 
cgit 


From 24f0056ca5cb392f1e1bf38d648a6037acf1f1ef Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 2 Jul 2017 19:37:21 +0300
Subject: message: Add support for replacing `<` to str2special

---
 src/nvim/message.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index feb2fb214e..8a9d8e1bc6 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1269,7 +1269,7 @@ msg_outtrans_special (
       string = "<Space>";
       str++;
     } else {
-      string = str2special((const char **)&str, from);
+      string = str2special((const char **)&str, from, false);
     }
     const int len = vim_strsize((char_u *)string);
     // Highlight special keys
@@ -1286,11 +1286,13 @@ msg_outtrans_special (
 /// Used for lhs or rhs of mappings.
 ///
 /// @param[in]  str  String to convert.
-/// @param[in]  replace_spaces  Convert spaces into <Space>, normally used for
+/// @param[in]  replace_spaces  Convert spaces into `<Space>`, normally used fo
 ///                             lhs, but not rhs.
+/// @param[in]  replace_lt  Convert `<` into `<lt>`.
 ///
 /// @return [allocated] Converted string.
-char *str2special_save(const char *const str, const bool replace_spaces)
+char *str2special_save(const char *const str, const bool replace_spaces,
+                       const bool replace_lt)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_MALLOC
   FUNC_ATTR_NONNULL_RET
 {
@@ -1299,7 +1301,7 @@ char *str2special_save(const char *const str, const bool replace_spaces)
 
   const char *p = str;
   while (*p != NUL) {
-    ga_concat(&ga, (const char_u *)str2special(&p, replace_spaces));
+    ga_concat(&ga, (const char_u *)str2special(&p, replace_spaces, replace_lt));
   }
   ga_append(&ga, NUL);
   return (char *)ga.ga_data;
@@ -1310,11 +1312,13 @@ char *str2special_save(const char *const str, const bool replace_spaces)
 /// @param[in,out]  sp  String to convert. Is advanced to the next key code.
 /// @param[in]  replace_spaces  Convert spaces into <Space>, normally used for
 ///                             lhs, but not rhs.
+/// @param[in]  replace_lt  Convert `<` into `<lt>`.
 ///
 /// @return Converted key code, in a static buffer. Buffer is always one and the
 ///         same, so save converted string somewhere before running str2special
 ///         for the second time.
-const char *str2special(const char **const sp, const bool replace_spaces)
+const char *str2special(const char **const sp, const bool replace_spaces,
+                        const bool replace_lt)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET
 {
   static char buf[7];
@@ -1366,7 +1370,10 @@ const char *str2special(const char **const sp, const bool replace_spaces)
   }
 
   // Make unprintable characters in <> form, also <M-Space> and <Tab>.
-  if (special || char2cells(c) > 1 || (replace_spaces && c == ' ')) {
+  if (special
+      || char2cells(c) > 1
+      || (replace_spaces && c == ' ')
+      || (replace_lt && c == '<')) {
     return (const char *)get_special_key_name(c, modifiers);
   }
   buf[0] = c;
@@ -1383,7 +1390,7 @@ void str2specialbuf(const char *sp, char *buf, size_t len)
   FUNC_ATTR_NONNULL_ALL
 {
   while (*sp) {
-    const char *s = str2special(&sp, false);
+    const char *s = str2special(&sp, false, false);
     const size_t s_len = strlen(s);
     if (s_len <= len) {
       break;
-- 
cgit 


From e07e46f53921aa75bc826290098491e4b5622448 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Jul 2017 02:06:40 +0300
Subject: message: Fix `:echo "\x80"` printing `~@<80>`

---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 8a9d8e1bc6..36f9ca84ed 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1196,7 +1196,7 @@ int msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
       len -= mb_l - 1;
       str += mb_l;
     } else {
-      s = transchar_byte(*str);
+      s = transchar_byte((uint8_t)(*str));
       if (s[1] != NUL) {
         // Unprintable char: print the printable chars so far and the
         // translation of the unprintable char.
-- 
cgit 


From 2952a00d2e2bf0cc6988c9b865497b1f567190c1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 26 Jul 2017 22:01:48 +0300
Subject: message: Only require second (format) argument to be not NULL

---
 src/nvim/message.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 92dd5a4695..fd7043cea8 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1636,7 +1636,7 @@ void msg_puts_attr_len(const char *const str, const ptrdiff_t len, int attr)
 /// @param[in]  attr  Highlight attributes.
 /// @param[in]  fmt  Format string.
 void msg_printf_attr(const int attr, const char *const fmt, ...)
-  FUNC_ATTR_NONNULL_ALL
+  FUNC_ATTR_NONNULL_ARG(2)
 {
   static char msgbuf[IOSIZE];
 
-- 
cgit 


From 3827d5bc713d9ed149bc793f411debb5b89a4eba Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 6 Aug 2017 02:44:15 +0200
Subject: input: skip dialogs if no UI is active

Treat dialogs in the same way as "silent mode" (`nvim -es`).

References #1984
References #3901
---
 src/nvim/message.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/nvim/message.c')

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 36f9ca84ed..28c88f5a14 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2722,9 +2722,11 @@ do_dialog (
   int c;
   int i;
 
-  /* Don't output anything in silent mode ("ex -s") */
-  if (silent_mode)
-    return dfltbutton;       /* return default option */
+  if (silent_mode      // No dialogs in silent mode ("ex -s")
+      || !ui_active()  // Without a UI Nvim waits for input forever.
+      ) {
+    return dfltbutton;  // return default option
+  }
 
 
   oldState = State;
-- 
cgit