From: Chunyang Xu <mail@xuchunyang.me>
To: emacs-orgmode@gnu.org
Subject: Bug: Babel result block '#+end_example' not indented [9.0.9 (release_9.0.9-748-g3359e0 @ /Users/xcy/src/org-mode/lisp/)]
Date: Sun, 13 Aug 2017 15:46:28 +0800 [thread overview]
Message-ID: <m2bmnjewq3.fsf@xuchunyang.me> (raw)
[-- Attachment #1: Type: text/plain, Size: 897 bytes --]
For example (noticing the last line '#+end_example' is not indented with
two space)
* test
#+BEGIN_SRC sh :results output
seq 10
#+END_SRC
#+RESULTS:
#+begin_example
1
2
3
4
5
6
7
8
9
10
#+end_example
By reading the source code, I think 'indent-rigidly' doesn't the correct
end bound so the last line is not indented
(defun org-babel-insert-result (result &optional result-params info hash lang)
...
(org-babel-examplify-region beg end results-switches inline)
(setq end (point))
...
(indent-rigidly beg end indent)
...
)
'org-babel-examplify-region' wraps the result within
#+begin_example..#+end_example but doesn't move the point forward by one
line because of using save-excursion.
I attach a patch which uses the marker 'end' to track where the result
block ends, instead of (point). I have tested it against Emacs
24.5 and 25.2 slightly.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ob-core-Fix-indentation.patch --]
[-- Type: text/x-patch, Size: 2329 bytes --]
From f48e1dfc70e7f91fe39c5545997e84855981db82 Mon Sep 17 00:00:00 2001
From: Chunyang Xu <mail@xuchunyang.me>
Date: Sun, 13 Aug 2017 15:08:52 +0800
Subject: [PATCH] ob-core: Fix indentation
* lisp/ob-core.el (org-babel-insert-result): Track the end position of the
result block with the marker 'end'.
TINYCHANGE
---
lisp/ob-core.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index f8a660312..cb4d463a4 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -2290,7 +2290,9 @@ INFO may provide the values of these header arguments (in the
(org-escape-code-in-region (min (point) end) end))
(goto-char end)
(unless no-newlines (goto-char (point-at-eol)))
- (setq end (point-marker))))
+ (when (markerp end) (set-marker end nil))
+ (setq end (point-marker))
+ (set-marker-insertion-type end t)))
(tabulablep
(lambda (r)
;; Non-nil when result R can be turned into
@@ -2345,6 +2347,7 @@ INFO may provide the values of these header arguments (in the
(org-babel-chomp result "\n"))))
(t (goto-char beg) (insert result)))
(setq end (point-marker))
+ (set-marker-insertion-type end t)
;; possibly wrap result
(cond
((assq :wrap (nth 2 info))
@@ -2384,8 +2387,7 @@ INFO may provide the values of these header arguments (in the
;; Hard code {{{results(...)}}} on top of customization.
(format "{{{results(%s)}}}"
org-babel-inline-result-wrap)))
- (org-babel-examplify-region beg end results-switches inline)
- (setq end (point))))))
+ (org-babel-examplify-region beg end results-switches inline)))))
;; Possibly indent results in par with #+results line.
(when (and (not inline) (numberp indent) (> indent 0)
;; In this case `table-align' does the work
@@ -2398,6 +2400,7 @@ INFO may provide the values of these header arguments (in the
(message "Code block returned no value.")
(message "Code block produced no output."))
(message "Code block evaluation complete.")))
+ (when (markerp end) (set-marker end nil))
(when outside-scope (narrow-to-region visible-beg visible-end))
(set-marker visible-beg nil)
(set-marker visible-end nil)))))))
--
2.14.1
next reply other threads:[~2017-08-13 7:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-13 7:46 Chunyang Xu [this message]
2017-08-13 7:57 ` Bug: Babel result block '#+end_example' not indented [9.0.9 (release_9.0.9-748-g3359e0 @ /Users/xcy/src/org-mode/lisp/)] Chunyang Xu
2017-08-13 14:22 ` 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=m2bmnjewq3.fsf@xuchunyang.me \
--to=mail@xuchunyang.me \
--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).