*** src/load-save.cc.orig2	2004-04-28 10:42:28.000000000 +0200
--- src/load-save.cc	2004-04-28 10:42:32.000000000 +0200
***************
*** 554,562 ****
  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\
--- 554,559 ----
***************
*** 581,588 ****
  \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\
  \n\
  @item -ascii\n\
  Force Octave to assume the file is in Octave's text format.\n\
--- 578,586 ----
  \n\
  @table @code\n\
  @item -force\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\
***************
*** 590,596 ****
  @item -binary\n\
  Force Octave to assume the file is in Octave's binary format.\n\
  \n\
! @item -mat-binary\n\
  Force Octave to assume the file is in @sc{Matlab}'s binary format.\n\
  \n\
  @item -mat4-binary\n\
--- 588,595 ----
  @item -binary\n\
  Force Octave to assume the file is in Octave's binary format.\n\
  \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\
***************
*** 608,616 ****
  
  "\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\
  \n\
  @end table\n\
  @end deffn")
--- 607,615 ----
  
  "\n\
  @item -import\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")
***************
*** 639,645 ****
      {
        if (argv[i] == "-force" || argv[i] == "-f")
  	{
! 	  force = true;
  	}
        else if (argv[i] == "-list" || argv[i] == "-l")
  	{
--- 638,645 ----
      {
        if (argv[i] == "-force" || argv[i] == "-f")
  	{
! 	  // Silently ignore this
! 	  // warning ("load: -force ignored");
  	}
        else if (argv[i] == "-list" || argv[i] == "-l")
  	{
***************
*** 657,663 ****
  	{
  	  format = LS_BINARY;
  	}
!       else if (argv[i] == "-mat-binary" || argv[i] == "-m")
  	{
  	  format = LS_MAT5_BINARY;
  	}
--- 657,663 ----
  	{
  	  format = LS_BINARY;
  	}
!       else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m")
  	{
  	  format = LS_MAT5_BINARY;
  	}
***************
*** 1206,1212 ****
  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\
  Save the data in @sc{Matlab}'s binary data format.\n\
  \n\
  @item -mat4-binary\n\
--- 1206,1213 ----
  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\n\
! @itemx -mat-binary\n\
  Save the data in @sc{Matlab}'s binary data format.\n\
  \n\
  @item -mat4-binary\n\
***************
*** 1306,1312 ****
  	  return retval;
  #endif /* ! HAVE_HDF5 */
  	}
!       else if (argv[i] == "-mat-binary" || argv[i] == "-m")
  	{
  	  format = LS_MAT5_BINARY;
  	}
--- 1307,1313 ----
  	  return retval;
  #endif /* ! HAVE_HDF5 */
  	}
!       else if (argv[i] == "-mat-binary" || argv[i] == "-mat" || argv[i] == "-m")
  	{
  	  format = LS_MAT5_BINARY;
  	}