summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2021-01-07 00:14:37 -0500
committerKyle Meyer <kyle@kyleam.com>2021-01-07 00:14:37 -0500
commit5b5c420da5298f6526b77c409a5ef67e63741bad (patch)
tree0fe05518d48fa71c75f2b4ea6c3015c12516f916
parentc07808af14e0fb9f12ebd1bf347c0faa91bf2f14 (diff)
parent33de2bd8ef90483778e4b18acbce388957b6863f (diff)
downloadorg-mode-5b5c420da5298f6526b77c409a5ef67e63741bad.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-compat.el2
-rw-r--r--lisp/org-refile.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 1f4e2e8..af10c2d 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -732,6 +732,8 @@ context. See the individual commands for more information."
"use `org-planning-line-re', followed by `org-ts-regexp-both' instead."
"Org 9.4")
+(define-obsolete-function-alias 'org-copy 'org-refile-copy "Org 9.4")
+
;;;; Obsolete link types
(eval-after-load 'ol
diff --git a/lisp/org-refile.el b/lisp/org-refile.el
index 0b44fdf..4a09ab5 100644
--- a/lisp/org-refile.el
+++ b/lisp/org-refile.el
@@ -373,8 +373,6 @@ the *old* location.")
(defvar org-refile-keep nil
"Non-nil means `org-refile' will copy instead of refile.")
-(define-obsolete-function-alias 'org-copy 'org-refile-copy)
-
;;;###autoload
(defun org-refile-copy ()
"Like `org-refile', but preserve the refiled subtree."