From bdebdb64b35d6a0a28e04335f4e8e46949206ad3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 26 Oct 2012 16:42:05 +0200 Subject: Merge upstream Org (from commit acbbe2) --- lisp/org/org-compat.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/org/org-compat.el') diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 76042849663..6e582b8c1d6 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -327,7 +327,7 @@ Works on both Emacs and XEmacs." (apply 'propertize string properties))) (defmacro org-find-library-dir (library) - `(file-name-directory (locate-library ,library))) + `(file-name-directory (or (locate-library ,library) ""))) (defun org-count-lines (s) "How many lines in string S?" -- cgit v1.2.1