Fix last commit

* lisp/org.el (org--collect-keywords-1): Fix thinko.
This commit is contained in:
Nicolas Goaziou 2020-04-26 18:50:58 +02:00
parent 053676d284
commit b223a28063
1 changed files with 9 additions and 9 deletions

View File

@ -4504,21 +4504,21 @@ directory."
keywords unique directory keywords unique directory
(cons uri files) (cons uri files)
alist))))))) alist)))))))
(key (keyword
(let ((entry (assoc-string key alist t)) (let ((entry (assoc keyword alist))
(value (final
(cond ((not (member key directory)) value) (cond ((not (member keyword directory)) value)
(buffer-file-name (buffer-file-name
(cons value (cons value
(file-name-directory buffer-file-name))) (file-name-directory buffer-file-name)))
(t (cons value default-directory))))) (t (cons value default-directory)))))
(cond ((member key unique) (cond ((member keyword unique)
(push (cons key value) alist) (push (cons keyword final) alist)
(setq keywords (remove key keywords)) (setq keywords (remove keyword keywords))
(setq regexp (org-make-options-regexp keywords))) (setq regexp (org-make-options-regexp keywords)))
((not (org-string-nw-p value)) nil) ((not (org-string-nw-p value)) nil)
((null entry) (push (list key value) alist)) ((null entry) (push (list keyword final) alist))
(t (push value (cdr entry))))))))))) (t (push final (cdr entry)))))))))))
alist))) alist)))
(defun org-tag-string-to-alist (s) (defun org-tag-string-to-alist (s)