From: Joseph Turner <joseph@breatheoutbreathe.in>
To: Org Mode Mailing List <emacs-orgmode@gnu.org>
Subject: [PATCH] Silently remove lockfiles from org-agenda-files
Date: Thu, 18 Jan 2024 22:27:42 -0800 [thread overview]
Message-ID: <87wms5stho.fsf@breatheoutbreathe.in> (raw)
[-- Attachment #1: Type: text/plain, Size: 921 bytes --]
My configuration contains the equivalent of
(setopt org-agenda-files
(directory-files-recursively "~/.local/share/org/todo" ".org$"))
My Emacs setup broke today due to the presence of a lockfile inside
"~/.local/share/org/todo". I use EXWM, and I show org-agenda on startup:
(add-hook 'after-init-hook
(lambda () (org-agenda nil "t")))
(setq initial-buffer-choice (lambda () (get-buffer "*Org Agenda*")))
org-agenda-files contained a non-existent file, so org-check-agenda-file
attempted to prompt me. For some reason (maybe EXWM didn't fully load),
Emacs simply hung without prompting, leaving me with a black screen.
The attached patch silently removes lockfiles from org-agenda-files.
Thanks!
Joseph
P.S.
I'm not sure how the lockfile ended up there. Maybe I killed Emacs with
SIGKILL while one of my agenda files was open and modified in a buffer,
and so the lockfile was not deleted?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-lisp-org.el-org-check-agenda-file-Silently-exclude-l.patch --]
[-- Type: text/x-diff, Size: 1052 bytes --]
From e69e69a03c215704d83f8388370f0db2bc93891d Mon Sep 17 00:00:00 2001
From: Joseph Turner <joseph@breatheoutbreathe.in>
Date: Thu, 18 Jan 2024 22:24:10 -0800
Subject: [PATCH] * lisp/org.el (org-check-agenda-file): Silently exclude
lockfiles
---
lisp/org.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index 8929a7217..f48a8ff46 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -15563,8 +15563,12 @@ (defun org-file-menu-entry (file)
(vector file (list 'find-file file) t))
(defun org-check-agenda-file (file)
- "Make sure FILE exists. If not, ask user what to do."
+ "Make sure FILE exists. If not, ask user what to do.
+Automatically exclude lockfiles."
(unless (file-exists-p file)
+ (when (string-match-p (rx bos ".#") file) ; Exclude lockfiles
+ (org-remove-file file)
+ (throw 'nextfile t))
(message "Non-existent agenda file %s. [R]emove from list or [A]bort?"
(abbreviate-file-name file))
(let ((r (downcase (read-char-exclusive))))
--
2.41.0
next reply other threads:[~2024-01-19 6:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-19 6:27 Joseph Turner [this message]
2024-01-19 13:19 ` [PATCH] Silently remove lockfiles from org-agenda-files Ihor Radchenko
2024-01-31 21:51 ` Joseph Turner
2024-02-01 11:47 ` Ihor Radchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wms5stho.fsf@breatheoutbreathe.in \
--to=joseph@breatheoutbreathe.in \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).