diff options
| author | Richard M. Stallman <rms@gnu.org> | 1998-01-09 23:21:17 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1998-01-09 23:21:17 +0000 |
| commit | 69713cd2d6c2d675edcaba8c06956cc1f368dc64 (patch) | |
| tree | af020981b8def0955e2dd8e6a9eb6bcd53ec2fc3 /src/xmenu.c | |
| parent | 2f4575696a300b3d7761e40dff778ed846e172bf (diff) | |
| download | emacs-69713cd2d6c2d675edcaba8c06956cc1f368dc64.tar.gz | |
(xmenu_show): Use size_byte of strings.
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 533526f5c4e..77a367a8ac9 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -2559,7 +2559,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) j++; continue; } - width = XSTRING (item)->size; + width = XSTRING (item)->size_byte; if (width > maxwidth) maxwidth = width; @@ -2582,7 +2582,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; + int gap = maxwidth - XSTRING (item_name)->size_byte; #ifdef C_ALLOCA Lisp_Object spacer; spacer = Fmake_string (make_number (gap), make_number (' ')); @@ -2594,14 +2594,14 @@ xmenu_show (f, x, y, for_click, keymaps, title, error) to reduce gc needs. */ item_data = (unsigned char *) alloca (maxwidth - + XSTRING (descrip)->size + 1); + + XSTRING (descrip)->size_byte + 1); bcopy (XSTRING (item_name)->data, item_data, - XSTRING (item_name)->size); + XSTRING (item_name)->size_byte); for (j = XSTRING (item_name)->size; j < maxwidth; j++) item_data[j] = ' '; bcopy (XSTRING (descrip)->data, item_data + j, - XSTRING (descrip)->size); - item_data[j + XSTRING (descrip)->size] = 0; + XSTRING (descrip)->size_byte); + item_data[j + XSTRING (descrip)->size_byte] = 0; #endif } else |