summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-10 15:41:50 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-05-10 15:41:50 +0200
commit13fb6a3fae056eea0954570f4fe308386a93c8f7 (patch)
treec1a88bc83f435c00afc5baa0c012315737950920
parentd94d52489d9d9939cdbe367e18d08afd7b5f3138 (diff)
downloadorg-mode-13fb6a3fae056eea0954570f4fe308386a93c8f7.tar.gz
Move obsolete declarations into "org-compat.el"
-rw-r--r--lisp/org-capture.el1
-rw-r--r--lisp/org-compat.el13
-rw-r--r--lisp/org-pcomplete.el4
3 files changed, 10 insertions, 8 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index acdcf53..d87fb31 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -474,7 +474,6 @@ When LOCAL is set, use the local variable `org-capture-current-plist',
this is necessary after initialization of the capture process,
to avoid conflicts with other active capture processes."
(plist-get (if local org-capture-current-plist org-capture-plist) prop))
-(define-obsolete-function-alias 'org-capture-member 'org-capture-get "Org 9.2")
;;; The minor mode
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 2f06f35..7caa15d 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -67,6 +67,13 @@
(defvar org-table1-hline-regexp)
+;;; Emacs < 27.1 compatibility
+
+(unless (fboundp 'pcomplete-uniquify-list)
+ ;; The misspelled variant was made obsolete in Emacs 27.1
+ (defalias 'pcomplete-uniquify-list 'pcomplete-uniqify-list))
+
+
;;; Emacs < 26.1 compatibility
(if (fboundp 'line-number-display-width)
@@ -216,6 +223,9 @@ Counting starts at 1."
(define-obsolete-function-alias 'org-activate-angle-links 'ignore "Org 9.0")
(define-obsolete-function-alias 'org-get-indentation
'current-indentation "Org 9.2")
+(define-obsolete-function-alias 'org-capture-member 'org-capture-get "Org 9.2")
+(define-obsolete-function-alias 'org-remove-from-invisibility-spec
+ 'remove-from-invisibility-spec "Org 9.2")
(defun org-in-fixed-width-region-p ()
"Non-nil if point in a fixed-width region."
@@ -496,9 +506,6 @@ Unlike to `use-region-p', this function also checks
;;; Invisibility compatibility
-(define-obsolete-function-alias 'org-remove-from-invisibility-spec 'remove-from-invisibility-spec
- "Org 9.2")
-
(defun org-in-invisibility-spec-p (arg)
"Is ARG a member of `buffer-invisibility-spec'?"
(when (consp buffer-invisibility-spec)
diff --git a/lisp/org-pcomplete.el b/lisp/org-pcomplete.el
index 60fc2b6..2653658 100644
--- a/lisp/org-pcomplete.el
+++ b/lisp/org-pcomplete.el
@@ -38,10 +38,6 @@
(declare-function org-entry-properties "org" (&optional pom which))
(declare-function org-tag-alist-to-string "org" (alist &optional skip-key))
-(unless (fboundp 'pcomplete-uniquify-list)
- ;; The misspelled variant was made obsolete in Emacs 27.1
- (defalias 'pcomplete-uniquify-list 'pcomplete-uniqify-list))
-
;;;; Customization variables
(defvar org-drawer-regexp)