aliens/org-contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

org-contacts.el: Catch nextfile' in org-contacts-db'

Browse source 
* org-contacts.el (org-contacts-db): Catch `nextfile'.

When a file in the list returned by the `org-contacts-files' function
doesn't exist and the user selects the option to attempt to remove it
from the `org-agenda-files' list, 'nextfile is thrown.  Catch it and
skip processing that file instead of failing.

TINYCHANGE
This commit is contained in:
Philippe Crama 2015-06-10 11:25:46 +02:00 committed by Nicolas Goaziou
parent 8078958995
commit d1298f4599
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
org-contacts.el
View file

@ -261,7 +261,28 @@ to dead or no buffer."
(make-progress-reporter "Updating Org Contacts Database..." 0 (length org-contacts-files))) (make-progress-reporter "Updating Org Contacts Database..." 0 (length org-contacts-files)))
(i 0)) (i 0))
(dolist (file (org-contacts-files)) (dolist (file (org-contacts-files))
(org-check-agenda-file file) (if (catch 'nextfile
;; if file doesn't exist and the user agrees to removing it
;; from org-agendas-list, 'nextfile is thrown. Catch it here
;; and skip processing the file.
;;
;; TODO: suppose that the user has set an org-contacts-files
;; list that contains an element that doesn't exist in the
;; file system: in that case, the org-agenda-files list could
;; be updated (and saved to the customizations of the user) if
;; it contained the same file even though the org-agenda-files
;; list wasn't actually used. I don't think it is normal that
;; org-contacts updates org-agenda-files in this case, but
;; short of duplicating org-check-agenda-files and
;; org-remove-files, I don't know how to avoid it.
;;
;; A side effect of the TODO is that the faulty
;; org-contacts-files list never gets updated and thus the
;; user is always queried about the missing files when
;; org-contacts-db-need-update-p returns true.
(org-check-agenda-file file))
(message "Skipped %s removed from org-agenda-files list."
(abbreviate-file-name file))
(with-current-buffer (org-get-agenda-file-buffer file) (with-current-buffer (org-get-agenda-file-buffer file)
(unless (eq major-mode 'org-mode) (unless (eq major-mode 'org-mode)
(error "File %s is not in `org-mode'" file)) (error "File %s is not in `org-mode'" file))
@ -270,7 +291,7 @@ to dead or no buffer."
(org-scan-tags (org-scan-tags
'org-contacts-at-point 'org-contacts-at-point
contacts-matcher contacts-matcher
todo-only)))) todo-only)))))
(progress-reporter-update progress-reporter (setq i (1+ i)))) (progress-reporter-update progress-reporter (setq i (1+ i))))
(setf org-contacts-db result (setf org-contacts-db result
org-contacts-last-update (current-time)) org-contacts-last-update (current-time))