[elpa] externals/org 0c85c8d 1/2: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 0c85c8d7edc3ca208ffbef0a0c7fa687fc8f0068
Merge: e80a009 857ae36
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 lisp/org-src.el | 9 ++++-----
 lisp/org.el     | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lisp/org-src.el b/lisp/org-src.el
index 5604e65..79f002e 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -453,15 +453,14 @@ Assume point is in the corresponding edit buffer."
       (insert (org-no-properties contents))
       (goto-char (point-min))
       (when (functionp write-back) (save-excursion (funcall write-back)))
-      ;; Add INDENTATION-OFFSET to every non-empty line in buffer,
+      ;; Add INDENTATION-OFFSET to every line in buffer,
       ;; unless indentation is meant to be preserved.
       (when (> indentation-offset 0)
        (while (not (eobp))
          (skip-chars-forward " \t")
-         (unless (eolp)                ;ignore blank lines
-           (let ((i (current-column)))
-             (delete-region (line-beginning-position) (point))
-             (indent-to (+ i indentation-offset))))
+         (let ((i (current-column)))
+           (delete-region (line-beginning-position) (point))
+           (indent-to (+ i indentation-offset)))
          (forward-line))))))
 
 (defun org-src--edit-element
diff --git a/lisp/org.el b/lisp/org.el
index ae09f3e..0add9bc 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18018,10 +18018,6 @@ object (e.g., within a comment).  In these case, you 
need to use
             (delete-and-extract-region (point) (line-end-position))))
        (org--newline indent arg interactive)
        (save-excursion (insert trailing-data))))
-     ;; FIXME: In a source block, don't try to indent as it may result
-     ;; in weird results due to `electric-indent-mode' being `t'.
-     ((eq element-type 'src-block)
-      (org--newline nil nil nil))
      (t
       ;; Do not auto-fill when point is in an Org property drawer.
       (let ((auto-fill-function (and (not (org-at-property-p))
@@ -19167,7 +19163,7 @@ Also align node properties according to 
`org-property-format'."
                       (line-beginning-position 2))))
             nil)
            ((and (eq type 'src-block)
-                  org-src-tab-acts-natively
+                 org-src-tab-acts-natively
                  (> (line-beginning-position)
                     (org-element-property :post-affiliated element))
                  (< (line-beginning-position)