Mercurial > octave

changeset 25457:49fa88321686

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Rik <rik@octave.org>
date Tue, 12 Jun 2018 08:15:22 -0700
parents b09f306fcd12 (current diff) 4c4a49bffdc5 (diff)
children a92ecef81da0
files libinterp/corefcn/file-io.cc
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc	Tue Jun 12 08:15:06 2018 -0700
+++ b/libinterp/corefcn/file-io.cc	Tue Jun 12 08:15:22 2018 -0700
@@ -721,10 +721,10 @@
 Set the file pointer to the location @var{offset} within the file @var{fid}.
 
 The pointer is positioned @var{offset} characters from the @var{origin}, which
-may be one of the predefined variables @w{@code{SEEK_SET}} (beginning),
-@w{@code{SEEK_CUR}} (current position), or @w{@code{SEEK_END}} (end of file) or
-strings @nospell{@qcode{"bof"}}, @nospell{@qcode{"cof"}}, or
-@nospell{@qcode{"eof"}}.  If @var{origin} is omitted, @w{@code{SEEK_SET}} is
+may be one of the predefined variables @w{@qcode{SEEK_SET}} (beginning),
+@w{@qcode{SEEK_CUR}} (current position), or @w{@qcode{SEEK_END}} (end of file)
+or strings @nospell{@qcode{"bof"}}, @nospell{@qcode{"cof"}}, or
+@nospell{@qcode{"eof"}}.  If @var{origin} is omitted, @w{@qcode{SEEK_SET}} is
 assumed.  @var{offset} may be positive, negative, or zero but not all
 combinations of @var{origin} and @var{offset} can be realized.
 
--- a/scripts/+containers/Map.m	Tue Jun 12 08:15:06 2018 -0700
+++ b/scripts/+containers/Map.m	Tue Jun 12 08:15:22 2018 -0700
@@ -374,7 +374,7 @@
               sref = feval (s(1).subs, this, s(2).subs{1});
               s = s(3:end);
             otherwise
-              error ("containters.Map: unknown property '%s'", s(1).subs);
+              error ("containers.Map: unknown property '%s'", s(1).subs);
           endswitch
         case "()"
           if (isempty (s(1).subs))