Mercurial > emacs
diff src/xmenu.c @ 21244:50929073a0ba
Use STRING_BYTES and SET_STRING_BYTES.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 21 Mar 1998 07:06:14 +0000 |
| parents | 10e1764f84b8 |
| children | 74fc1642fe30 |
line wrap: on
line diff
--- a/src/xmenu.c Sat Mar 21 06:16:35 1998 +0000 +++ b/src/xmenu.c Sat Mar 21 07:06:14 1998 +0000 @@ -2436,7 +2436,7 @@ j++; continue; } - width = XSTRING (item)->size_byte; + width = STRING_BYTES (XSTRING (item)); if (width > maxwidth) maxwidth = width; @@ -2459,7 +2459,7 @@ = 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 @@ 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