Merge branch 'main' of https://tildegit.org/acdw/emacs

1 files changed, 8 insertions, 6 deletions

@@ -38,6 +38,12 @@ lists, insert a new item or end the list, with checkbox if
 appropriate.  In tables, insert a new row or end the table."
   ;; Inspired by John Kitchin: http://kitchingroup.cheme.cmu.edu/blog/2017/04/09/A-better-return-in-org-mode/
   (interactive "P")
+  ;; Auto-fill if enabled
+  (when auto-fill-function
+    (if (listp auto-fill-function)
+        (dolist (func auto-fill-function)
+          (funcall func))
+      (funcall auto-fill-function)))
   (if default
       (org-return)
     (cond
@@ -87,10 +93,6 @@ appropriate.  In tables, insert a new row or end the table."
                          (org-element-property :contents-end context)))
              (item-child-p
               (unpackaged/org-element-descendant-of 'item context)))
-        (message "(or %S (and %S %S) %S)"
-                 first-item-p
-                 itemp (not emptyp)
-                 item-child-p)
         ;; The original function from unpackaged just tested the (or ...) test
         ;; in this cond, in an if.  However, that doesn't auto-end nested
         ;; lists.  So I made this form a cond and added the (and...) test in
@@ -99,13 +101,13 @@ appropriate.  In tables, insert a new row or end the table."
         ;; for now, it works well enough.
         (cond ((and itemp emptyp)
                (delete-region (line-beginning-position) (line-end-position))
-               (newline 2))
+               (insert "\n\n"))
               ((or first-item-p
                    (and itemp (not emptyp))
                    item-child-p)
                (org-insert-item))
               (t (delete-region (line-beginning-position) (line-end-position))
-                 (newline)))))
+                 (insert "\n")))))
 
      ((when (fboundp 'org-inlinetask-in-task-p)
         (org-inlinetask-in-task-p))