From 30a6126bb9a68afe4007fed5fa0a34ea8adedf40 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Nov 2021 22:50:09 +0100 Subject: [PATCH] oc: Fix `org-cite-fontify-default' docstring and simplify code * lisp/oc.el (org-cite-fontify-default): We don't need to assume activate processor may be used on a citation reference: that will not happen. --- lisp/oc.el | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/lisp/oc.el b/lisp/oc.el index a8cd6c37c..427c087c0 100644 --- a/lisp/oc.el +++ b/lisp/oc.el @@ -1141,17 +1141,14 @@ and must return either a string, an object, or a secondary string." ;;; Internal interface with fontification (activate capability) -(defun org-cite-fontify-default (datum) - "Fontify DATUM with `org-cite' and `org-cite-key' face. -DATUM is a citation object, or a citation reference. In any case, apply -`org-cite' face on the whole citation, and `org-cite-key' face on each key." - (let* ((cite (if (eq 'citation-reference (org-element-type datum)) - (org-element-property :parent datum) - datum)) - (beg (org-element-property :begin cite)) - (end (org-with-point-at (org-element-property :end cite) - (skip-chars-backward " \t") - (point)))) +(defun org-cite-fontify-default (cite) + "Fontify CITE with `org-cite' and `org-cite-key' faces. +CITE is a citation object. The function applies `org-cite' face +on the whole citation, and `org-cite-key' face on each key." + (let ((beg (org-element-property :begin cite)) + (end (org-with-point-at (org-element-property :end cite) + (skip-chars-backward " \t") + (point)))) (add-text-properties beg end '(font-lock-multiline t)) (add-face-text-property beg end 'org-cite) (dolist (reference (org-cite-get-references cite))