dotfiles

commit 9e48c4d65f6e7e53bc9485fd929591c13dd06619
parent bdafb3098044e1ca807031c79d58b154639a16a0
Author: Alex Balgavy <alex@balgavy.eu>
Date:   Wed,  1 May 2024 23:17:31 +0200

emacs: error on org import inboxes when sync conflict

Diffstat:
M
emacs/config.org
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/emacs/config.org b/emacs/config.org
@@ -1815,7 +1815,9 @@ And a function for importing other inboxes:
   (defun za/gtd-inbox-import ()
     (interactive)
     (unless (string= (buffer-file-name) (file-truename za/org-life-inbox))
-      (user-error "You're not in your GTD inbox file."))
+      (user-error "You're not in your GTD inbox file"))
+    (when (directory-files za/org-life-dir nil "\\.sync-conflict-")
+        (user-error "Sync conflicts found, please fix them"))
     (let ((mobile (if (boundp 'za/org-life-inbox-mobile) (file-truename za/org-life-inbox-mobile) nil))
           (calendar (if (boundp 'za/org-life-calendar-inbox) (file-truename za/org-life-calendar-inbox) nil)))
       (save-mark-and-excursion