[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org bfda3cc 13/41: lisp/org.el: Don't let RET indent in
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org bfda3cc 13/41: lisp/org.el: Don't let RET indent in source code blocks |
Date: |
Sun, 16 May 2021 04:57:16 -0400 (EDT) |
branch: externals/org
commit bfda3cc7df31fa79222efb4c190618c3c85a3d04
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>
lisp/org.el: Don't let RET indent in source code blocks
* lisp/org.el (org-return): Don't try to indent in source code
blocks.
Reported-by: Nathaniel W Griswold <nate@manicmind.earth>
Link:
https://orgmode.org/list/5DCBAF63-0E88-44AC-B892-1260F37E7E00@manicmind.earth/
---
lisp/org.el | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 350d047..c597219 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17898,12 +17898,13 @@ will not happen if point is in a table or on a
\"dead\"
object (e.g., within a comment). In these case, you need to use
`org-open-at-point' directly."
(interactive "i\nP\np")
- (let ((context (if org-return-follows-link (org-element-context)
- (org-element-at-point))))
+ (let* ((context (if org-return-follows-link (org-element-context)
+ (org-element-at-point)))
+ (element-type (org-element-type context)))
(cond
;; In a table, call `org-table-next-row'. However, before first
;; column or after last one, split the table.
- ((or (and (eq 'table (org-element-type context))
+ ((or (and (eq 'table element-type)
(not (eq 'table.el (org-element-property :type context)))
(>= (point) (org-element-property :contents-begin context))
(< (point) (org-element-property :contents-end context)))
@@ -17917,7 +17918,7 @@ object (e.g., within a comment). In these case, you
need to use
;; `org-return-follows-link' allows it. Tolerate fuzzy
;; locations, e.g., in a comment, as `org-open-at-point'.
((and org-return-follows-link
- (or (and (eq 'link (org-element-type context))
+ (or (and (eq 'link element-type)
;; Ensure point is not on the white spaces after
;; the link.
(let ((origin (point)))
@@ -17957,6 +17958,10 @@ 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))
@@ -19102,7 +19107,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)
- [elpa] externals/org updated (e444181 -> 70d98b5), ELPA Syncer, 2021/05/16
- [elpa] externals/org dcb6013 02/41: agenda: Fix org-duration-to-minutes error (take 2), ELPA Syncer, 2021/05/16
- [elpa] externals/org 0e39bf8 03/41: Throw user errors when trying to drag inline tasks, ELPA Syncer, 2021/05/16
- [elpa] externals/org 3581f37 04/41: CONTRIBUTE: Small enhancements, ELPA Syncer, 2021/05/16
- [elpa] externals/org fa3c9c8 05/41: lisp/org-id.el: Small enhancements, ELPA Syncer, 2021/05/16
- [elpa] externals/org 90a9ee1 08/41: lisp/org-agenda.el: Fix bug in `org-agenda-highlight-todo', ELPA Syncer, 2021/05/16
- [elpa] externals/org f318cd6 14/41: Fix test-org-element/cache "Preserve local structures when re-parenting.", ELPA Syncer, 2021/05/16
- [elpa] externals/org f00ad09 10/41: org-refile.el: Fix the case of emtpy buffer name, ELPA Syncer, 2021/05/16
- [elpa] externals/org 7dcb1af 11/41: Improve org-link-plain-re, ELPA Syncer, 2021/05/16
- [elpa] externals/org bfda3cc 13/41: lisp/org.el: Don't let RET indent in source code blocks,
ELPA Syncer <=
- [elpa] externals/org 24473b5 15/41: lisp/org.el: Use "[BUG]" instead of "Bug:" for bug reports, ELPA Syncer, 2021/05/16
- [elpa] externals/org 8531bb6 09/41: lisp/org.el: Minor aesthetic clean-up, ELPA Syncer, 2021/05/16
- [elpa] externals/org 88fbe21 01/41: Add Luc Pellissier as maintainer for two ob-* files, ELPA Syncer, 2021/05/16
- [elpa] externals/org dd88356 06/41: lisp/org-inlinetask.el: Silent the byte-compiler, ELPA Syncer, 2021/05/16
- [elpa] externals/org 5a0f6c9 07/41: lisp/ox-md.el: Mark some arguments as unused, ELPA Syncer, 2021/05/16
- [elpa] externals/org 99d873b 12/41: lisp/org.el: Fix indenting of planning line, ELPA Syncer, 2021/05/16
- [elpa] externals/org 3f59ea9 20/41: Add a test for known bug in org-element-cache, ELPA Syncer, 2021/05/16
- [elpa] externals/org b183315 21/41: Set org-adapt-indentation explicitly in some tests, ELPA Syncer, 2021/05/16
- [elpa] externals/org 33027f9 17/41: New command `org-refile-reverse' bound to C-c C-M-w, ELPA Syncer, 2021/05/16
- [elpa] externals/org e53572e 18/41: Fix code typo in 06c064e9, ELPA Syncer, 2021/05/16