changeset 6344:860682863572

[project @ 2007-02-22 20:24:11 by jwe]
author jwe
date Thu, 22 Feb 2007 20:24:11 +0000
parents f638513775a8
children 9e058e5fa8a7
files scripts/ChangeLog scripts/miscellaneous/doc.m scripts/plot/__uiobject_draw_axes__.m
diffstat 3 files changed, 20 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Feb 22 18:57:38 2007 +0000
+++ b/scripts/ChangeLog	Thu Feb 22 20:24:11 2007 +0000
@@ -1,3 +1,13 @@
+2007-02-22  Daniel J Sebald  <daniel.sebald@ieee.org>
+
+	* plot/__uiobject_draw_axes__.m: Insert newline between plot
+	command and data.
+
+2007-02-22  John W. Eaton  <jwe@octave.org>
+
+	* miscellaneous/doc.m: If index search fails, try again without
+	the index search option.
+
 2007-02-22  David Bateman  <dbateman@free.fr>
 
 	* miscellaneous/doc.m: Find doc.info file correctly in user directories.
--- a/scripts/miscellaneous/doc.m	Thu Feb 22 18:57:38 2007 +0000
+++ b/scripts/miscellaneous/doc.m	Thu Feb 22 20:24:11 2007 +0000
@@ -80,14 +80,17 @@
     cmd = sprintf ("\"%s\" --file \"%s\" --directory \"%s\"",
 		   info_program (), info_file_name, info_dir);
 
-    if (! isempty (fname))
-      cmd = sprintf ("%s --index-search %s", cmd, fname);
+    have_fname = ! isempty (fname);
+
+    if (have_fname)
+      status = system (sprintf ("%s --index-search %s", cmd, fname));
     endif
 
-    status = system (cmd);
-
-    if (status == 127)
-      warning ("unable to find info program `%s'", info_program ());
+    if (! (have_fname && status == 0))
+      status = system (cmd);
+      if (status == 127)
+	warning ("unable to find info program `%s'", info_program ());
+      endif
     endif
 
     if (nargout > 0)
--- a/scripts/plot/__uiobject_draw_axes__.m	Thu Feb 22 18:57:38 2007 +0000
+++ b/scripts/plot/__uiobject_draw_axes__.m	Thu Feb 22 20:24:11 2007 +0000
@@ -652,6 +652,7 @@
 	fprintf (plot_stream, ", \"%s\" %s %s %s",
 		 filespec{i}, usingclause{i}, titlespec{i}, withclause{i});
       endfor
+      fputs (plot_stream, ";\n");
       for i = 1:data_idx
 	if (strcmp (filespec{i}, "-"))
 	  if (nd == 2)