summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-08 13:03:14 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-08 13:03:14 +0200
commit3e11697ead9c2699755bd744c05b915c400be093 (patch)
treecd394bbc0b8e346563b6869db225c21ff9462cbd
parentc5bb67ef60e5e100245cb0f05ec4a061066d6b74 (diff)
parentda8b8f0774d378ad477ccd0b9c059dc246e90fde (diff)
downloadorg-mode-3e11697ead9c2699755bd744c05b915c400be093.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-compat.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index e5ca0e7..f68d310 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -104,7 +104,7 @@ output directories whose names match REGEXP."
(nconc result (nreverse files)))))
-;;; Obsolete aliases (remove them once the next major release is released).
+;;; Obsolete aliases (remove them after the next major release).
;;;; XEmacs compatibility, now removed.
(define-obsolete-function-alias 'org-activate-mark 'activate-mark)
@@ -204,6 +204,10 @@ Counting starts at 1."
'org-columns-insert-dblock "Org 9.0")
(define-obsolete-variable-alias 'org-export-babel-evaluate
'org-export-use-babel "Org 9.1")
+(define-obsolete-function-alias 'org-activate-bracket-links
+ 'org-activate-links "Org 9.0")
+(define-obsolete-function-alias 'org-activate-plain-links 'ignore "Org 9.0")
+(define-obsolete-function-alias 'org-activate-angle-links 'ignore "Org 9.0")
(defun org-in-fixed-width-region-p ()
"Non-nil if point in a fixed-width region."