mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 19:07:52 +00:00
Merge branch 'maint'
This commit is contained in:
commit
f3cdc5b211
|
@ -17950,12 +17950,13 @@ object (e.g., within a comment). In these case, you need to use
|
||||||
(org--newline indent arg interactive))))))
|
(org--newline indent arg interactive))))))
|
||||||
|
|
||||||
(defun org-return-and-maybe-indent ()
|
(defun org-return-and-maybe-indent ()
|
||||||
"Goto next table row, or insert a newline.
|
"Goto next table row, or insert a newline, maybe indented.
|
||||||
Call `org-table-next-row' or `org-return', depending on context.
|
Call `org-table-next-row' or `org-return', depending on context.
|
||||||
See the individual commands for more information.
|
See the individual commands for more information.
|
||||||
|
|
||||||
When inserting a newline, indent the new line if
|
When inserting a newline, if `org-adapt-indentation' is `t':
|
||||||
`electric-indent-mode' is disabled."
|
indent the line if `electric-indent-mode' is disabled, don't
|
||||||
|
indent it if it is enabled."
|
||||||
(interactive)
|
(interactive)
|
||||||
(org-return (not electric-indent-mode)))
|
(org-return (not electric-indent-mode)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue