mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

org-persist: Handle undefined variables in elisp containers 

* lisp/org-persist.el (org-persist-write:elisp): Do not try to write
elisp variable data when the variable is not defined.
(org-persist-load-all):
(org-persist-write-all): Cleanup containers that cannot be
read/written.
This commit is contained in:
Ihor Radchenko 2022-02-13 16:53:59 +08:00
parent 98588ebfe1
commit 27215ac5b5
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lisp/org-persist.el
View File

@ -613,10 +613,11 @@ COLLECTION is the plist holding data collectin."
"Write elisp CONTAINER according to COLLECTION."
(if (and (plist-get (plist-get collection :associated) :file)
(get-file-buffer (plist-get (plist-get collection :associated) :file)))
(buffer-local-value
(cadr container)
(get-file-buffer (plist-get (plist-get collection :associated) :file)))
(symbol-value (cadr container))))
(let ((buf (get-file-buffer (plist-get (plist-get collection :associated) :file))))
(when (buffer-local-boundp (cadr container) buf)
(buffer-local-value (cadr container) buf)))
(when (boundp (cadr container))
(symbol-value (cadr container)))))
(defalias 'org-persist-write:version #'ignore)
@ -794,7 +795,12 @@ The arguments have the same meaning as in `org-persist-read'."
(when collection
(cl-pushnew (plist-get collection :container) all-containers :test #'equal)))
(dolist (container all-containers)
(org-persist-load container associated t))))
(condition-case err
(org-persist-load container associated t)
(error
(message "%s. Deleting bad index entry." err)
(org-persist--remove-from-index (org-persist--find-index `(:container ,container :associated ,associated)))
nil)))))
(defun org-persist-load-all-buffer ()
"Call `org-persist-load-all' in current buffer."
@ -837,10 +843,21 @@ When ASSOCIATED is non-nil, only save the matching data."
(if associated
(when collection
(cl-pushnew (plist-get collection :container) all-containers :test #'equal))
(org-persist-write (plist-get collection :container) (plist-get collection :associated) t)))
(condition-case err
(org-persist-write (plist-get collection :container) (plist-get collection :associated) t)
(error
(message "%s. Deleting bad index entry." err)
(org-persist--remove-from-index collection)
nil))))
(dolist (container all-containers)
(when (org-persist--find-index `(:container ,container :associated ,associated))
(org-persist-write container associated t)))))
(let ((collection (org-persist--find-index `(:container ,container :associated ,associated))))
(when collection
(condition-case err
(org-persist-write container associated t)
(error
(message "%s. Deleting bad index entry." err)
(org-persist--remove-from-index collection)
nil)))))))
(defun org-persist-write-all-buffer ()
"Call `org-persist-write-all' in current buffer.