Skip to content

Commit f063287

Browse files
committed
maint: Merge default to bytecode-interpreter
2 parents 2bad387 + 7d7d37c commit f063287

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

etc/NEWS.10.md

+4
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@ from Octave 10.
191191
functions. Specific examples of this can be found in the "Minimizers"
192192
section of the Octave manual.
193193

194+
- The unsupported and unnecessary `load` options of `-force` and `-import` have
195+
been removed. If legacy m-files are still invoking `load` with these options
196+
update the code and remove them.
197+
194198
### Build system
195199

196200
- Octave now requires a C++ compiler that is compliant with C++17 (preferably

libinterp/corefcn/load-save.cc

-11
Original file line numberDiff line numberDiff line change
@@ -1233,17 +1233,6 @@ load_save_system::load (const octave_value_list& args, int nargout)
12331233
{
12341234
format = MAT_BINARY;
12351235
}
1236-
// FIXME: Unsupported and silently ignored. Can we just delete this?
1237-
else if (argv[i] == "-force" || argv[i] == "-f")
1238-
{
1239-
// Silently ignore this
1240-
// warning ("load: -force ignored");
1241-
}
1242-
// FIXME: Unsupported and ignored. Can we just delete this?
1243-
else if (argv[i] == "-import" || argv[i] == "-i")
1244-
{
1245-
warning ("load: -import ignored");
1246-
}
12471236
else if (argv[i] == "-list" || argv[i] == "-l")
12481237
{
12491238
list_only = true;

scripts/plot/draw/hist.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@
164164
endif
165165
x = x.'; # Convert to matrix
166166
elseif (isvector (x))
167-
equal_bin_spacing = strcmp (typeinfo (x), "range");
167+
equal_bin_spacing = ! isempty (strfind (typeinfo (x), "range"));
168168
if (! equal_bin_spacing)
169169
diffs = diff (x);
170-
if (all (diffs == diffs(1)))
170+
if (! any (abs ((diffs - diffs(1))) > eps (max (abs (x)))))
171171
equal_bin_spacing = true;
172172
endif
173173
endif

0 commit comments

Comments
 (0)