2 files changed, 6 insertions, 1 deletions

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  <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.
 
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