emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
To: Bjarte Johansen <bjarte.johansen@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] ob-core: Fix indented cached result returning nil
Date: Thu, 21 May 2015 00:19:33 +0200	[thread overview]
Message-ID: <87egma7uyy.fsf@selenimh.access.network> (raw)
In-Reply-To: <1432135367-37309-1-git-send-email-bjarte.johansen@gmail.com> (Bjarte Johansen's message of "Wed, 20 May 2015 17:22:47 +0200")

Hello,

Bjarte Johansen <bjarte.johansen@gmail.com> writes:

> Fix a problem where a source block would return nil if the result was
> cached and it was indented.

Thank you. Some comments follow.

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

You need to add TINYCHANGE at the end of the commit message if you
haven't signed FSF papers yet.

> -	    (end-of-line 1) (forward-char 1)
> +	    (end-of-line 1) (forward-char (1+ (current-indentation)))

Slightly better: 

  (forward-line)
  (forward-char (current-indentation))
  
> +(ert-deftest test-org-babel/indented-cached-org-bracket-link ()
> +  "When the result of a source block is indentend, a link and
                                           ^^^^^^^^
"a cached indented link"

> +cached it should still return the link."
> +  (let ((test-block (concat "* Test\n"
> +			    "  #+BEGIN_SRC sh :file test.txt :cache yes\n"
> +			    "    echo 'text'\n"
> +			    "  #+END_SRC\n"
> +			    "\n"
> +			    "  #+RESULTS[be4fa2f5922220a6bc5b6c1f2a6747a067404506]:\n"
> +			    "  [[file:test.txt]]")))
> +    (with-temp-buffer
> +      (insert test-block)
> +      (search-backward "BEGIN_SRC")
> +      (org-mode)
> +      (should (string= (concat default-directory "test.txt")
> +		       (org-babel-execute-src-block))))))

You should use `org-test-with-temp-text' instead, and avoid "sh" as it
might not be active.  OTOH, emacs-lisp is always available:

--8<---------------cut here---------------start------------->8---
(should
 (org-test-with-temp-text
     "* Test
  #+<point>BEGIN_SRC emacs-lisp :file test.txt :cache yes
    (message \"text\")
  #+END_SRC

  #+RESULTS[c9828cf13461ca9ccb31e76ba4aee02ec6d7a4e7]:
  [[file:test.txt]]"
   (string= (concat default-directory "test.txt")
            (org-babel-execute-src-block))))
--8<---------------cut here---------------end--------------->8---


Regards,

-- 
Nicolas Goaziou

  reply	other threads:[~2015-05-20 22:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 15:22 [PATCH] ob-core: Fix indented cached result returning nil Bjarte Johansen
2015-05-20 22:19 ` Nicolas Goaziou [this message]
2015-05-21 10:34   ` Bjarte Johansen
  -- strict thread matches above, loose matches on Subject: below --
2015-05-21 10:38 Bjarte Johansen
2015-05-23 19:50 ` Nicolas Goaziou
2015-05-24  9:49   ` Bjarte Johansen
2015-05-24  9:53     ` Bjarte Johansen
2015-05-24 11:41       ` Bjarte Johansen
2015-05-24 11:42 Bjarte Johansen
2015-05-26  8:20 ` Nicolas Goaziou

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87egma7uyy.fsf@selenimh.access.network \
    --to=mail@nicolasgoaziou.fr \
    --cc=bjarte.johansen@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).