mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

Teach inferior-octave-startup to handle Octave > 3.7

Browse Source
This commit is contained in:
Leo Liu 2013-05-18 11:17:35 +08:00
parent 5e80b74f7a
commit f6f87d33da
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -1,7 +1,7 @@
2013-05-18 Leo Liu <sdl.web@gmail.com>
* progmodes/octave.el (inferior-octave-startup): Use OCTAVE_SRCDIR
instead.
instead. Include "--no-gui" to prevent hangs for Octave > 3.7.
(octave-source-directories): Don't check process.
(octave-source-directories, octave-find-definition): Doc fix.

5
lisp/progmodes/octave.el
View File

@ -707,6 +707,11 @@ startup file, `~/.emacs-octave'."
inferior-octave-buffer
inferior-octave-program
(append (list "-i" "--no-line-editing")
;; --no-gui is introduced in Octave > 3.7
(when (zerop (process-file inferior-octave-program
nil nil nil
"--no-gui" "--help"))
(list "--no-gui"))
inferior-octave-startup-args))))
(set-process-filter proc 'inferior-octave-output-digest)
(setq inferior-octave-process proc