# HG changeset patch
# User David Grundberg <individ@acc.umu.se>
# Date 1224787537 -7200
# Node ID 56254a2e18e329cc3352b1d198cc31a004916f38
# Parent  dc8f6015f3e1db8e7e2b2a6d02d93ce1ab8da7f8
Removed interactive check (did not work properly)

diff -r dc8f6015f3e1 -r 56254a2e18e3 ChangeLog
--- a/ChangeLog	Thu Oct 23 20:28:50 2008 +0200
+++ b/ChangeLog	Thu Oct 23 20:45:37 2008 +0200
@@ -1,6 +1,7 @@
-2008-10-xx  David Grundberg <individ@acc.umu.se>
+2008-10-23  David Grundberg  <individ@acc.umu.se>
 
-	* pytave.cc: Use octave_main() to initialize Octave.
+	* pytave.cc: Use octave_main() to initialize Octave. Introduces
+	readline history clashes with interactive Python interpreter.
 	* configure.ac: Better testing for Python dependencies.
 	* configure.ac: Renamed my_ to pytave_
 	* configure.ac: Fixed whitespace.
diff -r dc8f6015f3e1 -r 56254a2e18e3 pytave.cc
--- a/pytave.cc	Thu Oct 23 20:28:50 2008 +0200
+++ b/pytave.cc	Thu Oct 23 20:45:37 2008 +0200
@@ -53,16 +53,9 @@
       }
 
       // Initialize Octave.
-      if (Py_FdIsInteractive(stdin, NULL)) {
-         // Print Octave interactive message.
-         char* argv[] = {"octave", "--no-line-editing", "--no-history", NULL};
-         octave_main(3, argv, 1);
-      } else {
-         // One may use -q to surpress the startup greeting.
-         char* argv[] = {"octave", "-q", "--no-line-editing",
-                         "--no-history", NULL};
-         octave_main(4, argv, 1);
-      }
+      // Also print Octave startup message.
+      char* argv[] = {"octave", "--no-line-editing", "--no-history", NULL};
+      octave_main(3, argv, 1);
 
       // Initialize Python Numeric Array