summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/octave-inf.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6bf3e1a15fa..9ed3c322922 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-23 Richard Stallman <rms@gnu.org>
+
+ * progmodes/octave-inf.el (inferior-octave-prompt): Accept .exe.
+
2007-07-23 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el: (sh-font-lock-backslash-quote)
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 63f9af50c1e..b46510b5ac9 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -42,7 +42,7 @@
:group 'octave-inferior)
(defcustom inferior-octave-prompt
- "\\(^octave\\(\\|.bin\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
+ "\\(^octave\\(\\|.bin\\|.exe\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
"Regexp to match prompts for the inferior Octave process."
:type 'regexp
:group 'octave-inferior)