1 files changed, 10 insertions, 10 deletions

diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index a498916e5e..88d968704b 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -666,8 +666,6 @@ static void free_menu_string(vimmenu_T *menu, int idx)
 static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
 {
   dict_T *dict;
-  char buf[sizeof(menu->mnemonic)];
-  int mnemonic_len;
 
   if (!menu || (menu->modes & modes) == 0x0) {
     return NULL;
@@ -679,11 +677,15 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
   tv_dict_add_nr(dict, S_LEN("hidden"), menu_is_hidden(menu->dname));
 
   if (menu->mnemonic) {
-    mnemonic_len = utf_char2bytes(menu->mnemonic, (u_char *)buf);
-    buf[mnemonic_len] = '\0';
+    char buf[MB_MAXCHAR + 1] = { 0 };  // > max value of utf8_char2bytes
+    utf_char2bytes(menu->mnemonic, (char_u *)buf);
     tv_dict_add_str(dict, S_LEN("shortcut"), buf);
   }
 
+  if (menu->actext) {
+    tv_dict_add_str(dict, S_LEN("actext"), (char *)menu->actext);
+  }
+
   if (menu->modes & MENU_TIP_MODE && menu->strings[MENU_INDEX_TIP]) {
     tv_dict_add_str(dict, S_LEN("tooltip"),
                     (char *)menu->strings[MENU_INDEX_TIP]);
@@ -697,11 +699,9 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
     for (int bit = 0; bit < MENU_MODES; bit++) {
       if ((menu->modes & modes & (1 << bit)) != 0) {
         dict_T *impl = tv_dict_alloc();
-        if (*menu->strings[bit] == NUL) {
-          tv_dict_add_str(impl, S_LEN("rhs"), (char *)"<Nop>");
-        } else {
-          tv_dict_add_str(impl, S_LEN("rhs"), (char *)menu->strings[bit]);
-        }
+        tv_dict_add_allocated_str(impl, S_LEN("rhs"),
+                                  str2special_save((char *)menu->strings[bit],
+                                                   false, false));
         tv_dict_add_nr(impl, S_LEN("silent"), menu->silent[bit]);
         tv_dict_add_nr(impl, S_LEN("enabled"),
                        (menu->enabled & (1 << bit)) ? 1 : 0);
@@ -717,7 +717,7 @@ static dict_T *menu_get_recursive(const vimmenu_T *menu, int modes)
     list_T *children_list = tv_list_alloc();
     for (menu = menu->children; menu != NULL; menu = menu->next) {
         dict_T *dic = menu_get_recursive(menu, modes);
-        if (dict && tv_dict_len(dict) > 0) {
+        if (tv_dict_len(dict) > 0) {
           tv_list_append_dict(children_list, dic);
         }
     }