To summarize (see also the patch's changelog message, and the ORG-NEWS entries which explain how to restore the current behaviour): - `org-return' (bound to RET) gains new arguments, and an interactive spec matching `newline'. - In situations where `org-return' must insert a newline, - if the INDENT argument is non-nil, `newline-and-indent' is called unconditionally, as before, - otherwise, `newline' is called with ARG and INTERACTIVE; if electric-indent-mode is on and INTERACTIVE is non-nil, this will trigger indentation. - `org-return-indent', the previous binding for C-j, is deprecated. - C-j is now bound to `org-return-and-maybe-indent', which calls (org-return t) when electric-indent-mode is disabled, and (org-return nil) otherwise. - In addition to the new unit tests, there is a new test helper to temporarily set or unset a minor mode. Let me know if I messed up something, or if there are things to tweak here and there. org-test-with-minor-mode might be overkill (and I am not used to writing macros, let alone edebug specs, so I might have goofed somewhere), but it does make the tests easier to read & write, so… 🤷 (I'm surprised such a macro does not already exist; did I miss it?) Thank you for your time.