From 3bb073b638430ce8af22912f81195fb03a6417b9 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 30 Nov 2020 23:45:50 -0500 Subject: [PATCH] ol: Fix type error in org-link-search corner case * lisp/ol.el (org-link-search): Account for orphan #+name keyword. If #+name is followed by a blank line (making it an invalid affiliated keyword), :name is nil. Reported-by: Dima Kogan Ref: https://orgmode.org/list/875z5xf7f7.fsf@secretsauce.net --- lisp/ol.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/ol.el b/lisp/ol.el index 951bb74e7..77ca21e26 100644 --- a/lisp/ol.el +++ b/lisp/ol.el @@ -1173,10 +1173,9 @@ of matched result, which is either `dedicated' or `fuzzy'." (catch :name-match (goto-char (point-min)) (while (re-search-forward name nil t) - (let ((element (org-element-at-point))) - (when (equal words - (split-string - (org-element-property :name element))) + (let* ((element (org-element-at-point)) + (name (org-element-property :name element))) + (when (and name (equal words (split-string name))) (setq type 'dedicated) (beginning-of-line) (throw :name-match t))))