From: "Kévin Le Gouguec" <kevin.legouguec@gmail.com>
To: Org Mode list <emacs-orgmode@gnu.org>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: [PATCH] Make RET and C-j obey `electric-indent-mode' in org-mode
Date: Thu, 07 May 2020 18:50:30 +0200 [thread overview]
Message-ID: <87v9l7pu3t.fsf@gmail.com> (raw)
In-Reply-To: <87368br8wi.fsf@gmail.com> ("Kévin Le Gouguec"'s message of "Thu, 07 May 2020 18:45:33 +0200")
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
Kévin Le Gouguec <kevin.legouguec@gmail.com> writes:
> (I hope I got that right.)
Except I forgot the explanatory comment, and I left a typo in the
docstring. Ahem.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1376 bytes --]
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 2b35535fa..caaf5ce58 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -102,6 +102,12 @@ is nil)."
(defun org-time-convert-to-list (time)
(seconds-to-time (float-time time))))
+;; `newline-and-indent' did not take a numeric argument before 27.1.
+(if (version< emacs-version "27")
+ (defsubst org-newline-and-indent (&optional _arg)
+ (newline-and-indent))
+ (defalias 'org-newline-and-indent #'newline-and-indent))
+
\f
;;; Emacs < 26.1 compatibility
diff --git a/lisp/org.el b/lisp/org.el
index 8ad437a20..142bfb999 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17649,12 +17649,12 @@ call `open-line' on the very first character."
(defun org--newline (indent arg interactive)
"Call `newline-and-indent' or just `newline'.
-If INDENT is non-nil, call `newline-and-indent' to indent
-unconditionally; otherwise, call `newline' with ARG and
-INTERACTIVE, which can trigger indentation if
+If INDENT is non-nil, call `newline-and-indent' with ARG (if
+supported) to indent unconditionally; otherwise, call `newline'
+with ARG and INTERACTIVE, which can trigger indentation if
`electric-indent-mode' is enabled."
(if indent
- (newline-and-indent)
+ (org-newline-and-indent arg)
(newline arg interactive)))
(defun org-return (&optional indent arg interactive)
next prev parent reply other threads:[~2020-05-07 16:50 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-26 15:43 Convert some files from outline-mode to org-mode Stefan Kangas
2020-04-26 16:13 ` Clément Pit-Claudel
2020-04-26 18:36 ` Stefan Monnier
2020-04-26 19:52 ` Stefan Kangas
2020-04-26 20:54 ` Stefan Monnier
2020-04-26 22:53 ` Clément Pit-Claudel
2020-04-26 16:16 ` H. Dieter Wilhelm
2020-04-26 17:22 ` Alan Mackenzie
2020-04-26 19:29 ` Stefan Kangas
2020-04-26 21:54 ` Kévin Le Gouguec
2020-04-26 22:09 ` Stefan Monnier
2020-04-26 22:41 ` Drew Adams
2020-04-27 7:20 ` Kévin Le Gouguec
2020-04-27 15:23 ` Drew Adams
2020-04-27 15:31 ` Jean-Christophe Helary
2020-04-27 7:39 ` Kévin Le Gouguec
2020-04-27 14:27 ` Reveal-mode (was: Convert some files from outline-mode to org-mode) Stefan Monnier
2020-04-27 10:23 ` Convert some files from outline-mode to org-mode Alan Mackenzie
2020-04-27 11:45 ` Kévin Le Gouguec
2020-04-27 20:30 ` Juri Linkov
2020-04-27 21:24 ` Drew Adams
2020-04-27 23:05 ` John Yates
2020-04-28 2:51 ` Richard Stallman
2020-05-24 6:23 ` Bastien
2020-04-28 15:12 ` Nicolas Goaziou
2020-04-28 16:41 ` H. Dieter Wilhelm
2020-04-28 17:56 ` Nicolas Goaziou
2020-04-28 19:22 ` H. Dieter Wilhelm
2020-04-28 23:35 ` Juri Linkov
2020-04-29 10:53 ` Nicolas Goaziou
2020-04-29 11:37 ` Reconciling org-mode idiosyncrasies with Emacs core (was: Convert some files from outline-mode to org-mode) Kévin Le Gouguec
2020-04-29 12:30 ` Reconciling org-mode idiosyncrasies with Emacs core Nicolas Goaziou
2020-05-04 10:45 ` Kévin Le Gouguec
2020-05-04 14:50 ` Nicolas Goaziou
2020-05-04 16:14 ` Kévin Le Gouguec
2020-05-06 14:54 ` [PATCH] Make RET and C-j obey `electric-indent-mode' in org-mode (was: Reconciling org-mode idiosyncrasies with Emacs core) Kévin Le Gouguec
2020-05-07 10:48 ` [PATCH] Make RET and C-j obey `electric-indent-mode' in org-mode Nicolas Goaziou
2020-05-07 12:03 ` Kévin Le Gouguec
2020-05-07 12:21 ` Nicolas Goaziou
2020-05-07 16:45 ` Kévin Le Gouguec
2020-05-07 16:50 ` Kévin Le Gouguec [this message]
2020-05-07 19:38 ` Nicolas Goaziou
2020-05-24 6:25 ` Bastien
2020-05-07 13:53 ` Stefan Monnier
2020-05-07 15:33 ` Kévin Le Gouguec
2020-05-24 6:23 ` Convert some files from outline-mode to org-mode Bastien
2020-05-24 6:18 ` Bastien
2020-04-27 12:14 ` H. Dieter Wilhelm
2020-05-24 6:13 ` Bastien
2020-04-26 18:40 ` Stefan Monnier
2020-05-24 6:15 ` Bastien
2020-04-27 2:23 ` Richard Stallman
2020-04-27 6:37 ` Michael Albinus
2020-04-27 7:12 ` tomas
2020-04-28 2:49 ` Richard Stallman
2020-04-28 9:40 ` Michael Albinus
2020-04-29 3:30 ` Richard Stallman
2020-05-24 6:16 ` Bastien
2020-04-27 9:59 ` Po Lu
2020-04-27 14:36 ` Stefan Monnier
2020-04-27 14:49 ` Jean-Christophe Helary
2020-04-29 3:27 ` Howard Melman
2020-04-29 3:52 ` Jean-Christophe Helary
2020-04-29 13:54 ` Howard Melman
2020-04-29 14:08 ` Jean-Christophe Helary
2020-04-29 14:17 ` Nicolas Goaziou
2020-04-29 14:52 ` Howard Melman
2020-04-29 14:03 ` Stefan Kangas
2020-04-30 10:25 ` H. Dieter Wilhelm
2020-05-07 21:01 ` Stefan Kangas
2020-05-08 17:50 ` Yuri Khan
2020-05-08 17:55 ` Stefan Kangas
2020-05-24 6:35 ` Bastien
2020-04-29 17:52 ` Alan Mackenzie
2020-04-29 19:19 ` Howard Melman
2020-04-30 2:24 ` Richard Stallman
2020-05-24 6:04 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v9l7pu3t.fsf@gmail.com \
--to=kevin.legouguec@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.