diff options
| author | Justin Vallon <JustinVallon@gmail.com> | 2023-12-28 17:16:45 -0500 |
|---|---|---|
| committer | Ihor Radchenko <yantar92@posteo.net> | 2023-12-28 23:57:02 +0100 |
| commit | 684aff8eebdca141bde486918739c3fe0b8cd524 (patch) | |
| tree | 22f8f7931ec7af8e468d08199d59b257bbb9fbbd | |
| parent | 80ce6152ba915b7c53d239f2b030f7afb8e70e8e (diff) | |
| download | org-mode-684aff8ee.tar.gz | |
org-persist--gc-orphan-p: Fix Emacs 26.1 compatibility
* lisp/org-compat: Add org-assoc-delete-all from compat/compat-27.el.
* lisp/org-persist.el (org-persist--gc-orphan-p): Use
org-assoc-delete-all.
TINYCHANGE
| -rw-r--r-- | lisp/org-compat.el | 18 | ||||
| -rw-r--r-- | lisp/org-persist.el | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 8b1f163..6fcea18 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -348,6 +348,24 @@ Execute BODY, and unwind connection-local variables." `(with-connection-local-profiles (connection-local-get-profiles nil) ,@body))) +;; assoc-delete-all missing from 26.1 +(if (fboundp 'assoc-delete-all) + (defalias 'org-assoc-delete-all 'assoc-delete-all) + ;; from compat/compat-27.el + (defun org-assoc-delete-all (key alist &optional test) + "Delete all matching key from alist, default test equal" + (unless test (setq test #'equal)) + (while (and (consp (car alist)) + (funcall test (caar alist) key)) + (setq alist (cdr alist))) + (let ((tail alist) tail-cdr) + (while (setq tail-cdr (cdr tail)) + (if (and (consp (car tail-cdr)) + (funcall test (caar tail-cdr) key)) + (setcdr tail (cdr tail-cdr)) + (setq tail tail-cdr)))) + alist)) + ;;; Emacs < 26.1 compatibility diff --git a/lisp/org-persist.el b/lisp/org-persist.el index 82c3114..229957f 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -1216,7 +1216,7 @@ Remove expired sessions timestamps." Remove current sessions from `org-persist-gc-lock-file'." (let* ((file (org-file-name-concat org-persist-directory org-persist-gc-lock-file)) (alist (when (file-exists-p file) (org-persist--read-elisp-file file)))) - (setq alist (assoc-delete-all before-init-time alist)) + (setq alist (org-assoc-delete-all before-init-time alist)) (org-persist--write-elisp-file file alist) ;; Only GC orphan files when there are no active sessions. (not alist))) |
