Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

@@ -3,6 +3,11 @@
 	* org-table.el (org-table-align): Fix alignment of strings
 	with invisible characters.
 
+2010-05-19  David Maus  <dmaus@ictsoc.de>
+
+	* org.el (org-refile-cache-get): Return empty list of targets
+	when cache was cleared.
+
 2010-05-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-refile-use-cache): New option.

lisp/org.el

@@ -9526,7 +9526,7 @@ on the system \"/user@host:\"."
   "Retrieve the cached value for refile targets given by IDENTIFIERS."
   (cond
    ((not org-refile-cache) nil)
-   ((not org-refile-use-cache) (org-refile-cache-clear))
+   ((not org-refile-use-cache) (org-refile-cache-clear) nil)
    (t
     (let ((set (cdr (assoc (sha1 (prin1-to-string identifiers))
 			   org-refile-cache))))