diff options
author | Achim Gratz <Stromeko@Stromeko.DE> | 2013-05-19 20:49:38 +0200 |
---|---|---|
committer | Achim Gratz <Stromeko@Stromeko.DE> | 2013-05-19 21:08:00 +0200 |
commit | 885d1d67862414318363761d4867a6a64d0af7cb (patch) | |
tree | 26d9abbcaa85cc617d75131b4ccbea0aa16adb6b | |
parent | 66316436dda8edceae0909d85226191a9b412c8a (diff) | |
download | org-mode-885d1d67862414318363761d4867a6a64d0af7cb.tar.gz |
ob-octave: Emacs 24.4 will ditch octave-inf in favor for octave
* lisp/ob-octave.el (org-babel-octave-initiate-session): If octave-inf
can't be loaded, try octave instead before giving up. Emacs 24.3.50
and upwards replaces octave-inf with just plain octave.
-rw-r--r-- | lisp/ob-octave.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index c2a3abb..40bedfd 100644 --- a/lisp/ob-octave.el +++ b/lisp/ob-octave.el @@ -151,7 +151,8 @@ create. Return the initialized session." "Create an octave inferior process buffer. If there is not a current inferior-process-buffer in SESSION then create. Return the initialized session." - (if matlabp (require 'matlab) (require 'octave-inf)) + (if matlabp (require 'matlab) (or (require 'octave-inf nil 'noerror) + (require 'octave))) (unless (string= session "none") (let ((session (or session (if matlabp "*Inferior Matlab*" "*Inferior Octave*")))) |