From xemacs-m  Tue Sep 23 22:39:58 1997
Received: from ns.jsys.co.jp (ns.jsys.co.jp [202.33.240.82])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id WAA25535
	for <xemacs-beta@xemacs.org>; Tue, 23 Sep 1997 22:39:40 -0500 (CDT)
Received: from cosmos.jsys.co.jp (cosmos.jsys.co.jp [172.31.80.5])
	by ns.jsys.co.jp (8.8.7/8.8.7) with ESMTP id MAA27991
	for <xemacs-beta@xemacs.org>; Wed, 24 Sep 1997 12:39:30 +0900 (JST)
Received: from skywalk.jsys.co.jp (j-04110.jsys.co.jp [172.31.49.72])
	by cosmos.jsys.co.jp (8.8.7/8.8.7/NOTES) with ESMTP id MAA27393
	for <xemacs-beta@xemacs.org>; Wed, 24 Sep 1997 12:39:00 +0900 (JST)
Received: (from ienaga@localhost) by skywalk.jsys.co.jp (8.8.5/3.5Wpl2) id MAA14180; Wed, 24 Sep 1997 12:37:16 +0900 (JST)
To: xemacs-beta@xemacs.org
Subject: [patch] lwlib/xlwmenu.c for 20.3 b23 "Sarajevo"
Mime-Version: 1.0 (generated by tm-edit 7.108)
Content-Type: multipart/mixed;
 boundary="Multipart_Wed_Sep_24_12:37:15_1997-1"
Content-Transfer-Encoding: 7bit
From: Kazuyuki IENAGA <ienaga@jsys.co.jp>
Date: 24 Sep 1997 12:37:15 +0900
Message-ID: <rysyb4n1ixg.fsf@skywalk.jsys.co.jp>
Lines: 57
X-Mailer: Quassia Gnus v0.7/XEmacs 20.3(beta23) - "Sarajevo"
X-Face:  9{'tf33,11#K2A'RDL?p:oEk{~%v;iFL63&]_`FnV~q9]UoqU:"Z*;!l8*yw(91jLdj'8ca
 ~kD1b`lzQ>o[fU=>6g(Er\.fiQPm[~<w?Is+rkeQnV9B~6|>`*Nw1,kCrfo(IH??{i~'F


--Multipart_Wed_Sep_24_12:37:15_1997-1
Content-Type: text/plain; charset=US-ASCII

If defined USE_XFONTSET, compilation will be failed.

Here's a patch:

--Multipart_Wed_Sep_24_12:37:15_1997-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="xlwmenu.c.diff"
Content-Transfer-Encoding: 7bit

===================================================================
RCS file: lwlib/RCS/xlwmenu.c,v
retrieving revision 1.1
diff -u -r1.1 lwlib/xlwmenu.c
--- lwlib/xlwmenu.c	1997/09/24 03:06:47	1.1
+++ lwlib/xlwmenu.c	1997/09/24 03:14:12
@@ -431,20 +431,8 @@
   return width;
 #else
 # ifdef USE_XFONTSET
-  int i, s=0, w=0;
-  for (i=0; string[i]; ++i) {
-    if (string[i]=='%' && string[i+1]=='_') {
-      XmbTextExtents(mw->menu.font_set, &string[s], i-s, &ri, &rl);
-      w += rl.width;
-      s = i + 2;
-      ++i;
-    }
-  }
-  if (string[s]) {
-    XmbTextExtents(mw->menu.font_set, &string[s], i-s, &ri, &rl);
-    w += rl.width;
-  }
-  return w;
+  XmbTextExtents(mw->menu.font_set, newchars, j, &ri, &rl);
+  return rl.width;
 # else /* ! USE_XFONTSET */
   XTextExtents (mw->menu.font, newchars, j, &drop, &drop, &drop, &xcs);
   return xcs.width;
@@ -837,11 +825,9 @@
 		return 0;
 	XmbDrawString (
 		XtDisplay (mw), window, mw->menu.font_set, gc,
-		x, y + mw->menu.font_ascent, &string[start], i-s
-	);
+		x, y + mw->menu.font_ascent, &string[start], end - start);
 	XmbTextExtents (
-		mw->menu.font_set, &string[start], end - start, &ri, &rl
-	);
+		mw->menu.font_set, &string[start], end - start, &ri, &rl);
 	return rl.width;
 # else
 	XCharStruct xcs;

--Multipart_Wed_Sep_24_12:37:15_1997-1--

