mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-22 07:09:47 +00:00
Code

Revert "org-src.el (org-src--contents-for-write-back): Do not indent blank lines"

Browse Source 
This reverts commit 35690cd04f.
This commit is contained in:
Bastien 2021-09-26 07:47:24 +02:00
parent 35690cd04f
commit ee0fd1ec31
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lisp/org-src.el
View File

@ -443,20 +443,14 @@ 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
(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)
(contents (org-with-wide-buffer (buffer-string)))
(write-back org-src--allow-write-back))
(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 (car contents)))
(setq marker (point-marker))
(insert (org-no-properties (car (cdr contents))))
(insert (org-no-properties contents))
(goto-char (point-min))
(when (functionp write-back) (save-excursion (funcall write-back)))
;; Add INDENTATION-OFFSET to every line in buffer,
@ -464,13 +458,10 @@ Assume point is in the corresponding edit buffer."
(when (> indentation-offset 0)
(while (not (eobp))
(skip-chars-forward " \t")
(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))))
(let ((i (current-column)))
(delete-region (line-beginning-position) (point))
(indent-to (+ i indentation-offset)))
(forward-line))))))
(defun org-src--edit-element
(datum name &optional initialize write-back contents remote)