changeset 4568:03c053808a7c

[project @ 2003-10-30 00:21:45 by jwe]
author jwe
date Thu, 30 Oct 2003 00:22:41 +0000
parents fc30061d01da
children 01e4957409a4
files ChangeLog emacs/octave-inf.el test/octave.test/matrix/matrix.exp
diffstat 3 files changed, 13 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 29 20:11:16 2003 +0000
+++ b/ChangeLog	Thu Oct 30 00:22:41 2003 +0000
@@ -1,3 +1,13 @@
+2003-10-29  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* emacs/octave-inf.el (inferior-octave-prompt): Don't bother
+	matching "octave.bin".
+
+2003-10-29  Lute Kamstra  <lute@gnu.org>
+
+	* emacs/octave-inf.el (inferior-octave-prompt): Recognize
+	version number in prompt.
+
 2003-10-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* emacs/octave-mod.el (octave-mode-syntax-table): Allow % to be a
--- a/emacs/octave-inf.el	Wed Oct 29 20:11:16 2003 +0000
+++ b/emacs/octave-inf.el	Thu Oct 30 00:22:41 2003 +0000
@@ -39,7 +39,7 @@
   :group 'octave-inferior)
 
 (defcustom inferior-octave-prompt
-  "\\(^octave\\(\\|.bin\\)\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
+  "\\(^octave\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
   "*Regexp to match prompts for the inferior Octave process."
   :type 'regexp
   :group 'octave-inferior)
--- a/test/octave.test/matrix/matrix.exp	Wed Oct 29 20:11:16 2003 +0000
+++ b/test/octave.test/matrix/matrix.exp	Thu Oct 30 00:22:41 2003 +0000
@@ -103,11 +103,11 @@
 do_test reshape-2.m
 
 set test reshape-3
-set prog_output "^usage:.*"
+set prog_output "\n... reshape:.*"
 do_test reshape-3.m
 
 set test reshape-4
-set prog_output "^usage:.*"
+set prog_output "^error:.*"
 do_test reshape-4.m
 
 set test shift-1