summaryrefslogtreecommitdiff
path: root/lisp/org/org-compat.el
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2017-08-29 10:07:08 +0200
committerRasmus <rasmus@gmx.us>2017-08-29 10:13:31 +0200
commit3ad8ca429bac5e1354881cf4411d6f41dab36b44 (patch)
tree41d8dc789a212dc3b1e09f402714b09dc1462fc5 /lisp/org/org-compat.el
parentc1854b1d31e1b0a3a9e91ef41110a5fa77bedb31 (diff)
downloademacs-3ad8ca429bac5e1354881cf4411d6f41dab36b44.tar.gz
emacs-3ad8ca429bac5e1354881cf4411d6f41dab36b44.tar.bz2
emacs-3ad8ca429bac5e1354881cf4411d6f41dab36b44.zip
Update Org to v9.0.10
Please see etc/ORG-NEWS for major changes. Note, this is a bugfix release.
Diffstat (limited to 'lisp/org/org-compat.el')
-rw-r--r--lisp/org/org-compat.el12
1 files changed, 12 insertions, 0 deletions
diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el
index e1d40369f19..68a1166c814 100644
--- a/lisp/org/org-compat.el
+++ b/lisp/org/org-compat.el
@@ -60,6 +60,12 @@
(defalias 'format-message 'format)
(defalias 'gui-get-selection 'x-get-selection))
+(defun org-decode-time (&optional time zone)
+ "Backward-compatible function for `decode-time'."
+ (if (< emacs-major-version 25)
+ (decode-time time)
+ (decode-time time zone)))
+
;;; Obsolete aliases (remove them after the next major release).
@@ -293,6 +299,12 @@ See `org-link-parameters' for documentation on the other parameters."
(define-obsolete-function-alias 'org-babel-number-p
'org-babel--string-to-number "Org 9.0")
+;;; The function was made obsolete by commit 65399674d5 of 2013-02-22.
+;;; This make-obsolete call was added 2016-09-01.
+(make-obsolete 'org-capture-import-remember-templates
+ "use the `org-capture-templates' variable instead."
+ "Org 9.0")
+
;;;; Obsolete link types