# HG changeset patch
# User jwe
# Date 1155621976 0
# Node ID a703198cb8b8e285e98bfd12d18364a398e990f0
# Parent  e6c29de3be3886c541780846b3ce7f30ebead04c
[project @ 2006-08-15 06:06:15 by jwe]

diff -r e6c29de3be38 -r a703198cb8b8 scripts/ChangeLog
--- a/scripts/ChangeLog	Mon Aug 14 20:07:37 2006 +0000
+++ b/scripts/ChangeLog	Tue Aug 15 06:06:16 2006 +0000
@@ -1,3 +1,7 @@
+2006-08-15  John W. Eaton  <jwe@octave.org>
+
+	* deprecated/is_global.m: Delete.
+
 2006-08-14  John W. Eaton  <jwe@octave.org>
 
 	* pkg/Makefile.in (script_sub_dir): Change from plot to pkg.
diff -r e6c29de3be38 -r a703198cb8b8 scripts/deprecated/is_global.m
--- a/scripts/deprecated/is_global.m	Mon Aug 14 20:07:37 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-## Copyright (C) 2002 John W. Eaton
-##
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2, or (at your option)
-## any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-## 02110-1301, USA.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {} is_global (@var{a})
-## This function has been deprecated.  Use isglobal instead.
-## @end deftypefn
-
-## Author: jwe
-
-function retval = is_global (varargin)
-
-  retval = isglobal (varargin{:});
-
-endfunction
diff -r e6c29de3be38 -r a703198cb8b8 src/ChangeLog
--- a/src/ChangeLog	Mon Aug 14 20:07:37 2006 +0000
+++ b/src/ChangeLog	Tue Aug 15 06:06:16 2006 +0000
@@ -1,3 +1,9 @@
+2006-08-15  John W. Eaton  <jwe@octave.org>
+
+	* variables.cc (do_isglobal): New function.
+	(Fisglobal): Use it.
+	(Fis_global): New function.
+
 2006-08-14  John W. Eaton  <jwe@octave.org>
 
 	* variables.cc (symbol_record_name_compare): Fix casts.
diff -r e6c29de3be38 -r a703198cb8b8 src/ls-mat5.cc
--- a/src/ls-mat5.cc	Mon Aug 14 20:07:37 2006 +0000
+++ b/src/ls-mat5.cc	Tue Aug 15 06:06:16 2006 +0000
@@ -477,7 +477,7 @@
 
   if (type != miMATRIX)
     {
-      error ("load: invalid element type");
+      error ("load: invalid element type = %d", type);
       goto early_read_error;
     }
 
diff -r e6c29de3be38 -r a703198cb8b8 src/variables.cc
--- a/src/variables.cc	Mon Aug 14 20:07:37 2006 +0000
+++ b/src/variables.cc	Tue Aug 15 06:06:16 2006 +0000
@@ -706,20 +706,8 @@
   return retval;
 }
 
-DEFUN (isglobal, args, ,
-  "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isglobal (@var{name})\n\
-Return 1 if @var{name} is globally visible.  Otherwise, return 0.  For\n\
-example,\n\
-\n\
-@example\n\
-@group\n\
-global x\n\
-isglobal (\"x\")\n\
-     @result{} 1\n\
-@end group\n\
-@end example\n\
-@end deftypefn")
+static octave_value
+do_isglobal (const octave_value_list& args)
 {
   octave_value retval = false;
 
@@ -746,6 +734,33 @@
   return retval;
 }
 
+DEFUN (isglobal, args, ,
+  "-*- texinfo -*-\n\
+@deftypefn {Built-in Function} {} isglobal (@var{name})\n\
+Return 1 if @var{name} is globally visible.  Otherwise, return 0.  For\n\
+example,\n\
+\n\
+@example\n\
+@group\n\
+global x\n\
+isglobal (\"x\")\n\
+     @result{} 1\n\
+@end group\n\
+@end example\n\
+@end deftypefn")
+{
+  return do_isglobal (args);
+}
+
+DEFUN (is_global, args, ,
+  "-*- texinfo -*-\n\
+@deftypefn {Built-in Function} {} isglobal (@var{name})\n\
+This function has been deprecated.  Use isglobal instead.\n\
+@end deftypefn")
+{
+  return do_isglobal (args);
+}
+
 int
 symbol_exist (const std::string& name, const std::string& type)
 {