* Re: Prepare release 8.2.6
2014-04-03 7:53 Prepare release 8.2.6 Bastien
@ 2014-04-03 9:17 ` Alan Schmitt
2014-04-03 10:13 ` KDr2
` (2 subsequent siblings)
3 siblings, 0 replies; 24+ messages in thread
From: Alan Schmitt @ 2014-04-03 9:17 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode
Hi Bastien,
Bastien <bzg@altern.org> writes:
> Hi all,
>
> I'll spend a few hours this afternoon chasing the last
> bugs in maint for Org 8.2.6. This release will then be
> merged into the emacs-24 branch, which first pretest is
> to be released very soon now.
>
> If you have outstanding bugs, please point at them.
I don't know if this qualifies as a bug, but I have not been able to get
around this: http://article.gmane.org/gmane.emacs.orgmode/84472
I just checked out out the maint branch, and I see the same problematic
behavior as I get with ELPA. Things work correctly in the master branch.
Alan
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 7:53 Prepare release 8.2.6 Bastien
2014-04-03 9:17 ` Alan Schmitt
@ 2014-04-03 10:13 ` KDr2
2014-04-03 11:47 ` Rainer M Krug
2014-04-03 11:47 ` Rainer M Krug
3 siblings, 0 replies; 24+ messages in thread
From: KDr2 @ 2014-04-03 10:13 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode
[-- Attachment #1.1: Type: text/plain, Size: 1356 bytes --]
Hi Bastien,
I sent a mail "[PATCH] ob-scheme.el: Fix scheme code blocks execution error
in batch mode" to the list yesterday, but I don't see it at
http://news.gmane.org/gmane.emacs.orgmode, so here I sent it to you again:
The bug:
write file ~/scheme-test.org with the content below:
-------8<--------------
#+BEGIN_SRC scheme :exports results :results output raw
(display "Hello Scheme in OrgMode")
#+END_SRC
-------8<--------------
and run:
emacs --batch --eval='(load "~/.emacs.d/init.el")' ~/scheme-test.org -f
org-html-export-to-html
you will find the bug:
`org-babel-scheme-execute-with-geiser' uses `current-message' to get the
results of scheme code blocks, but `current-message' always returns nil in
batch mode, and the attached patch fixes this.
Please consider to apply it, thanks.
On Thu, Apr 3, 2014 at 3:53 PM, Bastien <bzg@altern.org> wrote:
> Hi all,
>
> I'll spend a few hours this afternoon chasing the last
> bugs in maint for Org 8.2.6. This release will then be
> merged into the emacs-24 branch, which first pretest is
> to be released very soon now.
>
> If you have outstanding bugs, please point at them.
>
> As usual, thanks in advance for your help,
>
> PS: gmane.org seems to be down since April, 1st, so I
> could not follow the discussions since that time.
>
> --
> Bastien
>
>
--
--
KDr2, http://kdr2.com
[-- Attachment #1.2: Type: text/html, Size: 2442 bytes --]
[-- Attachment #2: 0001-ob-scheme.el-Fix-scheme-code-blocks-execution-error-.patch --]
[-- Type: text/x-patch, Size: 2291 bytes --]
From cebf9fc4fe09ab22fd31ff8e5606d0f680c121e9 Mon Sep 17 00:00:00 2001
From: KDr2 <killy.draw@gmail.com>
Date: Wed, 2 Apr 2014 10:30:38 +0800
Subject: [PATCH] ob-scheme.el: Fix scheme code blocks execution error in batch
mode
* lisp/ob-scheme.el (org-babel-scheme-capture-current-message, org-babel-scheme-execute-with-geiser): Capture scheme code results via current-message both in interactive mode and noninteractive mode.
`org-babel-scheme-execute-with-geiser' uses `current-message' to get the results of scheme code blocks, but `current-message' always returns nil in batch mode, and this patch fixes this.
Modified from a patch proposal by KDr2
---
lisp/ob-scheme.el | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index b7117e9..3b7ceb2 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -118,6 +118,17 @@ org-babel-scheme-execute-with-geiser will use a temporary session."
(name))))
result))
+(defmacro org-babel-scheme-capture-current-message (&rest body)
+ "Capture current message in both interactive and noninteractive mode"
+ `(if noninteractive
+ (let ((current-message nil))
+ (flet ((message (fmt &rest args) (setq current-message (apply #'format fmt args))))
+ ,@body
+ current-message))
+ (progn
+ ,@body
+ (current-message))))
+
(defun org-babel-scheme-execute-with-geiser (code output impl repl)
"Execute code in specified REPL. If the REPL doesn't exist, create it
using the given scheme implementation.
@@ -142,10 +153,11 @@ is true; otherwise returns the last value."
(current-buffer)))))
(setq geiser-repl--repl repl-buffer)
(setq geiser-impl--implementation nil)
- (geiser-eval-region (point-min) (point-max))
+ (setq result (org-babel-scheme-capture-current-message
+ (geiser-eval-region (point-min) (point-max))))
(setq result
- (if (equal (substring (current-message) 0 3) "=> ")
- (replace-regexp-in-string "^=> " "" (current-message))
+ (if (and (stringp result) (equal (substring result 0 3) "=> "))
+ (replace-regexp-in-string "^=> " "" result)
"\"An error occurred.\""))
(when (not repl)
(save-current-buffer (set-buffer repl-buffer)
--
1.9.1
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 7:53 Prepare release 8.2.6 Bastien
2014-04-03 9:17 ` Alan Schmitt
2014-04-03 10:13 ` KDr2
@ 2014-04-03 11:47 ` Rainer M Krug
2014-04-18 12:04 ` Bastien
2014-04-03 11:47 ` Rainer M Krug
3 siblings, 1 reply; 24+ messages in thread
From: Rainer M Krug @ 2014-04-03 11:47 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 2468 bytes --]
Bastien <bzg@altern.org> writes:
> Hi all,
>
> I'll spend a few hours this afternoon chasing the last
> bugs in maint for Org 8.2.6. This release will then be
> merged into the emacs-24 branch, which first pretest is
> to be released very soon now.
>
> If you have outstanding bugs, please point at them.
>
> As usual, thanks in advance for your help,
>
> PS: gmane.org seems to be down since April, 1st, so I
> could not follow the discussions since that time.
I don't know if this effects the release of 8.2.6, but I have a bug
which I would consider as serious. Using the following as the org file,
results in the error in R during export to latex / pdf:
--8<---------------cut here---------------start------------->8---
#+TITLE: single_to_multi
#+DATE: <2013-10-15 Tue>
#+AUTHOR: Rainer M. Krug
#+EMAIL: Rainer@krugs.de
#+PROPERTY: session *R_MOBILIS*
* R functions
:PROPERTIES:
:eval: never
:END:
Some function definitions and setting up of the compouting
environment. The functions are in the ~./R/~ folder, while the data
has been stored in the ~./data/~ folder as an ~.rda~ file.
These can be put into a package later.
** Data IO Functions
Some functions to for interaction with SQLite database.
*** IFN data
**** Load spatial forest inventory data
* Data Assessment Results
** IFN
*** Load spatial forest inventory data
#+begin_src R :results output
IFN.raw <- "Here it is"
#+end_src
*** Maps
**** Raw point data
The data from the raw points is plotted as maps.
#+begin_src R :results output
cat(IFN.raw)
#+end_src
* Versions:
- org :: Org-mode version 8.2.5h (release_8.2.5h-879-g23e62f @ /Users/rainerkrug/.emacs.d/org-mode/lisp/)
- emacs :: GNU Emacs 24.3.1 (x86_64-apple-darwin13.0.0, Carbon Version 1.6.0 AppKit 1265) of 2014-02-13 on Rainers-MacBook-Pro-2.local
--8<---------------cut here---------------end--------------->8---
The error is:
,----
| > cat(IFN.raw)
| 'org_babel_R_eoe'
| Error in cat(IFN.raw) : object 'IFN.raw' not found
| > [1] "org_babel_R_eoe"
| >
`----
In other words, the second code block is evaluated, but the second one
not.
If I remove the :evel: property *in the previous* tree, it works as
expected. But in the main document, I have code in there which I do not
want to have evaluated.
This has been introduced within the previous week, if I am not mistaken.
Cheers,
Rainer
--
Rainer M. Krug
PGP: 0x0F52F982
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4474 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 11:47 ` Rainer M Krug
@ 2014-04-18 12:04 ` Bastien
2014-04-28 13:40 ` Rainer M Krug
0 siblings, 1 reply; 24+ messages in thread
From: Bastien @ 2014-04-18 12:04 UTC (permalink / raw)
To: Rainer M Krug; +Cc: emacs-orgmode
Hi Rainer,
Rainer M Krug <Rainer@krugs.de> writes:
> This has been introduced within the previous week, if I am not
> mistaken.
Can you try to bisect a bit more? Maybe look for a commit that
changed property inheritance, as it looks like it's related.
Thanks,
--
Bastien
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-18 12:04 ` Bastien
@ 2014-04-28 13:40 ` Rainer M Krug
0 siblings, 0 replies; 24+ messages in thread
From: Rainer M Krug @ 2014-04-28 13:40 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 914 bytes --]
Just checked it with
Org-mode version 8.2.6 (release_8.2.6-936-gd9e6bd @
/Users/rainerkrug/.emacs.d/org-mode/lisp/)
and it works there.
Cheers,
Rainer
Bastien <bzg@gnu.org> writes:
> Hi Rainer,
>
> Rainer M Krug <Rainer@krugs.de> writes:
>
>> This has been introduced within the previous week, if I am not
>> mistaken.
>
> Can you try to bisect a bit more? Maybe look for a commit that
> changed property inheritance, as it looks like it's related.
>
> Thanks,
--
Rainer M. Krug, PhD (Conservation Ecology, SUN), MSc (Conservation Biology, UCT), Dipl. Phys. (Germany)
Centre of Excellence for Invasion Biology
Stellenbosch University
South Africa
Tel : +33 - (0)9 53 10 27 44
Cell: +33 - (0)6 85 62 59 98
Fax : +33 - (0)9 58 10 27 44
Fax (D): +49 - (0)3 21 21 25 22 44
email: Rainer@krugs.de
Skype: RMkrug
PGP: 0x0F52F982
[-- Attachment #2: Type: application/pgp-signature, Size: 494 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 7:53 Prepare release 8.2.6 Bastien
` (2 preceding siblings ...)
2014-04-03 11:47 ` Rainer M Krug
@ 2014-04-03 11:47 ` Rainer M Krug
3 siblings, 0 replies; 24+ messages in thread
From: Rainer M Krug @ 2014-04-03 11:47 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1.1.1: Type: text/plain, Size: 2546 bytes --]
Bastien <bzg@altern.org> writes:
> Hi all,
>
> I'll spend a few hours this afternoon chasing the last
> bugs in maint for Org 8.2.6. This release will then be
> merged into the emacs-24 branch, which first pretest is
> to be released very soon now.
>
> If you have outstanding bugs, please point at them.
>
> As usual, thanks in advance for your help,
>
> PS: gmane.org seems to be down since April, 1st, so I
> could not follow the discussions since that time.
Sorry if this has ben already received the list, but I must have missed
it.
I don't know if this effects the release of 8.2.6, but I have a bug
which I would consider as serious. Using the following as the org file,
results in the error in R during export to latex / pdf:
--8<---------------cut here---------------start------------->8---
#+TITLE: single_to_multi
#+DATE: <2013-10-15 Tue>
#+AUTHOR: Rainer M. Krug
#+EMAIL: Rainer@krugs.de
#+PROPERTY: session *R_MOBILIS*
* R functions
:PROPERTIES:
:eval: never
:END:
Some function definitions and setting up of the compouting
environment. The functions are in the ~./R/~ folder, while the data
has been stored in the ~./data/~ folder as an ~.rda~ file.
These can be put into a package later.
** Data IO Functions
Some functions to for interaction with SQLite database.
*** IFN data
**** Load spatial forest inventory data
* Data Assessment Results
** IFN
*** Load spatial forest inventory data
#+begin_src R :results output
IFN.raw <- "Here it is"
#+end_src
*** Maps
**** Raw point data
The data from the raw points is plotted as maps.
#+begin_src R :results output
cat(IFN.raw)
#+end_src
* Versions:
- org :: Org-mode version 8.2.5h (release_8.2.5h-879-g23e62f @ /Users/rainerkrug/.emacs.d/org-mode/lisp/)
- emacs :: GNU Emacs 24.3.1 (x86_64-apple-darwin13.0.0, Carbon Version 1.6.0 AppKit 1265) of 2014-02-13 on Rainers-MacBook-Pro-2.local
--8<---------------cut here---------------end--------------->8---
The error is:
,----
| > cat(IFN.raw)
| 'org_babel_R_eoe'
| Error in cat(IFN.raw) : object 'IFN.raw' not found
| > [1] "org_babel_R_eoe"
| >
`----
In other words, the second code block is evaluated, but the second one
not.
If I remove the :evel: property *in the previous* tree, it works as
expected. But in the main document, I have code in there which I do not
want to have evaluated.
This has been introduced within the previous week, if I am not mistaken.
Cheers,
Rainer
--
Rainer M. Krug
PGP: 0x0F52F982
[-- Attachment #1.1.2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4474 bytes --]
[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 4474 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 6:37 Bastien
@ 2014-04-04 9:05 ` Sebastien Vauban
2014-04-04 11:51 ` Michael Weylandt
2014-04-04 14:32 ` Michael Weylandt
2 siblings, 0 replies; 24+ messages in thread
From: Sebastien Vauban @ 2014-04-04 9:05 UTC (permalink / raw)
To: emacs-orgmode-mXXj517/zsQ
Hi Bastien,
Bastien wrote:
> I'll try to fix a few remaining bugs in maint this afternoon then
> release 8.2.6 so that we can merge it into Emacs emacs-24 branch, the
> pretest is scheduled to happen as soon as possible.
>
> If you have important bugs you want us to look at, now is the time to
> point at them.
As already mentioned before, I'd advocate trying to solve the following
2 bugs before merging back into Emacs:
- #16440: Some colors of the theme aren't respected in latest Emacs
- #15298: Background color lost when highlighting a string
As well, I don't know whether this is an Org or an Emacs problem, but
I can crash Emacs 24.3.50.1 (r114715, for the sake of completeness)
quite easily when capturing an Org item. Reported to Emacs as bug
#16780.
I retested it this morning with an up-to-date Org. Note that the same
capture process does not crash on the current Emacs I do use (Emacs
24.4.50.1, r116906 of 2014-03-30)... But would it crash for Org users in
the wild (using different Emacs versions)?
Thanks,
Seb
--
Sebastien Vauban
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 6:37 Bastien
2014-04-04 9:05 ` Sebastien Vauban
@ 2014-04-04 11:51 ` Michael Weylandt
2014-04-05 16:41 ` R. Michael Weylandt
2014-04-04 14:32 ` Michael Weylandt
2 siblings, 1 reply; 24+ messages in thread
From: Michael Weylandt @ 2014-04-04 11:51 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 944 bytes --]
On Apr 3, 2014, at 2:37, Bastien <bzg@gnu.org> wrote:
> Hi all,
>
> I'll try to fix a few remaining bugs in maint this afternoon
> then release 8.2.6 so that we can merge it into Emacs emacs-24
> branch, the pretest is scheduled to happen as soon as possible.
>
> If you have important bugs you want us to look at, now is the
> time to point at them.
Hi Bastien,
Two small usability issues you may want to take a look at:
1) Tell Emacs not to break inline source blocks when filling paragraphs:
http://lists.gnu.org/archive/html/emacs-orgmode/2014-03/msg01310.html
2) Allow =, +, and ; to be entered into org-insert-link. The list of character is org-link-escape-chars seems to be unnecessarily defensive and results in bad links being entered into documents (and then exported).
http://lists.gnu.org/archive/html/emacs-orgmode/2014-03/msg00990.html
Michael
>
> Thanks,
>
> --
> Bastien
>
>
[-- Attachment #2: Type: text/html, Size: 1751 bytes --]
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-04 11:51 ` Michael Weylandt
@ 2014-04-05 16:41 ` R. Michael Weylandt
2014-04-05 19:18 ` Nicolas Goaziou
0 siblings, 1 reply; 24+ messages in thread
From: R. Michael Weylandt @ 2014-04-05 16:41 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode@gnu.org
On Fri, Apr 4, 2014 at 7:51 AM, Michael Weylandt
<michael.weylandt@gmail.com> wrote:
>
>
> On Apr 3, 2014, at 2:37, Bastien <bzg@gnu.org> wrote:
>
> Hi all,
>
> I'll try to fix a few remaining bugs in maint this afternoon
> then release 8.2.6 so that we can merge it into Emacs emacs-24
> branch, the pretest is scheduled to happen as soon as possible.
>
> If you have important bugs you want us to look at, now is the
> time to point at them.
>
>
> Hi Bastien,
>
> Two small usability issues you may want to take a look at:
>
> 1) Tell Emacs not to break inline source blocks when filling paragraphs:
>
> http://lists.gnu.org/archive/html/emacs-orgmode/2014-03/msg01310.html
Small patch in support:
diff --git a/lisp/org-src.el b/lisp/org-src.el
index f870b2c..32de2a1 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -40,6 +40,7 @@
(declare-function org-do-remove-indentation "org" (&optional n))
(declare-function org-at-table.el-p "org" ())
(declare-function org-in-src-block-p "org" (&optional inside))
+(declare-function org-in-inline-src-block-p "org" ())
(declare-function org-in-block-p "org" (names))
(declare-function org-get-indentation "org" (&optional line))
(declare-function org-switch-to-buffer-other-window "org" (&rest args))
diff --git a/lisp/org.el b/lisp/org.el
index 318d95a..2778160 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -21536,6 +21536,9 @@ when point is at #+BEGIN_SRC or #+END_SRC."
(beginning-of-line)
(looking-at ".*#\\+\\(begin\\|end\\)_src")))))))
+(defun org-in-inline-src-block-p ()
+ "Test if within an inline src block."
+ (org-in-regexp org-babel-inline-src-block-regexp))
(defun org-context ()
"Return a list of contexts of the current cursor position.
If several contexts apply, all are returned.
@@ -22246,7 +22249,8 @@ hierarchy of headlines by UP levels before
marking the subtree."
(org-uniquify
(append fill-nobreak-predicate
'(org-fill-line-break-nobreak-p
- org-fill-paragraph-with-timestamp-nobreak-p)))))
+ org-fill-paragraph-with-timestamp-nobreak-p
+ org-in-inline-src-block-p)))))
(let ((paragraph-ending (substring org-element-paragraph-separate 1)))
(org-set-local 'paragraph-start paragraph-ending)
(org-set-local 'paragraph-separate paragraph-ending))
>
> 2) Allow =, +, and ; to be entered into org-insert-link. The list of
> character is org-link-escape-chars seems to be unnecessarily defensive and
> results in bad links being entered into documents (and then exported).
>
> http://lists.gnu.org/archive/html/emacs-orgmode/2014-03/msg00990.html
>
> Michael
>
>
> Thanks,
>
> --
> Bastien
>
>
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-05 16:41 ` R. Michael Weylandt
@ 2014-04-05 19:18 ` Nicolas Goaziou
2014-04-07 1:48 ` R. Michael Weylandt
0 siblings, 1 reply; 24+ messages in thread
From: Nicolas Goaziou @ 2014-04-05 19:18 UTC (permalink / raw)
To: R. Michael Weylandt; +Cc: Bastien, emacs-orgmode@gnu.org
Hello,
"R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
>> 1) Tell Emacs not to break inline source blocks when filling paragraphs:
>>
>> http://lists.gnu.org/archive/html/emacs-orgmode/2014-03/msg01310.html
>
> Small patch in support:
Thank you.
> +(defun org-in-inline-src-block-p ()
> + "Test if within an inline src block."
> + (org-in-regexp org-babel-inline-src-block-regexp))
I suggest not to use `org-in-regexp' here but `org-element-context'.
> - org-fill-paragraph-with-timestamp-nobreak-p)))))
> + org-fill-paragraph-with-timestamp-nobreak-p
> + org-in-inline-src-block-p)))))
Besides inline source blocks, ISTR there was other places where filling
was inappropriate (verbatim, code, export snippet, macro...). A single
`org-element-context' will find them all.
Another option for the problem at hand is to simply remove newline
characters in inline source blocks before executing them.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-05 19:18 ` Nicolas Goaziou
@ 2014-04-07 1:48 ` R. Michael Weylandt
2014-04-07 10:19 ` Nicolas Goaziou
0 siblings, 1 reply; 24+ messages in thread
From: R. Michael Weylandt @ 2014-04-07 1:48 UTC (permalink / raw)
Cc: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]
On Sat, Apr 5, 2014 at 3:18 PM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Hello,
>
> "R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
>
>>> 1) Tell Emacs not to break inline source blocks when filling paragraphs:
>
> I suggest not to use `org-in-regexp' here but `org-element-context'.
I'm not as familiar with org-element-context, but I think the attached
is what you had in mind.
> Besides inline source blocks, ISTR there was other places where filling
> was inappropriate (verbatim, code, export snippet, macro...). A single
> `org-element-context' will find them all.
Verbatim seems to work over multiple lines so I've left them out.
Macros and inline source blocks don't so I've included them. Not sure
what other elements to look at:
>
> Another option for the problem at hand is to simply remove newline
> characters in inline source blocks before executing them.
>
That might be better but would require a bit more work: at present,
inline source blocks can't extend over multiple lines so org wouldn't
recognize a construct like
src_python[:exports results]{1 + 2 +
3 + 4}
as an inline source block in the first place. Looking at
org-inline-src-block-regexp I'm not sure why though.
Patch also attached to improve link handling
Michael
[-- Attachment #2: 0001-org.el-Don-t-fill-on-inline-source-blocks-or-macros.patch --]
[-- Type: application/octet-stream, Size: 1828 bytes --]
From 03f58af1eba4550dd8f2500468ee852d52a89260 Mon Sep 17 00:00:00 2001
From: Michael Weylandt <michael.weylandt@gmail.com>
Date: Sun, 6 Apr 2014 21:19:56 -0400
Subject: [PATCH 1/2] org.el: Don't fill on inline source blocks or macros
* lisp/org.el (org-fill-element-nobreak-p): New function
* lisp/org.el (org-setup-filling): Add org-fill-element-nobreak-p to
fill-nobreak-predicate
Org currently doesn't recognize inline source blocks or macros spread
over multiple lines so we need to keep Emacs from filling (line
wrapping) and breaking these elements.
TINYCHANGE
---
lisp/org.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index 318d95a..52ac8dd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -22246,7 +22246,8 @@ hierarchy of headlines by UP levels before marking the subtree."
(org-uniquify
(append fill-nobreak-predicate
'(org-fill-line-break-nobreak-p
- org-fill-paragraph-with-timestamp-nobreak-p)))))
+ org-fill-paragraph-with-timestamp-nobreak-p
+ org-fill-element-nobreak-p)))))
(let ((paragraph-ending (substring org-element-paragraph-separate 1)))
(org-set-local 'paragraph-start paragraph-ending)
(org-set-local 'paragraph-separate paragraph-ending))
@@ -22268,6 +22269,12 @@ hierarchy of headlines by UP levels before marking the subtree."
(and (org-at-timestamp-p t)
(not (looking-at org-ts-regexp-both))))
+(defun org-fill-element-nobreak-p ()
+ "Non-nil when a new line at point would break an element which
+ cannot be split over multiple lines."
+ (member (car (org-element-context))
+ '(inline-src-block macro)))
+
(declare-function message-in-body-p "message" ())
(defvar orgtbl-line-start-regexp) ; From org-table.el
(defun org-adaptive-fill-function ()
--
1.8.3.4 (Apple Git-47)
[-- Attachment #3: 0002-org.el-Remove-and-from-org-link-escape-chars.patch --]
[-- Type: application/octet-stream, Size: 1118 bytes --]
From 7023f412093e1c17203c9959e929ad57557006f5 Mon Sep 17 00:00:00 2001
From: Michael Weylandt <michael.weylandt@gmail.com>
Date: Sun, 6 Apr 2014 21:37:12 -0400
Subject: [PATCH 2/2] org.el: Remove =, +, and ; from org-link-escape-chars
* org.el (org-link-escape-chars): Remove =, +, and ;
=, +, and ; are all valid URI characters (RFC 3986) and don't break
org's syntax so there's no need to escape them in link handling.
This fixes, e.g.,
(org-insert-link nil "http://google.com/search?q=orgmode" "Org mode")
which previously would produce an invalid URI in both the org file and
exported documents.
TINYCHANGE
---
lisp/org.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index 52ac8dd..f883f56 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9740,7 +9740,7 @@ according to FMT (default from `org-email-link-description-format')."
"]"))
(defconst org-link-escape-chars
- '(?\ ?\[ ?\] ?\; ?\= ?\+)
+ '(?\ ?\[ ?\])
"List of characters that should be escaped in link.
This is the list that is used for internal purposes.")
--
1.8.3.4 (Apple Git-47)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-07 1:48 ` R. Michael Weylandt
@ 2014-04-07 10:19 ` Nicolas Goaziou
2014-04-17 19:58 ` Bastien
0 siblings, 1 reply; 24+ messages in thread
From: Nicolas Goaziou @ 2014-04-07 10:19 UTC (permalink / raw)
To: R. Michael Weylandt; +Cc: emacs-orgmode@gnu.org
Hello,
"R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
> I'm not as familiar with org-element-context, but I think the attached
> is what you had in mind.
Thanks. Comments follow.
>> Another option for the problem at hand is to simply remove newline
>> characters in inline source blocks before executing them.
>
> That might be better but would require a bit more work:
It would require more work, but adding functions to
`fill-nobreak-predicate' has a cost, too.
It needs to be discussed, but I tend to think that it would be better to
allow newlines characters in macros and inline babel calls, even if it
means replacing them with a space when needed.
> at present,
> inline source blocks can't extend over multiple lines so org wouldn't
> recognize a construct like
>
> src_python[:exports results]{1 + 2 +
> 3 + 4}
>
> as an inline source block in the first place. Looking at
> org-inline-src-block-regexp I'm not sure why though.
Because there is everywhere [^...\n...], which means "no newline
characters, please". The same goes for ".*?", as "." cannot match
a newline character.
> +(defun org-fill-element-nobreak-p ()
Technically, it is about "objects", not elements. So the function could
be named `org-fill-objects-nobreak-p'.
> + "Non-nil when a new line at point would break an element which
> + cannot be split over multiple lines."
Ditto. Also the first sentence in the docstring cannot be split into two
lines.
> + (member (car (org-element-context))
> + '(inline-src-block macro)))
(memq (org-element-type (org-element-context))
...)
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-07 10:19 ` Nicolas Goaziou
@ 2014-04-17 19:58 ` Bastien
0 siblings, 0 replies; 24+ messages in thread
From: Bastien @ 2014-04-17 19:58 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: R. Michael Weylandt, emacs-orgmode@gnu.org
Hi Michael and Nicolas,
Nicolas Goaziou <n.goaziou@gmail.com> writes:
> It needs to be discussed, but I tend to think that it would be better to
> allow newlines characters in macros and inline babel calls, even if it
> means replacing them with a space when needed.
I've given this another thought and I agree here.
Prevent line breaks here would look weird, and adding
the space when needed looks easy enough (at least,
it's easy enough to suppose it is easy... not sure
about the details.)
--
Bastien
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-03 6:37 Bastien
2014-04-04 9:05 ` Sebastien Vauban
2014-04-04 11:51 ` Michael Weylandt
@ 2014-04-04 14:32 ` Michael Weylandt
2014-04-05 16:45 ` R. Michael Weylandt
2 siblings, 1 reply; 24+ messages in thread
From: Michael Weylandt @ 2014-04-04 14:32 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode@gnu.org
On Apr 3, 2014, at 2:37, Bastien <bzg@gnu.org> wrote:
> Hi all,
>
> I'll try to fix a few remaining bugs in maint this afternoon
> then release 8.2.6 so that we can merge it into Emacs emacs-24
> branch, the pretest is scheduled to happen as soon as possible.
>
> If you have important bugs you want us to look at, now is the
> time to point at them.
A few more minor things from my .emacs:
1) In ox-latex.el, add a `downcase` around the definition of mint-lang in org-latex-inline-src-block and the sexp `(or (cadr (assq (intern lang) org-latex-minted-langs)) lang)` in org-latex-src-block to respect minted's convention of putting all language names in lowercase.
2) Add a key binding C-c C-v k for org-babel-remove result in ob-keys.el. (Discussed on list but I can't find the reference)
I actually wrap it so C-u C-c C-v k calls
(org-babel-map-src-blocks nil (org-babel-remove-result))
>
> Thanks,
>
> --
> Bastien
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-04 14:32 ` Michael Weylandt
@ 2014-04-05 16:45 ` R. Michael Weylandt
2014-04-05 19:27 ` Nicolas Goaziou
0 siblings, 1 reply; 24+ messages in thread
From: R. Michael Weylandt @ 2014-04-05 16:45 UTC (permalink / raw)
To: Bastien; +Cc: emacs-orgmode@gnu.org
On Fri, Apr 4, 2014 at 10:32 AM, Michael Weylandt
<michael.weylandt@gmail.com> wrote:
>
>
> On Apr 3, 2014, at 2:37, Bastien <bzg@gnu.org> wrote:
>
>> Hi all,
>>
>> I'll try to fix a few remaining bugs in maint this afternoon
>> then release 8.2.6 so that we can merge it into Emacs emacs-24
>> branch, the pretest is scheduled to happen as soon as possible.
>>
>> If you have important bugs you want us to look at, now is the
>> time to point at them.
>
> A few more minor things from my .emacs:
>
> 1) In ox-latex.el, add a `downcase` around the definition of mint-lang in org-latex-inline-src-block and the sexp `(or (cadr (assq (intern lang) org-latex-minted-langs)) lang)` in org-latex-src-block to respect minted's convention of putting all language names in lowercase.
>
Patches:
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 59e6e83..013c731 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1474,9 +1474,9 @@ contextual information."
;; Use minted package.
((eq org-latex-listings 'minted)
(let* ((org-lang (org-element-property :language inline-src-block))
- (mint-lang (or (cadr (assq (intern org-lang)
+ (mint-lang (downcase (or (cadr (assq (intern org-lang)
org-latex-minted-langs))
- org-lang))
+ org-lang)))
(options (org-latex--make-option-string
org-latex-minted-options)))
(concat (format "\\mint%s{%s}"
@@ -2116,7 +2116,7 @@ contextual information."
("firstnumber" ,(number-to-string (1+ num-start))))
org-latex-minted-options)))
;; Language.
- (or (cadr (assq (intern lang) org-latex-minted-langs)) lang)
+ (downcase (or (cadr (assq (intern lang)
org-latex-minted-langs)) lang))
;; Source code.
(let* ((code-info (org-export-unravel-code src-block))
(max-width
> 2) Add a key binding C-c C-v k for org-babel-remove result in ob-keys.el. (Discussed on list but I can't find the reference)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index e8943c6..c73c42b 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2166,6 +2166,15 @@ code ---- the results are extracted in the
syntax of the source
(goto-char location) (forward-line 1)
(delete-region start (org-babel-result-end))))))
+(defun org-babel-remove-result-one-or-many (x)
+ "Remove the result of the current source block.
+If called with a prefix argument, remove all result blocks
+in the buffer."
+ (interactive "P")
+ (if x
+ (org-babel-map-src-blocks nil (org-babel-remove-result))
+ (org-babel-remove-result)))
+
(defun org-babel-result-end ()
"Return the point at the end of the current set of results."
(save-excursion
diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el
index 90b5196..dc1f437 100644
--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@@ -89,6 +89,7 @@ functions which are assigned key bindings, and see
("h" . org-babel-describe-bindings)
("\C-x" . org-babel-do-key-sequence-in-edit-buffer)
("x" . org-babel-do-key-sequence-in-edit-buffer)
+ ("k" . org-babel-remove-result-one-or-many)
("\C-\M-h" . org-babel-mark-block))
"Alist of key bindings and interactive Babel functions.
This list associates interactive Babel functions
>
> I actually wrap it so C-u C-c C-v k calls
>
> (org-babel-map-src-blocks nil (org-babel-remove-result))
>
>>
>> Thanks,
>>
>> --
>> Bastien
>>
>>
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-05 16:45 ` R. Michael Weylandt
@ 2014-04-05 19:27 ` Nicolas Goaziou
2014-04-05 21:48 ` York Zhao
2014-04-06 17:51 ` R. Michael Weylandt
0 siblings, 2 replies; 24+ messages in thread
From: Nicolas Goaziou @ 2014-04-05 19:27 UTC (permalink / raw)
To: R. Michael Weylandt; +Cc: Bastien, emacs-orgmode@gnu.org
Hello,
"R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
>> A few more minor things from my .emacs:
>>
>> 1) In ox-latex.el, add a `downcase` around the definition of
>> mint-lang in org-latex-inline-src-block and the sexp `(or (cadr
>> (assq (intern lang) org-latex-minted-langs)) lang)` in
>> org-latex-src-block to respect minted's convention of putting all
>> language names in lowercase.
Thank you.
Would you mind adding a commit message, TINYCHANGE at its end, and send
it again with "git format-patch"? See
http://orgmode.org/worg/org-contribute.html
for more information.
>> 2) Add a key binding C-c C-v k for org-babel-remove result in ob-keys.el. (Discussed on list but I can't find the reference)
[...]
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-05 19:27 ` Nicolas Goaziou
@ 2014-04-05 21:48 ` York Zhao
2014-04-06 17:51 ` R. Michael Weylandt
1 sibling, 0 replies; 24+ messages in thread
From: York Zhao @ 2014-04-05 21:48 UTC (permalink / raw)
To: Nicolas Goaziou; +Cc: R. Michael Weylandt, Bastien, emacs-orgmode@gnu.org
Hi there,
I reported a regression a few days ago, and I just knew that you are busy
preparing a new release. Since the bug I reported is a regression, I think you
may want to consider fix it before releasing the new version. Here's the bug
report I copied from the other email I had sent to this list:
(org-insert-headline '(4)) used to insert new heading before point. But this had
broken recently. According to the docstring, this command inserts new
heading at the end of the parent subtree ONLY if two universal prefix
arguments is given, not one. Here's the reproducer:
--8<---------------cut here---------------start------------->8---
emacs -Q -L path/to/org-mode/lisp/ --eval \
"(let ((buf (get-buffer-create \"test-org\"))) \
(with-current-buffer buf \
(org-mode) \
(insert \"* headline 1\") \
(goto-char (line-beginning-position)) \
(org-insert-heading '(4))) \
(switch-to-buffer buf))"
--8<---------------cut here---------------end--------------->8---
Thanks,
York
On Sat, Apr 5, 2014 at 3:27 PM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Hello,
>
> "R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
>
>>> A few more minor things from my .emacs:
>>>
>>> 1) In ox-latex.el, add a `downcase` around the definition of
>>> mint-lang in org-latex-inline-src-block and the sexp `(or (cadr
>>> (assq (intern lang) org-latex-minted-langs)) lang)` in
>>> org-latex-src-block to respect minted's convention of putting all
>>> language names in lowercase.
>
> Thank you.
>
> Would you mind adding a commit message, TINYCHANGE at its end, and send
> it again with "git format-patch"? See
>
> http://orgmode.org/worg/org-contribute.html
>
> for more information.
>
>>> 2) Add a key binding C-c C-v k for org-babel-remove result in ob-keys.el. (Discussed on list but I can't find the reference)
>
> [...]
>
>
> Regards,
>
> --
> Nicolas Goaziou
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-05 19:27 ` Nicolas Goaziou
2014-04-05 21:48 ` York Zhao
@ 2014-04-06 17:51 ` R. Michael Weylandt
2014-04-06 18:03 ` Nicolas Goaziou
2014-04-11 2:43 ` Eric Schulte
1 sibling, 2 replies; 24+ messages in thread
From: R. Michael Weylandt @ 2014-04-06 17:51 UTC (permalink / raw)
To: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
On Sat, Apr 5, 2014 at 3:27 PM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
> Hello,
>
> Would you mind adding a commit message, TINYCHANGE at its end, and send
> it again with "git format-patch"?
Hi Nicolas,
Thanks for taking the time to review my patches (2 attached):
hopefully these are formatted to org standards.
>
>>> 2) Add a key binding C-c C-v k for org-babel-remove result in ob-keys.el. (Discussed on list but I can't find the reference)
>
> [...]
>
>
> Regards,
>
> --
> Nicolas Goaziou
[-- Attachment #2: 0001-ox-latex.el-downcase-language-name-in-minted-blocks.patch --]
[-- Type: application/octet-stream, Size: 1751 bytes --]
From 6521b72a6a6bc8e1e613554ad406f360f927f3c3 Mon Sep 17 00:00:00 2001
From: Michael Weylandt <michael.weylandt@gmail.com>
Date: Sun, 6 Apr 2014 13:26:19 -0400
Subject: [PATCH 1/2] ox-latex.el: downcase language name in minted blocks
* lisp/ox-latex.el (org-latex-export-to-latex): Downcase the language
name when using minted highlighting for src block exports
Minted, by convention, uses all lowercase names for languages. This
will handle mappings like "R" to "r" or "Python" to "python"
automatically. More complex renamings still need to be handled by
customizing `org-latex-minted-langs.'
Note that the `downcase' is only applied when using the "automatic"
name. Names in `org-latex-minted-langs' still need to be lower-case.
TINYCHANGE
---
lisp/ox-latex.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 59e6e83..cc5e998 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1476,7 +1476,7 @@ contextual information."
(let* ((org-lang (org-element-property :language inline-src-block))
(mint-lang (or (cadr (assq (intern org-lang)
org-latex-minted-langs))
- org-lang))
+ (downcase org-lang)))
(options (org-latex--make-option-string
org-latex-minted-options)))
(concat (format "\\mint%s{%s}"
@@ -2116,7 +2116,7 @@ contextual information."
("firstnumber" ,(number-to-string (1+ num-start))))
org-latex-minted-options)))
;; Language.
- (or (cadr (assq (intern lang) org-latex-minted-langs)) lang)
+ (or (cadr (assq (intern lang) org-latex-minted-langs)) (downcase lang))
;; Source code.
(let* ((code-info (org-export-unravel-code src-block))
(max-width
--
1.8.3.4 (Apple Git-47)
[-- Attachment #3: 0002-ob-core.el-ob-keys.el-Add-a-keybinding-to-remove-res.patch --]
[-- Type: application/octet-stream, Size: 1929 bytes --]
From 00341c5327b5e72d42252ec9f7106a15c9363853 Mon Sep 17 00:00:00 2001
From: Michael Weylandt <michael.weylandt@gmail.com>
Date: Sun, 6 Apr 2014 13:41:47 -0400
Subject: [PATCH 2/2] ob-core.el, ob-keys.el: Add a keybinding to remove result
blocks
* ob-core.el: Add a function `org-babel-remove-result-one-or-many'
which wraps `org-babel-remove-result' to map unto all src blocks when
called with a prefix arg
* ob-keys.el: Add a keybinding "org-babel-key-prefix k" which maps
to `org-babel-remove-result-one-or-many.'
TINYCHANGE
---
lisp/ob-core.el | 9 +++++++++
lisp/ob-keys.el | 1 +
2 files changed, 10 insertions(+)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index e8943c6..c73c42b 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2166,6 +2166,15 @@ code ---- the results are extracted in the syntax of the source
(goto-char location) (forward-line 1)
(delete-region start (org-babel-result-end))))))
+(defun org-babel-remove-result-one-or-many (x)
+ "Remove the result of the current source block.
+If called with a prefix argument, remove all result blocks
+in the buffer."
+ (interactive "P")
+ (if x
+ (org-babel-map-src-blocks nil (org-babel-remove-result))
+ (org-babel-remove-result)))
+
(defun org-babel-result-end ()
"Return the point at the end of the current set of results."
(save-excursion
diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el
index 90b5196..dc1f437 100644
--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@@ -89,6 +89,7 @@ functions which are assigned key bindings, and see
("h" . org-babel-describe-bindings)
("\C-x" . org-babel-do-key-sequence-in-edit-buffer)
("x" . org-babel-do-key-sequence-in-edit-buffer)
+ ("k" . org-babel-remove-result-one-or-many)
("\C-\M-h" . org-babel-mark-block))
"Alist of key bindings and interactive Babel functions.
This list associates interactive Babel functions
--
1.8.3.4 (Apple Git-47)
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-06 17:51 ` R. Michael Weylandt
@ 2014-04-06 18:03 ` Nicolas Goaziou
2014-04-11 2:43 ` Eric Schulte
1 sibling, 0 replies; 24+ messages in thread
From: Nicolas Goaziou @ 2014-04-06 18:03 UTC (permalink / raw)
To: R. Michael Weylandt; +Cc: emacs-orgmode@gnu.org
"R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
> Thanks for taking the time to review my patches (2 attached):
> hopefully these are formatted to org standards.
Thank you. They look good.
I applied the first one. I'll let Eric, or Bastien, decide about it.
> * ob-core.el: Add a function `org-babel-remove-result-one-or-many'
> which wraps `org-babel-remove-result' to map unto all src blocks when
> called with a prefix arg
Small note: this should simply be:
* ob-core.el (org-babel-remove-result-one-or-many): New function.
Regards,
--
Nicolas Goaziou
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-06 17:51 ` R. Michael Weylandt
2014-04-06 18:03 ` Nicolas Goaziou
@ 2014-04-11 2:43 ` Eric Schulte
2014-04-13 17:02 ` R. Michael Weylandt
1 sibling, 1 reply; 24+ messages in thread
From: Eric Schulte @ 2014-04-11 2:43 UTC (permalink / raw)
To: R. Michael Weylandt; +Cc: emacs-orgmode@gnu.org
"R. Michael Weylandt" <michael.weylandt@gmail.com> writes:
> On Sat, Apr 5, 2014 at 3:27 PM, Nicolas Goaziou <n.goaziou@gmail.com> wrote:
>> Hello,
>>
>> Would you mind adding a commit message, TINYCHANGE at its end, and send
>> it again with "git format-patch"?
>
> Hi Nicolas,
>
> Thanks for taking the time to review my patches (2 attached):
> hopefully these are formatted to org standards.
>
I just tried to apply the second patch, but it no longer applies (with
"git am") to the Org-mode repo. Would you mind sending along an updated
version?
Thanks,
--
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: Prepare release 8.2.6
2014-04-11 2:43 ` Eric Schulte
@ 2014-04-13 17:02 ` R. Michael Weylandt
2014-04-17 6:26 ` Bastien
0 siblings, 1 reply; 24+ messages in thread
From: R. Michael Weylandt @ 2014-04-13 17:02 UTC (permalink / raw)
To: Eric Schulte; +Cc: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
On Thu, Apr 10, 2014 at 10:43 PM, Eric Schulte <schulte.eric@gmail.com> wrote:
>
> I just tried to apply the second patch, but it no longer applies (with
> "git am") to the Org-mode repo. Would you mind sending along an updated
> version?
>
Hi Eric,
The attached should apply cleanly against master.
Michael
[-- Attachment #2: 0001-Keybinding-to-remove-result-blocks.patch --]
[-- Type: application/octet-stream, Size: 1789 bytes --]
From d7d3428d5d3ff50b8abab7ad32643fd21b693889 Mon Sep 17 00:00:00 2001
From: Michael Weylandt <michael.weylandt@gmail.com>
Date: Sun, 13 Apr 2014 12:58:31 -0400
Subject: [PATCH] Keybinding to remove result blocks
* ob-core.el (org-babel-remove-result-one-or-many): New function.
* ob-keys.el: Keybinding for new function org-babel-remove-result-one-or-many
TINYCHANGE
---
lisp/ob-core.el | 9 +++++++++
lisp/ob-keys.el | 1 +
2 files changed, 10 insertions(+)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index 0adfc33..0e8c57f 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2252,6 +2252,15 @@ code ---- the results are extracted in the syntax of the source
(if keep-keyword (1+ (match-end 0)) (1- (match-beginning 0)))
(progn (forward-line 1) (org-babel-result-end))))))))
+(defun org-babel-remove-result-one-or-many (x)
+ "Remove the result of the current source block.
+If called with a prefix argument, remove all result blocks
+in the buffer."
+ (interactive "P")
+ (if x
+ (org-babel-map-src-blocks nil (org-babel-remove-result))
+ (org-babel-remove-result)))
+
(defun org-babel-result-end ()
"Return the point at the end of the current set of results."
(save-excursion
diff --git a/lisp/ob-keys.el b/lisp/ob-keys.el
index 90b5196..dc1f437 100644
--- a/lisp/ob-keys.el
+++ b/lisp/ob-keys.el
@@ -89,6 +89,7 @@ functions which are assigned key bindings, and see
("h" . org-babel-describe-bindings)
("\C-x" . org-babel-do-key-sequence-in-edit-buffer)
("x" . org-babel-do-key-sequence-in-edit-buffer)
+ ("k" . org-babel-remove-result-one-or-many)
("\C-\M-h" . org-babel-mark-block))
"Alist of key bindings and interactive Babel functions.
This list associates interactive Babel functions
--
1.8.3.4 (Apple Git-47)
^ permalink raw reply related [flat|nested] 24+ messages in thread