ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-07-02 09:20:35 +02:00
parent fbd865941f 796a78222a
commit dd757f14f0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-capture.el
View File

@ -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)

6
lisp/org-compat.el
View File

@ -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