# HG changeset patch
# User jwe
# Date 1159369554 0
# Node ID 52b520087c5048375a548766bb60705a26afbb64
# Parent  588dfb92e19e4802da62d3c5ff3c245d744c9ebc
[project @ 2006-09-27 15:05:53 by jwe]

diff -r 588dfb92e19e -r 52b520087c50 src/ChangeLog
--- a/src/ChangeLog	Wed Sep 27 14:54:05 2006 +0000
+++ b/src/ChangeLog	Wed Sep 27 15:05:54 2006 +0000
@@ -1,5 +1,7 @@
 2006-09-27  David Bateman  <dbateman@free.fr>
 
+	* file-io.cc (Fsprintf): If fmt is an sq_string, return an sq_string.
+
 	* DLD-FUNCTIONS/sparse.cc (spfind, sparse_find): Delete.
 	* DLD-FUNCTIONS/spfind.cc: New file implementating compatible
 	sparse find function.
diff -r 588dfb92e19e -r 52b520087c50 src/file-io.cc
--- a/src/file-io.cc	Wed Sep 27 14:54:05 2006 +0000
+++ b/src/file-io.cc	Wed Sep 27 15:05:54 2006 +0000
@@ -938,7 +938,9 @@
 
       if (os.is_valid ())
 	{
-	  if (args(0).is_string ())
+	  octave_value fmt_arg = args(0);
+
+	  if (fmt_arg.is_string ())
 	    {
 	      octave_value_list tmp_args;
 
@@ -950,9 +952,10 @@
 		    tmp_args(i-1) = args(i);
 		}
 
-	      retval(2) = os.printf (args(0), tmp_args, who);
+	      retval(2) = os.printf (fmt_arg, tmp_args, who);
 	      retval(1) = os.error ();
-	      retval(0) = ostr->str ();
+	      retval(0) = octave_value (ostr->str (),
+					fmt_arg.is_sq_string () ? '\'' : '"');
 	    }
 	  else
 	    ::error ("%s: format must be a string", who.c_str ());