1 files changed, 49 insertions, 4 deletions

@@ -2,6 +2,7 @@
 
 ;;; Code:
 
+(require 'el-patch)
 (require 'org)
 (require 'org-element)
 (require 'ox)
@@ -96,7 +97,7 @@ 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))
-               (insert "\n\n"))
+               (insert "\n"))
               ((or first-item-p
                    (and itemp (not emptyp))
                    item-child-p)
@@ -252,11 +253,11 @@ instead of the true count."
         ((use-region-p)
          (message "%d words in region"
                   (+org-count-words-stupidly (region-beginning)
-                                                 (region-end))))
+                                             (region-end))))
         (t
          (message "%d words in buffer"
                   (+org-count-words-stupidly (point-min)
-                                                 (point-max))))))
+                                             (point-max))))))
 
 ;;; org-insert-link-dwim - https://xenodium.com/emacs-dwim-do-what-i-mean/
 
@@ -561,7 +562,7 @@ and POST-PROCESS are passed to `org-export-to-file'."
   (let ((org-tmp-file "/tmp/org.html"))
     (org-export-to-file 'html org-tmp-file
       async subtreep visible-only body-only ext-plist post-process)
-    (start-process "xclicp" "*xclip*"
+    (start-process "xclip" "*xclip*"
                    "xclip" "-verbose"
                    "-i" org-tmp-file
                    "-t" "text/html"
@@ -684,5 +685,49 @@ This should only fire when switching to a buffer from `org-agenda'."
       (advice-remove 'org-agenda #'+org-agenda-inhibit-hooks)
       (advice-remove 'org-agenda-switch-to #'+org-agenda-switch-run-hooks))))
 
+
+;;; "Fix" `org-align-tags'
+
+(el-patch-defun org-align-tags (&optional all)
+  "Align tags in current entry.
+When optional argument ALL is non-nil, align all tags in the
+visible part of the buffer."
+  (let ((get-indent-column
+         (lambda ()
+           (let ((offset (el-patch-swap
+                           (if (bound-and-true-p org-indent-mode)
+                               (* (1- org-indent-indentation-per-level)
+                                  (1- (org-current-level)))
+                             0)
+                           0)))
+             (+ org-tags-column
+                (if (> org-tags-column 0) (- offset) offset))))))
+    (if (and (not all) (org-at-heading-p))
+        (org--align-tags-here (funcall get-indent-column))
+      (save-excursion
+        (if all
+            (progn
+              (goto-char (point-min))
+              (while (re-search-forward org-tag-line-re nil t)
+                (org--align-tags-here (funcall get-indent-column))))
+          (org-back-to-heading t)
+          (org--align-tags-here (funcall get-indent-column)))))))
+
+;;; Meta-return
+
+(defun +org-meta-return (&optional arg)
+  "Insert a new line, or wrap a region in a table.
+See `org-meta-return', but `+org-return-dwim' does most of the
+stuff I would want out of that function already.
+
+When called with a prefix ARG, will still unconditionally call
+`org-insert-heading'."
+  (interactive "P")
+  (org-fold-check-before-invisible-edit 'insert)
+  (or (run-hook-with-args-until-success 'org-metareturn-hook) ; Allow customizations
+      (call-interactively (cond (arg #'org-insert-heading)
+                                ((org-at-table-p) #'org-table-wrap-region)
+                                (t #'org-return)))))
+
 (provide '+org)
 ;;; +org.el ends here