From: Eric Schulte <schulte.eric@gmail.com>
To: Daniele Pizzolli <dan@toel.it>
Cc: emacs-orgmode@gnu.org
Subject: Re: Tentative patch to keep org-babel-results-keyword when calling org-babel-remove-result
Date: Fri, 20 Sep 2013 15:13:19 -0600 [thread overview]
Message-ID: <87wqmb5h8w.fsf@gmail.com> (raw)
In-Reply-To: <523CAFF5.8090604@toel.it> (Daniele Pizzolli's message of "Fri, 20 Sep 2013 22:28:37 +0200")
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
Hi Daniele,
Thanks for the suggestion and the accompanying patch. I've just applied
a modified version of your patch (included below). Please let me know
if this is insufficient for your needs.
Best,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-babel-remove-result-option-keep-result-keyword.patch --]
[-- Type: text/x-diff, Size: 1640 bytes --]
From 136bdc0e83358fa3f6af1d8b3b0cd71cace61efe Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.eric@gmail.com>
Date: Fri, 20 Sep 2013 15:07:15 -0600
Subject: [PATCH] org-babel-remove-result option keep result keyword
This patch is based off of a request and an initial patch supplied by
Daniele Pizzolli.
* lisp/ob-core.el (org-babel-remove-result): Added an option to keep
the results keyword when removing the content of results.
---
lisp/ob-core.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index cc6b7a9..e2404c1 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2159,15 +2159,17 @@ code ---- the results are extracted in the syntax of the source
(set-marker visible-beg nil)
(set-marker visible-end nil))))))
-(defun org-babel-remove-result (&optional info)
+(defun org-babel-remove-result (&optional info keep-keyword)
"Remove the result of the current source block."
(interactive)
- (let ((location (org-babel-where-is-src-block-result nil info)) start)
+ (let ((location (org-babel-where-is-src-block-result nil info)))
(when location
- (setq start (- location 1))
(save-excursion
- (goto-char location) (forward-line 1)
- (delete-region start (org-babel-result-end))))))
+ (goto-char location)
+ (when (looking-at org-babel-result-regexp)
+ (delete-region
+ (if keep-keyword (1+ (match-end 0)) (match-beginning 0))
+ (progn (forward-line 1) (org-babel-result-end))))))))
(defun org-babel-result-end ()
"Return the point at the end of the current set of results."
--
1.8.4
[-- Attachment #3: Type: text/plain, Size: 3056 bytes --]
Daniele Pizzolli <dan@toel.it> writes:
> Hello @ll,
>
> this is my fist post on the list. Thanks to everybody for posting
> interesting things and keeping org-mode improving!
>
> I am seeking help because of my limited elisp knowledge.
>
> This is my incomplete patch to extend org-babel-remove-result to keep
> the org-babel-results-keyword when removing the results.
>
> I need to keep the org-babel-results-keyword because I want to commit
> to my dvcs a clean file and easily evaluate the results at any time
> later.
>
> Unfortunately running org-babel-remove-result on a snippet like the
> following:
>
> #+BEGIN_SRC octave :results value file
> % at the end produce an image
> #+END_SRC
>
> #+ATTR_LATEX: :width 3cm
> #+RESULTS:
> [[file:image_01.png]]
>
> Will output:
>
> #+BEGIN_SRC octave :results value file
> % at the end produce an image
> #+END_SRC
>
> #+ATTR_LATEX: :width 3cm
>
> And a run of org-babel-execute-buffer will produce:
>
> #+BEGIN_SRC octave :results value file
> % at the end produce an image
> #+END_SRC
>
> #+RESULTS:
> [[file:image_01.png]]
>
> #+ATTR_LATEX: :width 3cm
>
> changing the position of the LaTeX specific attribute #+ATTR_LATEX: in
> way that it becomes useless.
>
> The patch add an optional argument to org-babel-remove-result but
> relies to an hard-coded value of the length of the default
> org-babel-results-keyword plus syntax elements: "#+RESULTS:".
>
> Instead of calculating lengths I think that is better to move to next
> line.
>
> I also skipped a deletion of the last char assuming that is always a
> new line. Is this assumption correct? If we delete the last line
> we can end with:
>
> #+RESULTS:
> ** some other section
>
> That will cause problem in the next evaluation.
>
> I will appreciate your suggestions to improve the patch myself. It
> would be great also if anybody can implement it properly and get it merged.
>
> Thanks in advance,
> Daniele Pizzolli
>
>
> diff --git a/lisp/ob-core.el b/lisp/ob-core.el
> index cc6b7a9..7517ebf 100644
> --- a/lisp/ob-core.el
> +++ b/lisp/ob-core.el
> @@ -2159,15 +2159,18 @@ code ---- the results are extracted in the syntax of the source
> (set-marker visible-beg nil)
> (set-marker visible-end nil))))))
>
> -(defun org-babel-remove-result (&optional info)
> - "Remove the result of the current source block."
> +(defun org-babel-remove-result (&optional info keep-keyword)
> + "Remove the result of the current source block. Optionally
> +keep the result keyword."
> (interactive)
> (let ((location (org-babel-where-is-src-block-result nil info)) start)
> (when location
> - (setq start (- location 1))
> + (setq start (if keep-keyword (+ location 10) (- location 1)))
> (save-excursion
> (goto-char location) (forward-line 1)
> - (delete-region start (org-babel-result-end))))))
> + (delete-region
> + start
> + (if keep-keyword (- (org-babel-result-end) 1) (org-babel-result-end)))))))
>
>
--
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D
next prev parent reply other threads:[~2013-09-20 21:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-20 20:28 Tentative patch to keep org-babel-results-keyword when calling org-babel-remove-result Daniele Pizzolli
2013-09-20 21:13 ` Eric Schulte [this message]
2013-09-20 21:56 ` Daniele Pizzolli
2013-09-20 22:30 ` Eric Schulte
2013-09-21 6:44 ` Daniele Pizzolli
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=87wqmb5h8w.fsf@gmail.com \
--to=schulte.eric@gmail.com \
--cc=dan@toel.it \
--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).