[Emacs-diffs] /srv/bzr/emacs/trunk r112629: Teach inferior-octave-startup to handle Octave > 3.7

[Leo Liu]

------------------------------------------------------------
revno: 112629
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Sat 2013-05-18 11:17:35 +0800
message:
  Teach inferior-octave-startup to handle Octave > 3.7
modified:
  lisp/ChangeLog
  lisp/progmodes/octave.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-18 01:17:50 +0000
+++ b/lisp/ChangeLog    2013-05-18 03:17:35 +0000
@@ -1,7 +1,7 @@
 2013-05-18  Leo Liu  <address@hidden>
 
        * 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.
 

=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el  2013-05-18 01:17:50 +0000
+++ b/lisp/progmodes/octave.el  2013-05-18 03:17:35 +0000
@@ -707,6 +707,11 @@
                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