Mercurial > emacs

changeset 20630:a24936ad1a35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(xmenu_show): Use size_byte of strings.
author Richard M. Stallman <rms@gnu.org>
date Fri, 09 Jan 1998 23:21:17 +0000
parents 69d52f3bdb46
children bcfd8b8cd42a
files src/xmenu.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/xmenu.c	Fri Jan 09 23:20:32 1998 +0000
+++ b/src/xmenu.c	Fri Jan 09 23:21:17 1998 +0000
@@ -2559,7 +2559,7 @@
 		  j++;
 		  continue;
 		}
-	      width = XSTRING (item)->size;
+	      width = XSTRING (item)->size_byte;
 	      if (width > maxwidth)
 		maxwidth = width;
 
@@ -2582,7 +2582,7 @@
 	    = 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 @@
 		 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