# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1426688426 14400
# Node ID e78c0514523d3af17634d36f13a0551da4359bc4
# Parent  55c2d33e6773e22416278e8a98e0ccfba987eedf
restore strmatch function; backout changeset f9959972949a

diff -r 55c2d33e6773 -r e78c0514523d doc/interpreter/container.txi
--- a/doc/interpreter/container.txi	Wed Mar 18 10:19:50 2015 -0400
+++ b/doc/interpreter/container.txi	Wed Mar 18 10:20:26 2015 -0400
@@ -891,8 +891,8 @@
 Strings}), @code{strcmp}, @code{strncmp}, @code{strcmpi},
 @code{strncmpi} (@pxref{Comparing Strings}), @code{str2double},
 @code{deblank}, @code{strtrim}, @code{strtrunc}, @code{strfind},
-@code{regexp}, @code{regexpi} (@pxref{Manipulating Strings}) and
-@code{str2double} (@pxref{String Conversions}).
+@code{strmatch}, , @code{regexp}, @code{regexpi} (@pxref{Manipulating 
+Strings}) and @code{str2double} (@pxref{String Conversions}).
 
 The function @code{iscellstr} can be used to test if an object is a
 cell array of strings.
diff -r 55c2d33e6773 -r e78c0514523d libinterp/corefcn/strfind.cc
--- a/libinterp/corefcn/strfind.cc	Wed Mar 18 10:19:50 2015 -0400
+++ b/libinterp/corefcn/strfind.cc	Wed Mar 18 10:20:26 2015 -0400
@@ -188,7 +188,7 @@
         @}\n\
 @end group\n\
 @end example\n\
-@seealso{findstr, regexp, regexpi, find}\n\
+@seealso{findstr, strmatch, regexp, regexpi, find}\n\
 @end deftypefn")
 {
   octave_value retval;
diff -r 55c2d33e6773 -r e78c0514523d scripts/strings/findstr.m
--- a/scripts/strings/findstr.m	Wed Mar 18 10:19:50 2015 -0400
+++ b/scripts/strings/findstr.m	Wed Mar 18 10:20:26 2015 -0400
@@ -35,7 +35,7 @@
 ##
 ## @strong{Caution:} @code{findstr} is scheduled for deprecation.  Use
 ## @code{strfind} in all new code.
-## @seealso{strfind, strcmp, strncmp, strcmpi, strncmpi, find}
+## @seealso{strfind, strmatch, strcmp, strncmp, strcmpi, strncmpi, find}
 ## @end deftypefn
 
 ## Note that this implementation swaps the strings if second one is longer