Mercurial > hg > octave-lyh

changeset 8163:7d6e659acc1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__gnuplot_version__.m: include patchlevel in output
author John W. Eaton <jwe@octave.org>
date Mon, 29 Sep 2008 18:47:24 -0400
parents 293c4b5fe33d
children 0d37c99fc06f
files scripts/ChangeLog scripts/plot/__gnuplot_version__.m
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-29  John W. Eaton  <jwe@octave.org>
+
+	* plot/__gnuplot_version__.m: Also include patchlevel.
+
 2008-09-29  Ben Abbott <bpabbott@mac.com>
 
 	* polynomial/deconv.m: Fix row/col orientation & length of output.
--- a/scripts/plot/__gnuplot_version__.m
+++ b/scripts/plot/__gnuplot_version__.m
@@ -38,7 +38,11 @@
     pattern = "^[^\\s]*\\s*([0-9]+\\.[0-9]+)\\s*[^\\s]*\\s*([^\\s]*)";
     [d1, d2, d3, d4, matches] = regexp (output, pattern);
     if (iscell (matches) && numel (matches) > 0 && iscellstr (matches{1}))
-      __version__ = matches{1}{1};
+      if (numel (matches{1}) == 2)
+	__version__ = sprintf ("%s.%s", matches{1}{:});
+      else
+	__version__ = matches{1}{1};
+      endif
     endif
   endif