From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 11 Mar 2002 18:42:35 +0000 (+0000)
Subject: (Fload): Don't assume that message_with_ntring uses the
X-Git-Tag: ttn-vms-21-2-B4~16229
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=714d8c393b62d807603e74e553e254ede8f18d39;p=emacs.git

(Fload): Don't assume that message_with_ntring uses the
string it is given like a C string.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ba5eaa43fe0..ec86d1539c1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-11  Gerd Moellmann  <gerd@gnu.org>
+
+	* lread.c (Fload): Don't assume that message_with_ntring uses the
+	string it is given like a C string.
+
 2002-03-10  Jan D.  <Jan.Djarv@mbox200.swipnet.se>
 
 	* xterm.h: Extern declare x_session_check_input () and
diff --git a/src/lread.c b/src/lread.c
index 9e2687e272b..81ae1f27a55 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -776,17 +776,22 @@ Return t if file exists.  */)
 	  stat ((char *)XSTRING (found)->data, &s1);
 	  XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 1] = 0;
 	  result = stat ((char *)XSTRING (found)->data, &s2);
+	  XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 1] = 'c';
+	  
 	  if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime)
 	    {
 	      /* Make the progress messages mention that source is newer.  */
 	      newer = 1;
 
 	      /* If we won't print another message, mention this anyway.  */
-	      if (! NILP (nomessage))
-		message_with_string ("Source file `%s' newer than byte-compiled file",
-				     found, 1);
+	      if (!NILP (nomessage))
+		{
+		  Lisp_Object file;
+		  file = Fsubstring (found, make_number (0), make_number (-1));
+		  message_with_string ("Source file `%s' newer than byte-compiled file",
+				       file, SMBP (file));
+		}
 	    }
-	  XSTRING (found)->data[STRING_BYTES (XSTRING (found)) - 1] = 'c';
 	}
     }
   else