Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-11-04 22:41:07 +01:00
commit fd50740c96
1 changed files with 1 additions and 2 deletions

View File

@ -540,8 +540,7 @@ When FILES is given, scan these files instead."
(with-temp-buffer
(condition-case nil
(progn
(insert-file-contents-literally org-id-locations-file)
(goto-char (point-min))
(insert-file-contents org-id-locations-file)
(setq org-id-locations (read (current-buffer))))
(error
(message "Could not read org-id-values from %s. Setting it to nil."