Mercurial > emacs

diff src/msdos.c @ 46370:40db0673e6f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Most uses of XSTRING combined with STRING_BYTES or indirection changed to SCHARS, SBYTES, STRING_INTERVALS, SREF, SDATA; explicit size_byte references left unchanged for now.
author Ken Raeburn <raeburn@raeburn.org>
date Mon, 15 Jul 2002 00:00:41 +0000
parents 2406cf2da1d4
children 6c7dc88b9a5d
line wrap: on
line diff
--- a/src/msdos.c	Sun Jul 14 23:54:05 2002 +0000
+++ b/src/msdos.c	Mon Jul 15 00:00:41 2002 +0000
@@ -1454,9 +1454,9 @@
       end = glyph + row->used[TEXT_AREA];
       if (glyph < end
 	  && STRINGP (glyph->object)
-	  && XSTRING (glyph->object)->intervals
+	  && STRING_INTERVALS (glyph->object)
 	  && glyph->charpos >= 0
-	  && glyph->charpos < XSTRING (glyph->object)->size)
+	  && glyph->charpos < SCHARS (glyph->object))
 	{
 	  /* If we're on a string with `help-echo' text property,
 	     arrange for the help to be displayed.  This is done by
@@ -1738,7 +1738,7 @@
 	  else if (NILP (help)
 		   && ((STRINGP (glyph->object)
 			&& glyph->charpos >= 0
-			&& glyph->charpos < XSTRING (glyph->object)->size)
+			&& glyph->charpos < SCHARS (glyph->object))
 		       || (BUFFERP (glyph->object)
 			   && glyph->charpos >= BEGV
 			   && glyph->charpos < ZV)))
@@ -2454,7 +2454,7 @@
 	{
 	  x_set_title (f, val);
 	  if (termscript)
-	    fprintf (termscript, "<TITLE: %s>\n", XSTRING (val)->data);
+	    fprintf (termscript, "<TITLE: %s>\n", SDATA (val));
 	}
       else if (EQ (prop, Qcursor_type))
 	{
@@ -4405,7 +4405,7 @@
     return Qnil;
 
   tem = Fcopy_sequence (filename);
-  msdos_downcase_filename (XSTRING (tem)->data);
+  msdos_downcase_filename (SDATA (tem));
   return tem;
 }