From 885d1d67862414318363761d4867a6a64d0af7cb Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 19 May 2013 20:49:38 +0200 Subject: [PATCH] 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. --- lisp/ob-octave.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ob-octave.el b/lisp/ob-octave.el index c2a3abb5f..40bedfdb1 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*")))) -- 2.11.4.GIT