diff options
| author | Leo Liu | 2013-05-18 11:17:35 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-05-18 11:17:35 +0800 |
| commit | f6f87d33dab8a26270682d494a8ce778b7c1ca15 (patch) | |
| tree | 6201c57cff541b75878b7d418c8caac3dc7015a5 /lisp/progmodes | |
| parent | 5e80b74f7aa90e002186ca510e877883c2f1f14f (diff) | |
| download | emacs-f6f87d33dab8a26270682d494a8ce778b7c1ca15.tar.gz emacs-f6f87d33dab8a26270682d494a8ce778b7c1ca15.zip | |
Teach inferior-octave-startup to handle Octave > 3.7
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/octave.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index 03da4095449..df03251bbc9 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el | |||
| @@ -707,6 +707,11 @@ startup file, `~/.emacs-octave'." | |||
| 707 | inferior-octave-buffer | 707 | inferior-octave-buffer |
| 708 | inferior-octave-program | 708 | inferior-octave-program |
| 709 | (append (list "-i" "--no-line-editing") | 709 | (append (list "-i" "--no-line-editing") |
| 710 | ;; --no-gui is introduced in Octave > 3.7 | ||
| 711 | (when (zerop (process-file inferior-octave-program | ||
| 712 | nil nil nil | ||
| 713 | "--no-gui" "--help")) | ||
| 714 | (list "--no-gui")) | ||
| 710 | inferior-octave-startup-args)))) | 715 | inferior-octave-startup-args)))) |
| 711 | (set-process-filter proc 'inferior-octave-output-digest) | 716 | (set-process-filter proc 'inferior-octave-output-digest) |
| 712 | (setq inferior-octave-process proc | 717 | (setq inferior-octave-process proc |