1 files changed, 29 insertions, 7 deletions

@@ -313,16 +313,38 @@ With a prefix argument, run git pull on the repo first."
 (defun acdw/copy-region-plain (start end)
   "Copy a region to clipboard, removing all Org formatting."
   (interactive "*r")
-  (let ((s (buffer-substring-no-properties start end)))
+  (let ((s (buffer-substring-no-properties start end))
+        (extracted-heading (when (derived-mode-p 'org-mode)
+                             (acdw/org-extract-heading-text))))
     (with-temp-buffer
       (insert s)
       (let ((sentence-end-double-space nil))
-        (unfill-region (point-min) (point-max)))
-      (copy-region-as-kill (point-min) (point-max)))
-    (when (called-interactively-p 'interactive)
-      (indicate-copied-region))
-    (setq deactivate-mark t)
-    nil))
+        ;; Remove org stuff
+        (when extracted-heading         ; Replace org heading with plaintext
+          (goto-char (point-min))
+          (kill-line)
+          (insert extracted-heading))
+        (replace-regexp org-property-drawer-re "") ;Delete properties
+        (replace-regexp org-logbook-drawer-re "") ;Delete logbook
+        (replace-regexp org-list-full-item-re "
+\4")
+        ;; Re-fill text for clipboard
+        (unfill-region (point-min) (point-max))
+        (flush-lines "^$" (point-min) (point-max)))
+      ;; Copy buffer
+      (copy-region-as-kill (point-min) (point-max))))
+  (when (called-interactively-p 'interactive)
+    (indicate-copied-region))
+  (setq deactivate-mark t)
+  nil)
+
+(defun acdw/org-extract-heading-text ()
+  (let ((heading (org-no-properties (org-get-heading t t t t))))
+    (message
+     (replace-regexp-in-string org-link-bracket-re
+                               (lambda (match)
+                                 (match-string-no-properties 2 match))
+                               heading))))
 
 (defun acdw/dir (&optional file make-directory)
   "Place Emacs files in one place.