mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 21:07:54 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
30314c6038
|
@ -913,12 +913,12 @@ When REMOVE-RELATED is non-nil, remove all the containers stored with
|
||||||
the CONTAINER as well."
|
the CONTAINER as well."
|
||||||
(unless org-persist--index (org-persist--load-index))
|
(unless org-persist--index (org-persist--load-index))
|
||||||
(setq container (org-persist--normalize-container container))
|
(setq container (org-persist--normalize-container container))
|
||||||
(setq associated (org-persist--normalize-associated associated))
|
|
||||||
(if (eq associated 'all)
|
(if (eq associated 'all)
|
||||||
(mapc (lambda (collection)
|
(mapc (lambda (collection)
|
||||||
(when (member container (plist-get collection :container))
|
(when (member container (plist-get collection :container))
|
||||||
(org-persist-unregister container (plist-get collection :associated) :remove-related remove-related)))
|
(org-persist-unregister container (plist-get collection :associated) :remove-related remove-related)))
|
||||||
org-persist--index)
|
org-persist--index)
|
||||||
|
(setq associated (org-persist--normalize-associated associated))
|
||||||
(let ((collection (org-persist--find-index `(:container ,container :associated ,associated))))
|
(let ((collection (org-persist--find-index `(:container ,container :associated ,associated))))
|
||||||
(when collection
|
(when collection
|
||||||
(if (or remove-related (= (length (plist-get collection :container)) 1))
|
(if (or remove-related (= (length (plist-get collection :container)) 1))
|
||||||
|
|
Loading…
Reference in a new issue