Mercurial > emacs
comparison lisp/progmodes/octave-inf.el @ 90988:492971a3f31f unicode-xft-base
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 816-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 24 Jul 2007 01:23:55 +0000 |
parents | 95d0cdf160ea dcfe1564f1a0 |
children | f55f9811f5d7 |
comparison
equal
deleted
inserted
replaced
90987:b2d8a283f27e | 90988:492971a3f31f |
---|---|
40 "Program invoked by `inferior-octave'." | 40 "Program invoked by `inferior-octave'." |
41 :type 'string | 41 :type 'string |
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) |
49 | 49 |
50 (defcustom inferior-octave-startup-file nil | 50 (defcustom inferior-octave-startup-file nil |