diff src/gui-x.c @ 14:9ee227acff29 r19-15b90

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents ac2d302a0011
children 0293115a14e9
line wrap: on
line diff
--- a/src/gui-x.c	Mon Aug 13 08:48:18 2007 +0200
+++ b/src/gui-x.c	Mon Aug 13 08:48:42 2007 +0200
@@ -433,7 +433,7 @@
 #endif
 
   CHECK_STRING (name);
-  wv->name = (char *) string_data (XSTRING (name));
+  wv->name = (char *) XSTRING_DATA (name);
 
   if (!NILP (suffix))
     {
@@ -459,8 +459,8 @@
     {
       CHECK_STRING (keys);
       keys = Fsubstitute_command_keys (keys);
-      if (string_length (XSTRING (keys)) > 0)
-	wv->key = xstrdup ((char *) string_data (XSTRING (keys)));
+      if (XSTRING_LENGTH (keys) > 0)
+	wv->key = xstrdup ((char *) XSTRING_DATA (keys));
       else
 	wv->key = 0;
     }