From 49d6951caa32e305d0899d871fc97c29d6dc281f Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Sun, 13 Nov 2011 16:03:51 +0000 Subject: [PATCH] Fix don't load symlinks (Emacs interlocking files) * testing/org-test.el: During test development various interlocking files may be present in testing/lisp directory (since they are being edited by emacs). Currently org-test-load will attempt to load these --- testing/org-test.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/org-test.el b/testing/org-test.el index ea8cae4b5..7d2f7e771 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -276,8 +276,9 @@ otherwise place the point at the beginning of the inserted text." (if (file-directory-p path) (rld path) (catch 'missing-test-dependency - (when (string-match "^[A-Za-z].*\\.el$" path) - load-file path)))) + (when (string-match "^[A-Za-z].*\\.el$" + (file-name-nondirectory path)) + (load-file path))))) (directory-files base 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.el$")))) (rld (expand-file-name "lisp" org-test-dir))