diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
| commit | bdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch) | |
| tree | ea3e0d00bd8da93ae89e86744a80f4e162c5361c /lisp/org/org-compat.el | |
| parent | ccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff) | |
| download | emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz | |
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'lisp/org/org-compat.el')
| -rw-r--r-- | lisp/org/org-compat.el | 2 |
1 files changed, 1 insertions, 1 deletions
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?" |