changeset 6805:41d8841124b3

[project @ 2007-07-27 05:26:27 by jwe]
author jwe
date Fri, 27 Jul 2007 05:26:27 +0000
parents 4d3fa8841006
children afa9123c5faa
files scripts/ChangeLog scripts/plot/drawnow.m
diffstat 2 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Thu Jul 26 18:44:07 2007 +0000
+++ b/scripts/ChangeLog	Fri Jul 27 05:26:27 2007 +0000
@@ -1,3 +1,8 @@
+2007-07-27  John W. Eaton  <jwe@octave.org>
+
+	* plot/drawnow.m: Only set default value for term if GNUTERM is
+	not set in the environment.
+
 2007-07-25  David Bateman  <dbateman@free.fr>
 
 	* Makefile.in, audio/Makefile.in, control/Makefile.in,
--- a/scripts/plot/drawnow.m	Thu Jul 26 18:44:07 2007 +0000
+++ b/scripts/plot/drawnow.m	Fri Jul 27 05:26:27 2007 +0000
@@ -109,17 +109,19 @@
 
       ## Guess the terminal type.
       term = getenv ("GNUTERM");
-      if (isempty (term) && ! isempty (getenv ("DISPLAY")))
-        term = "x11";
-      elseif (! isunix ())
-        term = "windows";
-      else
-        term = "aqua";
-        ## This should really be checking for os x before setting
-        ## the terminal type to aqua, but nobody will notice because
-        ## every other unix will be using x11 and windows will be
-        ## using windows.  Those diehards still running octave from
-        ## a linux console know how to set the GNUTERM variable.
+      if (isempty (term))
+	if (! isempty (getenv ("DISPLAY")))
+          term = "x11";
+	elseif (! isunix ())
+          term = "windows";
+	else
+	  ## This should really be checking for os x before setting
+	  ## the terminal type to aqua, but nobody will notice because
+	  ## every other unix will be using x11 and windows will be
+	  ## using windows.  Those diehards still running octave from
+	  ## a linux console know how to set the GNUTERM variable.
+          term = "aqua";
+	endif
       endif
 
       ## If no 'h' (why not?) then open the terminal as Figure 0.