Mercurial > octave-nkf

changeset 6230:06bee64edc08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-01-08 16:59:35 by jwe]
author jwe
date Mon, 08 Jan 2007 16:59:35 +0000
parents 6e455cc83069
children 82021cf7e53a
files src/ChangeLog src/data.cc src/version.h
diffstat 3 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jan 05 22:54:10 2007 +0000
+++ b/src/ChangeLog	Mon Jan 08 16:59:35 2007 +0000
@@ -1,3 +1,10 @@
+2007-01-06  John W. Eaton  <jwe@octave.org>
+
+	* version.h (OCTAVE_CONFIG_STATEMENT): New macro
+	(OCTAVE_NAME_AND_VERSION): Remove config info.
+	(OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY):
+	Use OCTAVE_CONFIG_STATEMENT here.
+
 2007-01-05  David Bateman  <dbateman@free.fr>
 
 	* Makefile.in (DLD_XSRC): Add fftw.cc and remove fftw_wisdom.cc
--- a/src/data.cc	Fri Jan 05 22:54:10 2007 +0000
+++ b/src/data.cc	Mon Jan 08 16:59:35 2007 +0000
@@ -1241,7 +1241,7 @@
 
 DEFUN (isinteger, args, ,
   "-*- texinfo -*-\n\
-@deftypefn {Built-in Function} {} isreal (@var{x})\n\
+@deftypefn {Built-in Function} {} isinteger (@var{x})\n\
 Return true if @var{x} is an integer object (int8, uint8, int16, etc.).\n\
 Note that @code{isinteger (14)} is false because numeric constants in\n\
 are double precision floating point values.\n\
--- a/src/version.h	Fri Jan 05 22:54:10 2007 +0000
+++ b/src/version.h	Mon Jan 08 16:59:35 2007 +0000
@@ -31,11 +31,16 @@
 
 #define OCTAVE_RELEASE_DATE "2006-10-02"
 
-#define OCTAVE_COPYRIGHT \
-  "Copyright (C) 2006 John W. Eaton."
+#define OCTAVE_COPYRIGHT "Copyright (C) 2006 John W. Eaton."
 
-#define OCTAVE_NAME_AND_VERSION \
-  "GNU Octave, version " OCTAVE_VERSION " (" OCTAVE_CANONICAL_HOST_TYPE ")"
+// This is the first line printed by --version.  The GNU coding
+// standards say that the version number should follow the last space
+// on the line.
+
+#define OCTAVE_NAME_AND_VERSION "GNU Octave, version " OCTAVE_VERSION
+
+#define OCTAVE_CONFIG_STATEMENT \
+  "Octave was configured for \"" OCTAVE_CANONICAL_HOST_TYPE "\"."
 
 #define OCTAVE_COPYING_STATEMENT \
   "This is free software; see the source code for copying conditions."
@@ -56,13 +61,14 @@
 http://www.octave.org/bugs.html to learn how to write a helpful report)."
 
 #define OCTAVE_NAME_VERSION_AND_COPYRIGHT \
-  OCTAVE_NAME_AND_VERSION ".\n" \
+  OCTAVE_NAME_AND_VERSION "\n" \
   OCTAVE_COPYRIGHT
 
 #define OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \
   OCTAVE_NAME_VERSION_AND_COPYRIGHT "\n" \
   OCTAVE_COPYING_STATEMENT "\n" \
-  OCTAVE_WARRANTY_STATEMENT
+  OCTAVE_WARRANTY_STATEMENT "\n\n" \
+  OCTAVE_CONFIG_STATEMENT
 
 #define X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS(ARG) \
   OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \