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

Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents 376386a54a3c
children 0293115a14e9
line wrap: on
line diff
--- a/src/glyphs.c	Mon Aug 13 08:48:18 2007 +0200
+++ b/src/glyphs.c	Mon Aug 13 08:48:42 2007 +0200
@@ -596,7 +596,7 @@
 	{
 	  char *s;
 	  Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
-	  s = strrchr ((char *) string_data (XSTRING (filename)), '/');
+	  s = strrchr ((char *) XSTRING_DATA (filename), '/');
 	  if (s)
 	    print_internal (build_string (s + 1), printcharfun, 1);
 	  else
@@ -2430,8 +2430,8 @@
 	struct face_cachel *cachel;
 
 	find_charsets_in_bufbyte_string (charsets,
-					 string_data (XSTRING (string)),
-					 string_length (XSTRING (string)));
+					 XSTRING_DATA   (string),
+					 XSTRING_LENGTH (string));
 
 	if (!NILP (frame_face))
 	  {