# HG changeset patch
# User Rik <rik@octave.org>
# Date 1409594249 25200
# Node ID be8a12acb20acf547ac98b7101ebdbcf594a3b94
# Parent  4fd271cd9b378a1c4602e8a70dceb6825f7243a1
Deprecate nargchk in favor of narginchk.

* NEWS: Announce deprecation.

* func.txi: Remove reference to nargchk in manual.

* narginchk.m, nargoutchk.m: Remove seealso references to nargchk.

* __splinefit__.m: Replace nargchk with narginchk.

* scripts/deprecated/nargchk.m: Moved from scripts/general.

* scripts/deprecated/module.mk: Add nargchk to deprecated build system.

* scripts/general/module.mk: Remove nargchk from regular build system.

diff -r 4fd271cd9b37 -r be8a12acb20a NEWS
--- a/NEWS	Mon Sep 01 08:00:05 2014 -0700
+++ b/NEWS	Mon Sep 01 10:57:29 2014 -0700
@@ -80,6 +80,7 @@
 
       bicubic              syl
       find_dir_in_path
+      nargchk
       nfields
 
     The following functions were deprecated in Octave 3.8 and have been
diff -r 4fd271cd9b37 -r be8a12acb20a doc/interpreter/func.txi
--- a/doc/interpreter/func.txi	Mon Sep 01 08:00:05 2014 -0700
+++ b/doc/interpreter/func.txi	Mon Sep 01 10:57:29 2014 -0700
@@ -395,10 +395,8 @@
 
 @DOCSTRING(validateattributes)
 
-For compatibility with @sc{matlab}, @code{nargchk}, @code{narginchk} and
-@code{nargoutchk} are available which provide similar error checking.
-
-@DOCSTRING(nargchk)
+For compatibility with @sc{matlab}, @code{narginchk} and @code{nargoutchk} are
+available which provide similar error checking.
 
 @DOCSTRING(narginchk)
 
diff -r 4fd271cd9b37 -r be8a12acb20a scripts/deprecated/module.mk
--- a/scripts/deprecated/module.mk	Mon Sep 01 08:00:05 2014 -0700
+++ b/scripts/deprecated/module.mk	Mon Sep 01 10:57:29 2014 -0700
@@ -4,6 +4,7 @@
   deprecated/bicubic.m \
   deprecated/find_dir_in_path.m \
   deprecated/isstr.m \
+  deprecated/nargchk.m \
   deprecated/nfields.m \
   deprecated/strmatch.m \
   deprecated/syl.m
diff -r 4fd271cd9b37 -r be8a12acb20a scripts/general/module.mk
--- a/scripts/general/module.mk	Mon Sep 01 08:00:05 2014 -0700
+++ b/scripts/general/module.mk	Mon Sep 01 10:57:29 2014 -0700
@@ -46,7 +46,6 @@
   general/loadobj.m \
   general/logspace.m \
   general/methods.m \
-  general/nargchk.m \
   general/narginchk.m \
   general/nargoutchk.m \
   general/nthargout.m \
diff -r 4fd271cd9b37 -r be8a12acb20a scripts/general/narginchk.m
--- a/scripts/general/narginchk.m	Mon Sep 01 08:00:05 2014 -0700
+++ b/scripts/general/narginchk.m	Mon Sep 01 10:57:29 2014 -0700
@@ -28,7 +28,7 @@
 ##
 ## Note that this function evaluates @code{nargin} on the caller.
 ##
-## @seealso{nargchk, nargoutchk, error, nargout, nargin}
+## @seealso{nargoutchk, error, nargout, nargin}
 ## @end deftypefn
 
 ## Author: Carnë Draug <carandraug+dev@gmail.com>
diff -r 4fd271cd9b37 -r be8a12acb20a scripts/general/nargoutchk.m
--- a/scripts/general/nargoutchk.m	Mon Sep 01 08:00:05 2014 -0700
+++ b/scripts/general/nargoutchk.m	Mon Sep 01 10:57:29 2014 -0700
@@ -38,7 +38,7 @@
 ##
 ## This is useful for checking to see that the number of output
 ## arguments supplied to a function is within an acceptable range.
-## @seealso{nargchk, narginchk, error, nargout, nargin}
+## @seealso{narginchk, error, nargout, nargin}
 ## @end deftypefn
 
 ## Author: Bill Denney <bill@denney.ws>
@@ -76,7 +76,7 @@
     if (strcmpi (outtype, "string"))
       msg = msg.message;
     elseif (isempty (msg.message))
-      ## Compatability: Matlab returns a 0x1 empty struct when nargchk passes
+      ## Compatibility: Matlab returns a 0x1 empty struct when nargoutchk passes
       msg = resize (msg, 0, 1);
     endif
 
diff -r 4fd271cd9b37 -r be8a12acb20a scripts/polynomial/private/__splinefit__.m
--- a/scripts/polynomial/private/__splinefit__.m	Mon Sep 01 08:00:05 2014 -0700
+++ b/scripts/polynomial/private/__splinefit__.m	Mon Sep 01 10:57:29 2014 -0700
@@ -111,7 +111,7 @@
 %   2011-07-01  Robust fitting parameter added.
 
 % Check number of arguments
-error(nargchk(3,7,nargin));
+narginchk(3,7);
 
 % Check arguments
 [x,y,dim,breaks,n,periodic,beta,constr] = arguments(varargin{:});