From f6f87d33dab8a26270682d494a8ce778b7c1ca15 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 18 May 2013 11:17:35 +0800 Subject: [PATCH] Teach inferior-octave-startup to handle Octave > 3.7 --- lisp/ChangeLog | 2 +- lisp/progmodes/octave.el | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 87f0e5242ab..b4bb56a1d6f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,7 @@ 2013-05-18 Leo Liu * 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. 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'." 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 -- 2.39.2