From: Po Lu <luangruo@yahoo.com>
Date: Sat, 22 Jan 2022 09:51:30 +0000 (+0000)
Subject: Prevent raw bytes from being displayed as help text on Haiku
X-Git-Tag: emacs-29.0.90~2873
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebe334cdc234de2897263aed4c05ac7088c11857;p=emacs.git

Prevent raw bytes from being displayed as help text on Haiku

* src/haikumenu.c (digest_menu_items): Don't set encoded text
into the menu item vector.
---

diff --git a/src/haikumenu.c b/src/haikumenu.c
index 2ceb0ff3653..2922981cb3b 100644
--- a/src/haikumenu.c
+++ b/src/haikumenu.c
@@ -142,10 +142,7 @@ digest_menu_items (void *first_menu, int start, int menu_items_used,
 	    }
 
 	  if (STRINGP (help) && STRING_MULTIBYTE (help))
-	    {
-	      help = ENCODE_UTF_8 (help);
-	      ASET (menu_items, i + MENU_ITEMS_ITEM_HELP, help);
-	    }
+	    help = ENCODE_UTF_8 (help);
 
 	  if (i + MENU_ITEMS_ITEM_LENGTH < menu_items_used &&
 	      NILP (AREF (menu_items, i + MENU_ITEMS_ITEM_LENGTH)))