[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 35690cd 36/85: org-src.el (org-src--contents-for-wr
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 35690cd 36/85: org-src.el (org-src--contents-for-write-back): Do not indent blank lines |
Date: |
Mon, 27 Sep 2021 15:57:45 -0400 (EDT) |
branch: externals/org
commit 35690cd04fa39489cab7afe0d518955d4541f269
Author: Sébastien Miquel <sebastien.miquel@posteo.eu>
Commit: Bastien <bzg@gnu.org>
org-src.el (org-src--contents-for-write-back): Do not indent blank lines
* lisp/org-src.el (org-src--contents-for-write-back): Do not indent
blank lines, except for the current line.
This was the original behaviour for all blank lines, before `857ae366b3`.
---
lisp/org-src.el | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 743e9e1..e331276 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -443,14 +443,20 @@ Assume point is in the corresponding edit buffer."
0))))
(use-tabs? (and (> org-src--tab-width 0) t))
(source-tab-width org-src--tab-width)
- (contents (org-with-wide-buffer (buffer-string)))
- (write-back org-src--allow-write-back))
+ (contents (org-with-wide-buffer
+ (let ((eol (progn (end-of-line) (point))))
+ (list (buffer-substring (point-min) eol)
+ (buffer-substring eol (point-max))))))
+ (write-back org-src--allow-write-back)
+ marker)
(with-current-buffer write-back-buf
;; Reproduce indentation parameters from source buffer.
(setq indent-tabs-mode use-tabs?)
(when (> source-tab-width 0) (setq tab-width source-tab-width))
;; Apply WRITE-BACK function on edit buffer contents.
- (insert (org-no-properties contents))
+ (insert (org-no-properties (car contents)))
+ (setq marker (point-marker))
+ (insert (org-no-properties (car (cdr contents))))
(goto-char (point-min))
(when (functionp write-back) (save-excursion (funcall write-back)))
;; Add INDENTATION-OFFSET to every line in buffer,
@@ -458,10 +464,13 @@ Assume point is in the corresponding edit buffer."
(when (> indentation-offset 0)
(while (not (eobp))
(skip-chars-forward " \t")
- (let ((i (current-column)))
- (delete-region (line-beginning-position) (point))
- (indent-to (+ i indentation-offset)))
- (forward-line))))))
+ (when (or (not (eolp)) ; ignore blank lines
+ (eq (point) (marker-position marker)))
+ (let ((i (current-column)))
+ (delete-region (line-beginning-position) (point))
+ (indent-to (+ i indentation-offset))))
+ (forward-line)))
+ (set-marker marker nil))))
(defun org-src--edit-element
(datum name &optional initialize write-back contents remote)
- [elpa] externals/org 177745e 73/85: doc/org-manual.org (Citations handling): New section, (continued)
- [elpa] externals/org 177745e 73/85: doc/org-manual.org (Citations handling): New section, ELPA Syncer, 2021/09/27
- [elpa] externals/org 1f2c26a 15/85: Merge branch 'bugfix', ELPA Syncer, 2021/09/27
- [elpa] externals/org 815c0b3 19/85: Merge branch 'bugfix', ELPA Syncer, 2021/09/27
- [elpa] externals/org f5392c4 08/85: Merge branch 'km/from-emacs-master', ELPA Syncer, 2021/09/27
- [elpa] externals/org 4063d4c 06/85: org: Rename for more consistency, ELPA Syncer, 2021/09/27
- [elpa] externals/org 9a4a24a 12/85: mk/targets.mk: Fix ORGVERSION in tag-less repos, ELPA Syncer, 2021/09/27
- [elpa] externals/org 2311677 13/85: mk/server.mk: Use a new path, ELPA Syncer, 2021/09/27
- [elpa] externals/org ce99b55 14/85: Merge commit '986341bd08', ELPA Syncer, 2021/09/27
- [elpa] externals/org 26b0297 20/85: Merge branch 'bugfix', ELPA Syncer, 2021/09/27
- [elpa] externals/org 45a5f17 21/85: org-manual.org: Augment TODO keywords example, ELPA Syncer, 2021/09/27
- [elpa] externals/org 35690cd 36/85: org-src.el (org-src--contents-for-write-back): Do not indent blank lines,
ELPA Syncer <=
- [elpa] externals/org faf1ba8 34/85: Merge branch 'bugfix', ELPA Syncer, 2021/09/27
- [elpa] externals/org 63a5af9 63/85: Backport commit 85e9e5f61 from Emacs, ELPA Syncer, 2021/09/27
- [elpa] externals/org 5e58af5 52/85: oc-csl: Use citeproc-el to create CSL processor itemgetters, ELPA Syncer, 2021/09/27
- [elpa] externals/org be0cdd1 40/85: org-mouse: Support intermediate-state checkboxes, ELPA Syncer, 2021/09/27
- [elpa] externals/org db67c7e 55/85: Move some ob-*el files to the new org-contrib repo, ELPA Syncer, 2021/09/27
- [elpa] externals/org 2aa2615 59/85: Document new agenda faces in the ORG-NEWS, ELPA Syncer, 2021/09/27
- [elpa] externals/org b80b0a5 51/85: org-clock.el: Make org-notify support macOS notification, ELPA Syncer, 2021/09/27
- [elpa] externals/org 78783f4 48/85: ob-core.el: Add ability to use closures as default header arguments, ELPA Syncer, 2021/09/27
- [elpa] externals/org b2da9ea 64/85: Backport commit 0da8118dc from Emacs, ELPA Syncer, 2021/09/27
- [elpa] externals/org 7d67719 68/85: org-manual: comment about latex code-block export, ELPA Syncer, 2021/09/27