diff options
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index ef51f83ee3c..1e6b0b13f1f 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2436,7 +2436,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) j++; continue; } - width = XSTRING (item)->size_byte; + width = STRING_BYTES (XSTRING (item)); if (width > maxwidth) maxwidth = width; @@ -2459,7 +2459,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; if (!NILP (descrip)) { - int gap = maxwidth - XSTRING (item_name)->size_byte; + int gap = maxwidth - STRING_BYTES (XSTRING (item_name)); #ifdef C_ALLOCA Lisp_Object spacer; spacer = Fmake_string (make_number (gap), make_number (' ')); @@ -2471,14 +2471,14 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) to reduce gc needs. */ item_data = (unsigned char *) alloca (maxwidth - + XSTRING (descrip)->size_byte + 1); + + STRING_BYTES (XSTRING (descrip)) + 1); bcopy (XSTRING (item_name)->data, item_data, - XSTRING (item_name)->size_byte); + STRING_BYTES (XSTRING (item_name))); for (j = XSTRING (item_name)->size; j < maxwidth; j++) item_data[j] = ' '; bcopy (XSTRING (descrip)->data, item_data + j, - XSTRING (descrip)->size_byte); - item_data[j + XSTRING (descrip)->size_byte] = 0; + STRING_BYTES (XSTRING (descrip))); + item_data[j + STRING_BYTES (XSTRING (descrip))] = 0; #endif } else |