branch: externals/org-transclusion
commit 01a836738777972e3911fbe138281a5088a266ce
Author: Benjamin Cherry <b...@devcarbon.com>
Commit: Benjamin Cherry <b...@devcarbon.com>
Move new-line guarentee to cover all content sources
---
org-transclusion-src-lines.el | 4 +---
org-transclusion.el | 5 ++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/org-transclusion-src-lines.el b/org-transclusion-src-lines.el
index ff1af8239f..4aec22daae 100644
--- a/org-transclusion-src-lines.el
+++ b/org-transclusion-src-lines.el
@@ -206,14 +206,12 @@ for the range works."
(when src-lang
(setq payload
(plist-put payload :src-content
- (let* ((src-content (plist-get payload :src-content))
- (needs-newline (not (string-suffix-p "\n"
src-content))))
+ (let ((src-content (plist-get payload :src-content)))
(concat
(format "#+begin_src %s" src-lang)
(when rest (format " %s" rest))
"\n"
src-content
- (if needs-newline "\n" "")
"#+end_src\n")))))
;; Return the payload either modified or unmodified
payload))
diff --git a/org-transclusion.el b/org-transclusion.el
index e53f275f62..5f4c3acbed 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -978,7 +978,10 @@ based on the following arguments:
(end-mkr)
(ov-src (text-clone-make-overlay sbeg send sbuf)) ;; source-buffer
overlay
(tc-pair ov-src)
- (content content))
+ (ensure-newline (lambda (str)
+ (when (not (string-suffix-p "\n" str)))
+ (concat str "\n")))
+ (content (funcall ensure-newline content)))
(when (org-transclusion-type-is-org type)
(with-temp-buffer
;; This temp buffer needs to be in Org Mode
