Mercurial > hg > octave-lyh

changeset 12362:3de1dae1e403 release-3-4-x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
__gnuplot_has_feature__.m: Don't throw an error if gnuplot isn't installed.
author Ben Abbott <bpabbott@mac.com>
date Tue, 01 Feb 2011 18:58:35 -0500
parents a950bfb7b8e8
children eb7c0ba7ca87
files scripts/ChangeLog scripts/plot/__gnuplot_has_feature__.m
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Ben Abbott  <bpabbott@mac.com>
+
+	* plot/__gnuplot_has_feature__.m: Don't throw an error if gnuplot
+	isn't installed.
+
 2011-02-01  John W. Eaton  <jwe@octave.org>
 
 	* plot/scatter3.m: Pass h to set, not ax.
--- a/scripts/plot/__gnuplot_has_feature__.m
+++ b/scripts/plot/__gnuplot_has_feature__.m
@@ -37,7 +37,12 @@
               "key_has_font_properties"};
 
   if (isempty (has_features))
-    gnuplot_version = __gnuplot_version__ ();
+    try
+      gnuplot_version = __gnuplot_version__ ();
+    catch
+      ## Don't throw an error if gnuplot isn't installed
+      gnuplot_version = "0.0.0";
+    end_try_catch
     versions = {"4.2.5", "4.4", "4.4", "4.4", "4.2", "4.2", "4.4", "4.4", "4.4"};
     operators = {">=", ">=", ">=", ">=", ">=", ">=", ">=", ">=", ">="};
     have_features = logical (zeros (size (features)));