aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2007-07-23 17:55:00 +0000
committerRichard M. Stallman2007-07-23 17:55:00 +0000
commit6145f7fdfe318bc3f13aa03c083bfcd489bd9d83 (patch)
tree8bfdc28e1f66a65dfc7aa79c7c89c091af9319d7
parentbdef712c490ff78e563550641fbeeba48c7dea9f (diff)
downloademacs-6145f7fdfe318bc3f13aa03c083bfcd489bd9d83.tar.gz
emacs-6145f7fdfe318bc3f13aa03c083bfcd489bd9d83.zip
(inferior-octave-prompt): Accept .exe.
-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 @@
12007-07-23 Richard Stallman <rms@gnu.org>
2
3 * progmodes/octave-inf.el (inferior-octave-prompt): Accept .exe.
4
12007-07-23 Stefan Monnier <monnier@iro.umontreal.ca> 52007-07-23 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * progmodes/sh-script.el: (sh-font-lock-backslash-quote) 7 * 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 @@
42 :group 'octave-inferior) 42 :group 'octave-inferior)
43 43
44(defcustom inferior-octave-prompt 44(defcustom inferior-octave-prompt
45 "\\(^octave\\(\\|.bin\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ " 45 "\\(^octave\\(\\|.bin\\|.exe\\)\\(-[.0-9]+\\)?\\(:[0-9]+\\)?\\|^debug\\|^\\)>+ "
46 "Regexp to match prompts for the inferior Octave process." 46 "Regexp to match prompts for the inferior Octave process."
47 :type 'regexp 47 :type 'regexp
48 :group 'octave-inferior) 48 :group 'octave-inferior)