Merge branch 'maint'
This commit is contained in:
commit
fd50740c96
|
@ -540,8 +540,7 @@ When FILES is given, scan these files instead."
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(condition-case nil
|
(condition-case nil
|
||||||
(progn
|
(progn
|
||||||
(insert-file-contents-literally org-id-locations-file)
|
(insert-file-contents org-id-locations-file)
|
||||||
(goto-char (point-min))
|
|
||||||
(setq org-id-locations (read (current-buffer))))
|
(setq org-id-locations (read (current-buffer))))
|
||||||
(error
|
(error
|
||||||
(message "Could not read org-id-values from %s. Setting it to nil."
|
(message "Could not read org-id-values from %s. Setting it to nil."
|
||||||
|
|
Loading…
Reference in New Issue