From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjarte Johansen Subject: [PATCH] ob-core: Fix indented cached result returning nil Date: Sun, 24 May 2015 13:42:20 +0200 Message-ID: <1432467740-2692-1-git-send-email-bjarte.johansen@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwUJ4-00033u-K0 for emacs-orgmode@gnu.org; Sun, 24 May 2015 07:43:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YwUIz-0002So-KS for emacs-orgmode@gnu.org; Sun, 24 May 2015 07:43:02 -0400 Received: from mail-lb0-x22a.google.com ([2a00:1450:4010:c04::22a]:34188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YwUIz-0002Sf-DK for emacs-orgmode@gnu.org; Sun, 24 May 2015 07:42:57 -0400 Received: by lbcmx3 with SMTP id mx3so37389483lbc.1 for ; Sun, 24 May 2015 04:42:56 -0700 (PDT) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Bjarte Johansen Fix a problem where a source block would return nil oif the result was cached and it was indented. * lisp/ob-core.el (org-babel-execute-src-block): Move point to the the first character of the result instead of the beginning of the line. * testing/lisp/test-ob.el (test-org-babel/indented-cached-org-bracket-link): Added test to to see if the indented cached result returns what it should return. --- lisp/ob-core.el | 3 ++- testing/lisp/test-ob.el | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index d25bb7c..9575096 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -653,7 +653,8 @@ block." (cache-current-p (save-excursion ;; return cached result (goto-char (org-babel-where-is-src-block-result nil info)) - (end-of-line 1) (forward-char 1) + (end-of-line 1) + (forward-char (1+ (current-indentation))) (let ((result (org-babel-read-result))) (message (replace-regexp-in-string "%" "%%" (format "%S" result))) result))) diff --git a/testing/lisp/test-ob.el b/testing/lisp/test-ob.el index f52ff24..83b4d00 100644 --- a/testing/lisp/test-ob.el +++ b/testing/lisp/test-ob.el @@ -20,6 +20,22 @@ ;;; Code: +(ert-deftest test-org-babel/indented-cached-org-bracket-link () + "When the result of a source block is a cached indented link it +should still return the link." + (should + (let ((default-directory temporary-file-directory)) + (org-test-with-temp-text + " +* Test + #+BEGIN_SRC emacs-lisp :file test.txt :cache yes + (message \"test\") + #+END_SRC" + ;; Execute twice as the first time creates the cache. + (org-babel-execute-src-block) + (string= (concat default-directory "test.txt") + (org-babel-execute-src-block)))))) + (ert-deftest test-org-babel/multi-line-header-regexp () (should(equal "^[ \t]*#\\+headers?:[ \t]*\\([^\n]*\\)$" org-babel-multi-line-header-regexp)) -- 2.3.2 (Apple Git-55)