diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-07-02 09:20:35 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2017-07-02 09:20:35 +0200 |
| commit | dd757f14f00bd106165fe900b011c7c1ea4e62ce (patch) | |
| tree | a76a4edd61267d0e1df96fb60275dfbca95b2147 | |
| parent | fbd865941f3105f689f78bf053bb3b353b9b8a23 (diff) | |
| parent | 796a78222adf85b96267c29d329acd250935d09f (diff) | |
| download | org-mode-dd757f14f00bd106165fe900b011c7c1ea4e62ce.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-capture.el | 4 | ||||
| -rw-r--r-- | lisp/org-compat.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el index 1090ae8..e3a50ed 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -1923,9 +1923,7 @@ Assume sexps have been marked with (if jump-to-captured '(:jump-to-captured t))))) org-remember-templates)))) -;;; 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") + (provide 'org-capture) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index ca0181c..4aecee3 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -375,6 +375,12 @@ use of this function is for the stuck project list." (define-obsolete-variable-alias 'org-texinfo-def-table-markup 'org-texinfo-table-default-markup "Org 9.1") +;;; 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 |