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:45:33 +0200 [thread overview]
Message-ID: <87368br8wi.fsf@gmail.com> (raw)
In-Reply-To: <874kss9bqx.fsf@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Thu, 07 May 2020 14:21:26 +0200")
[-- Attachment #1: Type: text/plain, Size: 697 bytes --]
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
> AFAICT, `newline-and-indent' doesn't accept any argument. Keeping it
> introduces a build warning and test failures. Hence the removal.
>
> Since you were calling it with an argument I assume this may be
> a novelty in Emacs 27.
Wow, you're right. That caught me off-guard.
> However Org still supports Emacs 24.4. If that's
> the case, we need an additional compatibility layer to support both
> cases. WDYT?
I don't know if we want to jump through these hoops for a feature that
people have done without so far? FWIW though, the following patch seems
to work ("make test" works with both 26.3 and 28.0 on my end):
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: newline-and-indent-compat.patch --]
[-- Type: text/x-patch, Size: 1307 bytes --]
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 2b35535fa..ed12b9d18 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -102,6 +102,11 @@ is nil)."
(defun org-time-convert-to-list (time)
(seconds-to-time (float-time time))))
+(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..57e78599f 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)
[-- Attachment #3: Type: text/plain, Size: 92 bytes --]
(I hope I got that right.)
> Meanwhile, I fixed the docstring. Thanks!
And thanks again.
next prev parent reply other threads:[~2020-05-07 16:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CADwFkm=qkNCWA40ieZ9Dv-gbk6xAzjG16sOa64GT+Zbv9pCC_A@mail.gmail.com>
[not found] ` <20200426172206.GC18629@ACM>
[not found] ` <87y2qhnc9a.fsf@gmail.com>
[not found] ` <20200427102311.GA4976@ACM>
[not found] ` <87mu6xtano.fsf@gmail.com>
[not found] ` <87k120ohsq.fsf@mail.linkov.net>
[not found] ` <87blnbir01.fsf@nicolasgoaziou.fr>
[not found] ` <87o8rbmbfa.fsf@mail.linkov.net>
[not found] ` <87k11yftqo.fsf@nicolasgoaziou.fr>
[not found] ` <87pnbqo74t.fsf_-_@gmail.com>
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 [this message]
2020-05-07 16:50 ` Kévin Le Gouguec
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
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87368br8wi.fsf@gmail.com \
--to=kevin.legouguec@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=emacs-orgmode@gnu.org \
--subject='Re: [PATCH] Make RET and C-j obey `electric-indent-mode'\'' in org-mode' \
/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
Code repositories for project(s) associated with this inbox:
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).