summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2010-02-26 19:51:15 +0100
committerCarsten Dominik <carsten.dominik@gmail.com>2010-02-26 19:51:15 +0100
commit721e547cd916ef30a1b07cd0d6fbaaa4a69f6273 (patch)
tree08dbd7a269441a459d0ce0b616435e4f25073ab3
parent906bca96c68e35adcd8840edf5e8a334d542174e (diff)
downloadorg-mode-721e547cd916ef30a1b07cd0d6fbaaa4a69f6273.tar.gz
Fix bug when there is no hast for id locations
Report by Gerald, fix by David Maus.
-rwxr-xr-xlisp/ChangeLog3
-rw-r--r--lisp/org-id.el4
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index edf582b..fe038ed 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
2010-02-26 Carsten Dominik <carsten.dominik@gmail.com>
+ * org-id.el (org-id-find-id-file): Fix bug when there is no hash
+ table for the id locations.
+
* org.el (org-read-date-analyze): Match American-style dates, like
5/30 or 5/13/7. Make sure cal-iso.el is loaded. Don't force he
current year when reading ISO and American dates.
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 6f27287..bceb0a9 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -545,7 +545,9 @@ When CHECK is given, prepare detailed information about duplicate IDs."
(defun org-id-find-id-file (id)
"Query the id database for the file in which this ID is located."
(unless org-id-locations (org-id-locations-load))
- (or (gethash id org-id-locations)
+ (or (and org-id-locations
+ (hash-table-p org-id-locations)
+ (gethash id org-id-locations))
;; ball back on current buffer
(buffer-file-name (or (buffer-base-buffer (current-buffer))
(current-buffer)))))