# HG changeset patch
# User jwe
# Date 1083298357 0
# Node ID a9f67193e3a0d2b6123da674b58999a34c4ec39b
# Parent  d7bad86d3416ead380897f107a2692aaf3a0bb2e
[project @ 2004-04-30 04:12:37 by jwe]

diff -r d7bad86d3416 -r a9f67193e3a0 src/ChangeLog
--- a/src/ChangeLog	Tue Apr 27 15:47:10 2004 +0000
+++ b/src/ChangeLog	Fri Apr 30 04:12:37 2004 +0000
@@ -1,3 +1,7 @@
+2004-04-29  David Bateman  <dbateman@free.fr>
+
+	* load-save.cc (Fload, Fsave): Accept -mat as well as -mat-binary.
+
 2004-04-27  David Bateman  <dbateman@free.fr>
 
 	* DLD-FUNCTIONS/sort.cc: Add missing "class" keywords to template
diff -r d7bad86d3416 -r a9f67193e3a0 src/load-save.cc
--- a/src/load-save.cc	Tue Apr 27 15:47:10 2004 +0000
+++ b/src/load-save.cc	Fri Apr 30 04:12:37 2004 +0000
@@ -557,9 +557,6 @@
 load data\n\
 @end example\n\
 \n\
-Octave will refuse to overwrite existing variables unless you use the\n\
-option @samp{-force}.\n\
-\n\
 If a variable that is not marked as global is loaded from a file when a\n\
 global symbol with the same name already exists, it is loaded in the\n\
 global symbol table.  Also, if a variable is marked as global in a file\n\
@@ -584,8 +581,9 @@
 \n\
 @table @code\n\
 @item -force\n\
-Force variables currently in memory to be overwritten by variables with\n\
-the same name found in the file.\n\
+The @samp{-force} option is accepted but ignored for backward\n\
+compatiability. Octave now overwrites variables currently in memeory with\n\
+the same name as those found in the file.\n\
 \n\
 @item -ascii\n\
 Force Octave to assume the file is in Octave's text format.\n\
@@ -593,7 +591,8 @@
 @item -binary\n\
 Force Octave to assume the file is in Octave's binary format.\n\
 \n\
-@item -mat-binary\n\
+@item -mat\n\
+@itemx -mat-binary\n\
 Force Octave to assume the file is in @sc{Matlab}'s binary format.\n\
 \n\
 @item -mat4-binary\n\
@@ -611,9 +610,9 @@
 
 "\n\
 @item -import\n\
-The @samp{-import} is acceptted but ignored for backward compatiability.\n\
-Octave can now support multi-dimensional HDF data and automatically modifies\n\
-variable names if they are invalid Octave identifiers.\n\
+The @samp{-import} is accepted but ignored for backward compatiability.\n\
+Octave can now support multi-dimensional HDF data and automatically\n\
+modifies variable names if they are invalid Octave identifiers.\n\
 \n\
 @end table\n\
 @end deffn")
@@ -642,7 +641,8 @@
     {
       if (argv[i] == "-force" || argv[i] == "-f")
 	{
-	  force = true;
+	  // Silently ignore this
+	  // warning ("load: -force ignored");
 	}
       else if (argv[i] == "-list" || argv[i] == "-l")
 	{
@@ -660,7 +660,7 @@
 	{
 	  format = LS_BINARY;
 	}
-      else if (argv[i] == "-mat-binary" || argv[i] == "-m")
+      else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m")
 	{
 	  format = LS_MAT5_BINARY;
 	}
@@ -1213,7 +1213,8 @@
 precision.  You should use this format only if you know that all the\n\
 values to be saved can be represented in single precision.\n\
 \n\
-@item -mat-binary\n\
+@item -mat\n\
+@itemx -mat-binary\n\
 Save the data in @sc{Matlab}'s binary data format.\n\
 \n\
 @item -mat4-binary\n\
@@ -1313,7 +1314,7 @@
 	  return retval;
 #endif /* ! HAVE_HDF5 */
 	}
-      else if (argv[i] == "-mat-binary" || argv[i] == "-m")
+      else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m")
 	{
 	  format = LS_MAT5_BINARY;
 	}