From 7d2ebc3ffa23f3ec3cb68c153e788af61b181f7b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 18 Apr 2018 18:07:29 +0200 Subject: [PATCH] Deprecate `org-get-local-tags' and `org-get-local-tags-at' * contrib/lisp/org-drill.el (org-drill-entry-p): (org-drill-entry-leech-p): * lisp/org-bibtex.el (org-bibtex-headline): (org-get-local-tags-at): Use `org-get-tags'. * lisp/org.el (org-get-local-tags-at): (org-get-local-tags): Move to... * lisp/org-compat.el: ... here. --- contrib/lisp/org-drill.el | 4 ++-- lisp/org-bibtex.el | 5 ++--- lisp/org-compat.el | 9 +++++++++ lisp/org.el | 8 -------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/contrib/lisp/org-drill.el b/contrib/lisp/org-drill.el index 12c7dba4b..c7f509bff 100644 --- a/contrib/lisp/org-drill.el +++ b/contrib/lisp/org-drill.el @@ -761,7 +761,7 @@ situation use `org-part-of-drill-entry-p'." (save-excursion (when marker (org-drill-goto-entry marker)) - (member org-drill-question-tag (org-get-local-tags)))) + (member org-drill-question-tag (org-get-tags nil t)))) (defun org-drill-goto-entry (marker) @@ -793,7 +793,7 @@ drill entry." (defun org-drill-entry-leech-p () "Is the current entry a 'leech item'?" (and (org-drill-entry-p) - (member "leech" (org-get-local-tags)))) + (member "leech" (org-get-tags nil t)))) ;; (defun org-drill-entry-due-p () diff --git a/lisp/org-bibtex.el b/lisp/org-bibtex.el index 94eef7447..4a9e6d2c6 100644 --- a/lisp/org-bibtex.el +++ b/lisp/org-bibtex.el @@ -354,9 +354,8 @@ and `org-exclude-tags-from-inheritance'." (append org-bibtex-tags org-bibtex-no-export-tags)) tag)) - (if org-bibtex-inherit-tags - (org-get-tags) - (org-get-local-tags-at))))))) + (if org-bibtex-inherit-tags (org-get-tags) + (org-get-tags nil t))))))) (when type (let ((entry (format "@%s{%s,\n%s\n}\n" type id diff --git a/lisp/org-compat.el b/lisp/org-compat.el index c0fe070ff..7e0e975ba 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -385,6 +385,15 @@ use of this function is for the stuck project list." (define-obsolete-function-alias 'org-get-tags-at 'org-get-tags "Org 9.2") +(defun org-get-local-tags () + "Get a list of tags defined in the current headline." + (declare (obsolete "use `org-get-tags' instead." "Org 9.2")) + (org-get-tags nil 'local)) + +(defun org-get-local-tags-at (&optional pos) + "Get a list of tags defined in the current headline." + (declare (obsolete "use `org-get-tags' instead." "Org 9.2")) + (org-get-tags pos 'local)) ;;;; Obsolete link types diff --git a/lisp/org.el b/lisp/org.el index 48ebf0362..b9edec9f2 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -14151,14 +14151,6 @@ When DOWNCASE is non-nil, expand downcased TAGS." (defvar org-tags-overlay (make-overlay 1 1)) (delete-overlay org-tags-overlay) -(defun org-get-local-tags-at (&optional pos) - "Get a list of tags defined in the current headline." - (org-get-tags pos 'local)) - -(defun org-get-local-tags () - "Get a list of tags defined in the current headline." - (org-get-tags nil 'local)) - (defun org-add-prop-inherited (s) (add-text-properties 0 (length s) '(inherited t) s) s) -- 2.11.4.GIT