# HG changeset patch
# User jwe
# Date 1180938321 0
# Node ID b26a8e0e42cd979331d2b8a3405da1f24d378a59
# Parent  44ebfc8c4ff01ff6cb75348a7dfb68d88247d932
[project @ 2007-06-04 06:25:21 by jwe]

diff --git a/doc/interpreter/numbers.txi b/doc/interpreter/numbers.txi
--- a/doc/interpreter/numbers.txi
+++ b/doc/interpreter/numbers.txi
@@ -544,6 +544,6 @@
 
 @DOCSTRING(isdefinite)
 
-@DOCSTRING(isbool)
+@DOCSTRING(islogical)
 
 @DOCSTRING(isprime)
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,8 +1,17 @@
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+2007-06-03  Søren Hauberg  <soren@hauberg.org>
+
+	* plot/axes.m: Eliminate redundant else clause.
+
+=======
+=======
 2007-06-03  David Bateman  <dbateman@free.fr>
 
 	* polynomial/spline.m: Add a small tolerance to spline tests.
 	* pkg/pkg.m: Protect against multiple actions being define.
 	
+>>>>>>> 1.846
 2007-06-01  David Bateman  <dbateman@free.fr>
 
 	* pkg.m (pkg:is_superuser): Remove function used in one place and
@@ -10,6 +19,7 @@
 	(pkg:install): Check for existence of files to install before
 	globbing and warn the user if they don't exist.
 
+>>>>>>> 1.844
 2007-05-31  David Bateman  <dbateman@free.fr>
 
 	* miscellaneous/copyfile.m: Split copying of multiple files to a 
diff --git a/scripts/plot/axes.m b/scripts/plot/axes.m
--- a/scripts/plot/axes.m
+++ b/scripts/plot/axes.m
@@ -34,7 +34,7 @@
     cf = gcf ();
     tmp = __go_axes__ (cf, varargin{:});
     set (cf, "currentaxes", tmp);
-  elseif (nargin == 1)
+  else
     ## arg is axes handle, make it the current axes for the current
     ## figure.
     tmp = varargin{1};
@@ -45,8 +45,6 @@
     else
       error ("axes: expecting argument to be axes handle");
     endif
-  else
-    print_usage ();
   endif
 
   if (nargout > 0)
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-04  John W. Eaton  <jwe@octave.org>
+
+	* data.cc (Fislogical): Rename from Fisbool.
+	Make isbool an alias for islogical.
+
 2007-06-03  David Bateman  <dbateman@free.fr>
 
 	* Makefile.in (DISTFILES): Add mxarray.h.in
@@ -23,6 +28,7 @@
 	* ov-re-sparse.cc (octave_sparse_matrix::as_mxArray): ditto.
 	* ov-struct.cc (octave_struct::as_mxArray): ditto.
 
+>>>>>>> 1.1759
 2007-06-02  David Bateman  <dbateman@free.fr>
 
 	* graphics.cc (color_property class): g++ doesn't like anonymous
diff --git a/src/data.cc b/src/data.cc
--- a/src/data.cc
+++ b/src/data.cc
@@ -1238,10 +1238,10 @@
   DATA_REDUCTION (sumsq);
 }
 
-DEFUN (isbool, args, ,
+DEFUN (islogical, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Functio} {} isbool (@var{x})\n\
-Return true if @var{x} is a boolean object.\n\
+@deftypefn {Built-in Functio} {} islogical (@var{x})\n\
+Return true if @var{x} is a logical object.\n\
 @end deftypefn")
 {
   octave_value retval;
@@ -1254,7 +1254,7 @@
   return retval;
 }
 
-DEFALIAS (islogical, isbool);
+DEFALIAS (isbool, islogical);
 
 DEFUN (isinteger, args, ,
   "-*- texinfo -*-\n\